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;