patch-pre2.0.6 linux/net/ipv4/tcp_input.c

Next file: linux/net/ipv4/tcp_output.c
Previous file: linux/net/decnet/README
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.5/linux/net/ipv4/tcp_input.c linux/net/ipv4/tcp_input.c
@@ -61,15 +61,7 @@
 		if (m <= 0)
 			m = 1;
 
-		/* Yikes. This used to test if m was larger than rtt/8.
-		 * Maybe on a long delay high speed link this would be
-	         * good initial guess, but over a slow link where the
-	         * delay is dominated by transmission time this will
-	         * be very bad, since ato will almost always be something
-		 * more like rtt/2. Better to discard data points that
-		 * are larger than the rtt estimate.
-	         */
-		if (m > sk->rtt)
+		if (m > (sk->rtt >> 3))
 		{
 			sk->ato = sk->rtt >> 3;
 			/*
@@ -741,7 +733,7 @@
 	 * (2) it has the same window as the last ACK,
 	 * (3) we have outstanding data that has not been ACKed
 	 * (4) The packet was not carrying any data.
-	 * (5) [From Floyds paper on fast retransmit wars]
+	 * (5) [From Floyd's paper on fast retransmit wars]
 	 *     The packet acked data after high_seq;
 	 * I've tried to order these in occurrence of most likely to fail
 	 * to least likely to fail.

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this