b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9 - kernel/msm-4.9

commit	b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9	[log] [tgz]
author	Pablo Neira Ayuso <pablo@netfilter.org>	Wed Nov 26 12:46:50 2014 +0100
committer	Pablo Neira Ayuso <pablo@netfilter.org>	Thu Nov 27 13:08:42 2014 +0100
tree	e566e49ab6f1736c5e5ce600ca5c9741f6c694a0
parent	1b63d4b9b54cee6002757a8d20b537aa4037ae8f [diff]

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>

include/net/netfilter/ipv4/nf_nat_redirect.h[Deleted - diff]
include/net/netfilter/ipv6/nf_nat_redirect.h[Deleted - diff]
include/net/netfilter/nf_nat_redirect.h[Added - diff]
net/ipv4/netfilter/Kconfig[diff]
net/ipv4/netfilter/Makefile[diff]
net/ipv4/netfilter/nft_redir_ipv4.c[diff]
net/ipv6/netfilter/Kconfig[diff]
net/ipv6/netfilter/Makefile[diff]
net/ipv6/netfilter/nf_nat_redirect_ipv6.c[Deleted - diff]
net/ipv6/netfilter/nft_redir_ipv6.c[diff]
net/netfilter/Kconfig[diff]
net/netfilter/Makefile[diff]
net/netfilter/nf_nat_redirect.c[Renamed from net/ipv4/netfilter/nf_nat_redirect_ipv4.c - diff]
net/netfilter/xt_REDIRECT.c[diff]

14 files changed

tree: e566e49ab6f1736c5e5ce600ca5c9741f6c694a0