[nrf fromlist] Bluetooth: Mesh: Stop Private NID advs upon subnet removal

m-alperen-sener · m-alperen-sener · commit ce5becf5edbc · 2025-04-03T12:09:14.000+02:00
Private Node Identity advertisement on a subnet should stop as soon as
the network is removed.

Upstream PR #: 87891

Signed-off-by: alperen sener &lt;alperen.sener@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
@@ -897,10 +897,13 @@ static void subnet_evt(struct bt_mesh_subnet *sub, enum bt_mesh_key_evt evt)
 		if (sub == beacon_sub) {
 			beacon_sub = NULL;
 		}
+
+		bt_mesh_proxy_identity_stop(sub);
 	} else {
 		bt_mesh_proxy_beacon_send(sub);
-		bt_mesh_adv_gatt_update();
 	}
+
+	bt_mesh_adv_gatt_update();
 }
 
 BT_MESH_SUBNET_CB_DEFINE(gatt_services) = {

Original file line number	Diff line number	Diff line change
`@@ -897,10 +897,13 @@ static void subnet_evt(struct bt_mesh_subnet *sub, enum bt_mesh_key_evt evt)`
`897`	`897`	`if (sub == beacon_sub) {`
`898`	`898`	`beacon_sub = NULL;`
`899`	`899`	`}`
	`900`	`+`
	`901`	`+ bt_mesh_proxy_identity_stop(sub);`
`900`	`902`	`} else {`
`901`	`903`	`bt_mesh_proxy_beacon_send(sub);`
`902`		`- bt_mesh_adv_gatt_update();`
`903`	`904`	`}`
	`905`	`+`
	`906`	`+ bt_mesh_adv_gatt_update();`
`904`	`907`	`}`
`905`	`908`
`906`	`909`	`BT_MESH_SUBNET_CB_DEFINE(gatt_services) = {`