| Message ID | 20240725223451.3208825-1-luiz.dentz@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1] Bluetooth: hci_event: Fix setting DISCOVERY_FINDING for passive scanning | 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=873942 ---Test result--- Test Summary: CheckPatch PASS 0.64 seconds GitLint PASS 0.20 seconds SubjectPrefix PASS 0.06 seconds BuildKernel PASS 29.40 seconds CheckAllWarning PASS 31.84 seconds CheckSparse WARNING 37.32 seconds CheckSmatch WARNING 101.61 seconds BuildKernel32 PASS 28.20 seconds TestRunnerSetup PASS 520.51 seconds TestRunner_l2cap-tester PASS 21.92 seconds TestRunner_iso-tester PASS 34.54 seconds TestRunner_bnep-tester PASS 4.92 seconds TestRunner_mgmt-tester PASS 112.59 seconds TestRunner_rfcomm-tester PASS 7.79 seconds TestRunner_sco-tester PASS 15.17 seconds TestRunner_ioctl-tester PASS 7.99 seconds TestRunner_mesh-tester FAIL 6.23 seconds TestRunner_smp-tester PASS 6.93 seconds TestRunner_userchan-tester PASS 5.08 seconds IncrementalBuild PASS 27.08 seconds Details ############################## Test: CheckSparse - WARNING Desc: Run sparse tool with linux kernel Output: net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h): ############################## Test: CheckSmatch - WARNING Desc: Run smatch tool with source Output: net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h): ############################## Test: TestRunner_mesh-tester - FAIL Desc: Run mesh-tester with test-runner Output: Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0 Failed Test Cases Mesh - Send cancel - 2 Failed 0.095 seconds --- Regards, Linux Bluetooth
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Thu, 25 Jul 2024 18:34:51 -0400 you wrote: > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > DISCOVERY_FINDING shall only be set for active scanning as passive > scanning is not meant to generate MGMT Device Found events causing > discovering state to go out of sync since userspace would believe it > is discovering when in fact it is just passive scanning. > > [...] Here is the summary with links: - [v1] Bluetooth: hci_event: Fix setting DISCOVERY_FINDING for passive scanning https://git.kernel.org/bluetooth/bluetooth-next/c/7a27b0ac58ab You are awesome, thank you!
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8a4ebd93adfc..06da8ac13dca 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -119,13 +119,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state) case DISCOVERY_STARTING: break; case DISCOVERY_FINDING: - /* If discovery was not started then it was initiated by the - * MGMT interface so no MGMT event shall be generated either - */ - if (old_state != DISCOVERY_STARTING) { - hdev->discovery.state = old_state; - return; - } mgmt_discovering(hdev, 1); break; case DISCOVERY_RESOLVING: diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index dce8035ca799..d0c118c47f6c 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1721,9 +1721,10 @@ static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable) switch (enable) { case LE_SCAN_ENABLE: hci_dev_set_flag(hdev, HCI_LE_SCAN); - if (hdev->le_scan_type == LE_SCAN_ACTIVE) + if (hdev->le_scan_type == LE_SCAN_ACTIVE) { clear_pending_adv_report(hdev); - hci_discovery_set_state(hdev, DISCOVERY_FINDING); + hci_discovery_set_state(hdev, DISCOVERY_FINDING); + } break; case LE_SCAN_DISABLE: