aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-04-30 15:42:10 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-04-30 15:42:10 +0000
commit3c05234962064ef4c0d3e746f825a3e3e11b7093 (patch)
tree53f4fdb956625bb51a95ec9d57afe02c5edee843
parente26227a404105b366fc7949aefa5e460113a0f8b (diff)
downloadupstream-3c05234962064ef4c0d3e746f825a3e3e11b7093.tar.gz
upstream-3c05234962064ef4c0d3e746f825a3e3e11b7093.tar.bz2
upstream-3c05234962064ef4c0d3e746f825a3e3e11b7093.zip
kmod-ipt-iprange: fix build error on .25
SVN-Revision: 10992
-rw-r--r--include/netfilter.mk1
-rw-r--r--package/kernel/modules/netfilter.mk2
-rw-r--r--target/linux/generic-2.6/config-2.6.251
3 files changed, 2 insertions, 2 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk
index 7e7005d2a2..56c5588252 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -120,6 +120,7 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_TOS, $(P_V4)ipt_TOS))
# iprange
$(eval $(call nf_add,IPT_IPRANGE,CONFIG_IP_NF_MATCH_IPRANGE, $(P_V4)ipt_iprange))
+$(eval $(call nf_add,IPT_IPRANGE,CONFIG_NETFILTER_XT_MATCH_IPRANGE, $(P_XT)xt_iprange))
# ipsec
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index bafb5ea92e..e753fb24fe 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -204,7 +204,7 @@ $(eval $(call KernelPackage,ipt-ulog))
define KernelPackage/ipt-iprange
SUBMENU:=$(NF_MENU)
TITLE:=Module for matching ip ranges
- FILES:=$(LINUX_DIR)/net/ipv4/netfilter/ipt_iprange.$(LINUX_KMOD_SUFFIX)
+ FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPRANGE-m)))
endef
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index d797a8c387..e9ac69a756 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -593,7 +593,6 @@ CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
CONFIG_IP_NF_MATCH_IPP2P=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_TIME=m