aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.14
diff options
context:
space:
mode:
authorKabuli Chana <newtownBuild@gmail.com>2018-03-09 10:33:04 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-09 22:12:48 +0100
commit7c1dae6e269371f317040f30cb607bf46e7e1e26 (patch)
tree71902c8572f1dfc9760cf6863d0bb4fac5346a09 /target/linux/mediatek/patches-4.14
parentfa22714181de40648d9680f6d5d9d4f03547ccc1 (diff)
downloadupstream-7c1dae6e269371f317040f30cb607bf46e7e1e26.tar.gz
upstream-7c1dae6e269371f317040f30cb607bf46e7e1e26.tar.bz2
upstream-7c1dae6e269371f317040f30cb607bf46e7e1e26.zip
kernel: bump to version 4.14.25
compile/test target mvebu/rango Signed-off-by: Kabuli Chana <newtownBuild@gmail.com>
Diffstat (limited to 'target/linux/mediatek/patches-4.14')
-rw-r--r--target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch2
-rw-r--r--target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch2
-rw-r--r--target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch2
-rw-r--r--target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch6
-rw-r--r--target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch2
5 files changed, 7 insertions, 7 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 07f8206ead..72a2ece464 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 <john@phrozen.org>
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 7542a55148..a658a572fc 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 <john@phrozen.org>
--- 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 531c426f9d..3ace7265c6 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 <john@phrozen.org>
--- 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 673df45a63..a3f4fe8060 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 <john@phrozen.org>
--- 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 <john@phrozen.org>
/*
* 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 <john@phrozen.org>
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 2efab3f7d5..f4c0fce566 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 <john@phrozen.org>
--- 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);