diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-26 12:46:50 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-27 13:08:42 +0100 |
commit | b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9 (patch) | |
tree | e566e49ab6f1736c5e5ce600ca5c9741f6c694a0 /net/ipv6/netfilter/Makefile | |
parent | 1b63d4b9b54cee6002757a8d20b537aa4037ae8f (diff) | |
download | linux-b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9.tar.gz linux-b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9.tar.bz2 linux-b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9.zip |
netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module
This resolves linking problems with CONFIG_IPV6=n:
net/built-in.o: In function `redirect_tg6':
xt_REDIRECT.c:(.text+0x6d021): undefined reference to `nf_nat_redirect_ipv6'
Reported-by: Andreas Ruprecht <rupran@einserver.de>
Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv6/netfilter/Makefile')
-rw-r--r-- | net/ipv6/netfilter/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile index d2ac9f5f212c..c36e0a5490de 100644 --- a/net/ipv6/netfilter/Makefile +++ b/net/ipv6/netfilter/Makefile @@ -19,7 +19,6 @@ obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_nat_ipv6-y := nf_nat_l3proto_ipv6.o nf_nat_proto_icmpv6.o obj-$(CONFIG_NF_NAT_IPV6) += nf_nat_ipv6.o obj-$(CONFIG_NF_NAT_MASQUERADE_IPV6) += nf_nat_masquerade_ipv6.o -obj-$(CONFIG_NF_NAT_REDIRECT_IPV6) += nf_nat_redirect_ipv6.o # defrag nf_defrag_ipv6-y := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o |