diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-03 21:07:32 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:45 -0400 |
commit | b9f2c0440d806e01968c3ed4def930a43be248ad (patch) | |
tree | b8e4668b0a4eab842fc33402e92b15f6c63cbc18 /drivers/net/8139cp.c | |
parent | 753f492093da7a40141bfe083073400f518f4c68 (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/8139cp.c')
-rw-r--r-- | drivers/net/8139cp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 7edd50cf7776..d437823c2c5e 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -1383,9 +1383,14 @@ static int cp_get_regs_len(struct net_device *dev) | |||
1383 | return CP_REGS_SIZE; | 1383 | return CP_REGS_SIZE; |
1384 | } | 1384 | } |
1385 | 1385 | ||
1386 | static int cp_get_stats_count (struct net_device *dev) | 1386 | static int cp_get_sset_count (struct net_device *dev, int sset) |
1387 | { | 1387 | { |
1388 | return CP_NUM_STATS; | 1388 | switch (sset) { |
1389 | case ETH_SS_STATS: | ||
1390 | return CP_NUM_STATS; | ||
1391 | default: | ||
1392 | return -EOPNOTSUPP; | ||
1393 | } | ||
1389 | } | 1394 | } |
1390 | 1395 | ||
1391 | static int cp_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | 1396 | static int cp_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) |
@@ -1563,7 +1568,7 @@ static void cp_get_ethtool_stats (struct net_device *dev, | |||
1563 | static const struct ethtool_ops cp_ethtool_ops = { | 1568 | static const struct ethtool_ops cp_ethtool_ops = { |
1564 | .get_drvinfo = cp_get_drvinfo, | 1569 | .get_drvinfo = cp_get_drvinfo, |
1565 | .get_regs_len = cp_get_regs_len, | 1570 | .get_regs_len = cp_get_regs_len, |
1566 | .get_stats_count = cp_get_stats_count, | 1571 | .get_sset_count = cp_get_sset_count, |
1567 | .get_settings = cp_get_settings, | 1572 | .get_settings = cp_get_settings, |
1568 | .set_settings = cp_set_settings, | 1573 | .set_settings = cp_set_settings, |
1569 | .nway_reset = cp_nway_reset, | 1574 | .nway_reset = cp_nway_reset, |