summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-05-02 04:09:11 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-02 04:09:11 -0700
commit1d3faa390df9f009d7d76134b2aa1f07990945a4 (patch)
treedf9941f3f636633f46968f35a8fbfa1f030c31c6 /net
parent0c89652a741cce71661d561c4466115c60c752d1 (diff)
downloadlinux-3.10-1d3faa390df9f009d7d76134b2aa1f07990945a4.tar.gz
linux-3.10-1d3faa390df9f009d7d76134b2aa1f07990945a4.tar.bz2
linux-3.10-1d3faa390df9f009d7d76134b2aa1f07990945a4.zip
vlan: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data. Signed-off-by: Denis V. Lunev <den@openvz.org> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/8021q/vlanproc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index daad0064e2c..08b54b593d5 100644
--- 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;
}