From: Mike McCormack <mikem@ring3k.org>
Date: Thu, 13 May 2010 06:12:49 +0000 (+0000)
Subject: sky2: Avoid race in sky2_change_mtu
X-Git-Tag: v2.6.35-rc1~473^2~118
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=df01093bb08916f434ebedde4610805d4105d05f;p=safe%2Fjmp%2Flinux-2.6

sky2: Avoid race in sky2_change_mtu

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 <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 15da5e4..efc31e9 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2275,8 +2275,8 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
 	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);