git.stricted.de - GitHub/moto-9609/android_kernel_motorola

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	Pablo Neira Ayuso <pablo@netfilter.org>
	Wed, 26 Nov 2014 11:46:50 +0000 (12:46 +0100)
committer	Pablo Neira Ayuso <pablo@netfilter.org>
	Thu, 27 Nov 2014 12:08:42 +0000 (13:08 +0100)
commit	b59eaf9e2871735ea7cc7e3dbf8bf83bddd786b9
tree	e566e49ab6f1736c5e5ce600ca5c9741f6c694a0	tree \| snapshot (tar.gz zip)
parent	1b63d4b9b54cee6002757a8d20b537aa4037ae8f	commit \| 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>

15 files changed:

include/net/netfilter/ipv4/nf_nat_redirect.h	[deleted file]	blob \| blame \| history
include/net/netfilter/ipv6/nf_nat_redirect.h	[deleted file]	blob \| blame \| history
include/net/netfilter/nf_nat_redirect.h	[new file with mode: 0644]	blob
net/ipv4/netfilter/Kconfig		diff \| blob \| blame \| history
net/ipv4/netfilter/Makefile		diff \| blob \| blame \| history
net/ipv4/netfilter/nf_nat_redirect_ipv4.c	[deleted file]	blob \| blame \| history
net/ipv4/netfilter/nft_redir_ipv4.c		diff \| blob \| blame \| history
net/ipv6/netfilter/Kconfig		diff \| blob \| blame \| history
net/ipv6/netfilter/Makefile		diff \| blob \| blame \| history
net/ipv6/netfilter/nf_nat_redirect_ipv6.c	[deleted file]	blob \| blame \| history
net/ipv6/netfilter/nft_redir_ipv6.c		diff \| blob \| blame \| history
net/netfilter/Kconfig		diff \| blob \| blame \| history
net/netfilter/Makefile		diff \| blob \| blame \| history
net/netfilter/nf_nat_redirect.c	[new file with mode: 0644]	blob
net/netfilter/xt_REDIRECT.c		diff \| blob \| blame \| history

RSS Atom