From ecd6f8bde486352a68f4d2ba2c7e5301b7396ffe Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 26 Aug 2011 20:41:38 +0200 Subject: [PATCH] --- yaml --- r: 265892 b: refs/heads/master c: 996bc370fa5f28f0a07d6c8dee26591db2f3dea9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/dma.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index cabb2fab7aac..e7c5cd2c336e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb85d63c73d924c172bde059ad8b0192abd74a4 +refs/heads/master: 996bc370fa5f28f0a07d6c8dee26591db2f3dea9 diff --git a/trunk/drivers/net/wireless/b43/dma.c b/trunk/drivers/net/wireless/b43/dma.c index e76b40ddbc48..c83c4b64c60e 100644 --- a/trunk/drivers/net/wireless/b43/dma.c +++ b/trunk/drivers/net/wireless/b43/dma.c @@ -423,14 +423,7 @@ static int alloc_ringmemory(struct b43_dmaring *ring) * has shown that 4K is sufficient for the latter as long as the buffer * does not cross an 8K boundary. * - * For unknown reasons - possibly a hardware error - the BCM4311 rev - * 02, which uses 64-bit DMA, needs the ring buffer in very low memory, - * which accounts for the GFP_DMA flag below. - * - * The flags here must match the flags in free_ringmemory below! */ - if (ring->type == B43_DMA_64BIT) - flags |= GFP_DMA; ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev, B43_DMA_RINGMEMSIZE, &(ring->dmabase), flags);