diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 21:29:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 21:29:53 -0800 |
| commit | 35d138ae22f826f95f0f8d0285947582ccf4508f (patch) | |
| tree | 622d0f4bd533ace1c12a8b51ee02afc1e6e663ab | |
| parent | d274ba2081cce6ff59f94e608a348f20ba1fe775 (diff) | |
| parent | 5bf887f2ff874e2cd881c34bbed974bee2c90808 (diff) | |
| download | op-kernel-dev-35d138ae22f826f95f0f8d0285947582ccf4508f.zip op-kernel-dev-35d138ae22f826f95f0f8d0285947582ccf4508f.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/ipv6/Makefile | 3 | ||||
| -rw-r--r-- | net/ipv6/netfilter.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index bf18cff..41877ab 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile @@ -12,13 +12,14 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o sit.o \ ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ xfrm6_output.o +ipv6-$(CONFIG_NETFILTER) += netfilter.o ipv6-objs += $(ipv6-y) obj-$(CONFIG_INET6_AH) += ah6.o obj-$(CONFIG_INET6_ESP) += esp6.o obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o -obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/ +obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 1ab62f0..d750cfc 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c @@ -90,7 +90,10 @@ int __init ipv6_netfilter_init(void) return nf_register_queue_rerouter(PF_INET6, &ip6_reroute); } -void __exit ipv6_netfilter_fini(void) +/* This can be called from inet6_init() on errors, so it cannot + * be marked __exit. -DaveM + */ +void ipv6_netfilter_fini(void) { nf_unregister_queue_rerouter(PF_INET6); } |
