From owner-p4-projects@FreeBSD.ORG  Thu Jul  7 08:04:18 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 54476106566C; Thu,  7 Jul 2011 08:04:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09087106564A
	for <perforce@freebsd.org>; Thu,  7 Jul 2011 08:04:18 +0000 (UTC)
	(envelope-from cnicutar@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id EC0A98FC0A
	for <perforce@freebsd.org>; Thu,  7 Jul 2011 08:04:17 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6784HAp014872
	for <perforce@freebsd.org>; Thu, 7 Jul 2011 08:04:17 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6784Hvo014869
	for perforce@freebsd.org; Thu, 7 Jul 2011 08:04:17 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Thu, 7 Jul 2011 08:04:17 GMT
Message-Id: <201107070804.p6784Hvo014869@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	cnicutar@freebsd.org using -f
From: Catalin Nicutar <cnicutar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 195839 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2011 08:04:18 -0000

http://p4web.freebsd.org/@@195839?ac=10

Change 195839 by cnicutar@cnicutar_cronos on 2011/07/07 08:04:15

	Change @195682 caused the retransmit timer to wait more than needed
	when the timeout is less then TCP_MAXRXTHISTFT retransmits.

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#6 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#6 (text+ko) ====

@@ -557,8 +557,10 @@
 			rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
 		else
 			/* We're in UTO, back off as much as we can. */
-			rexmt = min(TCPTV_REXMTMAX, uto_left * hz);
+			rexmt = TCPTV_REXMTMAX;
 	}
+	/* We might want to wait less than an entire backoff. */
+	rexmt = min(rexmt, uto_left * hz);
 	TCPT_RANGESET(tp->t_rxtcur, rexmt,
 		      tp->t_rttmin, TCPTV_REXMTMAX);
 	/*