Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net/rxrpc: convert to ->poll_mask 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f87be894

net/rxrpc/af_rxrpc.c

+3 −7
Original line number Diff line number Diff line
@@ -734,15 +734,11 @@ static int rxrpc_getsockopt(struct socket *sock, int level, int optname, 
/*

 * permit an RxRPC socket to be polled

 */

static __poll_t rxrpc_poll(struct file *file, struct socket *sock,

			       poll_table *wait)

static __poll_t rxrpc_poll_mask(struct socket *sock, __poll_t events)

{

	struct sock *sk = sock->sk;

	struct rxrpc_sock *rx = rxrpc_sk(sk);

	__poll_t mask;



	sock_poll_wait(file, sk_sleep(sk), wait);

	mask = 0;

	__poll_t mask = 0;



	/* the socket is readable if there are any messages waiting on the Rx

	 * queue */
@@ -949,7 +945,7 @@ static const struct proto_ops rxrpc_rpc_ops = { 
	.socketpair	= sock_no_socketpair,

	.accept		= sock_no_accept,

	.getname	= sock_no_getname,

	.poll		= rxrpc_poll,

	.poll_mask	= rxrpc_poll_mask,

	.ioctl		= sock_no_ioctl,

	.listen		= rxrpc_listen,

	.shutdown	= rxrpc_shutdown,