diff options
Diffstat (limited to 'net/vmw_vsock/af_vsock.c')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 1d0e39c9a3e2..2ec86e652a19 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c | |||
| @@ -949,8 +949,8 @@ static unsigned int vsock_poll(struct file *file, struct socket *sock, | |||
| 949 | return mask; | 949 | return mask; |
| 950 | } | 950 | } |
| 951 | 951 | ||
| 952 | static int vsock_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock, | 952 | static int vsock_dgram_sendmsg(struct socket *sock, struct msghdr *msg, |
| 953 | struct msghdr *msg, size_t len) | 953 | size_t len) |
| 954 | { | 954 | { |
| 955 | int err; | 955 | int err; |
| 956 | struct sock *sk; | 956 | struct sock *sk; |
| @@ -1062,11 +1062,10 @@ out: | |||
| 1062 | return err; | 1062 | return err; |
| 1063 | } | 1063 | } |
| 1064 | 1064 | ||
| 1065 | static int vsock_dgram_recvmsg(struct kiocb *kiocb, struct socket *sock, | 1065 | static int vsock_dgram_recvmsg(struct socket *sock, struct msghdr *msg, |
| 1066 | struct msghdr *msg, size_t len, int flags) | 1066 | size_t len, int flags) |
| 1067 | { | 1067 | { |
| 1068 | return transport->dgram_dequeue(kiocb, vsock_sk(sock->sk), msg, len, | 1068 | return transport->dgram_dequeue(vsock_sk(sock->sk), msg, len, flags); |
| 1069 | flags); | ||
| 1070 | } | 1069 | } |
| 1071 | 1070 | ||
| 1072 | static const struct proto_ops vsock_dgram_ops = { | 1071 | static const struct proto_ops vsock_dgram_ops = { |
| @@ -1505,8 +1504,8 @@ static int vsock_stream_getsockopt(struct socket *sock, | |||
| 1505 | return 0; | 1504 | return 0; |
| 1506 | } | 1505 | } |
| 1507 | 1506 | ||
| 1508 | static int vsock_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, | 1507 | static int vsock_stream_sendmsg(struct socket *sock, struct msghdr *msg, |
| 1509 | struct msghdr *msg, size_t len) | 1508 | size_t len) |
| 1510 | { | 1509 | { |
| 1511 | struct sock *sk; | 1510 | struct sock *sk; |
| 1512 | struct vsock_sock *vsk; | 1511 | struct vsock_sock *vsk; |
| @@ -1644,9 +1643,8 @@ out: | |||
| 1644 | 1643 | ||
| 1645 | 1644 | ||
| 1646 | static int | 1645 | static int |
| 1647 | vsock_stream_recvmsg(struct kiocb *kiocb, | 1646 | vsock_stream_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, |
| 1648 | struct socket *sock, | 1647 | int flags) |
| 1649 | struct msghdr *msg, size_t len, int flags) | ||
| 1650 | { | 1648 | { |
| 1651 | struct sock *sk; | 1649 | struct sock *sk; |
| 1652 | struct vsock_sock *vsk; | 1650 | struct vsock_sock *vsk; |
