diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-04-14 00:39:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-14 00:39:15 -0400 |
| commit | 6c61403daea578dcfe84f187c204db1a3fa3d6ae (patch) | |
| tree | 76418aa08d196b20920d6ec94dc2b586c1ff2c3f /include/linux | |
| parent | net: remove netdevice gso_min_segs (diff) | |
| parent | [net] drop 'size' argument of sock_recvmsg() (diff) | |
| download | linux-dev-6c61403daea578dcfe84f187c204db1a3fa3d6ae.tar.xz linux-dev-6c61403daea578dcfe84f187c204db1a3fa3d6ae.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/net.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 49175e4ced11..72c1e0622ce2 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -218,8 +218,7 @@ int sock_create_lite(int family, int type, int proto, struct socket **res); struct socket *sock_alloc(void); void sock_release(struct socket *sock); int sock_sendmsg(struct socket *sock, struct msghdr *msg); -int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, - int flags); +int sock_recvmsg(struct socket *sock, struct msghdr *msg, int flags); struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname); struct socket *sockfd_lookup(int fd, int *err); struct socket *sock_from_file(struct file *file, int *err); |