aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/strip.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/wireless/strip.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/wireless/strip.c')
-rw-r--r--drivers/net/wireless/strip.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index ef32a5c1e818..edb214e8c744 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -107,6 +107,7 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE";
107#include <linux/serialP.h> 107#include <linux/serialP.h>
108#include <linux/rcupdate.h> 108#include <linux/rcupdate.h>
109#include <net/arp.h> 109#include <net/arp.h>
110#include <net/net_namespace.h>
110 111
111#include <linux/ip.h> 112#include <linux/ip.h>
112#include <linux/tcp.h> 113#include <linux/tcp.h>
@@ -2787,7 +2788,7 @@ static int __init strip_init_driver(void)
2787 /* 2788 /*
2788 * Register the status file with /proc 2789 * Register the status file with /proc
2789 */ 2790 */
2790 proc_net_fops_create("strip", S_IFREG | S_IRUGO, &strip_seq_fops); 2791 proc_net_fops_create(&init_net, "strip", S_IFREG | S_IRUGO, &strip_seq_fops);
2791 2792
2792 return status; 2793 return status;
2793} 2794}
@@ -2809,7 +2810,7 @@ static void __exit strip_exit_driver(void)
2809 } 2810 }
2810 2811
2811 /* Unregister with the /proc/net file here. */ 2812 /* Unregister with the /proc/net file here. */
2812 proc_net_remove("strip"); 2813 proc_net_remove(&init_net, "strip");
2813 2814
2814 if ((i = tty_unregister_ldisc(N_STRIP))) 2815 if ((i = tty_unregister_ldisc(N_STRIP)))
2815 printk(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i); 2816 printk(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i);