This patch fixes a previous patch which did not remove setting
scanning_paused to false after resuming. So after setting the value,
the function to update scan will always quit.
Also need to set the value first before updating passive scan.
BUG=b:236868580,b:236340454
TEST=verified suspend is fixed in volteer with LE mouse
TEST=bluetooth_AdapterSRHealth.sr_peer_wake_le_hid
TEST=bluetooth_AdapterCLHealth.cl_adapter_pairing_suspend_resume_test
Changes in v2:
- Reduce title length
Changes in v1:
- Fix updating passive scan after suspend resume
Zhengping Jiang (1):
Bluetooth: hci_sync: Fix resuming scan after suspend resume
net/bluetooth/hci_sync.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
2.37.0.144.g8ac04bfd2-goog
After resuming, remove setting scanning_paused to false, because it is
checked and set to false in hci_resume_scan_sync. Also move setting
the value to false before updating passive scan, because the value is
used when resuming passive scan.
Fixes: 3b42055388c30 (Bluetooth: hci_sync: Fix attempting to suspend with
unfiltered passive scan)
Signed-off-by: Zhengping Jiang <[email protected]>
Reviewed-by: Abhishek Pandit-Subedi <[email protected]>
---
Changes in v2:
- Reduce title length
Changes in v1:
- Fix updating passive scan after suspend resume
net/bluetooth/hci_sync.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 7cb3100518799..212b0cdb25f5e 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -5063,13 +5063,13 @@ static int hci_resume_scan_sync(struct hci_dev *hdev)
if (!hdev->scanning_paused)
return 0;
+ hdev->scanning_paused = false;
+
hci_update_scan_sync(hdev);
/* Reset passive scanning to normal */
hci_update_passive_scan_sync(hdev);
- hdev->scanning_paused = false;
-
return 0;
}
@@ -5088,7 +5088,6 @@ int hci_resume_sync(struct hci_dev *hdev)
return 0;
hdev->suspended = false;
- hdev->scanning_paused = false;
/* Restore event mask */
hci_set_event_mask_sync(hdev);
--
2.37.0.144.g8ac04bfd2-goog
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=658728
---Test result---
Test Summary:
CheckPatch PASS 1.60 seconds
GitLint PASS 0.77 seconds
SubjectPrefix PASS 0.71 seconds
BuildKernel PASS 31.65 seconds
BuildKernel32 PASS 26.96 seconds
Incremental Build with patchesPASS 37.72 seconds
TestRunner: Setup PASS 463.20 seconds
TestRunner: l2cap-tester PASS 16.32 seconds
TestRunner: bnep-tester PASS 5.49 seconds
TestRunner: mgmt-tester PASS 94.37 seconds
TestRunner: rfcomm-tester PASS 8.93 seconds
TestRunner: sco-tester PASS 8.69 seconds
TestRunner: smp-tester PASS 8.72 seconds
TestRunner: userchan-tester PASS 5.69 seconds
---
Regards,
Linux Bluetooth