diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-17 08:50:19 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-17 08:50:19 +0000 |
| commit | 7fe381010159c7951bf5a978b8e8a0d2004af049 (patch) | |
| tree | 5726e8ab5ec631dcbb0d3d4b7af5ea3909b87a76 | |
| parent | 4428e3a8ce0990e9299d85ffd4cd183f2458fc4f (diff) | |
finalize r22241 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22242 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/netfilter.mk | 6 | ||||
| -rw-r--r-- | package/iptables/Makefile | 2 | ||||
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk index 77820c79a..5ec7df6bf 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 a401115de..6ba1c2d25 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 3ce557aa5..84f746f9c 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 |