From 9bcd1db78e66ffcf4e84c7df7ccc52e1241768c3 Mon Sep 17 00:00:00 2001 From: Jacob Keller Date: Tue, 2 Apr 2013 13:55:40 -0700 Subject: [PATCH] --- yaml --- r: 368823 b: refs/heads/master c: 8facd5fb73c6e960555e5913743dfbb6c3d984a5 h: refs/heads/master i: 368821: bffc89d02acee14c2c86118c2cbaa662f9ac2be1 368819: 01f8643ff96b350d7fc1fad560300e6995d24fd9 368815: 977092e16080fa5dd366ec715dd8d76995cd10a6 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/af_bluetooth.c | 2 +- trunk/net/core/datagram.c | 2 +- trunk/net/iucv/af_iucv.c | 2 +- trunk/net/nfc/llcp/sock.c | 2 +- trunk/net/unix/af_unix.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4bbff7452630..2ab0177360c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be0e2f1f7d2fb6c49ea29a4f8274b36537c34dba +refs/heads/master: 8facd5fb73c6e960555e5913743dfbb6c3d984a5 diff --git a/trunk/net/bluetooth/af_bluetooth.c b/trunk/net/bluetooth/af_bluetooth.c index 409902f892ff..fea778e1dc27 100644 --- a/trunk/net/bluetooth/af_bluetooth.c +++ b/trunk/net/bluetooth/af_bluetooth.c @@ -423,7 +423,7 @@ unsigned int bt_sock_poll(struct file *file, struct socket *sock, if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) mask |= POLLERR | - sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; + (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0); if (sk->sk_shutdown & RCV_SHUTDOWN) mask |= POLLRDHUP | POLLIN | POLLRDNORM; diff --git a/trunk/net/core/datagram.c b/trunk/net/core/datagram.c index 36da5b663514..ebba65d7e0da 100644 --- a/trunk/net/core/datagram.c +++ b/trunk/net/core/datagram.c @@ -750,7 +750,7 @@ 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 | - sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; + (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0); if (sk->sk_shutdown & RCV_SHUTDOWN) mask |= POLLRDHUP | POLLIN | POLLRDNORM; diff --git a/trunk/net/iucv/af_iucv.c b/trunk/net/iucv/af_iucv.c index f0550a38f295..7dfb9ed93698 100644 --- a/trunk/net/iucv/af_iucv.c +++ b/trunk/net/iucv/af_iucv.c @@ -1462,7 +1462,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock, if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) mask |= POLLERR | - sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; + (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0); if (sk->sk_shutdown & RCV_SHUTDOWN) mask |= POLLRDHUP; diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c index 2d55e8a45958..6b3254452b36 100644 --- a/trunk/net/nfc/llcp/sock.c +++ b/trunk/net/nfc/llcp/sock.c @@ -522,7 +522,7 @@ static unsigned int llcp_sock_poll(struct file *file, struct socket *sock, if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) mask |= POLLERR | - sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; + (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0); if (!skb_queue_empty(&sk->sk_receive_queue)) mask |= POLLIN | POLLRDNORM; diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c index fb7a63ff71a5..2e4d90044a52 100644 --- a/trunk/net/unix/af_unix.c +++ b/trunk/net/unix/af_unix.c @@ -2197,7 +2197,7 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock, /* exceptional events? */ if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) mask |= POLLERR | - sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; + (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0); if (sk->sk_shutdown & RCV_SHUTDOWN) mask |= POLLRDHUP | POLLIN | POLLRDNORM;