aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_module.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 /net/ieee80211/ieee80211_module.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 'net/ieee80211/ieee80211_module.c')
-rw-r--r--net/ieee80211/ieee80211_module.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 17ad278696ed..69cb6aad25be 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -47,6 +47,7 @@
47#include <linux/wireless.h> 47#include <linux/wireless.h>
48#include <linux/etherdevice.h> 48#include <linux/etherdevice.h>
49#include <asm/uaccess.h> 49#include <asm/uaccess.h>
50#include <net/net_namespace.h>
50#include <net/arp.h> 51#include <net/arp.h>
51 52
52#include <net/ieee80211.h> 53#include <net/ieee80211.h>
@@ -264,7 +265,7 @@ static int __init ieee80211_init(void)
264 struct proc_dir_entry *e; 265 struct proc_dir_entry *e;
265 266
266 ieee80211_debug_level = debug; 267 ieee80211_debug_level = debug;
267 ieee80211_proc = proc_mkdir(DRV_NAME, proc_net); 268 ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
268 if (ieee80211_proc == NULL) { 269 if (ieee80211_proc == NULL) {
269 IEEE80211_ERROR("Unable to create " DRV_NAME 270 IEEE80211_ERROR("Unable to create " DRV_NAME
270 " proc directory\n"); 271 " proc directory\n");
@@ -273,7 +274,7 @@ static int __init ieee80211_init(void)
273 e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR, 274 e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR,
274 ieee80211_proc); 275 ieee80211_proc);
275 if (!e) { 276 if (!e) {
276 remove_proc_entry(DRV_NAME, proc_net); 277 remove_proc_entry(DRV_NAME, init_net.proc_net);
277 ieee80211_proc = NULL; 278 ieee80211_proc = NULL;
278 return -EIO; 279 return -EIO;
279 } 280 }
@@ -293,7 +294,7 @@ static void __exit ieee80211_exit(void)
293#ifdef CONFIG_IEEE80211_DEBUG 294#ifdef CONFIG_IEEE80211_DEBUG
294 if (ieee80211_proc) { 295 if (ieee80211_proc) {
295 remove_proc_entry("debug_level", ieee80211_proc); 296 remove_proc_entry("debug_level", ieee80211_proc);
296 remove_proc_entry(DRV_NAME, proc_net); 297 remove_proc_entry(DRV_NAME, init_net.proc_net);
297 ieee80211_proc = NULL; 298 ieee80211_proc = NULL;
298 } 299 }
299#endif /* CONFIG_IEEE80211_DEBUG */ 300#endif /* CONFIG_IEEE80211_DEBUG */