adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 12:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

igb: Remove invalid stats counters

Browse source 
There are several counters being used like they are static when in fact
they are clear on read.  In order to prevent the values from being
incorrect I am removing the defunct counters.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2009-10-27 23:50:18 +00:00 committed by David S. Miller
parent 25568a531a
commit 645a3abd73
2 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/igb/igb.h
View file

@ -269,10 +269,6 @@ struct igb_adapter {
/* TX */ /* TX */
struct igb_ring *tx_ring; /* One per active queue */ struct igb_ring *tx_ring; /* One per active queue */
unsigned long tx_queue_len; unsigned long tx_queue_len;
u32 gotc;
u64 gotc_old;
u64 tpt_old;
u64 colc_old;
u32 tx_timeout_count; u32 tx_timeout_count;
/* RX */ /* RX */
@ -280,8 +276,6 @@ struct igb_adapter {
int num_tx_queues; int num_tx_queues;
int num_rx_queues; int num_rx_queues;
u32 gorc;
u64 gorc_old;
u32 max_frame_size; u32 max_frame_size;
u32 min_frame_size; u32 min_frame_size;

18
drivers/net/igb/igb_main.c
View file

@ -2925,9 +2925,6 @@ static void igb_watchdog_task(struct work_struct *work)
int i; int i;
link = igb_has_link(adapter); link = igb_has_link(adapter);
if ((netif_carrier_ok(netdev)) && link)
goto link_up;
if (link) { if (link) {
if (!netif_carrier_ok(netdev)) { if (!netif_carrier_ok(netdev)) {
u32 ctrl; u32 ctrl;
@ -2990,20 +2987,8 @@ static void igb_watchdog_task(struct work_struct *work)
} }
} }
link_up:
igb_update_stats(adapter); igb_update_stats(adapter);
igb_update_adaptive(hw);
hw->mac.tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
adapter->tpt_old = adapter->stats.tpt;
hw->mac.collision_delta = adapter->stats.colc - adapter->colc_old;
adapter->colc_old = adapter->stats.colc;
adapter->gorc = adapter->stats.gorc - adapter->gorc_old;
adapter->gorc_old = adapter->stats.gorc;
adapter->gotc = adapter->stats.gotc - adapter->gotc_old;
adapter->gotc_old = adapter->stats.gotc;
igb_update_adaptive(&adapter->hw);
if (!netif_carrier_ok(netdev)) { if (!netif_carrier_ok(netdev)) {
if (igb_desc_unused(tx_ring) + 1 < tx_ring->count) { if (igb_desc_unused(tx_ring) + 1 < tx_ring->count) {
@ -3875,7 +3860,6 @@ void igb_update_stats(struct igb_adapter *adapter)
adapter->stats.bptc += rd32(E1000_BPTC); adapter->stats.bptc += rd32(E1000_BPTC);
/* used for adaptive IFS */ /* used for adaptive IFS */
hw->mac.tx_packet_delta = rd32(E1000_TPT); hw->mac.tx_packet_delta = rd32(E1000_TPT);
adapter->stats.tpt += hw->mac.tx_packet_delta; adapter->stats.tpt += hw->mac.tx_packet_delta;
hw->mac.collision_delta = rd32(E1000_COLC); hw->mac.collision_delta = rd32(E1000_COLC);