michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: fix Proxy Solicitation build without CONFIG_BT_SETTINGS

Browse source 
`bt_mesh_settings_store_schedule` should be called only when
CONFIG_BT_SETTINGS is enabled.

Signed-off-by: Krzysztof Kopyściński <krzysztof.kopyscinski@codecoup.pl>
This commit is contained in:
Krzysztof Kopyściński 2023-05-18 09:21:20 +02:00 • committed by Carles Cufí
commit 38c925308b
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/bluetooth/mesh/solicitation.c
View file

@ -463,13 +463,17 @@ void bt_mesh_sol_reset(void)
#if CONFIG_BT_MESH_PROXY_SOLICITATION
sseq_out = 0;
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_SSEQ_PENDING);
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_SSEQ_PENDING);
}
#endif
#if CONFIG_BT_MESH_OD_PRIV_PROXY_SRV
(void)atomic_cas(&clear, 0, 1);
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
(void)atomic_cas(&clear, 0, 1);
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_SRPL_PENDING);
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_SRPL_PENDING);
}
#endif
}
@ -533,7 +537,9 @@ int bt_mesh_sol_send(void)
sseq_out++;
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_SSEQ_PENDING);
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_SSEQ_PENDING);
}
return 0;
#else