From fa64eba94f5e9051b57366264edfbfdadfa75b8b Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Thu, 14 Apr 2011 18:34:34 -0300
Subject: [PATCH] --- yaml --- r: 246936 b: refs/heads/master c:
 62f3a2cfb1891c070631e496eeea852e949ea8bb h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 815313ff7c1e..37f671e64490 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 280f294f7bd0c14d9f802a551c95dc930e31d723
+refs/heads/master: 62f3a2cfb1891c070631e496eeea852e949ea8bb
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index d5db5a38df6a..bc84ed1b3320 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -632,6 +632,8 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
 	if (!parent)
 		return;
 
+	bh_lock_sock(parent);
+
 	/* Check for backlog size */
 	if (sk_acceptq_is_full(parent)) {
 		BT_DBG("backlog full %d", parent->sk_ack_backlog);