netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick McHardy <kaber@trash.net>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Patrick McHardy <kaber@trash.net>,
	netfilter-devel@vger.kernel.org
Subject: netfilter 06/07: fix compilation error with NAT=n
Date: Mon, 20 Oct 2008 11:54:16 +0200 (MEST)	[thread overview]
Message-ID: <20081020095416.25670.24763.sendpatchset@x2.localnet> (raw)
In-Reply-To: <20081020095408.25670.37455.sendpatchset@x2.localnet>

commit 4cad11733aa8e182d7cfe39f9983940f2a7d0dc3
Author: Pablo Neira Ayuso <pablo@netfilter.org>
Date:   Mon Oct 20 11:47:30 2008 +0200

    netfilter: fix compilation error with NAT=n
    
    This patch fixes the compilation of ctnetlink when the NAT support
    is not enabled.
    
    /home/benh/kernels/linux-powerpc/net/netfilter/nf_conntrack_netlink.c:819: warning: enum 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
    
    Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Reported by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    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 2e4ad96..a040d46 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -813,6 +813,7 @@ out:
 	return err;
 }
 
+#ifdef CONFIG_NF_NAT_NEEDED
 static int
 ctnetlink_parse_nat_setup(struct nf_conn *ct,
 			  enum nf_nat_manip_type manip,
@@ -840,6 +841,7 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct,
 
 	return parse_nat_setup(ct, manip, attr);
 }
+#endif
 
 static int
 ctnetlink_change_status(struct nf_conn *ct, struct nlattr *cda[])

  parent reply	other threads:[~2008-10-20  9:54 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-20  9:54 netfilter 00/07: netfilter fixes Patrick McHardy
2008-10-20  9:54 ` netfilter 01/07: ctnetlink: remove obsolete NAT dependency from Kconfig Patrick McHardy
2008-10-20  9:54 ` netfilter 02/07: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array Patrick McHardy
2008-10-20  9:54 ` netfilter 03/07: xt_iprange: fix range inversion match Patrick McHardy
2008-10-20  9:54 ` netfilter 04/07: snmp nat leaks memory in case of failure Patrick McHardy
2008-10-20  9:54 ` netfilter 05/07: xt_recent: use proc_create_data() Patrick McHardy
2008-10-20  9:54 ` Patrick McHardy [this message]
2008-10-20  9:54 ` netfilter 07/07: replace old NF_ARP calls with NFPROTO_ARP Patrick McHardy
2008-10-20 10:35 ` netfilter 00/07: netfilter fixes David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081020095416.25670.24763.sendpatchset@x2.localnet \
    --to=kaber@trash.net \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).