---

yaml --- r: 110230 b: refs/heads/master c: 53240c2 h: refs/heads/master v: v3
git-mirror · Oct 7, 2008 · ac10c3a · ac10c3a
1 parent 8f67597
commit ac10c3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6c40d68ff6498b7f63ddf97cf0aa818d748dee7
+refs/heads/master: 53240c208776d557dba9d7afedbcdbf512774c16
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -4879,7 +4879,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 					goto no_ack;
 			}
 
-			__tcp_ack_snd_check(sk, 0);
+			if (!copied_early || tp->rcv_nxt != tp->rcv_wup)
+				__tcp_ack_snd_check(sk, 0);
 no_ack:
 #ifdef CONFIG_NET_DMA
 			if (copied_early)