1 files changed, 21 insertions, 19 deletions

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index fa314cb005a4..987b41c8eb48 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -48,11 +48,13 @@ struct ixgbe_stats {
 
 #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)
 static struct ixgbe_stats ixgbe_gstrings_stats[] = {
-        {"rx_packets", IXGBE_STAT(net_stats.rx_packets)},
-        {"tx_packets", IXGBE_STAT(net_stats.tx_packets)},
-        {"rx_bytes", IXGBE_STAT(net_stats.rx_bytes)},
-        {"tx_bytes", IXGBE_STAT(net_stats.tx_bytes)},
+        {"rx_packets", IXGBE_NETDEV_STAT(stats.rx_packets)},
+        {"tx_packets", IXGBE_NETDEV_STAT(stats.tx_packets)},
+        {"rx_bytes", IXGBE_NETDEV_STAT(stats.rx_bytes)},
+        {"tx_bytes", IXGBE_NETDEV_STAT(stats.tx_bytes)},
         {"rx_pkts_nic", IXGBE_STAT(stats.gprc)},
         {"tx_pkts_nic", IXGBE_STAT(stats.gptc)},
         {"rx_bytes_nic", IXGBE_STAT(stats.gorc)},
@@ -60,26 +62,26 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = {
         {"lsc_int", IXGBE_STAT(lsc_int)},
         {"tx_busy", IXGBE_STAT(tx_busy)},
         {"non_eop_descs", IXGBE_STAT(non_eop_descs)},
-        {"rx_errors", IXGBE_STAT(net_stats.rx_errors)},
-        {"tx_errors", IXGBE_STAT(net_stats.tx_errors)},
-        {"rx_dropped", IXGBE_STAT(net_stats.rx_dropped)},
-        {"tx_dropped", IXGBE_STAT(net_stats.tx_dropped)},
-        {"multicast", IXGBE_STAT(net_stats.multicast)},
+        {"rx_errors", IXGBE_NETDEV_STAT(stats.rx_errors)},
+        {"tx_errors", IXGBE_NETDEV_STAT(stats.tx_errors)},
+        {"rx_dropped", IXGBE_NETDEV_STAT(stats.rx_dropped)},
+        {"tx_dropped", IXGBE_NETDEV_STAT(stats.tx_dropped)},
+        {"multicast", IXGBE_NETDEV_STAT(stats.multicast)},
         {"broadcast", IXGBE_STAT(stats.bprc)},
         {"rx_no_buffer_count", IXGBE_STAT(stats.rnbc[0]) },
-        {"collisions", IXGBE_STAT(net_stats.collisions)},
-        {"rx_over_errors", IXGBE_STAT(net_stats.rx_over_errors)},
-        {"rx_crc_errors", IXGBE_STAT(net_stats.rx_crc_errors)},
-        {"rx_frame_errors", IXGBE_STAT(net_stats.rx_frame_errors)},
+        {"collisions", IXGBE_NETDEV_STAT(stats.collisions)},
+        {"rx_over_errors", IXGBE_NETDEV_STAT(stats.rx_over_errors)},
+        {"rx_crc_errors", IXGBE_NETDEV_STAT(stats.rx_crc_errors)},
+        {"rx_frame_errors", IXGBE_NETDEV_STAT(stats.rx_frame_errors)},
         {"hw_rsc_count", IXGBE_STAT(rsc_count)},
         {"fdir_match", IXGBE_STAT(stats.fdirmatch)},
         {"fdir_miss", IXGBE_STAT(stats.fdirmiss)},
-        {"rx_fifo_errors", IXGBE_STAT(net_stats.rx_fifo_errors)},
-        {"rx_missed_errors", IXGBE_STAT(net_stats.rx_missed_errors)},
-        {"tx_aborted_errors", IXGBE_STAT(net_stats.tx_aborted_errors)},
-        {"tx_carrier_errors", IXGBE_STAT(net_stats.tx_carrier_errors)},
-        {"tx_fifo_errors", IXGBE_STAT(net_stats.tx_fifo_errors)},
-        {"tx_heartbeat_errors", IXGBE_STAT(net_stats.tx_heartbeat_errors)},
+        {"rx_fifo_errors", IXGBE_NETDEV_STAT(stats.rx_fifo_errors)},
+        {"rx_missed_errors", IXGBE_NETDEV_STAT(stats.rx_missed_errors)},
+        {"tx_aborted_errors", IXGBE_NETDEV_STAT(stats.tx_aborted_errors)},
+        {"tx_carrier_errors", IXGBE_NETDEV_STAT(stats.tx_carrier_errors)},
+        {"tx_fifo_errors", IXGBE_NETDEV_STAT(stats.tx_fifo_errors)},
+        {"tx_heartbeat_errors", IXGBE_NETDEV_STAT(stats.tx_heartbeat_errors)},
         {"tx_timeout_count", IXGBE_STAT(tx_timeout_count)},
         {"tx_restart_queue", IXGBE_STAT(restart_queue)},
         {"rx_long_length_errors", IXGBE_STAT(stats.roc)},