[NETFILTER]: xt_hashlimit: fix ip6tables dependency

[NETFILTER]: xt_hashlimit: fix ip6tables dependency

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

Hi Dave,

while testing similar combinations that lead to the H.323 linker
error, I noticed this problem with xt_hashlimit.

Please also apply to 2.6.20. Thanks.

[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1191 bytes --]

[NETFILTER]: xt_hashlimit: fix ip6tables dependency

IP6_NF_IPTABLES=m, CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y results in a
linker error since ipv6_find_hdr is defined in ip6_tables.c. Fix similar
to Adrian Bunk's H.323 conntrack patch: selecting ip6_tables to be build
as module requires hashlimit to be built as module as well.

Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit 25dfa116b43b65d9e3bb5e89d392b6ebd1d00ec7
tree c4fa2b5e88eca77a237ffd3cd37419df45cb6ef7
parent 9c13a2e187957e0656eb458ca1251bd1b79aebaa
author Patrick McHardy <kaber@trash.net> Wed, 31 Jan 2007 01:35:02 +0100
committer Patrick McHardy <kaber@trash.net> Wed, 31 Jan 2007 01:35:02 +0100

 net/netfilter/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index cd10e44..2a2bcb3 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -628,7 +628,7 @@ config NETFILTER_XT_MATCH_TCPMSS
 
 config NETFILTER_XT_MATCH_HASHLIMIT
 	tristate '"hashlimit" match support'
-	depends on NETFILTER_XTABLES
+	depends on NETFILTER_XTABLES && (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
 	help
 	  This option adds a `hashlimit' match.
 

Re: [NETFILTER]: xt_hashlimit: fix ip6tables dependency

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Wed, 31 Jan 2007 01:39:47 +0100

> while testing similar combinations that lead to the H.323 linker
> error, I noticed this problem with xt_hashlimit.
> 
> Please also apply to 2.6.20. Thanks.

Applied, thanks Patrick.