---

yaml --- r: 287693 b: refs/heads/master c: 0af2a0d h: refs/heads/master i: 287691: d88969d v: v3
git-mirror · Feb 14, 2012 · 7b7ecc1 · 7b7ecc1
1 parent 54ad530
commit 7b7ecc1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbcf88b8833ce2c404b9a0e7caab82b20312cbbc
+refs/heads/master: 0af2a0d0576205dda778d25c6c344fc6508fc81d
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -1403,6 +1403,10 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
 
 	BUG_ON(!pcount);
 
+	/* Adjust hint for FACK. Non-FACK is handled in tcp_sacktag_one(). */
+	if (tcp_is_fack(tp) && (skb == tp->lost_skb_hint))
+		tp->lost_cnt_hint += pcount;
+
 	TCP_SKB_CB(prev)->end_seq += shifted;
 	TCP_SKB_CB(skb)->seq += shifted;