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/microchip/ksz_common.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/microchip/ksz_common.c')
-rw-r--r-- | drivers/net/dsa/microchip/ksz_common.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index bcb3e6c734f2..7210c49b7922 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c | |||
@@ -439,15 +439,22 @@ static void ksz_disable_port(struct dsa_switch *ds, int port, | |||
439 | ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_MAC_LOOPBACK, true); | 439 | ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_MAC_LOOPBACK, true); |
440 | } | 440 | } |
441 | 441 | ||
442 | static int ksz_sset_count(struct dsa_switch *ds, int port) | 442 | static int ksz_sset_count(struct dsa_switch *ds, int port, int sset) |
443 | { | 443 | { |
444 | if (sset != ETH_SS_STATS) | ||
445 | return 0; | ||
446 | |||
444 | return TOTAL_SWITCH_COUNTER_NUM; | 447 | return TOTAL_SWITCH_COUNTER_NUM; |
445 | } | 448 | } |
446 | 449 | ||
447 | static void ksz_get_strings(struct dsa_switch *ds, int port, uint8_t *buf) | 450 | static void ksz_get_strings(struct dsa_switch *ds, int port, |
451 | u32 stringset, uint8_t *buf) | ||
448 | { | 452 | { |
449 | int i; | 453 | int i; |
450 | 454 | ||
455 | if (stringset != ETH_SS_STATS) | ||
456 | return; | ||
457 | |||
451 | for (i = 0; i < TOTAL_SWITCH_COUNTER_NUM; i++) { | 458 | for (i = 0; i < TOTAL_SWITCH_COUNTER_NUM; i++) { |
452 | memcpy(buf + i * ETH_GSTRING_LEN, mib_names[i].string, | 459 | memcpy(buf + i * ETH_GSTRING_LEN, mib_names[i].string, |
453 | ETH_GSTRING_LEN); | 460 | ETH_GSTRING_LEN); |