061-fq_codel-dont-reinit-flow-state.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From b379135c40163ae79ba7a54e6928b53983e74ee8 Mon Sep 17 00:00:00 2001
  2. From: Eric Dumazet <eric.dumazet@gmail.com>
  3. Date: Sat, 1 Sep 2012 03:19:57 +0000
  4. Subject: [PATCH 307/558] fq_codel: dont reinit flow state
  5. When fq_codel builds a new flow, it should not reset codel state.
  6. Codel algo needs to get previous values (lastcount, drop_next) to get
  7. proper behavior.
  8. Signed-off-by: Dave Taht <dave.taht@gmail.com>
  9. Signed-off-by: Eric Dumazet <edumazet@google.com>
  10. Acked-by: Dave Taht <dave.taht@bufferbloat.net>
  11. Signed-off-by: David S. Miller <davem@davemloft.net>
  12. ---
  13. net/sched/sch_fq_codel.c | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. --- a/net/sched/sch_fq_codel.c
  16. +++ b/net/sched/sch_fq_codel.c
  17. @@ -191,7 +191,6 @@ static int fq_codel_enqueue(struct sk_bu
  18. if (list_empty(&flow->flowchain)) {
  19. list_add_tail(&flow->flowchain, &q->new_flows);
  20. - codel_vars_init(&flow->cvars);
  21. q->new_flow_count++;
  22. flow->deficit = q->quantum;
  23. flow->dropped = 0;
  24. @@ -418,6 +417,7 @@ static int fq_codel_init(struct Qdisc *s
  25. struct fq_codel_flow *flow = q->flows + i;
  26. INIT_LIST_HEAD(&flow->flowchain);
  27. + codel_vars_init(&flow->cvars);
  28. }
  29. }
  30. if (sch->limit >= 1)