6a7681a828253d61830c73d8865b701609df36eccb626ac8ede99292.patch

From d3b5cbe8b9e73aa198441ecc65878c5023e9bdaa Mon Sep 17 00:00:00 2001
From: Howard Chung <howardchung@google.com>
Date: Fri, 4 Dec 2020 12:03:18 +0800
Subject: [PATCH] Revert "FROMLIST: Bluetooth: Set scan parameters for ADV
 Monitor"

This reverts commit c97f862e4ed62729e2d5a4eeed6803a1e4a49878.

Reason for revert: re-submit the same patch series from bluetooth-next

BUG=b:153076274
TEST=build on top of this chain

Original change's description:
> FROMLIST: Bluetooth: Set scan parameters for ADV Monitor
>
> Set scan parameters when there is at least one Advertisement monitor.
>
> (am from https://patchwork.kernel.org/patch/11781597/)
>
> BUG=b:163695127
> TEST=run following steps on Sarien:
> 1. set LEScanIntervalAdvMonitor,LEScanWindowAdvMonitor to 2000,1000
>    in main.conf
> 2. add ADV monitor via btmgmt
> 3. verify "Interval: 1250.000 msec (0x07d0)
>            Window: 625.000 msec (0x03e8)" in btmon
> 4. remove ADV monitor via btmgmt
> 5. verify "Extended scan: Disabled (0x00)" in btmon
>
> Signed-off-by: Howard Chung <howardchung@google.com>
> Signed-off-by: Alain Michaud <alainm@chromium.org>
> Reviewed-by: Alain Michaud <alainm@chromium.org>
> Reviewed-by: Manish Mandlik <mmandlik@chromium.org>
> Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
> Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
> Change-Id: I24fee8b0f8148989e53b00cd4cb9bca1d80731d0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2416050
> Reviewed-by: Sean Paul <seanpaul@chromium.org>

Signed-off-by: Howard Chung <howardchung@google.com>
Change-Id: Iace78f6c781e5c9d0cc28b29e94c49d94ea1186d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2654829
Reviewed-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
 net/bluetooth/hci_request.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 7cbb460b09d1..09a8fa183320 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1118,23 +1118,6 @@ void hci_req_add_le_passive_scan(struct hci_request *req)
 	} else if (hci_is_le_conn_scanning(hdev)) {
 		window = hdev->le_scan_window_connect;
 		interval = hdev->le_scan_int_connect;
-	} else if (hci_is_adv_monitoring(hdev)) {
-		window = hdev->le_scan_window_adv_monitor;
-		interval = hdev->le_scan_int_adv_monitor;
-
-		/* Disable duplicates filter when scanning for advertisement
-		 * monitor for the following reasons.
-		 *
-		 * For HW pattern filtering (ex. MSFT), Realtek and Qualcomm
-		 * controllers ignore RSSI_Sampling_Period when the duplicates
-		 * filter is enabled.
-		 *
-		 * For SW pattern filtering, when we're not doing interleaved
-		 * scanning, it is necessary to disable duplicates filter,
-		 * otherwise hosts can only receive one advertisement and it's
-		 * impossible to know if a peer is still in range.
-		 */
-		filter_dup = LE_SCAN_FILTER_DUP_DISABLE;
 	} else {
 		window = hdev->le_scan_window;
 		interval = hdev->le_scan_interval;
-- 
2.17.1