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/cassini.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/cassini.c')
-rw-r--r-- | drivers/net/cassini.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index adc2e4d5a69e..563bf5f6fa2a 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -4772,9 +4772,14 @@ static void cas_get_regs(struct net_device *dev, struct ethtool_regs *regs, | |||
4772 | cas_read_regs(cp, p, regs->len / sizeof(u32)); | 4772 | cas_read_regs(cp, p, regs->len / sizeof(u32)); |
4773 | } | 4773 | } |
4774 | 4774 | ||
4775 | static int cas_get_stats_count(struct net_device *dev) | 4775 | static int cas_get_sset_count(struct net_device *dev, int sset) |
4776 | { | 4776 | { |
4777 | return CAS_NUM_STAT_KEYS; | 4777 | switch (sset) { |
4778 | case ETH_SS_STATS: | ||
4779 | return CAS_NUM_STAT_KEYS; | ||
4780 | default: | ||
4781 | return -EOPNOTSUPP; | ||
4782 | } | ||
4778 | } | 4783 | } |
4779 | 4784 | ||
4780 | static void cas_get_strings(struct net_device *dev, u32 stringset, u8 *data) | 4785 | static void cas_get_strings(struct net_device *dev, u32 stringset, u8 *data) |
@@ -4818,7 +4823,7 @@ static const struct ethtool_ops cas_ethtool_ops = { | |||
4818 | .set_msglevel = cas_set_msglevel, | 4823 | .set_msglevel = cas_set_msglevel, |
4819 | .get_regs_len = cas_get_regs_len, | 4824 | .get_regs_len = cas_get_regs_len, |
4820 | .get_regs = cas_get_regs, | 4825 | .get_regs = cas_get_regs, |
4821 | .get_stats_count = cas_get_stats_count, | 4826 | .get_sset_count = cas_get_sset_count, |
4822 | .get_strings = cas_get_strings, | 4827 | .get_strings = cas_get_strings, |
4823 | .get_ethtool_stats = cas_get_ethtool_stats, | 4828 | .get_ethtool_stats = cas_get_ethtool_stats, |
4824 | }; | 4829 | }; |