From: David S. Miller <davem@davemloft.net>
Date: Sat, 26 Jul 2008 09:28:09 +0000 (-0700)
Subject: Revert "pkt_sched: sch_sfq: dump a real number of flows"
X-Git-Tag: v2.6.27-rc1~75^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cdec7e50a4896c5197d5575d9ca635eea6825149;p=linux-2.6-omap-h63xx.git

Revert "pkt_sched: sch_sfq: dump a real number of flows"

This reverts commit f867e6af94239a04ec23aeec2fcda5aa58e41db7.

Based upon discussions between Jarek and Patrick McHardy
this is field being set is more a config parameter than a
statistic.  And we should add a true statistic to provide
this information if we really want it.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 73f53844ce9..8589da66656 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -536,14 +536,7 @@ static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb)
 
 	opt.limit = q->limit;
 	opt.divisor = SFQ_HASH_DIVISOR;
-	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++;
-	}
+	opt.flows = q->limit;
 
 	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);