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/spider_net_ethtool.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/spider_net_ethtool.c')
-rw-r--r-- | drivers/net/spider_net_ethtool.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c index 1460d5006d1c..94273037102f 100644 --- a/drivers/net/spider_net_ethtool.c +++ b/drivers/net/spider_net_ethtool.c | |||
@@ -147,9 +147,14 @@ spider_net_ethtool_get_ringparam(struct net_device *netdev, | |||
147 | ering->rx_pending = card->rx_chain.num_desc; | 147 | ering->rx_pending = card->rx_chain.num_desc; |
148 | } | 148 | } |
149 | 149 | ||
150 | static int spider_net_get_stats_count(struct net_device *netdev) | 150 | static int spider_net_get_sset_count(struct net_device *netdev, int sset) |
151 | { | 151 | { |
152 | return SPIDER_NET_NUM_STATS; | 152 | switch (sset) { |
153 | case ETH_SS_STATS: | ||
154 | return SPIDER_NET_NUM_STATS; | ||
155 | default: | ||
156 | return -EOPNOTSUPP; | ||
157 | } | ||
153 | } | 158 | } |
154 | 159 | ||
155 | static void spider_net_get_ethtool_stats(struct net_device *netdev, | 160 | static void spider_net_get_ethtool_stats(struct net_device *netdev, |
@@ -191,7 +196,7 @@ const struct ethtool_ops spider_net_ethtool_ops = { | |||
191 | .set_tx_csum = ethtool_op_set_tx_csum, | 196 | .set_tx_csum = ethtool_op_set_tx_csum, |
192 | .get_ringparam = spider_net_ethtool_get_ringparam, | 197 | .get_ringparam = spider_net_ethtool_get_ringparam, |
193 | .get_strings = spider_net_get_strings, | 198 | .get_strings = spider_net_get_strings, |
194 | .get_stats_count = spider_net_get_stats_count, | 199 | .get_sset_count = spider_net_get_sset_count, |
195 | .get_ethtool_stats = spider_net_get_ethtool_stats, | 200 | .get_ethtool_stats = spider_net_get_ethtool_stats, |
196 | }; | 201 | }; |
197 | 202 | ||