Changeset 1666

Timestamp:

07/04/06 12:22:11 (3 years ago)

Author:

kelmo

Message:

This patch improves the ability of VAPs to handle proc entries.
Specifically it allows parts of the driver to register a proc entry
and appropriate handlers with the vap. The vap will then take care of
ensuring that this proc entry exists for the lifetime of the vap and
that it is correctly relocated if the vap is renamed.

Previously these tasks had to be handled by whatever registered the
proc entry, which promoted code duplication.

The list of proc entries for a specific vap is stored as a linked
list. Two new methods are added.

The first is used to add a proc entry to the vap. It is called
ieee80211_proc_vcreate.

• vap - pointer to the vap to create the entry for
  
• fileops - pointer to methods to handle read/writes from the entry.
  Any NULL entries in this structure will be substituted with
  default entries. These default entries will use a
  proc_ieee80211_priv structure to provide a list of associated
  stations. Typically a caller will only need to provide an open
  method to read the desired information into the read buffer of the
  proc_ieee80211_priv structure.
  
• name - the name for the proc entry
  

The second method (ieee80211_proc_cleanup) is only used internally
and cleans up the memory used by the linked list of proc entries
when the vap is destroyed. ieee80211_proc_vdetach cannot be used for
this purpose as it is used when a vap is being renamed. Were we to
deallocate the linked list in the vdetach method all registered proc
entries would be lost if a vap was renamed.

This patch will make it significantly easier to perform further
development to add more information to the proc interface.

Closes #728

Signed-off-by: Matt Brown <matt@mattb.net.nz>

Files:

• trunk/net80211/ieee80211.c (modified) (1 diff)
• trunk/net80211/ieee80211_linux.c (modified) (5 diffs)
• trunk/net80211/ieee80211_linux.h (modified) (1 diff)
• trunk/net80211/ieee80211_var.h (modified) (2 diffs)

trunk/net80211/ieee80211.c

@@ -579 +579 @@
-
-        ieee80211_sysctl_vdetach(vap);
+        ieee80211_proc_cleanup(vap);
-        ieee80211_ioctl_vdetach(vap);
-        ieee80211_vlan_vdetach(vap);

trunk/net80211/ieee80211_linux.c

