---

yaml --- r: 298741 b: refs/heads/master c: 2f53384 h: refs/heads/master i: 298739: 179bdf1 v: v3
git-mirror · Apr 3, 2012 · 7b8b6a0 · 7b8b6a0
1 parent c649e23
commit 7b8b6a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;