diff mbox

[-next] netfilter: xt_TEE depends on NF_CONNTRACK

Message ID 20100514101218.16cdb0ad.randy.dunlap@oracle.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Randy Dunlap May 14, 2010, 5:12 p.m. UTC
From: Randy Dunlap <randy.dunlap@oracle.com>

Fix xt_TEE build for the case of NF_CONNTRACK=m and
NETFILTER_XT_TARGET_TEE=y:

xt_TEE.c:(.text+0x6df5c): undefined reference to `nf_conntrack_untracked'
4x

Built with all 4 m/y combinations.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc:	Patrick McHardy <kaber@trash.net>
Cc:	Jan Engelhardt <jengelh@medozas.de>
---
 net/netfilter/Kconfig |    1 +
 1 file changed, 1 insertion(+)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Patrick McHardy May 14, 2010, 5:20 p.m. UTC | #1
Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix xt_TEE build for the case of NF_CONNTRACK=m and
> NETFILTER_XT_TARGET_TEE=y:
> 
> xt_TEE.c:(.text+0x6df5c): undefined reference to `nf_conntrack_untracked'
> 4x
> 
> Built with all 4 m/y combinations.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc:	Patrick McHardy <kaber@trash.net>
> Cc:	Jan Engelhardt <jengelh@medozas.de>

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

Dave, please apply directly. Thanks!

> ---
>  net/netfilter/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20100514.orig/net/netfilter/Kconfig
> +++ linux-next-20100514/net/netfilter/Kconfig
> @@ -506,6 +506,7 @@ config NETFILTER_XT_TARGET_TEE
>  	tristate '"TEE" - packet cloning to alternate destiantion'
>  	depends on NETFILTER_ADVANCED
>  	depends on (IPV6 || IPV6=n)
> +	depends on !NF_CONNTRACK || NF_CONNTRACK
>  	---help---
>  	This option adds a "TEE" target with which a packet can be cloned and
>  	this clone be rerouted to another nexthop.
> 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller May 14, 2010, 8:52 p.m. UTC | #2
From: Patrick McHardy <kaber@trash.net>
Date: Fri, 14 May 2010 19:20:16 +0200

> Randy Dunlap wrote:
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>> 
>> Fix xt_TEE build for the case of NF_CONNTRACK=m and
>> NETFILTER_XT_TARGET_TEE=y:
>> 
>> xt_TEE.c:(.text+0x6df5c): undefined reference to `nf_conntrack_untracked'
>> 4x
>> 
>> Built with all 4 m/y combinations.
>> 
>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>> Cc:	Patrick McHardy <kaber@trash.net>
>> Cc:	Jan Engelhardt <jengelh@medozas.de>
> 
> Acked-by: Patrick McHardy <kaber@trash.net>
> 
> Dave, please apply directly. Thanks!

Done, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-next-20100514.orig/net/netfilter/Kconfig
+++ linux-next-20100514/net/netfilter/Kconfig
@@ -506,6 +506,7 @@  config NETFILTER_XT_TARGET_TEE
 	tristate '"TEE" - packet cloning to alternate destiantion'
 	depends on NETFILTER_ADVANCED
 	depends on (IPV6 || IPV6=n)
+	depends on !NF_CONNTRACK || NF_CONNTRACK
 	---help---
 	This option adds a "TEE" target with which a packet can be cloned and
 	this clone be rerouted to another nexthop.