Date: Fri, 6 Feb 2015 15:53:15 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278319 - in stable: 10/sys/dev/cxgbe/tom 10/sys/kern 9/sys/dev/cxgbe/tom 9/sys/kern Message-ID: <201502061553.t16FrFYu086352@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Fri Feb 6 15:53:13 2015 New Revision: 278319 URL: https://svnweb.freebsd.org/changeset/base/278319 Log: MFC 275808: Check for SS_NBIO in so->so_state instead of sb->sb_flags in soreceive_stream(). Modified: stable/9/sys/dev/cxgbe/tom/t4_ddp.c stable/9/sys/kern/uipc_socket.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/cxgbe/tom/t4_ddp.c stable/10/sys/kern/uipc_socket.c Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/dev/cxgbe/tom/t4_ddp.c ============================================================================== --- stable/9/sys/dev/cxgbe/tom/t4_ddp.c Fri Feb 6 15:38:11 2015 (r278318) +++ stable/9/sys/dev/cxgbe/tom/t4_ddp.c Fri Feb 6 15:53:13 2015 (r278319) @@ -1161,7 +1161,7 @@ restart: /* Socket buffer got some data that we shall deliver now. */ if (sb->sb_cc > 0 && !(flags & MSG_WAITALL) && - ((sb->sb_flags & SS_NBIO) || + ((so->so_state & SS_NBIO) || (flags & (MSG_DONTWAIT|MSG_NBIO)) || sb->sb_cc >= sb->sb_lowat || sb->sb_cc >= uio->uio_resid || Modified: stable/9/sys/kern/uipc_socket.c ============================================================================== --- stable/9/sys/kern/uipc_socket.c Fri Feb 6 15:38:11 2015 (r278318) +++ stable/9/sys/kern/uipc_socket.c Fri Feb 6 15:53:13 2015 (r278319) @@ -2063,7 +2063,7 @@ restart: /* Socket buffer got some data that we shall deliver now. */ if (sb->sb_cc > 0 && !(flags & MSG_WAITALL) && - ((sb->sb_flags & SS_NBIO) || + ((so->so_state & SS_NBIO) || (flags & (MSG_DONTWAIT|MSG_NBIO)) || sb->sb_cc >= sb->sb_lowat || sb->sb_cc >= uio->uio_resid ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502061553.t16FrFYu086352>