diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-02-28 14:14:58 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-28 14:14:58 -0800 |
commit | d45fba3625249fada590a2eea09c38e755a3a2a7 (patch) | |
tree | 0663813ee1b56adc585feb78d0b8124679d58568 /net/8021q | |
parent | 770207208e4374f013f6f49233d5c8c8df505e03 (diff) | |
download | kernel-common-d45fba3625249fada590a2eea09c38e755a3a2a7.tar.gz kernel-common-d45fba3625249fada590a2eea09c38e755a3a2a7.tar.bz2 kernel-common-d45fba3625249fada590a2eea09c38e755a3a2a7.zip |
[8021Q]: Use proc_create() to setup ->proc_fops first
Use proc_create() to make sure that ->proc_fops be setup before gluing
PDE to main tree.
Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlanproc.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index a0ec47925597..146cfb0e9882 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c @@ -161,11 +161,10 @@ int __init vlan_proc_init(void) if (!proc_vlan_dir) goto err; - proc_vlan_conf = create_proc_entry(name_conf, S_IFREG|S_IRUSR|S_IWUSR, - proc_vlan_dir); + proc_vlan_conf = proc_create(name_conf, S_IFREG|S_IRUSR|S_IWUSR, + proc_vlan_dir, &vlan_fops); if (!proc_vlan_conf) goto err; - proc_vlan_conf->proc_fops = &vlan_fops; return 0; err: @@ -182,13 +181,11 @@ int vlan_proc_add_dev(struct net_device *vlandev) { struct vlan_dev_info *dev_info = vlan_dev_info(vlandev); - dev_info->dent = create_proc_entry(vlandev->name, - S_IFREG|S_IRUSR|S_IWUSR, - proc_vlan_dir); + dev_info->dent = proc_create(vlandev->name, S_IFREG|S_IRUSR|S_IWUSR, + proc_vlan_dir, &vlandev_fops); if (!dev_info->dent) return -ENOBUFS; - dev_info->dent->proc_fops = &vlandev_fops; dev_info->dent->data = vlandev; return 0; } |