diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-05-29 14:50:45 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-29 14:50:45 -0400 |
| commit | 531efffc3e3ff52d732c8fa6f32e084e9c447612 (patch) | |
| tree | 79c301b2c8b5400a39c95e034764cf7a208a16a2 /drivers/net/wireless/b43/dma.h | |
| parent | bbf71a8f35cf52e97ba129401f82ccefd249c757 (diff) | |
| parent | b571a69745dc90aec3d0505a7ceac2702a93861b (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/b43/dma.h')
| -rw-r--r-- | drivers/net/wireless/b43/dma.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h index 9fdd1983079c..df8c8cdcbdb5 100644 --- a/drivers/net/wireless/b43/dma.h +++ b/drivers/net/wireless/b43/dma.h @@ -9,7 +9,7 @@ /* DMA-Interrupt reasons. */ #define B43_DMAIRQ_FATALMASK ((1 << 10) | (1 << 11) | (1 << 12) \ | (1 << 14) | (1 << 15)) -#define B43_DMAIRQ_NONFATALMASK (1 << 13) +#define B43_DMAIRQ_RDESC_UFLOW (1 << 13) #define B43_DMAIRQ_RX_DONE (1 << 16) /*** 32-bit DMA Engine. ***/ @@ -295,6 +295,8 @@ int b43_dma_tx(struct b43_wldev *dev, void b43_dma_handle_txstatus(struct b43_wldev *dev, const struct b43_txstatus *status); +void b43_dma_handle_rx_overflow(struct b43_dmaring *ring); + void b43_dma_rx(struct b43_dmaring *ring); void b43_dma_direct_fifo_rx(struct b43_wldev *dev, |