From 7b7ecc15ec6ee3d48bd494f42fbfb1c62d13ddc4 Mon Sep 17 00:00:00 2001
From: Neal Cardwell <ncardwell@google.com>
Date: Mon, 13 Feb 2012 20:22:08 +0000
Subject: [PATCH] --- yaml --- r: 287693 b: refs/heads/master c:
 0af2a0d0576205dda778d25c6c344fc6508fc81d h: refs/heads/master i:   287691:
 d88969dba7f55906a163325009c97bfd86d92d31 v: v3

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

diff --git a/[refs] b/[refs]
index 16d4bda56af8..8b6bd5a737d3 100644
--- 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
index 8116d06e042c..53c8ce4046b2 100644
--- 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;