Upgrade gspcav1 to 20071224 (#2922)

[openwrt.git] / package / kernel / modules / netfilter.mk

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 5fe6b57..11b67db 100644 (file)
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -227,6 +227,18 @@ endef
 
 define KernelPackage/ipt-ipset/description
  Netfilter kernel modules for ipset
+ Includes: 
+ - ip_set 
+ - ip_set_iphash 
+ - ip_set_ipmap 
+ - ip_set_ipporthash 
+ - ip_set_iptree 
+ - ip_set_iptreemap
+ - ip_set_macipmap 
+ - ip_set_nethash 
+ - ip_set_portmap 
+ - ipt_set 
+ - ipt_SET
 endef
 
 $(eval $(call KernelPackage,ipt-ipset))
@@ -250,6 +262,9 @@ define KernelPackage/ipt-extra/description
  - ipt_recent 
  - iptable_raw 
  - xt_NOTRACK 
+ - xt_TARPIT 
+ - xt_DELUDE 
+ - xt_CHAOS 
 endef
 
 $(eval $(call KernelPackage,ipt-extra))
@@ -259,8 +274,8 @@ define KernelPackage/ip6tables
   SUBMENU:=$(NF_MENU)
   TITLE:=IPv6 modules
   KCONFIG:=CONFIG_IP6_NF_IPTABLES
-  FILES:=$(LINUX_DIR)/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX)))))
+  FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPV6-m)))
 endef
 
 define KernelPackage/ip6tables/description
@@ -288,7 +303,6 @@ $(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
   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)))))