Bluetooth: hci_sync: Ignore errors from HCI_OP_REMOTE_NAME_REQ_CANCEL

Commit Message

Luiz Augusto von Dentz Aug. 16, 2023, 7:05 p.m. UTC

From: Luiz Augusto von Dentz <[e-mail]>

This ignores errors from HCI_OP_REMOTE_NAME_REQ_CANCEL since it
shouldn't interfere with the stopping of discovery and in certain
conditions it seems to be failing.

Link: https://github.com/bluez/bluez/issues/575
Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
---
 net/bluetooth/hci_sync.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

[e-mail] Aug. 16, 2023, 7:38 p.m. UTC | #1

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=776737

---Test result---

Test Summary:
CheckPatch                    PASS      0.70 seconds
GitLint                       PASS      0.32 seconds
SubjectPrefix                 PASS      0.11 seconds
BuildKernel                   PASS      39.19 seconds
CheckAllWarning               PASS      42.49 seconds
CheckSparse                   PASS      47.48 seconds
CheckSmatch                   PASS      131.14 seconds
BuildKernel32                 PASS      37.30 seconds
TestRunnerSetup               PASS      569.82 seconds
TestRunner_l2cap-tester       PASS      28.80 seconds
TestRunner_iso-tester         FAIL      84.10 seconds
TestRunner_bnep-tester        PASS      13.31 seconds
TestRunner_mgmt-tester        PASS      251.00 seconds
TestRunner_rfcomm-tester      PASS      19.10 seconds
TestRunner_sco-tester         PASS      22.35 seconds
TestRunner_ioctl-tester       PASS      22.16 seconds
TestRunner_mesh-tester        PASS      16.91 seconds
TestRunner_smp-tester         PASS      18.24 seconds
TestRunner_userchan-tester    PASS      14.51 seconds
IncrementalBuild              PASS      35.71 seconds

Details
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
Total: 95, Passed: 93 (97.9%), Failed: 2, Not Run: 0

Failed Test Cases
ISO Connect Suspend - Success                        Failed       4.458 seconds
ISO Connect2 Suspend - Success                       Failed      14.591 seconds


---
Regards,
Linux Bluetooth

Patch

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index d10a0f36b947..f6d1dc1716e3 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -5206,7 +5206,10 @@  int hci_stop_discovery_sync(struct hci_dev *hdev)
 		if (!e)
 			return 0;
 
-		return hci_remote_name_cancel_sync(hdev, &e->data.bdaddr);
+		/* Ignore cancel errors since it should interfere with stopping
+		 * of the discovery.
+		 */
+		hci_remote_name_cancel_sync(hdev, &e->data.bdaddr);
 	}
 
 	return 0;