Commit 5001c2dc authored by Christoph Hellwig's avatar Christoph Hellwig

net/rxrpc: convert to ->poll_mask

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f87be894
...@@ -734,15 +734,11 @@ static int rxrpc_getsockopt(struct socket *sock, int level, int optname, ...@@ -734,15 +734,11 @@ static int rxrpc_getsockopt(struct socket *sock, int level, int optname,
/* /*
* permit an RxRPC socket to be polled * permit an RxRPC socket to be polled
*/ */
static __poll_t rxrpc_poll(struct file *file, struct socket *sock, static __poll_t rxrpc_poll_mask(struct socket *sock, __poll_t events)
poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct rxrpc_sock *rx = rxrpc_sk(sk); struct rxrpc_sock *rx = rxrpc_sk(sk);
__poll_t mask; __poll_t mask = 0;
sock_poll_wait(file, sk_sleep(sk), wait);
mask = 0;
/* the socket is readable if there are any messages waiting on the Rx /* the socket is readable if there are any messages waiting on the Rx
* queue */ * queue */
...@@ -949,7 +945,7 @@ static const struct proto_ops rxrpc_rpc_ops = { ...@@ -949,7 +945,7 @@ static const struct proto_ops rxrpc_rpc_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = sock_no_accept, .accept = sock_no_accept,
.getname = sock_no_getname, .getname = sock_no_getname,
.poll = rxrpc_poll, .poll_mask = rxrpc_poll_mask,
.ioctl = sock_no_ioctl, .ioctl = sock_no_ioctl,
.listen = rxrpc_listen, .listen = rxrpc_listen,
.shutdown = rxrpc_shutdown, .shutdown = rxrpc_shutdown,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment