Home » Mailing list archives » git-commits-head » 2008 » February » 1

[NETFILTER]: x_tables: create per-netns /proc/net/*_tables_*

Previous thread: [NETFILTER]: nf_conntrack: reorder struct nf_conntrack_l4proto by Linux Kernel Mailing List on Friday, February 1, 2008 - 4:02 am. (1 message)

Next thread: [NETFILTER]: nf_conntrack_sane: annotate SANE helper with const by Linux Kernel Mailing List on Friday, February 1, 2008 - 4:02 am. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: [NETFILTER]: x_tables: create per-netns /proc/net/*_tables_*
Date: Friday, February 1, 2008 - 4:02 am

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3cb609...
Commit:     3cb609d57c20027a8b39fc60b79b930a89da82d4
Parent:     715cf35ac9291f31a4fea7d022695a64cac0af80
Author:     Alexey Dobriyan <adobriyan@sw.ru>
AuthorDate: Thu Jan 31 04:49:35 2008 -0800
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Thu Jan 31 19:28:06 2008 -0800

    [NETFILTER]: x_tables: create per-netns /proc/net/*_tables_*
    
    Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/linux/netfilter/x_tables.h |    4 ++--
 net/ipv4/netfilter/arp_tables.c    |   21 ++++++++++++++++++---
 net/ipv4/netfilter/ip_tables.c     |   21 ++++++++++++++++++---
 net/ipv6/netfilter/ip6_tables.c    |   22 +++++++++++++++++++---
 net/netfilter/x_tables.c           |   20 ++++++++++----------
 5 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 11eea39..b2c62cc 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -357,8 +357,8 @@ extern struct xt_table *xt_find_table_lock(struct net *net, int af,
 					   const char *name);
 extern void xt_table_unlock(struct xt_table *t);
 
-extern int xt_proto_init(int af);
-extern void xt_proto_fini(int af);
+extern int xt_proto_init(struct net *net, int af);
+extern void xt_proto_fini(struct net *net, int af);
 
 extern struct xt_table_info *xt_alloc_table_info(unsigned int size);
 extern void xt_free_table_info(struct xt_table_info *info);
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index 3608675..a7591ce 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -1822,11 +1822,26 @@ static struct nf_sockopt_ops arpt_sockopts = {
 	.owner		= THIS_MODULE,
 };
 
+static int ...
[ message continues ]
Previous thread: [NETFILTER]: nf_conntrack: reorder struct nf_conntrack_l4proto by Linux Kernel Mailing List on Friday, February 1, 2008 - 4:02 am. (1 message)

Next thread: [NETFILTER]: nf_conntrack_sane: annotate SANE helper with const by Linux Kernel Mailing List on Friday, February 1, 2008 - 4:02 am. (1 message)