From 90cfe1dc66d1b8b87895cb9dff868f0f454cbdd1 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Tue, 11 Aug 2020 10:44:52 +0530 Subject: [PATCH] Bluetooth: controller: Fix minor conditional compilation Fix minor conditional compilation around extended advertising and scanning. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/lll.h | 3 +++ subsys/bluetooth/controller/ll_sw/ull.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/lll.h b/subsys/bluetooth/controller/ll_sw/lll.h index 37d441559f6d82..2cd287e1adc123 100644 --- a/subsys/bluetooth/controller/ll_sw/lll.h +++ b/subsys/bluetooth/controller/ll_sw/lll.h @@ -286,7 +286,10 @@ struct node_rx_pdu { enum { EVENT_DONE_EXTRA_TYPE_NONE, + +#if defined(CONFIG_BT_CONN) EVENT_DONE_EXTRA_TYPE_CONN, +#endif /* CONFIG_BT_CONN */ #if defined(CONFIG_BT_CTLR_ADV_EXT) EVENT_DONE_EXTRA_TYPE_ADV, diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c index ad12666b5db03b..3bcc9b0c5aa07e 100644 --- a/subsys/bluetooth/controller/ll_sw/ull.c +++ b/subsys/bluetooth/controller/ll_sw/ull.c @@ -1870,20 +1870,20 @@ static inline void rx_demux_event_done(memq_link_t *link, break; #endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BT_CTLR_ADV_EXT) && defined(CONFIG_BT_BROADCASTER) +#if defined(CONFIG_BT_CTLR_ADV_EXT) +#if defined(CONFIG_BT_BROADCASTER) case EVENT_DONE_EXTRA_TYPE_ADV: ull_adv_done(done); break; -#endif /* CONFIG_BT_CTLR_ADV_EXT && CONFIG_BT_BROADCASTER */ +#endif /* CONFIG_BT_BROADCASTER */ #if defined(CONFIG_BT_OBSERVER) -#if defined(CONFIG_BT_CTLR_ADV_EXT) /* fallthrough checkpatch workaround! */ case EVENT_DONE_EXTRA_TYPE_SCAN_AUX: ull_scan_aux_done(done); break; -#endif /* CONFIG_BT_CTLR_ADV_EXT */ #endif /* CONFIG_BT_OBSERVER */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ #if defined(CONFIG_BT_CTLR_USER_EXT) case EVENT_DONE_EXTRA_TYPE_USER_START