diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 06:01:34 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:06 -0400 |
commit | 457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch) | |
tree | a2ceee88780cbce27433b9a4434b3e9251efd81a /net/wireless/wext.c | |
parent | 07feaebfcc10cd35e745c7073667935246494bee (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/wireless/wext.c')
-rw-r--r-- | net/wireless/wext.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/wext.c b/net/wireless/wext.c index debf5191a128..b8069afe0410 100644 --- a/net/wireless/wext.c +++ b/net/wireless/wext.c | |||
@@ -93,6 +93,7 @@ | |||
93 | #include <linux/if_arp.h> /* ARPHRD_ETHER */ | 93 | #include <linux/if_arp.h> /* ARPHRD_ETHER */ |
94 | #include <linux/etherdevice.h> /* compare_ether_addr */ | 94 | #include <linux/etherdevice.h> /* compare_ether_addr */ |
95 | #include <linux/interrupt.h> | 95 | #include <linux/interrupt.h> |
96 | #include <net/net_namespace.h> | ||
96 | 97 | ||
97 | #include <linux/wireless.h> /* Pretty obvious */ | 98 | #include <linux/wireless.h> /* Pretty obvious */ |
98 | #include <net/iw_handler.h> /* New driver API */ | 99 | #include <net/iw_handler.h> /* New driver API */ |
@@ -686,7 +687,7 @@ static const struct file_operations wireless_seq_fops = { | |||
686 | int __init wext_proc_init(void) | 687 | int __init wext_proc_init(void) |
687 | { | 688 | { |
688 | /* Create /proc/net/wireless entry */ | 689 | /* Create /proc/net/wireless entry */ |
689 | if (!proc_net_fops_create("wireless", S_IRUGO, &wireless_seq_fops)) | 690 | if (!proc_net_fops_create(&init_net, "wireless", S_IRUGO, &wireless_seq_fops)) |
690 | return -ENOMEM; | 691 | return -ENOMEM; |
691 | 692 | ||
692 | return 0; | 693 | return 0; |