diff mbox series

[v11,2/5] Bluetooth: Handle system suspend resume case

Message ID 20201126122109.v11.2.I3774a8f0d748c7c6ec3402c4adcead32810c9164@changeid
State New
Headers show
Series [v11,1/5] Bluetooth: Interleave with allowlist scan | expand

Commit Message

Howard Chung Nov. 26, 2020, 4:22 a.m. UTC
This patch adds code to handle the system suspension during interleave
scan. The interleave scan will be canceled when the system is going to
sleep, and will be restarted after waking up.

Signed-off-by: Howard Chung <howardchung@google.com>
Reviewed-by: Alain Michaud <alainm@chromium.org>
Reviewed-by: Manish Mandlik <mmandlik@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---

(no changes since v5)

Changes in v5:
- Remove the change in hci_req_config_le_suspend_scan

 net/bluetooth/hci_request.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Marcel Holtmann Dec. 3, 2020, 1:21 p.m. UTC | #1
Hi Howard,

> This patch adds code to handle the system suspension during interleave

> scan. The interleave scan will be canceled when the system is going to

> sleep, and will be restarted after waking up.

> 

> Signed-off-by: Howard Chung <howardchung@google.com>

> Reviewed-by: Alain Michaud <alainm@chromium.org>

> Reviewed-by: Manish Mandlik <mmandlik@chromium.org>

> Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>

> Reviewed-by: Miao-chen Chou <mcchou@chromium.org>

> ---

> 

> (no changes since v5)

> 

> Changes in v5:

> - Remove the change in hci_req_config_le_suspend_scan

> 

> net/bluetooth/hci_request.c | 4 +++-

> 1 file changed, 3 insertions(+), 1 deletion(-)


patch has been applied to bluetooth-next tree.

Regards

Marcel
diff mbox series

Patch

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index d6bf1517ddaec..8addb94560013 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1294,8 +1294,10 @@  void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next)
 		hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &page_scan);
 
 		/* Disable LE passive scan if enabled */
-		if (hci_dev_test_flag(hdev, HCI_LE_SCAN))
+		if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {
+			cancel_interleave_scan(hdev);
 			hci_req_add_le_scan_disable(&req, false);
+		}
 
 		/* Mark task needing completion */
 		set_bit(SUSPEND_SCAN_DISABLE, hdev->suspend_tasks);