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 | |
| parent | 463454b5dbd8dbab6e2fc6c557329e5b811b9c32 (diff) | |
| parent | ddcd0f41471a1e0394c8840a119ec3986a78462c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
| -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) | |||
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | if (sk->sk_state == BT_CONNECTED || !newsock || | 212 | if (sk->sk_state == BT_CONNECTED || !newsock || |
| 213 | test_bit(BT_DEFER_SETUP, &bt_sk(parent)->flags)) { | 213 | test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags)) { |
| 214 | bt_accept_unlink(sk); | 214 | bt_accept_unlink(sk); |
| 215 | if (newsock) | 215 | if (newsock) |
| 216 | sock_graft(sk, newsock); | 216 | sock_graft(sk, newsock); |