diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 11:54:31 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 11:54:31 +0000 |
| commit | d0ec348ded6f715b43b396b06ccb10599b37969d (patch) | |
| tree | 38c4c336aacd612b5cd620aeaad948fe79875274 | |
| parent | f933719138c9402de7b6c0084e2f1fec3a06d803 (diff) | |
| download | upstream-d0ec348ded6f715b43b396b06ccb10599b37969d.tar.gz upstream-d0ec348ded6f715b43b396b06ccb10599b37969d.tar.bz2 upstream-d0ec348ded6f715b43b396b06ccb10599b37969d.zip | |
kernel: fq_codel: dont reinit flow state
Keep fq_codel flow state around after queue empty.
SVN-Revision: 33687
| -rw-r--r-- | target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch b/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch new file mode 100644 index 0000000000..2e6b219446 --- /dev/null +++ b/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch @@ -0,0 +1,41 @@ +From b379135c40163ae79ba7a54e6928b53983e74ee8 Mon Sep 17 00:00:00 2001 +From: Eric Dumazet <eric.dumazet@gmail.com> +Date: Sat, 1 Sep 2012 03:19:57 +0000 +Subject: [PATCH 307/558] fq_codel: dont reinit flow state + +When fq_codel builds a new flow, it should not reset codel state. + +Codel algo needs to get previous values (lastcount, drop_next) to get +proper behavior. + +Signed-off-by: Dave Taht <dave.taht@gmail.com> +Signed-off-by: Eric Dumazet <edumazet@google.com> +Acked-by: Dave Taht <dave.taht@bufferbloat.net> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + 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 9fc1c62..4e606fc 100644 +--- a/net/sched/sch_fq_codel.c ++++ b/net/sched/sch_fq_codel.c +@@ -191,7 +191,6 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch) + + if (list_empty(&flow->flowchain)) { + list_add_tail(&flow->flowchain, &q->new_flows); +- codel_vars_init(&flow->cvars); + q->new_flow_count++; + flow->deficit = q->quantum; + flow->dropped = 0; +@@ -418,6 +417,7 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt) + struct fq_codel_flow *flow = q->flows + i; + + INIT_LIST_HEAD(&flow->flowchain); ++ codel_vars_init(&flow->cvars); + } + } + if (sch->limit >= 1) +-- +1.7.9.5 + |