Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[firefly-linux-kernel-4.4.55.git] / net / sched / sch_qfq.c

diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 3fb26555c79bb7e735cf4563d12baba4f1aff8e7..3ec7e88a43cab2df5e012d3c5216bc31b75eafe3 100644 (file)
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -664,14 +664,14 @@ static int qfq_dump_class_stats(struct Qdisc *sch, unsigned long arg,
        struct tc_qfq_stats xstats;
 
        memset(&xstats, 0, sizeof(xstats));
-       cl->qdisc->qstats.qlen = cl->qdisc->q.qlen;
 
        xstats.weight = cl->agg->class_weight;
        xstats.lmax = cl->agg->lmax;
 
        if (gnet_stats_copy_basic(d, NULL, &cl->bstats) < 0 ||
            gnet_stats_copy_rate_est(d, &cl->bstats, &cl->rate_est) < 0 ||
-           gnet_stats_copy_queue(d, &cl->qdisc->qstats) < 0)
+           gnet_stats_copy_queue(d, NULL,
+                                 &cl->qdisc->qstats, cl->qdisc->q.qlen) < 0)
                return -1;
 
        return gnet_stats_copy_app(d, &xstats, sizeof(xstats));