From 2729ab99f5ccf708e760fe91f92fb00482d0516f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Mon, 31 Dec 2007 04:43:32 -0800
Subject: [PATCH] --- yaml --- r: 78651 b: refs/heads/master c:
 3ccd3130b3f681a4aef6392327256786b3b6aa04 h: refs/heads/master i:   78649:
 0a00aead2f927986344ceb7daa2cfa642641f78e   78647:
 c04517e11ccca9529802f1b945951533657a9622 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b2ac08b8a237..e05b2edc54ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61f1ab41b8ede8e2a26c349a4e3372100545c5ec
+refs/heads/master: 3ccd3130b3f681a4aef6392327256786b3b6aa04
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 722c9cbb91e3..41f4b862319d 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -2504,11 +2504,8 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
 				    (tcp_fackets_out(tp) > tp->reordering));
 	int fast_rexmit = 0;
 
-	/* Some technical things:
-	 * 1. Reno does not count dupacks (sacked_out) automatically. */
-	if (!tp->packets_out)
+	if (WARN_ON(!tp->packets_out && tp->sacked_out))
 		tp->sacked_out = 0;
-
 	if (WARN_ON(!tp->sacked_out && tp->fackets_out))
 		tp->fackets_out = 0;