svn commit: r275808 - in head/sys: dev/cxgbe/tom kern

[John Baldwin]

Author: jhb
Date: Mon Dec 15 17:52:08 2014
New Revision: 275808
URL: https://svnweb.freebsd.org/changeset/base/275808

Log:
  Check for SS_NBIO in so->so_state instead of sb->sb_flags in
  soreceive_stream().
  
  Differential Revision:	https://reviews.freebsd.org/D1299
  Reviewed by:	bz, gnn
  MFC after:	1 week

Modified:
  head/sys/dev/cxgbe/tom/t4_ddp.c
  head/sys/kern/uipc_socket.c

Modified: head/sys/dev/cxgbe/tom/t4_ddp.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_ddp.c	Mon Dec 15 16:14:49 2014	(r275807)
+++ head/sys/dev/cxgbe/tom/t4_ddp.c	Mon Dec 15 17:52:08 2014	(r275808)
@@ -1173,7 +1173,7 @@ restart:
 
 	/* Socket buffer got some data that we shall deliver now. */
 	if (sbused(sb) && !(flags & MSG_WAITALL) &&
-	    ((sb->sb_flags & SS_NBIO) ||
+	    ((so->so_state & SS_NBIO) ||
 	     (flags & (MSG_DONTWAIT|MSG_NBIO)) ||
 	     sbused(sb) >= sb->sb_lowat ||
 	     sbused(sb) >= uio->uio_resid ||

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Mon Dec 15 16:14:49 2014	(r275807)
+++ head/sys/kern/uipc_socket.c	Mon Dec 15 17:52:08 2014	(r275808)
@@ -2002,7 +2002,7 @@ restart:
 
 	/* Socket buffer got some data that we shall deliver now. */
 	if (sbavail(sb) > 0 && !(flags & MSG_WAITALL) &&
-	    ((sb->sb_flags & SS_NBIO) ||
+	    ((so->so_state & SS_NBIO) ||
 	     (flags & (MSG_DONTWAIT|MSG_NBIO)) ||
 	     sbavail(sb) >= sb->sb_lowat ||
 	     sbavail(sb) >= uio->uio_resid ||