|
@@ -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;
|
|
|
}
|