wok-current annotate linux/stuff/linux-hotfix-2.6.30.4.u @ rev 4475
Merge
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon Nov 09 21:55:05 2009 +0100 (2009-11-09) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@3911 | 1 --- linux-2.6.30.4/net/socket.c |
| pascal@3911 | 2 +++ linux-2.6.30.4/net/socket.c |
| pascal@3911 | 3 @@ -736,7 +736,7 @@ |
| pascal@3911 | 4 if (more) |
| pascal@3911 | 5 flags |= MSG_MORE; |
| pascal@3911 | 6 |
| pascal@3911 | 7 - return sock->ops->sendpage(sock, page, offset, size, flags); |
| pascal@3911 | 8 + return kernel_sendpage(sock, page, offset, size, flags); |
| pascal@3911 | 9 } |
| pascal@3911 | 10 |
| pascal@3911 | 11 static ssize_t sock_splice_read(struct file *file, loff_t *ppos, |