aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 02f7d20f3c80..167b1aedfb42 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2292,8 +2292,6 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
2292 ew32(TCTL, tctl); 2292 ew32(TCTL, tctl);
2293 2293
2294 e1000e_config_collision_dist(hw); 2294 e1000e_config_collision_dist(hw);
2295
2296 adapter->tx_queue_len = adapter->netdev->tx_queue_len;
2297} 2295}
2298 2296
2299/** 2297/**
@@ -2879,7 +2877,6 @@ void e1000e_down(struct e1000_adapter *adapter)
2879 del_timer_sync(&adapter->watchdog_timer); 2877 del_timer_sync(&adapter->watchdog_timer);
2880 del_timer_sync(&adapter->phy_info_timer); 2878 del_timer_sync(&adapter->phy_info_timer);
2881 2879
2882 netdev->tx_queue_len = adapter->tx_queue_len;
2883 netif_carrier_off(netdev); 2880 netif_carrier_off(netdev);
2884 adapter->link_speed = 0; 2881 adapter->link_speed = 0;
2885 adapter->link_duplex = 0; 2882 adapter->link_duplex = 0;
@@ -3612,21 +3609,15 @@ static void e1000_watchdog_task(struct work_struct *work)
3612 "link gets many collisions.\n"); 3609 "link gets many collisions.\n");
3613 } 3610 }
3614 3611
3615 /* 3612 /* adjust timeout factor according to speed/duplex */
3616 * tweak tx_queue_len according to speed/duplex
3617 * and adjust the timeout factor
3618 */
3619 netdev->tx_queue_len = adapter->tx_queue_len;
3620 adapter->tx_timeout_factor = 1; 3613 adapter->tx_timeout_factor = 1;
3621 switch (adapter->link_speed) { 3614 switch (adapter->link_speed) {
3622 case SPEED_10: 3615 case SPEED_10:
3623 txb2b = 0; 3616 txb2b = 0;
3624 netdev->tx_queue_len = 10;
3625 adapter->tx_timeout_factor = 16; 3617 adapter->tx_timeout_factor = 16;
3626 break; 3618 break;
3627 case SPEED_100: 3619 case SPEED_100:
3628 txb2b = 0; 3620 txb2b = 0;
3629 netdev->tx_queue_len = 100;
3630 adapter->tx_timeout_factor = 10; 3621 adapter->tx_timeout_factor = 10;
3631 break; 3622 break;
3632 } 3623 }