diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-06 13:34:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-06 13:34:15 -0700 |
| commit | a25a32ab71f822efb3e6025c365caa678aa6ff3b (patch) | |
| tree | fcbc495baddf6d1837034cb83ee837887ea648f6 /drivers/net/wireless/b43/dma.c | |
| parent | ec80bfcb68a0c46443991991d459a0cde773cdea (diff) | |
| parent | 3d7dc7e8c1566acb0fc55df228b2ed91f5638e9d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/dma.c')
| -rw-r--r-- | drivers/net/wireless/b43/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 3d5566e7af0a..ff0f5ba14b2c 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c @@ -1536,7 +1536,7 @@ static void dma_rx(struct b43_dmaring *ring, int *slot) dmaaddr = meta->dmaaddr; goto drop_recycle_buffer; } - if (unlikely(len > ring->rx_buffersize)) { + if (unlikely(len + ring->frameoffset > ring->rx_buffersize)) { /* The data did not fit into one descriptor buffer * and is split over multiple buffers. * This should never happen, as we try to allocate buffers |