Commit 176d8ff7 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Mahesh Mahadevan
Browse files

Bluetooth: Controller: Define a macro to validate aux offset value 



Define a macro to validate aux offset value as it is checked
both in LLL and ULL execution contexts.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 9fa18600

subsys/bluetooth/controller/ll_sw/lll_scan_aux.h

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



#define AUX_OFFSET_IS_VALID(_offset_us, _win_size_us, _pdu_us) \

		(((_offset_us) + (_win_size_us)) >= ((_pdu_us) + (EVENT_MAFS_US)))



int lll_scan_aux_init(void);

int lll_scan_aux_reset(void);

void lll_scan_aux_prepare(void *param);

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ uint8_t lll_scan_aux_setup(struct pdu_adv *pdu, uint8_t pdu_phy, 


	/* Skip reception if invalid aux offset */

	pdu_us = PDU_AC_US(pdu->len, pdu_phy, pdu_phy_flags_rx);

	if (unlikely((aux_offset_us + window_size_us) < (pdu_us + EVENT_MAFS_US))) {

	if (unlikely(!AUX_OFFSET_IS_VALID(aux_offset_us, window_size_us, pdu_us))) {

		return 0U;

	}

subsys/bluetooth/controller/ll_sw/ull_scan_aux.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx) 


	/* Skip reception if invalid aux offset */

	pdu_us = PDU_AC_US(pdu->len, phy, ftr->phy_flags);

	if (unlikely((aux_offset_us + window_size_us) < (pdu_us + EVENT_MAFS_US))) {

	if (unlikely(!AUX_OFFSET_IS_VALID(aux_offset_us, window_size_us, pdu_us))) {

		goto ull_scan_aux_rx_flush;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE