From owner-svn-src-projects@FreeBSD.ORG  Tue Oct  7 13:08:53 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3BFCFAFA;
 Tue,  7 Oct 2014 13:08:53 +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 28A14CB7;
 Tue,  7 Oct 2014 13:08:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97D8r6I077093;
 Tue, 7 Oct 2014 13:08:53 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97D8r2W077092;
 Tue, 7 Oct 2014 13:08:53 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071308.s97D8r2W077092@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 13:08:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272686 - projects/sendfile/sys/netinet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 13:08:53 -0000

Author: glebius
Date: Tue Oct  7 13:08:52 2014
New Revision: 272686
URL: https://svnweb.freebsd.org/changeset/base/272686

Log:
  tcp_usr_ready() shouldn't honor SBS_CANTSENDMORE, since data already
  is in the socket and we must send it.
  
  Sponsored by:	Netflix
  Sponsored by:	Nginx, Inc.

Modified:
  projects/sendfile/sys/netinet/tcp_usrreq.c

Modified: projects/sendfile/sys/netinet/tcp_usrreq.c
==============================================================================
--- projects/sendfile/sys/netinet/tcp_usrreq.c	Tue Oct  7 10:54:53 2014	(r272685)
+++ projects/sendfile/sys/netinet/tcp_usrreq.c	Tue Oct  7 13:08:52 2014	(r272686)
@@ -941,17 +941,10 @@ tcp_usr_ready(struct socket *so, struct 
 	tp = intotcpcb(inp);
 
 	SOCKBUF_LOCK(&so->so_snd);
-	if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
-		SOCKBUF_UNLOCK(&so->so_snd);
-		error = ENOTCONN;
-	} else if (sbready(&so->so_snd, m, count) == 0) {
-		SOCKBUF_UNLOCK(&so->so_snd);
+	error = sbready(&so->so_snd, m, count);
+	SOCKBUF_UNLOCK(&so->so_snd);
+	if (error == 0)
 		error = tcp_output(tp);
-	} else {
-		SOCKBUF_UNLOCK(&so->so_snd);
-		error = EINPROGRESS;
-	}
-
 	INP_WUNLOCK(inp);
 
 	return (error);