Skip to contentSkip to conversation

Bluetooth: hci_core: Remove le_restart_scan work

PATCH Superseded Luiz Augusto von Dentz 2 participants 2 messages Sep 6, 2023

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH 1/1 Bluetooth: hci_core: Remove le_restart_scan work

From: Luiz Augusto von Dentz <[email protected]>

This removes le_restart_scan work and instead just disables controller duplicate filtering when discovery result_filtering is enabled and HCI_QUIRK_STRICT_DUPLICATE_FILTER is set.

---
 include/net/bluetooth/hci_core.h |  1 -
 net/bluetooth/hci_sync.c         | 96 +++-----------------------------
 net/bluetooth/mgmt.c             | 17 ------
 3 files changed, 7 insertions(+), 107 deletions(-)
include/net/bluetooth/hci_core.h +0 -1
index bbad301f5781..531795f990de 100644
@@ -532,7 +532,6 @@ struct hci_dev {
 	struct work_struct	tx_work;
 
 	struct delayed_work	le_scan_disable;
-	struct delayed_work	le_scan_restart;
 
 	struct sk_buff_head	rx_q;
 	struct sk_buff_head	raw_q;
net/bluetooth/hci_sync.c +7 -89

143 lines not on this page · raw message

net/bluetooth/mgmt.c +0 -17
index ba2e00646e8e..da79a2369dd7 100644
@@ -10134,21 +10134,6 @@ static bool eir_has_uuids(u8 *eir, u16 eir_len, u16 uuid_count, u8 (*uuids)[16])
 	return false;
 }
 
-static void restart_le_scan(struct hci_dev *hdev)
-{
-	/* If controller is not scanning we are done. */
-	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
-		return;
-
-	if (time_after(jiffies + DISCOV_LE_RESTART_DELAY,
-		       hdev->discovery.scan_start +
-		       hdev->discovery.scan_duration))
-		return;
-
-	queue_delayed_work(hdev->req_workqueue, &hdev->le_scan_restart,
-			   DISCOV_LE_RESTART_DELAY);
-}
-
 static bool is_filter_match(struct hci_dev *hdev, s8 rssi, u8 *eir,
 			    u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len)
 {
@@ -10183,8 +10168,6 @@ static bool is_filter_match(struct hci_dev *hdev, s8 rssi, u8 *eir,
 	 * scanning to ensure updated result with updated RSSI values.
 	 */
 	if (test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks)) {
-		restart_le_scan(hdev);
-
 		/* Validate RSSI value against the RSSI threshold once more. */
 		if (hdev->discovery.rssi != HCI_RSSI_INVALID &&
 		    rssi < hdev->discovery.rssi)
Signature · 1 line
2.41.0
#1 lore raw

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=782088

---Test result---

Test Summary:

CheckPatch                    PASS      1.03 seconds
GitLint                       PASS      0.30 seconds
SubjectPrefix                 PASS      0.10 seconds
BuildKernel                   PASS      33.82 seconds
CheckAllWarning               PASS      37.18 seconds
CheckSparse                   PASS      43.04 seconds
CheckSmatch                   PASS      113.93 seconds
BuildKernel32                 PASS      32.74 seconds
TestRunnerSetup               PASS      490.66 seconds
TestRunner_l2cap-tester       PASS      28.32 seconds
TestRunner_iso-tester         PASS      52.67 seconds
TestRunner_bnep-tester        PASS      11.17 seconds
TestRunner_mgmt-tester        PASS      224.61 seconds
TestRunner_rfcomm-tester      PASS      16.88 seconds
TestRunner_sco-tester         PASS      20.19 seconds
TestRunner_ioctl-tester       PASS      18.75 seconds
TestRunner_mesh-tester        PASS      13.93 seconds
TestRunner_smp-tester         PASS      15.04 seconds
TestRunner_userchan-tester    PASS      11.76 seconds
IncrementalBuild              PASS      31.05 seconds

---
Regards,
Linux Bluetooth