michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix controller privacy address check

Browse source 
Fix controllers address check in cases of controller-based
privacy is supported but not used to start advertising.

This fixes regression introduced in
commit 896619ad40 ("Bluetooth: controller: Fix
controller address check").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-01-03 12:35:31 +05:30 • committed by Alberto Escolar
commit 8cd9a94b2f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
subsys/bluetooth/controller/ll_sw/ull_adv.c
View file

@ -468,10 +468,10 @@ u8_t ll_adv_enable(u8_t enable)
/* AdvA, fill here at enable */
if (h->adv_addr) {
/* TODO: Privacy */
u8_t *tx_addr = ll_addr_get(pdu_adv->tx_addr, NULL);
if (!mem_nz(tx_addr, BDADDR_SIZE)) {
/* TODO: Privacy check */
if (pdu_adv->tx_addr && !mem_nz(tx_addr, BDADDR_SIZE)) {
return BT_HCI_ERR_INVALID_PARAM;
}
@ -518,7 +518,8 @@ u8_t ll_adv_enable(u8_t enable)
* found the fallback address was used instead, check
* that a valid address has been set.
*/
if (!mem_nz(&pdu_adv->adv_ind.addr[0], BDADDR_SIZE)) {
if (pdu_adv->tx_addr &&
!mem_nz(pdu_adv->adv_ind.addr, BDADDR_SIZE)) {
return BT_HCI_ERR_INVALID_PARAM;
}
}