Commit 2ed5c3f0 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller

sch_qfq: keep backlog updated with qlen

Reported-by: default avatarStas Nichiporovich <stasn77@gmail.com>
Fixes: 2ccccf5f ("net_sched: update hierarchical backlog too")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1f2beb8
...@@ -1153,6 +1153,7 @@ static struct sk_buff *qfq_dequeue(struct Qdisc *sch) ...@@ -1153,6 +1153,7 @@ static struct sk_buff *qfq_dequeue(struct Qdisc *sch)
if (!skb) if (!skb)
return NULL; return NULL;
qdisc_qstats_backlog_dec(sch, skb);
sch->q.qlen--; sch->q.qlen--;
qdisc_bstats_update(sch, skb); qdisc_bstats_update(sch, skb);
...@@ -1256,6 +1257,7 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch, ...@@ -1256,6 +1257,7 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
} }
bstats_update(&cl->bstats, skb); bstats_update(&cl->bstats, skb);
qdisc_qstats_backlog_inc(sch, skb);
++sch->q.qlen; ++sch->q.qlen;
agg = cl->agg; agg = cl->agg;
...@@ -1476,6 +1478,7 @@ static void qfq_reset_qdisc(struct Qdisc *sch) ...@@ -1476,6 +1478,7 @@ static void qfq_reset_qdisc(struct Qdisc *sch)
qdisc_reset(cl->qdisc); qdisc_reset(cl->qdisc);
} }
} }
sch->qstats.backlog = 0;
sch->q.qlen = 0; sch->q.qlen = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment