diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-06-01 19:15:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-03 19:24:04 -0400 |
commit | 8d5958f424b62060a8696b12c17dad198d5d386f (patch) | |
tree | 62d069f12c323b06fbfc4a89aeeea751d24485ea /net | |
parent | d7f4f332f082c4d4ba53582f902ed6b44fd6f45e (diff) |
sch_tbf: update backlog as well
Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/sched/sch_tbf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index 83b90b584fae..3161e491990b 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
@@ -207,6 +207,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
207 | return ret; | 207 | return ret; |
208 | } | 208 | } |
209 | 209 | ||
210 | qdisc_qstats_backlog_inc(sch, skb); | ||
210 | sch->q.qlen++; | 211 | sch->q.qlen++; |
211 | return NET_XMIT_SUCCESS; | 212 | return NET_XMIT_SUCCESS; |
212 | } | 213 | } |
@@ -217,6 +218,7 @@ static unsigned int tbf_drop(struct Qdisc *sch) | |||
217 | unsigned int len = 0; | 218 | unsigned int len = 0; |
218 | 219 | ||
219 | if (q->qdisc->ops->drop && (len = q->qdisc->ops->drop(q->qdisc)) != 0) { | 220 | if (q->qdisc->ops->drop && (len = q->qdisc->ops->drop(q->qdisc)) != 0) { |
221 | sch->qstats.backlog -= len; | ||
220 | sch->q.qlen--; | 222 | sch->q.qlen--; |
221 | qdisc_qstats_drop(sch); | 223 | qdisc_qstats_drop(sch); |
222 | } | 224 | } |
@@ -263,6 +265,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc *sch) | |||
263 | q->t_c = now; | 265 | q->t_c = now; |
264 | q->tokens = toks; | 266 | q->tokens = toks; |
265 | q->ptokens = ptoks; | 267 | q->ptokens = ptoks; |
268 | qdisc_qstats_backlog_dec(sch, skb); | ||
266 | sch->q.qlen--; | 269 | sch->q.qlen--; |
267 | qdisc_unthrottled(sch); | 270 | qdisc_unthrottled(sch); |
268 | qdisc_bstats_update(sch, skb); | 271 | qdisc_bstats_update(sch, skb); |
@@ -294,6 +297,7 @@ static void tbf_reset(struct Qdisc *sch) | |||
294 | struct tbf_sched_data *q = qdisc_priv(sch); | 297 | struct tbf_sched_data *q = qdisc_priv(sch); |
295 | 298 | ||
296 | qdisc_reset(q->qdisc); | 299 | qdisc_reset(q->qdisc); |
300 | sch->qstats.backlog = 0; | ||
297 | sch->q.qlen = 0; | 301 | sch->q.qlen = 0; |
298 | q->t_c = ktime_get_ns(); | 302 | q->t_c = ktime_get_ns(); |
299 | q->tokens = q->buffer; | 303 | q->tokens = q->buffer; |