diff options
| author |   Vinicius Costa Gomes <vinicius.gomes@openbossa.org> | 2012-05-31 22:53:39 -0300 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2012-06-05 06:26:26 +0300 |
| commit | ddcd0f41471a1e0394c8840a119ec3986a78462c (patch) | |
| tree | 734af9ef7847e5cf13de46a9d84b44906230a101 /net | |
| parent | iwlwifi: disable WoWLAN if !CONFIG_PM_SLEEP (diff) | |
| download | linux-dev-ddcd0f41471a1e0394c8840a119ec3986a78462c.tar.xz linux-dev-ddcd0f41471a1e0394c8840a119ec3986a78462c.zip | |
Bluetooth: Fix checking the wrong flag when accepting a socket
Most probably a typo, the check should have been for BT_SK_DEFER_SETUP
instead of BT_DEFER_SETUP (which right now only represents a socket
option).
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 46e7f86acfc9..3e18af4dadc4 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -210,7 +210,7 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock) } if (sk->sk_state == BT_CONNECTED || !newsock || - test_bit(BT_DEFER_SETUP, &bt_sk(parent)->flags)) { + test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags)) { bt_accept_unlink(sk); if (newsock) sock_graft(sk, newsock); |