kernel: Make kmod-nft-core depend on kmod-nf-nat

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

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 6d751cc658a26276535659e5729d24ff2dfda009..4f31fa8b18590a73ffd7c4ff8e8629db73437b93 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_4 @!LINUX_4_9
+  DEPENDS:=+kmod-nf-conntrack
   FILES:= \
        $(LINUX_DIR)/net/netfilter/nf_flow_table.ko \
        $(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko
@@ -245,7 +245,7 @@ $(eval $(call KernelPackage,ipt-filter))
 
 define KernelPackage/ipt-offload
   TITLE:=Netfilter routing/NAT offload support
-  KCONFIG:=CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD
+  KCONFIG:=$(KCONFIG_IPT_FLOW)
   FILES:=$(foreach mod,$(IPT_FLOW-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_FLOW-m)))
   $(call AddDepends/ipt,+kmod-nf-flow)
@@ -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 \
@@ -348,6 +349,98 @@ endef
 $(eval $(call KernelPackage,ipt-ipset))
 
 
+IPVS_MODULES:= \
+       ipvs/ip_vs \
+       ipvs/ip_vs_lc \
+       ipvs/ip_vs_wlc \
+       ipvs/ip_vs_rr \
+       ipvs/ip_vs_wrr \
+       ipvs/ip_vs_lblc \
+       ipvs/ip_vs_lblcr \
+       ipvs/ip_vs_dh \
+       ipvs/ip_vs_sh \
+       ipvs/ip_vs_fo \
+       ipvs/ip_vs_ovf \
+       ipvs/ip_vs_nq \
+       ipvs/ip_vs_sed \
+       xt_ipvs
+
+define KernelPackage/nf-ipvs
+  SUBMENU:=Netfilter Extensions
+  TITLE:=IP Virtual Server modules
+  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 \
+       CONFIG_IP_VS_DEBUG=n \
+       CONFIG_IP_VS_PROTO_TCP=y \
+       CONFIG_IP_VS_PROTO_UDP=y \
+       CONFIG_IP_VS_PROTO_AH_ESP=y \
+       CONFIG_IP_VS_PROTO_ESP=y \
+       CONFIG_IP_VS_PROTO_AH=y \
+       CONFIG_IP_VS_PROTO_SCTP=y \
+       CONFIG_IP_VS_TAB_BITS=12 \
+       CONFIG_IP_VS_RR \
+       CONFIG_IP_VS_WRR \
+       CONFIG_IP_VS_LC \
+       CONFIG_IP_VS_WLC \
+       CONFIG_IP_VS_FO \
+       CONFIG_IP_VS_OVF \
+       CONFIG_IP_VS_LBLC \
+       CONFIG_IP_VS_LBLCR \
+       CONFIG_IP_VS_DH \
+       CONFIG_IP_VS_SH \
+       CONFIG_IP_VS_SED \
+       CONFIG_IP_VS_NQ \
+       CONFIG_IP_VS_SH_TAB_BITS=8 \
+       CONFIG_IP_VS_NFCT=y \
+       CONFIG_NETFILTER_XT_MATCH_IPVS
+  FILES:=$(foreach mod,$(IPVS_MODULES),$(LINUX_DIR)/net/netfilter/$(mod).ko)
+  $(call AddDepends/ipt,+kmod-ipt-conntrack,+kmod-nf-conntrack)
+endef
+
+define KernelPackage/nf-ipvs/description
+ IPVS (IP Virtual Server) implements transport-layer load balancing inside
+ the Linux kernel so called Layer-4 switching.
+endef
+
+$(eval $(call KernelPackage,nf-ipvs))
+
+
+define KernelPackage/nf-ipvs-ftp
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Virtual Server FTP protocol support
+  KCONFIG:=CONFIG_IP_VS_FTP
+  DEPENDS:=kmod-nf-ipvs +kmod-nf-nat +kmod-nf-nathelper
+  FILES:=$(LINUX_DIR)/net/netfilter/ipvs/ip_vs_ftp.ko
+endef
+
+define KernelPackage/nf-ipvs-ftp/description
+  In the virtual server via Network Address Translation,
+  the IP address and port number of real servers cannot be sent to
+  clients in ftp connections directly, so FTP protocol helper is
+  required for tracking the connection and mangling it back to that of
+  virtual service.
+endef
+
+$(eval $(call KernelPackage,nf-ipvs-ftp))
+
+
+define KernelPackage/nf-ipvs-sip
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Virtual Server SIP protocol support
+  KCONFIG:=CONFIG_IP_VS_PE_SIP
+  DEPENDS:=kmod-nf-ipvs +kmod-nf-nathelper-extra
+  FILES:=$(LINUX_DIR)/net/netfilter/ipvs/ip_vs_pe_sip.ko
+endef
+
+define KernelPackage/nf-ipvs-sip/description
+  Allow persistence based on the SIP Call-ID
+endef
+
+$(eval $(call KernelPackage,nf-ipvs-sip))
+
+
 define KernelPackage/ipt-nat
   TITLE:=Basic NAT targets
   KCONFIG:=$(KCONFIG_IPT_NAT)
