From 7b8b6a0b889476bbed23050d48f98e2a16dce3b4 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 3 Apr 2012 09:37:01 +0000
Subject: [PATCH] --- yaml --- r: 298741 b: refs/heads/master c:
 2f53384424251c06038ae612e56231b96ab610ee h: refs/heads/master i:   298739:
 179bdf1fcf2995b51d77b2ce845115d96638eb97 v: v3

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

diff --git a/[refs] b/[refs]
index 0e437e74c66b..5e9040e3bffa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e675f0cc9a872fd152edc0c77acfed19bf28b81e
+refs/heads/master: 2f53384424251c06038ae612e56231b96ab610ee
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index cfd7edda0a8e..2ff6f45a76f4 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -860,7 +860,7 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffse
 	}
 
 out:
-	if (copied)
+	if (copied && !(flags & MSG_MORE))
 		tcp_push(sk, flags, mss_now, tp->nonagle);
 	return copied;