1 files changed, 0 insertions, 66 deletions
diff --git a/package/mac80211/patches/511-b43-refresh-rx-poison-on-buffer-recycling.patch b/package/mac80211/patches/511-b43-refresh-rx-poison-on-buffer-recycling.patch
deleted file mode 100644
index dfe79208cd..0000000000
--- a/package/mac80211/patches/511-b43-refresh-rx-poison-on-buffer-recycling.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-The RX buffer poison needs to be refreshed, if we recycle an RX buffer,
-because it might be (partially) overwritten by some DMA operations.
-
-Cc: stable@kernel.org
-Cc: Francesco Gringoli <francesco.gringoli@ing.unibs.it>
-Signed-off-by: Michael Buesch <mb@bu3sch.de>
-
----
-
---- a/drivers/net/wireless/b43/dma.c
-+++ b/drivers/net/wireless/b43/dma.c
-@@ -1503,20 +1503,16 @@ static void dma_rx(struct b43_dmaring *r
- 			len = le16_to_cpu(rxhdr->frame_len);
- 		} while (len == 0 && i++ < 5);
- 		if (unlikely(len == 0)) {
--			/* recycle the descriptor buffer. */
--			sync_descbuffer_for_device(ring, meta->dmaaddr,
--						   ring->rx_buffersize);
--			goto drop;
-+			dmaaddr = meta->dmaaddr;
-+			goto drop_recycle_buffer;
- 		}
- 	}
- 	if (unlikely(b43_rx_buffer_is_poisoned(ring, skb))) {
- 		/* Something went wrong with the DMA.
- 		 * The device did not touch the buffer and did not overwrite the poison. */
- 		b43dbg(ring->dev->wl, "DMA RX: Dropping poisoned buffer.\n");
--		/* recycle the descriptor buffer. */
--		sync_descbuffer_for_device(ring, meta->dmaaddr,
--					   ring->rx_buffersize);
--		goto drop;
-+		dmaaddr = meta->dmaaddr;
-+		goto drop_recycle_buffer;
- 	}
- 	if (unlikely(len > ring->rx_buffersize)) {
- 		/* The data did not fit into one descriptor buffer
-@@ -1530,6 +1526,7 @@ static void dma_rx(struct b43_dmaring *r
- 		while (1) {
- 			desc = ops->idx2desc(ring, *slot, &meta);
- 			/* recycle the descriptor buffer. */
-+			b43_poison_rx_buffer(ring, meta->skb);
- 			sync_descbuffer_for_device(ring, meta->dmaaddr,
- 						   ring->rx_buffersize);
- 			*slot = next_slot(ring, *slot);
-@@ -1548,8 +1545,7 @@ static void dma_rx(struct b43_dmaring *r
- 	err = setup_rx_descbuffer(ring, desc, meta, GFP_ATOMIC);
- 	if (unlikely(err)) {
- 		b43dbg(ring->dev->wl, "DMA RX: setup_rx_descbuffer() failed\n");
--		sync_descbuffer_for_device(ring, dmaaddr, ring->rx_buffersize);
--		goto drop;
-+		goto drop_recycle_buffer;
- 	}
- 
- 	unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0);
-@@ -1559,6 +1555,11 @@ static void dma_rx(struct b43_dmaring *r
- 	b43_rx(ring->dev, skb, rxhdr);
- drop:
- 	return;
-+
-+drop_recycle_buffer:
-+	/* Poison and recycle the RX buffer. */
-+	b43_poison_rx_buffer(ring, skb);
-+	sync_descbuffer_for_device(ring, dmaaddr, ring->rx_buffersize);
- }
- 
- void b43_dma_rx(struct b43_dmaring *ring)