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

Commit e7a98d47 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net/phonet: convert to ->poll_mask 



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

net/phonet/socket.c

+2 −5
Original line number Diff line number Diff line
@@ -340,15 +340,12 @@ static int pn_socket_getname(struct socket *sock, struct sockaddr *addr, 
	return sizeof(struct sockaddr_pn);

}



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

					poll_table *wait)

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

{

	struct sock *sk = sock->sk;

	struct pep_sock *pn = pep_sk(sk);

	__poll_t mask = 0;



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



	if (sk->sk_state == TCP_CLOSE)

		return EPOLLERR;

	if (!skb_queue_empty(&sk->sk_receive_queue))
@@ -473,7 +470,7 @@ const struct proto_ops phonet_stream_ops = { 
	.socketpair	= sock_no_socketpair,

	.accept		= pn_socket_accept,

	.getname	= pn_socket_getname,

	.poll		= pn_socket_poll,

	.poll_mask	= pn_socket_poll_mask,

	.ioctl		= pn_socket_ioctl,

	.listen		= pn_socket_listen,

	.shutdown	= sock_no_shutdown,