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 cc17b722078abcde11a257b4564f86ca29171749..08b54b593d565df95a7b64629b793371df8c5d4d 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -176,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;
 }
 
@@ -260,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");