Skip to content

Commit dcdd330

Browse files
cvinayakfabiobaltieri
authored andcommitted
Bluetooth: Controller: Fix redundant reset of sync aux association
Remove redundant reset of LLL sync aux context association. Related to commit 3263729 ("Bluetooth: Controller: Fix assertion terminating Periodic Sync"). Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
1 parent 49642ef commit dcdd330

File tree

1 file changed

+0
-19
lines changed
  • subsys/bluetooth/controller/ll_sw/nordic/lll

1 file changed

+0
-19
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -635,15 +635,6 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
635635
lll = prepare_param->param;
636636
lll->skip_prepare += (lll->lazy_prepare + 1U);
637637

638-
/* Reset Sync context association with any Aux context as the chain reception is aborted.
639-
* There is no race with ULL execution context assigning lll_aux as this is prepare being
640-
* aborted and no assignment would be done yet before the superior PDU is received.
641-
* TODO: This code here is redundant as isr_rx_done_cleanup() should ensure it is reset
642-
* on every periodic sync chain done. Remove it if there is no regression running
643-
* conformance tests.
644-
*/
645-
lll->lll_aux = NULL;
646-
647638
/* Extra done event, to check sync lost */
648639
e = ull_event_done_extra_get();
649640
LL_ASSERT(e);
@@ -823,16 +814,6 @@ static int isr_rx(struct lll_sync *lll, uint8_t node_type, uint8_t crc_ok,
823814
* again a node_rx for periodic report incomplete.
824815
*/
825816
if (node_type != NODE_RX_TYPE_EXT_AUX_REPORT) {
826-
/* Reset Sync context association with any Aux context
827-
* as a new chain is being setup for reception here.
828-
* TODO: This code here is redundant as
829-
* isr_rx_done_cleanup() should ensure it is reset
830-
* on every periodic sync chain done. Remove it if
831-
* there is no regression running conformance
832-
* tests.
833-
*/
834-
lll->lll_aux = NULL;
835-
836817
node_rx = ull_pdu_rx_alloc_peek(4);
837818
} else {
838819
node_rx = ull_pdu_rx_alloc_peek(3);

0 commit comments

Comments
 (0)