Re: [GIT]: Networking

Patrick McHardy
2008-10-17T11:56:00Z

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

Ingo Molnar wrote:
>> Pablo Neira Ayuso (1):
>> netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf_nat
>
> FYI, got a common build failure with latest -git, and bisected it back
> to the commit above. Config attached, error log and bisect log below.
>
> (The build failure output is at the bottom, it comes after dozens of
> build warnings all across the kernel.)
>
> net/netfilter/nf_conntrack_netlink.c:819: warning: ‘enum nf_nat_manip_type’ declared inside parameter list
> net/netfilter/nf_conntrack_netlink.c:819: warning: its scope is only this definition or declaration, which is probably not what you want
> net/netfilter/nf_conntrack_netlink.c:818: error: parameter 2 (‘manip’) has incomplete type

Thanks Ingo. I just sent this patch to Benjamin Herrenschmidt
for testing.

[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1092 bytes --]

commit cfbb966e0a84eb75e8e7c192953ecf3ca48a9420
Author: Patrick McHardy <kaber@trash.net>
Date: Fri Oct 17 13:50:35 2008 +0200

netfilter: ctnetlink: fix compilation error

Fix compilation error on (at least) ppc:

/home/benh/kernels/linux-powerpc/net/netfilter/nf_conntrack_netlink.c:819: warning: \u2018enum nf_nat_manip_type\u2019 declared inside parameter list
/home/benh/kernels/linux-powerpc/net/netfilter/nf_conntrack_netlink.c:819: warning: its scope is only this definition or declaration, which is probably not what you want

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 08e82d6..deace06 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -39,6 +39,7 @@
#include <net/netfilter/nf_conntrack_tuple.h>
#include <net/netfilter/nf_conntrack_acct.h>
#ifdef CONFIG_NF_NAT_NEEDED
+#include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_protocol.h>
#endif