Bluetooth: use configured default params for active scans

This patch fixes active scans to use the configured default parameters.

Signed-off-by: Alain Michaud <alainm@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 116207009dde0103f69757af703cfafec7b9f4c8..68a2ec36e1c1a5f5ef2bd9ce8b6ee82626ca907d 100644 (file)
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -2767,8 +2767,9 @@ static int active_scan(struct hci_request *req, unsigned long opt)
        if (err < 0)
                own_addr_type = ADDR_LE_DEV_PUBLIC;
 
-       hci_req_start_scan(req, LE_SCAN_ACTIVE, interval, DISCOV_LE_SCAN_WIN,
-                          own_addr_type, filter_policy);
+       hci_req_start_scan(req, LE_SCAN_ACTIVE, interval,
+                          hdev->le_scan_window_discovery, own_addr_type,
+                          filter_policy);
        return 0;
 }
 
@@ -2815,18 +2816,18 @@ static void start_discovery(struct hci_dev *hdev, u8 *status)
                         * to do BR/EDR inquiry.
                         */
                        hci_req_sync(hdev, interleaved_discov,
-                                    DISCOV_LE_SCAN_INT * 2, HCI_CMD_TIMEOUT,
+                                    hdev->le_scan_int_discovery * 2, HCI_CMD_TIMEOUT,
                                     status);
                        break;
                }
 
                timeout = msecs_to_jiffies(hdev->discov_interleaved_timeout);
-               hci_req_sync(hdev, active_scan, DISCOV_LE_SCAN_INT,
+               hci_req_sync(hdev, active_scan, hdev->le_scan_int_discovery,
                             HCI_CMD_TIMEOUT, status);
                break;
        case DISCOV_TYPE_LE:
                timeout = msecs_to_jiffies(DISCOV_LE_TIMEOUT);
-               hci_req_sync(hdev, active_scan, DISCOV_LE_SCAN_INT,
+               hci_req_sync(hdev, active_scan, hdev->le_scan_int_discovery,
                             HCI_CMD_TIMEOUT, status);
                break;
        default: