From patchwork Sun Feb 3 11:24:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 217742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C66D12C0092 for ; Sun, 3 Feb 2013 22:28:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753265Ab3BCL2x (ORCPT ); Sun, 3 Feb 2013 06:28:53 -0500 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:38165 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753070Ab3BCL2x (ORCPT ); Sun, 3 Feb 2013 06:28:53 -0500 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.72) (envelope-from ) id 1U1xkh-0006iO-Ni; Sun, 03 Feb 2013 12:28:51 +0100 From: Florian Westphal To: Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Florian Westphal Subject: [PATCH] netfilter: fix missing dependencies for NETFILTER_XT_MATCH_CONNLABEL Date: Sun, 3 Feb 2013 12:24:07 +0100 Message-Id: <1359890647-25846-1-git-send-email-fw@strlen.de> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <510DC976.7000008@infradead.org> References: <510DC976.7000008@infradead.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org It was possible to set NF_CONNTRACK=n NF_CONNTRACK_LABELS=y via NETFILTER_XT_MATCH_CONNLABEL=y: warning: (NETFILTER_XT_MATCH_CONNLABEL) selects NF_CONNTRACK_LABELS which has unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK) Reported-by: Randy Dunlap Signed-off-by: Florian Westphal Acked-by: Randy Dunlap diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index eb2c8eb..d4dd702 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -860,6 +860,7 @@ config NETFILTER_XT_MATCH_CONNBYTES config NETFILTER_XT_MATCH_CONNLABEL tristate '"connlabel" match support' select NF_CONNTRACK_LABELS + depends on NF_CONNTRACK depends on NETFILTER_ADVANCED ---help--- This match allows you to test and assign userspace-defined labels names