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 --- target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch | 2 +- target/linux/generic/hack-4.14/721-phy_packets.patch | 2 +- target/linux/generic/hack-4.14/902-debloat_proc.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/hack-4.14') diff --git a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch index ae911db870..e1eee003cf 100644 --- a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -369,12 +369,13 @@ extern struct Qdisc_ops noop_qdisc_ops; +@@ -368,12 +368,13 @@ extern struct Qdisc_ops noop_qdisc_ops; extern struct Qdisc_ops pfifo_fast_ops; extern struct Qdisc_ops mq_qdisc_ops; extern struct Qdisc_ops noqueue_qdisc_ops; diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index e3af0a07a3..62d0295173 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/721-phy_packets.patch @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2975,10 +2975,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2982,10 +2982,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index 9e33a76c6d..4f5fb7022c 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -393,7 +393,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -424,6 +424,9 @@ static struct pernet_operations ip_rt_pr +@@ -427,6 +427,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { -- cgit v1.2.3