Skip to content

Commit

Permalink
[PATCH] b44: race on device closing
Browse files Browse the repository at this point in the history
Usual fix:
- b44_interrupt() does not schedule NAPI polling when the device is
  going down;
- b44_close() waits for any scheduled NAPI polling before it starts
  to release the private structures of the device.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Francois Romieu authored and Jeff Garzik committed Nov 9, 2005
1 parent b9dcbb4 commit ba5eec9
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/net/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,12 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
istat &= imask;
if (istat) {
handled = 1;

if (unlikely(!netif_running(dev))) {
printk(KERN_INFO "%s: late interrupt.\n", dev->name);
goto irq_ack;
}

if (netif_rx_schedule_prep(dev)) {
/* NOTE: These writes are posted by the readback of
* the ISTAT register below.
Expand All @@ -921,6 +927,7 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
dev->name);
}

irq_ack:
bw32(bp, B44_ISTAT, istat);
br32(bp, B44_ISTAT);
}
Expand Down Expand Up @@ -1446,6 +1453,8 @@ static int b44_close(struct net_device *dev)

netif_stop_queue(dev);

netif_poll_disable(dev);

del_timer_sync(&bp->timer);

spin_lock_irq(&bp->lock);
Expand All @@ -1461,6 +1470,8 @@ static int b44_close(struct net_device *dev)

free_irq(dev->irq, dev);

netif_poll_enable(dev);

b44_free_consistent(bp);

return 0;
Expand Down

0 comments on commit ba5eec9

Please sign in to comment.