leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] b44: race on device closing

Browse Source 
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>
This commit is contained in:
Francois Romieu 2005-11-08 23:37:12 +01:00 committed by Jeff Garzik
parent b9dcbb40f4
commit ba5eec9c55
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/b44.c
View File

@ -909,6 +909,12 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
istat &= imask; istat &= imask;
if (istat) { if (istat) {
handled = 1; 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)) { if (netif_rx_schedule_prep(dev)) {
/* NOTE: These writes are posted by the readback of /* NOTE: These writes are posted by the readback of
* the ISTAT register below. * the ISTAT register below.
@ -921,6 +927,7 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
dev->name); dev->name);
} }
irq_ack:
bw32(bp, B44_ISTAT, istat); bw32(bp, B44_ISTAT, istat);
br32(bp, B44_ISTAT); br32(bp, B44_ISTAT);
} }
@ -1446,6 +1453,8 @@ static int b44_close(struct net_device *dev)
netif_stop_queue(dev); netif_stop_queue(dev);
netif_poll_disable(dev);
del_timer_sync(&bp->timer); del_timer_sync(&bp->timer);
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);
@ -1461,6 +1470,8 @@ static int b44_close(struct net_device *dev)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
netif_poll_enable(dev);
b44_free_consistent(bp); b44_free_consistent(bp);
return 0; return 0;