---

yaml --- r: 327464 b: refs/heads/master c: 78eb2f9 h: refs/heads/master v: v3
git-mirror · Aug 6, 2012 · 4c610ec · 4c610ec
1 parent 6bbfe97
commit 4c610ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9fc1d54f6f8123909cdee4fa98ab1ebf6c8651c
+refs/heads/master: 78eb2f985c17eab34a0ef919b3263d6b08064e98
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
@@ -5404,6 +5404,11 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
 		BT_DBG("chan %p scid 0x%4.4x state %s", chan, chan->scid,
 		       state_to_string(chan->state));
 
+		if (chan->chan_type == L2CAP_CHAN_CONN_FIX_A2MP) {
+			l2cap_chan_unlock(chan);
+			continue;
+		}
+
 		if (chan->scid == L2CAP_CID_LE_DATA) {
 			if (!status && encrypt) {
 				chan->sec_level = hcon->sec_level;