diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2012-09-01 03:19:57 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-09-03 14:36:50 -0400 |
| commit | b379135c40163ae79ba7a54e6928b53983e74ee8 (patch) | |
| tree | d6501834ec1f5e8d7fe2d0b0727f8e5c16c050f2 /net/sched/sch_fq_codel.c | |
| parent | net: usbnet: fix softirq storm on suspend (diff) | |
| download | linux-dev-b379135c40163ae79ba7a54e6928b53983e74ee8.tar.xz linux-dev-b379135c40163ae79ba7a54e6928b53983e74ee8.zip | |
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>
Diffstat (limited to 'net/sched/sch_fq_codel.c')
| -rw-r--r-- | net/sched/sch_fq_codel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c index 9fc1c62ec80e..4e606fcb2534 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) |