netdev - [PATCH] pkt_sched: sch_sfq: revert "dump a real number of flows" patch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20080724105352.GB3946@ff.dom.local>
Date:	Thu, 24 Jul 2008 10:53:52 +0000
From:	Jarek Poplawski <jarkao2@...il.com>
To:	Patrick McHardy <kaber@...sh.net>
Cc:	David Miller <davem@...emloft.net>, denys@...p.net.lb,
	netdev@...r.kernel.org
Subject: [PATCH] pkt_sched: sch_sfq: revert "dump a real number of flows"
	patch

On Thu, Jul 24, 2008 at 11:57:15AM +0200, Patrick McHardy wrote:
...
> IIRC the ESFQ for SFQ patches even use
> "flows" in ->init, so it might make things a bit more ugly if we
> ever merge those patches.

This argument looks right to me.

David, please, apply this reverting patch.

Thanks,
Jarek P.

-------------------->

pkt_sched: sch_sfq: revert "dump a real number of flows" patch

Patrick McHardy <kaber@...sh.net> noticed that since "flows" could be
used by sfq in the future as a parameter, we shouldn't currently
change it's meaning. This patch reverts my previous patch:
commit f867e6af94239a04ec23aeec2fcda5aa58e41db7


Signed-off-by: Jarek Poplawski <jarkao2@...il.com>

---

diff -Nurp net-2.6-/net/sched/sch_sfq.c net-2.6+/net/sched/sch_sfq.c
--- net-2.6-/net/sched/sch_sfq.c	2008-07-24 10:26:08.000000000 +0000
+++ net-2.6+/net/sched/sch_sfq.c	2008-07-21 09:32:53.000000000 +0000
@@ -536,14 +536,7 @@ static int sfq_dump(struct Qdisc *sch, s
 
 	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);
 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html