kernel: bump to 3.18.84

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 077-02-bgmac-implement-GRO-and-use-build_skb.patch

diff --git a/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch b/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
index 3636fb6..2a2df60 100644 (file)
--- a/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
+++ b/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
@@ -104,12 +104,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
                }
        }
 +}
- 
--      if (ring->cpu_base) {
--              /* Free ring of descriptors */
--              size = ring->num_slots * sizeof(struct bgmac_dma_desc);
--              dma_free_coherent(dma_dev, size, ring->cpu_base,
--                                ring->dma_base);
++
 +static void bgmac_dma_rx_ring_free(struct bgmac *bgmac,
 +                                 struct bgmac_dma_ring *ring)
 +{
@@ -121,7 +116,12 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +              slot = &ring->slots[i];
 +              if (!slot->buf)
 +                      continue;
-+
+ 
+-      if (ring->cpu_base) {
+-              /* Free ring of descriptors */
+-              size = ring->num_slots * sizeof(struct bgmac_dma_desc);
+-              dma_free_coherent(dma_dev, size, ring->cpu_base,
+-                                ring->dma_base);
 +              if (slot->dma_addr)
 +                      dma_unmap_single(dma_dev, slot->dma_addr,
 +                                       BGMAC_RX_BUF_SIZE,