e1000e: do not modify tx_queue_len on link speed change
Subsystems (2)
PATCH 1/1 e1000e: do not modify tx_queue_len on link speed change
From: Emil Tantilov <[email protected]>
Previously the driver tweaked txqueuelen to avoid false Tx hang reports seen at half duplex. This had the effect of overriding user set values on link change/reset. Testing shows that adjusting only the timeout factor is sufficient to prevent Tx hang reports at half duplex.
This patch removes all instances of tx_queue_len in the driver.
Originally reported and patched by Franco Fichtner
---
drivers/net/e1000e/e1000.h | 1 - drivers/net/e1000e/netdev.c | 11 +---------- 2 files changed, 1 insertions(+), 11 deletions(-)
drivers/net/e1000e/e1000.h +0 -1
@@ -279,7 +279,6 @@ struct e1000_adapter {struct napi_struct napi; -unsigned long tx_queue_len;unsigned int restart_queue;u32 txd_cmd;
drivers/net/e1000e/netdev.c +1 -10
@@ -2289,8 +2289,6 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)ew32 (TCTL , tctl);e1000e_config_collision_dist (hw); - - adapter->tx_queue_len = adapter->netdev->tx_queue_len; }/**
@@ -2877,7 +2875,6 @@ void e1000e_down(struct e1000_adapter *adapter)del_timer_sync (&adapter->watchdog_timer);del_timer_sync (&adapter->phy_info_timer); - netdev->tx_queue_len = adapter->tx_queue_len;netif_carrier_off (netdev); adapter->link_speed =0 ; adapter->link_duplex =0 ;
@@ -3588,21 +3585,15 @@ static void e1000_watchdog_task(struct work_struct *work) "link gets many collisions.\n"); } -/* -* tweak tx_queue_len according to speed/duplex -* and adjust the timeout factor -*/ - netdev->tx_queue_len = adapter->tx_queue_len; +/* adjust timeout factor according to speed/duplex */ adapter->tx_timeout_factor =1 ;switch (adapter->link_speed) {case SPEED_10 : txb2b =0 ; - netdev->tx_queue_len =10 ; adapter->tx_timeout_factor =16 ;break ;case SPEED_100 : txb2b =0 ; - netdev->tx_queue_len =100 ; adapter->tx_timeout_factor =10 ;break ; }
From: Jeff Kirsher <[email protected]>
Date: Wed, 24 Mar 2010 15:55:02 -0700
Quoted 6 lines
From: Emil Tantilov <[email protected]>
Previously the driver tweaked txqueuelen to avoid false Tx hang reports seen at half duplex. This had the effect of overriding user set values on link change/reset. Testing shows that adjusting only the timeout factor is sufficient to prevent Tx hang reports at half duplex.
Quoted 6 lines
This patch removes all instances of
tx_queue_lenin the driver.Originally reported and patched by Franco Fichtner
CC Franco Fichtner <[email protected]>Signed-off-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied to net-2.6