aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/bluetooth/af_bluetooth.c2
-rw-r--r--net/core/datagram.c2
-rw-r--r--net/iucv/af_iucv.c2
-rw-r--r--net/nfc/llcp/sock.c2
-rw-r--r--net/unix/af_unix.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 409902f892ff..fea778e1dc27 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -423,7 +423,7 @@ unsigned int bt_sock_poll(struct file *file, struct socket *sock,
423 423
424 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) 424 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
425 mask |= POLLERR | 425 mask |= POLLERR |
426 sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; 426 (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
427 427
428 if (sk->sk_shutdown & RCV_SHUTDOWN) 428 if (sk->sk_shutdown & RCV_SHUTDOWN)
429 mask |= POLLRDHUP | POLLIN | POLLRDNORM; 429 mask |= POLLRDHUP | POLLIN | POLLRDNORM;
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 36da5b663514..ebba65d7e0da 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -750,7 +750,7 @@ unsigned int datagram_poll(struct file *file, struct socket *sock,
750 /* exceptional events? */ 750 /* exceptional events? */
751 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) 751 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
752 mask |= POLLERR | 752 mask |= POLLERR |
753 sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; 753 (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
754 754
755 if (sk->sk_shutdown & RCV_SHUTDOWN) 755 if (sk->sk_shutdown & RCV_SHUTDOWN)
756 mask |= POLLRDHUP | POLLIN | POLLRDNORM; 756 mask |= POLLRDHUP | POLLIN | POLLRDNORM;
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index f0550a38f295..7dfb9ed93698 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1462,7 +1462,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
1462 1462
1463 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) 1463 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
1464 mask |= POLLERR | 1464 mask |= POLLERR |
1465 sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; 1465 (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
1466 1466
1467 if (sk->sk_shutdown & RCV_SHUTDOWN) 1467 if (sk->sk_shutdown & RCV_SHUTDOWN)
1468 mask |= POLLRDHUP; 1468 mask |= POLLRDHUP;
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index 2d55e8a45958..6b3254452b36 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -522,7 +522,7 @@ static unsigned int llcp_sock_poll(struct file *file, struct socket *sock,
522 522
523 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) 523 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
524 mask |= POLLERR | 524 mask |= POLLERR |
525 sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; 525 (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
526 526
527 if (!skb_queue_empty(&sk->sk_receive_queue)) 527 if (!skb_queue_empty(&sk->sk_receive_queue))
528 mask |= POLLIN | POLLRDNORM; 528 mask |= POLLIN | POLLRDNORM;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index fb7a63ff71a5..2e4d90044a52 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2197,7 +2197,7 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
2197 /* exceptional events? */ 2197 /* exceptional events? */
2198 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) 2198 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
2199 mask |= POLLERR | 2199 mask |= POLLERR |
2200 sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; 2200 (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
2201 2201
2202 if (sk->sk_shutdown & RCV_SHUTDOWN) 2202 if (sk->sk_shutdown & RCV_SHUTDOWN)
2203 mask |= POLLRDHUP | POLLIN | POLLRDNORM; 2203 mask |= POLLRDHUP | POLLIN | POLLRDNORM;