---

yaml --- r: 288224 b: refs/heads/master c: c0638c2 h: refs/heads/master v: v3
git-mirror · Mar 3, 2012 · 3abd221 · 3abd221
1 parent e24970b
commit 3abd221
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c5028e9da1255dd2b99762d8627b88b29f68cce
+refs/heads/master: c0638c247f559e1a16ee79e54df14bca2cb679ea
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -2569,6 +2569,7 @@ static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
 
 		if (cnt > packets) {
 			if ((tcp_is_sack(tp) && !tcp_is_fack(tp)) ||
+			    (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED) ||
 			    (oldcnt >= packets))
 				break;