Skip to content

Commit

Permalink
sky2: Shut off interrupts before NAPI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike McCormack authored and David S. Miller committed May 14, 2010
1 parent df01093 commit 93135a3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 93135a3

Please sign in to comment.