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

[linux-beck.git] / net / core / datagram.c

diff --git a/net/core/datagram.c b/net/core/datagram.c
index b5d48ac2a9c1f2e8be7dcb503799f5143b3c8734..b71423db77851eed9bd91f06a6ac0630f967a3e5 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -755,7 +755,9 @@ unsigned int datagram_poll(struct file *file, struct socket *sock,
 
        /* exceptional events? */
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-               mask |= POLLERR;
+               mask |= POLLERR |
+                       (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+
        if (sk->sk_shutdown & RCV_SHUTDOWN)
                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
        if (sk->sk_shutdown == SHUTDOWN_MASK)