From a9223aa25292cda1875e121aa146a0f653d8b9f9 Mon Sep 17 00:00:00 2001
From: Andy Boyett <agb@openwrt.org>
Date: Tue, 27 May 2008 20:42:54 -0700
Subject: [PATCH] [iptables] add hashlimit to iptables-mod-conntrack
  - also move ipt_limit from iptables-mod-extra to iptables-mod-conntrack description

---
 include/netfilter.mk                |    2 ++
 package/iptables/Makefile           |    2 ++
 package/kernel/modules/netfilter.mk |    3 ++-
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 8ebfa71..37451b5 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -33,6 +33,8 @@ $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_CONNMARK, $(P_V4)ipt_connm
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNMARK, $(P_XT)xt_connmark))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_CONNTRACK, $(P_V4)ipt_conntrack))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNTRACK, $(P_XT)xt_conntrack))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_HASHLIMIT, $(P_V4)ipt_hashlimit))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_HELPER, $(P_V4)ipt_helper))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_HELPER, $(P_XT)xt_helper))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_LIMIT, $(P_V4)ipt_limit))
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 9d6d8f8..3b02097 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -73,6 +73,8 @@ define Package/iptables-mod-conntrack/description
  - libipt_conntrack
  - libipt_helper
  - libipt_connmark/CONNMARK
+ - libipt_hashlimit
+ - libipt_limit
 endef
 
 define Package/iptables-mod-filter
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index ec9f68c..3c7cf3d 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -24,6 +24,8 @@ define KernelPackage/ipt-conntrack/description
  - ipt_conntrack
  - ipt_helper
  - ipt_connmark/CONNMARK
+ - ipt_hashlimit
+ - ipt_limit
 endef
 
 $(eval $(call KernelPackage,ipt-conntrack))
@@ -257,7 +259,6 @@ endef
 define KernelPackage/ipt-extra/description
  Other Netfilter (IPv4) kernel modules
  Includes:
- - ipt_limit
  - ipt_owner
  - ipt_physdev
  - ipt_pkttype
-- 
1.5.5.1