Ticket #203: imr-renaming-patch-r2.diff

net80211/ieee80211_linux.c

@@ -579 +579 @@
-{
-        int i, space;
-
+        char *devname = NULL;
-        space = 5*sizeof(struct ctl_table) + sizeof(ieee80211_sysctl_template);
-        vap->iv_sysctls = kmalloc(space, GFP_KERNEL);
-        if (vap->iv_sysctls == NULL) {
@@ -586 +587 @@
-                return;
-        }
-
+        /* Reserve space for the device name outside the net_device structure
+         * so that if the name changes we know what it used to be. 
+         */
+        devname = kmalloc((strlen(vap->iv_dev->name) + 1) * sizeof(char), GFP_KERNEL);
+        if(devname == NULL) {
+                printk("%s: no memory for VAP name!\n", __func__);
+                return;
+        }
+        strncpy(devname, vap->iv_dev->name, strlen(vap->iv_dev->name) + 1);
-        /* setup the table */
-        memset(vap->iv_sysctls, 0, space);
-        vap->iv_sysctls[0].ctl_name = CTL_NET;
@@ -594 +604 @@
-        vap->iv_sysctls[0].child = &vap->iv_sysctls[2];
-        /* [1] is NULL terminator */
-        vap->iv_sysctls[2].ctl_name = CTL_AUTO;
-
+devname;//
-        vap->iv_sysctls[2].mode = 0555;
-        vap->iv_sysctls[2].child = &vap->iv_sysctls[4];
-        /* [3] is NULL terminator */
@@ -630 +640 @@
-
-        if (proc_madwifi) {
-                proc_madwifi_count++;
-vap->iv_dev->
+dev
-                if (vap->iv_proc) {
-                        vap->iv_proc_stations = create_proc_entry("associated_sta",
-                                                                  PROC_IEEE80211_PERM, vap->iv_proc);
@@ -640 +650 @@
-        }
-
-}
+EXPORT_SYMBOL(ieee80211_sysctl_vattach);
-
-void
-ieee80211_sysctl_vdetach(struct ieee80211vap *vap)
@@ -648 +659 @@
-                unregister_sysctl_table(vap->iv_sysctl_header);
-                vap->iv_sysctl_header = NULL;
-        }
-
-
-
-
-
+
-        if (vap->iv_proc) {
-                remove_proc_entry("associated_sta", vap->iv_proc);
-dev->
+sysctls[2].proc
-                if (proc_madwifi_count == 1) {
-                        remove_proc_entry("madwifi", proc_net);
-                        
+                       
-                }
-                
+               
-        }
-
+        if(vap->iv_sysctls[2].procname) {
+                kfree(vap->iv_sysctls[2].procname);
+                vap->iv_sysctls[2].procname = NULL;
+        }
+        
+        if (vap->iv_sysctls) {
+                kfree(vap->iv_sysctls);
+                vap->iv_sysctls = NULL;
+        }
+
-}
+EXPORT_SYMBOL(ieee80211_sysctl_vdetach);
-#endif /* CONFIG_SYSCTL */
-
-/*

ath/if_ath_ahb.c

@@ -421 +421 @@
-MODULE_LICENSE("Dual BSD/GPL");
-#endif
-
+static struct notifier_block ath_dev_notifier = {
+        .notifier_call = ath_rcv_dev_event,
+};
+
-static int __init
-init_ath_ahb(void)
-{
-        printk(KERN_INFO "%s: %s\n", dev_info, version);
-
+        /* Initialise the interface list so we can record
+         * which devices we need to maintain proc entries for.
+         */
+        ath_initialise_interface_list();
-        if (init_ahb() != 0) {
-                printk("ath_ahb: No devices found, driver not installed.\n");
-                return (-ENODEV);
@@ -433 +441 @@
-#ifdef CONFIG_SYSCTL
-        ath_sysctl_register();
-#endif
+
+        /* Register for netdevice events so we can maintain
+         * the proc entries when interface names change.
+         */
+        register_netdevice_notifier(&ath_dev_notifier);
-        return (0);
-}
-module_init(init_ath_ahb);
@@ -440 +453 @@
-static void __exit
-exit_ath_ahb(void)
-{
+        /* We're unloading, so we need to unregister our interest
+         * in netdevice notifications.
+         */
+        unregister_netdevice_notifier(&ath_dev_notifier);
-#ifdef CONFIG_SYSCTL
-        ath_sysctl_unregister();
-#endif
-        exit_ath_wmac(AR531X_WLAN0_NUM);
-        exit_ath_wmac(AR531X_WLAN1_NUM);
-
+        /* The list will no longer be being modified, so we
+         * can clean it up and remove any memory that is still
+         * being used by it.
+         */
+        ath_cleanup_interface_list();
+        
-        printk(KERN_INFO "%s: driver unloaded\n", dev_info);
-}
-module_exit(exit_ath_ahb);

