michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix missing cond. compile for ext. scan filter

Browse source 
Fix missing conditional compile when Advertising Extensions
is enabled without Extended Scan Filter Policy support.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2022-04-23 07:22:03 +05:30 • committed by Marti Bolivar
commit 31f49936e2
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6119,7 +6119,6 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
const uint8_t *data = NULL; const uint8_t *data = NULL;
uint8_t scan_data_len = 0U; uint8_t scan_data_len = 0U;
uint8_t adv_addr_type = 0U; uint8_t adv_addr_type = 0U;
bool direct_report = false;
uint8_t sec_phy_scan = 0U; uint8_t sec_phy_scan = 0U;
uint8_t *adv_addr = NULL; uint8_t *adv_addr = NULL;
uint8_t data_status = 0U; uint8_t data_status = 0U;
@ -6226,11 +6225,21 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
bt_addr_le_t addr; bt_addr_le_t addr;
lll = node_rx->hdr.rx_ftr.param; lll = node_rx->hdr.rx_ftr.param;
#if defined(CONFIG_BT_CTLR_EXT_SCAN_FP)
direct_addr_type_curr = direct_addr_type_curr =
ext_adv_direct_addr_type(lll, ext_adv_direct_addr_type(lll,
direct_resolved_curr, direct_resolved_curr,
direct_report_curr, direct_report_curr,
adv->rx_addr, ptr); adv->rx_addr, ptr);
#else /* !CONFIG_BT_CTLR_EXT_SCAN_FP */
direct_addr_type_curr =
ext_adv_direct_addr_type(lll,
direct_resolved_curr,
false, adv->rx_addr,
ptr);
#endif /* !CONFIG_BT_CTLR_EXT_SCAN_FP */
direct_addr_curr = ptr; direct_addr_curr = ptr;
ptr += BDADDR_SIZE; ptr += BDADDR_SIZE;
@ -6351,10 +6360,6 @@ no_ext_hdr:
rl_idx = rl_idx_curr; rl_idx = rl_idx_curr;
#endif /* CONFIG_BT_CTLR_PRIVACY */ #endif /* CONFIG_BT_CTLR_PRIVACY */
#if defined(CONFIG_BT_CTLR_EXT_SCAN_FP)
direct_report = direct_report_curr;
#endif /* CONFIG_BT_CTLR_EXT_SCAN_FP */
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) && \ #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) && \
defined(CONFIG_BT_CTLR_FILTER_ACCEPT_LIST) defined(CONFIG_BT_CTLR_FILTER_ACCEPT_LIST)
devmatch = devmatch_curr; devmatch = devmatch_curr;
@ -6404,12 +6409,6 @@ no_ext_hdr:
} }
#endif /* CONFIG_BT_CTLR_PRIVACY */ #endif /* CONFIG_BT_CTLR_PRIVACY */
#if defined(CONFIG_BT_CTLR_EXT_SCAN_FP)
if (!direct_report) {
direct_report = direct_report_curr;
}
#endif /* CONFIG_BT_CTLR_EXT_SCAN_FP */
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) && \ #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) && \
defined(CONFIG_BT_CTLR_FILTER_ACCEPT_LIST) defined(CONFIG_BT_CTLR_FILTER_ACCEPT_LIST)
if (!devmatch) { if (!devmatch) {