aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 9c74fc8f0e32..726e1f99aa8d 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2163,15 +2163,14 @@ int sock_no_getsockopt(struct socket *sock, int level, int optname,
2163} 2163}
2164EXPORT_SYMBOL(sock_no_getsockopt); 2164EXPORT_SYMBOL(sock_no_getsockopt);
2165 2165
2166int sock_no_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, 2166int sock_no_sendmsg(struct socket *sock, struct msghdr *m, size_t len)
2167 size_t len)
2168{ 2167{
2169 return -EOPNOTSUPP; 2168 return -EOPNOTSUPP;
2170} 2169}
2171EXPORT_SYMBOL(sock_no_sendmsg); 2170EXPORT_SYMBOL(sock_no_sendmsg);
2172 2171
2173int sock_no_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, 2172int sock_no_recvmsg(struct socket *sock, struct msghdr *m, size_t len,
2174 size_t len, int flags) 2173 int flags)
2175{ 2174{
2176 return -EOPNOTSUPP; 2175 return -EOPNOTSUPP;
2177} 2176}
@@ -2543,14 +2542,14 @@ int compat_sock_common_getsockopt(struct socket *sock, int level, int optname,
2543EXPORT_SYMBOL(compat_sock_common_getsockopt); 2542EXPORT_SYMBOL(compat_sock_common_getsockopt);
2544#endif 2543#endif
2545 2544
2546int sock_common_recvmsg(struct kiocb *iocb, struct socket *sock, 2545int sock_common_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
2547 struct msghdr *msg, size_t size, int flags) 2546 int flags)
2548{ 2547{
2549 struct sock *sk = sock->sk; 2548 struct sock *sk = sock->sk;
2550 int addr_len = 0; 2549 int addr_len = 0;
2551 int err; 2550 int err;
2552 2551
2553 err = sk->sk_prot->recvmsg(iocb, sk, msg, size, flags & MSG_DONTWAIT, 2552 err = sk->sk_prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,
2554 flags & ~MSG_DONTWAIT, &addr_len); 2553 flags & ~MSG_DONTWAIT, &addr_len);
2555 if (err >= 0) 2554 if (err >= 0)
2556 msg->msg_namelen = addr_len; 2555 msg->msg_namelen = addr_len;