aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ehea
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-03 21:07:32 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:45 -0400
commitb9f2c0440d806e01968c3ed4def930a43be248ad (patch)
treeb8e4668b0a4eab842fc33402e92b15f6c63cbc18 /drivers/net/ehea
parent753f492093da7a40141bfe083073400f518f4c68 (diff)
[netdrvr] Stop using legacy hooks ->self_test_count, ->get_stats_count
These have been superceded by the new ->get_sset_count() hook. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea')
-rw-r--r--drivers/net/ehea/ehea_ethtool.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index 6498455bf97c..679f40ee9572 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -196,9 +196,14 @@ static void ehea_get_strings(struct net_device *dev, u32 stringset, u8 *data)
196 } 196 }
197} 197}
198 198
199static int ehea_get_stats_count(struct net_device *dev) 199static int ehea_get_sset_count(struct net_device *dev, int sset)
200{ 200{
201 return ARRAY_SIZE(ehea_ethtool_stats_keys); 201 switch (sset) {
202 case ETH_SS_STATS:
203 return ARRAY_SIZE(ehea_ethtool_stats_keys);
204 default:
205 return -EOPNOTSUPP;
206 }
202} 207}
203 208
204static void ehea_get_ethtool_stats(struct net_device *dev, 209static void ehea_get_ethtool_stats(struct net_device *dev,
@@ -207,7 +212,7 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
207 int i, k, tmp; 212 int i, k, tmp;
208 struct ehea_port *port = netdev_priv(dev); 213 struct ehea_port *port = netdev_priv(dev);
209 214
210 for (i = 0; i < ehea_get_stats_count(dev); i++) 215 for (i = 0; i < ehea_get_sset_count(dev, ETH_SS_STATS); i++)
211 data[i] = 0; 216 data[i] = 0;
212 i = 0; 217 i = 0;
213 218
@@ -264,7 +269,7 @@ const struct ethtool_ops ehea_ethtool_ops = {
264 .get_link = ethtool_op_get_link, 269 .get_link = ethtool_op_get_link,
265 .set_tso = ethtool_op_set_tso, 270 .set_tso = ethtool_op_set_tso,
266 .get_strings = ehea_get_strings, 271 .get_strings = ehea_get_strings,
267 .get_stats_count = ehea_get_stats_count, 272 .get_sset_count = ehea_get_sset_count,
268 .get_ethtool_stats = ehea_get_ethtool_stats, 273 .get_ethtool_stats = ehea_get_ethtool_stats,
269 .get_rx_csum = ehea_get_rx_csum, 274 .get_rx_csum = ehea_get_rx_csum,
270 .set_settings = ehea_set_settings, 275 .set_settings = ehea_set_settings,