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/netfilter/xt_REDIRECT.c | |
| parent | 1b63d4b9b54cee6002757a8d20b537aa4037ae8f (diff) | |
| download | linux-b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9.tar.bz2 | |
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/netfilter/xt_REDIRECT.c')
| -rw-r--r-- | net/netfilter/xt_REDIRECT.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/xt_REDIRECT.c b/net/netfilter/xt_REDIRECT.c index b6ec67efd900..03f0b370e178 100644 --- a/net/netfilter/xt_REDIRECT.c +++ b/net/netfilter/xt_REDIRECT.c @@ -26,8 +26,7 @@ #include <net/checksum.h> #include <net/protocol.h> #include <net/netfilter/nf_nat.h> -#include <net/netfilter/ipv4/nf_nat_redirect.h> -#include <net/netfilter/ipv6/nf_nat_redirect.h> +#include <net/netfilter/nf_nat_redirect.h> static unsigned int redirect_tg6(struct sk_buff *skb, const struct xt_action_param *par) |