Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / net / sctp / socket.c

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 039fcb618c34985f5b2a337d6a0876bca24b28da..37382317fba4e6204a060c98db939b5349a0e04b 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7518,11 +7518,11 @@ out:
  * here, again, by modeling the current TCP/UDP code.  We don't have
  * a good way to test with it yet.
  */
-unsigned int sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
+__poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
 {
        struct sock *sk = sock->sk;
        struct sctp_sock *sp = sctp_sk(sk);
-       unsigned int mask;
+       __poll_t mask;
 
        poll_wait(file, sk_sleep(sk), wait);