Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / ipx / ipx_proc.c

diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
index 811e4badce81fd4920d5bb45854d34c1b805fe0f..d483a00dc427994abf293771391b28a4194c8b03 100644 (file)
--- a/net/ipx/ipx_proc.c
+++ b/net/ipx/ipx_proc.c
@@ -9,6 +9,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/tcp_states.h>
 #include <net/ipx.h>
 
@@ -286,21 +287,21 @@ out:
        return 0;
 }
 
-static struct seq_operations ipx_seq_interface_ops = {
+static const struct seq_operations ipx_seq_interface_ops = {
        .start  = ipx_seq_interface_start,
        .next   = ipx_seq_interface_next,
        .stop   = ipx_seq_interface_stop,
        .show   = ipx_seq_interface_show,
 };
 
-static struct seq_operations ipx_seq_route_ops = {
+static const struct seq_operations ipx_seq_route_ops = {
        .start  = ipx_seq_route_start,
        .next   = ipx_seq_route_next,
        .stop   = ipx_seq_route_stop,
        .show   = ipx_seq_route_show,
 };
 
-static struct seq_operations ipx_seq_socket_ops = {
+static const struct seq_operations ipx_seq_socket_ops = {
        .start  = ipx_seq_socket_start,
        .next   = ipx_seq_socket_next,
        .stop   = ipx_seq_interface_stop,
@@ -322,7 +323,7 @@ static int ipx_seq_socket_open(struct inode *inode, struct file *file)
        return seq_open(file, &ipx_seq_socket_ops);
 }
 
-static struct file_operations ipx_seq_interface_fops = {
+static const struct file_operations ipx_seq_interface_fops = {
        .owner          = THIS_MODULE,
        .open           = ipx_seq_interface_open,
        .read           = seq_read,
@@ -330,7 +331,7 @@ static struct file_operations ipx_seq_interface_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations ipx_seq_route_fops = {
+static const struct file_operations ipx_seq_route_fops = {
        .owner          = THIS_MODULE,
        .open           = ipx_seq_route_open,
        .read           = seq_read,
@@ -338,7 +339,7 @@ static struct file_operations ipx_seq_route_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations ipx_seq_socket_fops = {
+static const struct file_operations ipx_seq_socket_fops = {
        .owner          = THIS_MODULE,
        .open           = ipx_seq_socket_open,
        .read           = seq_read,
@@ -353,7 +354,7 @@ int __init ipx_proc_init(void)
        struct proc_dir_entry *p;
        int rc = -ENOMEM;
 
-       ipx_proc_dir = proc_mkdir("ipx", proc_net);
+       ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
 
        if (!ipx_proc_dir)
                goto out;
@@ -381,7 +382,7 @@ out_socket:
 out_route:
        remove_proc_entry("interface", ipx_proc_dir);
 out_interface:
-       remove_proc_entry("ipx", proc_net);
+       remove_proc_entry("ipx", init_net.proc_net);
        goto out;
 }
 
@@ -390,7 +391,7 @@ void __exit ipx_proc_exit(void)
        remove_proc_entry("interface", ipx_proc_dir);
        remove_proc_entry("route", ipx_proc_dir);
        remove_proc_entry("socket", ipx_proc_dir);
-       remove_proc_entry("ipx", proc_net);
+       remove_proc_entry("ipx", init_net.proc_net);
 }
 
 #else /* CONFIG_PROC_FS */