Commit 93135a3b authored May 13, 2010 by Mike McCormack Committed by David S. Miller May 14, 2010

sky2: Shut off interrupts before NAPI



Interrupts should be masked, then synchronized, and
finally NAPI should be 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>

parent df01093b

drivers/net/sky2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3320,10 +3320,10 @@ static void sky2_restart(struct work_struct *work)

		rtnl_lock();

		napi_disable(&hw->napi);
		synchronize_irq(hw->pdev->irq);
		imask = sky2_read32(hw, B0_IMSK);
		sky2_write32(hw, B0_IMSK, 0);
		synchronize_irq(hw->pdev->irq);
		napi_disable(&hw->napi);

		for (i = 0; i < hw->ports; i++) {
		struct net_device *dev = hw->dev[i];