ipgre: convert to netdevice_ops

[safe/jmp/linux-2.6] / net / wanrouter / wanproc.c

diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index c28ba5a..267f7ff 100644 (file)
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -20,7 +20,6 @@
 * Dec 13, 1996 Gene Kozin      Initial version (based on Sangoma's WANPIPE)
 *****************************************************************************/
 
-#include <linux/config.h>
 #include <linux/init.h>                /* __initfunc et al. */
 #include <linux/stddef.h>      /* offsetof(), etc. */
 #include <linux/errno.h>       /* return codes */
@@ -30,6 +29,7 @@
 #include <linux/seq_file.h>
 #include <linux/smp_lock.h>
 
+#include <net/net_namespace.h>
 #include <asm/io.h>
 
 #define PROC_STATS_FORMAT "%30s: %12lu\n"
@@ -38,10 +38,10 @@
 
 #define PROT_DECODE(prot) ((prot == WANCONFIG_FR) ? " FR" :\
                              (prot == WANCONFIG_X25) ? " X25" : \
-                                (prot == WANCONFIG_PPP) ? " PPP" : \
+                                (prot == WANCONFIG_PPP) ? " PPP" : \
                                    (prot == WANCONFIG_CHDLC) ? " CHDLC": \
                                       (prot == WANCONFIG_MPPP) ? " MPPP" : \
-                                          " Unknown" )
+                                          " Unknown" )
 
 /****** Function Prototypes *************************************************/
 
@@ -165,14 +165,14 @@ static int status_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations config_op = {
+static const struct seq_operations config_op = {
        .start  = r_start,
        .next   = r_next,
        .stop   = r_stop,
        .show   = config_show,
 };
 
-static struct seq_operations status_op = {
+static const struct seq_operations status_op = {
        .start  = r_start,
        .next   = r_next,
        .stop   = r_stop,
@@ -189,7 +189,7 @@ static int status_open(struct inode *inode, struct file *file)
        return seq_open(file, &status_op);
 }
 
-static struct file_operations config_fops = {
+static const struct file_operations config_fops = {
        .owner   = THIS_MODULE,
        .open    = config_open,
        .read    = seq_read,
@@ -197,7 +197,7 @@ static struct file_operations config_fops = {
        .release = seq_release,
 };
 
-static struct file_operations status_fops = {
+static const struct file_operations status_fops = {
        .owner   = THIS_MODULE,
        .open    = status_open,
        .read    = seq_read,
@@ -272,13 +272,13 @@ static int wandev_open(struct inode *inode, struct file *file)
        return single_open(file, wandev_show, PDE(inode)->data);
 }
 
-static struct file_operations wandev_fops = {
+static const struct file_operations wandev_fops = {
        .owner   = THIS_MODULE,
        .open    = wandev_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
        .release = single_release,
-       .ioctl   = wanrouter_ioctl,
+       .unlocked_ioctl  = wanrouter_ioctl,
 };
 
 /*
@@ -288,23 +288,21 @@ static struct file_operations wandev_fops = {
 int __init wanrouter_proc_init(void)
 {
        struct proc_dir_entry *p;
-       proc_router = proc_mkdir(ROUTER_NAME, proc_net);
+       proc_router = proc_mkdir(ROUTER_NAME, init_net.proc_net);
        if (!proc_router)
                goto fail;
 
-       p = create_proc_entry("config", S_IRUGO, proc_router);
+       p = proc_create("config", S_IRUGO, proc_router, &config_fops);
        if (!p)
                goto fail_config;
-       p->proc_fops = &config_fops;
-       p = create_proc_entry("status", S_IRUGO, proc_router);
+       p = proc_create("status", S_IRUGO, proc_router, &status_fops);
        if (!p)
                goto fail_stat;
-       p->proc_fops = &status_fops;
        return 0;
 fail_stat:
        remove_proc_entry("config", proc_router);
 fail_config:
-       remove_proc_entry(ROUTER_NAME, proc_net);
+       remove_proc_entry(ROUTER_NAME, init_net.proc_net);
 fail:
        return -ENOMEM;
 }
@@ -317,7 +315,7 @@ void wanrouter_proc_cleanup(void)
 {
        remove_proc_entry("config", proc_router);
        remove_proc_entry("status", proc_router);
-       remove_proc_entry(ROUTER_NAME, proc_net);
+       remove_proc_entry(ROUTER_NAME, init_net.proc_net);
 }
 
 /*
@@ -329,10 +327,10 @@ int wanrouter_proc_add(struct wan_device* wandev)
        if (wandev->magic != ROUTER_MAGIC)
                return -EINVAL;
 
-       wandev->dent = create_proc_entry(wandev->name, S_IRUGO, proc_router);
+       wandev->dent = proc_create(wandev->name, S_IRUGO,
+                                  proc_router, &wandev_fops);
        if (!wandev->dent)
                return -ENOMEM;
-       wandev->dent->proc_fops = &wandev_fops;
        wandev->dent->data      = wandev;
        return 0;
 }