---

yaml --- r: 314478 b: refs/heads/master c: d060991 h: refs/heads/master v: v3
git-mirror · Jun 5, 2012 · 7b2071d · 7b2071d
1 parent 3655a97
commit 7b2071d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0431a43ca5ada5ffd3668116b64168f4a1a64286
+refs/heads/master: d060991f3bf4b6f8e9c5dec0c210fe76d9165000
diff --git a/trunk/net/bluetooth/af_bluetooth.c b/trunk/net/bluetooth/af_bluetooth.c
@@ -199,7 +199,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);