diff options
| author | jhb <jhb@FreeBSD.org> | 2015-02-06 15:53:13 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-02-06 15:53:13 +0000 |
| commit | b2ec5474301d37ac927f7ff78cd22f9e60fe0a86 (patch) | |
| tree | ebcf52a01cc0e86045b1d1f23f8ceafad5b5ce31 /sys/kern/uipc_socket.c | |
| parent | d00b9ac996246997218e24586889f5e322208a3c (diff) | |
| download | FreeBSD-src-b2ec5474301d37ac927f7ff78cd22f9e60fe0a86.zip FreeBSD-src-b2ec5474301d37ac927f7ff78cd22f9e60fe0a86.tar.gz | |
MFC 275808:
Check for SS_NBIO in so->so_state instead of sb->sb_flags in
soreceive_stream().
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 6cb446a..39c4daa 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1941,7 +1941,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 || |
