From 645a1e39e4e3e84a275c5e4a7c8049041146f9b5 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 21 Jan 2008 00:13:19 -0800 Subject: [NET_SCHED]: sch_ingress: move dependencies to Kconfig Instead of complaining at scheduler initialization time, check the dependencies in Kconfig. Signed-off-by: Patrick McHardy Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller --- net/sched/sch_ingress.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'net/sched/sch_ingress.c') diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index c69e7bc7fb6c..b30ca01bdc04 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c @@ -162,19 +162,10 @@ static struct nf_hook_ops ing_ops[] __read_mostly = { static int ingress_init(struct Qdisc *sch, struct rtattr *opt) { - /* Make sure either netfilter or preferably CLS_ACT is - * compiled in */ #ifndef CONFIG_NET_CLS_ACT -#ifndef CONFIG_NETFILTER - printk("You MUST compile classifier actions into the kernel\n"); - return -EINVAL; -#else +#ifdef CONFIG_NETFILTER printk("Ingress scheduler: Classifier actions prefered over netfilter\n"); -#endif -#endif -#ifndef CONFIG_NET_CLS_ACT -#ifdef CONFIG_NETFILTER if (!nf_registered) { if (nf_register_hooks(ing_ops, ARRAY_SIZE(ing_ops)) < 0) { printk("ingress qdisc registration error \n"); -- cgit v1.2.3-59-g8ed1b