| Message ID | b9da7e6788c218f4c3876a5e68b90af18ba800df.1685294131.git.pav@iki.fi (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | LE Set CIG Parameters / Create CIS fixes | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | success | CheckPatch PASS |
| tedd_an/GitLint | success | Gitlint PASS |
| tedd_an/SubjectPrefix | success | Gitlint PASS |
| tedd_an/IncrementalBuild | success | Incremental Build PASS |
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 182dba4a19b5..47a8ec796d97 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1815,6 +1815,19 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) /* Update CIG */ qos->ucast.cig = data.cig; + } else { + /* If CIG is busy, fail early because cmd error closes conns */ + data.cig = qos->ucast.cig; + data.count = 0; + + hci_conn_hash_list_state(hdev, find_cis, ISO_LINK, + BT_CONNECT, &data); + if (data.count) + return false; + hci_conn_hash_list_state(hdev, find_cis, ISO_LINK, + BT_CONNECTED, &data); + if (data.count) + return false; } data.pdu.cp.cig_id = qos->ucast.cig;
Don't try to do set CIG parameters if we know the CIG is busy, because we drop all connections on command failure in hci_cc_le_set_cig_params. Trying to connect new CIS while CIG is not configurable shall not cause other active CIS connections to fail. Check the CIG is not busy before trying to emit the Set CIG Parameters command. Fixes: 26afbd826ee3 ("Bluetooth: Add initial implementation of CIS connections") Signed-off-by: Pauli Virtanen <pav@iki.fi> --- net/bluetooth/hci_conn.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)