diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-11 00:02:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-11 00:02:21 -0500 |
| commit | 5bf887f2ff874e2cd881c34bbed974bee2c90808 (patch) | |
| tree | 0785a763e185a1a7e30b61ebf2f09ea29d74bd2e /net/ipv6/Makefile | |
| 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/Makefile')
| -rw-r--r-- | net/ipv6/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index bf18cff13120..41877abd22e6 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 \ | |||
| 12 | 12 | ||
| 13 | ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ | 13 | ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ |
| 14 | xfrm6_output.o | 14 | xfrm6_output.o |
| 15 | ipv6-$(CONFIG_NETFILTER) += netfilter.o | ||
| 15 | ipv6-objs += $(ipv6-y) | 16 | ipv6-objs += $(ipv6-y) |
| 16 | 17 | ||
| 17 | obj-$(CONFIG_INET6_AH) += ah6.o | 18 | obj-$(CONFIG_INET6_AH) += ah6.o |
| 18 | obj-$(CONFIG_INET6_ESP) += esp6.o | 19 | obj-$(CONFIG_INET6_ESP) += esp6.o |
| 19 | obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o | 20 | obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o |
| 20 | obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o | 21 | obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o |
| 21 | obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/ | 22 | obj-$(CONFIG_NETFILTER) += netfilter/ |
| 22 | 23 | ||
| 23 | obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o | 24 | obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o |
| 24 | 25 | ||