aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-04-11 19:38:51 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-05-01 17:29:18 -0400
commit271a15eabe094538d958dc68ccfc9c36b699247a (patch)
tree586e33f88cece63828614b2a2f0e92007064f024 /drivers/net/wireless
parent2f96b8c1d5d492c1d0457b253015330f844136f6 (diff)
proc: Supply PDE attribute setting accessor functions
Supply accessor functions to set attributes in proc_dir_entry structs. The following are supplied: proc_set_size() and proc_set_user(). Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> cc: linuxppc-dev@lists.ozlabs.org cc: linux-media@vger.kernel.org cc: netdev@vger.kernel.org cc: linux-wireless@vger.kernel.org cc: linux-pci@vger.kernel.org cc: netfilter-devel@vger.kernel.org cc: alsa-devel@alsa-project.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/airo.c34
1 files changed, 11 insertions, 23 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 66e398d4730d..21d02335b46f 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -4507,73 +4507,63 @@ static int setup_proc_entry( struct net_device *dev,
4507 airo_entry); 4507 airo_entry);
4508 if (!apriv->proc_entry) 4508 if (!apriv->proc_entry)
4509 goto fail; 4509 goto fail;
4510 apriv->proc_entry->uid = proc_kuid; 4510 proc_set_user(apriv->proc_entry, proc_kuid, proc_kgid);
4511 apriv->proc_entry->gid = proc_kgid;
4512 4511
4513 /* Setup the StatsDelta */ 4512 /* Setup the StatsDelta */
4514 entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm, 4513 entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm,
4515 apriv->proc_entry, &proc_statsdelta_ops, dev); 4514 apriv->proc_entry, &proc_statsdelta_ops, dev);
4516 if (!entry) 4515 if (!entry)
4517 goto fail_stats_delta; 4516 goto fail_stats_delta;
4518 entry->uid = proc_kuid; 4517 proc_set_user(entry, proc_kuid, proc_kgid);
4519 entry->gid = proc_kgid;
4520 4518
4521 /* Setup the Stats */ 4519 /* Setup the Stats */
4522 entry = proc_create_data("Stats", S_IRUGO & proc_perm, 4520 entry = proc_create_data("Stats", S_IRUGO & proc_perm,
4523 apriv->proc_entry, &proc_stats_ops, dev); 4521 apriv->proc_entry, &proc_stats_ops, dev);
4524 if (!entry) 4522 if (!entry)
4525 goto fail_stats; 4523 goto fail_stats;
4526 entry->uid = proc_kuid; 4524 proc_set_user(entry, proc_kuid, proc_kgid);
4527 entry->gid = proc_kgid;
4528 4525
4529 /* Setup the Status */ 4526 /* Setup the Status */
4530 entry = proc_create_data("Status", S_IRUGO & proc_perm, 4527 entry = proc_create_data("Status", S_IRUGO & proc_perm,
4531 apriv->proc_entry, &proc_status_ops, dev); 4528 apriv->proc_entry, &proc_status_ops, dev);
4532 if (!entry) 4529 if (!entry)
4533 goto fail_status; 4530 goto fail_status;
4534 entry->uid = proc_kuid; 4531 proc_set_user(entry, proc_kuid, proc_kgid);
4535 entry->gid = proc_kgid;
4536 4532
4537 /* Setup the Config */ 4533 /* Setup the Config */
4538 entry = proc_create_data("Config", proc_perm, 4534 entry = proc_create_data("Config", proc_perm,
4539 apriv->proc_entry, &proc_config_ops, dev); 4535 apriv->proc_entry, &proc_config_ops, dev);
4540 if (!entry) 4536 if (!entry)
4541 goto fail_config; 4537 goto fail_config;
4542 entry->uid = proc_kuid; 4538 proc_set_user(entry, proc_kuid, proc_kgid);
4543 entry->gid = proc_kgid;
4544 4539
4545 /* Setup the SSID */ 4540 /* Setup the SSID */
4546 entry = proc_create_data("SSID", proc_perm, 4541 entry = proc_create_data("SSID", proc_perm,
4547 apriv->proc_entry, &proc_SSID_ops, dev); 4542 apriv->proc_entry, &proc_SSID_ops, dev);
4548 if (!entry) 4543 if (!entry)
4549 goto fail_ssid; 4544 goto fail_ssid;
4550 entry->uid = proc_kuid; 4545 proc_set_user(entry, proc_kuid, proc_kgid);
4551 entry->gid = proc_kgid;
4552 4546
4553 /* Setup the APList */ 4547 /* Setup the APList */
4554 entry = proc_create_data("APList", proc_perm, 4548 entry = proc_create_data("APList", proc_perm,
4555 apriv->proc_entry, &proc_APList_ops, dev); 4549 apriv->proc_entry, &proc_APList_ops, dev);
4556 if (!entry) 4550 if (!entry)
4557 goto fail_aplist; 4551 goto fail_aplist;
4558 entry->uid = proc_kuid; 4552 proc_set_user(entry, proc_kuid, proc_kgid);
4559 entry->gid = proc_kgid;
4560 4553
4561 /* Setup the BSSList */ 4554 /* Setup the BSSList */
4562 entry = proc_create_data("BSSList", proc_perm, 4555 entry = proc_create_data("BSSList", proc_perm,
4563 apriv->proc_entry, &proc_BSSList_ops, dev); 4556 apriv->proc_entry, &proc_BSSList_ops, dev);
4564 if (!entry) 4557 if (!entry)
4565 goto fail_bsslist; 4558 goto fail_bsslist;
4566 entry->uid = proc_kuid; 4559 proc_set_user(entry, proc_kuid, proc_kgid);
4567 entry->gid = proc_kgid;
4568 4560
4569 /* Setup the WepKey */ 4561 /* Setup the WepKey */
4570 entry = proc_create_data("WepKey", proc_perm, 4562 entry = proc_create_data("WepKey", proc_perm,
4571 apriv->proc_entry, &proc_wepkey_ops, dev); 4563 apriv->proc_entry, &proc_wepkey_ops, dev);
4572 if (!entry) 4564 if (!entry)
4573 goto fail_wepkey; 4565 goto fail_wepkey;
4574 entry->uid = proc_kuid; 4566 proc_set_user(entry, proc_kuid, proc_kgid);
4575 entry->gid = proc_kgid;
4576
4577 return 0; 4567 return 0;
4578 4568
4579fail_wepkey: 4569fail_wepkey:
@@ -5695,10 +5685,8 @@ static int __init airo_init_module( void )
5695 5685
5696 airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL); 5686 airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);
5697 5687
5698 if (airo_entry) { 5688 if (airo_entry)
5699 airo_entry->uid = proc_kuid; 5689 proc_set_user(airo_entry, proc_kuid, proc_kgid);
5700 airo_entry->gid = proc_kgid;
5701 }
5702 5690
5703 for (i = 0; i < 4 && io[i] && irq[i]; i++) { 5691 for (i = 0; i < 4 && io[i] && irq[i]; i++) {
5704 airo_print_info("", "Trying to configure ISA adapter at irq=%d " 5692 airo_print_info("", "Trying to configure ISA adapter at irq=%d "