Bluetooth: mgmt: multi adv for read_adv_features()

The read_adv_features() method had a single instance identifier hard
coded. Refer to the advertising instance list instead to return a
dynamically generated list of instance identifiers.

Signed-off-by: Florian Grandel <fgrandel@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 7fabcb60da2d82e8d023a49ef69d751311f00add..49356c7788f96a534a430abdce7bbd5b8d2deb72 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6763,8 +6763,9 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,
 {
        struct mgmt_rp_read_adv_features *rp;
        size_t rp_len;
-       int err;
+       int err, i;
        bool instance;
+       struct adv_info *adv_instance;
        u32 supported_flags;
 
        BT_DBG("%s", hdev->name);
@@ -6777,12 +6778,9 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,
 
        rp_len = sizeof(*rp);
 
-       /* Currently only one instance is supported, so just add 1 to the
-        * response length.
-        */
        instance = hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE);
        if (instance)
-               rp_len++;
+               rp_len += hdev->adv_instance_cnt;
 
        rp = kmalloc(rp_len, GFP_ATOMIC);
        if (!rp) {
@@ -6797,12 +6795,16 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,
        rp->max_scan_rsp_len = HCI_MAX_AD_LENGTH;
        rp->max_instances = HCI_MAX_ADV_INSTANCES;
 
-       /* Currently only one instance is supported, so simply return the
-        * current instance number.
-        */
        if (instance) {
-               rp->num_instances = 1;
-               rp->instance[0] = 1;
+               i = 0;
+               list_for_each_entry(adv_instance, &hdev->adv_instances, list) {
+                       if (i >= hdev->adv_instance_cnt)
+                               break;
+
+                       rp->instance[i] = adv_instance->instance;
+                       i++;
+               }
+               rp->num_instances = hdev->adv_instance_cnt;
        } else {
                rp->num_instances = 0;
        }