svn commit: r196561 - stable/7/sys/netinet

[Peter Wemm]

Author: peter
Date: Wed Aug 26 19:45:17 2009
New Revision: 196561
URL: http://svn.freebsd.org/changeset/base/196561

Log:
  MFC r194304: Fix ticks overflow in the handling of t_badtrxtwin.

Modified:
  stable/7/sys/netinet/tcp_input.c

Modified: stable/7/sys/netinet/tcp_input.c
==============================================================================
--- stable/7/sys/netinet/tcp_input.c	Wed Aug 26 14:32:37 2009	(r196560)
+++ stable/7/sys/netinet/tcp_input.c	Wed Aug 26 19:45:17 2009	(r196561)
@@ -1030,7 +1030,7 @@ tcp_do_segment(struct mbuf *m, struct tc
 				 * "bad retransmit" recovery.
 				 */
 				if (tp->t_rxtshift == 1 &&
-				    ticks < tp->t_badrxtwin) {
+				    (int)(ticks - tp->t_badrxtwin) < 0) {
 					++tcpstat.tcps_sndrexmitbad;
 					tp->snd_cwnd = tp->snd_cwnd_prev;
 					tp->snd_ssthresh =
@@ -1961,7 +1961,7 @@ process_ACK:
 		 * original cwnd and ssthresh, and proceed to transmit where
 		 * we left off.
 		 */
-		if (tp->t_rxtshift == 1 && ticks < tp->t_badrxtwin) {
+		if (tp->t_rxtshift == 1 && (int)(ticks - tp->t_badrxtwin) < 0) {
 			++tcpstat.tcps_sndrexmitbad;
 			tp->snd_cwnd = tp->snd_cwnd_prev;
 			tp->snd_ssthresh = tp->snd_ssthresh_prev;