diff options
Diffstat (limited to 'net/8021q/vlanproc.c')
-rw-r--r-- | net/8021q/vlanproc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index bd08aa090763..ac80e6b9ef53 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/fs.h> | 33 | #include <linux/fs.h> |
34 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
35 | #include <linux/if_vlan.h> | 35 | #include <linux/if_vlan.h> |
36 | #include <net/net_namespace.h> | ||
36 | #include "vlanproc.h" | 37 | #include "vlanproc.h" |
37 | #include "vlan.h" | 38 | #include "vlan.h" |
38 | 39 | ||
@@ -143,7 +144,7 @@ void vlan_proc_cleanup(void) | |||
143 | remove_proc_entry(name_conf, proc_vlan_dir); | 144 | remove_proc_entry(name_conf, proc_vlan_dir); |
144 | 145 | ||
145 | if (proc_vlan_dir) | 146 | if (proc_vlan_dir) |
146 | proc_net_remove(name_root); | 147 | proc_net_remove(&init_net, name_root); |
147 | 148 | ||
148 | /* Dynamically added entries should be cleaned up as their vlan_device | 149 | /* Dynamically added entries should be cleaned up as their vlan_device |
149 | * is removed, so we should not have to take care of it here... | 150 | * is removed, so we should not have to take care of it here... |
@@ -156,7 +157,7 @@ void vlan_proc_cleanup(void) | |||
156 | 157 | ||
157 | int __init vlan_proc_init(void) | 158 | int __init vlan_proc_init(void) |
158 | { | 159 | { |
159 | proc_vlan_dir = proc_mkdir(name_root, proc_net); | 160 | proc_vlan_dir = proc_mkdir(name_root, init_net.proc_net); |
160 | if (proc_vlan_dir) { | 161 | if (proc_vlan_dir) { |
161 | proc_vlan_conf = create_proc_entry(name_conf, | 162 | proc_vlan_conf = create_proc_entry(name_conf, |
162 | S_IFREG|S_IRUSR|S_IWUSR, | 163 | S_IFREG|S_IRUSR|S_IWUSR, |