Bluetooth: Host: Fix incorrect ACL buffer count

cvinayak · carlescufi · commit f31b9742434c · 2022-06-03T15:11:33.000+02:00
Fix incorrect ACL buffer count use when Controller used
supports separate ISO buffers.

Signed-off-by: Vinayak Kariappa Chettimada &lt;vich@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
@@ -132,10 +132,15 @@ struct k_sem *bt_conn_get_pkts(struct bt_conn *conn)
 	}
 #endif /* CONFIG_BT_BREDR */
 #if defined(CONFIG_BT_ISO)
-	if (conn->type == BT_CONN_TYPE_ISO || bt_dev.le.iso_mtu) {
-		if (bt_dev.le.iso_pkts.limit) {
+	/* Use ISO pkts semaphore if LE Read Buffer Size command returned
+	 * dedicated ISO buffers.
+	 */
+	if (conn->type == BT_CONN_TYPE_ISO) {
+		if (bt_dev.le.iso_mtu && bt_dev.le.iso_pkts.limit) {
 			return &bt_dev.le.iso_pkts;
 		}
+
+		return NULL;
 	}
 #endif /* CONFIG_BT_ISO */
 #if defined(CONFIG_BT_CONN)

Original file line number	Diff line number	Diff line change
`@@ -132,10 +132,15 @@ struct k_sem bt_conn_get_pkts(struct bt_conn conn)`
`132`	`132`	`}`
`133`	`133`	`#endif /* CONFIG_BT_BREDR */`
`134`	`134`	`#if defined(CONFIG_BT_ISO)`
`135`		`- if (conn->type == BT_CONN_TYPE_ISO \|\| bt_dev.le.iso_mtu) {`
`136`		`- if (bt_dev.le.iso_pkts.limit) {`
	`135`	`+ /* Use ISO pkts semaphore if LE Read Buffer Size command returned`
	`136`	`+ * dedicated ISO buffers.`
	`137`	`+ */`
	`138`	`+ if (conn->type == BT_CONN_TYPE_ISO) {`
	`139`	`+ if (bt_dev.le.iso_mtu && bt_dev.le.iso_pkts.limit) {`
`137`	`140`	`return &bt_dev.le.iso_pkts;`
`138`	`141`	`}`
	`142`	`+`
	`143`	`+ return NULL;`
`139`	`144`	`}`
`140`	`145`	`#endif /* CONFIG_BT_ISO */`
`141`	`146`	`#if defined(CONFIG_BT_CONN)`