1 files changed, 15 insertions, 0 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 2e6564e47ded..4c4912e9a7c4 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3924,6 +3924,21 @@ static int set_scan_params(struct sock *sk, struct hci_dev *hdev,
 
         err = cmd_complete(sk, hdev->id, MGMT_OP_SET_SCAN_PARAMS, 0, NULL, 0);
 
+        /* If background scan is running, restart it so new parameters are
+         * loaded.
+         */
+        if (test_bit(HCI_LE_SCAN, &hdev->dev_flags) &&
+            hdev->discovery.state == DISCOVERY_STOPPED) {
+                struct hci_request req;
+
+                hci_req_init(&req, hdev);
+
+                hci_req_add_le_scan_disable(&req);
+                hci_req_add_le_passive_scan(&req);
+
+                hci_req_run(&req, NULL);
+        }
+
         hci_dev_unlock(hdev);
 
         return err;