Bluetooth: Mesh: pb_gatt: update delayable work

Switch to the new API. Adds a link check to the protocol timeout to
ensure the link is still active.

Signed-off-by: Peter Bigot <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>

Author: pabigot

subsys/bluetooth/mesh/pb_gatt.c

@@ -22,7 +22,7 @@ struct prov_link {
 	const struct prov_bearer_cb *cb;
 	void *cb_data;
 	struct net_buf_simple *rx_buf;
-	struct k_delayed_work prot_timer;
+	struct k_work_delayable prot_timer;
 };
 
 static struct prov_link link;
@@ -34,7 +34,8 @@ static void reset_state(void)
 		link.conn = NULL;
 	}
 
-	k_delayed_work_cancel(&link.prot_timer);
+	/* If this fails, the protocol timeout handler will exit early. */
+	(void)k_work_cancel_delayable(&link.prot_timer);
 
 	link.rx_buf = bt_mesh_proxy_get_buf();
 }
@@ -51,8 +52,12 @@ static void link_closed(enum prov_bearer_link_status status)
 
 static void protocol_timeout(struct k_work *work)
 {
-	BT_DBG("Protocol timeout");
+	if (!link.conn) {
+		/* Already disconnected */
+		return;
+	}
 
+	BT_DBG("Protocol timeout");
 	link_closed(PROV_BEARER_LINK_STATUS_TIMEOUT);
 }
 
@@ -70,7 +75,7 @@ int bt_mesh_pb_gatt_recv(struct bt_conn *conn, struct net_buf_simple *buf)
 		return -EINVAL;
 	}
 
-	k_delayed_work_submit(&link.prot_timer, PROTOCOL_TIMEOUT);
+	k_work_reschedule(&link.prot_timer, PROTOCOL_TIMEOUT);
 
 	link.cb->recv(&pb_gatt, link.cb_data, buf);
 
@@ -86,7 +91,7 @@ int bt_mesh_pb_gatt_open(struct bt_conn *conn)
 	}
 
 	link.conn = bt_conn_ref(conn);
-	k_delayed_work_submit(&link.prot_timer, PROTOCOL_TIMEOUT);
+	k_work_reschedule(&link.prot_timer, PROTOCOL_TIMEOUT);
 
 	link.cb->link_opened(&pb_gatt, link.cb_data);
 
@@ -125,7 +130,7 @@ static int buf_send(struct net_buf_simple *buf, prov_bearer_send_complete_t cb,
 		return -ENOTCONN;
 	}
 
-	k_delayed_work_submit(&link.prot_timer, PROTOCOL_TIMEOUT);
+	k_work_reschedule(&link.prot_timer, PROTOCOL_TIMEOUT);
 
 	return bt_mesh_proxy_send(link.conn, BT_MESH_PROXY_PROV, buf);
 }
@@ -137,7 +142,7 @@ static void clear_tx(void)
 
 void pb_gatt_init(void)
 {
-	k_delayed_work_init(&link.prot_timer, protocol_timeout);
+	k_work_init_delayable(&link.prot_timer, protocol_timeout);
 }
 
 void pb_gatt_reset(void)