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>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index aff285698c8511deae1465c041c2fa23778a0b31..9d838a072db4a23913934086aeca92a17401925f 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -867,7 +867,6 @@ int hci_conn_params_set(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_all(struct hci_dev *hdev);
 void hci_conn_params_clear_disabled(struct hci_dev *hdev);
-void hci_conn_params_clear_enabled(struct hci_dev *hdev);
 
 struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list,
                                                  bdaddr_t *addr,

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index f996e2c4815c20ea8bc399b24406cea4e82057ae..d01bd043c2316210db8d8b29ac87b4bcc6181d11 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3621,24 +3621,6 @@ void hci_conn_params_clear_disabled(struct hci_dev *hdev)
        BT_DBG("All LE disabled connection parameters were removed");
 }
 
-/* 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)
 {

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f514eb15e0fb4fbbb4b707d21c9aaeadfd07a8c5..04a66429ad4db3aea8a6703e84fa5619bdcbef7c 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -5284,6 +5284,8 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
 
                device_removed(sk, hdev, &cp->addr.bdaddr, cp->addr.type);
        } else {
+               struct hci_conn_params *p, *tmp;
+
                if (cp->addr.type) {
                        err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_DEVICE,
                                           MGMT_STATUS_INVALID_PARAMS,
@@ -5291,7 +5293,18 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
                        goto unlock;
                }
 
-               hci_conn_params_clear_enabled(hdev);
+               list_for_each_entry_safe(p, tmp, &hdev->le_conn_params, list) {
+                       if (p->auto_connect == HCI_AUTO_CONN_DISABLED)
+                               continue;
+                       device_removed(sk, hdev, &p->addr, p->addr_type);
+                       list_del(&p->action);
+                       list_del(&p->list);
+                       kfree(p);
+               }
+
+               BT_DBG("All LE connection parameters were removed");
+
+               hci_update_background_scan(hdev);
        }
 
        err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_DEVICE,