Commit 422bb17f authored by Howard Chung's avatar Howard Chung Committed by Johan Hedberg

Bluetooth: Handle active scan case

This patch adds code to handle the active scan during interleave
scan. The interleave scan will be canceled when users start active scan,
and it will be restarted after active scan stopped.
Signed-off-by: default avatarHoward Chung <howardchung@google.com>
Reviewed-by: default avatarAlain Michaud <alainm@chromium.org>
Reviewed-by: default avatarManish Mandlik <mmandlik@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 36afe87a
...@@ -3083,8 +3083,10 @@ static int active_scan(struct hci_request *req, unsigned long opt) ...@@ -3083,8 +3083,10 @@ static int active_scan(struct hci_request *req, unsigned long opt)
* running. Thus, we should temporarily stop it in order to set the * running. Thus, we should temporarily stop it in order to set the
* discovery scanning parameters. * discovery scanning parameters.
*/ */
if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {
hci_req_add_le_scan_disable(req, false); hci_req_add_le_scan_disable(req, false);
cancel_interleave_scan(hdev);
}
/* All active scans will be done with either a resolvable private /* All active scans will be done with either a resolvable private
* address (when privacy feature has been enabled) or non-resolvable * address (when privacy feature has been enabled) or non-resolvable
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment