From 3abd22198ffaf125c1ce26f8894d1959faf6577c Mon Sep 17 00:00:00 2001
From: Neal Cardwell <ncardwell@google.com>
Date: Fri, 2 Mar 2012 21:36:51 +0000
Subject: [PATCH] --- yaml --- r: 288224 b: refs/heads/master c:
 c0638c247f559e1a16ee79e54df14bca2cb679ea h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 24daf6eb46b7..16c4edbd9746 100644
--- 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
index ee42d42b2f45..d9b83d198c3d 100644
--- 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;