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

…t/bluetooth/bluetooth
git-mirror · Jun 6, 2012 · 2d4524a · 2d4524a
2 parents 463454b + ddcd0f4
commit 2d4524a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);