diff options
| author | Michael Buesch <mb@bu3sch.de> | 2006-06-05 20:24:10 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-15 15:48:13 -0400 |
| commit | 78ff56a06edc3407996173daf63e48f6b90c7062 (patch) | |
| tree | 93ddfccd648ee84faeb95bcf8f5183ac91d873f7 /drivers/net/wireless/bcm43xx/bcm43xx_pio.c | |
| parent | 74f4903363579d3336c294ebb11f02c8f35845ca (diff) | |
[PATCH] bcm43xx: redesign locking
Redesign the bcm43xx locking.
This is pre-work to get a preemptible periodic work handler.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_pio.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c index 0aa1bd269a2..e77e9d859f8 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c @@ -262,7 +262,7 @@ static void tx_tasklet(unsigned long d) int err; u16 txctl; - bcm43xx_lock_mmio(bcm, flags); + bcm43xx_lock_irqonly(bcm, flags); txctl = bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL); if (txctl & BCM43xx_PIO_TXCTL_SUSPEND) @@ -298,7 +298,7 @@ static void tx_tasklet(unsigned long d) continue; } out_unlock: - bcm43xx_unlock_mmio(bcm, flags); + bcm43xx_unlock_irqonly(bcm, flags); } static void setup_txqueues(struct bcm43xx_pioqueue *queue) @@ -374,7 +374,6 @@ static void cancel_transfers(struct bcm43xx_pioqueue *queue) struct bcm43xx_pio_txpacket *packet, *tmp_packet; netif_tx_disable(queue->bcm->net_dev); - assert(queue->bcm->shutting_down); tasklet_disable(&queue->txtask); list_for_each_entry_safe(packet, tmp_packet, &queue->txrunning, list) |