From: Patrick McHardy Subject: [NETFILTER 08/08]: xt_CONNSECMARK: fix Kconfig dependencies Date: Fri, 17 Nov 2006 06:35:50 +0100 (MET) Message-ID: <20061117053550.10231.53961.sendpatchset@localhost.localdomain> References: <20061117053540.10231.92379.sendpatchset@localhost.localdomain> Cc: netfilter-devel@lists.netfilter.org, Patrick McHardy , davem@davemloft.net Return-path: To: stable@kernel.org In-Reply-To: <20061117053540.10231.92379.sendpatchset@localhost.localdomain> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org [NETFILTER]: xt_CONNSECMARK: fix Kconfig dependencies CONNSECMARK needs conntrack, add missing dependency to fix linking error with CONNSECMARK=y and CONNTRACK=m. Reported by Toralf Förster . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller --- commit 7f013c33ba2b02614c856d715b65d858bc1ec47f tree 7ba757cfe1e953e47726bdcf956c16d07d94aa6e parent ca6adddd237afa4910bab5e9e8ba0685f37c2bfe author Patrick McHardy Fri, 17 Nov 2006 06:25:54 +0100 committer Patrick McHardy Fri, 17 Nov 2006 06:25:54 +0100 net/netfilter/Kconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 96af461..e1c27b7 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -197,7 +197,9 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_CONNSECMARK tristate '"CONNSECMARK" target support' - depends on NETFILTER_XTABLES && (NF_CONNTRACK_SECMARK || IP_NF_CONNTRACK_SECMARK) + depends on NETFILTER_XTABLES && \ + ((NF_CONNTRACK && NF_CONNTRACK_SECMARK) || \ + (IP_NF_CONNTRACK && IP_NF_CONNTRACK_SECMARK)) help The CONNSECMARK target copies security markings from packets to connections, and restores security markings from connections