diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-06 11:13:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-06 18:48:45 -0700 |
| commit | db40980fcdb560d7992b0511df16cdd3f7e381f3 (patch) | |
| tree | 337b5c41bd55915a4b894ea6fe09a865e7dcb0e4 /net/bluetooth | |
| parent | d61702f1273b71c2809365a7806d7fe84fd77f15 (diff) | |
| download | op-kernel-dev-db40980fcdb560d7992b0511df16cdd3f7e381f3.zip op-kernel-dev-db40980fcdb560d7992b0511df16cdd3f7e381f3.tar.gz | |
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 421c45b..ed0f22f 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 mask |= POLLERR; if (sk->sk_shutdown & RCV_SHUTDOWN) - mask |= POLLRDHUP; + mask |= POLLRDHUP | POLLIN | POLLRDNORM; if (sk->sk_shutdown == SHUTDOWN_MASK) mask |= POLLHUP; - if (!skb_queue_empty(&sk->sk_receive_queue) || - (sk->sk_shutdown & RCV_SHUTDOWN)) + if (!skb_queue_empty(&sk->sk_receive_queue)) mask |= POLLIN | POLLRDNORM; if (sk->sk_state == BT_CLOSED) |
