e1000e: Use the instance of net_device_stats from net_device.

Since net_device has an instance of net_device_stats,
we can remove the instance of this from the private adapter structure.

Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 1bf4d2a5d34f..8a78a143e591 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -43,6 +43,8 @@ struct e1000_stats {
 
 #define E1000_STAT(m) sizeof(((struct e1000_adapter *)0)->m), \
                       offsetof(struct e1000_adapter, m)
+#define E1000_NETDEV_STAT(m) sizeof(((struct net_device *)0)->m), \
+                      offsetof(struct net_device, m)
 static const struct e1000_stats e1000_gstrings_stats[] = {
         { "rx_packets", E1000_STAT(stats.gprc) },
         { "tx_packets", E1000_STAT(stats.gptc) },
@@ -52,21 +54,21 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
         { "tx_broadcast", E1000_STAT(stats.bptc) },
         { "rx_multicast", E1000_STAT(stats.mprc) },
         { "tx_multicast", E1000_STAT(stats.mptc) },
-        { "rx_errors", E1000_STAT(net_stats.rx_errors) },
-        { "tx_errors", E1000_STAT(net_stats.tx_errors) },
-        { "tx_dropped", E1000_STAT(net_stats.tx_dropped) },
+        { "rx_errors", E1000_NETDEV_STAT(stats.rx_errors) },
+        { "tx_errors", E1000_NETDEV_STAT(stats.tx_errors) },
+        { "tx_dropped", E1000_NETDEV_STAT(stats.tx_dropped) },
         { "multicast", E1000_STAT(stats.mprc) },
         { "collisions", E1000_STAT(stats.colc) },
-        { "rx_length_errors", E1000_STAT(net_stats.rx_length_errors) },
-        { "rx_over_errors", E1000_STAT(net_stats.rx_over_errors) },
+        { "rx_length_errors", E1000_NETDEV_STAT(stats.rx_length_errors) },
+        { "rx_over_errors", E1000_NETDEV_STAT(stats.rx_over_errors) },
         { "rx_crc_errors", E1000_STAT(stats.crcerrs) },
-        { "rx_frame_errors", E1000_STAT(net_stats.rx_frame_errors) },
+        { "rx_frame_errors", E1000_NETDEV_STAT(stats.rx_frame_errors) },
         { "rx_no_buffer_count", E1000_STAT(stats.rnbc) },
         { "rx_missed_errors", E1000_STAT(stats.mpc) },
         { "tx_aborted_errors", E1000_STAT(stats.ecol) },
         { "tx_carrier_errors", E1000_STAT(stats.tncrs) },
-        { "tx_fifo_errors", E1000_STAT(net_stats.tx_fifo_errors) },
-        { "tx_heartbeat_errors", E1000_STAT(net_stats.tx_heartbeat_errors) },
+        { "tx_fifo_errors", E1000_NETDEV_STAT(stats.tx_fifo_errors) },
+        { "tx_heartbeat_errors", E1000_NETDEV_STAT(stats.tx_heartbeat_errors) },
         { "tx_window_errors", E1000_STAT(stats.latecol) },
         { "tx_abort_late_coll", E1000_STAT(stats.latecol) },
         { "tx_deferred_ok", E1000_STAT(stats.dc) },