svn commit: r251378 - stable/9/sys/ofed/drivers/infiniband/ulp/sdp

[John Baldwin]

Author: jhb
Date: Tue Jun  4 14:38:50 2013
New Revision: 251378
URL: http://svnweb.freebsd.org/changeset/base/251378

Log:
  MFC 249066:
  Check for SS_NBIO in the socket state field rather than socket buffer
  flags.

Modified:
  stable/9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
==============================================================================
--- stable/9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c	Tue Jun  4 13:55:03 2013	(r251377)
+++ stable/9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c	Tue Jun  4 14:38:50 2013	(r251378)
@@ -1267,7 +1267,7 @@ sdp_sorecv(struct socket *so, struct soc
 
 	/* Socket buffer is empty and we shall not block. */
 	if (sb->sb_cc == 0 &&
-	    ((sb->sb_flags & SS_NBIO) || (flags & (MSG_DONTWAIT|MSG_NBIO)))) {
+	    ((so->so_state & SS_NBIO) || (flags & (MSG_DONTWAIT|MSG_NBIO)))) {
 		error = EAGAIN;
 		goto out;
 	}
@@ -1297,7 +1297,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 ||