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