aboutsummaryrefslogtreecommitdiffstats
path: root/net/802
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-12 06:01:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:06 -0400
commit457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch)
treea2ceee88780cbce27433b9a4434b3e9251efd81a /net/802
parent07feaebfcc10cd35e745c7073667935246494bee (diff)
[NET]: Make /proc/net per network namespace
This patch makes /proc/net per network namespace. It modifies the global variables proc_net and proc_net_stat to be per network namespace. The proc_net file helpers are modified to take a network namespace argument, and all of their callers are fixed to pass &init_net for that argument. This ensures that all of the /proc/net files are only visible and usable in the initial network namespace until the code behind them has been updated to be handle multiple network namespaces. Making /proc/net per namespace is necessary as at least some files in /proc/net depend upon the set of network devices which is per network namespace, and even more files in /proc/net have contents that are relevant to a single network namespace. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/802')
-rw-r--r--net/802/tr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/802/tr.c b/net/802/tr.c
index e56e61a7f545..032c31e748eb 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -36,6 +36,7 @@
36#include <linux/seq_file.h> 36#include <linux/seq_file.h>
37#include <linux/init.h> 37#include <linux/init.h>
38#include <net/arp.h> 38#include <net/arp.h>
39#include <net/net_namespace.h>
39 40
40static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev); 41static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev);
41static void rif_check_expire(unsigned long dummy); 42static void rif_check_expire(unsigned long dummy);
@@ -639,7 +640,7 @@ static int __init rif_init(void)
639 rif_timer.function = rif_check_expire; 640 rif_timer.function = rif_check_expire;
640 add_timer(&rif_timer); 641 add_timer(&rif_timer);
641 642
642 proc_net_fops_create("tr_rif", S_IRUGO, &rif_seq_fops); 643 proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);
643 return 0; 644 return 0;
644} 645}
645 646