projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tcp: tcp_sendpages() should call tcp_push() once
[linux-flexiantxendom0-3.2.10.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
484cc69
..
851edcd
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;
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);
}
return kernel_sendpage(sock, page, offset, size, flags);
}