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

LEDE Commits lede-commits at lists.infradead.org
Sat Sep 24 14:40:12 PDT 2016


neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/ce89535bce052c9463e32ad83b950d00c988c21f

commit ce89535bce052c9463e32ad83b950d00c988c21f
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Sat Sep 24 23:37:54 2016 +0200

    kernel: remove duplicate br-netfilter file and Kconfig symbol from kmod-ebtables
    
    br_netfilter.ko and the corresponding Kconfig symbol are already provided
    by kmod-br-netfilter, which is a dependency of kmod-ebtables.
    
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
---
 package/kernel/linux/modules/netfilter.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 6876f24..ccbd20a 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -661,11 +661,8 @@ define KernelPackage/ebtables
   SUBMENU:=$(NF_MENU)
   TITLE:=Bridge firewalling modules
   DEPENDS:=+kmod-ipt-core +kmod-bridge +kmod-br-netfilter
-  FILES:= \
-	$(LINUX_DIR)/net/bridge/br_netfilter.ko \
-	$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko)
-  KCONFIG:=CONFIG_BRIDGE_NETFILTER \
-	$(KCONFIG_EBTABLES)
+  FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_EBTABLES)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(EBTABLES-m)))
 endef
 



More information about the lede-commits mailing list