aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c19
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 }