Skip to content

Commit ebf6eda

Browse files
Vudentzgregkh
authored andcommitted
Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis
commit 50efc63 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f6079dc commit ebf6eda

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

include/net/bluetooth/hci_core.h

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

11941194
/* Match CIG ID if set */
1195-
if (cig != BT_ISO_QOS_CIG_UNSET && cig != c->iso_qos.cig)
1195+
if (cig != c->iso_qos.cig)
11961196
continue;
11971197

11981198
/* Match CIS ID if set */
1199-
if (id != BT_ISO_QOS_CIS_UNSET && id != c->iso_qos.cis)
1199+
if (id != c->iso_qos.cis)
12001200
continue;
12011201

12021202
/* Match destination address if set */

0 commit comments

Comments
 (0)