1 files changed, 20 insertions, 20 deletions

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index a8fc0de1f969..5e24f72602a1 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -51,7 +51,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *v);
 
 
 /*
- *      Names of the proc directory entries 
+ *      Names of the proc directory entries
  */
 
 static const char name_root[]    = "vlan";
@@ -66,7 +66,7 @@ static const char name_conf[]	 = "config";
  */
 
 /*
- *      Generic /proc/net/vlan/<file> file and inode operations 
+ *      Generic /proc/net/vlan/<file> file and inode operations
  */
 
 static struct seq_operations vlan_seq_ops = {
@@ -81,7 +81,7 @@ static int vlan_seq_open(struct inode *inode, struct file *file)
         return seq_open(file, &vlan_seq_ops);
 }
 
-static struct file_operations vlan_fops = {
+static const struct file_operations vlan_fops = {
         .owner   = THIS_MODULE,
         .open    = vlan_seq_open,
         .read    = seq_read,
@@ -98,7 +98,7 @@ static int vlandev_seq_open(struct inode *inode, struct file *file)
         return single_open(file, vlandev_seq_show, PDE(inode)->data);
 }
 
-static struct file_operations vlandev_fops = {
+static const struct file_operations vlandev_fops = {
         .owner = THIS_MODULE,
         .open    = vlandev_seq_open,
         .read    = seq_read,
@@ -111,13 +111,13 @@ static struct file_operations vlandev_fops = {
  */
 
 /*
- *      /proc/net/vlan 
+ *      /proc/net/vlan
  */
 
 static struct proc_dir_entry *proc_vlan_dir;
 
 /*
- *      /proc/net/vlan/config 
+ *      /proc/net/vlan/config
  */
 
 static struct proc_dir_entry *proc_vlan_conf;
@@ -238,15 +238,15 @@ int vlan_proc_rem_dev(struct net_device *vlandev)
  */
 
 /* starting at dev, find a VLAN device */
-static struct net_device *vlan_skip(struct net_device *dev) 
+static struct net_device *vlan_skip(struct net_device *dev)
 {
-        while (dev && !(dev->priv_flags & IFF_802_1Q_VLAN)) 
+        while (dev && !(dev->priv_flags & IFF_802_1Q_VLAN))
                 dev = dev->next;
 
         return dev;
 }
 
-/* start read of /proc/net/vlan/config */ 
+/* start read of /proc/net/vlan/config */
 static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct net_device *dev;
@@ -256,19 +256,19 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
 
         if (*pos == 0)
                 return SEQ_START_TOKEN;
-        
-        for (dev = vlan_skip(dev_base); dev && i < *pos; 
+
+        for (dev = vlan_skip(dev_base); dev && i < *pos;
              dev = vlan_skip(dev->next), ++i);
-                
+
         return  (i == *pos) ? dev : NULL;
-} 
+}
 
 static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         ++*pos;
 
-        return vlan_skip((v == SEQ_START_TOKEN)  
-                            ? dev_base 
+        return vlan_skip((v == SEQ_START_TOKEN)
+                            ? dev_base
                             : ((struct net_device *)v)->next);
 }
 
@@ -287,13 +287,13 @@ static int vlan_seq_show(struct seq_file *seq, void *v)
                 if (vlan_name_type < ARRAY_SIZE(vlan_name_type_str))
                     nmtype =  vlan_name_type_str[vlan_name_type];
 
-                seq_printf(seq, "Name-Type: %s\n", 
+                seq_printf(seq, "Name-Type: %s\n",
                            nmtype ? nmtype :  "UNKNOWN" );
         } else {
                 const struct net_device *vlandev = v;
                 const struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev);
 
-                seq_printf(seq, "%-15s| %d  | %s\n",  vlandev->name,  
+                seq_printf(seq, "%-15s| %d  | %s\n",  vlandev->name,
                            dev_info->vlan_id,    dev_info->real_dev->name);
         }
         return 0;
@@ -323,13 +323,13 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
         seq_puts(seq, "\n");
         seq_printf(seq, fmt, "total frames transmitted", stats->tx_packets);
         seq_printf(seq, fmt, "total bytes transmitted", stats->tx_bytes);
-        seq_printf(seq, fmt, "total headroom inc", 
+        seq_printf(seq, fmt, "total headroom inc",
                    dev_info->cnt_inc_headroom_on_tx);
-        seq_printf(seq, fmt, "total encap on xmit", 
+        seq_printf(seq, fmt, "total encap on xmit",
                    dev_info->cnt_encap_on_xmit);
         seq_printf(seq, "Device: %s", dev_info->real_dev->name);
         /* now show all PRIORITY mappings relating to this VLAN */
-        seq_printf(seq, 
+        seq_printf(seq,
                        "\nINGRESS priority mappings: 0:%lu  1:%lu  2:%lu  3:%lu  4:%lu  5:%lu  6:%lu 7:%lu\n",
                        dev_info->ingress_priority_map[0],
                        dev_info->ingress_priority_map[1],