kernel: Remove support for kernel 3.18

[oweals/openwrt.git] / package / kernel / linux / modules / netfilter.mk

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 25715be5d1c443649b377779d708410e75f4a466..53188eab5acd27ee484643fcdd7dcbf6188a9234 100644 (file)
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -152,7 +152,7 @@ define KernelPackage/nf-flow
        CONFIG_NETFILTER_INGRESS=y \
        CONFIG_NF_FLOW_TABLE \
        CONFIG_NF_FLOW_TABLE_HW
-  DEPENDS:=+kmod-nf-conntrack @!LINUX_3_18 @!LINUX_4_9
+  DEPENDS:=+kmod-nf-conntrack @!LINUX_4_9
   FILES:= \
        $(LINUX_DIR)/net/netfilter/nf_flow_table.ko \
        $(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko
@@ -330,6 +330,7 @@ define KernelPackage/ipt-ipset
        CONFIG_IP_SET_BITMAP_IPMAC \
        CONFIG_IP_SET_BITMAP_PORT \
        CONFIG_IP_SET_HASH_IP \
+       CONFIG_IP_SET_HASH_IPMAC \
        CONFIG_IP_SET_HASH_IPMARK \
        CONFIG_IP_SET_HASH_IPPORT \
        CONFIG_IP_SET_HASH_IPPORTIP \
@@ -367,7 +368,7 @@ IPVS_MODULES:= \
 define KernelPackage/nf-ipvs
   SUBMENU:=Netfilter Extensions
   TITLE:=IP Virtual Server modules
-  DEPENDS:=@IPV6 +kmod-lib-crc32c +kmod-ipt-conntrack +kmod-nf-conntrack
+  DEPENDS:=@IPV6 +kmod-lib-crc32c +kmod-ipt-conntrack +kmod-nf-conntrack +LINUX_4_14:kmod-nf-conntrack6
   KCONFIG:= \
        CONFIG_IP_VS \
        CONFIG_IP_VS_IPV6=y \
@@ -646,6 +647,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:= \