Commit 373110c5 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann

Bluetooth: Rename hci_conn_params_clear to hci_conn_params_clear_all

We'll soon have specific clear functions for clearing enabled or
disabled entries, so rename the function that removes everything to
clear_all().
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent af963243
...@@ -861,7 +861,7 @@ struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev, ...@@ -861,7 +861,7 @@ struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,
int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type, int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
u8 auto_connect); u8 auto_connect);
void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type); void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type);
void hci_conn_params_clear(struct hci_dev *hdev); void hci_conn_params_clear_all(struct hci_dev *hdev);
struct bdaddr_list *hci_pend_le_conn_lookup(struct hci_dev *hdev, struct bdaddr_list *hci_pend_le_conn_lookup(struct hci_dev *hdev,
bdaddr_t *addr, u8 addr_type); bdaddr_t *addr, u8 addr_type);
......
...@@ -3580,7 +3580,7 @@ void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type) ...@@ -3580,7 +3580,7 @@ void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type)
} }
/* This function requires the caller holds hdev->lock */ /* This function requires the caller holds hdev->lock */
void hci_conn_params_clear(struct hci_dev *hdev) void hci_conn_params_clear_all(struct hci_dev *hdev)
{ {
struct hci_conn_params *params, *tmp; struct hci_conn_params *params, *tmp;
...@@ -4038,7 +4038,7 @@ void hci_unregister_dev(struct hci_dev *hdev) ...@@ -4038,7 +4038,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
hci_smp_irks_clear(hdev); hci_smp_irks_clear(hdev);
hci_remote_oob_data_clear(hdev); hci_remote_oob_data_clear(hdev);
hci_white_list_clear(hdev); hci_white_list_clear(hdev);
hci_conn_params_clear(hdev); hci_conn_params_clear_all(hdev);
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
hci_dev_put(hdev); hci_dev_put(hdev);
......
...@@ -5104,7 +5104,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev, ...@@ -5104,7 +5104,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
goto unlock; goto unlock;
} }
hci_conn_params_clear(hdev); hci_conn_params_clear_all(hdev);
} }
err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_DEVICE, err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_DEVICE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment