From 9a7d9f4a7f7f103b13fecb41466dcfbe8cc57cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kopy=C5=9Bci=C5=84ski?= Date: Wed, 6 Oct 2021 08:24:55 +0200 Subject: [PATCH] host/mesh: Only do label lookup when there are labels Include virtual label's pending_store function in the LABEL_COUNT > 0 compile guard to avoid including dead iteration code in the compilation. This is port of 7039675df13c74e74fb76d4f41cfc7e949c209ad --- nimble/host/mesh/src/transport.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nimble/host/mesh/src/transport.c b/nimble/host/mesh/src/transport.c index 721d5005b..0299c9833 100644 --- a/nimble/host/mesh/src/transport.c +++ b/nimble/host/mesh/src/transport.c @@ -1749,6 +1749,7 @@ uint8_t *bt_mesh_va_label_get(uint16_t addr) return NULL; } +#if CONFIG_BT_MESH_LABEL_COUNT > 0 static struct virtual_addr *bt_mesh_va_get(uint16_t index) { if (index >= ARRAY_SIZE(virtual_addrs)) { @@ -1758,7 +1759,6 @@ static struct virtual_addr *bt_mesh_va_get(uint16_t index) return &virtual_addrs[index]; } -#if CONFIG_BT_MESH_LABEL_COUNT > 0 static int va_set(int argc, char **argv, char *val) { struct va_val va; @@ -1809,7 +1809,6 @@ static int va_set(int argc, char **argv, char *val) return 0; } -#endif #define IS_VA_DEL(_label) ((_label)->ref == 0) void bt_mesh_va_pending_store(void) @@ -1857,8 +1856,13 @@ void bt_mesh_va_pending_store(void) } } } +#else +void bt_mesh_va_pending_store(void) +{ + /* Do nothing. */ +} +#endif /* CONFIG_BT_MESH_LABEL_COUNT > 0 */ -#if CONFIG_BT_MESH_LABEL_COUNT > 0 static struct conf_handler bt_mesh_va_conf_handler = { .ch_name = "bt_mesh", .ch_get = NULL,