projects
/
openwrt
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: backport patches for fq_codel queue memory limit support
[openwrt/.git]
/
target
/
linux
/
generic
/
patches-4.4
/
661-fq_codel_keep_dropped_stats.patch
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 cb3bb2f28d1c746c68d1495203f4b8903c5a2f66..30907229ce95209f578357b25bdf27fd9c703727 100644
(file)
--- 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
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -21
1,7 +211
,6 @@ static int fq_codel_enqueue(struct sk_bu
+@@ -21
8,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;
}
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
;