From 357db4d668b6cef3603c4b7d84a8e1d60af688ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Rymanowski?= Date: Tue, 28 May 2019 12:12:46 +0200 Subject: [PATCH] nimble/ll: Improve handling BLE_LL_EXT_ADV_AUX_PTR_CNT = 0 This patch makes sure that when BLE_LL_EXT_ADV_AUX_PTR_CNT = 0 then related membuf is NULL. --- nimble/controller/src/ble_ll_scan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nimble/controller/src/ble_ll_scan.c b/nimble/controller/src/ble_ll_scan.c index 24e2ae40e..c8fbfbb50 100644 --- a/nimble/controller/src/ble_ll_scan.c +++ b/nimble/controller/src/ble_ll_scan.c @@ -147,10 +147,14 @@ struct ble_ll_scan_advertisers g_ble_ll_scan_dup_advs[MYNEWT_VAL(BLE_LL_NUM_SCAN_DUP_ADVS)]; #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) +#if MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT) != 0 static os_membuf_t ext_adv_mem[ OS_MEMPOOL_SIZE( MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT), sizeof (struct ble_ll_aux_data)) ]; +#else +#define ext_adv_mem NULL +#endif static struct os_mempool ext_adv_pool;