@@ -319 +319 @@
-#ifdef CONFIG_SYSCTL
-
-#define MAX_PROC_IEEE80211_SIZE 16383
-#define PROC_IEEE80211_PERM 0644
-
-static struct proc_dir_entry *proc_madwifi;
-static int proc_madwifi_count = 0;
-
-/* XXX: Not the right place for such a declaration */
-struct proc_ieee80211_priv {
-     int rlen;
-     int max_rlen;
-     char *rbuf;
-
-     int wlen;
-     int max_wlen;
-     char *wbuf;
-};
-
-static int
@@ -599 +585 @@
-        int i, space;
-        char *devname = NULL;
+        struct ieee80211_proc_entry *tmp=NULL;
-        
-        space = 5 * sizeof(struct ctl_table) + sizeof(ieee80211_sysctl_template);
@@ -650 +637 @@
-        }
-
+        /* Ensure the base madwifi directory exists */
-        if (!proc_madwifi && proc_net != NULL) {
-                proc_madwifi = proc_mkdir("madwifi", proc_net);
@@ -656 +644 @@
-        }
-
+        /* Create a proc directory named after the VAP */
-        if (proc_madwifi) {
-                proc_madwifi_count++;
-                vap->iv_proc = proc_mkdir(vap->iv_dev->name, proc_madwifi);
+        }
+        
+        /* Create a proc entry listing the associated stations */
+        ieee80211_proc_vcreate(vap, &proc_ieee80211_ops, "associated_sta");
+
+        /* Recreate any other proc entries that have been registered */
-                if (vap->iv_proc) {
-
+
+
+
+
-                                PROC_IEEE80211_PERM, vap->iv_proc);
-
-
+
+
+
+
-                }
-        }
-}
-
+/* Frees all memory used for the list of proc entries */
+void 
+ieee80211_proc_cleanup(struct ieee80211vap *vap)
+{
+        struct ieee80211_proc_entry *tmp=vap->iv_proc_entries;
+        struct ieee80211_proc_entry *next = NULL;
+        while (tmp) {
+                next = tmp->next;
+                kfree(tmp);
+                tmp = next;
+        }
+}
+
+/* Called by other modules to register a proc entry under the vap directory */
+int 
+ieee80211_proc_vcreate(struct ieee80211vap *vap, 
+                struct file_operations *fileops, char *name)
+{
+        struct ieee80211_proc_entry *entry;
+        struct ieee80211_proc_entry *tmp=NULL;
+
+        /* Ignore if already in the list */
+        if (vap->iv_proc_entries) {
+                tmp = vap->iv_proc_entries;
+                do {
+                        if (strcmp(tmp->name, name)==0)
+                                return -1;
+                        /* Check for end of list */
+                        if (!tmp->next)
+                                break;
+                        /* Otherwise move on */
+                        tmp = tmp->next;
+                } while (1);
+        }
+        
+        /* Create an item in our list for the new entry */
+        entry = kmalloc(sizeof(struct ieee80211_proc_entry), GFP_KERNEL);
+        if (entry == NULL) {
+                printk("%s: no memory for new proc entry (%s)!\n", __func__, 
+                                name);
+                return -1;
+        }
+
+        /* Replace null fileops pointers with our standard functions */
+        if (!fileops->open)
+                fileops->open = proc_ieee80211_open;
+        if (!fileops->release)
+                fileops->release = proc_ieee80211_close;
+        if (!fileops->read)
+                fileops->read = proc_ieee80211_read;
+        if (!fileops->write)
+                fileops->write = proc_ieee80211_write;
+        
+        /* Create the entry record */
+        entry->name = name;
+        entry->fileops = fileops;
+        entry->next = NULL;
+        entry->entry = NULL;
+
+        /* Create the actual proc entry */
+        if (vap->iv_proc) {
+                entry->entry = create_proc_entry(entry->name, 
+                                PROC_IEEE80211_PERM, vap->iv_proc);
+                entry->entry->data = vap;
+                entry->entry->proc_fops = entry->fileops;
+        }
+
+        /* Add it to the list */
+        if (!tmp) {
+                /* Add to the start */
+                vap->iv_proc_entries = entry;
+        } else {
+                /* Add to the end */
+                tmp->next = entry;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(ieee80211_proc_vcreate);
+
-void
-ieee80211_sysctl_vdetach(struct ieee80211vap *vap)
-{
+        struct ieee80211_proc_entry *tmp=NULL;
+
-        if (vap->iv_sysctl_header) {
-                unregister_sysctl_table(vap->iv_sysctl_header);
@@ -677 +759 @@
-
-        if (vap->iv_proc) {
-
+
+
+
+
+
+
+
+
+
-                remove_proc_entry(vap->iv_proc->name, proc_madwifi);
-                if (proc_madwifi_count == 1) {

trunk/net80211/ieee80211_linux.h

@@ -480 +480 @@
-void ieee80211_sysctl_vattach(struct ieee80211vap *);
-void ieee80211_sysctl_vdetach(struct ieee80211vap *);
+int ieee80211_proc_vcreate(struct ieee80211vap *, struct file_operations *,
+               char *);
+void ieee80211_proc_cleanup(struct ieee80211vap *);
-#endif /* CONFIG_SYSCTL */
-

trunk/net80211/ieee80211_var.h

@@ -266 +266 @@
-};
-
+#ifdef CONFIG_SYSCTL
+#define MAX_PROC_IEEE80211_SIZE 16383
+#define PROC_IEEE80211_PERM 0644
+
+struct proc_ieee80211_priv {
+     int rlen;
+     int max_rlen;
+     char *rbuf;
+
+     int wlen;
+     int max_wlen;
+     char *wbuf;
+};
+
+struct ieee80211_proc_entry {
+        char *name;
+        struct file_operations *fileops;
+        struct proc_dir_entry *entry;
+        struct ieee80211_proc_entry *next;
+};
+#endif
+
-struct ieee80211vap {
-        struct net_device *iv_dev;              /* associated device */
@@ -276 +298 @@
-        struct ctl_table_header *iv_sysctl_header;
-        struct ctl_table *iv_sysctls;
-        struct proc_dir_entry *iv_proc_stations;
-        struct proc_dir_entry *iv_proc;
+        struct ieee80211_proc_entry *iv_proc_entries;
-#endif
-        struct vlan_group *iv_vlgrp;            /* vlan group state */