michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix resolving index from being overwritten

Browse source 
When generating LE Extended Advertising Report the device
address can be either in primary or auxiliary channel PDU,
do not overwrite resolving list index if present in primary
channel PDU.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-07-26 18:46:02 +05:30 • committed by Carles Cufí
commit fcc15f713a
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/controller/hci/hci.c
View file

@ -4919,7 +4919,7 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
int8_t rssi;
#if defined(CONFIG_BT_CTLR_PRIVACY)
uint8_t rl_idx;
uint8_t rl_idx = ll_rl_size_get();
#endif /* CONFIG_BT_CTLR_PRIVACY */
if (!(event_mask & BT_EVT_MASK_LE_META_EVENT) ||
@ -4950,7 +4950,7 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
rssi = -(node_rx_curr->hdr.rx_ftr.rssi);
#if defined(CONFIG_BT_CTLR_PRIVACY)
rl_idx = node_rx_curr->hdr.rx_ftr.rl_idx;
uint8_t rl_idx_curr = node_rx_curr->hdr.rx_ftr.rl_idx;
#endif /* CONFIG_BT_CTLR_PRIVACY */
BT_DBG("phy= 0x%x, type= 0x%x, len= %u, tat= %u, rat= %u,"
@ -5101,6 +5101,9 @@ no_ext_hdr:
data_len = data_len_curr;
total_data_len = data_len;
data = data_curr;
#if defined(CONFIG_BT_CTLR_PRIVACY)
rl_idx = rl_idx_curr;
#endif /* CONFIG_BT_CTLR_PRIVACY */
} else {
/* TODO: Validate current value with previous, also
* detect the scan response in the list of node_rx.
@ -5127,6 +5130,11 @@ no_ext_hdr:
* fragment.
*/
}
#if defined(CONFIG_BT_CTLR_PRIVACY)
if (rl_idx >= ll_rl_size_get()) {
rl_idx = rl_idx_curr;
}
#endif /* CONFIG_BT_CTLR_PRIVACY */
}
if (!node_rx_next) {