From patchwork Wed Dec 10 16:54:55 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamalesh Babulal X-Patchwork-Id: 13234 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 E7A4FDDECF for ; Thu, 11 Dec 2008 03:55:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755352AbYLJQzF (ORCPT ); Wed, 10 Dec 2008 11:55:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755156AbYLJQzE (ORCPT ); Wed, 10 Dec 2008 11:55:04 -0500 Received: from e28smtp06.in.ibm.com ([59.145.155.6]:52106 "EHLO e28smtp06.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752963AbYLJQzB (ORCPT ); Wed, 10 Dec 2008 11:55:01 -0500 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by e28smtp06.in.ibm.com (8.13.1/8.13.1) with ESMTP id mBAGswq6003936; Wed, 10 Dec 2008 22:24:58 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mBAGs0V53678416; Wed, 10 Dec 2008 22:24:00 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.13.1/8.13.3) with ESMTP id mBAGsv7W020333; Wed, 10 Dec 2008 22:24:58 +0530 Received: from linux.vnet.ibm.com ([9.77.194.32]) by d28av01.in.ibm.com (8.13.1/8.12.11) with ESMTP id mBAGstmE020312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Dec 2008 22:24:56 +0530 Date: Wed, 10 Dec 2008 22:24:55 +0530 From: Kamalesh Babulal To: Randy Dunlap Cc: Stephen Rothwell , netdev , linux-next@vger.kernel.org, LKML , netfilter-devel@vger.kernel.org, eric@inl.fr, kaber@trash.net Subject: Re: linux-next: Tree for December 1 (netfilter build error) Message-ID: <20081210165455.GC6391@linux.vnet.ibm.com> Reply-To: Kamalesh Babulal References: <20081201190827.2d02b1a5.sfr@canb.auug.org.au> <20081201115934.00ba918a.randy.dunlap@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20081201115934.00ba918a.randy.dunlap@oracle.com> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org * Randy Dunlap [2008-12-01 11:59:34]: > On Mon, 1 Dec 2008 19:08:27 +1100 Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20081128: > > > > Today's tree fails the powerpc allyesconfig build. > > > ERROR: "nfulnl_log_packet" [net/netfilter/xt_NFLOG.ko] undefined! > > config attached. next-20081210 kernel build fails when !CONFIG_NETFILTER_NETLINK_LOG This was introduced by the commit 5f7340eff8f68f41b7e5c7ad47ec4cd1ea1afb40 Author: Eric Leblond Date: Tue Nov 4 14:21:08 2008 +0100 netfilter: xt_NFLOG: don't call nf_log_packet in NFLOG module. the function nfulnl_log_packet is exported only if CONFIG_NETFILTER_NETLINK_LOG is enabled, so marking the loging function between ifdef. I have tested the patch for build failure only Signed-off-by: Kamalesh Babulal --- net/netfilter/xt_NFLOG.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c index a57c5cf..fa814a6 100644 --- a/net/netfilter/xt_NFLOG.c +++ b/net/netfilter/xt_NFLOG.c @@ -32,8 +32,11 @@ nflog_tg(struct sk_buff *skb, const struct xt_target_param *par) li.u.ulog.group = info->group; li.u.ulog.qthreshold = info->threshold; +#ifdef CONFIG_NETFILTER_NETLINK_LOG nfulnl_log_packet(par->family, par->hooknum, skb, par->in, par->out, &li, info->prefix); +#endif /* CONFIG_NETFILTER_NETLINK_LOG */ + return XT_CONTINUE; }