aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-06 17:21:09 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-12 10:33:42 +0100
commit3d3a9333154efdbd956fd42fe6f954278a6687f8 (patch)
treea0950878b6a765a1ef685ade01c0e09f4928727c /target
parent862a8851035426db79d27625285ffd736ef9a85d (diff)
downloadupstream-3d3a9333154efdbd956fd42fe6f954278a6687f8.tar.gz
upstream-3d3a9333154efdbd956fd42fe6f954278a6687f8.tar.bz2
upstream-3d3a9333154efdbd956fd42fe6f954278a6687f8.zip
kernel: bump 4.14 to 4.14.152
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch4
1 files changed, 2 insertions, 2 deletions
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 0a4925d6fa..cf03b00f82 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 <nbd@nbd.name>
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
-@@ -368,12 +368,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
+@@ -373,12 +373,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;
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
-@@ -2029,7 +2029,7 @@ static int __init pktsched_init(void)
+@@ -2031,7 +2031,7 @@ static int __init pktsched_init(void)
return err;
}