---

yaml --- r: 105581 b: refs/heads/master c: f867e6a h: refs/heads/master i: 105579: a0b49f1 v: v3
git-mirror · Jul 24, 2008 · b97f4ed · b97f4ed
1 parent 343e1c5
commit b97f4ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f75a9b6426e686649ac440c37ec7c249501f9a5
+refs/heads/master: f867e6af94239a04ec23aeec2fcda5aa58e41db7
diff --git a/trunk/net/sched/sch_sfq.c b/trunk/net/sched/sch_sfq.c
@@ -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);