commit 3ae0f96acb67aafe1e13a545e7a1b86159103733
author Pavel Vasilyev <pavel.vasilyev@nordicsemi.no> Thu May 13 12:47:17 2021 +0200
committer Johan Hedberg <johan.hedberg@gmail.com> Mon May 17 13:23:30 2021 +0300
tree 6b91aadf4c26436d982ae3bc619a5bc7e9ed55d1
parent 41e885947e4f48aae0866df9e5fee657afb7c1cc

Bluetooth: Mesh: Fix incorrect flag check in mesh settings

This bug was introduced in PR #31176, where setting's flags were
moved out from bt_mesh.flags to pending_flags.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

subsys/bluetooth/mesh/settings.c

diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index 96d2ecc..8f9fdec 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -100,7 +100,7 @@
 		timeout_ms = 0;
 	} else if (atomic_test_bit(pending_flags,
 				   BT_MESH_SETTINGS_RPL_PENDING) &&
-		   (!(atomic_get(bt_mesh.flags) & GENERIC_PENDING_BITS) ||
+		   (!(atomic_get(pending_flags) & GENERIC_PENDING_BITS) ||
 		    (CONFIG_BT_MESH_RPL_STORE_TIMEOUT <
 		     CONFIG_BT_MESH_STORE_TIMEOUT))) {
 		timeout_ms = CONFIG_BT_MESH_RPL_STORE_TIMEOUT * MSEC_PER_SEC;