diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-10 21:02:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-10 21:02:21 -0800 |
| commit | 5bf887f2ff874e2cd881c34bbed974bee2c90808 (patch) | |
| tree | 0785a763e185a1a7e30b61ebf2f09ea29d74bd2e /net/ipv6/netfilter.c | |
| parent | 9819d85c210f5953fffc1052060e589d633f20ed (diff) | |
[IPV6]: Fix modular build with netfilter enabled.
Also, drop __exit marker from ipv6_netfilter_fini() as this
can be invoked from inet6_init() error handling paths.
Based upon a report from Stephen Hemminger.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/netfilter.c')
| -rw-r--r-- | net/ipv6/netfilter.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 1ab62f033664..d750cfc019dc 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); } |