ar71xx: fix AR934X clock frequency calculation

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

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index e44d067..713d8cb 100644 (file)
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -24,7 +24,7 @@ endef
 define KernelPackage/ipt-core/description
  Netfilter core kernel modules
  Includes:
- - comment (2.6)
+ - comment
  - limit
  - LOG
  - mac
@@ -54,7 +54,7 @@ define KernelPackage/ipt-conntrack/description
  Netfilter (IPv4) kernel modules for connection tracking
  Includes:
  - conntrack
- - defrag (2.6)
+ - defrag
  - iptables_raw
  - NOTRACK
  - state
@@ -89,7 +89,7 @@ define KernelPackage/ipt-filter
   KCONFIG:=$(KCONFIG_IPT_FILTER)
   FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m)))
-  $(call AddDepends/ipt,+kmod-textsearch)
+  $(call AddDepends/ipt,+kmod-lib-textsearch)
 endef
 
 define KernelPackage/ipt-filter/description
@@ -116,14 +116,12 @@ define KernelPackage/ipt-ipopt/description
  - CLASSIFY
  - dscp/DSCP
  - ecn/ECN
- - hl/HL (2.6.30 and later)
+ - hl/HL
  - length
  - mark/MARK
- - statistic (2.6)
+ - statistic
  - tcpmss
  - time
- - tos/TOS (prior to 2.6.25)
- - ttl/TTL (prior to 2.6.30)
  - unclean
 endef
 
@@ -143,7 +141,7 @@ define KernelPackage/ipt-ipsec/description
  Includes:
  - ah
  - esp
- - policy (2.6)
+ - policy
 endef
 
 $(eval $(call KernelPackage,ipt-ipsec))
@@ -177,7 +175,6 @@ endef
 define KernelPackage/ipt-nat-extra/description
  Netfilter (IPv4) kernel modules for extra NAT targets
  Includes:
- - MIRROR (2.4)
  - NETMAP
  - REDIRECT
 endef
@@ -209,7 +206,7 @@ define KernelPackage/ipt-nathelper-extra
   KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA)
   FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m)))
-  $(call AddDepends/ipt,+kmod-ipt-nat +kmod-textsearch)
+  $(call AddDepends/ipt,+kmod-ipt-nat +kmod-lib-textsearch)
 endef
 
 define KernelPackage/ipt-nathelper-extra/description
@@ -218,10 +215,10 @@ define KernelPackage/ipt-nathelper-extra/description
  - amanda
  - h323
  - mms
- - pptp (2.6)
- - proto_gre (2.6)
+ - pptp
+ - proto_gre
  - rtsp
- - sip (2.6)
+ - sip
  - snmp_basic
 endef
 
@@ -262,10 +259,28 @@ endef
 $(eval $(call KernelPackage,ipt-ulog))
 
 
+define KernelPackage/ipt-debug
+  TITLE:=Module for debugging/development
+  KCONFIG:=$(KCONFIG_IPT_DEBUG)
+  DEFAULT:=n
+  FILES:=$(foreach mod,$(IPT_DEBUG-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_DEBUG-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-debug/description
+ Netfilter modules for debugging/development of the firewall
+ Includes:
+ - TRACE
+endef
+
+$(eval $(call KernelPackage,ipt-debug))
+
+
 define KernelPackage/ipt-led
   TITLE:=Module to trigger a LED with a Netfilter rule
   KCONFIG:=$(KCONFIG_IPT_LED)
-  FILES:=$(foreach mod,$(IPT_LED-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  FILES:=$(foreach mod,$(IPT_LED-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,61,$(notdir $(IPT_LED-m)))
   $(call AddDepends/ipt)
 endef
@@ -278,6 +293,7 @@ $(eval $(call KernelPackage,ipt-led))
 
 define KernelPackage/ipt-tproxy
   TITLE:=Transparent proxying support
+  DEPENDS+=+IPV6:kmod-ipv6
   KCONFIG:= \
        CONFIG_NETFILTER_TPROXY \
        CONFIG_NETFILTER_XT_MATCH_SOCKET \
@@ -285,7 +301,7 @@ define KernelPackage/ipt-tproxy
   FILES:= \
        $(LINUX_DIR)/net/netfilter/nf_tproxy_core.ko \
        $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
-  AUTOLOAD:=$(call AutoLoad,45,$(notdir nf_tproxy_core $(IPT_TPROXY-m)))
+  AUTOLOAD:=$(call AutoLoad,50,$(notdir nf_tproxy_core $(IPT_TPROXY-m)))
   $(call AddDepends/ipt)
 endef
 
@@ -295,6 +311,41 @@ endef
 
 $(eval $(call KernelPackage,ipt-tproxy))
 
+define KernelPackage/ipt-tee
+  TITLE:=TEE support
+  KCONFIG:= \
+       CONFIG_NETFILTER_XT_TARGET_TEE
+  FILES:= \
+       $(LINUX_DIR)/net/netfilter/xt_TEE.ko \
+       $(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir nf_tee $(IPT_TEE-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-tee/description
+  Kernel modules for TEE
+endef
+
+$(eval $(call KernelPackage,ipt-tee))
+
+
+define KernelPackage/ipt-u32
+  TITLE:=U32 support
+  KCONFIG:= \
+       CONFIG_NETFILTER_XT_MATCH_U32
+  FILES:= \
+       $(LINUX_DIR)/net/netfilter/xt_u32.ko \
+       $(foreach mod,$(IPT_U32-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir nf_tee $(IPT_U32-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-u32/description
+  Kernel modules for U32
+endef
+
+$(eval $(call KernelPackage,ipt-u32))
+
 
 define KernelPackage/ipt-iprange
   TITLE:=Module for matching ip ranges
@@ -324,7 +375,6 @@ endef
 define KernelPackage/ipt-extra/description
  Other Netfilter (IPv4) kernel modules
  Includes:
- - condition (2.4 only)
  - owner
  - physdev (if bridge support was enabled in kernel)
  - pkttype