Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/atlx/atl1.c

+3 −1
Original line number Diff line number Diff line
@@ -2642,6 +2642,7 @@ static void atl1_down(struct atl1_adapter *adapter) 
{

	struct net_device *netdev = adapter->netdev;



	netif_stop_queue(netdev);

	del_timer_sync(&adapter->watchdog_timer);

	del_timer_sync(&adapter->phy_config_timer);

	adapter->phy_timer_pending = false;
@@ -2655,7 +2656,6 @@ static void atl1_down(struct atl1_adapter *adapter) 
	adapter->link_speed = SPEED_0;

	adapter->link_duplex = -1;

	netif_carrier_off(netdev);

	netif_stop_queue(netdev);



	atl1_clean_tx_ring(adapter);

	atl1_clean_rx_ring(adapter);
@@ -2724,6 +2724,8 @@ static int atl1_open(struct net_device *netdev) 
	struct atl1_adapter *adapter = netdev_priv(netdev);

	int err;



	netif_carrier_off(netdev);



	/* allocate transmit descriptors */

	err = atl1_setup_ring_resources(adapter);

	if (err)

drivers/net/atlx/atlx.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static void atlx_check_for_link(struct atlx_adapter *adapter) 
				netdev->name);

			adapter->link_speed = SPEED_0;

			netif_carrier_off(netdev);

			netif_stop_queue(netdev);

		}

	}

	schedule_work(&adapter->link_chg_task);