From d898294d5d334669a90b8ea63f4bd0dad118dfec Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajitk@serverengines.com>
Date: Tue, 13 Oct 2009 01:47:33 +0000
Subject: [PATCH] --- yaml --- r: 170687 b: refs/heads/master c:
 29c3a050f83c524218b1baa4e43aedd21501b338 h: refs/heads/master i:   170685:
 778b7bc4c556aebdadf21952ed68078e5c48ea60   170683:
 4eec2a38392b616663ece3408cdc718f9083161a   170679:
 161234c1314f096edc90716fed8907b13cd2a08a   170671:
 94729859d682aec3d89c0866ba65083634d527e2   170655:
 f95893d4086cf8831c4a8c6af4c7b500495ef155   170623:
 40b022f9b9a77c5d9b319d2295eaf0fe98ab8376 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 27 ++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 621053daec1a..35bcc3744d52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f9cf8951e5253cfef821f8dcb92f6fc3af50c6
+refs/heads/master: 29c3a050f83c524218b1baa4e43aedd21501b338
diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
index 987b41c8eb48..08eccf418c67 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -40,16 +40,22 @@
 
 #define IXGBE_ALL_RAR_ENTRIES 16
 
+enum {NETDEV_STATS, IXGBE_STATS};
+
 struct ixgbe_stats {
 	char stat_string[ETH_GSTRING_LEN];
+	int type;
 	int sizeof_stat;
 	int stat_offset;
 };
 
-#define IXGBE_STAT(m) sizeof(((struct ixgbe_adapter *)0)->m), \
-                             offsetof(struct ixgbe_adapter, m)
-#define IXGBE_NETDEV_STAT(m) sizeof(((struct net_device *)0)->m), \
-                             offsetof(struct net_device, m)
+#define IXGBE_STAT(m)		IXGBE_STATS, \
+				sizeof(((struct ixgbe_adapter *)0)->m), \
+				offsetof(struct ixgbe_adapter, m)
+#define IXGBE_NETDEV_STAT(m)	NETDEV_STATS, \
+				sizeof(((struct net_device *)0)->m), \
+				offsetof(struct net_device, m)
+
 static struct ixgbe_stats ixgbe_gstrings_stats[] = {
 	{"rx_packets", IXGBE_NETDEV_STAT(stats.rx_packets)},
 	{"tx_packets", IXGBE_NETDEV_STAT(stats.tx_packets)},
@@ -931,10 +937,21 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
 	int stat_count = sizeof(struct ixgbe_queue_stats) / sizeof(u64);
 	int j, k;
 	int i;
+	char *p = NULL;
 
 	ixgbe_update_stats(adapter);
 	for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
-		char *p = (char *)adapter + ixgbe_gstrings_stats[i].stat_offset;
+		switch (ixgbe_gstrings_stats[i].type) {
+		case NETDEV_STATS:
+			p = (char *) netdev +
+					ixgbe_gstrings_stats[i].stat_offset;
+			break;
+		case IXGBE_STATS:
+			p = (char *) adapter +
+					ixgbe_gstrings_stats[i].stat_offset;
+			break;
+		}
+
 		data[i] = (ixgbe_gstrings_stats[i].sizeof_stat ==
 		           sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
 	}