Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 011159a0 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by John W. Linville
Browse files

airo: correct proc entry creation interfaces 



* use proc_mkdir_mode() instead of create_proc_entry(S_IFDIR|...),
  export proc_mkdir_mode() for that, oh well.
* don't supply S_IFREG to proc_create_data(), it's unnecessary

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9368a9a2

drivers/net/wireless/airo.c

+11 −22
Original line number Diff line number Diff line
@@ -4500,8 +4500,7 @@ 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,

	apriv->proc_entry = proc_mkdir_mode(apriv->proc_name, airo_perm,

					    airo_entry);

	if (!apriv->proc_entry)

		goto fail;
@@ -4509,8 +4508,7 @@ static int setup_proc_entry( struct net_device *dev, 
	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;
@@ -4518,8 +4516,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;
@@ -4527,8 +4524,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;
@@ -4536,8 +4532,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;
@@ -4545,8 +4540,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;
@@ -4554,8 +4548,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;
@@ -4563,8 +4556,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;
@@ -4572,8 +4564,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;
@@ -5705,9 +5696,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;

fs/proc/generic.c

+1 −0
Original line number Diff line number Diff line
@@ -674,6 +674,7 @@ struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode, 
	}

	return ent;

}

EXPORT_SYMBOL(proc_mkdir_mode);



struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,

		struct proc_dir_entry *parent)