netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 09/12] netfilter: use forward declaration instead of including linux/proc_fs.h
Date: Fri, 19 Jun 2015 19:17:46 +0200	[thread overview]
Message-ID: <1434734269-4545-10-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1434734269-4545-1-git-send-email-pablo@netfilter.org>

We don't need to pull the full definitions in that file, a simple forward
declaration is enough.

Moreover, include linux/procfs.h from nf_synproxy_core, otherwise this hits a
compilation error due to missing declarations, ie.

net/netfilter/nf_synproxy_core.c: In function ‘synproxy_proc_init’:
net/netfilter/nf_synproxy_core.c:326:2: error: implicit declaration of function ‘proc_create’ [-Werror=implicit-function-declaration]
  if (!proc_create("synproxy", S_IRUGO, net->proc_net_stat,
  ^

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
 include/net/netns/netfilter.h    |    2 +-
 net/netfilter/nf_synproxy_core.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/net/netns/netfilter.h b/include/net/netns/netfilter.h
index 8874002..cf25b5e 100644
--- a/include/net/netns/netfilter.h
+++ b/include/net/netns/netfilter.h
@@ -1,9 +1,9 @@
 #ifndef __NETNS_NETFILTER_H
 #define __NETNS_NETFILTER_H
 
-#include <linux/proc_fs.h>
 #include <linux/netfilter.h>
 
+struct proc_dir_entry;
 struct nf_logger;
 
 struct netns_nf {
diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
index 52e20c9..789feea 100644
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@ -11,6 +11,7 @@
 #include <asm/unaligned.h>
 #include <net/tcp.h>
 #include <net/netns/generic.h>
+#include <linux/proc_fs.h>
 
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter/x_tables.h>
-- 
1.7.10.4

  parent reply	other threads:[~2015-06-19 17:17 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-19 17:17 [PATCH 00/12] Netfilter updates for net-next Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 01/12] netfilter: nfnetlink_queue: add security context information Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 02/12] netfilter: xt_socket: add XT_SOCKET_RESTORESKMARK flag Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 03/12] netfilter: x_tables: align per cpu xt_counter Pablo Neira Ayuso
2015-06-22 11:49   ` David Laight
2015-06-22 13:27     ` Eric Dumazet
2015-06-19 17:17 ` [PATCH 04/12] netfilter: bridge: rename br_netfilter.c to br_netfilter_hooks.c Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 05/12] netfilter: bridge: split ipv6 code into separated file Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 06/12] netfilter: Kill unused copies of RCV_SKB_FAIL Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 07/12] net: sched: Simplify em_ipset_match Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 08/12] net: include missing headers in net/net_namespace.h Pablo Neira Ayuso
2015-06-19 17:17 ` Pablo Neira Ayuso [this message]
2015-06-19 17:17 ` [PATCH 10/12] netfilter: don't pull include/linux/netfilter.h from netns headers Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 11/12] netfilter: Remove spurios included of netfilter.h Pablo Neira Ayuso
2015-06-19 17:17 ` [PATCH 12/12] netfilter: xtables: fix warnings on 32bit platforms Pablo Neira Ayuso
2015-06-20 22:40 ` [PATCH 00/12] Netfilter updates for net-next 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=1434734269-4545-10-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --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).