Skip to content

Commit

Permalink
[nrf fromtree] Bluetooth: Controller: Fix redundant reset of sync aux…
Browse files Browse the repository at this point in the history
… association

Remove redundant reset of LLL sync aux context association.

Related to commit 32637290207a ("Bluetooth: Controller: Fix
assertion terminating Periodic Sync").

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
(cherry picked from commit dcdd3308953ababa0a67382e696982b9f8e2ab86)
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
  • Loading branch information
cvinayak committed Feb 17, 2025
1 parent d126355 commit 62dae90
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,15 +635,6 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
lll = prepare_param->param;
lll->skip_prepare += (lll->lazy_prepare + 1U);

/* Reset Sync context association with any Aux context as the chain reception is aborted.
* There is no race with ULL execution context assigning lll_aux as this is prepare being
* aborted and no assignment would be done yet before the superior PDU is received.
* TODO: This code here is redundant as isr_rx_done_cleanup() should ensure it is reset
* on every periodic sync chain done. Remove it if there is no regression running
* conformance tests.
*/
lll->lll_aux = NULL;

/* Extra done event, to check sync lost */
e = ull_event_done_extra_get();
LL_ASSERT(e);
Expand Down Expand Up @@ -823,16 +814,6 @@ static int isr_rx(struct lll_sync *lll, uint8_t node_type, uint8_t crc_ok,
* again a node_rx for periodic report incomplete.
*/
if (node_type != NODE_RX_TYPE_EXT_AUX_REPORT) {
/* Reset Sync context association with any Aux context
* as a new chain is being setup for reception here.
* TODO: This code here is redundant as
* isr_rx_done_cleanup() should ensure it is reset
* on every periodic sync chain done. Remove it if
* there is no regression running conformance
* tests.
*/
lll->lll_aux = NULL;

node_rx = ull_pdu_rx_alloc_peek(4);
} else {
node_rx = ull_pdu_rx_alloc_peek(3);
Expand Down

0 comments on commit 62dae90

Please sign in to comment.