Subject: [PATCH 2/6] sky2: Avoid race in sky2_change_mtu

From: Stephen Hemminger <[email-masked]>
Date: Thu, 13 May 2010 09:12:49 -0700

From: Mike McCormack <[email-masked]>

netif_stop_queue does not ensure all in-progress transmits are complete,
 so use netif_tx_disable() instead.

Secondly, make sure NAPI polls are disabled before stopping the tx queue,
 otherwise sky2_status_intr might trigger a TX queue wakeup between when
 we stop the queue and NAPI is disabled.

Signed-off-by: Mike McCormack <[email-masked]>
Acked-by: Stephen Hemminger <[email-masked]>

---
This is not a regression, so only apply to -next

--- a/drivers/net/sky2.c	2010-05-13 08:57:20.186332415 -0700
+++ b/drivers/net/sky2.c	2010-05-13 08:57:22.526983099 -0700
@@ -2275,8 +2275,8 @@ static int sky2_change_mtu(struct net_de
 	sky2_write32(hw, B0_IMSK, 0);
 
 	dev->trans_start = jiffies;	/* prevent tx timeout */
-	netif_stop_queue(dev);
 	napi_disable(&hw->napi);
+	netif_tx_disable(dev);
 
 	synchronize_irq(hw->pdev->irq);