Author: nbd
Date: 2015-03-29 06:28:02 +0200 (Sun, 29 Mar 2015)
New Revision: 45104

Removed:
   trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch
Modified:
   trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
Log:
kernel: clean up fq_codel default patch

Signed-off-by: Felix Fietkau <[email protected]>

Modified: 
trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
===================================================================
--- trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch   
2015-03-29 04:26:57 UTC (rev 45103)
+++ trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch   
2015-03-29 04:28:02 UTC (rev 45104)
@@ -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);

Deleted: trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch
===================================================================
--- trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch    
2015-03-29 04:26:57 UTC (rev 45103)
+++ trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch    
2015-03-29 04:28:02 UTC (rev 45104)
@@ -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. */
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to