Commit 93135a3b authored by Mike McCormack's avatar Mike McCormack Committed by David S. Miller

sky2: Shut off interrupts before NAPI

Interrupts should be masked, then synchronized, and
finally NAPI should be disabled.
Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df01093b
...@@ -3320,10 +3320,10 @@ static void sky2_restart(struct work_struct *work) ...@@ -3320,10 +3320,10 @@ static void sky2_restart(struct work_struct *work)
rtnl_lock(); rtnl_lock();
napi_disable(&hw->napi);
synchronize_irq(hw->pdev->irq);
imask = sky2_read32(hw, B0_IMSK); imask = sky2_read32(hw, B0_IMSK);
sky2_write32(hw, B0_IMSK, 0); sky2_write32(hw, B0_IMSK, 0);
synchronize_irq(hw->pdev->irq);
napi_disable(&hw->napi);
for (i = 0; i < hw->ports; i++) { for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i]; struct net_device *dev = hw->dev[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment