aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-16 17:45:08 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-16 19:54:50 +0200
commit17de501daabda6f5a1cb9c539bc3c3f885aeca10 (patch)
tree0c8f9cc2995733acd65a4ca3f675c257d2235f6f /target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch
parent7bd10f9a2af8f498b003879b61c46750968a6c2c (diff)
downloadupstream-17de501daabda6f5a1cb9c539bc3c3f885aeca10.tar.gz
upstream-17de501daabda6f5a1cb9c539bc3c3f885aeca10.tar.bz2
upstream-17de501daabda6f5a1cb9c539bc3c3f885aeca10.zip
kernel: backport patches for fq_codel queue memory limit support
Use it to replace the reduction in max packets/flows Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch')
-rw-r--r--target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch b/target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch
index cb3bb2f28d..30907229ce 100644
--- a/target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch
+++ b/target/linux/generic/patches-4.4/661-fq_codel_keep_dropped_stats.patch
@@ -1,10 +1,10 @@
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -211,7 +211,6 @@ static int fq_codel_enqueue(struct sk_bu
+@@ -218,7 +218,6 @@ static int fq_codel_enqueue(struct sk_bu
list_add_tail(&flow->flowchain, &q->new_flows);
q->new_flow_count++;
flow->deficit = q->quantum;
- flow->dropped = 0;
}
- if (++sch->q.qlen <= sch->limit)
- return NET_XMIT_SUCCESS;
+ q->memory_usage += skb->truesize;
+ memory_limited = q->memory_usage > q->memory_limit;