summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2010-05-13 10:12:49 +0400
committerDavid S. Miller <davem@davemloft.net>2010-05-14 14:06:20 +0400
commitdf01093bb08916f434ebedde4610805d4105d05f (patch)
tree85f19aa28e7b525ac22c5a981d2f4f83de97858a /drivers
parent37652522faa0877dc6d0dbb6b999bdccc07f0e89 (diff)
downloadlinux-df01093bb08916f434ebedde4610805d4105d05f.tar.xz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 15da5e419eb1..efc31e93eb78 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);