diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-06-06 13:57:05 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-06 13:57:05 -0400 |
| commit | 2d4524ac18a3965051f6279aff5e9b1d72ac9d7f (patch) | |
| tree | e5dd72d82bddb691bd502bd8fbcec07350a83fae /net | |
| parent | cfg80211: fix interface combinations check (diff) | |
| parent | Bluetooth: Fix checking the wrong flag when accepting a socket (diff) | |
| download | linux-dev-2d4524ac18a3965051f6279aff5e9b1d72ac9d7f.tar.xz linux-dev-2d4524ac18a3965051f6279aff5e9b1d72ac9d7f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
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); |