| Message ID | 47604dd334647dcd097dc0a87814745790522b0d.1684788145.git.pav@iki.fi (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fb576dc482524416a830398d86b60f0100236a00 |
| Headers | show |
| Series | [v2,1/2] Bluetooth: ISO: consider right CIS when removing CIG at cleanup | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | success | CheckPatch PASS |
| tedd_an/GitLint | fail | WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search 16: B2 Line has trailing whitespace: " " 21: B2 Line has trailing whitespace: " " 23: B2 Line has trailing whitespace: " " 24: B1 Line exceeds max length (83>80): " ISO Connect2 CIG auto/auto Seq - Success Passed 0.148 seconds" |
| tedd_an/SubjectPrefix | success | Gitlint PASS |
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 2363477af89d..99150d054a8d 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1771,24 +1771,23 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) memset(&data, 0, sizeof(data)); - /* Allocate a CIG if not set */ + /* Allocate first still reconfigurable CIG if not set */ if (qos->ucast.cig == BT_ISO_QOS_CIG_UNSET) { - for (data.cig = 0x00; data.cig < 0xff; data.cig++) { + for (data.cig = 0x00; data.cig < 0xf0; data.cig++) { data.count = 0; - data.cis = 0xff; - hci_conn_hash_list_state(hdev, cis_list, ISO_LINK, - BT_BOUND, &data); + hci_conn_hash_list_state(hdev, find_cis, ISO_LINK, + BT_CONNECT, &data); if (data.count) continue; - hci_conn_hash_list_state(hdev, cis_list, ISO_LINK, + hci_conn_hash_list_state(hdev, find_cis, ISO_LINK, BT_CONNECTED, &data); if (!data.count) break; } - if (data.cig == 0xff) + if (data.cig == 0xf0) return false; /* Update CIG */
Make CIG auto-allocation to select the first CIG_ID that is still configurable. Also use correct CIG_ID range (see Core v5.3 Vol 4 Part E Sec 7.8.97 p.2553). Previously, it would always select CIG_ID 0 regardless of anything, because cis_list with data.cis == 0xff (BT_ISO_QOS_CIS_UNSET) would not count any CIS. Since we are not adding CIS here, use find_cis instead. Fixes: 26afbd826ee3 ("Bluetooth: Add initial implementation of CIS connections") Signed-off-by: Pauli Virtanen <pav@iki.fi> --- Notes: * v2: add forgotten signoff + fixes It could also make sense to always auto-allocate to an unused CIG_ID instead. However, that changes current behavior, and would force userspace to do the allocation themselves as they may want to use as few CIG as possible. I think e.g Intel AX210 doesn't support multiple CIG. With the patchset adding new BlueZ iso-tester CIG tests: ISO Connect2 CIG auto/auto Seq - Success Passed 0.148 seconds net/bluetooth/hci_conn.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)