p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/nfc: convert to ->poll_mask 

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2017-12-31 16:39:15 +01:00
parent 9490e40a06
commit 4bac2bcd83
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/nfc/llcp_sock.c
View File

@ -548,16 +548,13 @@ static inline __poll_t llcp_accept_poll(struct sock *parent)
return 0; return 0;
} }
static __poll_t llcp_sock_poll(struct file *file, struct socket *sock, static __poll_t llcp_sock_poll_mask(struct socket *sock, __poll_t events)
poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
__poll_t mask = 0; __poll_t mask = 0;
pr_debug("%p\n", sk); pr_debug("%p\n", sk);
sock_poll_wait(file, sk_sleep(sk), wait);
if (sk->sk_state == LLCP_LISTEN) if (sk->sk_state == LLCP_LISTEN)
return llcp_accept_poll(sk); return llcp_accept_poll(sk);
@ -899,7 +896,7 @@ static const struct proto_ops llcp_sock_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = llcp_sock_accept, .accept = llcp_sock_accept,
.getname = llcp_sock_getname, .getname = llcp_sock_getname,
.poll = llcp_sock_poll, .poll_mask = llcp_sock_poll_mask,
.ioctl = sock_no_ioctl, .ioctl = sock_no_ioctl,
.listen = llcp_sock_listen, .listen = llcp_sock_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,
@ -919,7 +916,7 @@ static const struct proto_ops llcp_rawsock_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = sock_no_accept, .accept = sock_no_accept,
.getname = llcp_sock_getname, .getname = llcp_sock_getname,
.poll = llcp_sock_poll, .poll_mask = llcp_sock_poll_mask,
.ioctl = sock_no_ioctl, .ioctl = sock_no_ioctl,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,