From patchwork Wed Dec 10 18:49:17 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Leblond X-Patchwork-Id: 13303 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 1308ADDEFD for ; Thu, 11 Dec 2008 06:37:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755585AbYLJThU (ORCPT ); Wed, 10 Dec 2008 14:37:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754445AbYLJThU (ORCPT ); Wed, 10 Dec 2008 14:37:20 -0500 Received: from bayen.regit.org ([81.57.69.189]:45604 "EHLO ice-age" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753653AbYLJThS (ORCPT ); Wed, 10 Dec 2008 14:37:18 -0500 X-Greylist: delayed 2861 seconds by postgrey-1.27 at vger.kernel.org; Wed, 10 Dec 2008 14:37:18 EST Received: from eric by ice-age with local (Exim 4.69) (envelope-from ) id 1LAU7Z-00037P-Nv; Wed, 10 Dec 2008 19:49:17 +0100 From: Eric Leblond To: Kamalesh Babulal Cc: Randy Dunlap , Stephen Rothwell , netdev , linux-next@vger.kernel.org, LKML , netfilter-devel@vger.kernel.org, kaber@trash.net, Eric Leblond Subject: netfilter: xt_NFLOG is dependant of nfnetlink_log Date: Wed, 10 Dec 2008 19:49:17 +0100 Message-Id: <1228934957-11967-1-git-send-email-eric@inl.fr> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1228934630.5961.8.camel@ice-age> References: <1228934630.5961.8.camel@ice-age> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch "don't call nf_log_packet in NFLOG module" make xt_NFLOG dependant of nfnetlink_log. This patch forces the dependencies to fix compilation in case only xt_NFLOG compilation was asked and modifies the help message accordingly to the change. Signed-off-by: Eric Leblond --- net/netfilter/Kconfig | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 25dcef9..c2bac9c 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -373,11 +373,10 @@ config NETFILTER_XT_TARGET_MARK config NETFILTER_XT_TARGET_NFLOG tristate '"NFLOG" target support' default m if NETFILTER_ADVANCED=n + select NETFILTER_NETLINK_LOG help This option enables the NFLOG target, which allows to LOG - messages through the netfilter logging API, which can use - either the old LOG target, the old ULOG target or nfnetlink_log - as backend. + messages through nfnetlink_log. To compile it as a module, choose M here. If unsure, say N.