diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-05-12 20:44:16 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-05-12 20:44:16 +0200 |
| commit | 75b069f505233807c44072c3773ab8ad57f6fa2a (patch) | |
| tree | 667e27af2e8a6e7cf9d36b00bc79d7c670003491 /target | |
| parent | 7fab5dc48698b3ed55edfc4489c9b168a2a8dd27 (diff) | |
| download | upstream-75b069f505233807c44072c3773ab8ad57f6fa2a.tar.gz upstream-75b069f505233807c44072c3773ab8ad57f6fa2a.tar.bz2 upstream-75b069f505233807c44072c3773ab8ad57f6fa2a.zip | |
kernel: fold codel default fix into main patch
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch | 20 | ||||
| -rw-r--r-- | target/linux/generic/patches-4.4/664-codel_fix_3_12.patch | 22 |
2 files changed, 20 insertions, 22 deletions
diff --git a/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch b/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch index d3aeb9256f..096d239238 100644 --- a/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch +++ b/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch @@ -42,6 +42,15 @@ struct Qdisc_class_common { --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c +@@ -31,7 +31,7 @@ + #include <net/dst.h> + + /* Qdisc to use by default */ +-const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops; ++const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops; + EXPORT_SYMBOL(default_qdisc_ops); + + /* Main transmission queue. */ @@ -728,7 +728,7 @@ static void attach_one_default_qdisc(str void *_unused) { @@ -73,3 +82,14 @@ TC_H_MAKE(TC_H_MAJ(sch->handle), TC_H_MIN(i + 1))); if (qdisc == NULL) { +--- a/net/sched/sch_api.c ++++ b/net/sched/sch_api.c +@@ -1946,7 +1946,7 @@ static int __init pktsched_init(void) + return err; + } + +- register_qdisc(&pfifo_fast_ops); ++ register_qdisc(&fq_codel_qdisc_ops); + register_qdisc(&pfifo_qdisc_ops); + register_qdisc(&bfifo_qdisc_ops); + register_qdisc(&pfifo_head_drop_qdisc_ops); diff --git a/target/linux/generic/patches-4.4/664-codel_fix_3_12.patch b/target/linux/generic/patches-4.4/664-codel_fix_3_12.patch deleted file mode 100644 index 4d4ca250f1..0000000000 --- a/target/linux/generic/patches-4.4/664-codel_fix_3_12.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/net/sched/sch_api.c -+++ b/net/sched/sch_api.c -@@ -1946,7 +1946,7 @@ static int __init pktsched_init(void) - return err; - } - -- register_qdisc(&pfifo_fast_ops); -+ register_qdisc(&fq_codel_qdisc_ops); - register_qdisc(&pfifo_qdisc_ops); - register_qdisc(&bfifo_qdisc_ops); - register_qdisc(&pfifo_head_drop_qdisc_ops); ---- a/net/sched/sch_generic.c -+++ b/net/sched/sch_generic.c -@@ -31,7 +31,7 @@ - #include <net/dst.h> - - /* Qdisc to use by default */ --const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops; -+const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops; - EXPORT_SYMBOL(default_qdisc_ops); - - /* Main transmission queue. */ |