[VLAN]: Clean up initialization code

[deliverable/linux.git] / net / 8021q / vlanproc.c

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index bd08aa090763ad469e7e9c795f8057d8370e46f0..971e6233801eab307ef56506e9a18038465d424b 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -33,6 +33,7 @@
 #include <linux/fs.h>
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
+#include <net/net_namespace.h>
 #include "vlanproc.h"
 #include "vlan.h"
 
@@ -143,7 +144,7 @@ void vlan_proc_cleanup(void)
                remove_proc_entry(name_conf, proc_vlan_dir);
 
        if (proc_vlan_dir)
-               proc_net_remove(name_root);
+               proc_net_remove(&init_net, name_root);
 
        /* Dynamically added entries should be cleaned up as their vlan_device
         * is removed, so we should not have to take care of it here...
@@ -156,16 +157,19 @@ void vlan_proc_cleanup(void)
 
 int __init vlan_proc_init(void)
 {
-       proc_vlan_dir = proc_mkdir(name_root, proc_net);
-       if (proc_vlan_dir) {
-               proc_vlan_conf = create_proc_entry(name_conf,
-                                                  S_IFREG|S_IRUSR|S_IWUSR,
-                                                  proc_vlan_dir);
-               if (proc_vlan_conf) {
-                       proc_vlan_conf->proc_fops = &vlan_fops;
-                       return 0;
-               }
-       }
+       proc_vlan_dir = proc_mkdir(name_root, init_net.proc_net);
+       if (!proc_vlan_dir)
+               goto err;
+
+       proc_vlan_conf = create_proc_entry(name_conf, S_IFREG|S_IRUSR|S_IWUSR,
+                                          proc_vlan_dir);
+       if (!proc_vlan_conf)
+               goto err;
+       proc_vlan_conf->proc_fops = &vlan_fops;
+       return 0;
+
+err:
+       pr_err("%s: can't create entry in proc filesystem!\n", __FUNCTION__);
        vlan_proc_cleanup();
        return -ENOBUFS;
 }
@@ -178,13 +182,6 @@ int vlan_proc_add_dev (struct net_device *vlandev)
 {
        struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev);
 
-       if (!(vlandev->priv_flags & IFF_802_1Q_VLAN)) {
-               printk(KERN_ERR
-                      "ERROR:  vlan_proc_add, device -:%s:- is NOT a VLAN\n",
-                      vlandev->name);
-               return -EINVAL;
-       }
-
        dev_info->dent = create_proc_entry(vlandev->name,
                                           S_IFREG|S_IRUSR|S_IWUSR,
                                           proc_vlan_dir);
@@ -193,11 +190,6 @@ int vlan_proc_add_dev (struct net_device *vlandev)
 
        dev_info->dent->proc_fops = &vlandev_fops;
        dev_info->dent->data = vlandev;
-
-#ifdef VLAN_DEBUG
-       printk(KERN_ERR "vlan_proc_add, device -:%s:- being added.\n",
-              vlandev->name);
-#endif
        return 0;
 }
 
@@ -206,28 +198,11 @@ int vlan_proc_add_dev (struct net_device *vlandev)
  */
 int vlan_proc_rem_dev(struct net_device *vlandev)
 {
-       if (!vlandev) {
-               printk(VLAN_ERR "%s: invalid argument: %p\n",
-                       __FUNCTION__, vlandev);
-               return -EINVAL;
-       }
-
-       if (!(vlandev->priv_flags & IFF_802_1Q_VLAN)) {
-               printk(VLAN_DBG "%s: invalid argument, device: %s is not a VLAN device, priv_flags: 0x%4hX.\n",
-                       __FUNCTION__, vlandev->name, vlandev->priv_flags);
-               return -EINVAL;
-       }
-
-#ifdef VLAN_DEBUG
-       printk(VLAN_DBG "%s: dev: %p\n", __FUNCTION__, vlandev);
-#endif
-
        /** NOTE:  This will consume the memory pointed to by dent, it seems. */
        if (VLAN_DEV_INFO(vlandev)->dent) {
                remove_proc_entry(VLAN_DEV_INFO(vlandev)->dent->name, proc_vlan_dir);
                VLAN_DEV_INFO(vlandev)->dent = NULL;
        }
-
        return 0;
 }
 
@@ -253,7 +228,7 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
        if (*pos == 0)
                return SEQ_START_TOKEN;
 
-       for_each_netdev(dev) {
+       for_each_netdev(&init_net, dev) {
                if (!is_vlan_dev(dev))
                        continue;
 
@@ -272,9 +247,9 @@ static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 
        dev = (struct net_device *)v;
        if (v == SEQ_START_TOKEN)
-               dev = net_device_entry(&dev_base_head);
+               dev = net_device_entry(&init_net.dev_base_head);
 
-       for_each_netdev_continue(dev) {
+       for_each_netdev_continue(&init_net, dev) {
                if (!is_vlan_dev(dev))
                        continue;
 
@@ -315,7 +290,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
 {
        struct net_device *vlandev = (struct net_device *) seq->private;
        const struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev);
-       struct net_device_stats *stats;
+       struct net_device_stats *stats = &vlandev->stats;
        static const char fmt[] = "%30s %12lu\n";
        int i;
 
@@ -326,9 +301,6 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
                       vlandev->name, dev_info->vlan_id,
                       (int)(dev_info->flags & 1), vlandev->priv_flags);
 
-
-       stats = vlan_dev_get_stats(vlandev);
-
        seq_printf(seq, fmt, "total frames received", stats->rx_packets);
        seq_printf(seq, fmt, "total bytes received", stats->rx_bytes);
        seq_printf(seq, fmt, "Broadcast/Multicast Rcvd", stats->multicast);