PERFORCE change 195839 for review

[Catalin Nicutar]

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

Change 195839 by cnicutar at 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);
 	/*