ath/if_ath_pci.c

@@ -320 +320 @@
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,22)
-        /* include the device name so later versions of kudzu DTRT */
-        strncpy(info.bus_info, pci_name((struct pci_dev *)sc->sc_bdev),
-               
+
-#endif
-        return copy_to_user(addr, &info, sizeof(info)) ? -EFAULT : 0;
-}
@@ -332 +332 @@
-MODULE_LICENSE("Dual BSD/GPL");
-#endif
-
+static struct notifier_block ath_dev_notifier = {
+        .notifier_call = ath_rcv_dev_event,
+};
+
-static int __init
-init_ath_pci(void)
-{
-        printk(KERN_INFO "%s: %s\n", dev_info, version);
-
+        /* Setup the list of interfaces that interest us
+         * so they can be recorded when they are created.
+         */
+        ath_initialise_interface_list();
+        
-        if (pci_register_driver(&ath_pci_drv_id) < 0) {
-                printk("ath_pci: No devices found, driver not installed.\n");
-                pci_unregister_driver(&ath_pci_drv_id);
-                return (-ENODEV);
-        }
+
+        /* Register for netdevice notifications so we can maintain
+         * the proc entries correctly.
+         */
+        register_netdevice_notifier(&ath_dev_notifier);
-#ifdef CONFIG_SYSCTL
-        ath_sysctl_register();
-#endif
@@ -355 +369 @@
-#ifdef CONFIG_SYSCTL
-        ath_sysctl_unregister();
-#endif
+        /* The module is unloading, so we need to unregister our
+         * interest in netdevice notifications.
+         */
+        unregister_netdevice_notifier(&ath_dev_notifier);
-        pci_unregister_driver(&ath_pci_drv_id);
-
+        /* The interfaces list will no longer be modified, so 
+         * clean up any memory used by it.
+         */
+        ath_cleanup_interface_list();
-        printk(KERN_INFO "%s: driver unloaded\n", dev_info);
-}
-module_exit(exit_ath_pci);

ath/if_athvar.h

@@ -664 +664 @@
-void    ath_sysctl_unregister(void);
-#endif /* CONFIG_SYSCTL */
-
+/* Device Event Notification */
+int ath_rcv_dev_event(struct notifier_block *, unsigned long, void *);
+
+/* Interface List preperatation */
+struct ath_interfaces_list {
+        struct list_head list;
+        struct net_device *dev;
+        unsigned char type;
+};
+
+void ath_initialise_interface_list(void);
+void ath_cleanup_interface_list(void);
+
-/*
- * HAL definitions to comply with local coding convention.
- */

ath/if_ath.c

