Received: with ECARTIS (v1.0.0; list netdev); Fri, 31 Dec 2004 06:09:13 -0800 (PST) Received: from b.mx.projectdream.org (eth0-0.arisu.projectdream.org [194.158.4.191]) by oss.sgi.com (8.13.0/8.13.0) with ESMTP id iBVE8kpl026870 for ; Fri, 31 Dec 2004 06:09:06 -0800 Received: from postel.suug.ch (unknown [195.134.158.23]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by b.mx.projectdream.org (Postfix) with ESMTP id F36F3F; Fri, 31 Dec 2004 15:16:58 +0100 (CET) Received: by postel.suug.ch (Postfix, from userid 10001) id 353AD1C0EA; Fri, 31 Dec 2004 15:17:21 +0100 (CET) Date: Fri, 31 Dec 2004 15:17:21 +0100 From: Thomas Graf To: "David S. Miller" Cc: Jamal Hadi Salim , Patrick McHardy , netdev@oss.sgi.com Subject: [RESEND 9/9] PKT_SCHED: Actions are now available for all classifiers & Fix police Kconfig dependencies Message-ID: <20041231141721.GL32419@postel.suug.ch> References: <20041230122652.GM32419@postel.suug.ch> <20041230123617.GV32419@postel.suug.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041230123617.GV32419@postel.suug.ch> X-Virus-Scanned: ClamAV 0.80/645/Mon Dec 27 14:56:20 2004 clamav-milter version 0.80j on 127.0.0.1 X-Virus-Status: Clean X-archive-position: 13293 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: tgraf@suug.ch Precedence: bulk X-list: netdev Removes outdated comment and make action and old compat policer mutually exclusive to reflect the code. Noted by Jamal Hadi Salim. Signed-off-by: Thomas Graf --- linux-2.6.10-bk2.orig/net/sched/Kconfig 2004-12-31 14:10:54.000000000 +0100 +++ linux-2.6.10-bk2/net/sched/Kconfig 2004-12-31 15:04:01.000000000 +0100 @@ -381,7 +381,6 @@ ---help--- This option requires you have a new iproute2. It enables tc extensions which can be used with tc classifiers. - Only the u32 and fw classifiers are supported at the moment. You MUST NOT turn this on if you dont have an update iproute2. config NET_ACT_POLICE @@ -392,13 +391,6 @@ below to select a policer. You MUST NOT turn this on if you dont have an update iproute2. -config NET_CLS_POLICE - bool "Traffic policing (needed for in/egress)" - depends on NET_CLS && NET_QOS && NET_ACT_POLICE!=y && NET_ACT_POLICE!=m - help - Say Y to support traffic policing (bandwidth limits). Needed for - ingress and egress rate limiting. - config NET_ACT_GACT tristate "generic Actions" depends on NET_CLS_ACT @@ -432,3 +424,11 @@ ---help--- requires new iproute2 This allows for packets to be generically edited + +config NET_CLS_POLICE + bool "Traffic policing (needed for in/egress)" + depends on NET_CLS && NET_QOS && NET_CLS_ACT!=y + help + Say Y to support traffic policing (bandwidth limits). Needed for + ingress and egress rate limiting. +