patch-pre2.0.14-final2.0 linux/net/ipv4/tcp_output.c

• Lines: 16
• Date: Sat Jun 8 16:22:56 1996
• Orig file: pre2.0.14/linux/net/ipv4/tcp_output.c
• Orig date: Thu Jun 6 17:42:39 1996

diff -u --recursive --new-file pre2.0.14/linux/net/ipv4/tcp_output.c linux/net/ipv4/tcp_output.c
@@ -882,11 +882,12 @@
 
 	/* Calculate new timeout */
 	now = jiffies;
-	if (timeout > max_timeout || sk->bytes_rcv >= sk->max_unacked) {
+	if (timeout > max_timeout)
+		timeout = max_timeout;
+	timeout += now;
+	if (sk->bytes_rcv >= sk->max_unacked) {
 		timeout = now;
 		mark_bh(TIMER_BH);
-	} else {
-		timeout += now;
 	}
 
 	/* Use new timeout only if there wasn't a older one earlier  */