From owner-svn-src-all@FreeBSD.ORG  Thu Dec  2 01:01:37 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9712C106566C;
	Thu,  2 Dec 2010 01:01:37 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 857428FC12;
	Thu,  2 Dec 2010 01:01:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB211b3l063261;
	Thu, 2 Dec 2010 01:01:37 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB211bJv063259;
	Thu, 2 Dec 2010 01:01:37 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201012020101.oB211bJv063259@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Thu, 2 Dec 2010 01:01:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216103 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Dec 2010 01:01:37 -0000

Author: lstewart
Date: Thu Dec  2 01:01:37 2010
New Revision: 216103
URL: http://svn.freebsd.org/changeset/base/216103

Log:
  Set ssthresh appropriately on RTO. This change was accidentally not ported from
  the pre modular CC stack.
  
  Sponsored by:	FreeBSD Foundation
  Submitted by:	David Hayes <dahayes at swin edu au>
  MFC after:	9 weeks
  X-MFC with:	r215166

Modified:
  head/sys/netinet/tcp_input.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Thu Dec  2 00:49:02 2010	(r216102)
+++ head/sys/netinet/tcp_input.c	Thu Dec  2 01:01:37 2010	(r216103)
@@ -378,6 +378,8 @@ cc_cong_signal(struct tcpcb *tp, struct 
 		tp->t_dupacks = 0;
 		tp->t_bytes_acked = 0;
 		EXIT_RECOVERY(tp->t_flags);
+		tp->snd_ssthresh = max(2, min(tp->snd_wnd, tp->snd_cwnd) / 2 /
+		    tp->t_maxseg) * tp->t_maxseg;
 		tp->snd_cwnd = tp->t_maxseg;
 		break;
 	case CC_RTO_ERR: