diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 13:44:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 13:44:43 -0800 |
| commit | 58dc125a66145f45f239cd78db9410062dc0bcd4 (patch) | |
| tree | 90537ddf035e96ca3182f61755ed234de93b449b /net/ipv6/netfilter.c | |
| parent | c544bdb1999e04eb10035f1c3262a103859d94b2 (diff) | |
| parent | 8a4c8a96a47c9e2f08156fd9664974df086eed50 (diff) | |
| download | olio-linux-3.10-58dc125a66145f45f239cd78db9410062dc0bcd4.tar.xz olio-linux-3.10-58dc125a66145f45f239cd78db9410062dc0bcd4.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 @@ -#include <linux/config.h> -#include <linux/init.h> - -#ifdef CONFIG_NETFILTER - #include <linux/kernel.h> +#include <linux/init.h> #include <linux/ipv6.h> #include <linux/netfilter.h> #include <linux/netfilter_ipv6.h> @@ -94,18 +90,7 @@ int __init ipv6_netfilter_init(void) return nf_register_queue_rerouter(PF_INET6, &ip6_reroute); } -void ipv6_netfilter_fini(void) +void __exit ipv6_netfilter_fini(void) { nf_unregister_queue_rerouter(PF_INET6); } - -#else /* CONFIG_NETFILTER */ -int __init ipv6_netfilter_init(void) -{ - return 0; -} - -void ipv6_netfilter_fini(void) -{ -} -#endif /* CONFIG_NETFILTER */ |