Re: [PATCH net-next 1/5] dsa: Pass the port to get_sset_count()

[Vivien Didelot]

Hi Andrew,

Andrew Lunn <and...@lunn.ch> writes:

> --- a/net/dsa/master.c
> +++ b/net/dsa/master.c
> @@ -42,7 +42,7 @@ static int dsa_master_get_sset_count(struct net_device 
> *dev, int sset)
>               count += ops->get_sset_count(dev, sset);
>  
>       if (sset == ETH_SS_STATS && ds->ops->get_sset_count)
> -             count += ds->ops->get_sset_count(ds);
> +             count += ds->ops->get_sset_count(ds, cpu_dp->index);
>  
>       return count;
>  }
> @@ -76,7 +76,7 @@ static void dsa_master_get_strings(struct net_device *dev, 
> uint32_t stringset,
>                * constructed earlier
>                */
>               ds->ops->get_strings(ds, port, ndata);
> -             count = ds->ops->get_sset_count(ds);
> +             count = ds->ops->get_sset_count(ds, cpu_dp->index);

You could reuse the 'port' variable already assigned to cpu_dp->index.

>               for (i = 0; i < count; i++) {
>                       memmove(ndata + (i * len + sizeof(pfx)),
>                               ndata + i * len, len - sizeof(pfx));
> diff --git a/net/dsa/slave.c b/net/dsa/slave.c
> index f52307296de4..0d07004d59d4 100644
> --- a/net/dsa/slave.c
> +++ b/net/dsa/slave.c
> @@ -559,7 +559,7 @@ static int dsa_slave_get_sset_count(struct net_device 
> *dev, int sset)
>  
>               count = 4;
>               if (ds->ops->get_sset_count)
> -                     count += ds->ops->get_sset_count(ds);
> +                     count += ds->ops->get_sset_count(ds, dp->index);
>  
>               return count;
>       }

Otherwise:

Reviewed-by: Vivien Didelot <vivien.dide...@savoirfairelinux.com>


Thanks,

        Vivien