Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[sfrench/cifs-2.6.git] / net / sctp / socket.c

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index ce620e878538be99e1f79784582d0da48ba292ea..d20f7addee19ecb794fa85f9ed73e8b40784a095 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7717,14 +7717,12 @@ out:
  * here, again, by modeling the current TCP/UDP code.  We don't have
  * a good way to test with it yet.
  */
-__poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
+__poll_t sctp_poll_mask(struct socket *sock, __poll_t events)
 {
        struct sock *sk = sock->sk;
        struct sctp_sock *sp = sctp_sk(sk);
        __poll_t mask;
 
-       poll_wait(file, sk_sleep(sk), wait);
-
        sock_rps_record_flow(sk);
 
        /* A TCP-style listening socket becomes readable when the accept queue