1 files changed, 21 insertions, 21 deletions

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index d34b6daf8930..c718fd3664b6 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -168,13 +168,13 @@ err:
 
 int vlan_proc_add_dev(struct net_device *vlandev)
 {
-        struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
+        struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
         struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id);
 
-        dev_info->dent =
+        vlan->dent =
                 proc_create_data(vlandev->name, S_IFREG|S_IRUSR|S_IWUSR,
                                  vn->proc_vlan_dir, &vlandev_fops, vlandev);
-        if (!dev_info->dent)
+        if (!vlan->dent)
                 return -ENOBUFS;
         return 0;
 }
@@ -187,10 +187,10 @@ int vlan_proc_rem_dev(struct net_device *vlandev)
         struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id);
 
         /** 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,
+        if (vlan_dev_priv(vlandev)->dent) {
+                remove_proc_entry(vlan_dev_priv(vlandev)->dent->name,
                                   vn->proc_vlan_dir);
-                vlan_dev_info(vlandev)->dent = NULL;
+                vlan_dev_priv(vlandev)->dent = NULL;
         }
         return 0;
 }
@@ -268,10 +268,10 @@ static int vlan_seq_show(struct seq_file *seq, void *v)
                            nmtype ? nmtype :  "UNKNOWN");
         } else {
                 const struct net_device *vlandev = v;
-                const struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
+                const struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
 
                 seq_printf(seq, "%-15s| %d  | %s\n",  vlandev->name,
-                           dev_info->vlan_id,    dev_info->real_dev->name);
+                           vlan->vlan_id,    vlan->real_dev->name);
         }
         return 0;
 }
@@ -279,7 +279,7 @@ static int vlan_seq_show(struct seq_file *seq, void *v)
 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);
+        const struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
         struct rtnl_link_stats64 temp;
         const struct rtnl_link_stats64 *stats;
         static const char fmt64[] = "%30s %12llu\n";
@@ -291,8 +291,8 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
         stats = dev_get_stats(vlandev, &temp);
         seq_printf(seq,
                    "%s  VID: %d  REORDER_HDR: %i  dev->priv_flags: %hx\n",
-                   vlandev->name, dev_info->vlan_id,
-                   (int)(dev_info->flags & 1), vlandev->priv_flags);
+                   vlandev->name, vlan->vlan_id,
+                   (int)(vlan->flags & 1), vlandev->priv_flags);
 
         seq_printf(seq, fmt64, "total frames received", stats->rx_packets);
         seq_printf(seq, fmt64, "total bytes received", stats->rx_bytes);
@@ -300,23 +300,23 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
         seq_puts(seq, "\n");
         seq_printf(seq, fmt64, "total frames transmitted", stats->tx_packets);
         seq_printf(seq, fmt64, "total bytes transmitted", stats->tx_bytes);
-        seq_printf(seq, "Device: %s", dev_info->real_dev->name);
+        seq_printf(seq, "Device: %s", vlan->real_dev->name);
         /* now show all PRIORITY mappings relating to this VLAN */
         seq_printf(seq, "\nINGRESS priority mappings: "
                         "0:%u  1:%u  2:%u  3:%u  4:%u  5:%u  6:%u 7:%u\n",
-                   dev_info->ingress_priority_map[0],
-                   dev_info->ingress_priority_map[1],
-                   dev_info->ingress_priority_map[2],
-                   dev_info->ingress_priority_map[3],
-                   dev_info->ingress_priority_map[4],
-                   dev_info->ingress_priority_map[5],
-                   dev_info->ingress_priority_map[6],
-                   dev_info->ingress_priority_map[7]);
+                   vlan->ingress_priority_map[0],
+                   vlan->ingress_priority_map[1],
+                   vlan->ingress_priority_map[2],
+                   vlan->ingress_priority_map[3],
+                   vlan->ingress_priority_map[4],
+                   vlan->ingress_priority_map[5],
+                   vlan->ingress_priority_map[6],
+                   vlan->ingress_priority_map[7]);
 
         seq_printf(seq, " EGRESS priority mappings: ");
         for (i = 0; i < 16; i++) {
                 const struct vlan_priority_tci_mapping *mp
-                        = dev_info->egress_priority_map[i];
+                        = vlan->egress_priority_map[i];
                 while (mp) {
                         seq_printf(seq, "%u:%hu ",
                                    mp->priority, ((mp->vlan_qos >> 13) & 0x7));