 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_socket.c,v 1.110 2011/07/17 23:59:54 christos Exp $	*/
+/*	$NetBSD: linux_socket.c,v 1.111 2011/12/20 23:56:28 christos Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Functions in multiarch:
  *	linux_sys_socketcall		: linux_socketcall.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.110 2011/07/17 23:59:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.111 2011/12/20 23:56:28 christos Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #endif /* defined(_KERNEL_OPT) */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 @@ -1366,44 +1366,44 @@ linux_sys_connect(struct lwp *l, const s
 	} */
 	int		error;
 	struct mbuf *nam;
 	error = linux_get_sa(l, SCARG(uap, s), &nam, SCARG(uap, name),
 	    SCARG(uap, namelen));
 	if (error)
 		return (error);
 	error = do_sys_connect(l, SCARG(uap, s), nam);
 	if (error == EISCONN) {
 		struct socket *so;
-		int state, prflags, nbio;
+		int state, prflags;
 		/* fd_getsock() will use the descriptor for us */
 	    	if (fd_getsock(SCARG(uap, s), &so) != 0)
 		    	return EISCONN;
 		solock(so);
 		state = so->so_state;
 		nbio = so->so_nbio;
 		prflags = so->so_proto->pr_flags;
 		sounlock(so);
 		fd_putfile(SCARG(uap, s));
 		/*
 		 * We should only let this call succeed once per
 		 * non-blocking connect; however we don't have
 		 * a convenient place to keep that state..
 		 */
-		if (nbio && (state & SS_ISCONNECTED) &&
+		if ((state & (SS_ISCONNECTED|SS_NBIO)) ==
 		    (SS_ISCONNECTED|SS_NBIO) &&
 		    (prflags & PR_CONNREQUIRED))
 			return 0;
+	}
 	return (error);
+}
 int
 linux_sys_bind(struct lwp *l, const struct linux_sys_bind_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(const struct osockaddr *) name;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kttcp.c,v 1.28 2008/04/24 11:38:36 ad Exp $	*/
+/*	$NetBSD: kttcp.c,v 1.29 2011/12/20 23:56:28 christos Exp $	*/
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden and Jason R. Thorpe for
  * Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,27 +32,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * kttcp.c -- provides kernel support for testing network testing,
  *            see kttcp(4)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.28 2008/04/24 11:38:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.29 2011/12/20 23:56:28 christos Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/protosw.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 #include <sys/socketvar.h>
 @@ -227,27 +227,27 @@ kttcp_sosend(struct socket *so, unsigned
 		if ((so->so_state & SS_ISCONNECTED) == 0) {
 			if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
 				if ((so->so_state & SS_ISCONFIRMING) == 0)
 					snderr(ENOTCONN);
 			} else
 				snderr(EDESTADDRREQ);
+		}
 		space = sbspace(&so->so_snd);
 		if (flags & MSG_OOB)
 			space += 1024;
 		if ((atomic && resid > so->so_snd.sb_hiwat))
 			snderr(EMSGSIZE);
 		if (space < resid && (atomic || space < so->so_snd.sb_lowat)) {
-			if (so->so_nbio)
+			if (so->so_state & SS_NBIO)
 				snderr(EWOULDBLOCK);
 			SBLASTRECORDCHK(&so->so_rcv,
 			    "kttcp_soreceive sbwait 1");
 			SBLASTMBUFCHK(&so->so_rcv,
 			    "kttcp_soreceive sbwait 1");
 			sbunlock(&so->so_snd);
 			error = sbwait(&so->so_snd);
 			if (error)
 				goto out;
 			goto restart;
+		}
 		mp = &top;
 		do {
 @@ -417,27 +417,27 @@ kttcp_soreceive(struct socket *so, unsig
+		}
 		for (; m; m = m->m_next)
 			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
 				m = so->so_rcv.sb_mb;
 				goto dontblock;
+			}
 		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
 		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
 			error = ENOTCONN;
 			goto release;
+		}
 		if (resid == 0)
 			goto release;
