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/ibmveth.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/ibmveth.c')
-rw-r--r-- | drivers/net/ibmveth.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 228973484ed8..4ac161e1ca12 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -802,9 +802,14 @@ static void ibmveth_get_strings(struct net_device *dev, u32 stringset, u8 *data) | |||
802 | memcpy(data, ibmveth_stats[i].name, ETH_GSTRING_LEN); | 802 | memcpy(data, ibmveth_stats[i].name, ETH_GSTRING_LEN); |
803 | } | 803 | } |
804 | 804 | ||
805 | static int ibmveth_get_stats_count(struct net_device *dev) | 805 | static int ibmveth_get_sset_count(struct net_device *dev, int sset) |
806 | { | 806 | { |
807 | return ARRAY_SIZE(ibmveth_stats); | 807 | switch (sset) { |
808 | case ETH_SS_STATS: | ||
809 | return ARRAY_SIZE(ibmveth_stats); | ||
810 | default: | ||
811 | return -EOPNOTSUPP; | ||
812 | } | ||
808 | } | 813 | } |
809 | 814 | ||
810 | static void ibmveth_get_ethtool_stats(struct net_device *dev, | 815 | static void ibmveth_get_ethtool_stats(struct net_device *dev, |
@@ -825,7 +830,7 @@ static const struct ethtool_ops netdev_ethtool_ops = { | |||
825 | .get_rx_csum = ibmveth_get_rx_csum, | 830 | .get_rx_csum = ibmveth_get_rx_csum, |
826 | .set_rx_csum = ibmveth_set_rx_csum, | 831 | .set_rx_csum = ibmveth_set_rx_csum, |
827 | .get_strings = ibmveth_get_strings, | 832 | .get_strings = ibmveth_get_strings, |
828 | .get_stats_count = ibmveth_get_stats_count, | 833 | .get_sset_count = ibmveth_get_sset_count, |
829 | .get_ethtool_stats = ibmveth_get_ethtool_stats, | 834 | .get_ethtool_stats = ibmveth_get_ethtool_stats, |
830 | }; | 835 | }; |
831 | 836 | ||