aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-07-17 08:50:19 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-07-17 08:50:19 +0000
commit57d2e57b02a009593a80ffa6af02841acc2541b6 (patch)
tree18932713fb38c23384bb35830181469dd4901bd8
parent15da77bdedb15082693655e3a38fea6944c85872 (diff)
downloadupstream-57d2e57b02a009593a80ffa6af02841acc2541b6.tar.gz
upstream-57d2e57b02a009593a80ffa6af02841acc2541b6.tar.bz2
upstream-57d2e57b02a009593a80ffa6af02841acc2541b6.zip
finalize r22241 fixes
SVN-Revision: 22242
-rw-r--r--include/netfilter.mk6
-rw-r--r--package/iptables/Makefile2
-rw-r--r--package/kernel/modules/netfilter.mk5
3 files changed, 7 insertions, 6 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk
index 77820c79a8..5ec7df6bf5 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -114,9 +114,10 @@ $(eval $(call nf_add,IPT_IMQ,CONFIG_NETFILTER_XT_TARGET_IMQ, $(P_XT)xt_IMQ))
# ipopt
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_DSCP, $(P_V4)ipt_dscp))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_DSCP, $(P_V4)ipt_DSCP))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP))
+$(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_ECN, $(P_V4)ipt_ecn))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_LENGTH, $(P_V4)ipt_length))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length))
@@ -131,7 +132,7 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_UNCLEAN, $(P_V4)ipt_unclean))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_CLASSIFY, $(P_V4)ipt_CLASSIFY ))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_CLASSIFY, $(P_XT)xt_CLASSIFY))
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_DSCP, $(P_V4)ipt_DSCP))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_DSCP, $(P_V4)ipt_dscp))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_ECN, $(P_V4)ipt_ECN))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_MARK, $(P_V4)ipt_MARK))
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
@@ -282,7 +283,6 @@ $(eval $(call nf_add,IPT_ULOG,CONFIG_IP_NF_TARGET_ULOG, $(P_V4)ipt_ULOG))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_TARGET_TPROXY, $(P_XT)xt_TPROXY))
-
#
# ebtables
#
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index a401115de0..6ba1c2d250 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -197,7 +197,7 @@ endef
define Package/iptables-mod-hashlimit/description
iptables extensions for hashlimit matching
Includes:
-- libxt_hashlimit
+- libipt_hashlimit
endef
define Package/iptables-mod-iprange
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 3ce557aa5b..84f746f9c5 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -514,11 +514,12 @@ endef
$(eval $(call KernelPackage,nf-conntrack-netlink))
define KernelPackage/ipt-hashlimit
-$(call KernelPackage/ipt/Depends,)
+ SUBMENU:=$(NF_MENU)
TITLE:=Netfilter hashlimit match
- FILES:=$(LINUX_DIR)/net/netfilter/xt_hashlimit.ko
KCONFIG:=$(KCONFIG_IPT_HASHLIMIT)
+ FILES:=$(LINUX_DIR)/net/netfilter/xt_hashlimit.ko
AUTOLOAD:=$(call AutoLoad,50,xt_hashlimit)
+ $(call KernelPackage/ipt)
endef
define KernelPackage/ipt-hashlimit/description