Bluetooth: HCI: Add proper tracking for enable status of adv instances

This adds a field to track if advertising instances are enabled or not
and only clear HCI_LE_ADV flag if there is no instance left advertising.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@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 4abe3c49400263c1877390dce557e6ae3c0176dd..b79b31359bf854a4689cd5e0c468cf9a25857c63 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -221,6 +221,7 @@ struct oob_data {
 
 struct adv_info {
        struct list_head list;
+       bool enabled;
        bool pending;
        __u8    instance;
        __u32   flags;

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index ea7fc09478be844b7550dada5c6439e4e36d75e7..35c5cc9f91b0143b9683fa4305fa265bdc32d17b 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1277,7 +1277,9 @@ static void hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev,
                                         struct sk_buff *skb)
 {
        struct hci_cp_le_set_ext_adv_enable *cp;
+       struct hci_cp_ext_adv_set *set;
        __u8 status = *((__u8 *) skb->data);
+       struct adv_info *adv = NULL, *n;
 
        BT_DBG("%s status 0x%2.2x", hdev->name, status);
 
@@ -1288,22 +1290,48 @@ static void hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev,
        if (!cp)
                return;
 
+       set = (void *)cp->data;
+
        hci_dev_lock(hdev);
 
+       if (cp->num_of_sets)
+               adv = hci_find_adv_instance(hdev, set->handle);
+
        if (cp->enable) {
                struct hci_conn *conn;
 
                hci_dev_set_flag(hdev, HCI_LE_ADV);
 
+               if (adv)
+                       adv->enabled = true;
+
                conn = hci_lookup_le_connect(hdev);
                if (conn)
                        queue_delayed_work(hdev->workqueue,
                                           &conn->le_conn_timeout,
                                           conn->conn_timeout);
        } else {
+               if (adv) {
+                       adv->enabled = false;
+                       /* If just one instance was disabled check if there are
+                        * any other instance enabled before clearing HCI_LE_ADV
+                        */
+                       list_for_each_entry_safe(adv, n, &hdev->adv_instances,
+                                                list) {
+                               if (adv->enabled)
+                                       goto unlock;
+                       }
+               } else {
+                       /* All instances shall be considered disabled */
+                       list_for_each_entry_safe(adv, n, &hdev->adv_instances,
+                                                list)
+                               adv->enabled = false;
+               }
+
                hci_dev_clear_flag(hdev, HCI_LE_ADV);
        }
 
+unlock:
        hci_dev_unlock(hdev);
 }