git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ali5451-cleanup' into for-linus
[pandora-kernel.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
791d71a
..
6d47165
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-736,7
+736,7
@@
static ssize_t sock_sendpage(struct file *file, struct page *page,
if (more)
flags |= MSG_MORE;
- return
sock->ops->
sendpage(sock, page, offset, size, flags);
+ return
kernel_
sendpage(sock, page, offset, size, flags);
}
static ssize_t sock_splice_read(struct file *file, loff_t *ppos,