Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d5958f4 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

sch_tbf: update backlog as well 



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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7f4f332

net/sched/sch_tbf.c

+4 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		return ret;

	}



	qdisc_qstats_backlog_inc(sch, skb);

	sch->q.qlen++;

	return NET_XMIT_SUCCESS;

}
@@ -217,6 +218,7 @@ static unsigned int tbf_drop(struct Qdisc *sch) 
	unsigned int len = 0;



	if (q->qdisc->ops->drop && (len = q->qdisc->ops->drop(q->qdisc)) != 0) {

		sch->qstats.backlog -= len;

		sch->q.qlen--;

		qdisc_qstats_drop(sch);

	}
@@ -263,6 +265,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc *sch) 
			q->t_c = now;

			q->tokens = toks;

			q->ptokens = ptoks;

			qdisc_qstats_backlog_dec(sch, skb);

			sch->q.qlen--;

			qdisc_unthrottled(sch);

			qdisc_bstats_update(sch, skb);
@@ -294,6 +297,7 @@ static void tbf_reset(struct Qdisc *sch) 
	struct tbf_sched_data *q = qdisc_priv(sch);



	qdisc_reset(q->qdisc);

	sch->qstats.backlog = 0;

	sch->q.qlen = 0;

	q->t_c = ktime_get_ns();

	q->tokens = q->buffer;