From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758013Ab0ENRUU (ORCPT <rfc822;w@1wt.eu>);
	Fri, 14 May 2010 13:20:20 -0400
Received: from stinky.trash.net ([213.144.137.162]:49331 "EHLO
	stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755069Ab0ENRUS (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 14 May 2010 13:20:18 -0400
Message-ID: <4BED8650.5040808@trash.net>
Date: Fri, 14 May 2010 19:20:16 +0200
From: Patrick McHardy <kaber@trash.net>
User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090701)
MIME-Version: 1.0
To: Randy Dunlap <randy.dunlap@oracle.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>, netdev <netdev@vger.kernel.org>,
       Jan Engelhardt <jengelh@medozas.de>, netfilter-devel@vger.kernel.org,
       linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
       "David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH -next] netfilter: xt_TEE depends on NF_CONNTRACK
References: <20100514161407.740da901.sfr@canb.auug.org.au> <20100514101218.16cdb0ad.randy.dunlap@oracle.com>
In-Reply-To: <20100514101218.16cdb0ad.randy.dunlap@oracle.com>
X-Enigmail-Version: 0.95.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.
>