kernel: revert fq_codel quantum override to prevent it from causing too much cpu...

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47811

diff --git a/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch b/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch
index f7f4659efc764e2a15c3905c17b56dce896128bb..8c99e62cececa7902ca9793368368be200cfee66 100644 (file)
--- a/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch
+++ b/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch
@@ -1,14 +1,11 @@
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c

-@@ -387,9 +387,9 @@ static int fq_codel_init(struct Qdisc *s
+@@ -387,7 +387,7 @@ static int fq_codel_init(struct Qdisc *s

        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;
        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;

--      q->quantum = psched_mtu(qdisc_dev(sch));
-+      q->quantum = 300;
+       q->quantum = psched_mtu(qdisc_dev(sch));

        q->perturbation = prandom_u32();
        q->perturbation = prandom_u32();

-       INIT_LIST_HEAD(&q->new_flows);
-       INIT_LIST_HEAD(&q->old_flows);

diff --git a/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch b/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch
index f7f4659efc764e2a15c3905c17b56dce896128bb..8c99e62cececa7902ca9793368368be200cfee66 100644 (file)
--- a/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch
+++ b/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch
@@ -1,14 +1,11 @@
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c

-@@ -387,9 +387,9 @@ static int fq_codel_init(struct Qdisc *s
+@@ -387,7 +387,7 @@ static int fq_codel_init(struct Qdisc *s

        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;
        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;

--      q->quantum = psched_mtu(qdisc_dev(sch));
-+      q->quantum = 300;
+       q->quantum = psched_mtu(qdisc_dev(sch));

        q->perturbation = prandom_u32();
        q->perturbation = prandom_u32();

-       INIT_LIST_HEAD(&q->new_flows);
-       INIT_LIST_HEAD(&q->old_flows);

diff --git a/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch b/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch
index a2ff80509445547bc3c84aeade4e569e8fbbbcd7..cf4ff6fb186f660d8f728ff7713220249e2530b3 100644 (file)
--- a/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch
+++ b/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch
@@ -1,14 +1,11 @@
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c

-@@ -412,9 +412,9 @@ static int fq_codel_init(struct Qdisc *s
+@@ -412,7 +412,7 @@ static int fq_codel_init(struct Qdisc *s

        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;
        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;

--      q->quantum = psched_mtu(qdisc_dev(sch));
-+      q->quantum = 300;
+       q->quantum = psched_mtu(qdisc_dev(sch));

        q->perturbation = prandom_u32();
        q->perturbation = prandom_u32();

-       INIT_LIST_HEAD(&q->new_flows);
-       INIT_LIST_HEAD(&q->old_flows);

diff --git a/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch b/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch
index a2ff80509445547bc3c84aeade4e569e8fbbbcd7..cf4ff6fb186f660d8f728ff7713220249e2530b3 100644 (file)
--- a/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch
+++ b/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch
@@ -1,14 +1,11 @@
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c

-@@ -412,9 +412,9 @@ static int fq_codel_init(struct Qdisc *s
+@@ -412,7 +412,7 @@ static int fq_codel_init(struct Qdisc *s

        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;
        struct fq_codel_sched_data *q = qdisc_priv(sch);
        int i;
  
 -      sch->limit = 10*1024;
 +      sch->limit = 1024;
        q->flows_cnt = 1024;

--      q->quantum = psched_mtu(qdisc_dev(sch));
-+      q->quantum = 300;
+       q->quantum = psched_mtu(qdisc_dev(sch));

        q->perturbation = prandom_u32();
        q->perturbation = prandom_u32();

-       INIT_LIST_HEAD(&q->new_flows);
-       INIT_LIST_HEAD(&q->old_flows);