Bluetooth: Controller: Fix extended scanning data length assertion
Fix assertion due to LLL scheduling of auxiliary PDU
reception was not considered in the ULL when checking for
accumulated data length exceeding the supported maximum scan
data length. This caused the auxiliary context to be release
while LLL was still active with scheduled PDU reception.
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 4158d9523ea98c3fb92fbd2396a340017381e6f0)
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
index 9a86a47..3efb8c2 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
@@ -538,8 +538,21 @@
} else {
aux->data_len += data_len;
+ /* Flush auxiliary PDU receptions and stop any more ULL
+ * scheduling if accumulated data length exceeds configured
+ * maximum supported.
+ */
if (aux->data_len >= CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX) {
- goto ull_scan_aux_rx_flush;
+ /* If LLL has already scheduled, then let it proceed.
+ *
+ * TODO: LLL to check accumulated data length and
+ * stop further reception.
+ * Currently LLL will schedule as long as there
+ * are free node rx available.
+ */
+ if (!ftr->aux_lll_sched) {
+ goto ull_scan_aux_rx_flush;
+ }
}
}
