[kernel] r19273 - dists/sid/linux/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Jul 22 02:53:36 2012
New Revision: 19273

Log:
Fix context in atl1c bug fix patch

Modified:
   dists/sid/linux/debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch

Modified: dists/sid/linux/debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch	Sun Jul 22 02:37:20 2012	(r19272)
+++ dists/sid/linux/debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch	Sun Jul 22 02:53:36 2012	(r19273)
@@ -22,15 +22,13 @@
  drivers/net/ethernet/atheros/atl1c/atl1c_main.c |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-index 9cc1570..1f78b63 100644
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -261,7 +261,6 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
- 	if ((phy_data & BMSR_LSTATUS) == 0) {
- 		/* link down */
+@@ -267,7 +267,6 @@ static void atl1c_check_link_status(stru
+ 				dev_warn(&pdev->dev, "stop mac failed\n");
+ 		atl1c_set_aspm(hw, false);
  		netif_carrier_off(netdev);
 -		netif_stop_queue(netdev);
- 		hw->hibernate = true;
- 		if (atl1c_reset_mac(hw) != 0)
- 			if (netif_msg_hw(adapter))
+ 		atl1c_phy_reset(hw);
+ 		atl1c_phy_init(&adapter->hw);
+ 	} else {