From owner-svn-src-head@FreeBSD.ORG  Sun Nov 30 12:11:02 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 54E392FB;
 Sun, 30 Nov 2014 12:11:02 +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 41BE8C1B;
 Sun, 30 Nov 2014 12:11:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUCB2Ve034975;
 Sun, 30 Nov 2014 12:11:02 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUCB2iv034974;
 Sun, 30 Nov 2014 12:11:02 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201411301211.sAUCB2iv034974@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: Sun, 30 Nov 2014 12:11:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275320 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Nov 2014 12:11:02 -0000

Author: glebius
Date: Sun Nov 30 12:11:01 2014
New Revision: 275320
URL: https://svnweb.freebsd.org/changeset/base/275320

Log:
  Missed in r274421: use sbavail() instead of bare access to sb_cc.

Modified:
  head/sys/netinet/tcp_usrreq.c

Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c	Sun Nov 30 11:59:20 2014	(r275319)
+++ head/sys/netinet/tcp_usrreq.c	Sun Nov 30 12:11:01 2014	(r275320)
@@ -925,7 +925,7 @@ tcp_usr_send(struct socket *so, int flag
 			tp->snd_wnd = TTCP_CLIENT_SND_WND;
 			tcp_mss(tp, -1);
 		}
-		tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
+		tp->snd_up = tp->snd_una + sbavail(&so->so_snd);
 		tp->t_flags |= TF_FORCEDATA;
 		error = tcp_output(tp);
 		tp->t_flags &= ~TF_FORCEDATA;