---

yaml --- r: 211123 b: refs/heads/master c: b3de755 h: refs/heads/master i: 211121: d6e85a7 211119: 7bf874f v: v3
git-mirror · Sep 27, 2010 · 6148aa8 · 6148aa8
1 parent 7e20174
commit 6148aa8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fd6c88ef875a14740801ebfc6b6e4e064a1cdd4
+refs/heads/master: b3de7559afbb7a8a35b4be975a6adf6c5e3cdca0
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -2545,7 +2545,8 @@ static void tcp_mark_head_lost(struct sock *sk, int packets)
 			cnt += tcp_skb_pcount(skb);
 
 		if (cnt > packets) {
-			if (tcp_is_sack(tp) || (oldcnt >= packets))
+			if ((tcp_is_sack(tp) && !tcp_is_fack(tp)) ||
+			    (oldcnt >= packets))
 				break;
 
 			mss = skb_shinfo(skb)->gso_size;