diff options
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 33 | 
1 files changed, 11 insertions, 22 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index a70c512f05d..55cf71fbffe 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -4501,17 +4501,15 @@ static int setup_proc_entry( struct net_device *dev,  	struct proc_dir_entry *entry;  	/* First setup the device directory */  	strcpy(apriv->proc_name,dev->name); -	apriv->proc_entry = create_proc_entry(apriv->proc_name, -					      S_IFDIR|airo_perm, -					      airo_entry); +	apriv->proc_entry = proc_mkdir_mode(apriv->proc_name, airo_perm, +					    airo_entry);  	if (!apriv->proc_entry)  		goto fail;  	apriv->proc_entry->uid = proc_uid;  	apriv->proc_entry->gid = proc_gid;  	/* Setup the StatsDelta */ -	entry = proc_create_data("StatsDelta", -				 S_IFREG | (S_IRUGO&proc_perm), +	entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm,  				 apriv->proc_entry, &proc_statsdelta_ops, dev);  	if (!entry)  		goto fail_stats_delta; @@ -4519,8 +4517,7 @@ static int setup_proc_entry( struct net_device *dev,  	entry->gid = proc_gid;  	/* Setup the Stats */ -	entry = proc_create_data("Stats", -				 S_IFREG | (S_IRUGO&proc_perm), +	entry = proc_create_data("Stats", S_IRUGO & proc_perm,  				 apriv->proc_entry, &proc_stats_ops, dev);  	if (!entry)  		goto fail_stats; @@ -4528,8 +4525,7 @@ static int setup_proc_entry( struct net_device *dev,  	entry->gid = proc_gid;  	/* Setup the Status */ -	entry = proc_create_data("Status", -				 S_IFREG | (S_IRUGO&proc_perm), +	entry = proc_create_data("Status", S_IRUGO & proc_perm,  				 apriv->proc_entry, &proc_status_ops, dev);  	if (!entry)  		goto fail_status; @@ -4537,8 +4533,7 @@ static int setup_proc_entry( struct net_device *dev,  	entry->gid = proc_gid;  	/* Setup the Config */ -	entry = proc_create_data("Config", -				 S_IFREG | proc_perm, +	entry = proc_create_data("Config", proc_perm,  				 apriv->proc_entry, &proc_config_ops, dev);  	if (!entry)  		goto fail_config; @@ -4546,8 +4541,7 @@ static int setup_proc_entry( struct net_device *dev,  	entry->gid = proc_gid;  	/* Setup the SSID */ -	entry = proc_create_data("SSID", -				 S_IFREG | proc_perm, +	entry = proc_create_data("SSID", proc_perm,  				 apriv->proc_entry, &proc_SSID_ops, dev);  	if (!entry)  		goto fail_ssid; @@ -4555,8 +4549,7 @@ static int setup_proc_entry( struct net_device *dev,  	entry->gid = proc_gid;  	/* Setup the APList */ -	entry = proc_create_data("APList", -				 S_IFREG | proc_perm, +	entry = proc_create_data("APList", proc_perm,  				 apriv->proc_entry, &proc_APList_ops, dev);  	if (!entry)  		goto fail_aplist; @@ -4564,8 +4557,7 @@ static int setup_proc_entry( struct net_device *dev,  	entry->gid = proc_gid;  	/* Setup the BSSList */ -	entry = proc_create_data("BSSList", -				 S_IFREG | proc_perm, +	entry = proc_create_data("BSSList", proc_perm,  				 apriv->proc_entry, &proc_BSSList_ops, dev);  	if (!entry)  		goto fail_bsslist; @@ -4573,8 +4565,7 @@ static int setup_proc_entry( struct net_device *dev,  	entry->gid = proc_gid;  	/* Setup the WepKey */ -	entry = proc_create_data("WepKey", -				 S_IFREG | proc_perm, +	entry = proc_create_data("WepKey", proc_perm,  				 apriv->proc_entry, &proc_wepkey_ops, dev);  	if (!entry)  		goto fail_wepkey; @@ -5706,9 +5697,7 @@ static int __init airo_init_module( void )  {  	int i; -	airo_entry = create_proc_entry("driver/aironet", -				       S_IFDIR | airo_perm, -				       NULL); +	airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);  	if (airo_entry) {  		airo_entry->uid = proc_uid;  |