michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix some incorrect asserts on connection

Browse source 
Fixes some incorrect assertions in ull_adv.c on connection establishment

Note that the usual checks using adv->lll.conn doesn't work here,
since ull_periph_setup() NULLs the lll's conn structure pointer
before stopping the ticker

Signed-off-by: Troels Nilsson <trnn@demant.com>
This commit is contained in:
Troels Nilsson 2023-08-29 12:52:51 +02:00 • committed by Carles Cufí
commit d3f386d52b
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2423,8 +2423,25 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,
static void ticker_update_op_cb(uint32_t status, void *param)
{
#if defined(CONFIG_BT_PERIPHERAL) && (defined(CONFIG_BT_ASSERT) || defined(CONFIG_ASSERT))
struct ll_adv_set *adv = param;
struct pdu_adv *pdu = lll_adv_data_peek(&adv->lll);
bool connectable = (pdu->type == PDU_ADV_TYPE_ADV_IND) ||
(pdu->type == PDU_ADV_TYPE_DIRECT_IND) ||
#if defined(CONFIG_BT_CTLR_ADV_EXT)
((pdu->type == PDU_ADV_TYPE_EXT_IND) &&
(pdu->adv_ext_ind.adv_mode & BT_HCI_LE_ADV_PROP_CONN)) ||
#endif /* CONFIG_BT_CTLR_ADV_EXT */
0;
#endif /* CONFIG_BT_PERIPHERAL && (CONFIG_BT_ASSERT || CONFIG_ASSERT) */
LL_ASSERT(status == TICKER_STATUS_SUCCESS ||
param == ull_disable_mark_get());
param == ull_disable_mark_get() ||
#if defined(CONFIG_BT_PERIPHERAL)
/* if using connectable adv and lll.conn is 0 -> a connection is underway */
(connectable && !adv->lll.conn) ||
#endif /* CONFIG_BT_PERIPHERAL */
0);
}
#if defined(CONFIG_BT_PERIPHERAL)