summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-14 00:39:15 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-14 00:39:15 -0400
commit6c61403daea578dcfe84f187c204db1a3fa3d6ae (patch)
tree76418aa08d196b20920d6ec94dc2b586c1ff2c3f /include
parent743b03a83297690f0bd38c452a3bbb47d2be300a (diff)
parent2da62906b1e298695e1bb725927041cd59942c98 (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Diffstat (limited to 'include')
-rw-r--r--include/linux/net.h3
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);