From 3a2ff7b08c19fcdd8782eb0637729327c07856f8 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Sat, 27 May 2017 00:44:52 +0200 Subject: [PATCH] Bluetooth: controller: Fix CSA#2 assert Fix the assert in the controller during connection setup when peer does not support CSA#2 feature and free Rx buffer queue does not have enough buffers to generate CSA event. The assert was reproduced by turning on advertisement indication and scan request notification features in the controllers advanced features, and a peer that does not support CSA#2 initiated a connection. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/ctrl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 8eee1c334dc..6f1aecaa61d 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -738,8 +738,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t irkmatch_ok, struct connection *conn; u32_t ticker_status; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) && - pdu_adv->chan_sel) { + if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { radio_pdu_node_rx = packet_rx_reserve_get(4); } else { radio_pdu_node_rx = packet_rx_reserve_get(3); @@ -1005,8 +1004,7 @@ static inline u32_t isr_rx_obs(u8_t irkmatch_id, u8_t rssi_ready) u32_t ticker_status; u32_t conn_space_us; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) && - pdu_adv_rx->chan_sel) { + if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { radio_pdu_node_rx = packet_rx_reserve_get(4); } else { radio_pdu_node_rx = packet_rx_reserve_get(3);