Skip to content

Commit

Permalink
igbvf: do not modify tx_queue_len on link speed change
Browse files Browse the repository at this point in the history
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 <franco@lastsummer.de>

CC: Franco Fichtner <franco@lastsummer.de>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Emil Tantilov authored and David S. Miller committed Mar 27, 2010
1 parent 6a2bad7 commit a08af74
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
1 change: 0 additions & 1 deletion drivers/net/igbvf/igbvf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
11 changes: 1 addition & 10 deletions drivers/net/igbvf/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -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*/
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit a08af74

Please sign in to comment.