From 27e549852400ed46a2fd06f419c8b48c1af624ff Mon Sep 17 00:00:00 2001 From: Chinmay Chhajed Date: Tue, 15 Jun 2021 13:59:19 +0530 Subject: [PATCH 1/4] bt/controller: Fix for BLE ACL tx flush issue during reset. --- 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 2289aaf8ed..0e21ca73e2 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 2289aaf8ed5bbf3de7cab8f27d8b53653bdbddb2 +Subproject commit 0e21ca73e2a0b5e9310a2874785116986051184e From 5abd645cce9834134618144ba875a005370d0a22 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Wed, 9 Jun 2021 15:26:21 +0800 Subject: [PATCH 2/4] 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 3ed29424e4..81684f875b 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 75b387d7e73f5cb7d72148cfdc6ea612958cd61e Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Wed, 30 Jun 2021 21:39:30 +0800 Subject: [PATCH 3/4] If the scan window set as 4 slots and the scan interval set as 5 slots, then the device will crash when starting scanning.This commit is to fix this bug.Remove duplicate events in r_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 0e21ca73e2..a1a21986c9 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 0e21ca73e2a0b5e9310a2874785116986051184e +Subproject commit a1a21986c9d843befeb43c8a061cc6ff91b866a2 From d21da1f61a1ea1a77c359094d3b927aace6a3559 Mon Sep 17 00:00:00 2001 From: xiongweichao Date: Fri, 16 Jul 2021 20:21:37 +0800 Subject: [PATCH 4/4] Add remove sniff when peer not accepted sniff mode --- 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 a1a21986c9..19f905ff4d 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit a1a21986c9d843befeb43c8a061cc6ff91b866a2 +Subproject commit 19f905ff4d60d2387046dbb1cdb27f6defd24f28