commit 2d4524ac18a3965051f6279aff5e9b1d72ac9d7f
author John W. Linville <linville@tuxdriver.com> Wed Jun 06 13:57:05 2012 -0400
committer John W. Linville <linville@tuxdriver.com> Wed Jun 06 13:57:05 2012 -0400
tree e5dd72d82bddb691bd502bd8fbcec07350a83fae
parent 463454b5dbd8dbab6e2fc6c557329e5b811b9c32
parent ddcd0f41471a1e0394c8840a119ec3986a78462c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

net/bluetooth/af_bluetooth.c

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 46e7f86..3e18af4 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -210,7 +210,7 @@
 		}
 
 		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);