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/r8169.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/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 06a1a6f2d17b..eecd811feead 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -992,9 +992,14 @@ struct rtl8169_counters { | |||
992 | u16 tx_underun; | 992 | u16 tx_underun; |
993 | }; | 993 | }; |
994 | 994 | ||
995 | static int rtl8169_get_stats_count(struct net_device *dev) | 995 | static int rtl8169_get_sset_count(struct net_device *dev, int sset) |
996 | { | 996 | { |
997 | return ARRAY_SIZE(rtl8169_gstrings); | 997 | switch (sset) { |
998 | case ETH_SS_STATS: | ||
999 | return ARRAY_SIZE(rtl8169_gstrings); | ||
1000 | default: | ||
1001 | return -EOPNOTSUPP; | ||
1002 | } | ||
998 | } | 1003 | } |
999 | 1004 | ||
1000 | static void rtl8169_get_ethtool_stats(struct net_device *dev, | 1005 | static void rtl8169_get_ethtool_stats(struct net_device *dev, |
@@ -1068,7 +1073,7 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { | |||
1068 | .get_wol = rtl8169_get_wol, | 1073 | .get_wol = rtl8169_get_wol, |
1069 | .set_wol = rtl8169_set_wol, | 1074 | .set_wol = rtl8169_set_wol, |
1070 | .get_strings = rtl8169_get_strings, | 1075 | .get_strings = rtl8169_get_strings, |
1071 | .get_stats_count = rtl8169_get_stats_count, | 1076 | .get_sset_count = rtl8169_get_sset_count, |
1072 | .get_ethtool_stats = rtl8169_get_ethtool_stats, | 1077 | .get_ethtool_stats = rtl8169_get_ethtool_stats, |
1073 | }; | 1078 | }; |
1074 | 1079 | ||