michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Abort auxiliary LLL if aux_ptr missing

Browse source 
Abort Auxiliary LLL prepare if current primary PDU is
missing the aux_ptr.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-04-23 16:04:36 +05:30 • committed by Carles Cufí
commit 6a86307ad4
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
View file

@ -133,9 +133,12 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
/* FIXME: get latest only when primary PDU without Aux PDUs */ /* FIXME: get latest only when primary PDU without Aux PDUs */
sec = lll_adv_aux_data_latest_get(lll, &upd); sec = lll_adv_aux_data_latest_get(lll, &upd);
/* Get reference to primary PDU aux_ptr */ /* Get reference to primary PDU */
lll_adv = lll->adv; lll_adv = lll->adv;
pri = lll_adv_data_curr_get(lll_adv); pri = lll_adv_data_curr_get(lll_adv);
LL_ASSERT(pri->type == PDU_ADV_TYPE_EXT_IND);
/* Get reference to extended header */
p = (void *)&pri->adv_ext_ind; p = (void *)&pri->adv_ext_ind;
h = (void *)p->ext_hdr_adi_adv_data; h = (void *)p->ext_hdr_adi_adv_data;
ptr = (uint8_t *)h + sizeof(*h); ptr = (uint8_t *)h + sizeof(*h);
@ -150,10 +153,14 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
ptr += sizeof(struct ext_adv_adi); ptr += sizeof(struct ext_adv_adi);
} }
LL_ASSERT((pri->type == PDU_ADV_TYPE_EXT_IND) && h->aux_ptr);
aux = (void *)ptr; aux = (void *)ptr;
/* Abort if no aux_ptr filled */
if (!h->aux_ptr || !aux->offs) {
radio_isr_set(lll_isr_abort, lll);
radio_disable();
}
#if !defined(BT_CTLR_ADV_EXT_PBACK) #if !defined(BT_CTLR_ADV_EXT_PBACK)
/* Set up Radio H/W */ /* Set up Radio H/W */
radio_reset(); radio_reset();