Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / net / irda / irproc.c

diff --git a/net/irda/irproc.c b/net/irda/irproc.c
index 181cb51b48a8b5b50e64820a71581e702aa2f307..88e80a312732a9ed18e7e1d511d79ac6f0f9d682 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,16 +67,14 @@ 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;
 
-       for (i=0; i<ARRAY_SIZE(irda_dirs); i++) {
-               d = create_proc_entry(irda_dirs[i].name, 0, proc_irda);
-               if (d)
-                       d->proc_fops = irda_dirs[i].fops;
-       }
+       for (i = 0; i < ARRAY_SIZE(irda_dirs); i++)
+               d = proc_create(irda_dirs[i].name, 0, proc_irda,
+                               irda_dirs[i].fops);
 }
 
 /*
@@ -92,7 +91,7 @@ void 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;
        }
 }