e1000: 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 adapter structure.

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

1 files changed, 20 insertions, 21 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index bcd192ca47b0..6a6141482979 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3101,10 +3101,8 @@ static void e1000_reset_task(struct work_struct *work)
 
 static struct net_device_stats *e1000_get_stats(struct net_device *netdev)
 {
-        struct e1000_adapter *adapter = netdev_priv(netdev);
-
         /* only return the current stats */
-        return &adapter->net_stats;
+        return &netdev->stats;
 }
 
 /**
@@ -3196,6 +3194,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 
 void e1000_update_stats(struct e1000_adapter *adapter)
 {
+        struct net_device *netdev = adapter->netdev;
         struct e1000_hw *hw = &adapter->hw;
         struct pci_dev *pdev = adapter->pdev;
         unsigned long flags;
@@ -3288,32 +3287,32 @@ void e1000_update_stats(struct e1000_adapter *adapter)
         }
 
         /* Fill out the OS statistics structure */
-        adapter->net_stats.multicast = adapter->stats.mprc;
-        adapter->net_stats.collisions = adapter->stats.colc;
+        netdev->stats.multicast = adapter->stats.mprc;
+        netdev->stats.collisions = adapter->stats.colc;
 
         /* Rx Errors */
 
         /* RLEC on some newer hardware can be incorrect so build
         * our own version based on RUC and ROC */
-        adapter->net_stats.rx_errors = adapter->stats.rxerrc +
+        netdev->stats.rx_errors = adapter->stats.rxerrc +
                 adapter->stats.crcerrs + adapter->stats.algnerrc +
                 adapter->stats.ruc + adapter->stats.roc +
                 adapter->stats.cexterr;
         adapter->stats.rlerrc = adapter->stats.ruc + adapter->stats.roc;
-        adapter->net_stats.rx_length_errors = adapter->stats.rlerrc;
-        adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs;
-        adapter->net_stats.rx_frame_errors = adapter->stats.algnerrc;
-        adapter->net_stats.rx_missed_errors = adapter->stats.mpc;
+        netdev->stats.rx_length_errors = adapter->stats.rlerrc;
+        netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
+        netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
+        netdev->stats.rx_missed_errors = adapter->stats.mpc;
 
         /* Tx Errors */
         adapter->stats.txerrc = adapter->stats.ecol + adapter->stats.latecol;
-        adapter->net_stats.tx_errors = adapter->stats.txerrc;
-        adapter->net_stats.tx_aborted_errors = adapter->stats.ecol;
-        adapter->net_stats.tx_window_errors = adapter->stats.latecol;
-        adapter->net_stats.tx_carrier_errors = adapter->stats.tncrs;
+        netdev->stats.tx_errors = adapter->stats.txerrc;
+        netdev->stats.tx_aborted_errors = adapter->stats.ecol;
+        netdev->stats.tx_window_errors = adapter->stats.latecol;
+        netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
         if (hw->bad_tx_carr_stats_fd &&
             adapter->link_duplex == FULL_DUPLEX) {
-                adapter->net_stats.tx_carrier_errors = 0;
+                netdev->stats.tx_carrier_errors = 0;
                 adapter->stats.tncrs = 0;
         }
 
@@ -3514,8 +3513,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
         }
         adapter->total_tx_bytes += total_tx_bytes;
         adapter->total_tx_packets += total_tx_packets;
-        adapter->net_stats.tx_bytes += total_tx_bytes;
-        adapter->net_stats.tx_packets += total_tx_packets;
+        netdev->stats.tx_bytes += total_tx_bytes;
+        netdev->stats.tx_packets += total_tx_packets;
         return (count < tx_ring->count);
 }
 
@@ -3767,8 +3766,8 @@ next_desc:
 
         adapter->total_rx_packets += total_rx_packets;
         adapter->total_rx_bytes += total_rx_bytes;
-        adapter->net_stats.rx_bytes += total_rx_bytes;
-        adapter->net_stats.rx_packets += total_rx_packets;
+        netdev->stats.rx_bytes += total_rx_bytes;
+        netdev->stats.rx_packets += total_rx_packets;
         return cleaned;
 }
 
@@ -3916,8 +3915,8 @@ next_desc:
 
         adapter->total_rx_packets += total_rx_packets;
         adapter->total_rx_bytes += total_rx_bytes;
-        adapter->net_stats.rx_bytes += total_rx_bytes;
-        adapter->net_stats.rx_packets += total_rx_packets;
+        netdev->stats.rx_bytes += total_rx_bytes;
+        netdev->stats.rx_packets += total_rx_packets;
         return cleaned;
 }