Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8328c38f authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller
Browse files

e1000: Fix erroneous display of stats by ethtool -S 



Commit 23d26497 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 e0f36a95

drivers/net/e1000/e1000_ethtool.c

+22 −5
Original line number Original line Diff line number Diff line
@@ -31,16 +31,22 @@ 
#include "e1000.h"

#include "e1000.h"

#include <asm/uaccess.h>

#include <asm/uaccess.h>





enum {NETDEV_STATS, E1000_STATS};



struct e1000_stats {

struct e1000_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 E1000_STAT(m) FIELD_SIZEOF(struct e1000_adapter, m), \

#define E1000_STAT(m)		E1000_STATS, \

				sizeof(((struct e1000_adapter *)0)->m), \

		      		offsetof(struct e1000_adapter, m)

		      		offsetof(struct e1000_adapter, m)

#define E1000_NETDEV_STAT(m) FIELD_SIZEOF(struct net_device, m), \

#define E1000_NETDEV_STAT(m)	NETDEV_STATS, \

				sizeof(((struct net_device *)0)->m), \

				offsetof(struct net_device, m)

				offsetof(struct net_device, m)



static const struct e1000_stats e1000_gstrings_stats[] = {

static const struct e1000_stats e1000_gstrings_stats[] = {

	{ "rx_packets", E1000_STAT(stats.gprc) },

	{ "rx_packets", E1000_STAT(stats.gprc) },

	{ "tx_packets", E1000_STAT(stats.gptc) },

	{ "tx_packets", E1000_STAT(stats.gptc) },
@@ -1832,10 +1838,21 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, 
{

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);

	int i;

	int i;

	char *p = NULL;





	e1000_update_stats(adapter);

	e1000_update_stats(adapter);

	for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {

	for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {

		char *p = (char *)adapter+e1000_gstrings_stats[i].stat_offset;

		switch (e1000_gstrings_stats[i].type) {

		case NETDEV_STATS:

			p = (char *) netdev +

					e1000_gstrings_stats[i].stat_offset;

			break;

		case E1000_STATS:

			p = (char *) adapter +

					e1000_gstrings_stats[i].stat_offset;

			break;

		}



		data[i] = (e1000_gstrings_stats[i].sizeof_stat ==

		data[i] = (e1000_gstrings_stats[i].sizeof_stat ==

			sizeof(u64)) ? *(u64 *)p : *(u32 *)p;

			sizeof(u64)) ? *(u64 *)p : *(u32 *)p;

	}

	}