diff options
author | Michael Buesch <mbuesch@freenet.de> | 2006-03-13 09:20:05 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-03-27 11:19:36 -0500 |
commit | e1b1b581b847a5ae9409a02a586476eaba2b3f89 (patch) | |
tree | 8022bfb924f0f3649b791ab440a54d27ca56a41c | |
parent | 73733847beead47dc31b1f8e1532e5eea9f8ddd3 (diff) |
[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>
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index a563258cad3d..3ab02f4f8ec0 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
@@ -1765,22 +1765,17 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm) | |||
1765 | /* We intentionally don't set "activity" to 1, here. */ | 1765 | /* We intentionally don't set "activity" to 1, here. */ |
1766 | } | 1766 | } |
1767 | if (dma_reason[3] & BCM43xx_DMAIRQ_RX_DONE) { | 1767 | if (dma_reason[3] & BCM43xx_DMAIRQ_RX_DONE) { |
1768 | if (likely(bcm->current_core->rev < 5)) { | 1768 | if (bcm43xx_using_pio(bcm)) |
1769 | if (bcm43xx_using_pio(bcm)) | 1769 | bcm43xx_pio_rx(bcm->current_core->pio->queue3); |
1770 | bcm43xx_pio_rx(bcm->current_core->pio->queue3); | 1770 | else |
1771 | else | 1771 | bcm43xx_dma_rx(bcm->current_core->dma->rx_ring1); |
1772 | bcm43xx_dma_rx(bcm->current_core->dma->rx_ring1); | 1772 | activity = 1; |
1773 | activity = 1; | ||
1774 | } else | ||
1775 | assert(0); | ||
1776 | } | 1773 | } |
1777 | bcmirq_handled(BCM43xx_IRQ_RX); | 1774 | bcmirq_handled(BCM43xx_IRQ_RX); |
1778 | 1775 | ||
1779 | if (reason & BCM43xx_IRQ_XMIT_STATUS) { | 1776 | if (reason & BCM43xx_IRQ_XMIT_STATUS) { |
1780 | if (bcm->current_core->rev >= 5) { | 1777 | handle_irq_transmit_status(bcm); |
1781 | handle_irq_transmit_status(bcm); | 1778 | activity = 1; |
1782 | activity = 1; | ||
1783 | } | ||
1784 | //TODO: In AP mode, this also causes sending of powersave responses. | 1779 | //TODO: In AP mode, this also causes sending of powersave responses. |
1785 | bcmirq_handled(BCM43xx_IRQ_XMIT_STATUS); | 1780 | bcmirq_handled(BCM43xx_IRQ_XMIT_STATUS); |
1786 | } | 1781 | } |