---

yaml --- r: 96603 b: refs/heads/master c: a1c1f28 h: refs/heads/master i: 96601: 06a4d4f 96599: 6e3f10e v: v3
git-mirror · May 13, 2008 · 5a8b7c2 · 5a8b7c2
1 parent 63e0ced
commit 5a8b7c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)