[NET]: Make /proc/net per network namespace

[linux-block.git] / net / irda / irproc.c

diff --git a/net/irda/irproc.c b/net/irda/irproc.c
index d6f9aba5b9dc1de454e058d4bb037ef0e56445cf..cae24fbda966f654d3817dcb38077b334ddd0b1a 100644 (file)
--- a/net/irda/irproc.c
+++ b/net/irda/irproc.c
@@ -28,6 +28,7 @@
 #include <linux/seq_file.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <net/net_namespace.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irlap.h>
@@ -66,7 +67,7 @@ void __init irda_proc_register(void)
        int i;
        struct proc_dir_entry *d;
 
-       proc_irda = proc_mkdir("irda", proc_net);
+       proc_irda = proc_mkdir("irda", init_net.proc_net);
        if (proc_irda == NULL)
                return;
        proc_irda->owner = THIS_MODULE;
@@ -84,7 +85,7 @@ void __init irda_proc_register(void)
  *    Unregister irda entry in /proc file system
  *
  */
-void __exit irda_proc_unregister(void)
+void irda_proc_unregister(void)
 {
        int i;
 
@@ -92,7 +93,7 @@ void __exit irda_proc_unregister(void)
                for (i=0; i<ARRAY_SIZE(irda_dirs); i++)
                        remove_proc_entry(irda_dirs[i].name, proc_irda);
 
-               remove_proc_entry("irda", proc_net);
+               remove_proc_entry("irda", init_net.proc_net);
                proc_irda = NULL;
        }
 }