kernel: remove duplicate br-netfilter file and Kconfig symbol from kmod-ebtables

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

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index a5220825f90bed1c1d7cfdc116821ebeb553b638..ccbd20a64349bcd0ba129f7a71bee4d67f54bfd5 100644 (file)
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -68,6 +68,7 @@ define KernelPackage/nf-conntrack
   KCONFIG:= \
         CONFIG_NETFILTER=y \
         CONFIG_NETFILTER_ADVANCED=y \
+        CONFIG_NF_CONNTRACK_ZONES=y \
        $(KCONFIG_NF_CONNTRACK)
   FILES:=$(foreach mod,$(NF_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK-m)))
@@ -270,60 +271,6 @@ define KernelPackage/ipt-ipset
 endef
 $(eval $(call KernelPackage,ipt-ipset))
 
-IPVS_MODULES:= \
-       ip_vs \
-       ip_vs_lc \
-       ip_vs_wlc \
-       ip_vs_rr \
-       ip_vs_wrr \
-       ip_vs_lblc \
-       ip_vs_lblcr \
-       ip_vs_dh \
-       ip_vs_sh \
-       ip_vs_fo \
-       ip_vs_nq \
-       ip_vs_sed
-
-define KernelPackage/nf-ipvs
-  SUBMENU:=Netfilter Extensions
-  TITLE:=IP Virtual Server modules
-  DEPENDS:=+kmod-lib-crc32c
-  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=n \
-       CONFIG_NETFILTER_XT_MATCH_IPVS=n
-
-  FILES:=$(foreach mod,$(IPVS_MODULES),$(LINUX_DIR)/net/netfilter/ipvs/$(mod).ko)
-  $(call AddDepends/ipt,+kmod-ipt-conntrack)
-endef
-$(eval $(call KernelPackage,nf-ipvs))
-
-define KernelPackage/nf-ipvs/description
- IPVS (IP Virtual Server) implements transport-layer load balancing inside the Linux kernel
- so called Layer-4 switching.
-endef
 
 define KernelPackage/ipt-nat
   TITLE:=Basic NAT targets
@@ -632,7 +579,7 @@ define KernelPackage/ipt-extra
   KCONFIG:=$(KCONFIG_IPT_EXTRA)
   FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_EXTRA-m)))
-  $(call AddDepends/ipt)
+  $(call AddDepends/ipt,+kmod-br-netfilter)
 endef
 
 define KernelPackage/ipt-extra/description
@@ -697,13 +644,25 @@ endef
 $(eval $(call KernelPackage,arptables))
 
 
+define KernelPackage/br-netfilter
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Bridge netfilter support modules
+  HIDDEN:=1
+  DEPENDS:=+kmod-ipt-core +kmod-bridge
+  FILES:=$(LINUX_DIR)/net/bridge/br_netfilter.ko
+  KCONFIG:=CONFIG_BRIDGE_NETFILTER
+  AUTOLOAD:=$(call AutoProbe,br_netfilter)
+endef
+
+$(eval $(call KernelPackage,br-netfilter))
+
+
 define KernelPackage/ebtables
   SUBMENU:=$(NF_MENU)
   TITLE:=Bridge firewalling modules
-  DEPENDS:=+kmod-ipt-core +kmod-bridge
+  DEPENDS:=+kmod-ipt-core +kmod-bridge +kmod-br-netfilter
   FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko)
-  KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \
-       $(KCONFIG_EBTABLES)
+  KCONFIG:=$(KCONFIG_EBTABLES)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(EBTABLES-m)))
 endef