From d75cb432576c624c5e787ec926ae625533662195 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Wed, 9 Jun 2021 15:26:21 +0800 Subject: [PATCH 1/2] bugfix:Set address resolution enable. If not set enable and the filter policy is 2 or 3, the controller will reply with invalid param error. --- components/bt/host/bluedroid/stack/btm/btm_ble_gap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c b/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c index 5fdc2c6e20..59827779eb 100644 --- a/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c +++ b/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c @@ -860,6 +860,8 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode, tBTM_SET_LOCAL_PRIVACY_CBACK (*random_cb->set_local_privacy_cback)(BTM_SET_PRIVACY_SUCCESS); random_cb->set_local_privacy_cback = NULL; } + //Disable RPA function + btsnd_hcic_ble_set_addr_resolution_enable(FALSE); } else { /* privacy is turned on*/ /* always set host random address, used when privacy 1.1 or priavcy 1.2 is disabled */ btm_gen_resolvable_private_addr((void *)btm_gen_resolve_paddr_low); @@ -878,6 +880,7 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode, tBTM_SET_LOCAL_PRIVACY_CBACK } else { /* 4.1/4.0 controller */ p_cb->privacy_mode = BTM_PRIVACY_1_1; } + btsnd_hcic_ble_set_addr_resolution_enable(TRUE); } #if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE) From b60af85f9842a75f248c2c4c9c4d47765ab151d0 Mon Sep 17 00:00:00 2001 From: wangmengyang Date: Mon, 19 Jul 2021 07:53:43 +0800 Subject: [PATCH 2/2] component/bt: Fix some bugs in bluetooth controller(2fcbe897) 1. Fixed BLE ACL tx flush issue during reset. 2. Added remove sniff when peer not accepted sniff mode 3. Fixed crash issue when using scan parameter(window=4 slot, interval=5 slot) 4. Removed duplicated events in lld_evt_end --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 3adb056b8a..41866ca55b 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 3adb056b8ae4f67e929a6ba7ea1d918fec02aeaf +Subproject commit 41866ca55b805f947fc9b6fe565ca2b6eff3709a