Commit 231835e4 authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller

igb: Fix erroneous display of stats by ethtool -S

Commit 337e067d overlooked the way offsets for netdev stats were considered.
Because of this some of the stats shown by ethtool -S were wrong.
This patch fixes it.
Signed-off-by: default avatarAjit Khaparde <ajitk@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8328c38f
...@@ -37,16 +37,22 @@ ...@@ -37,16 +37,22 @@
#include "igb.h" #include "igb.h"
enum {NETDEV_STATS, IGB_STATS};
struct igb_stats { struct igb_stats {
char stat_string[ETH_GSTRING_LEN]; char stat_string[ETH_GSTRING_LEN];
int type;
int sizeof_stat; int sizeof_stat;
int stat_offset; int stat_offset;
}; };
#define IGB_STAT(m) FIELD_SIZEOF(struct igb_adapter, m), \ #define IGB_STAT(m) IGB_STATS, \
FIELD_SIZEOF(struct igb_adapter, m), \
offsetof(struct igb_adapter, m) offsetof(struct igb_adapter, m)
#define IGB_NETDEV_STAT(m) FIELD_SIZEOF(struct net_device, m), \ #define IGB_NETDEV_STAT(m) NETDEV_STATS, \
FIELD_SIZEOF(struct net_device, m), \
offsetof(struct net_device, m) offsetof(struct net_device, m)
static const struct igb_stats igb_gstrings_stats[] = { static const struct igb_stats igb_gstrings_stats[] = {
{ "rx_packets", IGB_STAT(stats.gprc) }, { "rx_packets", IGB_STAT(stats.gprc) },
{ "tx_packets", IGB_STAT(stats.gptc) }, { "tx_packets", IGB_STAT(stats.gptc) },
...@@ -1959,10 +1965,21 @@ static void igb_get_ethtool_stats(struct net_device *netdev, ...@@ -1959,10 +1965,21 @@ static void igb_get_ethtool_stats(struct net_device *netdev,
int stat_count_rx = sizeof(struct igb_rx_queue_stats) / sizeof(u64); int stat_count_rx = sizeof(struct igb_rx_queue_stats) / sizeof(u64);
int j; int j;
int i; int i;
char *p = NULL;
igb_update_stats(adapter); igb_update_stats(adapter);
for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) { for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) {
char *p = (char *)adapter+igb_gstrings_stats[i].stat_offset; switch (igb_gstrings_stats[i].type) {
case NETDEV_STATS:
p = (char *) netdev +
igb_gstrings_stats[i].stat_offset;
break;
case IGB_STATS:
p = (char *) adapter +
igb_gstrings_stats[i].stat_offset;
break;
}
data[i] = (igb_gstrings_stats[i].sizeof_stat == data[i] = (igb_gstrings_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment