From owner-svn-src-stable-9@FreeBSD.ORG Fri Feb 6 15:53:15 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DE9254B; Fri, 6 Feb 2015 15:53:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77CB33B5; Fri, 6 Feb 2015 15:53:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16FrFsq086354; Fri, 6 Feb 2015 15:53:15 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16FrFYu086352; Fri, 6 Feb 2015 15:53:15 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502061553.t16FrFYu086352@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 6 Feb 2015 15:53:15 +0000 (UTC) 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 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 15:53:15 -0000 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 ||