aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-08-27 02:04:35 +0000
committerNicolas Thill <nico@openwrt.org>2007-08-27 02:04:35 +0000
commit1e650af892228633ec294b5aa884090fc260440f (patch)
tree9d6bcdb7bbf9128d259482bf598761a3c4543a15
parentae4081695ead6c29fd918b48d1ec26173816cdcf (diff)
downloadupstream-1e650af892228633ec294b5aa884090fc260440f.tar.gz
upstream-1e650af892228633ec294b5aa884090fc260440f.tar.bz2
upstream-1e650af892228633ec294b5aa884090fc260440f.zip
revert [8473] (see [8055])
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8499 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/netfilter.mk2
-rw-r--r--target/linux/generic-2.4/config-template2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk
index 414d2f1d24..49ffefbad6 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -40,7 +40,7 @@ $(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_MATCH_OWNER, $(P_V4)ipt_owner))
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_physdev))
$(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_MATCH_PKTTYPE, $(P_V4)ipt_pkttype))
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PKTTYPE, $(P_XT)xt_pkttype))
-$(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_MATCH_QUOTA, $(P_V4)ipt_quota))
+#$(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_MATCH_QUOTA, $(P_V4)ipt_quota))
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_QUOTA, $(P_XT)xt_quota))
$(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT))
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_TARGET_DELUDE, $(P_XT)xt_DELUDE))
diff --git a/target/linux/generic-2.4/config-template b/target/linux/generic-2.4/config-template
index 525b916a33..9f33ef427e 100644
--- a/target/linux/generic-2.4/config-template
+++ b/target/linux/generic-2.4/config-template
@@ -242,7 +242,7 @@ CONFIG_IP_NF_MATCH_MARK=y
CONFIG_IP_NF_MATCH_MULTIPORT=y
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_QUOTA=m
+# CONFIG_IP_NF_MATCH_QUOTA is not set
CONFIG_IP_NF_MATCH_RANDOM=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_SET=m