aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-03-10 10:09:07 +0100
committerFelix Fietkau <nbd@nbd.name>2018-03-11 08:58:53 +0100
commit9306bdf31c0b536389f79d66cee3dcc2d97735c1 (patch)
treee89af746ed7598ff678adcc46c8ca9bff2bf12d9 /target/linux/generic/hack-4.14
parent4e8f1e9f4ca088542fd2b861ea2f1a9dca0d845f (diff)
downloadupstream-9306bdf31c0b536389f79d66cee3dcc2d97735c1.tar.gz
upstream-9306bdf31c0b536389f79d66cee3dcc2d97735c1.tar.bz2
upstream-9306bdf31c0b536389f79d66cee3dcc2d97735c1.zip
kernel: merge a pending fix for HFSC warnings/slowdowns (fixes FS#1136)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/hack-4.14')
-rw-r--r--target/linux/generic/hack-4.14/660-fq_codel_defaults.patch2
-rw-r--r--target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-4.14/660-fq_codel_defaults.patch b/target/linux/generic/hack-4.14/660-fq_codel_defaults.patch
index 3e27351fa6..b923a2d206 100644
--- a/target/linux/generic/hack-4.14/660-fq_codel_defaults.patch
+++ b/target/linux/generic/hack-4.14/660-fq_codel_defaults.patch
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -465,7 +465,11 @@ static int fq_codel_init(struct Qdisc *s
+@@ -471,7 +471,11 @@ static int fq_codel_init(struct Qdisc *s
sch->limit = 10*1024;
q->flows_cnt = 1024;
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 e1eee003cf..5b61d74672 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
@@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
register_qdisc(&pfifo_head_drop_qdisc_ops);
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -694,7 +694,7 @@ static const struct Qdisc_class_ops fq_c
+@@ -700,7 +700,7 @@ static const struct Qdisc_class_ops fq_c
.walk = fq_codel_walk,
};
@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.cl_ops = &fq_codel_class_ops,
.id = "fq_codel",
.priv_size = sizeof(struct fq_codel_sched_data),
-@@ -709,6 +709,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+@@ -715,6 +715,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
.dump_stats = fq_codel_dump_stats,
.owner = THIS_MODULE,
};