-		if (so->so_nbio || (flags & MSG_DONTWAIT)) {
+		if ((so->so_so_state & SS_NBIO) || (flags & MSG_DONTWAIT|MSG_NBIO)) {
 			error = EWOULDBLOCK;
 			goto release;
+		}
 		sbunlock(&so->so_rcv);
 		error = sbwait(&so->so_rcv);
 		if (error) {
 			sounlock(so);
 			return (error);
+		}
 		goto restart;
+	}
  dontblock:
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_socket.c,v 1.64 2011/06/30 22:38:50 dyoung Exp $	*/
+/*	$NetBSD: sys_socket.c,v 1.65 2011/12/20 23:56:28 christos Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)sys_socket.c	8.3 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.64 2011/06/30 22:38:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.65 2011/12/20 23:56:28 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/poll.h>
 #include <sys/proc.h>
 @@ -117,28 +117,32 @@ soo_write(file_t *fp, off_t *offset, str
 	return error;
+}
 int
 soo_ioctl(file_t *fp, u_long cmd, void *data)
+{
 	struct socket *so = fp->f_data;
 	int error = 0;
 	switch (cmd) {
 	case FIONBIO:
-		/* No reason to lock and this call is made very often. */
+		solock(so);
-		so->so_nbio = *(int *)data;
+		if (*(int *)data)
 			so->so_state |= SS_NBIO;
 		else
 			so->so_state &= ~SS_NBIO;
 		sounlock(so);
 		break;
 	case FIOASYNC:
 		solock(so);
 		if (*(int *)data) {
 			so->so_state |= SS_ASYNC;
 			so->so_rcv.sb_flags |= SB_ASYNC;
 			so->so_snd.sb_flags |= SB_ASYNC;
 		} else {
 			so->so_state &= ~SS_ASYNC;
 			so->so_rcv.sb_flags &= ~SB_ASYNC;
 			so->so_snd.sb_flags &= ~SB_ASYNC;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_socket.c,v 1.205 2011/07/02 17:53:50 bouyer Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.206 2011/12/20 23:56:28 christos Exp $	*/
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -53,27 +53,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_socket.c	8.6 (Berkeley) 5/2/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.205 2011/07/02 17:53:50 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.206 2011/12/20 23:56:28 christos Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
 #include "opt_mbuftrace.h"
 #include "opt_somaxkva.h"
 #include "opt_multiprocessor.h"	/* XXX */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 @@ -731,27 +731,28 @@ soclose(struct socket *so)
+			}
 			break;
+		}
+	}
 	if (so->so_pcb == 0)
 		goto discard;
 	if (so->so_state & SS_ISCONNECTED) {
 		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
 			error = sodisconnect(so);
 			if (error)
 				goto drop;
+		}
 		if (so->so_options & SO_LINGER) {
-			if ((so->so_state & SS_ISDISCONNECTING) && so->so_nbio)
+			if ((so->so_state & (SS_ISDISCONNECTING|SS_NBIO)) ==
 			    (SS_ISDISCONNECTING|SS_NBIO))
 				goto drop;
 			while (so->so_state & SS_ISCONNECTED) {
 				error = sowait(so, true, so->so_linger * hz);
 				if (error)
 					break;
+			}
+		}
+	}
  drop:
 	if (so->so_pcb) {
 		error2 = (*so->so_proto->pr_usrreq)(so, PRU_DETACH,
 		    NULL, NULL, NULL, NULL);
 		if (error == 0)
 @@ -951,27 +952,27 @@ sosend(struct socket *so, struct mbuf *a
 				goto release;
+			}
+		}
 		space = sbspace(&so->so_snd);
 		if (flags & MSG_OOB)
 			space += 1024;
 		if ((atomic && resid > so->so_snd.sb_hiwat) ||
 		    clen > so->so_snd.sb_hiwat) {
 			error = EMSGSIZE;
 			goto release;
+		}
 		if (space < resid + clen &&
 		    (atomic || space < so->so_snd.sb_lowat || space < clen)) {
-			if (so->so_nbio) {
+			if ((so->so_state & SS_NBIO) || (flags & MSG_NBIO)) {
 				error = EWOULDBLOCK;
 				goto release;
+			}
 			sbunlock(&so->so_snd);
 			if (wakeup_state & SS_RESTARTSYS) {
 				error = ERESTART;
 				goto out;
+			}
 			error = sbwait(&so->so_snd);
 			if (error)
 				goto out;
 			wakeup_state = so->so_state;
 			goto restart;
 @@ -1247,27 +1248,28 @@ soreceive(struct socket *so, struct mbuf
+		}
 		for (; m != NULL; m = m->m_next)
 			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
 				m = so->so_rcv.sb_mb;
 				goto dontblock;
+			}
 		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
 		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
 			error = ENOTCONN;
 			goto release;
+		}
 		if (uio->uio_resid == 0)
 			goto release;
