[nrf fromtree] bluetooth: mesh: proxy_msg: Fix extracting role from k_work

PavelVPV · jukkar · commit 5b8badb6ebd3 · 2024-12-05T12:16:34.000+02:00
Fix extracting role from k_work. Hot fix for #78914 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no> (cherry picked from commit f5409bd) Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no> (cherry picked from commit 52c7aa8)
diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
@@ -252,11 +252,9 @@ int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 
 static void proxy_msg_send_pending(struct k_work *work)
 {
-	struct bt_mesh_proxy_role *role;
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_mesh_proxy_role *role = CONTAINER_OF(work, struct bt_mesh_proxy_role, work);
 	struct bt_mesh_adv *adv;
 
-	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
 	if (!role->conn) {
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -252,11 +252,9 @@ int bt_mesh_proxy_relay_send(struct bt_conn conn, struct bt_mesh_adv adv)`
`252`	`252`
`253`	`253`	`static void proxy_msg_send_pending(struct k_work *work)`
`254`	`254`	`{`
`255`		`- struct bt_mesh_proxy_role *role;`
`256`		`- struct k_work_delayable *dwork = k_work_delayable_from_work(work);`
	`255`	`+ struct bt_mesh_proxy_role *role = CONTAINER_OF(work, struct bt_mesh_proxy_role, work);`
`257`	`256`	`struct bt_mesh_adv *adv;`
`258`	`257`
`259`		`- role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);`
`260`	`258`	`if (!role->conn) {`
`261`	`259`	`return;`
`262`	`260`	`}`