OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

   TITLE:=Netfilter flowtable support
   KCONFIG:= \
 	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_3_18 @!LINUX_4_4 @!LINUX_4_9
   FILES:= \
 	$(LINUX_DIR)/net/netfilter/nf_flow_table.ko \
 	$(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko
   AUTOLOAD:=$(call AutoProbe,nf_flow_table nf_flow_table_hw)
 endef
 define KernelPackage/ipt-filter/description
  Netfilter (IPv4) kernel modules for packet content inspection
  Includes:
- - string
- - bpf
+ - string
 endef
 	CONFIG_NETFILTER_XT_SET \
 	CONFIG_IP_SET_BITMAP_IP \
 	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 \
 	CONFIG_IP_SET_HASH_IPPORTNET \
 	CONFIG_IP_SET_HASH_MAC \
   AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPSET_MODULES)))
 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
-  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)
   SUBMENU:=$(NF_MENU)
   TITLE:=Extra Conntrack and NAT helpers
   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 +kmod-ipt-raw +LINUX_4_19:kmod-asn1-decoder
+  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch
 endef
 define KernelPackage/nf-nathelper-extra/description
  Extra Netfilter (IPv4) Conntrack and NAT helpers
 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 \
+  KCONFIG:= \
   	CONFIG_NETFILTER_XT_MATCH_SOCKET \
   	CONFIG_NETFILTER_XT_TARGET_TPROXY
   FILES:= \
   	$(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
 define KernelPackage/ipt-cluster
   TITLE:=Module for matching 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,+kmod-nf-conntrack)
+  $(call AddDepends/ipt)
 endef
 define KernelPackage/ipt-cluster/description
  Netfilter (IPv4/IPv6) module for matching cluster
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_NAT6-m)))
   KCONFIG:=$(KCONFIG_NFT_NAT6)
 endef
-$(eval $(call KernelPackage,nft-nat6))
-define KernelPackage/nft-netdev
-  SUBMENU:=$(NF_MENU)
-  TITLE:=Netfilter nf_tables netdev support
-  DEPENDS:=+kmod-nft-core
-  KCONFIG:= \
-	CONFIG_NETFILTER_INGRESS=y \
-	CONFIG_NF_TABLES_NETDEV \
-	CONFIG_NF_DUP_NETDEV \
-	CONFIG_NFT_DUP_NETDEV \
-	CONFIG_NFT_FWD_NETDEV
-  FILES:= \
-	$(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
-  AUTOLOAD:=$(call AutoProbe,nf_tables_netdev nf_dup_netdev nft_dup_netdev nft_fwd_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