diff mbox

linux-next: Tree for December 1 (netfilter build error)

Message ID 20081210165455.GC6391@linux.vnet.ibm.com
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Kamalesh Babulal Dec. 10, 2008, 4:54 p.m. UTC 
* Randy Dunlap <randy.dunlap@oracle.com> [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 <eric@inl.fr>
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 <kamalesh@linux.vnet.ibm.com>
--
 net/netfilter/xt_NFLOG.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Comments

Eric Leblond Dec. 10, 2008, 6:43 p.m. UTC | #1 
Hi,

Le mercredi 10 décembre 2008 à 22:24 +0530, Kamalesh Babulal a écrit :
> * Randy Dunlap <randy.dunlap@oracle.com> [2008-12-01 11:59:34]:
> 	    
> the function nfulnl_log_packet is exported only if
> CONFIG_NETFILTER_NETLINK_LOG is enabled, so marking the loging function
> between ifdef.
> 

My patch introduces a real depedency of xt_NFLOG with nfnetlink_log
(CONFIG_NETFILTER_NETLINK_LOG) but I forget to state it in Kconfig.
 
I thus disagree with your patch. It is better to fix the compilation
depedency instead by modifying Kconfig.

A patch fixing this issue is to come.

BR,
diff mbox

Patch

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;
 }