Commit 7274c20f authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller
Browse files

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: default avatarAjit Khaparde <ajitk@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72dad218

drivers/net/e1000e/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ struct e1000_adapter { 
	/* OS defined structs */

	struct net_device *netdev;

	struct pci_dev *pdev;

	struct net_device_stats net_stats;



	/* structs defined in e1000_hw.h */

	struct e1000_hw hw;

drivers/net/e1000e/ethtool.c

+10 −8
Original line number Diff line number Diff line
@@ -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) },

drivers/net/e1000e/netdev.c

+21 −22
Original line number Diff line number Diff line
@@ -560,8 +560,8 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, 


	adapter->total_rx_bytes += total_rx_bytes;

	adapter->total_rx_packets += total_rx_packets;

	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;

}
@@ -690,8 +690,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);

}
@@ -871,8 +871,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 


	adapter->total_rx_bytes += total_rx_bytes;

	adapter->total_rx_packets += total_rx_packets;

	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;

}
@@ -1051,8 +1051,8 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, 


	adapter->total_rx_bytes += total_rx_bytes;

	adapter->total_rx_packets += total_rx_packets;

	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;

}
@@ -3287,6 +3287,7 @@ static void e1000_update_phy_info(unsigned long data) 
 **/

void e1000e_update_stats(struct e1000_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	struct e1000_hw *hw = &adapter->hw;

	struct pci_dev *pdev = adapter->pdev;

	u16 phy_data;
@@ -3381,8 +3382,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter) 
	adapter->stats.tsctfc += er32(TSCTFC);



	/* 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 */
@@ -3390,22 +3391,22 @@ void e1000e_update_stats(struct e1000_adapter *adapter) 
	 * 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->net_stats.rx_length_errors = adapter->stats.ruc +

	netdev->stats.rx_length_errors = adapter->stats.ruc +

					      adapter->stats.roc;

	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_crc_errors = adapter->stats.crcerrs;

	netdev->stats.rx_frame_errors = adapter->stats.algnerrc;

	netdev->stats.rx_missed_errors = adapter->stats.mpc;



	/* Tx Errors */

	adapter->net_stats.tx_errors = adapter->stats.ecol +

	netdev->stats.tx_errors = adapter->stats.ecol +

				       adapter->stats.latecol;

	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_aborted_errors = adapter->stats.ecol;

	netdev->stats.tx_window_errors = adapter->stats.latecol;

	netdev->stats.tx_carrier_errors = adapter->stats.tncrs;



	/* Tx Dropped needs to be maintained elsewhere */
@@ -4254,10 +4255,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;

}



/**