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 a70c512f05d2..55cf71fbffe3 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, | |||
4501 | struct proc_dir_entry *entry; | 4501 | struct proc_dir_entry *entry; |
4502 | /* First setup the device directory */ | 4502 | /* First setup the device directory */ |
4503 | strcpy(apriv->proc_name,dev->name); | 4503 | strcpy(apriv->proc_name,dev->name); |
4504 | apriv->proc_entry = create_proc_entry(apriv->proc_name, | 4504 | apriv->proc_entry = proc_mkdir_mode(apriv->proc_name, airo_perm, |
4505 | S_IFDIR|airo_perm, | 4505 | airo_entry); |
4506 | airo_entry); | ||
4507 | if (!apriv->proc_entry) | 4506 | if (!apriv->proc_entry) |
4508 | goto fail; | 4507 | goto fail; |
4509 | apriv->proc_entry->uid = proc_uid; | 4508 | apriv->proc_entry->uid = proc_uid; |
4510 | apriv->proc_entry->gid = proc_gid; | 4509 | apriv->proc_entry->gid = proc_gid; |
4511 | 4510 | ||
4512 | /* Setup the StatsDelta */ | 4511 | /* Setup the StatsDelta */ |
4513 | entry = proc_create_data("StatsDelta", | 4512 | entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm, |
4514 | S_IFREG | (S_IRUGO&proc_perm), | ||
4515 | apriv->proc_entry, &proc_statsdelta_ops, dev); | 4513 | apriv->proc_entry, &proc_statsdelta_ops, dev); |
4516 | if (!entry) | 4514 | if (!entry) |
4517 | goto fail_stats_delta; | 4515 | goto fail_stats_delta; |
@@ -4519,8 +4517,7 @@ static int setup_proc_entry( struct net_device *dev, | |||
4519 | entry->gid = proc_gid; | 4517 | entry->gid = proc_gid; |
4520 | 4518 | ||
4521 | /* Setup the Stats */ | 4519 | /* Setup the Stats */ |
4522 | entry = proc_create_data("Stats", | 4520 | entry = proc_create_data("Stats", S_IRUGO & proc_perm, |
4523 | S_IFREG | (S_IRUGO&proc_perm), | ||
4524 | apriv->proc_entry, &proc_stats_ops, dev); | 4521 | apriv->proc_entry, &proc_stats_ops, dev); |
4525 | if (!entry) | 4522 | if (!entry) |
4526 | goto fail_stats; | 4523 | goto fail_stats; |
@@ -4528,8 +4525,7 @@ static int setup_proc_entry( struct net_device *dev, | |||
4528 | entry->gid = proc_gid; | 4525 | entry->gid = proc_gid; |
4529 | 4526 | ||
4530 | /* Setup the Status */ | 4527 | /* Setup the Status */ |
4531 | entry = proc_create_data("Status", | 4528 | entry = proc_create_data("Status", S_IRUGO & proc_perm, |
4532 | S_IFREG | (S_IRUGO&proc_perm), | ||
4533 | apriv->proc_entry, &proc_status_ops, dev); | 4529 | apriv->proc_entry, &proc_status_ops, dev); |
4534 | if (!entry) | 4530 | if (!entry) |
4535 | goto fail_status; | 4531 | goto fail_status; |
@@ -4537,8 +4533,7 @@ static int setup_proc_entry( struct net_device *dev, | |||
4537 | entry->gid = proc_gid; | 4533 | entry->gid = proc_gid; |
4538 | 4534 | ||
4539 | /* Setup the Config */ | 4535 | /* Setup the Config */ |
4540 | entry = proc_create_data("Config", | 4536 | entry = proc_create_data("Config", proc_perm, |
4541 | S_IFREG | proc_perm, | ||
4542 | apriv->proc_entry, &proc_config_ops, dev); | 4537 | apriv->proc_entry, &proc_config_ops, dev); |
4543 | if (!entry) | 4538 | if (!entry) |
4544 | goto fail_config; | 4539 | goto fail_config; |
@@ -4546,8 +4541,7 @@ static int setup_proc_entry( struct net_device *dev, | |||
4546 | entry->gid = proc_gid; | 4541 | entry->gid = proc_gid; |
4547 | 4542 | ||
4548 | /* Setup the SSID */ | 4543 | /* Setup the SSID */ |
4549 | entry = proc_create_data("SSID", | 4544 | entry = proc_create_data("SSID", proc_perm, |
4550 | S_IFREG | proc_perm, | ||
4551 | apriv->proc_entry, &proc_SSID_ops, dev); | 4545 | apriv->proc_entry, &proc_SSID_ops, dev); |
4552 | if (!entry) | 4546 | if (!entry) |
4553 | goto fail_ssid; | 4547 | goto fail_ssid; |
@@ -4555,8 +4549,7 @@ static int setup_proc_entry( struct net_device *dev, | |||
4555 | entry->gid = proc_gid; | 4549 | entry->gid = proc_gid; |
4556 | 4550 | ||
4557 | /* Setup the APList */ | 4551 | /* Setup the APList */ |
4558 | entry = proc_create_data("APList", | 4552 | entry = proc_create_data("APList", proc_perm, |
4559 | S_IFREG | proc_perm, | ||
4560 | apriv->proc_entry, &proc_APList_ops, dev); | 4553 | apriv->proc_entry, &proc_APList_ops, dev); |
4561 | if (!entry) | 4554 | if (!entry) |
4562 | goto fail_aplist; | 4555 | goto fail_aplist; |
@@ -4564,8 +4557,7 @@ static int setup_proc_entry( struct net_device *dev, | |||
4564 | entry->gid = proc_gid; | 4557 | entry->gid = proc_gid; |
4565 | 4558 | ||
4566 | /* Setup the BSSList */ | 4559 | /* Setup the BSSList */ |
4567 | entry = proc_create_data("BSSList", | 4560 | entry = proc_create_data("BSSList", proc_perm, |
4568 | S_IFREG | proc_perm, | ||
4569 | apriv->proc_entry, &proc_BSSList_ops, dev); | 4561 | apriv->proc_entry, &proc_BSSList_ops, dev); |
4570 | if (!entry) | 4562 | if (!entry) |
4571 | goto fail_bsslist; | 4563 | goto fail_bsslist; |
@@ -4573,8 +4565,7 @@ static int setup_proc_entry( struct net_device *dev, | |||
4573 | entry->gid = proc_gid; | 4565 | entry->gid = proc_gid; |
4574 | 4566 | ||
4575 | /* Setup the WepKey */ | 4567 | /* Setup the WepKey */ |
4576 | entry = proc_create_data("WepKey", | 4568 | entry = proc_create_data("WepKey", proc_perm, |
4577 | S_IFREG | proc_perm, | ||
4578 | apriv->proc_entry, &proc_wepkey_ops, dev); | 4569 | apriv->proc_entry, &proc_wepkey_ops, dev); |
4579 | if (!entry) | 4570 | if (!entry) |
4580 | goto fail_wepkey; | 4571 | goto fail_wepkey; |
@@ -5706,9 +5697,7 @@ static int __init airo_init_module( void ) | |||
5706 | { | 5697 | { |
5707 | int i; | 5698 | int i; |
5708 | 5699 | ||
5709 | airo_entry = create_proc_entry("driver/aironet", | 5700 | airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL); |
5710 | S_IFDIR | airo_perm, | ||
5711 | NULL); | ||
5712 | 5701 | ||
5713 | if (airo_entry) { | 5702 | if (airo_entry) { |
5714 | airo_entry->uid = proc_uid; | 5703 | airo_entry->uid = proc_uid; |