[src/trunk]: src/sys/netinet tcp_usrreq: fix the previous - the assert is sti...

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

details:   https://anonhg.NetBSD.org/src/rev/b6ec66f38ccc
branches:  trunk
changeset: 329380:b6ec66f38ccc
user:      rmind <rmind%NetBSD.org@localhost>
date:      Thu May 22 00:28:32 2014 +0000

description:
tcp_usrreq: fix the previous - the assert is still not true (but PRU_SENSE
case will handle it); eventually, pr_usrreq should not be called without
PCB attached.

diffstat:

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

diffs (39 lines):

diff -r cfd25c65ff81 -r b6ec66f38ccc sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Wed May 21 23:59:03 2014 +0000
+++ b/sys/netinet/tcp_usrreq.c  Thu May 22 00:28:32 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.176 2014/05/21 18:41:43 rmind Exp $   */
+/*     $NetBSD: tcp_usrreq.c,v 1.177 2014/05/22 00:28:32 rmind 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.176 2014/05/21 18:41:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.177 2014/05/22 00:28:32 rmind Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -250,7 +250,9 @@
                return EAFNOSUPPORT;
        }
        KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB));
-
+#ifdef INET6
+       /* XXX: KASSERT((inp != NULL) ^ (in6p != NULL)); */
+#endif
        /*
         * When a TCP is attached to a socket, then there will be
         * a (struct inpcb) pointed at by the socket, and this
@@ -265,9 +267,6 @@
                error = EINVAL;
                goto release;
        }
-#ifdef INET6
-       KASSERT((inp != NULL) ^ (in6p != NULL));
-#endif
 #ifdef INET
        if (inp) {
                tp = intotcpcb(inp);