X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetfilter.mk;h=69bdba0fcb692e87cf3fdbc88a7b1c5ffcd79ade;hp=d24329fae515e20dbb4b99e72289208e9e6bceb5;hb=dc131c0a6e13e2d670ed3c9112a88b0cf3f9b7d9;hpb=5d02fa2bd382b1a73ae57b8706bafa4f81701e34

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index d24329fae5..69bdba0fcb 100644
--- 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,13 @@ 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)
+ - ttl/TTL
  - unclean
 endef
 
@@ -143,7 +142,7 @@ define KernelPackage/ipt-ipsec/description
  Includes:
  - ah
  - esp
- - policy (2.6)
+ - policy
 endef
 
 $(eval $(call KernelPackage,ipt-ipsec))
@@ -177,7 +176,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 +207,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,11 +216,11 @@ define KernelPackage/ipt-nathelper-extra/description
  - amanda
  - h323
  - mms
- - pptp (2.6)
- - proto_gre (2.6)
- - rtsp
- - sip (2.6)
+ - pptp
+ - proto_gre
+ - sip
  - snmp_basic
+ - broadcast
 endef
 
 $(eval $(call KernelPackage,ipt-nathelper-extra))
@@ -231,6 +229,7 @@ $(eval $(call KernelPackage,ipt-nathelper-extra))
 define KernelPackage/ipt-queue
   TITLE:=Module for user-space packet queueing
   KCONFIG:=$(KCONFIG_IPT_QUEUE)
+  DEPENDS:=@!LINUX_3_6
   FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m)))
   $(call AddDepends/ipt)
@@ -314,6 +313,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
@@ -343,7 +377,7 @@ endef
 define KernelPackage/ipt-extra/description
  Other Netfilter (IPv4) kernel modules
  Includes:
- - condition (2.4 only)
+ - addrtype
  - owner
  - physdev (if bridge support was enabled in kernel)
  - pkttype