From 20b5a4ca01ca7b7c98dceb204e8b7b0a32f40cc9 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 4 Feb 2020 13:17:37 +0100 Subject: kernel: bump 4.19 to 4.19.101 Refreshed all patches. Fixes: - CVE-2019-14896 - CVE-2019-14897 Remove upstreamed: - 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch - 950-0202-staging-bcm2835-camera-fix-module-autoloading.patch - 001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- .../mediatek/patches-4.19/0002-eth-fix-dsa-support.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch') diff --git a/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch b/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch index 873dbed817..6c90222517 100644 --- a/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch +++ b/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch @@ -1,7 +1,6 @@ -diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c ---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2019-12-23 11:42:02.728620670 +0800 -+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2019-12-23 11:42:48.747289058 +0800 -@@ -999,11 +999,6 @@ +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -999,11 +999,6 @@ static int mtk_poll_rx(struct napi_struc if (!(trxd.rxd2 & RX_DMA_DONE)) break; @@ -13,7 +12,7 @@ diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/m mac = (trxd.rxd4 >> RX_DMA_FPORT_SHIFT) & RX_DMA_FPORT_MASK; /* From QDMA(5). This is a external interface case of HWNAT. -@@ -1017,7 +1012,7 @@ +@@ -1017,7 +1012,7 @@ static int mtk_poll_rx(struct napi_struc mac = 0; else mac--; @@ -22,7 +21,7 @@ diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/m if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT || !eth->netdev[mac])) goto release_desc; -@@ -2030,10 +2025,6 @@ +@@ -2030,10 +2025,6 @@ static int mtk_hw_init(struct mtk_eth *e /* Disable RX VLan Offloading */ mtk_w32(eth, 0, MTK_CDMP_EG_CTRL); -- cgit v1.2.3