From 7b2071dfe6c3f4d19b691c2d012fb1d822c46a5d Mon Sep 17 00:00:00 2001
From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date: Thu, 31 May 2012 22:53:39 -0300
Subject: [PATCH] --- yaml --- r: 314478 b: refs/heads/master c:
 d060991f3bf4b6f8e9c5dec0c210fe76d9165000 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/net/bluetooth/af_bluetooth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c90262b12428..b9ad6ab3f62b 100644
--- 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
index 251747269d37..f7db5792ec64 100644
--- 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);