michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Fix advertiser with identity switches to RPA

Browse source 
Fix advertiser requested to use the identity address while privacy
feature is enabled will change to using RPA address when advertise is
resumed or when RPA timeout occurred.
RPA timeout does not need to run when advertiser is using identity.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-01-15 18:56:39 +01:00 • committed by Johan Hedberg
commit 64b890463d
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/host/hci_core.c
View file

@ -607,7 +607,8 @@ static void rpa_timeout(struct k_work *work)
atomic_clear_bit(bt_dev.flags, BT_DEV_RPA_VALID);
/* IF no roles using the RPA is running we can stop the RPA timer */
if (!(atomic_test_bit(bt_dev.flags, BT_DEV_ADVERTISING) ||
if (!((atomic_test_bit(bt_dev.flags, BT_DEV_ADVERTISING) &&
!atomic_test_bit(bt_dev.flags, BT_DEV_ADVERTISING_IDENTITY)) ||
atomic_test_bit(bt_dev.flags, BT_DEV_INITIATING) ||
(atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING) &&
atomic_test_bit(bt_dev.flags, BT_DEV_ACTIVE_SCAN)))) {
@ -6172,7 +6173,8 @@ void bt_le_adv_resume(void)
bt_conn_set_state(adv_conn, BT_CONN_CONNECT_ADV);
if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
if (IS_ENABLED(CONFIG_BT_PRIVACY) &&
!atomic_test_bit(bt_dev.flags, BT_DEV_ADVERTISING_IDENTITY)) {
le_set_private_addr(bt_dev.adv_id);
}