diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2011-08-11 17:16:27 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:45:59 -0400 |
| commit | 17030f48e31adde5b043741c91ba143f5f7db0fd (patch) | |
| tree | 2a3ad5748e949da0dcbdfe9139db82030f809969 /drivers/net/wireless/b43/dma.c | |
| parent | 5d852905561a979dfb4d8a68f7313dcb8f055bec (diff) | |
| download | blackbird-op-linux-17030f48e31adde5b043741c91ba143f5f7db0fd.tar.gz blackbird-op-linux-17030f48e31adde5b043741c91ba143f5f7db0fd.zip | |
b43: support new RX header, noticed to be used in 598.314+ fw
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/dma.c')
| -rw-r--r-- | drivers/net/wireless/b43/dma.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 83cba22ac6e8..d0d9aee44a59 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c @@ -858,8 +858,17 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, ring->current_slot = -1; } else { if (ring->index == 0) { - ring->rx_buffersize = B43_DMA0_RX_BUFFERSIZE; - ring->frameoffset = B43_DMA0_RX_FRAMEOFFSET; + switch (dev->fw.hdr_format) { + case B43_FW_HDR_598: + ring->rx_buffersize = B43_DMA0_RX_FW598_BUFSIZE; + ring->frameoffset = B43_DMA0_RX_FW598_FO; + break; + case B43_FW_HDR_410: + case B43_FW_HDR_351: + ring->rx_buffersize = B43_DMA0_RX_FW351_BUFSIZE; + ring->frameoffset = B43_DMA0_RX_FW351_FO; + break; + } } else B43_WARN_ON(1); } |
