Bluetooth: Mesh: Reset solicitation settings before calling reset cb

Trigger erasing solicitation settings before calling `bt_mesh_settings_store_pending` and `bt_mesh_prov.reset` callback. The `bt_mesh_settings_store_pending` flushes every settings that is pending to be erased. The `bt_mesh_prov.reset` callback must be called as the last step because a user is free to do anything from this callback including rebooting or reprovisioning the device. Signed-off-by: Pavel Vasilyev <[email protected]>
zephyrproject-rtos · Feb 5, 2024 · c018cda · c018cda
1 parent 826d67a
commit c018cda
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/subsys/bluetooth/mesh/main.c b/subsys/bluetooth/mesh/main.c
@@ -401,17 +401,17 @@ void bt_mesh_reset(void)
 
 	bt_mesh_comp_unprovision();
 
+	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION)) {
+		bt_mesh_sol_reset();
+	}
+
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
 		bt_mesh_settings_store_pending();
 	}
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PROV)) {
 		bt_mesh_prov_reset();
 	}
-
-	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION)) {
-		bt_mesh_sol_reset();
-	}
 }
 
 bool bt_mesh_is_provisioned(void)