diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-02 16:43:54 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-02 16:43:54 -0500 |
| commit | dc0d633e35643662f27a0b1c531da3cd6b204b9c (patch) | |
| tree | cae724ecca3fb997bf3ad6b70bff4e3c739cd648 /net/bluetooth/af_bluetooth.c | |
| parent | aef6c928a92481f75fbd548eb8c1e840912444b8 (diff) | |
| parent | 4ae1652ef1bf38e07caa5d1d86ffd3b31103b55a (diff) | |
| download | lwn-dc0d633e35643662f27a0b1c531da3cd6b204b9c.tar.gz lwn-dc0d633e35643662f27a0b1c531da3cd6b204b9c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 062124cd89cf..cdcfcabb34ab 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -199,15 +199,14 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock) BT_DBG("parent %p", parent); - local_bh_disable(); list_for_each_safe(p, n, &bt_sk(parent)->accept_q) { sk = (struct sock *) list_entry(p, struct bt_sock, accept_q); - bh_lock_sock(sk); + lock_sock(sk); /* FIXME: Is this check still needed */ if (sk->sk_state == BT_CLOSED) { - bh_unlock_sock(sk); + release_sock(sk); bt_accept_unlink(sk); continue; } @@ -218,14 +217,12 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock) if (newsock) sock_graft(sk, newsock); - bh_unlock_sock(sk); - local_bh_enable(); + release_sock(sk); return sk; } - bh_unlock_sock(sk); + release_sock(sk); } - local_bh_enable(); return NULL; } |