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>

1 files changed, 14 insertions, 1 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f514eb15e0fb..04a66429ad4d 100644
--- 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,