tcp: tcp_sendpages() should call tcp_push() once

[mv-sheeva.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 484cc6953fc61ebcb049604e5dbdb57a4ffcd385..851edcd6b0982d5a820da29e2145be75bddcff9c 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -811,9 +811,9 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
 
        sock = file->private_data;
 
-       flags = !(file->f_flags & O_NONBLOCK) ? 0 : MSG_DONTWAIT;
-       if (more)
-               flags |= MSG_MORE;
+       flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;
+       /* more is a combination of MSG_MORE and MSG_SENDPAGE_NOTLAST */
+       flags |= more;
 
        return kernel_sendpage(sock, page, offset, size, flags);
 }