From 4f4fb7b45312c2f083dea49a2bc8ea574a148113 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Jian Date: Mon, 3 Jul 2017 19:41:56 +0800 Subject: [PATCH] Merge branch 'bugfix/btdm_cherry-pick_ble_smp_bonding_issues' into 'master' component/bt: Fixed the bug crash of disconnet BLE when close the SMP module in the menuconfig. See merge request !941 --- components/bt/bluedroid/stack/l2cap/l2c_utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/components/bt/bluedroid/stack/l2cap/l2c_utils.c b/components/bt/bluedroid/stack/l2cap/l2c_utils.c index 042387964d..68f5767ef6 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_utils.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_utils.c @@ -2635,7 +2635,16 @@ void l2cu_no_dynamic_ccbs (tL2C_LCB *p_lcb) /* probably no buffer to send disconnect */ timeout = BT_1SEC_TIMEOUT; } +#else + if (btsnd_hcic_disconnect (p_lcb->handle, HCI_ERR_PEER_USER)) { + l2cu_process_fixed_disc_cback(p_lcb); + p_lcb->link_state = LST_DISCONNECTING; + timeout = L2CAP_LINK_DISCONNECT_TOUT; + } else { + timeout = BT_1SEC_TIMEOUT; + } #endif ///SMP_INCLUDED == TRUE + } if (timeout != 0xFFFF) {