Commit b29be6d3 authored by Jay Cliburn's avatar Jay Cliburn Committed by David S. Miller

atl1: fix transmit timeout bug

See http://marc.info/?l=linux-netdev&m=121931988219314&w=2

Stop the queue and turn off carrier to prevent transmit timeouts
when the cable is unplugged/replugged.
Signed-off-by: default avatarJay Cliburn <jacliburn@bellsouth.net>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e824b3eb
...@@ -2642,6 +2642,7 @@ static void atl1_down(struct atl1_adapter *adapter) ...@@ -2642,6 +2642,7 @@ static void atl1_down(struct atl1_adapter *adapter)
{ {
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
netif_stop_queue(netdev);
del_timer_sync(&adapter->watchdog_timer); del_timer_sync(&adapter->watchdog_timer);
del_timer_sync(&adapter->phy_config_timer); del_timer_sync(&adapter->phy_config_timer);
adapter->phy_timer_pending = false; adapter->phy_timer_pending = false;
...@@ -2655,7 +2656,6 @@ static void atl1_down(struct atl1_adapter *adapter) ...@@ -2655,7 +2656,6 @@ static void atl1_down(struct atl1_adapter *adapter)
adapter->link_speed = SPEED_0; adapter->link_speed = SPEED_0;
adapter->link_duplex = -1; adapter->link_duplex = -1;
netif_carrier_off(netdev); netif_carrier_off(netdev);
netif_stop_queue(netdev);
atl1_clean_tx_ring(adapter); atl1_clean_tx_ring(adapter);
atl1_clean_rx_ring(adapter); atl1_clean_rx_ring(adapter);
...@@ -2724,6 +2724,8 @@ static int atl1_open(struct net_device *netdev) ...@@ -2724,6 +2724,8 @@ static int atl1_open(struct net_device *netdev)
struct atl1_adapter *adapter = netdev_priv(netdev); struct atl1_adapter *adapter = netdev_priv(netdev);
int err; int err;
netif_carrier_off(netdev);
/* allocate transmit descriptors */ /* allocate transmit descriptors */
err = atl1_setup_ring_resources(adapter); err = atl1_setup_ring_resources(adapter);
if (err) if (err)
......
...@@ -105,7 +105,6 @@ static void atlx_check_for_link(struct atlx_adapter *adapter) ...@@ -105,7 +105,6 @@ static void atlx_check_for_link(struct atlx_adapter *adapter)
netdev->name); netdev->name);
adapter->link_speed = SPEED_0; adapter->link_speed = SPEED_0;
netif_carrier_off(netdev); netif_carrier_off(netdev);
netif_stop_queue(netdev);
} }
} }
schedule_work(&adapter->link_chg_task); schedule_work(&adapter->link_chg_task);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment