diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-06 07:13:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-06 21:48:45 -0400 |
| commit | db40980fcdb560d7992b0511df16cdd3f7e381f3 (patch) | |
| tree | 337b5c41bd55915a4b894ea6fe09a865e7dcb0e4 /net/bluetooth | |
| parent | d61702f1273b71c2809365a7806d7fe84fd77f15 (diff) | |
net: poll() optimizations
No need to test twice sk->sk_shutdown & RCV_SHUTDOWN
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 421c45bd1b95..ed0f22f57668 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
| @@ -297,13 +297,12 @@ unsigned int bt_sock_poll(struct file * file, struct socket *sock, poll_table *w | |||
| 297 | mask |= POLLERR; | 297 | mask |= POLLERR; |
| 298 | 298 | ||
| 299 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 299 | if (sk->sk_shutdown & RCV_SHUTDOWN) |
| 300 | mask |= POLLRDHUP; | 300 | mask |= POLLRDHUP | POLLIN | POLLRDNORM; |
| 301 | 301 | ||
| 302 | if (sk->sk_shutdown == SHUTDOWN_MASK) | 302 | if (sk->sk_shutdown == SHUTDOWN_MASK) |
| 303 | mask |= POLLHUP; | 303 | mask |= POLLHUP; |
| 304 | 304 | ||
| 305 | if (!skb_queue_empty(&sk->sk_receive_queue) || | 305 | if (!skb_queue_empty(&sk->sk_receive_queue)) |
| 306 | (sk->sk_shutdown & RCV_SHUTDOWN)) | ||
| 307 | mask |= POLLIN | POLLRDNORM; | 306 | mask |= POLLIN | POLLRDNORM; |
| 308 | 307 | ||
| 309 | if (sk->sk_state == BT_CLOSED) | 308 | if (sk->sk_state == BT_CLOSED) |