Module Name: src
Committed By: pgoyette
Date: Wed May 21 13:21:20 UTC 2014
Modified Files:
src/sys/netinet: tcp_usrreq.c
Log Message:
Restore original sense of the check, and allow both inp and in6p to be
NULL. This case is explicitly handled below.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/netinet/tcp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.174 src/sys/netinet/tcp_usrreq.c:1.175
--- src/sys/netinet/tcp_usrreq.c:1.174 Tue May 20 19:04:00 2014
+++ src/sys/netinet/tcp_usrreq.c Wed May 21 13:21:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.174 2014/05/20 19:04:00 rmind Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.175 2014/05/21 13:21:20 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.174 2014/05/20 19:04:00 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.175 2014/05/21 13:21:20 pgoyette Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -251,7 +251,7 @@ tcp_usrreq(struct socket *so, int req, s
}
#ifdef INET6
- KASSERT((inp != NULL) ^ (in6p != NULL));
+ KASSERT((inp == NULL) || (in6p == NULL));
#endif
KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB));
