Module Name: src Committed By: bouyer Date: Sat Mar 17 19:51:46 UTC 2012
Modified Files: src/sys/netinet [netbsd-6]: tcp_usrreq.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.162.2.1 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.162 src/sys/netinet/tcp_usrreq.c:1.162.2.1 --- src/sys/netinet/tcp_usrreq.c:1.162 Thu Feb 2 19:43:07 2012 +++ src/sys/netinet/tcp_usrreq.c Sat Mar 17 19:51:45 2012 @@ -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 @@ tcp_usrreq(struct socket *so, int req, * 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;