lkml.org 
[lkml]   [2018]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/28] net/caif: convert to ->poll_mask
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    net/caif/caif_socket.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
    index a6fb1b3bcad9..c7991867d622 100644
    --- a/net/caif/caif_socket.c
    +++ b/net/caif/caif_socket.c
    @@ -934,15 +934,11 @@ static int caif_release(struct socket *sock)
    }

    /* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */
    -static __poll_t caif_poll(struct file *file,
    - struct socket *sock, poll_table *wait)
    +static __poll_t caif_poll_mask(struct socket *sock, __poll_t events)
    {
    struct sock *sk = sock->sk;
    - __poll_t mask;
    struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
    -
    - sock_poll_wait(file, sk_sleep(sk), wait);
    - mask = 0;
    + __poll_t mask = 0;

    /* exceptional events? */
    if (sk->sk_err)
    @@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = {
    .socketpair = sock_no_socketpair,
    .accept = sock_no_accept,
    .getname = sock_no_getname,
    - .poll = caif_poll,
    + .poll_mask = caif_poll_mask,
    .ioctl = sock_no_ioctl,
    .listen = sock_no_listen,
    .shutdown = sock_no_shutdown,
    @@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = {
    .socketpair = sock_no_socketpair,
    .accept = sock_no_accept,
    .getname = sock_no_getname,
    - .poll = caif_poll,
    + .poll_mask = caif_poll_mask,
    .ioctl = sock_no_ioctl,
    .listen = sock_no_listen,
    .shutdown = sock_no_shutdown,
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-03-21 08:45    [W:4.076 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site