Bluetooth: Mesh: Fix clearing Friend state upon reset

Johan Hedberg · jhedberg · commit a9a18cec7b34 · 2017-11-28T17:17:48.000+02:00
Not clearing the Friend state could risk invalid timers staying
active, etc.

Signed-off-by: Johan Hedberg &lt;johan.hedberg@intel.com&gt;
diff --git a/subsys/bluetooth/host/mesh/main.c b/subsys/bluetooth/host/mesh/main.c
@@ -120,6 +120,10 @@ void bt_mesh_reset(void)
 		bt_mesh_lpn_disable(true);
 	}
 
+	if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) {
+		bt_mesh_friend_clear_net_idx(BT_MESH_KEY_ANY);
+	}
+
 	if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
 		bt_mesh_proxy_gatt_disable();
 	}

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,10 @@ void bt_mesh_reset(void)`
`120`	`120`	`bt_mesh_lpn_disable(true);`
`121`	`121`	`}`
`122`	`122`
	`123`	`+ if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) {`
	`124`	`+ bt_mesh_friend_clear_net_idx(BT_MESH_KEY_ANY);`
	`125`	`+ }`
	`126`	`+`
`123`	`127`	`if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {`
`124`	`128`	`bt_mesh_proxy_gatt_disable();`
`125`	`129`	`}`