Commit 73e42ff7 authored Oct 21, 2016 by Eric Dumazet Committed by David S. Miller Oct 26, 2016

sch_htb: do not report fake rate estimators



When I prepared commit d250a5f9 ("pkt_sched: gen_estimator: Dont
report fake rate estimators"), htb still had an implicit rate estimator
for all its classes.

Then later, I made this rate estimator optional in commit 64153ce0
("net_sched: htb: do not setup default rate estimators"), but I forgot
to update htb use of gnet_stats_copy_rate_est()

After this patch, "tc -s qdisc ..." no longer report fake rate
estimators for HTB classes.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 432490f9

net/sched/sch_htb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1145,7 +1145,7 @@ htb_dump_class_stats(struct Qdisc sch, unsigned long arg, struct gnet_dump d)

		if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
		d, NULL, &cl->bstats) < 0 \|\|
		gnet_stats_copy_rate_est(d, NULL, &cl->rate_est) < 0 \|\|
		gnet_stats_copy_rate_est(d, &cl->bstats, &cl->rate_est) < 0 \|\|
		gnet_stats_copy_queue(d, NULL, &qs, qlen) < 0)
		return -1;

Admin message