aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/lanstreamer.c
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 /drivers/net/tokenring/lanstreamer.c
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 'drivers/net/tokenring/lanstreamer.c')
-rw-r--r--drivers/net/tokenring/lanstreamer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 5d849c089a3b..fc4495581f96 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -123,6 +123,7 @@
123#include <linux/bitops.h> 123#include <linux/bitops.h>
124#include <linux/jiffies.h> 124#include <linux/jiffies.h>
125 125
126#include <net/net_namespace.h>
126#include <net/checksum.h> 127#include <net/checksum.h>
127 128
128#include <asm/io.h> 129#include <asm/io.h>
@@ -250,7 +251,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
250#if STREAMER_NETWORK_MONITOR 251#if STREAMER_NETWORK_MONITOR
251#ifdef CONFIG_PROC_FS 252#ifdef CONFIG_PROC_FS
252 if (!dev_streamer) 253 if (!dev_streamer)
253 create_proc_read_entry("net/streamer_tr", 0, 0, 254 create_proc_read_entry("streamer_tr", 0, init_net.proc_net,
254 streamer_proc_info, NULL); 255 streamer_proc_info, NULL);
255 streamer_priv->next = dev_streamer; 256 streamer_priv->next = dev_streamer;
256 dev_streamer = streamer_priv; 257 dev_streamer = streamer_priv;
@@ -423,7 +424,7 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
423 } 424 }
424 } 425 }
425 if (!dev_streamer) 426 if (!dev_streamer)
426 remove_proc_entry("net/streamer_tr", NULL); 427 remove_proc_entry("streamer_tr", init_net.proc_net);
427 } 428 }
428#endif 429#endif
429#endif 430#endif