From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 30 Apr 2008 15:42:10 +0000 (+0000)
Subject: kmod-ipt-iprange: fix build error on .25
X-Git-Tag: reboot~26636
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3c05234962064ef4c0d3e746f825a3e3e11b7093;p=openwrt%2Fstaging%2Fjogo.git

kmod-ipt-iprange: fix build error on .25

SVN-Revision: 10992
---

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