kernel: bump 4.9 to 4.9.123

[oweals/openwrt.git] / target / linux / generic / hack-4.9 / 660-fq_codel_defaults.patch

diff --git a/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch b/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch
index 3bac10f6eb65698ece946036d9c2aedb91ec8dc1..ea461e189dcebcc453882519a890a4d614dbcda0 100644 (file)
--- a/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch
+++ b/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch
@@ -3,24 +3,25 @@ From: Felix Fietkau <nbd@nbd.name>
 Date: Fri, 7 Jul 2017 17:21:53 +0200
 Subject:  hack: net: fq_codel: tune defaults for small devices
 
+Assume that x86_64 devices always have a big memory and do not need this 
+optimization compared to devices with only 32 MB or 64 MB RAM.
+
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  net/sched/sch_fq_codel.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
-index a5ea0e9b6be4..4467b95795bf 100644
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
-@@ -479,7 +479,7 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt)
+@@ -485,7 +485,11 @@ static int fq_codel_init(struct Qdisc *s
  
        sch->limit = 10*1024;
        q->flows_cnt = 1024;
--      q->memory_limit = 32 << 20; /* 32 MBytes */
++#ifdef CONFIG_X86_64
+       q->memory_limit = 32 << 20; /* 32 MBytes */
++#else
 +      q->memory_limit = 4 << 20; /* 4 MBytes */
++#endif
        q->drop_batch_size = 64;
        q->quantum = psched_mtu(qdisc_dev(sch));
        q->perturbation = prandom_u32();
--- 
-2.11.0
-