@@ -447,7 +540,7 @@ define KernelPackage/nf-nathelper-extra
   KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA)
   FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m)))
-  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch
+  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw +!LINUX_4_14:kmod-asn1-decoder
 endef
 
 define KernelPackage/nf-nathelper-extra/description
@@ -553,11 +646,8 @@ $(eval $(call KernelPackage,ipt-led))
 define KernelPackage/ipt-tproxy
   TITLE:=Transparent proxying support
   DEPENDS+=+kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +IPV6:kmod-ip6tables
-  KCONFIG:= \
-       CONFIG_NETFILTER_XT_MATCH_SOCKET \
-       CONFIG_NETFILTER_XT_TARGET_TPROXY
-  FILES:= \
-       $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_IPT_TPROXY)
+  FILES:=$(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_TPROXY-m)))
   $(call AddDepends/ipt)
 endef
@@ -571,11 +661,8 @@ $(eval $(call KernelPackage,ipt-tproxy))
 define KernelPackage/ipt-tee
   TITLE:=TEE support
   DEPENDS:=+kmod-ipt-conntrack
-  KCONFIG:= \
-       CONFIG_NETFILTER_XT_TARGET_TEE
-  FILES:= \
-       $(LINUX_DIR)/net/netfilter/xt_TEE.ko \
-       $(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_IPT_TEE)
+  FILES:=$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m)))
   $(call AddDepends/ipt)
 endef
@@ -589,11 +676,8 @@ $(eval $(call KernelPackage,ipt-tee))
 
 define KernelPackage/ipt-u32
   TITLE:=U32 support
-  KCONFIG:= \
-       CONFIG_NETFILTER_XT_MATCH_U32
-  FILES:= \
-       $(LINUX_DIR)/net/netfilter/xt_u32.ko \
-       $(foreach mod,$(IPT_U32-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_IPT_U32)
+  FILES:=$(foreach mod,$(IPT_U32-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_U32-m)))
   $(call AddDepends/ipt)
 endef
@@ -606,11 +690,8 @@ $(eval $(call KernelPackage,ipt-u32))
 
 define KernelPackage/ipt-checksum
   TITLE:=CHECKSUM support
-  KCONFIG:= \
-       CONFIG_NETFILTER_XT_TARGET_CHECKSUM
-  FILES:= \
-       $(LINUX_DIR)/net/netfilter/xt_CHECKSUM.ko \
-       $(foreach mod,$(IPT_CHECKSUM-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_IPT_CHECKSUM)
+  FILES:=$(foreach mod,$(IPT_CHECKSUM-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CHECKSUM-m)))
   $(call AddDepends/ipt)
 endef
@@ -643,7 +724,7 @@ define KernelPackage/ipt-cluster
   KCONFIG:=$(KCONFIG_IPT_CLUSTER)
   FILES:=$(foreach mod,$(IPT_CLUSTER-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CLUSTER-m)))
-  $(call AddDepends/ipt)
+  $(call AddDepends/ipt,+kmod-nf-conntrack)
 endef
 
 define KernelPackage/ipt-cluster/description
@@ -968,7 +1049,7 @@ $(eval $(call KernelPackage,ipt-rpfilter))
 define KernelPackage/nft-core
   SUBMENU:=$(NF_MENU)
   TITLE:=Netfilter nf_tables support
-  DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +kmod-nf-reject6 +kmod-nf-conntrack6
+  DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +kmod-nf-reject6 +kmod-nf-conntrack6 +LINUX_5_4:kmod-nf-nat
   FILES:=$(foreach mod,$(NFT_CORE-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m)))
   KCONFIG:= \
@@ -1064,7 +1145,7 @@ define KernelPackage/nft-netdev
        CONFIG_NFT_DUP_NETDEV \
        CONFIG_NFT_FWD_NETDEV
   FILES:= \
-       $(LINUX_DIR)/net/netfilter/nf_tables_netdev.ko \
+       $(LINUX_DIR)/net/netfilter/nf_tables_netdev.ko@lt4.17 \
        $(LINUX_DIR)/net/netfilter/nf_dup_netdev.ko \
        $(LINUX_DIR)/net/netfilter/nft_dup_netdev.ko \
        $(LINUX_DIR)/net/netfilter/nft_fwd_netdev.ko
@@ -1072,3 +1153,15 @@ define KernelPackage/nft-netdev
 endef
 
 $(eval $(call KernelPackage,nft-netdev))
+
+
+define KernelPackage/nft-fib
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter nf_tables fib support
+  DEPENDS:=+kmod-nft-core
+  FILES:=$(foreach mod,$(NFT_FIB-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_FIB-m)))
+  KCONFIG:=$(KCONFIG_NFT_FIB)
+endef
+
+$(eval $(call KernelPackage,nft-fib))