From 5a8b7c283685cd1ec292cb041c4f7f65088cd982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Tue, 13 May 2008 02:53:26 -0700
Subject: [PATCH] --- yaml --- r: 96603 b: refs/heads/master c:
 a1c1f281b84a751fdb5ff919da3b09df7297619f h: refs/heads/master i:   96601:
 06a4d4ff2634c6bc3ec2d8595934b3eda7f40647   96599:
 6e3f10ec47d42ff15176ce17f150fdf838b224e2 v: v3

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

diff --git a/[refs] b/[refs]
index a94c90abbfe3..14094c44a63b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47ac3199acb0676b58491b29418283f37a116952
+refs/heads/master: a1c1f281b84a751fdb5ff919da3b09df7297619f
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 26c936930e92..d6edb98fd526 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -2482,7 +2482,7 @@ static void tcp_try_to_open(struct sock *sk, int flag)
 
 	tcp_verify_left_out(tp);
 
-	if (tp->retrans_out == 0)
+	if (!tp->frto_counter && tp->retrans_out == 0)
 		tp->retrans_stamp = 0;
 
 	if (flag & FLAG_ECE)