both hci_request.c and hci_sync.c have the same definition for
disconnected_accept_list_entries(), so remove a redundant copy.
Signed-off-by: Zijun Hu <[email protected]>
---
v4->v5
-move the func declaration from hci_request.h to hci_request.c
v2->v4
-optimize commit message
v1->v2
-remove the func copy within hci_request.c instead of hci_sync.c
net/bluetooth/hci_request.c | 20 ++------------------
net/bluetooth/hci_sync.c | 2 +-
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 635cc5fb451e..69e30217c4e4 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -32,6 +32,8 @@
#include "msft.h"
#include "eir.h"
+extern bool disconnected_accept_list_entries(struct hci_dev *hdev);
+
void hci_req_init(struct hci_request *req, struct hci_dev *hdev)
{
skb_queue_head_init(&req->cmd_q);
@@ -1784,24 +1786,6 @@ int hci_update_random_address(struct hci_request *req, bool require_privacy,
return 0;
}
-static bool disconnected_accept_list_entries(struct hci_dev *hdev)
-{
- struct bdaddr_list *b;
-
- list_for_each_entry(b, &hdev->accept_list, list) {
- struct hci_conn *conn;
-
- conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &b->bdaddr);
- if (!conn)
- return true;
-
- if (conn->state != BT_CONNECTED && conn->state != BT_CONFIG)
- return true;
- }
-
- return false;
-}
-
void __hci_req_update_scan(struct hci_request *req)
{
struct hci_dev *hdev = req->hdev;
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 3067d94e7a8e..b44d0b4143e6 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2425,7 +2425,7 @@ int hci_write_fast_connectable_sync(struct hci_dev *hdev, bool enable)
return err;
}
-static bool disconnected_accept_list_entries(struct hci_dev *hdev)
+bool disconnected_accept_list_entries(struct hci_dev *hdev)
{
struct bdaddr_list *b;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
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=662214
---Test result---
Test Summary:
CheckPatch PASS 2.01 seconds
GitLint PASS 1.07 seconds
SubjectPrefix PASS 0.91 seconds
BuildKernel PASS 35.23 seconds
BuildKernel32 PASS 31.05 seconds
Incremental Build with patchesPASS 49.16 seconds
TestRunner: Setup PASS 535.85 seconds
TestRunner: l2cap-tester PASS 17.28 seconds
TestRunner: bnep-tester PASS 6.05 seconds
TestRunner: mgmt-tester PASS 101.05 seconds
TestRunner: rfcomm-tester PASS 9.41 seconds
TestRunner: sco-tester PASS 9.45 seconds
TestRunner: smp-tester PASS 9.24 seconds
TestRunner: userchan-tester PASS 6.07 seconds
---
Regards,
Linux Bluetooth