diff options
| author | Florian Fainelli <florian@openwrt.org> | 2015-03-28 18:17:46 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2015-03-28 18:17:46 +0000 |
| commit | 5dbf2d51cd341da555cad8a12a30f0c7bc8c180a (patch) | |
| tree | fbcde669487d033038d2cf71e758fab9be527204 /target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch | |
| parent | 0af24edcefa7019105bca8860e6e0f0a65c93178 (diff) | |
| download | master-187ad058-5dbf2d51cd341da555cad8a12a30f0c7bc8c180a.tar.gz master-187ad058-5dbf2d51cd341da555cad8a12a30f0c7bc8c180a.tar.bz2 master-187ad058-5dbf2d51cd341da555cad8a12a30f0c7bc8c180a.zip | |
kernel: refresh 3.18 patches
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45093 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 14 |
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, |