Commit d4edda0f authored by Alain Michaud's avatar Alain Michaud Committed by Marcel Holtmann
Browse files

Bluetooth: use configured default params for active scans 



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

Signed-off-by: default avatarAlain Michaud <alainm@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 49b020c1

net/bluetooth/hci_request.c

+6 −5
Original line number Diff line number Diff line
@@ -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: