From 26cf81b94b22a3cc95676ff63e6d69dd256de080 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 28 Mar 2015 18:17:46 +0000 Subject: kernel: refresh 3.18 patches Signed-off-by: Florian Fainelli SVN-Revision: 45093 --- .../077-02-bgmac-implement-GRO-and-use-build_skb.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '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 3636fb619a..2a2df608b9 100644 --- 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 } } +} - -- 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 + 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, -- cgit v1.2.3