diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-31 16:39:42 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-26 09:16:44 +0200 |
| commit | e7a98d47eebde147e67dc1139d5d8a741c735a6a (patch) | |
| tree | a625a1eef393384033c51f3e81d3bef7b4b60474 | |
| parent | 4bac2bcd839605baf22e4c8b29e4e52156883e45 (diff) | |
| download | linux-e7a98d47eebde147e67dc1139d5d8a741c735a6a.tar.gz linux-e7a98d47eebde147e67dc1139d5d8a741c735a6a.tar.bz2 linux-e7a98d47eebde147e67dc1139d5d8a741c735a6a.zip | |
net/phonet: convert to ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | net/phonet/socket.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/phonet/socket.c b/net/phonet/socket.c index 9ecf02def928..ea2bfc3aafb9 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c @@ -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, |