[PATCH] bcm43xx: receive TX status on MMIO or DMA unconditionally regarding the 80211 core rev.

Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2006-03-13 15:20:05 +01:00 committed by John W. Linville
parent 73733847be
commit e1b1b581b8

View File

@ -1765,22 +1765,17 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)
/* We intentionally don't set "activity" to 1, here. */ /* We intentionally don't set "activity" to 1, here. */
} }
if (dma_reason[3] & BCM43xx_DMAIRQ_RX_DONE) { if (dma_reason[3] & BCM43xx_DMAIRQ_RX_DONE) {
if (likely(bcm->current_core->rev < 5)) { if (bcm43xx_using_pio(bcm))
if (bcm43xx_using_pio(bcm)) bcm43xx_pio_rx(bcm->current_core->pio->queue3);
bcm43xx_pio_rx(bcm->current_core->pio->queue3); else
else bcm43xx_dma_rx(bcm->current_core->dma->rx_ring1);
bcm43xx_dma_rx(bcm->current_core->dma->rx_ring1); activity = 1;
activity = 1;
} else
assert(0);
} }
bcmirq_handled(BCM43xx_IRQ_RX); bcmirq_handled(BCM43xx_IRQ_RX);
if (reason & BCM43xx_IRQ_XMIT_STATUS) { if (reason & BCM43xx_IRQ_XMIT_STATUS) {
if (bcm->current_core->rev >= 5) { handle_irq_transmit_status(bcm);
handle_irq_transmit_status(bcm); activity = 1;
activity = 1;
}
//TODO: In AP mode, this also causes sending of powersave responses. //TODO: In AP mode, this also causes sending of powersave responses.
bcmirq_handled(BCM43xx_IRQ_XMIT_STATUS); bcmirq_handled(BCM43xx_IRQ_XMIT_STATUS);
} }