From 7c1dae6e269371f317040f30cb607bf46e7e1e26 Mon Sep 17 00:00:00 2001 From: Kabuli Chana Date: Fri, 9 Mar 2018 10:33:04 -0700 Subject: kernel: bump to version 4.14.25 compile/test target mvebu/rango Signed-off-by: Kabuli Chana --- .../patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch | 2 +- .../0043-net-next-mediatek-enable-special-tag-indication-for-.patch | 2 +- .../mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch | 2 +- .../mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch | 6 +++--- .../patches-4.14/0051-net-mediatek-increase-tx_timeout.patch | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/mediatek') 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 07f8206..72a2ece 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 @@ -22,7 +22,7 @@ Signed-off-by: John Crispin mapped_addr = dma_map_single(eth->dev, skb->data, skb_headlen(skb), DMA_TO_DEVICE); -@@ -1979,7 +1979,10 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -1980,7 +1980,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 */ diff --git a/target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch b/target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch index 7542a55..a658a57 100644 --- a/target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch +++ b/target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch @@ -17,7 +17,7 @@ Signed-off-by: John Crispin --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -1983,6 +1983,8 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -1984,6 +1984,8 @@ static int mtk_hw_init(struct mtk_eth *e */ val = mtk_r32(eth, MTK_CDMQ_IG_CTRL); mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL); diff --git a/target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch b/target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch index 531c426..3ace726 100644 --- a/target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch +++ b/target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch @@ -11,7 +11,7 @@ Signed-off-by: John Crispin --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -1994,6 +1994,7 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -1995,6 +1995,7 @@ static int mtk_hw_init(struct mtk_eth *e /* enable interrupt delay for RX */ mtk_w32(eth, MTK_PDMA_DELAY_RX_DELAY, MTK_PDMA_DELAY_INT); diff --git a/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch b/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch index 673df45..a3f4fe8 100644 --- a/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch +++ b/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3621,6 +3621,58 @@ set_rps_cpu(struct net_device *dev, stru +@@ -3628,6 +3628,58 @@ set_rps_cpu(struct net_device *dev, stru return rflow; } @@ -69,7 +69,7 @@ Signed-off-by: John Crispin /* * get_rps_cpu is called from netif_receive_skb and returns the target * CPU from the RPS map of the receiving queue for a given skb. -@@ -3710,7 +3762,7 @@ static int get_rps_cpu(struct net_device +@@ -3717,7 +3769,7 @@ static int get_rps_cpu(struct net_device try_rps: if (map) { @@ -78,7 +78,7 @@ Signed-off-by: John Crispin if (cpu_online(tcpu)) { cpu = tcpu; goto done; -@@ -8795,6 +8847,9 @@ static int __init net_dev_init(void) +@@ -8802,6 +8854,9 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } diff --git a/target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch b/target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch index 2efab3f..f4c0fce 100644 --- a/target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch +++ b/target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2453,7 +2453,7 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -2454,7 +2454,7 @@ static int mtk_add_mac(struct mtk_eth *e mac->hw_stats->reg_offset = id * MTK_STAT_OFFSET; SET_NETDEV_DEV(eth->netdev[id], eth->dev); -- cgit v1.1