b43: Rename the DMA ring pointers
PATCH 1/1 b43: Rename the DMA ring pointers
Rename the DMA ring pointers to have more descriptive and standard names. Also remove the 6th unused TX ring. We can add it back later, if we need it. The unused TX-status rx-ring is also removed, as that's only used by legacy devices not supported by this driver anyway.
This is no functional change, except less memory allocation for the removed rings.
Signed-off-by Michael Buesch <[email protected]>
---
For 2.6.26
drivers/net/wireless/b43/b43.h +6 -8
@@ -586,21 +586,19 @@ struct b43_phy {bool phy_locked;#endif /* B43_DEBUG */ };/* Data structures for DMA transmission, per 80211 core. */ struct b43_dma { -struct b43_dmaring *tx_ring0; -struct b43_dmaring *tx_ring1; -struct b43_dmaring *tx_ring2; -struct b43_dmaring *tx_ring3; -struct b43_dmaring *tx_ring4; -struct b43_dmaring *tx_ring5; +struct b43_dmaring *tx_ring_AC_BK;/* Background */ +struct b43_dmaring *tx_ring_AC_BE;/* Best Effort */ +struct b43_dmaring *tx_ring_AC_VI;/* Video */ +struct b43_dmaring *tx_ring_AC_VO;/* Voice */ +struct b43_dmaring *tx_ring_mcast;/* Multicast */ -struct b43_dmaring *rx_ring0; -struct b43_dmaring *rx_ring3;/* only available on core.rev < 5 */ +struct b43_dmaring *rx_ring; };/* Context information for a noise calculation (Link Quality). */ struct b43_noise_calculation {u8 channel_at_start;bool calculation_running;
drivers/net/wireless/b43/dma.c +77 -155
394 lines not on this page · raw message
drivers/net/wireless/b43/main.c +2 -3
@@ -1591,17 +1591,16 @@ static void b43_interrupt_tasklet(struct ;/* TODO */ if (reason &B43_IRQ_NOISESAMPLE_OK )handle_irq_noise (dev);/* Check the DMA reason registers for received data. */ if (dma_reason[0 ] &B43_DMAIRQ_RX_DONE ) -b43_dma_rx (dev->dma.rx_ring0); -if (dma_reason[3 ] &B43_DMAIRQ_RX_DONE ) -b43_dma_rx (dev->dma.rx_ring3); +b43_dma_rx (dev->dma.rx_ring);B43_WARN_ON (dma_reason[1 ] &B43_DMAIRQ_RX_DONE );B43_WARN_ON (dma_reason[2 ] &B43_DMAIRQ_RX_DONE ); +B43_WARN_ON (dma_reason[3 ] &B43_DMAIRQ_RX_DONE );B43_WARN_ON (dma_reason[4 ] &B43_DMAIRQ_RX_DONE );B43_WARN_ON (dma_reason[5 ] &B43_DMAIRQ_RX_DONE );if (reason &B43_IRQ_TX_OK )handle_irq_transmit_status (dev);