diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-17 22:59:07 +0100 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-18 02:59:48 +0100 |
| commit | 88ba41453dbc65e1d5d596073d66bdf2e59a43a1 (patch) | |
| tree | 85b3d54e44612581df2482905a93ab53cae2acce /target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch | |
| parent | 6c2e1ff80f52b939405fe0c14577c584602ae432 (diff) | |
| download | upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.tar.gz upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.tar.bz2 upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.zip | |
kernel: bump 4.14 to 4.14.20
Refresh patches.
Remove upstreamed patches:
- backport/080-v4.15-0001-arch-define-weak-abort.patch
- backport/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
Update patch that no longer applies:
pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
Fixes CVE-2017-8824.
Compile-tested: octeon, x86/64.
Runtime-tested: octeon, x86/64.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch b/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch index 36321c55cf..07f8206ead 100644 --- a/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch +++ b/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch @@ -11,7 +11,7 @@ Signed-off-by: John Crispin <john@phrozen.org> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -643,8 +643,8 @@ static int mtk_tx_map(struct sk_buff *sk +@@ -709,8 +709,8 @@ static int mtk_tx_map(struct sk_buff *sk txd4 |= TX_DMA_CHKSUM; /* VLAN header offload */ @@ -22,7 +22,7 @@ Signed-off-by: John Crispin <john@phrozen.org> mapped_addr = dma_map_single(eth->dev, skb->data, skb_headlen(skb), DMA_TO_DEVICE); -@@ -1874,7 +1874,10 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -1979,7 +1979,10 @@ static int mtk_hw_init(struct mtk_eth *e mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL); /* Enable RX VLan Offloading */ @@ -32,8 +32,8 @@ Signed-off-by: John Crispin <john@phrozen.org> + else + mtk_w32(eth, 0, MTK_CDMP_EG_CTRL); - /* disable delay and normal interrupt */ - mtk_w32(eth, 0, MTK_QDMA_DELAY_INT); + /* enable interrupt delay for RX */ + mtk_w32(eth, MTK_PDMA_DELAY_RX_DELAY, MTK_PDMA_DELAY_INT); --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -34,8 +34,6 @@ |