aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-29 04:28:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-29 04:28:02 +0000
commit9444bc1ee272362b4085f77bca3a63d369fc1e70 (patch)
tree5d5114133859efaa930c94af08fcbfe4c6642edd /target/linux
parente0f421dcab1125bee0ea0798d78f7105632c020f (diff)
downloadupstream-9444bc1ee272362b4085f77bca3a63d369fc1e70.tar.gz
upstream-9444bc1ee272362b4085f77bca3a63d369fc1e70.tar.bz2
upstream-9444bc1ee272362b4085f77bca3a63d369fc1e70.zip
kernel: clean up fq_codel default patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45104
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch20
-rw-r--r--target/linux/generic/patches-3.18/664-codel_fix_3_12.patch22
2 files changed, 20 insertions, 22 deletions
diff --git a/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch b/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
index 9af740daf3..656bbd08fc 100644
--- a/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
+++ b/target/linux/generic/patches-3.18/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. */
@@ -737,7 +737,7 @@ static void attach_one_default_qdisc(str
if (dev->tx_queue_len) {
@@ -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
+@@ -1945,7 +1945,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-3.18/664-codel_fix_3_12.patch b/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch
deleted file mode 100644
index 2682441b1c..0000000000
--- a/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/net/sched/sch_api.c
-+++ b/net/sched/sch_api.c
-@@ -1945,7 +1945,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. */