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]>
---
v2->v3
-remove table char to solve gitlint checking failure
v1->v2
-remove the func copy within hci_request.c instead of hci_sync.c
net/bluetooth/hci_request.c | 18 ------------------
net/bluetooth/hci_request.h | 2 ++
net/bluetooth/hci_sync.c | 2 +-
3 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 635cc5fb451e..edec0447aaa7 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1784,24 +1784,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_request.h b/net/bluetooth/hci_request.h
index 7f8df258e295..e80b500878d9 100644
--- a/net/bluetooth/hci_request.h
+++ b/net/bluetooth/hci_request.h
@@ -120,6 +120,8 @@ void __hci_req_update_scan(struct hci_request *req);
int hci_update_random_address(struct hci_request *req, bool require_privacy,
bool use_rpa, u8 *own_addr_type);
+bool disconnected_accept_list_entries(struct hci_dev *hdev);
+
int hci_abort_conn(struct hci_conn *conn, u8 reason);
void __hci_abort_conn(struct hci_request *req, struct hci_conn *conn,
u8 reason);
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 212b0cdb25f5..48a262f0ae49 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2419,7 +2419,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=659950
---Test result---
Test Summary:
CheckPatch PASS 1.42 seconds
GitLint PASS 0.58 seconds
SubjectPrefix PASS 0.50 seconds
BuildKernel PASS 34.86 seconds
BuildKernel32 PASS 30.74 seconds
Incremental Build with patchesPASS 42.15 seconds
TestRunner: Setup PASS 516.15 seconds
TestRunner: l2cap-tester PASS 17.07 seconds
TestRunner: bnep-tester PASS 5.80 seconds
TestRunner: mgmt-tester PASS 100.43 seconds
TestRunner: rfcomm-tester PASS 9.21 seconds
TestRunner: sco-tester PASS 9.00 seconds
TestRunner: smp-tester PASS 9.17 seconds
TestRunner: userchan-tester PASS 6.03 seconds
---
Regards,
Linux Bluetooth