igb: rx_fifo_errors counter fix
Subsystems (2)
PATCH 1/1 igb: rx_fifo_errors counter fix
From: Eric Dumazet <[email protected]>
Alexey Vlasov reported insane rx_queue_drop_packet_count (rx_fifo_errors) values.
IGB drivers is doing an accumulation for 82575, instead using a zero value for rqdpc_total.
---
drivers/net/igb/igb_main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/igb/igb_main.c +2 -3
@@ -3552,6 +3552,7 @@ void igb_update_stats(struct igb_adapter *adapter)struct e1000_hw *hw = &adapter->hw;struct pci_dev *pdev = adapter->pdev;u16 phy_tmp; +unsigned long rqdpc_total =0 ;#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
@@ -3645,7 +3646,6 @@ void igb_update_stats(struct igb_adapter *adapter)if (hw->mac.type != e1000_82575) {u32 rqdpc_tmp; -u64 rqdpc_total =0 ;int i;/* Read out drops stats per RX queue. Notice RQDPC (Receive * Queue Drop Packet Count) stats only gets incremented, if
@@ -3660,7 +3660,6 @@ void igb_update_stats(struct igb_adapter *adapter) adapter->rx_ring[i].rx_stats.drops += rqdpc_tmp; rqdpc_total += adapter->rx_ring[i].rx_stats.drops; } - adapter->net_stats.rx_fifo_errors = rqdpc_total; }/* Note RNBC (Receive No Buffers Count) is an not an exact
@@ -3668,7 +3667,7 @@ void igb_update_stats(struct igb_adapter *adapter)* one of the reason for saving it in rx_fifo_errors, as its * potentially not a true drop. */ - adapter->net_stats.rx_fifo_errors += adapter->stats.rnbc; + adapter->net_stats.rx_fifo_errors = rqdpc_total + adapter->stats.rnbc;/* RLEC on some newer hardware can be incorrect so build * our own version based on RUC and ROC */
From: Jeff Kirsher <[email protected]>
Date: Tue, 05 Oct 2010 16:04:09 -0700
Quoted 5 lines
From: Eric Dumazet <[email protected]>
Alexey Vlasov reported insane
rx_queue_drop_packet_count(rx_fifo_errors) values.
Quoted 7 lines
IGB drivers is doing an accumulation for 82575, instead using a zero value for
rqdpc_total.Reported-by Alexey Vlasov <[email protected]>Signed-off-by Eric Dumazet <[email protected]>Tested-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Quoted 8 lines · Jeff Kirsher
From: Eric Dumazet <[email protected]>
Alexey Vlasov reported insane
rx_queue_drop_packet_count(rx_fifo_errors) values.IGB drivers is doing an accumulation for 82575, instead using a zero value for
rqdpc_total.
Quoted 7 lines
Reported-by Alexey Vlasov <[email protected]>Signed-off-by Eric Dumazet <[email protected]>Tested-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>---
drivers/net/igb/igb_main.c | 5 ++---
Why isn't this needed in Linus's tree? If it is in Linus's tree, what is the git commit id?
Is it needed in .35? Please, more context...
thanks,
greg k-h