---

yaml --- r: 66860 b: refs/heads/master c: 3de9647 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 86437e9 · 86437e9
1 parent 5d07cf1
commit 86437e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e835331e3111e5a92eb3a852405ea71ca8fff97
+refs/heads/master: 3de96471bd7fb76406e975ef6387abe3a0698149
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -3027,6 +3027,9 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
 	/* See if we can take anything off of the retransmit queue. */
 	flag |= tcp_clean_rtx_queue(sk, &seq_rtt);
 
+	/* Guarantee sacktag reordering detection against wrap-arounds */
+	if (before(tp->frto_highmark, tp->snd_una))
+		tp->frto_highmark = 0;
 	if (tp->frto_counter)
 		frto_cwnd = tcp_process_frto(sk, flag);