lkml.org 
[lkml]   [2018]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 28/36] net/nfc: convert to ->poll_mask
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    net/nfc/llcp_sock.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
    index 985909f105eb..1ee9f35084b1 100644
    --- a/net/nfc/llcp_sock.c
    +++ b/net/nfc/llcp_sock.c
    @@ -549,16 +549,13 @@ static inline __poll_t llcp_accept_poll(struct sock *parent)
    return 0;
    }

    -static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
    - poll_table *wait)
    +static __poll_t llcp_sock_poll_mask(struct socket *sock, __poll_t events)
    {
    struct sock *sk = sock->sk;
    __poll_t mask = 0;

    pr_debug("%p\n", sk);

    - sock_poll_wait(file, sk_sleep(sk), wait);
    -
    if (sk->sk_state == LLCP_LISTEN)
    return llcp_accept_poll(sk);

    @@ -900,7 +897,7 @@ static const struct proto_ops llcp_sock_ops = {
    .socketpair = sock_no_socketpair,
    .accept = llcp_sock_accept,
    .getname = llcp_sock_getname,
    - .poll = llcp_sock_poll,
    + .poll_mask = llcp_sock_poll_mask,
    .ioctl = sock_no_ioctl,
    .listen = llcp_sock_listen,
    .shutdown = sock_no_shutdown,
    @@ -920,7 +917,7 @@ static const struct proto_ops llcp_rawsock_ops = {
    .socketpair = sock_no_socketpair,
    .accept = sock_no_accept,
    .getname = llcp_sock_getname,
    - .poll = llcp_sock_poll,
    + .poll_mask = llcp_sock_poll_mask,
    .ioctl = sock_no_ioctl,
    .listen = sock_no_listen,
    .shutdown = sock_no_shutdown,
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-01-22 21:19    [W:2.484 / U:1.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site