alpha: fix compile failures with gcc-4.3 (bug #10438)

[linux-2.6] / net / 8021q / vlanproc.c

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 995544b890715be117b025bb5645b5963cced83e..08b54b593d565df95a7b64629b793371df8c5d4d 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -80,7 +80,8 @@ static const struct seq_operations vlan_seq_ops = {
 
 static int vlan_seq_open(struct inode *inode, struct file *file)
 {
-       return seq_open(file, &vlan_seq_ops);
+       return seq_open_net(inode, file, &vlan_seq_ops,
+                       sizeof(struct seq_net_private));
 }
 
 static const struct file_operations vlan_fops = {
@@ -88,7 +89,7 @@ static const struct file_operations vlan_fops = {
        .open    = vlan_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = seq_release,
+       .release = seq_release_net,
 };
 
 /*
@@ -175,12 +176,11 @@ int vlan_proc_add_dev(struct net_device *vlandev)
        struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
        struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id);
 
-       dev_info->dent = proc_create(vlandev->name, S_IFREG|S_IRUSR|S_IWUSR,
-                                    vn->proc_vlan_dir, &vlandev_fops);
+       dev_info->dent =
+               proc_create_data(vlandev->name, S_IFREG|S_IRUSR|S_IWUSR,
+                                vn->proc_vlan_dir, &vlandev_fops, vlandev);
        if (!dev_info->dent)
                return -ENOBUFS;
-
-       dev_info->dent->data = vlandev;
        return 0;
 }
 
@@ -211,6 +211,7 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(dev_base_lock)
 {
        struct net_device *dev;
+       struct net *net = seq_file_net(seq);
        loff_t i = 1;
 
        read_lock(&dev_base_lock);
@@ -218,7 +219,7 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
        if (*pos == 0)
                return SEQ_START_TOKEN;
 
-       for_each_netdev(&init_net, dev) {
+       for_each_netdev(net, dev) {
                if (!is_vlan_dev(dev))
                        continue;
 
@@ -232,14 +233,15 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
 static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct net_device *dev;
+       struct net *net = seq_file_net(seq);
 
        ++*pos;
 
        dev = (struct net_device *)v;
        if (v == SEQ_START_TOKEN)
-               dev = net_device_entry(&init_net.dev_base_head);
+               dev = net_device_entry(&net->dev_base_head);
 
-       for_each_netdev_continue(&init_net, dev) {
+       for_each_netdev_continue(net, dev) {
                if (!is_vlan_dev(dev))
                        continue;
 
@@ -257,13 +259,16 @@ static void vlan_seq_stop(struct seq_file *seq, void *v)
 
 static int vlan_seq_show(struct seq_file *seq, void *v)
 {
+       struct net *net = seq_file_net(seq);
+       struct vlan_net *vn = net_generic(net, vlan_net_id);
+
        if (v == SEQ_START_TOKEN) {
                const char *nmtype = NULL;
 
                seq_puts(seq, "VLAN Dev name     | VLAN ID\n");
 
-               if (vlan_name_type < ARRAY_SIZE(vlan_name_type_str))
-                   nmtype =  vlan_name_type_str[vlan_name_type];
+               if (vn->name_type < ARRAY_SIZE(vlan_name_type_str))
+                   nmtype =  vlan_name_type_str[vn->name_type];
 
                seq_printf(seq, "Name-Type: %s\n",
                           nmtype ? nmtype :  "UNKNOWN");