From b654a044271ecb2da0e571f44cae859a4da51dec Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 17 Mar 2012 02:48:51 +0000 Subject: [PATCH] PR/46077: M. Nunberg: Stat should not fial on connecting socket. --- sys/netinet/tcp_usrreq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 3a106ede40da..a4f9ae3d86bf 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -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.163 2012/03/17 02:48:51 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -95,7 +95,7 @@ */ #include -__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.163 2012/03/17 02:48:51 christos 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;