From: Oldřich Jedlička Date: Tue, 29 Jan 2019 21:25:33 +0000 (+0100) Subject: kernel: Added required dependencies for socket match. X-Git-Tag: v18.06.5~11 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a2fe698a40a76d693493b89fd929241093cf8ff4;p=openwrt%2Fstaging%2Fchunkeey.git kernel: Added required dependencies for socket match. This applies to kernel 4.10 and newer. See https://github.com/torvalds/linux/commit/8db4c5be88f62ffd7a552f70687a10c614dc697b The above commit added to kernel 4.10 added new dependency for building the NETFILTER_XT_MATCH_SOCKET (xt_socket.ko) module. The NF_SOCKET_IPVx options (both of them) need to be enabled in order to build the NETFILTER_XT_MATCH_SOCKET module. Without the change the module is not built. Signed-off-by: Oldřich Jedlička (cherry picked from commit 66e875a07033cdcfd8c4a16940d4acfe63c60202) (required for fixing FS#2531) Signed-off-by: Yousong Zhou --- diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 3a989104d7..f2e10682b4 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -554,6 +554,8 @@ define KernelPackage/ipt-tproxy TITLE:=Transparent proxying support DEPENDS+=+kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +IPV6:kmod-ip6tables KCONFIG:= \ + CONFIG_NF_SOCKET_IPV4 \ + CONFIG_NF_SOCKET_IPV6 \ CONFIG_NETFILTER_XT_MATCH_SOCKET \ CONFIG_NETFILTER_XT_TARGET_TPROXY FILES:= \