Use Linux 3.17 4-argument alloc_netdev(), provide compatibility code

[madwifi/.git] / ath / if_ath_ahb.c

diff --git a/ath/if_ath_ahb.c b/ath/if_ath_ahb.c
index eab9f7b5f6e91ab2badc6819db8b6c1d39245596..59c6579671baff4aad836c57cbff7db932e1abae 100644 (file)
--- a/ath/if_ath_ahb.c
+++ b/ath/if_ath_ahb.c
@@ -10,7 +10,7 @@
 #define        EXPORT_SYMTAB
 #endif
 
-#ifndef AUTOCONF_INCLUDED
+#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION)
 #include <linux/config.h>
 #endif
 #include <linux/version.h>
@@ -21,6 +21,7 @@
 #include <linux/cache.h>
 #include <linux/platform_device.h>
 #include <linux/ethtool.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -33,8 +34,8 @@
 #include "if_ath_ahb.h"
 #include "ah_soc.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-#error "Kernel versions older than 2.6.19 are not supported!"
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#error "Kernel versions older than 2.6.15 are not supported!"
 #endif
 
 /*
@@ -44,14 +45,7 @@
 static char *version = RELEASE_VERSION;
 static char *dev_info = "ath_ahb";
 
-struct ath_ahb_softc {
-       struct ath_softc        aps_sc;
-#ifdef CONFIG_PM
-       u32 aps_pmstate[16];
-#endif
-};
-
-static struct ath_ahb_softc *sclist[2] = {NULL, NULL};
+static struct ath_softc *sclist[2] = {NULL, NULL};
 static u_int8_t num_activesc = 0;
 
 
@@ -161,18 +155,18 @@ ahb_disable_wmac(u_int16_t devid, u_int16_t wlanNum)
 static int
 exit_ath_wmac(u_int16_t wlanNum, struct ar531x_config *config)
 {
-       struct ath_ahb_softc *sc = sclist[wlanNum];
+       struct ath_softc *sc = sclist[wlanNum];
        struct net_device *dev;
        u_int16_t devid;
 
        if (sc == NULL)
                return -ENODEV; /* XXX: correct return value? */
 
-       dev = sc->aps_sc.sc_dev;
+       dev = sc->sc_dev;
        ath_detach(dev);
        if (dev->irq)
                free_irq(dev->irq, dev);
-       devid = sc->aps_sc.devid;
+       devid = sc->devid;
        config->tag = (void *)((unsigned long) devid);
 
        ahb_disable_wmac(devid, wlanNum);
@@ -186,7 +180,7 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
 {
        const char *athname;
        struct net_device *dev;
-       struct ath_ahb_softc *sc;
+       struct ath_softc *sc;
 
        if (((wlanNum != 0) && (wlanNum != 1)) ||
                (sclist[wlanNum] != NULL))
@@ -194,19 +188,20 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
 
        ahb_enable_wmac(devid, wlanNum);
 
-       dev = alloc_netdev(sizeof(struct ath_ahb_softc), "wifi%d", ether_setup);
+       dev = alloc_netdev(sizeof(struct ath_softc), "wifi%d", NET_NAME_UNKNOWN,
+                          ether_setup);
        if (dev == NULL) {
                printk(KERN_ERR "%s: no memory for device state\n", dev_info);
                goto bad2;
        }
        sc = netdev_priv(dev);
-       sc->aps_sc.sc_dev = dev;
+       sc->sc_dev = dev;
 
        /*
         * Mark the device as detached to avoid processing
         * interrupts until setup is complete.
         */
-       sc->aps_sc.sc_invalid = 1;
+       sc->sc_invalid = 1;
        SET_MODULE_OWNER(dev);
        sclist[wlanNum] = sc;
 
@@ -229,8 +224,8 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
                goto bad3;
        }
        dev->mem_end = dev->mem_start + AR531X_WLANX_LEN;
-       sc->aps_sc.sc_iobase = (void __iomem *)dev->mem_start;
-       sc->aps_sc.sc_bdev = NULL;
+       sc->sc_iobase = (void __iomem *)dev->mem_start;
+       sc->sc_bdev = NULL;
 
        if (request_irq(dev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) {
                printk(KERN_WARNING "%s: %s: request_irq failed\n", dev_info, dev->name);
@@ -245,7 +240,7 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
        num_activesc++;
        /* Ready to process interrupts */
 
-       sc->aps_sc.sc_invalid = 0;
+       sc->sc_invalid = 0;
        return 0;
 
  bad4: