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

2d4524ac · John W. Linville · 463454b5 · ddcd0f41 · 2d4524ac
Commit 2d4524ac authored Jun 06, 2012 by John W. Linville
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

net/bluetooth/af_bluetooth.c net/bluetooth/af_bluetooth.c +1 -1

No files found.
--- 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);