Skip to content

Commit 62bcaa6

Browse files
committed
Bluetooth: ISO: Fix defer tests being unstable
iso-tester defer tests seem to fail with hci_conn_hash_lookup_cig being unable to resolve a cig in set_cig_params_sync due a race where it is run immediatelly before hci_bind_cis is able to set the QoS settings into the hci_conn object. So this moves the assigning of the QoS settings to be done directly by hci_le_set_cig_params to prevent that from happening again. Fixes: 26afbd8 ("Bluetooth: Add initial implementation of CIS connections") Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 0e4d4dc commit 62bcaa6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/bluetooth/hci_conn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,6 +1944,8 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos)
19441944
return false;
19451945

19461946
done:
1947+
conn->iso_qos = *qos;
1948+
19471949
if (hci_cmd_sync_queue(hdev, set_cig_params_sync,
19481950
UINT_PTR(qos->ucast.cig), NULL) < 0)
19491951
return false;
@@ -2013,8 +2015,6 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst,
20132015
}
20142016

20152017
hci_conn_hold(cis);
2016-
2017-
cis->iso_qos = *qos;
20182018
cis->state = BT_BOUND;
20192019

20202020
return cis;

0 commit comments

Comments
 (0)