---

yaml --- r: 299546 b: refs/heads/master c: 4d846f0 h: refs/heads/master v: v3
git-mirror · Apr 18, 2012 · a43e19c · a43e19c
1 parent ae34ed5
commit a43e19c
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: 48159f009f5f92ef5962e7c278ac615d74242fa5
+refs/heads/master: 4d846f02392a710f9604892ac3329e628e60a230
diff --git 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;