]> err.no Git - linux-2.6/commitdiff
pkt_sched: sch_sfq: dump a real number of flows
authorJarek Poplawski <jarkao2@gmail.com>
Thu, 24 Jul 2008 04:34:27 +0000 (21:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Jul 2008 04:34:27 +0000 (21:34 -0700)
Dump the "flows" number according to the number of active flows
instead of repeating the "limit".

Reported-by: Denys Fedoryshchenko <denys@visp.net.lb>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_sfq.c

index 8589da666568b50fc47ac1a2c280a0a96c92a5f3..73f53844ce976128f35a59663d2a9b3f13ed254f 100644 (file)
@@ -536,7 +536,14 @@ static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb)
 
        opt.limit = q->limit;
        opt.divisor = SFQ_HASH_DIVISOR;
-       opt.flows = q->limit;
+       opt.flows = 0;
+       if (q->tail != SFQ_DEPTH) {
+               unsigned int i;
+
+               for (i = 0; i < SFQ_HASH_DIVISOR; i++)
+                       if (q->ht[i] != SFQ_DEPTH)
+                               opt.flows++;
+       }
 
        NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);