From dff0b2104d8403f888c3d0bebd70dce08d254dad Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 18 Nov 2018 18:15:56 +0100 Subject: [PATCH] kernel: netfilter: Add nf_tproxy_ipv{4,6} and nf_socket_ipv{4,6} The nf_socket.ko module was split in commit 8db4c5be88f ("netfilter: move socket lookup infrastructure to nf_socket_ipv{4,6}.c") into a common, n IPv4 and an IPv6 part. The nf_tproxy.ko module was split in commit 45ca4e0cf27 ("netfilter: Libify xt_TPROXY") into a common, an IPv4 and an IPv6 part. Signed-off-by: Hauke Mehrtens (cherry picked from commit 89806545cc1711f4e33c1c2ac5265aec4afe8078) (required for fixing FS#2531) Signed-off-by: Yousong Zhou --- include/netfilter.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/netfilter.mk b/include/netfilter.mk index 510aa183ca..2a4f89472c 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -258,7 +258,11 @@ $(eval $(call nf_add,IPT_DEBUG,CONFIG_NETFILTER_XT_TARGET_TRACE, $(P_XT)xt_TRACE # tproxy $(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket)) +$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV4, $(P_V4)nf_socket_ipv4, ge 4.10)) +$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV6, $(P_V6)nf_socket_ipv6, ge 4.10)) $(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_TARGET_TPROXY, $(P_XT)xt_TPROXY)) +$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_TPROXY_IPV4, $(P_V4)nf_tproxy_ipv4, ge 4.18)) +$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_TPROXY_IPV6, $(P_V6)nf_tproxy_ipv6, ge 4.18)) # led $(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED)) -- 2.25.1