diff options
author | Patrick McHardy <kaber@trash.net> | 2006-01-09 19:43:13 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-10 15:54:29 -0500 |
commit | bb94aa169eaa6e713a429370d37388722f08666f (patch) | |
tree | fefb35f0c42d6e434c6b8ec627a9d715027e7ea2 /net/ipv6/netfilter.c | |
parent | d3f4a687f683f536506d0aa6b22e6cb3e79639ce (diff) |
[NETFILTER]: net/ipv[46]/netfilter.c cleanups
Don't wrap entire file in #ifdef CONFIG_NETFILTER, remove a few
unneccessary includes.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/netfilter.c')
-rw-r--r-- | net/ipv6/netfilter.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index b63678328a3..1ab62f03366 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c | |||
@@ -1,9 +1,5 @@ | |||
1 | #include <linux/config.h> | ||
2 | #include <linux/init.h> | ||
3 | |||
4 | #ifdef CONFIG_NETFILTER | ||
5 | |||
6 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
2 | #include <linux/init.h> | ||
7 | #include <linux/ipv6.h> | 3 | #include <linux/ipv6.h> |
8 | #include <linux/netfilter.h> | 4 | #include <linux/netfilter.h> |
9 | #include <linux/netfilter_ipv6.h> | 5 | #include <linux/netfilter_ipv6.h> |
@@ -94,18 +90,7 @@ int __init ipv6_netfilter_init(void) | |||
94 | return nf_register_queue_rerouter(PF_INET6, &ip6_reroute); | 90 | return nf_register_queue_rerouter(PF_INET6, &ip6_reroute); |
95 | } | 91 | } |
96 | 92 | ||
97 | void ipv6_netfilter_fini(void) | 93 | void __exit ipv6_netfilter_fini(void) |
98 | { | 94 | { |
99 | nf_unregister_queue_rerouter(PF_INET6); | 95 | nf_unregister_queue_rerouter(PF_INET6); |
100 | } | 96 | } |
101 | |||
102 | #else /* CONFIG_NETFILTER */ | ||
103 | int __init ipv6_netfilter_init(void) | ||
104 | { | ||
105 | return 0; | ||
106 | } | ||
107 | |||
108 | void ipv6_netfilter_fini(void) | ||
109 | { | ||
110 | } | ||
111 | #endif /* CONFIG_NETFILTER */ | ||