From 13893567358a8426d03ac3c613befc55431f23ce Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 21 Jan 2008 00:13:44 -0800 Subject: [NET_SCHED]: sch_ingress: avoid a few #ifdefs Move the repeating "ifndef CONFIG_NET_CLS_ACT/ifdef CONFIG_NETFILTER" ifdefs into a single condition. Signed-off-by: Patrick McHardy Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller --- net/sched/sch_ingress.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'net/sched/sch_ingress.c') diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index b30ca01bdc04..4c7f7e712918 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c @@ -20,11 +20,9 @@ /* Thanks to Doron Oz for this hack */ -#ifndef CONFIG_NET_CLS_ACT -#ifdef CONFIG_NETFILTER +#if !defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NETFILTER) static int nf_registered; #endif -#endif struct ingress_qdisc_data { struct tcf_proto *filter_list; @@ -118,8 +116,7 @@ static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch) return result; } -#ifndef CONFIG_NET_CLS_ACT -#ifdef CONFIG_NETFILTER +#if !defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NETFILTER) static unsigned int ing_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *indev, const struct net_device *outdev, @@ -158,12 +155,10 @@ static struct nf_hook_ops ing_ops[] __read_mostly = { }, }; #endif -#endif static int ingress_init(struct Qdisc *sch, struct rtattr *opt) { -#ifndef CONFIG_NET_CLS_ACT -#ifdef CONFIG_NETFILTER +#if !defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NETFILTER) printk("Ingress scheduler: Classifier actions prefered over netfilter\n"); if (!nf_registered) { @@ -173,7 +168,6 @@ static int ingress_init(struct Qdisc *sch, struct rtattr *opt) } nf_registered++; } -#endif #endif return 0; } @@ -240,12 +234,10 @@ static int __init ingress_module_init(void) static void __exit ingress_module_exit(void) { unregister_qdisc(&ingress_qdisc_ops); -#ifndef CONFIG_NET_CLS_ACT -#ifdef CONFIG_NETFILTER +#if !defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NETFILTER) if (nf_registered) nf_unregister_hooks(ing_ops, ARRAY_SIZE(ing_ops)); #endif -#endif } module_init(ingress_module_init) -- cgit v1.2.3-59-g8ed1b