[src/trunk]: src/sys/netinet Restore original sense of the check, and allow b...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f30cea904285
branches:  trunk
changeset: 329370:f30cea904285
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed May 21 13:21:20 2014 +0000

description:
Restore original sense of the check, and allow both inp and in6p to be
NULL.  This case is explicitly handled below.

diffstat:

 sys/netinet/tcp_usrreq.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5b7f47c4dba5 -r f30cea904285 sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Wed May 21 13:12:19 2014 +0000
+++ b/sys/netinet/tcp_usrreq.c  Wed May 21 13:21:20 2014 +0000
@@ -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 @@
        }
 
 #ifdef INET6
-       KASSERT((inp != NULL) ^ (in6p != NULL));
+       KASSERT((inp == NULL) || (in6p == NULL));
 #endif
        KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB));