Bluetooth: Remove hci_req_le_suspend_config

Add a missing SUSPEND_SCAN_ENABLE in passive scan, remove the separate
function for configuring le scan during suspend and update the request
complete function to clear both enable and disable tasks.

Fixes: dce0a4be8054 ("Bluetooth: Set missing suspend task bits")
Reviewed-by: Alain Michaud <alainm@chromium.org>
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 71bffd7..5aa7bd5 100644 (file)
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1087,6 +1087,8 @@ void hci_req_add_le_passive_scan(struct hci_request *req)
        if (hdev->suspended) {
                window = hdev->le_scan_window_suspend;
                interval = hdev->le_scan_int_suspend;
+
+               set_bit(SUSPEND_SCAN_ENABLE, hdev->suspend_tasks);
        } else if (hci_is_le_conn_scanning(hdev)) {
                window = hdev->le_scan_window_connect;
                interval = hdev->le_scan_int_connect;
@@ -1170,19 +1172,6 @@ static void hci_req_set_event_filter(struct hci_request *req)
        hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
 }
 
-static void hci_req_config_le_suspend_scan(struct hci_request *req)
-{
-       /* Before changing params disable scan if enabled */
-       if (hci_dev_test_flag(req->hdev, HCI_LE_SCAN))
-               hci_req_add_le_scan_disable(req, false);
-
-       /* Configure params and enable scanning */
-       hci_req_add_le_passive_scan(req);
-
-       /* Block suspend notifier on response */
-       set_bit(SUSPEND_SCAN_ENABLE, req->hdev->suspend_tasks);
-}
-
 static void cancel_adv_timeout(struct hci_dev *hdev)
 {
        if (hdev->adv_instance_timeout) {
@@ -1245,8 +1234,10 @@ static void suspend_req_complete(struct hci_dev *hdev, u8 status, u16 opcode)
 {
        bt_dev_dbg(hdev, "Request complete opcode=0x%x, status=0x%x", opcode,
                   status);
-       if (test_and_clear_bit(SUSPEND_SCAN_ENABLE, hdev->suspend_tasks) ||
-           test_and_clear_bit(SUSPEND_SCAN_DISABLE, hdev->suspend_tasks)) {
+       if (test_bit(SUSPEND_SCAN_ENABLE, hdev->suspend_tasks) ||
+           test_bit(SUSPEND_SCAN_DISABLE, hdev->suspend_tasks)) {
+               clear_bit(SUSPEND_SCAN_ENABLE, hdev->suspend_tasks);
+               clear_bit(SUSPEND_SCAN_DISABLE, hdev->suspend_tasks);
                wake_up(&hdev->suspend_wait_q);
        }
 }
@@ -1336,7 +1327,7 @@ void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next)
                /* Enable event filter for paired devices */
                hci_req_set_event_filter(&req);
                /* Enable passive scan at lower duty cycle */
-               hci_req_config_le_suspend_scan(&req);
+               __hci_update_background_scan(&req);
                /* Pause scan changes again. */
                hdev->scanning_paused = true;
                hci_req_run(&req, suspend_req_complete);
@@ -1346,7 +1337,7 @@ void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next)
 
                hci_req_clear_event_filter(&req);
                /* Reset passive/background scanning to normal */
-               hci_req_config_le_suspend_scan(&req);
+               __hci_update_background_scan(&req);
 
                /* Unpause directed advertising */
                hdev->advertising_paused = false;