@@ -68 +68 @@
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_monitor.h>
-
+#include <net80211/ieee80211_linux.h>
+
-#ifdef USE_HEADERLEN_RESV
-#include <net80211/if_llc.h>
-#endif
@@ -381 +383 @@
-        }                                   \
-    } while(0)
-
+struct ath_interfaces_list interface_list;
+
+/*
+ * Initialises the list of interfaces to watch for when
+ * we recieve device notifier events.
+ */
+
+void ath_initialise_interface_list()
+{
+        INIT_LIST_HEAD(&interface_list.list);
+}
+
+
+/*
+ * Goes through the interface list deleting all entries and
+ * freeing any memory allocated to them.
+ * Done when the module is being unloaded.
+ */
+void ath_cleanup_interface_list()
+{
+        struct list_head *pos, *q;
+        struct ath_interfaces_list *tmp;
+        
+        list_for_each_safe(pos, q, &(interface_list.list)) {
+                tmp = list_entry(pos, struct ath_interfaces_list, list);
+                list_del(pos);
+                kfree(tmp);
+        }
+}
+
+/* Function to handle the device event notifications.
+ * If the event is a NETDEV_CHANGENAME, and is for an interface
+ * we are taking care of, then we want to remove it's existing 
+ * proc entries (which now have the wrong names) and add
+ * new, correct, entries.
+ */
-int
+ath_rcv_dev_event(struct notifier_block *this, unsigned long event,
+                void *ptr)
+{
+        struct net_device *dev = ptr;
+        struct ath_interfaces_list *tmp = NULL;
+
+#ifdef CONFIG_SYSCTL
+        switch (event) {
+                case NETDEV_CHANGE:
+                        break;
+                case NETDEV_CHANGENAME:
+                        /* In here, we want to register and deregister
+                         * the sysctls, effectively moving
+                         * the proc entries to the correct place.
+                         */
+                        list_for_each_entry(tmp, &interface_list.list, list) {
+                                /* If this is a device in our list of
+                                 * devices to watch for: 
+                                 */
+                                if(tmp->dev != dev) 
+                                        break;
+                                
+                                /* If the type is 0, then it
+                                 * a base interface (typically wifi%d)
+                                 * then we handle it with one
+                                 * set of functions
+                                 */
+                                if(tmp->type == 0) {
+                                        ath_dynamic_sysctl_unregister(
+                                                        dev->priv);
+                                        ath_dynamic_sysctl_register(
+                                                        dev->priv);
+                                }
+                                /* If the type is 1 it's a VAP
+                                 * and so we use a different set.
+                                 */
+                                else if(tmp->type == 1) {
+                                        ieee80211_sysctl_vdetach(dev->priv);
+                                        ieee80211_sysctl_vattach(dev->priv);
+                                }
+                        }
+                        break;
+        }
+#endif /* CONFIG_SYSCTL */
+        return NOTIFY_DONE;
+}
+
+
+
+int
-ath_attach(u_int16_t devid, struct net_device *dev)
-{
-        struct ath_softc *sc = dev->priv;
@@ -391 +479 @@
-        int error = 0,i;
-        u_int8_t csz;
-
+        struct ath_interfaces_list *tmp = NULL;
+        
-        sc->sc_debug = ath_debug;
-        DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid);
-
@@ -853 +943 @@
-                printk(KERN_ERR "%s: unable to register device\n", dev->name);
-                goto bad3;
-        }
+
+        /* interfaces list is definately setup now, so add the new
+         * device to the list. */
+
+        tmp = (struct ath_interfaces_list *)kmalloc(
+                        sizeof(struct ath_interfaces_list), GFP_KERNEL);
+        if(tmp == NULL) {
+                printk(KERN_ERR "%s: unable to allocate space for interface list\n"
+                                , dev->name);
+                goto bad3;
+        }
+        tmp->dev = dev;
+        tmp->type = 0;
+        list_add(&(tmp->list), &(interface_list.list));
-        /*
-         * Attach dynamic MIB vars and announce support
-         * now that we have a device name with unit number.
@@ -888 +992 @@
-        struct ath_softc *sc = dev->priv;
-        struct ath_hal *ah = sc->sc_ah;
-
+        
-        DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);
-        ath_stop(dev);
-
@@ -939 +1044 @@
-        struct ieee80211vap *vap;
-        int ic_opmode;
-
+        struct ath_interfaces_list *tmp = NULL;
+        
-        /* XXX ic unlocked and race against add */
-        switch (opmode) {
-        case IEEE80211_M_STA:   /* ap+sta for repeater application */
@@ -992 +1099 @@
-        }
-        avp = dev->priv;
-        ieee80211_vap_setup(ic, dev, name, unit, opmode, flags);
+        tmp = (struct ath_interfaces_list *)kmalloc(
+                        sizeof(struct ath_interfaces_list), GFP_KERNEL);
+        if(tmp == NULL) {
+                return NULL;
+        }
+        tmp->dev = dev;
+        tmp->type = 1;
+        list_add(&(tmp->list), &(interface_list.list));
-        /* override with driver methods */
-        vap = &avp->av_vap;
-        avp->av_newstate = vap->iv_newstate;
@@ -1138 +1253 @@
-        struct ath_hal *ah = sc->sc_ah;
-        struct ath_vap *avp = ATH_VAP(vap);
-        int decrease = 1;
+
+
+        struct ath_interfaces_list *tmp = NULL;
+        struct list_head *pos, *q;
-        KASSERT(vap->iv_state == IEEE80211_S_INIT, ("vap not stopped"));
-
-        if (dev->flags & IFF_RUNNING) {
@@ -1184 +1303 @@
-                decrease = 0;
-        }
-        ieee80211_vap_detach(vap);
+        list_for_each_safe(pos,q,&(interface_list.list)) {
+                tmp= list_entry(pos, struct ath_interfaces_list, list);
+                if(tmp->dev == dev) {
+                        list_del(pos);
+                        kfree(tmp);
+                }
+        }
-        /* NB: memory is reclaimed through dev->destructor callback */
-        if (decrease)
-                sc->sc_nvaps--;
@@ -9218 +9344 @@
-{
-        int i, space;
-
+        /* Space for the dev->name */
+        char *dev_name = NULL;
-        space = 5*sizeof(struct ctl_table) + sizeof(ath_sysctl_template);
-        sc->sc_sysctls = kmalloc(space, GFP_KERNEL);
-        if (sc->sc_sysctls == NULL) {
@@ -9225 +9353 @@
-                return;
-        }
-
+        /* We want to reserve space for the name of the device seperate
+         * to the net_device structure, because when the name is changed
+         * it is changed in the net_device structure and the message given
+         * out.  Thus we won't know what the name used to be if we rely
+         * on it.
+         */
+        dev_name = kmalloc((strlen(sc->sc_dev->name) + 1) * sizeof(char), GFP_KERNEL);
+        if (dev_name == NULL) {
+                printk("%s: no memory for device name storage!\n", __func__);
+                return;
+        }
+        strncpy(dev_name, sc->sc_dev->name, strlen(sc->sc_dev->name) + 1);
-        /* setup the table */
-        memset(sc->sc_sysctls, 0, space);
-        sc->sc_sysctls[0].ctl_name = CTL_DEV;
@@ -9233 +9373 @@
-        sc->sc_sysctls[0].child = &sc->sc_sysctls[2];
-        /* [1] is NULL terminator */
-        sc->sc_sysctls[2].ctl_name = CTL_AUTO;
-sc->sc_dev->
+dev_
-        sc->sc_sysctls[2].mode = 0555;
-        sc->sc_sysctls[2].child = &sc->sc_sysctls[4];
-        /* [3] is NULL terminator */
@@ -9267 +9407 @@
-                unregister_sysctl_table(sc->sc_sysctl_header);
-                sc->sc_sysctl_header = NULL;
-        }
+        if(sc->sc_sysctls[2].procname) {
+                kfree(sc->sc_sysctls[2].procname);
+                sc->sc_sysctls[2].procname = NULL;
+        }
-        if (sc->sc_sysctls) {
-                kfree(sc->sc_sysctls);
-                sc->sc_sysctls = NULL;