diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 17:32:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 17:32:33 +0000 |
| commit | 402c9a689ecc7e6d32913ae7161ceb038a27e848 (patch) | |
| tree | 900605bee0d7fea650f2d96394db47796afaa9f4 /target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch | |
| parent | aef07fb7c85d795a3f1b36fb831d6b76617f3768 (diff) | |
| download | master-187ad058-402c9a689ecc7e6d32913ae7161ceb038a27e848.tar.gz master-187ad058-402c9a689ecc7e6d32913ae7161ceb038a27e848.tar.bz2 master-187ad058-402c9a689ecc7e6d32913ae7161ceb038a27e848.zip | |
kernel: sync bgmac changes with latest upstream submission
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45420 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch b/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch index 5f5fe93703..846e2ee0e2 100644 --- a/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch +++ b/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch @@ -54,8 +54,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> struct device *dma_dev = bgmac->core->dma_dev; struct bgmac_slot_info *slot = &ring->slots[ring->start]; struct bgmac_rx_header *rx = slot->buf + BGMAC_RX_BUF_OFFSET; -@@ -463,6 +473,8 @@ static int bgmac_dma_rx_read(struct bgma - break; +@@ -459,6 +469,8 @@ static int bgmac_dma_rx_read(struct bgma + ring->start = 0; } + bgmac_dma_rx_update_index(bgmac, ring); @@ -63,7 +63,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> return handled; } -@@ -682,6 +694,8 @@ static int bgmac_dma_init(struct bgmac * +@@ -678,6 +690,8 @@ static int bgmac_dma_init(struct bgmac * if (ring->unaligned) bgmac_dma_rx_enable(bgmac, ring); @@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> for (j = 0; j < ring->num_slots; j++) { err = bgmac_dma_rx_skb_for_slot(bgmac, &ring->slots[j]); if (err) -@@ -690,12 +704,7 @@ static int bgmac_dma_init(struct bgmac * +@@ -686,12 +700,7 @@ static int bgmac_dma_init(struct bgmac * bgmac_dma_rx_setup_desc(bgmac, ring, j); } |