[src/netbsd-6]: src/sys/netinet Pull up following revision(s) (requested by j...

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

details:   https://anonhg.NetBSD.org/src/rev/db9c4c665047
branches:  netbsd-6
changeset: 773938:db9c4c665047
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Mar 17 19:51:45 2012 +0000

description:
Pull up following revision(s) (requested by jruoho in ticket #124):
        sys/netinet/tcp_usrreq.c: revision 1.163
PR/46077: M. Nunberg: Stat should not fial on connecting socket.

diffstat:

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

diffs (34 lines):

diff -r fd54537d7bab -r db9c4c665047 sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Sat Mar 17 17:55:47 2012 +0000
+++ b/sys/netinet/tcp_usrreq.c  Sat Mar 17 19:51:45 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.162 2012/02/02 19:43:07 tls Exp $     */
+/*     $NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -267,11 +267,11 @@
         * a (struct inpcb) pointed at by the socket, and this
         * structure will point at a subsidary (struct tcpcb).
         */
-#ifndef INET6
-       if (inp == 0 && req != PRU_ATTACH)
-#else
-       if ((inp == 0 && in6p == 0) && req != PRU_ATTACH)
+       if ((inp == 0
+#ifdef INET6
+           && in6p == 0
 #endif
+           ) && (req != PRU_ATTACH && req != PRU_SENSE))
        {
                error = EINVAL;
                goto release;