X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4ada9dfdbafd8af83f47169395cec0fab91b7ee3..ac2d02c3e08c4c3d62859bffb4dd3bb891b3d5c6:/package/kernel/modules/netfilter.mk

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index e753fb24f..31c6287a5 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,6 +7,7 @@
 # $Id$
 
 NF_MENU:=Netfilter Extensions
+NF_KMOD:=1
 include $(INCLUDE_DIR)/netfilter.mk
 
 define KernelPackage/ipt-conntrack
@@ -110,9 +111,9 @@ $(eval $(call KernelPackage,ipt-nat))
 define KernelPackage/ipt-nathelper
   SUBMENU:=$(NF_MENU)
   TITLE:=Default Conntrack and NAT helpers
-  KCONFIG:=$(KCONFIG_IPT_NAT_DEFAULT)
-  FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_DEFAULT-m)))
+  KCONFIG:=$(KCONFIG_IPT_NATHELPER)
+  FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NATHELPER-m)))
 endef
 
 define KernelPackage/ipt-nathelper/description
@@ -131,9 +132,9 @@ $(eval $(call KernelPackage,ipt-nathelper))
 define KernelPackage/ipt-nathelper-extra
   SUBMENU:=$(NF_MENU)
   TITLE:=Extra Conntrack and NAT helpers
-  KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA)
-  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_EXTRA-m)))
+  KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA)
+  FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NATHELPER_EXTRA-m)))
 endef
 
 define KernelPackage/ipt-nathelper-extra/description
@@ -300,13 +301,13 @@ endef
 
 $(eval $(call KernelPackage,arptables))
 
-
 define KernelPackage/ebtables
   SUBMENU:=$(NF_MENU)
   TITLE:=Bridge firewalling modules
   DEPENDS:=@LINUX_2_6
   FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_BRIDGE_NF_EBTABLES
+  KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \
+  	CONFIG_BRIDGE_NF_EBTABLES
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX)))))
 endef