diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2018-04-25 15:12:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-27 11:53:03 -0400 |
commit | 89f09048348936a9a8c5131c8538cc6ed26fd44c (patch) | |
tree | 8b44dd664df9b03217bc751a9319e129dbe2c47a /drivers/net/dsa/mt7530.c | |
parent | 1d1e79f1c6a57dc3750d328ea38a4c385d4edee8 (diff) |
net: dsa: Pass stringset to ethtool operations
Up until now we largely assumed that we were interested in ETH_SS_STATS
type of strings for all ethtool operations, this is about to change with
the introduction of additional string sets, e.g: ETH_SS_PHY_STATS.
Update all functions to take an appropriate stringset argument and act
on it when it is different than ETH_SS_STATS for now.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mt7530.c')
-rw-r--r-- | drivers/net/dsa/mt7530.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 80a4dbc3a499..62e486652e62 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c | |||
@@ -573,10 +573,14 @@ static int mt7530_phy_write(struct dsa_switch *ds, int port, int regnum, | |||
573 | } | 573 | } |
574 | 574 | ||
575 | static void | 575 | static void |
576 | mt7530_get_strings(struct dsa_switch *ds, int port, uint8_t *data) | 576 | mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset, |
577 | uint8_t *data) | ||
577 | { | 578 | { |
578 | int i; | 579 | int i; |
579 | 580 | ||
581 | if (stringset != ETH_SS_STATS) | ||
582 | return; | ||
583 | |||
580 | for (i = 0; i < ARRAY_SIZE(mt7530_mib); i++) | 584 | for (i = 0; i < ARRAY_SIZE(mt7530_mib); i++) |
581 | strncpy(data + i * ETH_GSTRING_LEN, mt7530_mib[i].name, | 585 | strncpy(data + i * ETH_GSTRING_LEN, mt7530_mib[i].name, |
582 | ETH_GSTRING_LEN); | 586 | ETH_GSTRING_LEN); |
@@ -604,8 +608,11 @@ mt7530_get_ethtool_stats(struct dsa_switch *ds, int port, | |||
604 | } | 608 | } |
605 | 609 | ||
606 | static int | 610 | static int |
607 | mt7530_get_sset_count(struct dsa_switch *ds, int port) | 611 | mt7530_get_sset_count(struct dsa_switch *ds, int port, int sset) |
608 | { | 612 | { |
613 | if (sset != ETH_SS_STATS) | ||
614 | return 0; | ||
615 | |||
609 | return ARRAY_SIZE(mt7530_mib); | 616 | return ARRAY_SIZE(mt7530_mib); |
610 | } | 617 | } |
611 | 618 | ||