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

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

net/bluetooth/hci_request.c

+3 −1
Original line number Diff line number Diff line
@@ -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

	 * 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);

		cancel_interleave_scan(hdev);

	}



	/* All active scans will be done with either a resolvable private

	 * address (when privacy feature has been enabled) or non-resolvable