igbvf: do not modify tx_queue_len on link speed change
Subsystems (2)
PATCH 1/1 igbvf: 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.
Based on e1000e patch by Franco Fichtner <[email protected]>
---
drivers/net/igbvf/igbvf.h | 1 - drivers/net/igbvf/netdev.c | 11 +---------- 2 files changed, 1 insertions(+), 11 deletions(-)
drivers/net/igbvf/igbvf.h +0 -1
@@ -198,7 +198,6 @@ struct igbvf_adapter {struct igbvf_ring *tx_ring/* One per active queue */ ____cacheline_aligned_in_smp ; -unsigned long tx_queue_len;unsigned int restart_queue;u32 txd_cmd;
drivers/net/igbvf/netdev.c +1 -10
@@ -1304,8 +1304,6 @@ static void igbvf_configure_tx(struct igbvf_adapter *adapter)/* enable Report Status bit */ adapter->txd_cmd |=E1000_ADVTXD_DCMD_RS ; - - adapter->tx_queue_len = adapter->netdev->tx_queue_len; }/**
@@ -1524,7 +1522,6 @@ void igbvf_down(struct igbvf_adapter *adapter)del_timer_sync (&adapter->watchdog_timer); - netdev->tx_queue_len = adapter->tx_queue_len;netif_carrier_off (netdev);/* record the stats before reset*/
@@ -1857,21 +1854,15 @@ static void igbvf_watchdog_task(struct work_struct *work) &adapter->link_duplex);igbvf_print_link_info (adapter); -/* -* 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 ;/* maybe add some timeout factor ? */ break ; }
From: Jeff Kirsher <[email protected]>
Date: Thu, 25 Mar 2010 15:11:48 -0700
Quoted 11 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.
Based on e1000e patch by Franco Fichtner <[email protected]>
CC Franco Fichtner <[email protected]>Signed-off-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.