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/chelsio/cxgb2.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/chelsio/cxgb2.c')
-rw-r--r-- | drivers/net/chelsio/cxgb2.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c index 7029f13d008d..2dbf8dc116c6 100644 --- a/drivers/net/chelsio/cxgb2.c +++ b/drivers/net/chelsio/cxgb2.c | |||
@@ -439,9 +439,14 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
439 | strcpy(info->bus_info, pci_name(adapter->pdev)); | 439 | strcpy(info->bus_info, pci_name(adapter->pdev)); |
440 | } | 440 | } |
441 | 441 | ||
442 | static int get_stats_count(struct net_device *dev) | 442 | static int get_sset_count(struct net_device *dev, int sset) |
443 | { | 443 | { |
444 | return ARRAY_SIZE(stats_strings); | 444 | switch (sset) { |
445 | case ETH_SS_STATS: | ||
446 | return ARRAY_SIZE(stats_strings); | ||
447 | default: | ||
448 | return -EOPNOTSUPP; | ||
449 | } | ||
445 | } | 450 | } |
446 | 451 | ||
447 | static void get_strings(struct net_device *dev, u32 stringset, u8 *data) | 452 | static void get_strings(struct net_device *dev, u32 stringset, u8 *data) |
@@ -798,7 +803,7 @@ static const struct ethtool_ops t1_ethtool_ops = { | |||
798 | .set_sg = ethtool_op_set_sg, | 803 | .set_sg = ethtool_op_set_sg, |
799 | .get_link = ethtool_op_get_link, | 804 | .get_link = ethtool_op_get_link, |
800 | .get_strings = get_strings, | 805 | .get_strings = get_strings, |
801 | .get_stats_count = get_stats_count, | 806 | .get_sset_count = get_sset_count, |
802 | .get_ethtool_stats = get_stats, | 807 | .get_ethtool_stats = get_stats, |
803 | .get_regs_len = get_regs_len, | 808 | .get_regs_len = get_regs_len, |
804 | .get_regs = get_regs, | 809 | .get_regs = get_regs, |