Commit 50efc63d authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

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: c14516fa ("Bluetooth: hci_conn: Fix not matching by CIS ID")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent a5812c68

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1227,11 +1227,11 @@ static inline struct hci_conn *hci_conn_hash_lookup_cis(struct hci_dev *hdev, 
			continue;



		/* Match CIG ID if set */

		if (cig != BT_ISO_QOS_CIG_UNSET && cig != c->iso_qos.ucast.cig)

		if (cig != c->iso_qos.ucast.cig)

			continue;



		/* Match CIS ID if set */

		if (id != BT_ISO_QOS_CIS_UNSET && id != c->iso_qos.ucast.cis)

		if (id != c->iso_qos.ucast.cis)

			continue;



		/* Match destination address if set */