summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-06 13:06:51 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-06 12:32:26 +0200
commit19de0825cd8acb1de6fa6a135b1f059446781049 (patch)
tree9be768edd200b27b526abc390f406b68dbfef4f1 /net/bluetooth/hci_core.c
parent9e1d7e15340b14bfb2ac86d77ca72fcebfe67d66 (diff)
downloadop-kernel-dev-19de0825cd8acb1de6fa6a135b1f059446781049.zip
op-kernel-dev-19de0825cd8acb1de6fa6a135b1f059446781049.tar.gz
Bluetooth: Fix sending Device Removed when clearing all parameters
When calling Device Remove with BDADDR_ANY we should in a similar way emit Device Removed events as we do when removing a single device. Since we have to iterate the list and call device_removed() the dedicated hci_conn_params_clear_enabled() is not really useful anymore. This patch removes the helper function and does the event emission and list item removal in a single loop. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index f996e2c..d01bd04 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3622,24 +3622,6 @@ void hci_conn_params_clear_disabled(struct hci_dev *hdev)
}
/* This function requires the caller holds hdev->lock */
-void hci_conn_params_clear_enabled(struct hci_dev *hdev)
-{
- struct hci_conn_params *params, *tmp;
-
- list_for_each_entry_safe(params, tmp, &hdev->le_conn_params, list) {
- if (params->auto_connect == HCI_AUTO_CONN_DISABLED)
- continue;
- list_del(&params->action);
- list_del(&params->list);
- kfree(params);
- }
-
- hci_update_background_scan(hdev);
-
- BT_DBG("All enabled LE connection parameters were removed");
-}
-
-/* This function requires the caller holds hdev->lock */
void hci_conn_params_clear_all(struct hci_dev *hdev)
{
struct hci_conn_params *params, *tmp;
OpenPOWER on IntegriCloud