| Message ID | 2bf70b0560375b50180518968abd8c4dfcce7f34.1684788145.git.pav@iki.fi |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/2] Bluetooth: ISO: consider right CIS when removing CIG at cleanup | expand |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=749935 ---Test result--- Test Summary: CheckPatch PASS 1.23 seconds GitLint FAIL 0.83 seconds SubjectPrefix PASS 0.14 seconds BuildKernel PASS 42.43 seconds CheckAllWarning PASS 47.20 seconds CheckSparse PASS 53.66 seconds CheckSmatch PASS 141.21 seconds BuildKernel32 PASS 39.84 seconds TestRunnerSetup PASS 572.92 seconds TestRunner_l2cap-tester PASS 19.08 seconds TestRunner_iso-tester PASS 25.65 seconds TestRunner_bnep-tester PASS 6.73 seconds TestRunner_mgmt-tester PASS 143.08 seconds TestRunner_rfcomm-tester PASS 11.26 seconds TestRunner_sco-tester PASS 10.24 seconds TestRunner_ioctl-tester PASS 11.53 seconds TestRunner_mesh-tester PASS 8.35 seconds TestRunner_smp-tester PASS 9.87 seconds TestRunner_userchan-tester PASS 6.99 seconds IncrementalBuild FAIL 0.94 seconds Details ############################## Test: GitLint - FAIL Desc: Run gitlint Output: [v2,2/2] Bluetooth: ISO: fix CIG auto-allocation to select configurable CIG 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" ############################## Test: IncrementalBuild - FAIL Desc: Incremental build with the patches in the series Output: error: patch failed: net/bluetooth/hci_conn.c:950 error: net/bluetooth/hci_conn.c: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch --- Regards, Linux Bluetooth
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index f75ef12f18f7..2363477af89d 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -950,6 +950,8 @@ static void find_cis(struct hci_conn *conn, void *data) /* Ignore broadcast */ if (!bacmp(&conn->dst, BDADDR_ANY)) return; + if (d->cig != conn->iso_qos.ucast.cig) + return; d->count++; } @@ -963,6 +965,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;
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: 26afbd826ee3 ("Bluetooth: Add initial implementation of CIS connections") Signed-off-by: Pauli Virtanen <pav@iki.fi> --- Notes: * v2: add forgotten signoff + fixes net/bluetooth/hci_conn.c | 5 +++++ 1 file changed, 5 insertions(+)