From 86b8e5ca087d7e608ebecf9e453e79c824a1d36f Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 13 Nov 2007 20:48:36 -0800 Subject: [PATCH] --- yaml --- r: 78931 b: refs/heads/master c: 419886927796dfeca87c1fd11d1fe2ed442103cc h: refs/heads/master i: 78929: 5f2ec64e0a5e3c6c71cdcc8ca53a2fadc8668298 78927: 687f76738aaec14a505ae22fcd35ada47f09e40a v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9ae559e364d2..2849d08feb51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a6c686799346b6c95405c9e051f5023873504fa +refs/heads/master: 419886927796dfeca87c1fd11d1fe2ed442103cc diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 51476a309c82..9b07a722e52d 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -458,6 +458,8 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, adapter->total_rx_packets += total_rx_packets; adapter->total_rx_bytes += total_rx_bytes; + adapter->net_stats.rx_packets += total_rx_packets; + adapter->net_stats.rx_bytes += total_rx_bytes; return cleaned; } @@ -593,6 +595,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_packets += total_tx_packets; + adapter->net_stats.tx_bytes += total_tx_bytes; return cleaned; } @@ -755,6 +759,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, adapter->total_rx_packets += total_rx_packets; adapter->total_rx_bytes += total_rx_bytes; + adapter->net_stats.rx_packets += total_rx_packets; + adapter->net_stats.rx_bytes += total_rx_bytes; return cleaned; } @@ -2535,10 +2541,6 @@ void e1000e_update_stats(struct e1000_adapter *adapter) } /* Fill out the OS statistics structure */ - adapter->net_stats.rx_packets = adapter->stats.gprc; - adapter->net_stats.tx_packets = adapter->stats.gptc; - adapter->net_stats.rx_bytes = adapter->stats.gorcl; - adapter->net_stats.tx_bytes = adapter->stats.gotcl; adapter->net_stats.multicast = adapter->stats.mprc; adapter->net_stats.collisions = adapter->stats.colc;