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

Commit 9490e40a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net/caif: convert to ->poll_mask 



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

net/caif/caif_socket.c

+4 −8
Original line number Diff line number Diff line
@@ -934,15 +934,11 @@ static int caif_release(struct socket *sock) 
}



/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */

static __poll_t caif_poll(struct file *file,

			      struct socket *sock, poll_table *wait)

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

{

	struct sock *sk = sock->sk;

	__poll_t mask;

	struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);



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

	mask = 0;

	__poll_t mask = 0;



	/* exceptional events? */

	if (sk->sk_err)
@@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = { 
	.socketpair = sock_no_socketpair,

	.accept = sock_no_accept,

	.getname = sock_no_getname,

	.poll = caif_poll,

	.poll_mask = caif_poll_mask,

	.ioctl = sock_no_ioctl,

	.listen = sock_no_listen,

	.shutdown = sock_no_shutdown,
@@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = { 
	.socketpair = sock_no_socketpair,

	.accept = sock_no_accept,

	.getname = sock_no_getname,

	.poll = caif_poll,

	.poll_mask = caif_poll_mask,

	.ioctl = sock_no_ioctl,

	.listen = sock_no_listen,

	.shutdown = sock_no_shutdown,