diff options
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/server.c | 4 | ||||
| -rw-r--r-- | net/tipc/socket.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index c0d331f13eee..df0c563c90cd 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c @@ -259,8 +259,8 @@ static int tipc_receive_from_sock(struct tipc_conn *con) iov.iov_base = buf; iov.iov_len = s->max_rcvbuf_size; msg.msg_name = &addr; - ret = kernel_recvmsg(con->sock, &msg, &iov, 1, iov.iov_len, - MSG_DONTWAIT); + iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &iov, 1, iov.iov_len); + ret = sock_recvmsg(con->sock, &msg, MSG_DONTWAIT); if (ret <= 0) { kmem_cache_free(s->rcvbuf_cache, buf); goto out_close; diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 473a096b6fba..163f3a547501 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -711,12 +711,12 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr, * imply that the operation will succeed, merely that it should be performed * and will not block. */ -static unsigned int tipc_poll(struct file *file, struct socket *sock, +static __poll_t tipc_poll(struct file *file, struct socket *sock, poll_table *wait) { struct sock *sk = sock->sk; struct tipc_sock *tsk = tipc_sk(sk); - u32 revents = 0; + __poll_t revents = 0; sock_poll_wait(file, sk_sleep(sk), wait); |