diff options
author | Ayaz Abdulla <aabdulla@nvidia.com> | 2009-03-05 03:01:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-10 08:29:44 -0400 |
commit | 8ed1454aa8ab6c616f9c457238c6397c0529ceb9 (patch) | |
tree | ebaf3dd57c13d454e1826e2b255106e372b7d02d /drivers/net/forcedeth.c | |
parent | a2205472c3017bfe97b6cb6f5acd6ca141a97eda (diff) |
forcedeth: fix stats version feature
Newer versions of the stats feature would not encompass all older
versions. This would result in only retreiving a subset of all available
stats in HW.
Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index e3b7305e8b8c..abe3306855fd 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -87,8 +87,8 @@ | |||
87 | #define DEV_HAS_MSI_X 0x000080 /* device supports MSI-X */ | 87 | #define DEV_HAS_MSI_X 0x000080 /* device supports MSI-X */ |
88 | #define DEV_HAS_POWER_CNTRL 0x000100 /* device supports power savings */ | 88 | #define DEV_HAS_POWER_CNTRL 0x000100 /* device supports power savings */ |
89 | #define DEV_HAS_STATISTICS_V1 0x000200 /* device supports hw statistics version 1 */ | 89 | #define DEV_HAS_STATISTICS_V1 0x000200 /* device supports hw statistics version 1 */ |
90 | #define DEV_HAS_STATISTICS_V2 0x000400 /* device supports hw statistics version 2 */ | 90 | #define DEV_HAS_STATISTICS_V2 0x000600 /* device supports hw statistics version 2 */ |
91 | #define DEV_HAS_STATISTICS_V3 0x000800 /* device supports hw statistics version 3 */ | 91 | #define DEV_HAS_STATISTICS_V3 0x000e00 /* device supports hw statistics version 3 */ |
92 | #define DEV_HAS_TEST_EXTENDED 0x001000 /* device supports extended diagnostic test */ | 92 | #define DEV_HAS_TEST_EXTENDED 0x001000 /* device supports extended diagnostic test */ |
93 | #define DEV_HAS_MGMT_UNIT 0x002000 /* device supports management unit */ | 93 | #define DEV_HAS_MGMT_UNIT 0x002000 /* device supports management unit */ |
94 | #define DEV_HAS_CORRECT_MACADDR 0x004000 /* device supports correct mac address order */ | 94 | #define DEV_HAS_CORRECT_MACADDR 0x004000 /* device supports correct mac address order */ |
@@ -4796,12 +4796,12 @@ static int nv_get_sset_count(struct net_device *dev, int sset) | |||
4796 | else | 4796 | else |
4797 | return NV_TEST_COUNT_BASE; | 4797 | return NV_TEST_COUNT_BASE; |
4798 | case ETH_SS_STATS: | 4798 | case ETH_SS_STATS: |
4799 | if (np->driver_data & DEV_HAS_STATISTICS_V1) | 4799 | if (np->driver_data & DEV_HAS_STATISTICS_V3) |
4800 | return NV_DEV_STATISTICS_V1_COUNT; | 4800 | return NV_DEV_STATISTICS_V3_COUNT; |
4801 | else if (np->driver_data & DEV_HAS_STATISTICS_V2) | 4801 | else if (np->driver_data & DEV_HAS_STATISTICS_V2) |
4802 | return NV_DEV_STATISTICS_V2_COUNT; | 4802 | return NV_DEV_STATISTICS_V2_COUNT; |
4803 | else if (np->driver_data & DEV_HAS_STATISTICS_V3) | 4803 | else if (np->driver_data & DEV_HAS_STATISTICS_V1) |
4804 | return NV_DEV_STATISTICS_V3_COUNT; | 4804 | return NV_DEV_STATISTICS_V1_COUNT; |
4805 | else | 4805 | else |
4806 | return 0; | 4806 | return 0; |
4807 | default: | 4807 | default: |