-		if (so->so_nbio || (flags & MSG_DONTWAIT)) {
+		if ((so->so_state & SS_NBIO) ||
 		    (flags & (MSG_DONTWAIT|MSG_NBIO))) {
 			error = EWOULDBLOCK;
 			goto release;
+		}
 		SBLASTRECORDCHK(&so->so_rcv, "soreceive sbwait 1");
 		SBLASTMBUFCHK(&so->so_rcv, "soreceive sbwait 1");
 		sbunlock(&so->so_rcv);
 		if (wakeup_state & SS_RESTARTSYS)
 			error = ERESTART;
 		else
 			error = sbwait(&so->so_rcv);
 		if (error != 0) {
 			sounlock(so);
 			splx(s);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_socket2.c,v 1.109 2011/08/31 18:31:03 plunky Exp $	*/
+/*	$NetBSD: uipc_socket2.c,v 1.110 2011/12/20 23:56:28 christos Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -48,27 +48,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_socket2.c	8.2 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.109 2011/08/31 18:31:03 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.110 2011/12/20 23:56:28 christos Exp $");
 #include "opt_mbuftrace.h"
 #include "opt_sb_max.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/domain.h>
 #include <sys/poll.h>
 @@ -255,27 +255,26 @@ sonewconn(struct socket *head, int conns
 		connstatus = 0;
 	soqueue = connstatus ? 1 : 0;
 	if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2)
 		return NULL;
 	so = soget(false);
 	if (so == NULL)
 		return NULL;
 	mutex_obj_hold(head->so_lock);
 	so->so_lock = head->so_lock;
 	so->so_type = head->so_type;
 	so->so_options = head->so_options &~ SO_ACCEPTCONN;
 	so->so_linger = head->so_linger;
 	so->so_state = head->so_state | SS_NOFDREF;
 	so->so_nbio = head->so_nbio;
 	so->so_proto = head->so_proto;
 	so->so_timeo = head->so_timeo;
 	so->so_pgid = head->so_pgid;
 	so->so_send = head->so_send;
 	so->so_receive = head->so_receive;
 	so->so_uidinfo = head->so_uidinfo;
 	so->so_cpid = head->so_cpid;
 #ifdef MBUFTRACE
 	so->so_mowner = head->so_mowner;
 	so->so_rcv.sb_mowner = head->so_rcv.sb_mowner;
 	so->so_snd.sb_mowner = head->so_snd.sb_mowner;
 #endif
 	if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) != 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_syscalls.c,v 1.148 2011/11/04 02:13:08 christos Exp $	*/
+/*	$NetBSD: uipc_syscalls.c,v 1.149 2011/12/20 23:56:28 christos Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_syscalls.c	8.6 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.148 2011/11/04 02:13:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.149 2011/12/20 23:56:28 christos Exp $");
 #include "opt_pipe.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/buf.h>
 #define MBUFTYPES
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 @@ -188,27 +188,27 @@ do_sys_accept(struct lwp *l, int sock, s
 	solock(so);
 	if (__predict_false(mask))
 		sigsuspendsetup(l, mask);
 	if (!(so->so_proto->pr_flags & PR_LISTEN)) {
 		error = EOPNOTSUPP;
 		goto bad;
+	}
 	if ((so->so_options & SO_ACCEPTCONN) == 0) {
 		error = EINVAL;
 		goto bad;
+	}
-	if (so->so_nbio && so->so_qlen == 0) {
+	if ((so->so_state & SS_NBIO) && so->so_qlen == 0) {
 		error = EWOULDBLOCK;
 		goto bad;
+	}
 	while (so->so_qlen == 0 && so->so_error == 0) {
 		if (so->so_state & SS_CANTRCVMORE) {
 			so->so_error = ECONNABORTED;
 			break;
+		}
 		if (wakeup_state & SS_RESTARTSYS) {
 			error = ERESTART;
 			goto bad;
+		}
 		error = sowait(so, true, 0);
 @@ -357,27 +357,27 @@ do_sys_connect(struct lwp *l, int fd, st
 		m_freem(nam);
 		return (error);
+	}
 	solock(so);
 	MCLAIM(nam, so->so_mowner);
 	if ((so->so_state & SS_ISCONNECTING) != 0) {
 		error = EALREADY;
 		goto out;
+	}
 	error = soconnect(so, nam, l);
 	if (error)
 		goto bad;
-	if (so->so_nbio && (so->so_state & SS_ISCONNECTING) != 0) {
+	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING) != 0) {
 		error = EINPROGRESS;
 		goto out;
+	}
 	while ((so->so_state & SS_ISCONNECTING) != 0 && so->so_error == 0) {
 		error = sowait(so, true, 0);
 		if (__predict_false((so->so_state & SS_ISABORTING) != 0)) {
 			error = EPIPE;
 			interrupted = 1;
 			break;
+		}
 		if (error) {
 			if (error == EINTR || error == ERESTART)
 				interrupted = 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fifo_vnops.c,v 1.70 2011/08/31 18:31:03 plunky Exp $	*/
+/*	$NetBSD: fifo_vnops.c,v 1.71 2011/12/20 23:56:29 christos Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -48,27 +48,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.70 2011/08/31 18:31:03 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.71 2011/12/20 23:56:29 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 @@ -233,88 +233,79 @@ fifo_open(void *v)
  */
 /* ARGSUSED */
 static int
 fifo_read(void *v)
+{
 	struct vop_read_args /* {
 		struct vnode	*a_vp;
 		struct uio	*a_uio;
 		int		a_ioflag;
 		kauth_cred_t	a_cred;
 	} */ *ap = v;
 	struct uio	*uio;
 	struct socket	*rso;
-	int		error;
+	int		error, sflags;
 	size_t		startresid;
 	uio = ap->a_uio;
 	rso = ap->a_vp->v_fifoinfo->fi_readsock;
 #ifdef DIAGNOSTIC
 	if (uio->uio_rw != UIO_READ)
 		panic("fifo_read mode");
 #endif
 	if (uio->uio_resid == 0)
 		return (0);
 	startresid = uio->uio_resid;
 	VOP_UNLOCK(ap->a_vp);
-	if (ap->a_ioflag & IO_NDELAY) {
+	sflags = (ap->a_ioflag & IO_NDELAY) ? MSG_NBIO : 0;
-		/* XXX Bogus, affects other threads. */
+	error = (*rso->so_receive)(rso, NULL, uio, NULL, NULL, &sflags);
 		rso->so_nbio = 1;
 	error = (*rso->so_receive)(rso, NULL, uio, NULL, NULL, NULL);
 	/*
 	 * Clear EOF indication after first such return.
 	 */
-	if (uio->uio_resid == startresid)
+	if (error != EINTR && uio->uio_resid == startresid)
 		rso->so_state &= ~SS_CANTRCVMORE;
 	if (ap->a_ioflag & IO_NDELAY) {
 		rso->so_nbio = 0;
 		if (error == EWOULDBLOCK &&
 		    ap->a_vp->v_fifoinfo->fi_writers == 0)
 			error = 0;
+	}
 	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY);
 	return (error);
+}
 /*
  * Vnode op for write
  */
 /* ARGSUSED */
 static int
 fifo_write(void *v)
+{
 	struct vop_write_args /* {
 		struct vnode	*a_vp;
 		struct uio	*a_uio;
 		int		a_ioflag;
 		kauth_cred_t	a_cred;
 	} */ *ap = v;
 	struct socket	*wso;
-	int		error;
+	int		error, sflags;
 	wso = ap->a_vp->v_fifoinfo->fi_writesock;
 #ifdef DIAGNOSTIC
 	if (ap->a_uio->uio_rw != UIO_WRITE)
 		panic("fifo_write mode");
 #endif
 	VOP_UNLOCK(ap->a_vp);
-	if (ap->a_ioflag & IO_NDELAY) {
+	sflags = (ap->a_ioflag & IO_NDELAY) ? MSG_NBIO : 0;
-		/* XXX Bogus, affects other threads. */
+	error = (*wso->so_send)(wso, NULL, ap->a_uio, 0, NULL, sflags, curlwp);
 		wso->so_nbio = 1;
 	error = (*wso->so_send)(wso, NULL, ap->a_uio, 0, NULL, 0, curlwp);
 	if (ap->a_ioflag & IO_NDELAY)
 		wso->so_nbio = 0;
 	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY);
 	return (error);
+}
 /*
  * Device ioctl operation.
  */
 /* ARGSUSED */
 static int
 fifo_ioctl(void *v)
+{
 	struct vop_ioctl_args /* {
 		struct vnode	*a_vp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tp_usrreq.c,v 1.40 2009/03/18 22:08:57 he Exp $	*/
+/*	$NetBSD: tp_usrreq.c,v 1.41 2011/12/20 23:56:29 christos Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -55,27 +55,27 @@ SOFTWARE.
 ******************************************************************/
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
  * tp_usrreq(), the fellow that gets called from most of the socket code.
  * Pretty straighforward. THe only really awful stuff here is the OOB
  * processing, which is done wholly here. tp_rcvoob() and tp_sendoob() are
  * contained here and called by tp_usrreq().
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tp_usrreq.c,v 1.40 2009/03/18 22:08:57 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tp_usrreq.c,v 1.41 2011/12/20 23:56:29 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <netiso/tp_param.h>
 @@ -202,27 +202,27 @@ restart:
 	sblock(sb, M_WAITOK);
 	for (nn = &sb->sb_mb; (n = *nn) != NULL; nn = &n->m_nextpkt)
 		if (n->m_type == MT_OOBDATA)
 			break;
 	if (n == 0) {
 #ifdef ARGO_DEBUG
 		if (argo_debug[D_XPD]) {
 			printf("RCVOOB: empty queue!\n");
+		}
 #endif
 		sbunlock(sb);
-		if (so->so_nbio) {
+		if (so->so_state & SS_NBIO) {
 			return EWOULDBLOCK;
+		}
 		sbwait(sb);
 		goto restart;
+	}
 	m->m_len = 0;
 	/* Assuming at most one xpd tpdu is in the buffer at once */
 	while (n != NULL) {
 		m->m_len += n->m_len;
 		memcpy(mtod(m, void *), mtod(n, void *), (unsigned) n->m_len);
 		m->m_data += n->m_len;	/* so mtod() in bcopy() above gives
 					 * right addr */
 @@ -296,27 +296,27 @@ tp_sendoob(struct tp_pcb *tpcb, struct s
 		if (xdata)
 			printf("xdata len 0x%x\n", xdata->m_len);
+	}
 #endif
 	/*
 	 * DO NOT LOCK the Xsnd buffer!!!! You can have at MOST one socket
 	 * buf locked at any time!!! (otherwise you might sleep() in sblock()
 	 * w/ a signal pending and cause the system call to be aborted w/ a
 	 * locked socketbuf, which is a problem.  So the so_snd buffer lock
 	 * (done in sosend()) serves as the lock for Xpd.
 	 */
 	if (sb->sb_mb) {	/* Anything already in eXpedited data
 				 * sockbuf? */
-		if (so->so_nbio) {
+		if (so->so_state & SS_NBIO) {
 			return EWOULDBLOCK;
+		}
 		while (sb->sb_mb) {
 			sbunlock(&so->so_snd);	/* already locked by sosend */
 			sbwait(&so->so_snd);
 			sblock(&so->so_snd, M_WAITOK);	/* sosend will unlock on
 							 * return */
+		}
+	}
 	if (xdata == (struct mbuf *) 0) {
 		/* empty xpd packet */
 		xdata = m_gethdr(M_WAIT, MT_OOBDATA);
 		xdata->m_len = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: socket.h,v 1.100 2011/06/26 16:43:12 christos Exp $	*/
+/*	$NetBSD: socket.h,v 1.101 2011/12/20 23:56:29 christos Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -482,26 +482,27 @@ struct msghdr {
 #define	MSG_OOB		0x0001		/* process out-of-band data */
 #define	MSG_PEEK	0x0002		/* peek at incoming message */
 #define	MSG_DONTROUTE	0x0004		/* send without using routing tables */
 #define	MSG_EOR		0x0008		/* data completes record */
 #define	MSG_TRUNC	0x0010		/* data discarded before delivery */
 #define	MSG_CTRUNC	0x0020		/* control data lost before delivery */
 #define	MSG_WAITALL	0x0040		/* wait for full request or error */
 #define	MSG_DONTWAIT	0x0080		/* this message should be nonblocking */
 #define	MSG_BCAST	0x0100		/* this message was rcvd using link-level brdcst */
 #define	MSG_MCAST	0x0200		/* this message was rcvd using link-level mcast */
 #define	MSG_NOSIGNAL	0x0400		/* do not generate SIGPIPE on EOF */
 #if defined(_NETBSD_SOURCE)
 #define	MSG_CMSG_CLOEXEC 0x0800		/* close on exec receiving fd */
 #define	MSG_NBIO	0x1000		/* use non-blocking I/O */
 #endif
 /* Extra flags used internally only */
 #define	MSG_USERFLAGS	0x0ffffff
 #define MSG_NAMEMBUF	0x1000000	/* msg_name is an mbuf */
 #define MSG_CONTROLMBUF	0x2000000	/* msg_control is an mbuf */
 #define MSG_IOVUSRSPACE	0x4000000	/* msg_iov is in user space */
 #define MSG_LENUSRSPACE	0x8000000	/* address length is in user space */
 /*
  * Header for ancillary data objects in msg_control buffer.
  * Used for additional information with/about a datagram
  * not expressible by flags.  The format is a sequence

 @@ -1,14 +1,14 @@
-/*	$NetBSD: socketvar.h,v 1.126 2011/07/02 17:53:51 bouyer Exp $	*/
+/*	$NetBSD: socketvar.h,v 1.127 2011/12/20 23:56:29 christos Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -118,27 +118,26 @@ struct sockbuf {
 /*
  * Kernel structure per socket.
  * Contains send and receive buffer queues,
  * handle on protocol and pointer to protocol
  * private data and error information.
  */
 struct socket {
 	kmutex_t * volatile so_lock;	/* pointer to lock on structure */
 	kcondvar_t	so_cv;		/* notifier */
 	short		so_type;	/* generic type, see socket.h */
 	short		so_options;	/* from socket call, see socket.h */
 	u_short		so_linger;	/* time to linger while closing */
 	short		so_state;	/* internal state flags SS_*, below */
 	int		so_nbio;	/* non-blocking I/O enabled */
 	void		*so_pcb;	/* protocol control block */
 	const struct protosw *so_proto;	/* protocol handle */
 /*
  * Variables for connection queueing.
  * Socket where accepts occur is so_head in all subsidiary sockets.
  * If so_head is 0, socket is not related to an accept.
  * For head socket so_q0 queues partially completed connections,
  * while so_q is a queue of connections ready to be accepted.
  * If a connection is aborted and it has so_head set, then
  * it has to be pulled out of either so_q0 or so_q.
  * We allow connections to queue up based on current queue lengths
  * and limit on number of queued connections for this socket.
  */
 @@ -200,26 +199,27 @@ do {									\
 #define	SS_CANTRCVMORE		0x020	/* can't receive more data from peer */
 #define	SS_RCVATMARK		0x040	/* at mark on input */
 #define	SS_ISABORTING		0x080	/* aborting fd references - close() */
 #define	SS_RESTARTSYS		0x100	/* restart blocked system calls */
 #define	SS_ISDISCONNECTED	0x800	/* socket disconnected from peer */
 #define	SS_ASYNC		0x100	/* async i/o notify */
 #define	SS_ISCONFIRMING		0x200	/* deciding to accept connection req */
 #define	SS_MORETOCOME		0x400	/*
 					 * hint from sosend to lower layer;
 					 * more data coming
 					 */
 #define	SS_ISAPIPE 		0x1000	/* socket is implementing a pipe */
 #define	SS_NBIO			0x2000	/* socket is in non blocking I/O */
 #ifdef _KERNEL
 struct accept_filter {
 	char	accf_name[16];
 	void	(*accf_callback)
 		(struct socket *, void *, int, int);
 	void *	(*accf_create)
 		(struct socket *, char *);
 	void	(*accf_destroy)
 		(struct socket *);
 	LIST_ENTRY(accept_filter) accf_next;
 	u_int	accf_refcnt;