aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 41330349b07a..47da5fc1e9f4 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -383,8 +383,6 @@ static void e1000_configure(struct e1000_adapter *adapter)
383 adapter->alloc_rx_buf(adapter, ring, 383 adapter->alloc_rx_buf(adapter, ring,
384 E1000_DESC_UNUSED(ring)); 384 E1000_DESC_UNUSED(ring));
385 } 385 }
386
387 adapter->tx_queue_len = netdev->tx_queue_len;
388} 386}
389 387
390int e1000_up(struct e1000_adapter *adapter) 388int e1000_up(struct e1000_adapter *adapter)
@@ -503,7 +501,6 @@ void e1000_down(struct e1000_adapter *adapter)
503 del_timer_sync(&adapter->watchdog_timer); 501 del_timer_sync(&adapter->watchdog_timer);
504 del_timer_sync(&adapter->phy_info_timer); 502 del_timer_sync(&adapter->phy_info_timer);
505 503
506 netdev->tx_queue_len = adapter->tx_queue_len;
507 adapter->link_speed = 0; 504 adapter->link_speed = 0;
508 adapter->link_duplex = 0; 505 adapter->link_duplex = 0;
509 netif_carrier_off(netdev); 506 netif_carrier_off(netdev);
@@ -2315,19 +2312,15 @@ static void e1000_watchdog(unsigned long data)
2315 E1000_CTRL_RFCE) ? "RX" : ((ctrl & 2312 E1000_CTRL_RFCE) ? "RX" : ((ctrl &
2316 E1000_CTRL_TFCE) ? "TX" : "None" ))); 2313 E1000_CTRL_TFCE) ? "TX" : "None" )));
2317 2314
2318 /* tweak tx_queue_len according to speed/duplex 2315 /* adjust timeout factor according to speed/duplex */
2319 * and adjust the timeout factor */
2320 netdev->tx_queue_len = adapter->tx_queue_len;
2321 adapter->tx_timeout_factor = 1; 2316 adapter->tx_timeout_factor = 1;
2322 switch (adapter->link_speed) { 2317 switch (adapter->link_speed) {
2323 case SPEED_10: 2318 case SPEED_10:
2324 txb2b = false; 2319 txb2b = false;
2325 netdev->tx_queue_len = 10;
2326 adapter->tx_timeout_factor = 16; 2320 adapter->tx_timeout_factor = 16;
2327 break; 2321 break;
2328 case SPEED_100: 2322 case SPEED_100:
2329 txb2b = false; 2323 txb2b = false;
2330 netdev->tx_queue_len = 100;
2331 /* maybe add some timeout factor ? */ 2324 /* maybe add some timeout factor ? */
2332 break; 2325 break;
2333 } 2326 }