From 5188c45b011bbc8dba47e0ae14e52eec5f6e9347 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sun, 3 Feb 2013 09:13:05 +0000
Subject: [PATCH] --- yaml --- r: 349654 b: refs/heads/master c:
 2e5f421211ff76c17130b4597bc06df4eeead24f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7f4fde4e5fc1..77227392d16e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 973ec449bb4f2b8c514bacbcb4d9506fc31c8ce3
+refs/heads/master: 2e5f421211ff76c17130b4597bc06df4eeead24f
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 8aca4ee95ff9..680c4224ed96 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -3484,7 +3484,8 @@ static bool tcp_process_frto(struct sock *sk, int flag)
 	    ((tp->frto_counter >= 2) && (flag & FLAG_RETRANS_DATA_ACKED)))
 		tp->undo_marker = 0;
 
-	if (!before(tp->snd_una, tp->frto_highmark)) {
+	if (!before(tp->snd_una, tp->frto_highmark) ||
+	    !tcp_packets_in_flight(tp)) {
 		tcp_enter_frto_loss(sk, (tp->frto_counter == 1 ? 2 : 3), flag);
 		return true;
 	}