fixup! Bluetooth: Host: Don't call user callback from TX thread

alwa-nordic · alwa-nordic · commit 54338e66f451 · 2025-10-10T15:44:24.000+02:00
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
@@ -285,14 +285,15 @@ static void att_tx_destroy_work_handler(struct k_work *work)
 	}
 
 	if (!sys_slist_is_empty(&tx_destroy_queue)) {
-		k_work_submit(&att_tx_destroy_work);
+		k_work_submit_to_queue(bt_workq_chosen, &att_tx_destroy_work);
 	}
 }
 
 static void att_tx_destroy(struct net_buf *buf)
 {
+	/* We need to invoke `att_on_sent_cb` which may block. Defer to bt_workq. */
 	net_buf_slist_put(&tx_destroy_queue, buf);
-	k_work_submit(&att_tx_destroy_work);
+	k_work_submit_to_queue(bt_workq_chosen, &att_tx_destroy_work); /* att_tx_destroy_work_handler */
 }
 
 NET_BUF_POOL_DEFINE(att_pool, CONFIG_BT_ATT_TX_COUNT,

Original file line number	Diff line number	Diff line change
`@@ -285,14 +285,15 @@ static void att_tx_destroy_work_handler(struct k_work *work)`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`if (!sys_slist_is_empty(&tx_destroy_queue)) {`
`288`		`- k_work_submit(&att_tx_destroy_work);`
	`288`	`+ k_work_submit_to_queue(bt_workq_chosen, &att_tx_destroy_work);`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`static void att_tx_destroy(struct net_buf *buf)`
`293`	`293`	`{`
	`294`	+ /* We need to invoke `att_on_sent_cb` which may block. Defer to bt_workq. */
`294`	`295`	`net_buf_slist_put(&tx_destroy_queue, buf);`
`295`		`- k_work_submit(&att_tx_destroy_work);`
	`296`	`+ k_work_submit_to_queue(bt_workq_chosen, &att_tx_destroy_work); /* att_tx_destroy_work_handler */`
`296`	`297`	`}`
`297`	`298`
`298`	`299`	`NET_BUF_POOL_DEFINE(att_pool, CONFIG_BT_ATT_TX_COUNT,`