lkml.org 
[lkml]   [2018]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/32] net/phonet: convert to ->poll_mask
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    net/phonet/socket.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/net/phonet/socket.c b/net/phonet/socket.c
    index 7563b0ac8386..c18c906c025f 100644
    --- a/net/phonet/socket.c
    +++ b/net/phonet/socket.c
    @@ -341,15 +341,12 @@ static int pn_socket_getname(struct socket *sock, struct sockaddr *addr,
    return 0;
    }

    -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 POLLERR;
    if (!skb_queue_empty(&sk->sk_receive_queue))
    @@ -474,7 +471,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,
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-01-14 23:21    [W:4.200 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site