The following commit has been merged in the batman-adv/next branch: commit 78eb2f985c17eab34a0ef919b3263d6b08064e98 Author: Andrei Emeltchenko andrei.emeltchenko@intel.com Date: Thu Jul 19 17:03:47 2012 +0300
Bluetooth: Fix processing A2MP chan in security_cfm
Do not process A2MP channel in l2cap_security_cfm
Signed-off-by: Andrei Emeltchenko andrei.emeltchenko@intel.com Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index a8964db..64d88a6 100644 --- a/net/bluetooth/l2cap_core.c +++ b/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;