From ac10c3acab1a2f734dbb6911fa2e1a2794555289 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@engin.umich.edu>
Date: Tue, 7 Oct 2008 15:31:19 -0700
Subject: [PATCH] --- yaml --- r: 110230 b: refs/heads/master c:
 53240c208776d557dba9d7afedbcdbf512774c16 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 79c56d91f475..aea34c1bd6cb 100644
--- 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
index 67ccce2a96bd..7abc6b80d47d 100644
--- 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)