diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
| commit | 1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38 (patch) | |
| tree | 548d3518b41341b93c88ee4ff5661e1eb42bd7f4 /net/bluetooth/af_bluetooth.c | |
| parent | perf/core: Optimize perf_init_event() for TYPE_SOFTWARE (diff) | |
| parent | Linux 5.4-rc7 (diff) | |
| download | linux-dev-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.tar.xz linux-dev-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.zip | |
Merge tag 'v5.4-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 94ddf19998c7..5f508c50649d 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -460,7 +460,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock, if (sk->sk_state == BT_LISTEN) return bt_accept_poll(sk); - if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) + if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue)) mask |= EPOLLERR | (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0); @@ -470,7 +470,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock, if (sk->sk_shutdown == SHUTDOWN_MASK) mask |= EPOLLHUP; - if (!skb_queue_empty(&sk->sk_receive_queue)) + if (!skb_queue_empty_lockless(&sk->sk_receive_queue)) mask |= EPOLLIN | EPOLLRDNORM; if (sk->sk_state == BT_CLOSED) |