From a43e19c9c5989aab52407b5cf461160ddca426fd Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Mon, 16 Apr 2012 23:28:07 +0000
Subject: [PATCH] --- yaml --- r: 299546 b: refs/heads/master c:
 4d846f02392a710f9604892ac3329e628e60a230 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 e20b9b093e69..14430708479c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48159f009f5f92ef5962e7c278ac615d74242fa5
+refs/heads/master: 4d846f02392a710f9604892ac3329e628e60a230
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 9944c1d9a218..3ff364065376 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -335,6 +335,7 @@ static void tcp_grow_window(struct sock *sk, const struct sk_buff *skb)
 			incr = __tcp_grow_window(sk, skb);
 
 		if (incr) {
+			incr = max_t(int, incr, 2 * skb->len);
 			tp->rcv_ssthresh = min(tp->rcv_ssthresh + incr,
 					       tp->window_clamp);
 			inet_csk(sk)->icsk_ack.quick |= 1;