Commit 31c5f916 authored by Pauli Virtanen's avatar Pauli Virtanen Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: ISO: consider right CIS when removing CIG at cleanup 



When looking for CIS blocking CIG removal, consider only the CIS with
the right CIG ID. Don't try to remove CIG with unset CIG ID.

Fixes: 26afbd82 ("Bluetooth: Add initial implementation of CIS connections")
Signed-off-by: default avatarPauli Virtanen <pav@iki.fi>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent fb928170

net/bluetooth/hci_conn.c

+5 −2
Original line number Diff line number Diff line
@@ -947,8 +947,8 @@ static void find_cis(struct hci_conn *conn, void *data) 
{

	struct iso_list_data *d = data;



	/* Ignore broadcast */

	if (!bacmp(&conn->dst, BDADDR_ANY))

	/* Ignore broadcast or if CIG don't match */

	if (!bacmp(&conn->dst, BDADDR_ANY) || d->cig != conn->iso_qos.ucast.cig)

		return;



	d->count++;
@@ -963,6 +963,9 @@ static void cis_cleanup(struct hci_conn *conn) 
	struct hci_dev *hdev = conn->hdev;

	struct iso_list_data d;



	if (conn->iso_qos.ucast.cig == BT_ISO_QOS_CIG_UNSET)

		return;



	memset(&d, 0, sizeof(d));

	d.cig = conn->iso_qos.ucast.cig;