summaryrefslogtreecommitdiffstats
path: root/net/dsa/slave.c
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-04-25 15:12:50 -0400
committerDavid S. Miller <davem@davemloft.net>2018-04-27 11:53:03 -0400
commit89f09048348936a9a8c5131c8538cc6ed26fd44c (patch)
tree8b44dd664df9b03217bc751a9319e129dbe2c47a /net/dsa/slave.c
parent1d1e79f1c6a57dc3750d328ea38a4c385d4edee8 (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 'net/dsa/slave.c')
-rw-r--r--net/dsa/slave.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 18561af7a8f1..f3fb3a0880b1 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -560,7 +560,8 @@ static void dsa_slave_get_strings(struct net_device *dev,
560 strncpy(data + 2 * len, "rx_packets", len); 560 strncpy(data + 2 * len, "rx_packets", len);
561 strncpy(data + 3 * len, "rx_bytes", len); 561 strncpy(data + 3 * len, "rx_bytes", len);
562 if (ds->ops->get_strings) 562 if (ds->ops->get_strings)
563 ds->ops->get_strings(ds, dp->index, data + 4 * len); 563 ds->ops->get_strings(ds, dp->index, stringset,
564 data + 4 * len);
564 } 565 }
565} 566}
566 567
@@ -605,7 +606,7 @@ static int dsa_slave_get_sset_count(struct net_device *dev, int sset)
605 606
606 count = 4; 607 count = 4;
607 if (ds->ops->get_sset_count) 608 if (ds->ops->get_sset_count)
608 count += ds->ops->get_sset_count(ds, dp->index); 609 count += ds->ops->get_sset_count(ds, dp->index, sset);
609 610
610 return count; 611 return count;
611 } 612 }