Hi Florian,
> 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@xxxxxxxxx>
> ---
> net/bluetooth/mgmt.c | 21 +++++++++------------
> 1 file changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> index 9dc4905..55ab2a3 100644
> --- a/net/bluetooth/mgmt.c
> +++ b/net/bluetooth/mgmt.c
> @@ -6770,8 +6770,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);
> @@ -6784,12 +6785,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) {
> @@ -6803,15 +6801,14 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,
> rp->max_adv_data_len = HCI_MAX_AD_LENGTH;
> rp->max_scan_rsp_len = HCI_MAX_AD_LENGTH;
> rp->max_instances = HCI_MAX_ADV_INSTANCES;
> + rp->num_instances = hdev->adv_instance_cnt;
>
> - /* Currently only one instance is supported, so simply return the
> - * current instance number.
> - */
> if (instance) {
> - rp->num_instances = 1;
> - rp->instance[0] = 1;
> - } else {
> - rp->num_instances = 0;
> + i = 0;
> + list_for_each_entry(adv_instance, &hdev->adv_instances, list) {
> + rp->instance[i] = adv_instance->instance;
> + i++;
> + }
I would really prefer that we leave this logic in place. When !instance, then keep returning rp->num_instances = 0 and in the other case set it to hdev->adv_instance_cnt. I would also prefer that the list is really limited by adv_instance_cnt and not blindly trusted that the list size is the same.
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
