Skip to contentSkip to conversation

Bluetooth: hci_core: Remove le_restart_scan work

PATCH RESEND Applied Luiz Augusto von Dentz 3 participants 3 messages Nov 22, 2023 – Nov 27, 2023

Subsystems (2)

v1 of 2 Applied 1/1 Latest is v2 →

lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH RESEND 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 201c0809540a..eed6c9f37b12 100644
@@ -534,7 +534,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.42.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=803389

---Test result---

Test Summary:

CheckPatch                    PASS      1.03 seconds
GitLint                       PASS      0.28 seconds
SubjectPrefix                 PASS      0.06 seconds
BuildKernel                   PASS      28.27 seconds
CheckAllWarning               PASS      31.23 seconds
CheckSparse                   PASS      36.70 seconds
CheckSmatch                   PASS      101.34 seconds
BuildKernel32                 PASS      27.83 seconds
TestRunnerSetup               PASS      432.11 seconds
TestRunner_l2cap-tester       PASS      23.97 seconds
TestRunner_iso-tester         PASS      40.21 seconds
TestRunner_bnep-tester        PASS      7.22 seconds
TestRunner_mgmt-tester        PASS      166.49 seconds
TestRunner_rfcomm-tester      PASS      13.10 seconds
TestRunner_sco-tester         PASS      14.69 seconds
TestRunner_ioctl-tester       PASS      12.21 seconds
TestRunner_mesh-tester        PASS      8.93 seconds
TestRunner_smp-tester         PASS      9.87 seconds
TestRunner_userchan-tester    PASS      7.40 seconds
IncrementalBuild              PASS      25.55 seconds

---
Regards,
Linux Bluetooth

#2 lore raw
In reply to Luiz Augusto von Dentz
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:

Quoted 11 lines · On Wed, 22 Nov 2023 12:56:36 -0500 you wrote:

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.

[...]

Here is the summary with links:
- [RESEND] Bluetooth: hci_core: Remove le_restart_scan work

    https://git.kernel.org/bluetooth/bluetooth-next/c/a4230d16e0b6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html