Skip to content

Commit 50efc63

Browse files
committed
Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis
hci_conn_hash_lookup_cis shall always match the requested CIG and CIS ids even when they are unset as otherwise it result in not being able to bind/connect different sockets to the same address as that would result in having multiple sockets mapping to the same hci_conn which doesn't really work and prevents BAP audio configuration such as AC 6(i) when CIG and CIS are left unset. Fixes: c14516f ("Bluetooth: hci_conn: Fix not matching by CIS ID") Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
1 parent a5812c6 commit 50efc63

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/net/bluetooth/hci_core.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,11 +1227,11 @@ static inline struct hci_conn *hci_conn_hash_lookup_cis(struct hci_dev *hdev,
12271227
continue;
12281228

12291229
/* Match CIG ID if set */
1230-
if (cig != BT_ISO_QOS_CIG_UNSET && cig != c->iso_qos.ucast.cig)
1230+
if (cig != c->iso_qos.ucast.cig)
12311231
continue;
12321232

12331233
/* Match CIS ID if set */
1234-
if (id != BT_ISO_QOS_CIS_UNSET && id != c->iso_qos.ucast.cis)
1234+
if (id != c->iso_qos.ucast.cis)
12351235
continue;
12361236

12371237
/* Match destination address if set */

0 commit comments

Comments
 (0)