]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fq_codel: return non zero qlen in class dumps
authorEric Dumazet <edumazet@google.com>
Mon, 6 Jun 2016 16:12:39 +0000 (09:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Jun 2016 23:28:11 +0000 (16:28 -0700)
We properly scan the flow list to count number of packets,
but John passed 0 to gnet_stats_copy_queue() so we report
a zero value to user space instead of the result.

Fixes: 640158536632 ("net: sched: restrict use of qstats qlen")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: John Fastabend <john.r.fastabend@intel.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_fq_codel.c

index fff7867f4a4fed0ab66d78ec603109e337ad5550..da250b2e06ae3b2cc054ff1d31e29649a74f6e13 100644 (file)
@@ -661,7 +661,7 @@ static int fq_codel_dump_class_stats(struct Qdisc *sch, unsigned long cl,
                qs.backlog = q->backlogs[idx];
                qs.drops = flow->dropped;
        }
-       if (gnet_stats_copy_queue(d, NULL, &qs, 0) < 0)
+       if (gnet_stats_copy_queue(d, NULL, &qs, qs.qlen) < 0)
                return -1;
        if (idx < q->flows_cnt)
                return gnet_stats_copy_app(d, &xstats, sizeof(xstats));