aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2015-03-28 18:17:46 +0000
committerFlorian Fainelli <florian@openwrt.org>2015-03-28 18:17:46 +0000
commit26cf81b94b22a3cc95676ff63e6d69dd256de080 (patch)
treef354ed85a459691287292295be7b0bb1e7c2a9b2 /target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
parent0b13d69bba6ebc11b6f67c20ec088ccaa9957a3f (diff)
downloadupstream-26cf81b94b22a3cc95676ff63e6d69dd256de080.tar.gz
upstream-26cf81b94b22a3cc95676ff63e6d69dd256de080.tar.bz2
upstream-26cf81b94b22a3cc95676ff63e6d69dd256de080.zip
kernel: refresh 3.18 patches
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 45093
Diffstat (limited to 'target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch')
-rw-r--r--target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch14
1 files changed, 7 insertions, 7 deletions
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 <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,