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/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.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/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch')
-rw-r--r-- | target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch b/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch index 4f2c7b2e6e..8163e4475d 100644 --- a/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch +++ b/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch @@ -17,7 +17,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 -@@ -933,10 +933,16 @@ static int mtk_poll_rx(struct napi_struc +@@ -999,10 +999,16 @@ static int mtk_poll_rx(struct napi_struc if (!(trxd.rxd2 & RX_DMA_DONE)) break; @@ -36,11 +36,11 @@ Signed-off-by: John Crispin <john@phrozen.org> + mac--; + } - netdev = eth->netdev[mac]; - + if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT || + !eth->netdev[mac])) --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h -@@ -284,6 +284,7 @@ +@@ -287,6 +287,7 @@ /* QDMA descriptor rxd4 */ #define RX_DMA_L4_VALID BIT(24) |