[nrf fromtree] Bluetooth: Controller: Fix auxiliary context release on scan done

Fix auxiliary context release on scan done, do not wait for
reference count to reduce when Periodic Sync events overlap.

Regression introduced in commit 624e003 ("Bluetooth:
controller: Fix auxiliary scan context release").

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
(cherry picked from commit 4591c01)
(cherry picked from commit 8e80aed)

Author: cvinayak

subsys/bluetooth/controller/ll_sw/ull_scan_aux.c

@@ -746,7 +746,6 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
 void ull_scan_aux_done(struct node_rx_event_done *done)
 {
 	struct ll_scan_aux_set *aux;
-	struct ull_hdr *hdr;
 
 	/* Get reference to ULL context */
 	aux = CONTAINER_OF(done->param, struct ll_scan_aux_set, ull);
@@ -757,8 +756,8 @@ void ull_scan_aux_done(struct node_rx_event_done *done)
 
 		sync = CONTAINER_OF(done->param, struct ll_sync_set, ull);
 		LL_ASSERT(ull_sync_is_valid_get(sync));
-		hdr = &sync->ull;
 
+		/* Auxiliary context will be flushed by ull_scan_aux_stop() */
 		if (unlikely(sync->is_stop) || !sync->lll.lll_aux) {
 			return;
 		}
@@ -778,18 +777,9 @@ void ull_scan_aux_done(struct node_rx_event_done *done)
 		if (unlikely(scan->is_stop)) {
 			return;
 		}
-
-		/* Setup the disabled callback to flush the auxiliary PDUs */
-		hdr = &aux->ull;
 	}
 
-	if (ull_ref_get(hdr) == 0U) {
-		flush(aux);
-	} else {
-		LL_ASSERT(!hdr->disabled_cb);
-		hdr->disabled_param = aux;
-		hdr->disabled_cb = done_disabled_cb;
-	}
+	flush(aux);
 }
 
 struct ll_scan_aux_set *ull_scan_aux_set_get(uint8_t handle)