Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
  [NET]: Fix and allocate less memory for ->priv'less netdevices
  [IPV6]: Fix dangling references on error in fib6_add().
  [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
  [PKT_SCHED]: Fix datalen check in tcf_simp_init().
  [INET]: Uninline the __inet_inherit_port call.
  [INET]: Drop the inet_inherit_port() call.
  SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
  [netdrvr] forcedeth: internal simplifications; changelog removal
  phylib: factor out get_phy_id from within get_phy_device
  PHY: add BCM5464 support to broadcom PHY driver
  cxgb3: Fix __must_check warning with dev_dbg.
  tc35815: Statistics cleanup
  natsemi: fix MMIO for PPC 44x platforms
  [TIPC]: Cleanup of TIPC reference table code
  [TIPC]: Optimized initialization of TIPC reference table
  [TIPC]: Remove inlining of reference table locking routines
  e1000: convert uint16_t style integers to u16
  ixgb: convert uint16_t style integers to u16
  sb1000.c: make const arrays static
  sb1000.c: stop inlining largish static functions
  ...

375 files changed, 33895 insertions, 86245 deletions

diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 8fafac987e0b..54dac0696d91 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -54,25 +54,24 @@
                 v1.19a 28Oct2002 Davud Ruggiero <jdr@farfalle.com>
                         - Increase *read_eeprom udelay to workaround oops with 2 cards.
                 v1.19b 08Nov2002 Marc Zyngier <maz@wild-wind.fr.eu.org>
-                    - Introduce driver model for EISA cards.
+                        - Introduce driver model for EISA cards.
+                v1.20  04Feb2008 Ondrej Zary <linux@rainbow-software.org>
+                        - convert to isa_driver and pnp_driver and some cleanups
 */
 
 #define DRV_NAME        "3c509"
-#define DRV_VERSION     "1.19b"
-#define DRV_RELDATE     "08Nov2002"
+#define DRV_VERSION     "1.20"
+#define DRV_RELDATE     "04Feb2008"
 
 /* A few values that may be tweaked. */
 
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT  (400*HZ/1000)
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 10;
 
 #include <linux/module.h>
-#ifdef CONFIG_MCA
 #include <linux/mca.h>
-#endif
-#include <linux/isapnp.h>
+#include <linux/isa.h>
+#include <linux/pnp.h>
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
@@ -97,10 +96,6 @@ static int max_interrupt_work = 10;
 
 static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
 
-#if defined(CONFIG_PM) && (defined(CONFIG_MCA) || defined(CONFIG_EISA))
-#define EL3_SUSPEND
-#endif
-
 #ifdef EL3_DEBUG
 static int el3_debug = EL3_DEBUG;
 #else
@@ -111,6 +106,7 @@ static int el3_debug = 2;
  * a global variable so that the mca/eisa probe routines can increment
  * it */
 static int el3_cards = 0;
+#define EL3_MAX_CARDS 8
 
 /* To minimize the size of the driver source I only define operating
    constants if they are used several times.  You'll need the manual
@@ -119,7 +115,7 @@ static int el3_cards = 0;
 #define EL3_DATA 0x00
 #define EL3_CMD 0x0e
 #define EL3_STATUS 0x0e
-#define  EEPROM_READ 0x80
+#define EEPROM_READ 0x80
 
 #define EL3_IO_EXTENT   16
 
@@ -168,23 +164,31 @@ enum RxFilter {
  */
 #define SKB_QUEUE_SIZE  64
 
+enum el3_cardtype { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA };
+
 struct el3_private {
         struct net_device_stats stats;
-        struct net_device *next_dev;
         spinlock_t lock;
         /* skb send-queue */
         int head, size;
         struct sk_buff *queue[SKB_QUEUE_SIZE];
-        enum {
-                EL3_MCA,
-                EL3_PNP,
-                EL3_EISA,
-        } type;                                         /* type of device */
-        struct device *dev;
+        enum el3_cardtype type;
 };
-static int id_port __initdata = 0x110;  /* Start with 0x110 to avoid new sound cards.*/
-static struct net_device *el3_root_dev;
+static int id_port;
+static int current_tag;
+static struct net_device *el3_devs[EL3_MAX_CARDS];
+
+/* Parameters that may be passed into the module. */
+static int debug = -1;
+static int irq[] = {-1, -1, -1, -1, -1, -1, -1, -1};
+/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
+static int max_interrupt_work = 10;
+#ifdef CONFIG_PNP
+static int nopnp;
+#endif
 
+static int __init el3_common_init(struct net_device *dev);
+static void el3_common_remove(struct net_device *dev);
 static ushort id_read_eeprom(int index);
 static ushort read_eeprom(int ioaddr, int index);
 static int el3_open(struct net_device *dev);
@@ -199,7 +203,7 @@ static void el3_tx_timeout (struct net_device *dev);
 static void el3_down(struct net_device *dev);
 static void el3_up(struct net_device *dev);
 static const struct ethtool_ops ethtool_ops;
-#ifdef EL3_SUSPEND
+#ifdef CONFIG_PM
 static int el3_suspend(struct device *, pm_message_t);
 static int el3_resume(struct device *);
 #else
@@ -209,13 +213,272 @@ static int el3_resume(struct device *);
 
 
 /* generic device remove for all device types */
-#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
 static int el3_device_remove (struct device *device);
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void el3_poll_controller(struct net_device *dev);
 #endif
 
+/* Return 0 on success, 1 on error, 2 when found already detected PnP card */
+static int el3_isa_id_sequence(__be16 *phys_addr)
+{
+        short lrs_state = 0xff;
+        int i;
+
+        /* ISA boards are detected by sending the ID sequence to the
+           ID_PORT.  We find cards past the first by setting the 'current_tag'
+           on cards as they are found.  Cards with their tag set will not
+           respond to subsequent ID sequences. */
+
+        outb(0x00, id_port);
+        outb(0x00, id_port);
+        for (i = 0; i < 255; i++) {
+                outb(lrs_state, id_port);
+                lrs_state <<= 1;
+                lrs_state = lrs_state & 0x100 ? lrs_state ^ 0xcf : lrs_state;
+        }
+        /* For the first probe, clear all board's tag registers. */
+        if (current_tag == 0)
+                outb(0xd0, id_port);
+        else                    /* Otherwise kill off already-found boards. */
+                outb(0xd8, id_port);
+        if (id_read_eeprom(7) != 0x6d50)
+                return 1;
+        /* Read in EEPROM data, which does contention-select.
+           Only the lowest address board will stay "on-line".
+           3Com got the byte order backwards. */
+        for (i = 0; i < 3; i++)
+                phys_addr[i] = htons(id_read_eeprom(i));
+#ifdef CONFIG_PNP
+        if (!nopnp) {
+                /* The ISA PnP 3c509 cards respond to the ID sequence too.
+                   This check is needed in order not to register them twice. */
+                for (i = 0; i < el3_cards; i++) {
+                        struct el3_private *lp = netdev_priv(el3_devs[i]);
+                        if (lp->type == EL3_PNP
+                            && !memcmp(phys_addr, el3_devs[i]->dev_addr,
+                                       ETH_ALEN)) {
+                                if (el3_debug > 3)
+                                        printk(KERN_DEBUG "3c509 with address %02x %02x %02x %02x %02x %02x was found by ISAPnP\n",
+                                                phys_addr[0] & 0xff, phys_addr[0] >> 8,
+                                                phys_addr[1] & 0xff, phys_addr[1] >> 8,
+                                                phys_addr[2] & 0xff, phys_addr[2] >> 8);
+                                /* Set the adaptor tag so that the next card can be found. */
+                                outb(0xd0 + ++current_tag, id_port);
+                                return 2;
+                        }
+                }
+        }
+#endif /* CONFIG_PNP */
+        return 0;
+
+}
+
+static void __devinit el3_dev_fill(struct net_device *dev, __be16 *phys_addr,
+                                   int ioaddr, int irq, int if_port,
+                                   enum el3_cardtype type)
+{
+        struct el3_private *lp = netdev_priv(dev);
+
+        memcpy(dev->dev_addr, phys_addr, ETH_ALEN);
+        dev->base_addr = ioaddr;
+        dev->irq = irq;
+        dev->if_port = if_port;
+        lp->type = type;
+}
+
+static int __devinit el3_isa_match(struct device *pdev,
+                                   unsigned int ndev)
+{
+        struct net_device *dev;
+        int ioaddr, isa_irq, if_port, err;
+        unsigned int iobase;
+        __be16 phys_addr[3];
+
+        while ((err = el3_isa_id_sequence(phys_addr)) == 2)
+                ;       /* Skip to next card when PnP card found */
+        if (err == 1)
+                return 0;
+
+        iobase = id_read_eeprom(8);
+        if_port = iobase >> 14;
+        ioaddr = 0x200 + ((iobase & 0x1f) << 4);
+        if (irq[el3_cards] > 1 && irq[el3_cards] < 16)
+                isa_irq = irq[el3_cards];
+        else
+                isa_irq = id_read_eeprom(9) >> 12;
+
+        dev = alloc_etherdev(sizeof(struct el3_private));
+        if (!dev)
+                return -ENOMEM;
+
+        netdev_boot_setup_check(dev);
+
+        if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) {
+                free_netdev(dev);
+                return 0;
+        }
+
+        /* Set the adaptor tag so that the next card can be found. */
+        outb(0xd0 + ++current_tag, id_port);
+
+        /* Activate the adaptor at the EEPROM location. */
+        outb((ioaddr >> 4) | 0xe0, id_port);
+
+        EL3WINDOW(0);
+        if (inw(ioaddr) != 0x6d50) {
+                free_netdev(dev);
+                return 0;
+        }
+
+        /* Free the interrupt so that some other card can use it. */
+        outw(0x0f00, ioaddr + WN0_IRQ);
+
+        el3_dev_fill(dev, phys_addr, ioaddr, isa_irq, if_port, EL3_ISA);
+        dev_set_drvdata(pdev, dev);
+        if (el3_common_init(dev)) {
+                free_netdev(dev);
+                return 0;
+        }
+
+        el3_devs[el3_cards++] = dev;
+        return 1;
+}
+
+static int __devexit el3_isa_remove(struct device *pdev,
+                                    unsigned int ndev)
+{
+        el3_device_remove(pdev);
+        dev_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int el3_isa_suspend(struct device *dev, unsigned int n,
+                           pm_message_t state)
+{
+        current_tag = 0;
+        return el3_suspend(dev, state);
+}
+
+static int el3_isa_resume(struct device *dev, unsigned int n)
+{
+        struct net_device *ndev = dev_get_drvdata(dev);
+        int ioaddr = ndev->base_addr, err;
+        __be16 phys_addr[3];
+
+        while ((err = el3_isa_id_sequence(phys_addr)) == 2)
+                ;       /* Skip to next card when PnP card found */
+        if (err == 1)
+                return 0;
+        /* Set the adaptor tag so that the next card can be found. */
+        outb(0xd0 + ++current_tag, id_port);
+        /* Enable the card */
+        outb((ioaddr >> 4) | 0xe0, id_port);
+        EL3WINDOW(0);
+        if (inw(ioaddr) != 0x6d50)
+                return 1;
+        /* Free the interrupt so that some other card can use it. */
+        outw(0x0f00, ioaddr + WN0_IRQ);
+        return el3_resume(dev);
+}
+#endif
+
+static struct isa_driver el3_isa_driver = {
+        .match          = el3_isa_match,
+        .remove         = __devexit_p(el3_isa_remove),
+#ifdef CONFIG_PM
+        .suspend        = el3_isa_suspend,
+        .resume         = el3_isa_resume,
+#endif
+        .driver         = {
+                .name   = "3c509"
+        },
+};
+static int isa_registered;
+
+#ifdef CONFIG_PNP
+static struct pnp_device_id el3_pnp_ids[] = {
+        { .id = "TCM5090" }, /* 3Com Etherlink III (TP) */
+        { .id = "TCM5091" }, /* 3Com Etherlink III */
+        { .id = "TCM5094" }, /* 3Com Etherlink III (combo) */
+        { .id = "TCM5095" }, /* 3Com Etherlink III (TPO) */
+        { .id = "TCM5098" }, /* 3Com Etherlink III (TPC) */
+        { .id = "PNP80f7" }, /* 3Com Etherlink III compatible */
+        { .id = "PNP80f8" }, /* 3Com Etherlink III compatible */
+        { .id = "" }
+};
+MODULE_DEVICE_TABLE(pnp, el3_pnp_ids);
+
+static int __devinit el3_pnp_probe(struct pnp_dev *pdev,
+                                    const struct pnp_device_id *id)
+{
+        short i;
+        int ioaddr, irq, if_port;
+        u16 phys_addr[3];
+        struct net_device *dev = NULL;
+        int err;
+
+        ioaddr = pnp_port_start(pdev, 0);
+        if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-pnp"))
+                return -EBUSY;
+        irq = pnp_irq(pdev, 0);
+        EL3WINDOW(0);
+        for (i = 0; i < 3; i++)
+                phys_addr[i] = htons(read_eeprom(ioaddr, i));
+        if_port = read_eeprom(ioaddr, 8) >> 14;
+        dev = alloc_etherdev(sizeof(struct el3_private));
+        if (!dev) {
+                release_region(ioaddr, EL3_IO_EXTENT);
+                return -ENOMEM;
+        }
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        netdev_boot_setup_check(dev);
+
+        el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_PNP);
+        pnp_set_drvdata(pdev, dev);
+        err = el3_common_init(dev);
+
+        if (err) {
+                pnp_set_drvdata(pdev, NULL);
+                free_netdev(dev);
+                return err;
+        }
+
+        el3_devs[el3_cards++] = dev;
+        return 0;
+}
+
+static void __devexit el3_pnp_remove(struct pnp_dev *pdev)
+{
+        el3_common_remove(pnp_get_drvdata(pdev));
+        pnp_set_drvdata(pdev, NULL);
+}
+
+#ifdef CONFIG_PM
+static int el3_pnp_suspend(struct pnp_dev *pdev, pm_message_t state)
+{
+        return el3_suspend(&pdev->dev, state);
+}
+
+static int el3_pnp_resume(struct pnp_dev *pdev)
+{
+        return el3_resume(&pdev->dev);
+}
+#endif
+
+static struct pnp_driver el3_pnp_driver = {
+        .name           = "3c509",
+        .id_table       = el3_pnp_ids,
+        .probe          = el3_pnp_probe,
+        .remove         = __devexit_p(el3_pnp_remove),
+#ifdef CONFIG_PM
+        .suspend        = el3_pnp_suspend,
+        .resume         = el3_pnp_resume,
+#endif
+};
+static int pnp_registered;
+#endif /* CONFIG_PNP */
+
 #ifdef CONFIG_EISA
 static struct eisa_device_id el3_eisa_ids[] = {
                 { "TCM5092" },
@@ -230,13 +493,14 @@ static int el3_eisa_probe (struct device *device);
 static struct eisa_driver el3_eisa_driver = {
                 .id_table = el3_eisa_ids,
                 .driver   = {
-                                .name    = "3c509",
+                                .name    = "3c579",
                                 .probe   = el3_eisa_probe,
                                 .remove  = __devexit_p (el3_device_remove),
                                 .suspend = el3_suspend,
                                 .resume  = el3_resume,
                 }
 };
+static int eisa_registered;
 #endif
 
 #ifdef CONFIG_MCA
@@ -271,45 +535,9 @@ static struct mca_driver el3_mca_driver = {
                                 .resume  = el3_resume,
                 },
 };
+static int mca_registered;
 #endif /* CONFIG_MCA */
 
-#if defined(__ISAPNP__)
-static struct isapnp_device_id el3_isapnp_adapters[] __initdata = {
-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5090),
-                (long) "3Com Etherlink III (TP)" },
-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5091),
-                (long) "3Com Etherlink III" },
-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5094),
-                (long) "3Com Etherlink III (combo)" },
-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5095),
-                (long) "3Com Etherlink III (TPO)" },
-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5098),
-                (long) "3Com Etherlink III (TPC)" },
-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('P', 'N', 'P'), ISAPNP_FUNCTION(0x80f7),
-                (long) "3Com Etherlink III compatible" },
-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('P', 'N', 'P'), ISAPNP_FUNCTION(0x80f8),
-                (long) "3Com Etherlink III compatible" },
-        { }     /* terminate list */
-};
-
-static __be16 el3_isapnp_phys_addr[8][3];
-static int nopnp;
-#endif /* __ISAPNP__ */
-
-/* With the driver model introduction for EISA devices, both init
- * and cleanup have been split :
- * - EISA devices probe/remove starts in el3_eisa_probe/el3_device_remove
- * - MCA/ISA still use el3_probe
- *
- * Both call el3_common_init/el3_common_remove. */
-
 static int __init el3_common_init(struct net_device *dev)
 {
         struct el3_private *lp = netdev_priv(dev);
@@ -360,231 +588,11 @@ static int __init el3_common_init(struct net_device *dev)
 
 static void el3_common_remove (struct net_device *dev)
 {
-        struct el3_private *lp = netdev_priv(dev);
-
-        (void) lp;                              /* Keep gcc quiet... */
-#if defined(__ISAPNP__)
-        if (lp->type == EL3_PNP)
-                pnp_device_detach(to_pnp_dev(lp->dev));
-#endif
-
         unregister_netdev (dev);
         release_region(dev->base_addr, EL3_IO_EXTENT);
         free_netdev (dev);
 }
 
-static int __init el3_probe(int card_idx)
-{
-        struct net_device *dev;
-        struct el3_private *lp;
-        short lrs_state = 0xff, i;
-        int ioaddr, irq, if_port;
-        __be16 phys_addr[3];
-        static int current_tag;
-        int err = -ENODEV;
-#if defined(__ISAPNP__)
-        static int pnp_cards;
-        struct pnp_dev *idev = NULL;
-        int pnp_found = 0;
-
-        if (nopnp == 1)
-                goto no_pnp;
-
-        for (i=0; el3_isapnp_adapters[i].vendor != 0; i++) {
-                int j;
-                while ((idev = pnp_find_dev(NULL,
-                                            el3_isapnp_adapters[i].vendor,
-                                            el3_isapnp_adapters[i].function,
-                                            idev))) {
-                        if (pnp_device_attach(idev) < 0)
-                                continue;
-                        if (pnp_activate_dev(idev) < 0) {
-__again:
-                                pnp_device_detach(idev);
-                                continue;
-                        }
-                        if (!pnp_port_valid(idev, 0) || !pnp_irq_valid(idev, 0))
-                                goto __again;
-                        ioaddr = pnp_port_start(idev, 0);
-                        if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509 PnP")) {
-                                pnp_device_detach(idev);
-                                return -EBUSY;
-                        }
-                        irq = pnp_irq(idev, 0);
-                        if (el3_debug > 3)
-                                printk ("ISAPnP reports %s at i/o 0x%x, irq %d\n",
-                                        (char*) el3_isapnp_adapters[i].driver_data, ioaddr, irq);
-                        EL3WINDOW(0);
-                        for (j = 0; j < 3; j++)
-                                el3_isapnp_phys_addr[pnp_cards][j] =
-                                        phys_addr[j] =
-                                                htons(read_eeprom(ioaddr, j));
-                        if_port = read_eeprom(ioaddr, 8) >> 14;
-                        dev = alloc_etherdev(sizeof (struct el3_private));
-                        if (!dev) {
-                                        release_region(ioaddr, EL3_IO_EXTENT);
-                                        pnp_device_detach(idev);
-                                        return -ENOMEM;
-                        }
-
-                        SET_NETDEV_DEV(dev, &idev->dev);
-                        pnp_cards++;
-
-                        netdev_boot_setup_check(dev);
-                        pnp_found = 1;
-                        goto found;
-                }
-        }
-no_pnp:
-#endif /* __ISAPNP__ */
-
-        /* Select an open I/O location at 0x1*0 to do contention select. */
-        for ( ; id_port < 0x200; id_port += 0x10) {
-                if (!request_region(id_port, 1, "3c509"))
-                        continue;
-                outb(0x00, id_port);
-                outb(0xff, id_port);
-                if (inb(id_port) & 0x01){
-                        release_region(id_port, 1);
-                        break;
-                } else
-                        release_region(id_port, 1);
-        }
-        if (id_port >= 0x200) {
-                /* Rare -- do we really need a warning? */
-                printk(" WARNING: No I/O port available for 3c509 activation.\n");
-                return -ENODEV;
-        }
-
-        /* Next check for all ISA bus boards by sending the ID sequence to the
-           ID_PORT.  We find cards past the first by setting the 'current_tag'
-           on cards as they are found.  Cards with their tag set will not
-           respond to subsequent ID sequences. */
-
-        outb(0x00, id_port);
-        outb(0x00, id_port);
-        for(i = 0; i < 255; i++) {
-                outb(lrs_state, id_port);
-                lrs_state <<= 1;
-                lrs_state = lrs_state & 0x100 ? lrs_state ^ 0xcf : lrs_state;
-        }
-
-        /* For the first probe, clear all board's tag registers. */
-        if (current_tag == 0)
-                outb(0xd0, id_port);
-        else                            /* Otherwise kill off already-found boards. */
-                outb(0xd8, id_port);
-
-        if (id_read_eeprom(7) != 0x6d50) {
-                return -ENODEV;
-        }
-
-        /* Read in EEPROM data, which does contention-select.
-           Only the lowest address board will stay "on-line".
-           3Com got the byte order backwards. */
-        for (i = 0; i < 3; i++) {
-                phys_addr[i] = htons(id_read_eeprom(i));
-        }
-
-#if defined(__ISAPNP__)
-        if (nopnp == 0) {
-                /* The ISA PnP 3c509 cards respond to the ID sequence.
-                   This check is needed in order not to register them twice. */
-                for (i = 0; i < pnp_cards; i++) {
-                        if (phys_addr[0] == el3_isapnp_phys_addr[i][0] &&
-                            phys_addr[1] == el3_isapnp_phys_addr[i][1] &&
-                            phys_addr[2] == el3_isapnp_phys_addr[i][2])
-                        {
-                                if (el3_debug > 3)
-                                        printk("3c509 with address %02x %02x %02x %02x %02x %02x was found by ISAPnP\n",
-                                                phys_addr[0] & 0xff, phys_addr[0] >> 8,
-                                                phys_addr[1] & 0xff, phys_addr[1] >> 8,
-                                                phys_addr[2] & 0xff, phys_addr[2] >> 8);
-                                /* Set the adaptor tag so that the next card can be found. */
-                                outb(0xd0 + ++current_tag, id_port);
-                                goto no_pnp;
-                        }
-                }
-        }
-#endif /* __ISAPNP__ */
-
-        {
-                unsigned int iobase = id_read_eeprom(8);
-                if_port = iobase >> 14;
-                ioaddr = 0x200 + ((iobase & 0x1f) << 4);
-        }
-        irq = id_read_eeprom(9) >> 12;
-
-        dev = alloc_etherdev(sizeof (struct el3_private));
-        if (!dev)
-                return -ENOMEM;
-
-        netdev_boot_setup_check(dev);
-
-        /* Set passed-in IRQ or I/O Addr. */
-        if (dev->irq > 1  &&  dev->irq < 16)
-                        irq = dev->irq;
-
-        if (dev->base_addr) {
-                if (dev->mem_end == 0x3c509     /* Magic key */
-                    && dev->base_addr >= 0x200  &&  dev->base_addr <= 0x3e0)
-                        ioaddr = dev->base_addr & 0x3f0;
-                else if (dev->base_addr != ioaddr)
-                        goto out;
-        }
-
-        if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509")) {
-                err = -EBUSY;
-                goto out;
-        }
-
-        /* Set the adaptor tag so that the next card can be found. */
-        outb(0xd0 + ++current_tag, id_port);
-
-        /* Activate the adaptor at the EEPROM location. */
-        outb((ioaddr >> 4) | 0xe0, id_port);
-
-        EL3WINDOW(0);
-        if (inw(ioaddr) != 0x6d50)
-                goto out1;
-
-        /* Free the interrupt so that some other card can use it. */
-        outw(0x0f00, ioaddr + WN0_IRQ);
-
-#if defined(__ISAPNP__)
- found:                                                 /* PNP jumps here... */
-#endif /* __ISAPNP__ */
-
-        memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
-        dev->base_addr = ioaddr;
-        dev->irq = irq;
-        dev->if_port = if_port;
-        lp = netdev_priv(dev);
-#if defined(__ISAPNP__)
-        lp->dev = &idev->dev;
-        if (pnp_found)
-                lp->type = EL3_PNP;
-#endif
-        err = el3_common_init(dev);
-
-        if (err)
-                goto out1;
-
-        el3_cards++;
-        lp->next_dev = el3_root_dev;
-        el3_root_dev = dev;
-        return 0;
-
-out1:
-#if defined(__ISAPNP__)
-        if (idev)
-                pnp_device_detach(idev);
-#endif
-out:
-        free_netdev(dev);
-        return err;
-}
-
 #ifdef CONFIG_MCA
 static int __init el3_mca_probe(struct device *device)
 {
@@ -596,7 +604,6 @@ static int __init el3_mca_probe(struct device *device)
          * redone for multi-card detection by ZP Gu (zpg@castle.net)
          * now works as a module */
 
-        struct el3_private *lp;
         short i;
         int ioaddr, irq, if_port;
         u16 phys_addr[3];
@@ -613,7 +620,7 @@ static int __init el3_mca_probe(struct device *device)
         irq = pos5 & 0x0f;
 
 
-        printk("3c529: found %s at slot %d\n",
+        printk(KERN_INFO "3c529: found %s at slot %d\n",
                    el3_mca_adapter_names[mdev->index], slot + 1);
 
         /* claim the slot */
@@ -626,7 +633,7 @@ static int __init el3_mca_probe(struct device *device)
         irq = mca_device_transform_irq(mdev, irq);
         ioaddr = mca_device_transform_ioport(mdev, ioaddr);
         if (el3_debug > 2) {
-                        printk("3c529: irq %d  ioaddr 0x%x  ifport %d\n", irq, ioaddr, if_port);
+                        printk(KERN_DEBUG "3c529: irq %d  ioaddr 0x%x  ifport %d\n", irq, ioaddr, if_port);
         }
         EL3WINDOW(0);
         for (i = 0; i < 3; i++) {
@@ -641,13 +648,7 @@ static int __init el3_mca_probe(struct device *device)
 
         netdev_boot_setup_check(dev);
 
-        memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
-        dev->base_addr = ioaddr;
-        dev->irq = irq;
-        dev->if_port = if_port;
-        lp = netdev_priv(dev);
-        lp->dev = device;
-        lp->type = EL3_MCA;
+        el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_MCA);
         device->driver_data = dev;
         err = el3_common_init(dev);
 
@@ -657,7 +658,7 @@ static int __init el3_mca_probe(struct device *device)
                 return -ENOMEM;
         }
 
-        el3_cards++;
+        el3_devs[el3_cards++] = dev;
         return 0;
 }
 
@@ -666,7 +667,6 @@ static int __init el3_mca_probe(struct device *device)
 #ifdef CONFIG_EISA
 static int __init el3_eisa_probe (struct device *device)
 {
-        struct el3_private *lp;
         short i;
         int ioaddr, irq, if_port;
         u16 phys_addr[3];
@@ -678,7 +678,7 @@ static int __init el3_eisa_probe (struct device *device)
         edev = to_eisa_device (device);
         ioaddr = edev->base_addr;
 
-        if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509"))
+        if (!request_region(ioaddr, EL3_IO_EXTENT, "3c579-eisa"))
                 return -EBUSY;
 
         /* Change the register set to the configuration window 0. */
@@ -700,13 +700,7 @@ static int __init el3_eisa_probe (struct device *device)
 
         netdev_boot_setup_check(dev);
 
-        memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
-        dev->base_addr = ioaddr;
-        dev->irq = irq;
-        dev->if_port = if_port;
-        lp = netdev_priv(dev);
-        lp->dev = device;
-        lp->type = EL3_EISA;
+        el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA);
         eisa_set_drvdata (edev, dev);
         err = el3_common_init(dev);
 
@@ -716,12 +710,11 @@ static int __init el3_eisa_probe (struct device *device)
                 return err;
         }
 
-        el3_cards++;
+        el3_devs[el3_cards++] = dev;
         return 0;
 }
 #endif
 
-#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
 /* This remove works for all device types.
  *
  * The net dev must be stored in the driver_data field */
@@ -734,7 +727,6 @@ static int __devexit el3_device_remove (struct device *device)
         el3_common_remove (dev);
         return 0;
 }
-#endif
 
 /* Read a word from the EEPROM using the regular EEPROM access register.
    Assume that we are in register window zero.
@@ -749,7 +741,7 @@ static ushort read_eeprom(int ioaddr, int index)
 }
 
 /* Read a word from the EEPROM when in the ISA ID probe state. */
-static ushort __init id_read_eeprom(int index)
+static ushort id_read_eeprom(int index)
 {
         int bit, word = 0;
 
@@ -765,7 +757,7 @@ static ushort __init id_read_eeprom(int index)
                 word = (word << 1) + (inb(id_port) & 0x01);
 
         if (el3_debug > 3)
-                printk("  3c509 EEPROM word %d %#4.4x.\n", index, word);
+                printk(KERN_DEBUG "  3c509 EEPROM word %d %#4.4x.\n", index, word);
 
         return word;
 }
@@ -787,13 +779,13 @@ el3_open(struct net_device *dev)
 
         EL3WINDOW(0);
         if (el3_debug > 3)
-                printk("%s: Opening, IRQ %d      status@%x %4.4x.\n", dev->name,
+                printk(KERN_DEBUG "%s: Opening, IRQ %d   status@%x %4.4x.\n", dev->name,
                            dev->irq, ioaddr + EL3_STATUS, inw(ioaddr + EL3_STATUS));
 
         el3_up(dev);
 
         if (el3_debug > 3)
-                printk("%s: Opened 3c509  IRQ %d  status %4.4x.\n",
+                printk(KERN_DEBUG "%s: Opened 3c509  IRQ %d  status %4.4x.\n",
                            dev->name, dev->irq, inw(ioaddr + EL3_STATUS));
 
         return 0;
@@ -806,7 +798,7 @@ el3_tx_timeout (struct net_device *dev)
         int ioaddr = dev->base_addr;
 
         /* Transmitter timeout, serious problems. */
-        printk("%s: transmit timed out, Tx_status %2.2x status %4.4x "
+        printk(KERN_WARNING "%s: transmit timed out, Tx_status %2.2x status %4.4x "
                    "Tx FIFO room %d.\n",
                    dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS),
                    inw(ioaddr + TX_FREE));
@@ -831,7 +823,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         lp->stats.tx_bytes += skb->len;
 
         if (el3_debug > 4) {
-                printk("%s: el3_start_xmit(length = %u) called, status %4.4x.\n",
+                printk(KERN_DEBUG "%s: el3_start_xmit(length = %u) called, status %4.4x.\n",
                            dev->name, skb->len, inw(ioaddr + EL3_STATUS));
         }
 #if 0
@@ -840,7 +832,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 ushort status = inw(ioaddr + EL3_STATUS);
                 if (status & 0x0001             /* IRQ line active, missed one. */
                         && inw(ioaddr + EL3_STATUS) & 1) {                      /* Make sure. */
-                        printk("%s: Missed interrupt, status then %04x now %04x"
+                        printk(KERN_DEBUG "%s: Missed interrupt, status then %04x now %04x"
                                    "  Tx %2.2x Rx %4.4x.\n", dev->name, status,
                                    inw(ioaddr + EL3_STATUS), inb(ioaddr + TX_STATUS),
                                    inw(ioaddr + RX_STATUS));
@@ -914,7 +906,7 @@ el3_interrupt(int irq, void *dev_id)
 
         if (el3_debug > 4) {
                 status = inw(ioaddr + EL3_STATUS);
-                printk("%s: interrupt, status %4.4x.\n", dev->name, status);
+                printk(KERN_DEBUG "%s: interrupt, status %4.4x.\n", dev->name, status);
         }
 
         while ((status = inw(ioaddr + EL3_STATUS)) &
@@ -925,7 +917,7 @@ el3_interrupt(int irq, void *dev_id)
 
                 if (status & TxAvailable) {
                         if (el3_debug > 5)
-                                printk("        TX room bit was handled.\n");
+                                printk(KERN_DEBUG "     TX room bit was handled.\n");
                         /* There's room in the FIFO for a full-sized packet. */
                         outw(AckIntr | TxAvailable, ioaddr + EL3_CMD);
                         netif_wake_queue (dev);
@@ -964,7 +956,7 @@ el3_interrupt(int irq, void *dev_id)
                 }
 
                 if (--i < 0) {
-                        printk("%s: Infinite loop in interrupt, status %4.4x.\n",
+                        printk(KERN_ERR "%s: Infinite loop in interrupt, status %4.4x.\n",
                                    dev->name, status);
                         /* Clear all interrupts. */
                         outw(AckIntr | 0xFF, ioaddr + EL3_CMD);
@@ -975,7 +967,7 @@ el3_interrupt(int irq, void *dev_id)
         }
 
         if (el3_debug > 4) {
-                printk("%s: exiting interrupt, status %4.4x.\n", dev->name,
+                printk(KERN_DEBUG "%s: exiting interrupt, status %4.4x.\n", dev->name,
                            inw(ioaddr + EL3_STATUS));
         }
         spin_unlock(&lp->lock);
@@ -1450,7 +1442,7 @@ el3_up(struct net_device *dev)
 }
 
 /* Power Management support functions */
-#ifdef EL3_SUSPEND
+#ifdef CONFIG_PM
 
 static int
 el3_suspend(struct device *pdev, pm_message_t state)
@@ -1500,79 +1492,102 @@ el3_resume(struct device *pdev)
         return 0;
 }
 
-#endif /* EL3_SUSPEND */
-
-/* Parameters that may be passed into the module. */
-static int debug = -1;
-static int irq[] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int xcvr[] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+#endif /* CONFIG_PM */
 
 module_param(debug,int, 0);
 module_param_array(irq, int, NULL, 0);
-module_param_array(xcvr, int, NULL, 0);
 module_param(max_interrupt_work, int, 0);
 MODULE_PARM_DESC(debug, "debug level (0-6)");
 MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
-MODULE_PARM_DESC(xcvr,"transceiver(s) (0=internal, 1=external)");
 MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt");
-#if defined(__ISAPNP__)
+#ifdef CONFIG_PNP
 module_param(nopnp, int, 0);
 MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)");
-MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters);
-#endif  /* __ISAPNP__ */
-MODULE_DESCRIPTION("3Com Etherlink III (3c509, 3c509B) ISA/PnP ethernet driver");
+#endif  /* CONFIG_PNP */
+MODULE_DESCRIPTION("3Com Etherlink III (3c509, 3c509B, 3c529, 3c579) ethernet driver");
 MODULE_LICENSE("GPL");
 
 static int __init el3_init_module(void)
 {
         int ret = 0;
-        el3_cards = 0;
 
         if (debug >= 0)
                 el3_debug = debug;
 
-        el3_root_dev = NULL;
-        while (el3_probe(el3_cards) == 0) {
-                if (irq[el3_cards] > 1)
-                        el3_root_dev->irq = irq[el3_cards];
-                if (xcvr[el3_cards] >= 0)
-                        el3_root_dev->if_port = xcvr[el3_cards];
-                el3_cards++;
+#ifdef CONFIG_PNP
+        if (!nopnp) {
+                ret = pnp_register_driver(&el3_pnp_driver);
+                if (!ret)
+                        pnp_registered = 1;
+        }
+#endif
+        /* Select an open I/O location at 0x1*0 to do ISA contention select. */
+        /* Start with 0x110 to avoid some sound cards.*/
+        for (id_port = 0x110 ; id_port < 0x200; id_port += 0x10) {
+                if (!request_region(id_port, 1, "3c509-control"))
+                        continue;
+                outb(0x00, id_port);
+                outb(0xff, id_port);
+                if (inb(id_port) & 0x01)
+                        break;
+                else
+                        release_region(id_port, 1);
+        }
+        if (id_port >= 0x200) {
+                id_port = 0;
+                printk(KERN_ERR "No I/O port available for 3c509 activation.\n");
+        } else {
+                ret = isa_register_driver(&el3_isa_driver, EL3_MAX_CARDS);
+                if (!ret)
+                        isa_registered = 1;
         }
-
 #ifdef CONFIG_EISA
         ret = eisa_driver_register(&el3_eisa_driver);
+        if (!ret)
+                eisa_registered = 1;
 #endif
 #ifdef CONFIG_MCA
-        {
-                int err = mca_register_driver(&el3_mca_driver);
-                if (ret == 0)
-                        ret = err;
-        }
+        ret = mca_register_driver(&el3_mca_driver);
+        if (!ret)
+                mca_registered = 1;
+#endif
+
+#ifdef CONFIG_PNP
+        if (pnp_registered)
+                ret = 0;
+#endif
+        if (isa_registered)
+                ret = 0;
+#ifdef CONFIG_EISA
+        if (eisa_registered)
+                ret = 0;
+#endif
+#ifdef CONFIG_MCA
+        if (mca_registered)
+                ret = 0;
 #endif
         return ret;
 }
 
 static void __exit el3_cleanup_module(void)
 {
-        struct net_device *next_dev;
-
-        while (el3_root_dev) {
-                struct el3_private *lp = netdev_priv(el3_root_dev);
-
-                next_dev = lp->next_dev;
-                el3_common_remove (el3_root_dev);
-                el3_root_dev = next_dev;
-        }
-
+#ifdef CONFIG_PNP
+        if (pnp_registered)
+                pnp_unregister_driver(&el3_pnp_driver);
+#endif
+        if (isa_registered)
+                isa_unregister_driver(&el3_isa_driver);
+        if (id_port)
+                release_region(id_port, 1);
 #ifdef CONFIG_EISA
-        eisa_driver_unregister (&el3_eisa_driver);
+        if (eisa_registered)
+                eisa_driver_unregister(&el3_eisa_driver);
 #endif
 #ifdef CONFIG_MCA
-        mca_unregister_driver(&el3_mca_driver);
+        if (mca_registered)
+                mca_unregister_driver(&el3_mca_driver);
 #endif
 }
 
 module_init (el3_init_module);
 module_exit (el3_cleanup_module);
-
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index be6e918456d9..53bd903d2321 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -966,8 +966,8 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
 
         addr_len = read_eeprom (ioaddr, 0, 8) == 0x8129 ? 8 : 6;
         for (i = 0; i < 3; i++)
-                ((u16 *) (dev->dev_addr))[i] =
-                    le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));
+                ((__le16 *) (dev->dev_addr))[i] =
+                    cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len));
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
         /* The Rtl8139-specific entries in the device structure. */
@@ -1373,8 +1373,8 @@ static void rtl8139_hw_start (struct net_device *dev)
         /* unlock Config[01234] and BMCR register writes */
         RTL_W8_F (Cfg9346, Cfg9346_Unlock);
         /* Restore our idea of the MAC address. */
-        RTL_W32_F (MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0)));
-        RTL_W32_F (MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4)));
+        RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
+        RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));
 
         /* Must enable Tx/Rx before setting transfer thresholds! */
         RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
@@ -1945,7 +1945,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
                 rmb();
 
                 /* read size+status of next frame from DMA ring buffer */
-                rx_status = le32_to_cpu (*(u32 *) (rx_ring + ring_offset));
+                rx_status = le32_to_cpu (*(__le32 *) (rx_ring + ring_offset));
                 rx_size = rx_status >> 16;
                 pkt_size = rx_size - 4;
 
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index a82807641dcf..a499e867f0f4 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -48,14 +48,16 @@ EXPORT_SYMBOL(__alloc_ei_netdev);
 
 #if defined(MODULE)
 
-int init_module(void)
+static int __init ns8390_module_init(void)
 {
         return 0;
 }
 
-void cleanup_module(void)
+static void __exit ns8390_module_exit(void)
 {
 }
 
+module_init(ns8390_module_init);
+module_exit(ns8390_module_exit);
 #endif /* MODULE */
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3a0b20afec7b..45c3a208d93f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -467,6 +467,13 @@ config SNI_82596
           Say Y here to support the on-board Intel 82596 ethernet controller
           built into SNI RM machines.
 
+config KORINA
+        tristate "Korina (IDT RC32434) Ethernet support"
+        depends on NET_ETHERNET && MIKROTIK_RB500
+        help
+          If you have a Mikrotik RouterBoard 500 or IDT RC32434
+          based system say Y. Otherwise say N.
+
 config MIPS_JAZZ_SONIC
         tristate "MIPS JAZZ onboard SONIC Ethernet support"
         depends on MACH_JAZZ
@@ -1431,7 +1438,7 @@ config CS89x0
 config TC35815
         tristate "TOSHIBA TC35815 Ethernet support"
         depends on NET_PCI && PCI && MIPS
-        select MII
+        select PHYLIB
 
 config EEPRO100
         tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
@@ -2220,93 +2227,6 @@ config SKY2_DEBUG
 
          If unsure, say N.
 
-config SK98LIN
-        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)"
-        depends on PCI
-        ---help---
-          Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
-          compliant Gigabit Ethernet Adapter.
-
-          This driver supports the original Yukon chipset. This driver is
-          deprecated and will be removed from the kernel in the near future,
-          it has been replaced by the skge driver. skge is cleaner and
-          seems to work better.
-
-          This driver does not support the newer Yukon2 chipset. A separate
-          driver, sky2, is provided to support Yukon2-based adapters.
-
-          The following adapters are supported by this driver:
-            - 3Com 3C940 Gigabit LOM Ethernet Adapter
-            - 3Com 3C941 Gigabit LOM Ethernet Adapter
-            - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
-            - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
-            - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
-            - Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter
-            - Allied Telesyn AT-2970TX Gigabit Ethernet Adapter
-            - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
-            - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
-            - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
-            - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
-            - EG1032 v2 Instant Gigabit Network Adapter
-            - EG1064 v2 Instant Gigabit Network Adapter
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
-            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
-            - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
-            - Marvell RDK-8001 Adapter
-            - Marvell RDK-8002 Adapter
-            - Marvell RDK-8003 Adapter
-            - Marvell RDK-8004 Adapter
-            - Marvell RDK-8006 Adapter
-            - Marvell RDK-8007 Adapter
-            - Marvell RDK-8008 Adapter
-            - Marvell RDK-8009 Adapter
-            - Marvell RDK-8010 Adapter
-            - Marvell RDK-8011 Adapter
-            - Marvell RDK-8012 Adapter
-            - Marvell RDK-8052 Adapter
-            - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
-            - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
-            - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
-            - SK-9521 10/100/1000Base-T Adapter
-            - SK-9521 V2.0 10/100/1000Base-T Adapter
-            - SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)
-            - SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter
-            - SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)
-            - SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)
-            - SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter
-            - SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)
-            - SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)
-            - SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter
-            - SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)
-            - SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter
-            - SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)
-            - SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
-            - SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)
-            - SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
-            - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
-            - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
-            - SMC EZ Card 1000 (SMC9452TXV.2)
-          
-          The adapters support Jumbo Frames.
-          The dual link adapters support link-failover and dual port features.
-          Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support 
-          the scatter-gather functionality with sendfile(). Please refer to 
-          <file:Documentation/networking/sk98lin.txt> for more information about
-          optional driver parameters.
-          Questions concerning this driver may be addressed to:
-              <linux@syskonnect.de>
-          
-          If you want to compile this driver as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want),
-          say M here and read <file:Documentation/kbuild/modules.txt>. The module will
-          be called sk98lin. This is recommended.
-
 config VIA_VELOCITY
         tristate "VIA Velocity support"
         depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3b1ea321dc05..4d71729e85e5 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_CHELSIO_T3) += cxgb3/
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_ATL1) += atl1/
+obj-$(CONFIG_ATL1) += atlx/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 obj-$(CONFIG_TEHUTI) += tehuti.o
 
@@ -75,7 +75,6 @@ ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
 obj-$(CONFIG_SKY2) += sky2.o
-obj-$(CONFIG_SK98LIN) += sk98lin/
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_VIA_RHINE) += via-rhine.o
 obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
@@ -191,6 +190,7 @@ obj-$(CONFIG_ZORRO8390) += zorro8390.o
 obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
 obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
 obj-$(CONFIG_EQUALIZER) += eql.o
+obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 92c3a4cf0bb1..65b901ebfd62 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -1010,7 +1010,7 @@ module_param(io, int, 0);
 module_param(irq, int, 0);
 module_param(board_type, int, 0);
 
-int __init init_module(void)
+static int __init cops_module_init(void)
 {
         if (io == 0)
                 printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",
@@ -1021,12 +1021,14 @@ int __init init_module(void)
         return 0;
 }
 
-void __exit cleanup_module(void)
+static void __exit cops_module_exit(void)
 {
         unregister_netdev(cops_dev);
         cleanup_card(cops_dev);
         free_netdev(cops_dev);
 }
+module_init(cops_module_init);
+module_exit(cops_module_exit);
 #endif /* MODULE */
 
 /*
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index c59c8067de99..bdc4c0bb56d9 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -940,7 +940,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
 
                         /* is the RECON info empty or old? */
                         if (!lp->first_recon || !lp->last_recon ||
-                            jiffies - lp->last_recon > HZ * 10) {
+                            time_after(jiffies, lp->last_recon + HZ * 10)) {
                                 if (lp->network_down)
                                         BUGMSG(D_NORMAL, "reconfiguration detected: cabling restored?\n");
                                 lp->first_recon = lp->last_recon = jiffies;
@@ -974,7 +974,8 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
                                         lp->num_recons = 1;
                                 }
                         }
-                } else if (lp->network_down && jiffies - lp->last_recon > HZ * 10) {
+                } else if (lp->network_down &&
+                                time_after(jiffies, lp->last_recon + HZ * 10)) {
                         if (lp->network_down)
                                 BUGMSG(D_NORMAL, "cabling restored?\n");
                         lp->first_recon = lp->last_recon = 0;
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index 7cf0a2511697..8b51313b1300 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -348,14 +348,15 @@ MODULE_LICENSE("GPL");
 
 #ifdef MODULE
 
-int init_module(void)
+static int __init com20020_module_init(void)
 {
         BUGLVL(D_NORMAL) printk(VERSION);
         return 0;
 }
 
-void cleanup_module(void)
+static void __exit com20020_module_exit(void)
 {
 }
-
+module_init(com20020_module_init);
+module_exit(com20020_module_exit);
 #endif                          /* MODULE */
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 24d81f922533..7e874d485d24 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -881,7 +881,7 @@ MODULE_PARM_DESC(io, "AT1700/FMV18X I/O base address");
 MODULE_PARM_DESC(irq, "AT1700/FMV18X IRQ number");
 MODULE_PARM_DESC(net_debug, "AT1700/FMV18X debug level (0-6)");
 
-int __init init_module(void)
+static int __init at1700_module_init(void)
 {
         if (io == 0)
                 printk("at1700: You should not use auto-probing with insmod!\n");
@@ -891,13 +891,14 @@ int __init init_module(void)
         return 0;
 }
 
-void __exit
-cleanup_module(void)
+static void __exit at1700_module_exit(void)
 {
         unregister_netdev(dev_at1700);
         cleanup_card(dev_at1700);
         free_netdev(dev_at1700);
 }
+module_init(at1700_module_init);
+module_exit(at1700_module_exit);
 #endif /* MODULE */
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 13c293b286de..4cceaac8863a 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -1155,7 +1155,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr )
 #ifdef MODULE
 static struct net_device *atarilance_dev;
 
-int __init init_module(void)
+static int __init atarilance_module_init(void)
 {
         atarilance_dev = atarilance_probe(-1);
         if (IS_ERR(atarilance_dev))
@@ -1163,13 +1163,14 @@ int __init init_module(void)
         return 0;
 }
 
-void __exit cleanup_module(void)
+static void __exit atarilance_module_exit(void)
 {
         unregister_netdev(atarilance_dev);
         free_irq(atarilance_dev->irq, atarilance_dev);
         free_netdev(atarilance_dev);
 }
-
+module_init(atarilance_module_init);
+module_exit(atarilance_module_exit);
 #endif /* MODULE */
 
 
diff --git a/drivers/net/atl1/Makefile b/drivers/net/atl1/Makefile
deleted file mode 100644
index a6b707e4e69e..000000000000
--- a/drivers/net/atl1/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_ATL1)      += atl1.o
-atl1-y                  += atl1_main.o atl1_hw.o atl1_ethtool.o atl1_param.o
diff --git a/drivers/net/atl1/atl1.h b/drivers/net/atl1/atl1.h
deleted file mode 100644
index ff4765f6c3de..000000000000
--- a/drivers/net/atl1/atl1.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
- * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
- *
- * Derived from Intel e1000 driver
- * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef _ATL1_H_
-#define _ATL1_H_
-
-#include <linux/types.h>
-#include <linux/if_vlan.h>
-
-#include "atl1_hw.h"
-
-/* function prototypes needed by multiple files */
-s32 atl1_up(struct atl1_adapter *adapter);
-void atl1_down(struct atl1_adapter *adapter);
-int atl1_reset(struct atl1_adapter *adapter);
-s32 atl1_setup_ring_resources(struct atl1_adapter *adapter);
-void atl1_free_ring_resources(struct atl1_adapter *adapter);
-
-extern char atl1_driver_name[];
-extern char atl1_driver_version[];
-extern const struct ethtool_ops atl1_ethtool_ops;
-
-struct atl1_adapter;
-
-#define ATL1_MAX_INTR           3
-#define ATL1_MAX_TX_BUF_LEN     0x3000  /* 12288 bytes */
-
-#define ATL1_DEFAULT_TPD        256
-#define ATL1_MAX_TPD            1024
-#define ATL1_MIN_TPD            64
-#define ATL1_DEFAULT_RFD        512
-#define ATL1_MIN_RFD            128
-#define ATL1_MAX_RFD            2048
-
-#define ATL1_GET_DESC(R, i, type)       (&(((type *)((R)->desc))[i]))
-#define ATL1_RFD_DESC(R, i)     ATL1_GET_DESC(R, i, struct rx_free_desc)
-#define ATL1_TPD_DESC(R, i)     ATL1_GET_DESC(R, i, struct tx_packet_desc)
-#define ATL1_RRD_DESC(R, i)     ATL1_GET_DESC(R, i, struct rx_return_desc)
-
-/*
- * This detached comment is preserved for documentation purposes only.
- * It was originally attached to some code that got deleted, but seems
- * important enough to keep around...
- *
- * <begin detached comment>
- * Some workarounds require millisecond delays and are run during interrupt
- * context.  Most notably, when establishing link, the phy may need tweaking
- * but cannot process phy register reads/writes faster than millisecond
- * intervals...and we establish link due to a "link status change" interrupt.
- * <end detached comment>
- */
-
-/*
- * atl1_ring_header represents a single, contiguous block of DMA space
- * mapped for the three descriptor rings (tpd, rfd, rrd) and the two
- * message blocks (cmb, smb) described below
- */
-struct atl1_ring_header {
-        void *desc;             /* virtual address */
-        dma_addr_t dma;         /* physical address*/
-        unsigned int size;      /* length in bytes */
-};
-
-/*
- * atl1_buffer is wrapper around a pointer to a socket buffer
- * so a DMA handle can be stored along with the skb
- */
-struct atl1_buffer {
-        struct sk_buff *skb;    /* socket buffer */
-        u16 length;             /* rx buffer length */
-        u16 alloced;            /* 1 if skb allocated */
-        dma_addr_t dma;
-};
-
-/* transmit packet descriptor (tpd) ring */
-struct atl1_tpd_ring {
-        void *desc;             /* descriptor ring virtual address */
-        dma_addr_t dma;         /* descriptor ring physical address */
-        u16 size;               /* descriptor ring length in bytes */
-        u16 count;              /* number of descriptors in the ring */
-        u16 hw_idx;             /* hardware index */
-        atomic_t next_to_clean;
-        atomic_t next_to_use;
-        struct atl1_buffer *buffer_info;
-};
-
-/* receive free descriptor (rfd) ring */
-struct atl1_rfd_ring {
-        void *desc;             /* descriptor ring virtual address */
-        dma_addr_t dma;         /* descriptor ring physical address */
-        u16 size;               /* descriptor ring length in bytes */
-        u16 count;              /* number of descriptors in the ring */
-        atomic_t next_to_use;
-        u16 next_to_clean;
-        struct atl1_buffer *buffer_info;
-};
-
-/* receive return descriptor (rrd) ring */
-struct atl1_rrd_ring {
-        void *desc;             /* descriptor ring virtual address */
-        dma_addr_t dma;         /* descriptor ring physical address */
-        unsigned int size;      /* descriptor ring length in bytes */
-        u16 count;              /* number of descriptors in the ring */
-        u16 next_to_use;
-        atomic_t next_to_clean;
-};
-
-/* coalescing message block (cmb) */
-struct atl1_cmb {
-        struct coals_msg_block *cmb;
-        dma_addr_t dma;
-};
-
-/* statistics message block (smb) */
-struct atl1_smb {
-        struct stats_msg_block *smb;
-        dma_addr_t dma;
-};
-
-/* Statistics counters */
-struct atl1_sft_stats {
-        u64 rx_packets;
-        u64 tx_packets;
-        u64 rx_bytes;
-        u64 tx_bytes;
-        u64 multicast;
-        u64 collisions;
-        u64 rx_errors;
-        u64 rx_length_errors;
-        u64 rx_crc_errors;
-        u64 rx_frame_errors;
-        u64 rx_fifo_errors;
-        u64 rx_missed_errors;
-        u64 tx_errors;
-        u64 tx_fifo_errors;
-        u64 tx_aborted_errors;
-        u64 tx_window_errors;
-        u64 tx_carrier_errors;
-        u64 tx_pause;           /* num pause packets transmitted. */
-        u64 excecol;            /* num tx packets w/ excessive collisions. */
-        u64 deffer;             /* num tx packets deferred */
-        u64 scc;                /* num packets subsequently transmitted
-                                 * successfully w/ single prior collision. */
-        u64 mcc;                /* num packets subsequently transmitted
-                                 * successfully w/ multiple prior collisions. */
-        u64 latecol;            /* num tx packets  w/ late collisions. */
-        u64 tx_underun;         /* num tx packets aborted due to transmit
-                                 * FIFO underrun, or TRD FIFO underrun */
-        u64 tx_trunc;           /* num tx packets truncated due to size
-                                 * exceeding MTU, regardless whether truncated
-                                 * by the chip or not. (The name doesn't really
-                                 * reflect the meaning in this case.) */
-        u64 rx_pause;           /* num Pause packets received. */
-        u64 rx_rrd_ov;
-        u64 rx_trunc;
-};
-
-/* hardware structure */
-struct atl1_hw {
-        u8 __iomem *hw_addr;
-        struct atl1_adapter *back;
-        enum atl1_dma_order dma_ord;
-        enum atl1_dma_rcb rcb_value;
-        enum atl1_dma_req_block dmar_block;
-        enum atl1_dma_req_block dmaw_block;
-        u8 preamble_len;
-        u8 max_retry;           /* Retransmission maximum, after which the
-                                 * packet will be discarded */
-        u8 jam_ipg;             /* IPG to start JAM for collision based flow
-                                 * control in half-duplex mode. In units of
-                                 * 8-bit time */
-        u8 ipgt;                /* Desired back to back inter-packet gap.
-                                 * The default is 96-bit time */
-        u8 min_ifg;             /* Minimum number of IFG to enforce in between
-                                 * receive frames. Frame gap below such IFP
-                                 * is dropped */
-        u8 ipgr1;               /* 64bit Carrier-Sense window */
-        u8 ipgr2;               /* 96-bit IPG window */
-        u8 tpd_burst;           /* Number of TPD to prefetch in cache-aligned
-                                 * burst. Each TPD is 16 bytes long */
-        u8 rfd_burst;           /* Number of RFD to prefetch in cache-aligned
-                                 * burst. Each RFD is 12 bytes long */
-        u8 rfd_fetch_gap;
-        u8 rrd_burst;           /* Threshold number of RRDs that can be retired
-                                 * in a burst. Each RRD is 16 bytes long */
-        u8 tpd_fetch_th;
-        u8 tpd_fetch_gap;
-        u16 tx_jumbo_task_th;
-        u16 txf_burst;          /* Number of data bytes to read in a cache-
-                                 * aligned burst. Each SRAM entry is 8 bytes */
-        u16 rx_jumbo_th;        /* Jumbo packet size for non-VLAN packet. VLAN
-                                 * packets should add 4 bytes */
-        u16 rx_jumbo_lkah;
-        u16 rrd_ret_timer;      /* RRD retirement timer. Decrement by 1 after
-                                 * every 512ns passes. */
-        u16 lcol;               /* Collision Window */
-
-        u16 cmb_tpd;
-        u16 cmb_rrd;
-        u16 cmb_rx_timer;
-        u16 cmb_tx_timer;
-        u32 smb_timer;
-        u16 media_type;
-        u16 autoneg_advertised;
-
-        u16 mii_autoneg_adv_reg;
-        u16 mii_1000t_ctrl_reg;
-
-        u32 max_frame_size;
-        u32 min_frame_size;
-
-        u16 dev_rev;
-
-        /* spi flash */
-        u8 flash_vendor;
-
-        u8 mac_addr[ETH_ALEN];
-        u8 perm_mac_addr[ETH_ALEN];
-
-        bool phy_configured;
-};
-
-struct atl1_adapter {
-        struct net_device *netdev;
-        struct pci_dev *pdev;
-        struct net_device_stats net_stats;
-        struct atl1_sft_stats soft_stats;
-        struct vlan_group *vlgrp;
-        u32 rx_buffer_len;
-        u32 wol;
-        u16 link_speed;
-        u16 link_duplex;
-        spinlock_t lock;
-        struct work_struct tx_timeout_task;
-        struct work_struct link_chg_task;
-        struct work_struct pcie_dma_to_rst_task;
-        struct timer_list watchdog_timer;
-        struct timer_list phy_config_timer;
-        bool phy_timer_pending;
-
-        /* all descriptor rings' memory */
-        struct atl1_ring_header ring_header;
-
-        /* TX */
-        struct atl1_tpd_ring tpd_ring;
-        spinlock_t mb_lock;
-
-        /* RX */
-        struct atl1_rfd_ring rfd_ring;
-        struct atl1_rrd_ring rrd_ring;
-        u64 hw_csum_err;
-        u64 hw_csum_good;
-
-        u16 imt;        /* interrupt moderator timer (2us resolution */
-        u16 ict;        /* interrupt clear timer (2us resolution */
-        struct mii_if_info mii;         /* MII interface info */
-
-        /* structs defined in atl1_hw.h */
-        u32 bd_number;                  /* board number */
-        bool pci_using_64;
-        struct atl1_hw hw;
-        struct atl1_smb smb;
-        struct atl1_cmb cmb;
-};
-
-#endif  /* _ATL1_H_ */
diff --git a/drivers/net/atl1/atl1_ethtool.c b/drivers/net/atl1/atl1_ethtool.c
deleted file mode 100644
index 68a83be843ab..000000000000
--- a/drivers/net/atl1/atl1_ethtool.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
- * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
- *
- * Derived from Intel e1000 driver
- * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/ethtool.h>
-#include <linux/netdevice.h>
-#include <linux/mii.h>
-#include <asm/uaccess.h>
-
-#include "atl1.h"
-
-struct atl1_stats {
-        char stat_string[ETH_GSTRING_LEN];
-        int sizeof_stat;
-        int stat_offset;
-};
-
-#define ATL1_STAT(m) sizeof(((struct atl1_adapter *)0)->m), \
-        offsetof(struct atl1_adapter, m)
-
-static struct atl1_stats atl1_gstrings_stats[] = {
-        {"rx_packets", ATL1_STAT(soft_stats.rx_packets)},
-        {"tx_packets", ATL1_STAT(soft_stats.tx_packets)},
-        {"rx_bytes", ATL1_STAT(soft_stats.rx_bytes)},
-        {"tx_bytes", ATL1_STAT(soft_stats.tx_bytes)},
-        {"rx_errors", ATL1_STAT(soft_stats.rx_errors)},
-        {"tx_errors", ATL1_STAT(soft_stats.tx_errors)},
-        {"rx_dropped", ATL1_STAT(net_stats.rx_dropped)},
-        {"tx_dropped", ATL1_STAT(net_stats.tx_dropped)},
-        {"multicast", ATL1_STAT(soft_stats.multicast)},
-        {"collisions", ATL1_STAT(soft_stats.collisions)},
-        {"rx_length_errors", ATL1_STAT(soft_stats.rx_length_errors)},
-        {"rx_over_errors", ATL1_STAT(soft_stats.rx_missed_errors)},
-        {"rx_crc_errors", ATL1_STAT(soft_stats.rx_crc_errors)},
-        {"rx_frame_errors", ATL1_STAT(soft_stats.rx_frame_errors)},
-        {"rx_fifo_errors", ATL1_STAT(soft_stats.rx_fifo_errors)},
-        {"rx_missed_errors", ATL1_STAT(soft_stats.rx_missed_errors)},
-        {"tx_aborted_errors", ATL1_STAT(soft_stats.tx_aborted_errors)},
-        {"tx_carrier_errors", ATL1_STAT(soft_stats.tx_carrier_errors)},
-        {"tx_fifo_errors", ATL1_STAT(soft_stats.tx_fifo_errors)},
-        {"tx_window_errors", ATL1_STAT(soft_stats.tx_window_errors)},
-        {"tx_abort_exce_coll", ATL1_STAT(soft_stats.excecol)},
-        {"tx_abort_late_coll", ATL1_STAT(soft_stats.latecol)},
-        {"tx_deferred_ok", ATL1_STAT(soft_stats.deffer)},
-        {"tx_single_coll_ok", ATL1_STAT(soft_stats.scc)},
-        {"tx_multi_coll_ok", ATL1_STAT(soft_stats.mcc)},
-        {"tx_underun", ATL1_STAT(soft_stats.tx_underun)},
-        {"tx_trunc", ATL1_STAT(soft_stats.tx_trunc)},
-        {"tx_pause", ATL1_STAT(soft_stats.tx_pause)},
-        {"rx_pause", ATL1_STAT(soft_stats.rx_pause)},
-        {"rx_rrd_ov", ATL1_STAT(soft_stats.rx_rrd_ov)},
-        {"rx_trunc", ATL1_STAT(soft_stats.rx_trunc)}
-};
-
-static void atl1_get_ethtool_stats(struct net_device *netdev,
-                                struct ethtool_stats *stats, u64 *data)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        int i;
-        char *p;
-
-        for (i = 0; i < ARRAY_SIZE(atl1_gstrings_stats); i++) {
-                p = (char *)adapter+atl1_gstrings_stats[i].stat_offset;
-                data[i] = (atl1_gstrings_stats[i].sizeof_stat ==
-                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-        }
-
-}
-
-static int atl1_get_sset_count(struct net_device *netdev, int sset)
-{
-        switch (sset) {
-        case ETH_SS_STATS:
-                return ARRAY_SIZE(atl1_gstrings_stats);
-        default:
-                return -EOPNOTSUPP;
-        }
-}
-
-static int atl1_get_settings(struct net_device *netdev,
-                                struct ethtool_cmd *ecmd)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_hw *hw = &adapter->hw;
-
-        ecmd->supported = (SUPPORTED_10baseT_Half |
-                           SUPPORTED_10baseT_Full |
-                           SUPPORTED_100baseT_Half |
-                           SUPPORTED_100baseT_Full |
-                           SUPPORTED_1000baseT_Full |
-                           SUPPORTED_Autoneg | SUPPORTED_TP);
-        ecmd->advertising = ADVERTISED_TP;
-        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
-            hw->media_type == MEDIA_TYPE_1000M_FULL) {
-                ecmd->advertising |= ADVERTISED_Autoneg;
-                if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR) {
-                        ecmd->advertising |= ADVERTISED_Autoneg;
-                        ecmd->advertising |=
-                            (ADVERTISED_10baseT_Half |
-                             ADVERTISED_10baseT_Full |
-                             ADVERTISED_100baseT_Half |
-                             ADVERTISED_100baseT_Full |
-                             ADVERTISED_1000baseT_Full);
-                }
-                else
-                        ecmd->advertising |= (ADVERTISED_1000baseT_Full);
-        }
-        ecmd->port = PORT_TP;
-        ecmd->phy_address = 0;
-        ecmd->transceiver = XCVR_INTERNAL;
-
-        if (netif_carrier_ok(adapter->netdev)) {
-                u16 link_speed, link_duplex;
-                atl1_get_speed_and_duplex(hw, &link_speed, &link_duplex);
-                ecmd->speed = link_speed;
-                if (link_duplex == FULL_DUPLEX)
-                        ecmd->duplex = DUPLEX_FULL;
-                else
-                        ecmd->duplex = DUPLEX_HALF;
-        } else {
-                ecmd->speed = -1;
-                ecmd->duplex = -1;
-        }
-        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
-            hw->media_type == MEDIA_TYPE_1000M_FULL)
-                ecmd->autoneg = AUTONEG_ENABLE;
-        else
-                ecmd->autoneg = AUTONEG_DISABLE;
-
-        return 0;
-}
-
-static int atl1_set_settings(struct net_device *netdev,
-                                struct ethtool_cmd *ecmd)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_hw *hw = &adapter->hw;
-        u16 phy_data;
-        int ret_val = 0;
-        u16 old_media_type = hw->media_type;
-
-        if (netif_running(adapter->netdev)) {
-                dev_dbg(&adapter->pdev->dev, "ethtool shutting down adapter\n");
-                atl1_down(adapter);
-        }
-
-        if (ecmd->autoneg == AUTONEG_ENABLE)
-                hw->media_type = MEDIA_TYPE_AUTO_SENSOR;
-        else {
-                if (ecmd->speed == SPEED_1000) {
-                        if (ecmd->duplex != DUPLEX_FULL) {
-                                dev_warn(&adapter->pdev->dev,
-                                        "can't force to 1000M half duplex\n");
-                                ret_val = -EINVAL;
-                                goto exit_sset;
-                        }
-                        hw->media_type = MEDIA_TYPE_1000M_FULL;
-                } else if (ecmd->speed == SPEED_100) {
-                        if (ecmd->duplex == DUPLEX_FULL) {
-                                hw->media_type = MEDIA_TYPE_100M_FULL;
-                        } else
-                                hw->media_type = MEDIA_TYPE_100M_HALF;
-                } else {
-                        if (ecmd->duplex == DUPLEX_FULL)
-                                hw->media_type = MEDIA_TYPE_10M_FULL;
-                        else
-                                hw->media_type = MEDIA_TYPE_10M_HALF;
-                }
-        }
-        switch (hw->media_type) {
-        case MEDIA_TYPE_AUTO_SENSOR:
-                ecmd->advertising =
-                    ADVERTISED_10baseT_Half |
-                    ADVERTISED_10baseT_Full |
-                    ADVERTISED_100baseT_Half |
-                    ADVERTISED_100baseT_Full |
-                    ADVERTISED_1000baseT_Full |
-                    ADVERTISED_Autoneg | ADVERTISED_TP;
-                break;
-        case MEDIA_TYPE_1000M_FULL:
-                ecmd->advertising =
-                    ADVERTISED_1000baseT_Full |
-                    ADVERTISED_Autoneg | ADVERTISED_TP;
-                break;
-        default:
-                ecmd->advertising = 0;
-                break;
-        }
-        if (atl1_phy_setup_autoneg_adv(hw)) {
-                ret_val = -EINVAL;
-                dev_warn(&adapter->pdev->dev,
-                        "invalid ethtool speed/duplex setting\n");
-                goto exit_sset;
-        }
-        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
-            hw->media_type == MEDIA_TYPE_1000M_FULL)
-                phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN;
-        else {
-                switch (hw->media_type) {
-                case MEDIA_TYPE_100M_FULL:
-                        phy_data =
-                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_100 |
-                            MII_CR_RESET;
-                        break;
-                case MEDIA_TYPE_100M_HALF:
-                        phy_data = MII_CR_SPEED_100 | MII_CR_RESET;
-                        break;
-                case MEDIA_TYPE_10M_FULL:
-                        phy_data =
-                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_10 | MII_CR_RESET;
-                        break;
-                default:        /* MEDIA_TYPE_10M_HALF: */
-                        phy_data = MII_CR_SPEED_10 | MII_CR_RESET;
-                        break;
-                }
-        }
-        atl1_write_phy_reg(hw, MII_BMCR, phy_data);
-exit_sset:
-        if (ret_val)
-                hw->media_type = old_media_type;
-
-        if (netif_running(adapter->netdev)) {
-                dev_dbg(&adapter->pdev->dev, "ethtool starting adapter\n");
-                atl1_up(adapter);
-        } else if (!ret_val) {
-                dev_dbg(&adapter->pdev->dev, "ethtool resetting adapter\n");
-                atl1_reset(adapter);
-        }
-        return ret_val;
-}
-
-static void atl1_get_drvinfo(struct net_device *netdev,
-                                struct ethtool_drvinfo *drvinfo)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-
-        strncpy(drvinfo->driver, atl1_driver_name, sizeof(drvinfo->driver));
-        strncpy(drvinfo->version, atl1_driver_version,
-                sizeof(drvinfo->version));
-        strncpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
-        strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
-                sizeof(drvinfo->bus_info));
-        drvinfo->eedump_len = ATL1_EEDUMP_LEN;
-}
-
-static void atl1_get_wol(struct net_device *netdev,
-                            struct ethtool_wolinfo *wol)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-
-        wol->supported = WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;
-        wol->wolopts = 0;
-        if (adapter->wol & ATL1_WUFC_EX)
-                wol->wolopts |= WAKE_UCAST;
-        if (adapter->wol & ATL1_WUFC_MC)
-                wol->wolopts |= WAKE_MCAST;
-        if (adapter->wol & ATL1_WUFC_BC)
-                wol->wolopts |= WAKE_BCAST;
-        if (adapter->wol & ATL1_WUFC_MAG)
-                wol->wolopts |= WAKE_MAGIC;
-        return;
-}
-
-static int atl1_set_wol(struct net_device *netdev,
-                        struct ethtool_wolinfo *wol)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-
-        if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
-                return -EOPNOTSUPP;
-        adapter->wol = 0;
-        if (wol->wolopts & WAKE_UCAST)
-                adapter->wol |= ATL1_WUFC_EX;
-        if (wol->wolopts & WAKE_MCAST)
-                adapter->wol |= ATL1_WUFC_MC;
-        if (wol->wolopts & WAKE_BCAST)
-                adapter->wol |= ATL1_WUFC_BC;
-        if (wol->wolopts & WAKE_MAGIC)
-                adapter->wol |= ATL1_WUFC_MAG;
-        return 0;
-}
-
-static void atl1_get_ringparam(struct net_device *netdev,
-                            struct ethtool_ringparam *ring)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_tpd_ring *txdr = &adapter->tpd_ring;
-        struct atl1_rfd_ring *rxdr = &adapter->rfd_ring;
-
-        ring->rx_max_pending = ATL1_MAX_RFD;
-        ring->tx_max_pending = ATL1_MAX_TPD;
-        ring->rx_mini_max_pending = 0;
-        ring->rx_jumbo_max_pending = 0;
-        ring->rx_pending = rxdr->count;
-        ring->tx_pending = txdr->count;
-        ring->rx_mini_pending = 0;
-        ring->rx_jumbo_pending = 0;
-}
-
-static int atl1_set_ringparam(struct net_device *netdev,
-                                struct ethtool_ringparam *ring)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_tpd_ring *tpdr = &adapter->tpd_ring;
-        struct atl1_rrd_ring *rrdr = &adapter->rrd_ring;
-        struct atl1_rfd_ring *rfdr = &adapter->rfd_ring;
-
-        struct atl1_tpd_ring tpd_old, tpd_new;
-        struct atl1_rfd_ring rfd_old, rfd_new;
-        struct atl1_rrd_ring rrd_old, rrd_new;
-        struct atl1_ring_header rhdr_old, rhdr_new;
-        int err;
-
-        tpd_old = adapter->tpd_ring;
-        rfd_old = adapter->rfd_ring;
-        rrd_old = adapter->rrd_ring;
-        rhdr_old = adapter->ring_header;
-
-        if (netif_running(adapter->netdev))
-                atl1_down(adapter);
-
-        rfdr->count = (u16) max(ring->rx_pending, (u32) ATL1_MIN_RFD);
-        rfdr->count = rfdr->count > ATL1_MAX_RFD ? ATL1_MAX_RFD :
-                        rfdr->count;
-        rfdr->count = (rfdr->count + 3) & ~3;
-        rrdr->count = rfdr->count;
-
-        tpdr->count = (u16) max(ring->tx_pending, (u32) ATL1_MIN_TPD);
-        tpdr->count = tpdr->count > ATL1_MAX_TPD ? ATL1_MAX_TPD :
-                        tpdr->count;
-        tpdr->count = (tpdr->count + 3) & ~3;
-
-        if (netif_running(adapter->netdev)) {
-                /* try to get new resources before deleting old */
-                err = atl1_setup_ring_resources(adapter);
-                if (err)
-                        goto err_setup_ring;
-
-                /*
-                 * save the new, restore the old in order to free it,
-                 * then restore the new back again
-                 */
-
-                rfd_new = adapter->rfd_ring;
-                rrd_new = adapter->rrd_ring;
-                tpd_new = adapter->tpd_ring;
-                rhdr_new = adapter->ring_header;
-                adapter->rfd_ring = rfd_old;
-                adapter->rrd_ring = rrd_old;
-                adapter->tpd_ring = tpd_old;
-                adapter->ring_header = rhdr_old;
-                atl1_free_ring_resources(adapter);
-                adapter->rfd_ring = rfd_new;
-                adapter->rrd_ring = rrd_new;
-                adapter->tpd_ring = tpd_new;
-                adapter->ring_header = rhdr_new;
-
-                err = atl1_up(adapter);
-                if (err)
-                        return err;
-        }
-        return 0;
-
-err_setup_ring:
-        adapter->rfd_ring = rfd_old;
-        adapter->rrd_ring = rrd_old;
-        adapter->tpd_ring = tpd_old;
-        adapter->ring_header = rhdr_old;
-        atl1_up(adapter);
-        return err;
-}
-
-static void atl1_get_pauseparam(struct net_device *netdev,
-                             struct ethtool_pauseparam *epause)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_hw *hw = &adapter->hw;
-
-        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
-            hw->media_type == MEDIA_TYPE_1000M_FULL) {
-                epause->autoneg = AUTONEG_ENABLE;
-        } else {
-                epause->autoneg = AUTONEG_DISABLE;
-        }
-        epause->rx_pause = 1;
-        epause->tx_pause = 1;
-}
-
-static int atl1_set_pauseparam(struct net_device *netdev,
-                             struct ethtool_pauseparam *epause)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_hw *hw = &adapter->hw;
-
-        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
-            hw->media_type == MEDIA_TYPE_1000M_FULL) {
-                epause->autoneg = AUTONEG_ENABLE;
-        } else {
-                epause->autoneg = AUTONEG_DISABLE;
-        }
-
-        epause->rx_pause = 1;
-        epause->tx_pause = 1;
-
-        return 0;
-}
-
-static u32 atl1_get_rx_csum(struct net_device *netdev)
-{
-        return 1;
-}
-
-static void atl1_get_strings(struct net_device *netdev, u32 stringset,
-                                u8 *data)
-{
-        u8 *p = data;
-        int i;
-
-        switch (stringset) {
-        case ETH_SS_STATS:
-                for (i = 0; i < ARRAY_SIZE(atl1_gstrings_stats); i++) {
-                        memcpy(p, atl1_gstrings_stats[i].stat_string,
-                                ETH_GSTRING_LEN);
-                        p += ETH_GSTRING_LEN;
-                }
-                break;
-        }
-}
-
-static int atl1_nway_reset(struct net_device *netdev)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_hw *hw = &adapter->hw;
-
-        if (netif_running(netdev)) {
-                u16 phy_data;
-                atl1_down(adapter);
-
-                if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
-                        hw->media_type == MEDIA_TYPE_1000M_FULL) {
-                        phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN;
-                } else {
-                        switch (hw->media_type) {
-                        case MEDIA_TYPE_100M_FULL:
-                                phy_data = MII_CR_FULL_DUPLEX |
-                                        MII_CR_SPEED_100 | MII_CR_RESET;
-                                break;
-                        case MEDIA_TYPE_100M_HALF:
-                                phy_data = MII_CR_SPEED_100 | MII_CR_RESET;
-                                break;
-                        case MEDIA_TYPE_10M_FULL:
-                                phy_data = MII_CR_FULL_DUPLEX |
-                                        MII_CR_SPEED_10 | MII_CR_RESET;
-                                break;
-                        default:  /* MEDIA_TYPE_10M_HALF */
-                                phy_data = MII_CR_SPEED_10 | MII_CR_RESET;
-                        }
-                }
-                atl1_write_phy_reg(hw, MII_BMCR, phy_data);
-                atl1_up(adapter);
-        }
-        return 0;
-}
-
-const struct ethtool_ops atl1_ethtool_ops = {
-        .get_settings           = atl1_get_settings,
-        .set_settings           = atl1_set_settings,
-        .get_drvinfo            = atl1_get_drvinfo,
-        .get_wol                = atl1_get_wol,
-        .set_wol                = atl1_set_wol,
-        .get_ringparam          = atl1_get_ringparam,
-        .set_ringparam          = atl1_set_ringparam,
-        .get_pauseparam         = atl1_get_pauseparam,
-        .set_pauseparam         = atl1_set_pauseparam,
-        .get_rx_csum            = atl1_get_rx_csum,
-        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
-        .get_link               = ethtool_op_get_link,
-        .set_sg                 = ethtool_op_set_sg,
-        .get_strings            = atl1_get_strings,
-        .nway_reset             = atl1_nway_reset,
-        .get_ethtool_stats      = atl1_get_ethtool_stats,
-        .get_sset_count         = atl1_get_sset_count,
-        .set_tso                = ethtool_op_set_tso,
-};
diff --git a/drivers/net/atl1/atl1_hw.c b/drivers/net/atl1/atl1_hw.c
deleted file mode 100644
index 9d3bd22e3a82..000000000000
--- a/drivers/net/atl1/atl1_hw.c
+++ /dev/null
@@ -1,720 +0,0 @@
-/*
- * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
- * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
- *
- * Derived from Intel e1000 driver
- * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/if_vlan.h>
-#include <linux/etherdevice.h>
-#include <linux/crc32.h>
-#include <asm/byteorder.h>
-
-#include "atl1.h"
-
-/*
- * Reset the transmit and receive units; mask and clear all interrupts.
- * hw - Struct containing variables accessed by shared code
- * return : ATL1_SUCCESS  or  idle status (if error)
- */
-s32 atl1_reset_hw(struct atl1_hw *hw)
-{
-        struct pci_dev *pdev = hw->back->pdev;
-        u32 icr;
-        int i;
-
-        /*
-         * Clear Interrupt mask to stop board from generating
-         * interrupts & Clear any pending interrupt events
-         */
-        /*
-         * iowrite32(0, hw->hw_addr + REG_IMR);
-         * iowrite32(0xffffffff, hw->hw_addr + REG_ISR);
-         */
-
-        /*
-         * Issue Soft Reset to the MAC.  This will reset the chip's
-         * transmit, receive, DMA.  It will not effect
-         * the current PCI configuration.  The global reset bit is self-
-         * clearing, and should clear within a microsecond.
-         */
-        iowrite32(MASTER_CTRL_SOFT_RST, hw->hw_addr + REG_MASTER_CTRL);
-        ioread32(hw->hw_addr + REG_MASTER_CTRL);
-
-        iowrite16(1, hw->hw_addr + REG_GPHY_ENABLE);
-        ioread16(hw->hw_addr + REG_GPHY_ENABLE);
-
-        msleep(1);              /* delay about 1ms */
-
-        /* Wait at least 10ms for All module to be Idle */
-        for (i = 0; i < 10; i++) {
-                icr = ioread32(hw->hw_addr + REG_IDLE_STATUS);
-                if (!icr)
-                        break;
-                msleep(1);      /* delay 1 ms */
-                cpu_relax();    /* FIXME: is this still the right way to do this? */
-        }
-
-        if (icr) {
-                dev_dbg(&pdev->dev, "ICR = 0x%x\n", icr);
-                return icr;
-        }
-
-        return ATL1_SUCCESS;
-}
-
-/* function about EEPROM
- *
- * check_eeprom_exist
- * return 0 if eeprom exist
- */
-static int atl1_check_eeprom_exist(struct atl1_hw *hw)
-{
-        u32 value;
-        value = ioread32(hw->hw_addr + REG_SPI_FLASH_CTRL);
-        if (value & SPI_FLASH_CTRL_EN_VPD) {
-                value &= ~SPI_FLASH_CTRL_EN_VPD;
-                iowrite32(value, hw->hw_addr + REG_SPI_FLASH_CTRL);
-        }
-
-        value = ioread16(hw->hw_addr + REG_PCIE_CAP_LIST);
-        return ((value & 0xFF00) == 0x6C00) ? 0 : 1;
-}
-
-static bool atl1_read_eeprom(struct atl1_hw *hw, u32 offset, u32 *p_value)
-{
-        int i;
-        u32 control;
-
-        if (offset & 3)
-                return false;   /* address do not align */
-
-        iowrite32(0, hw->hw_addr + REG_VPD_DATA);
-        control = (offset & VPD_CAP_VPD_ADDR_MASK) << VPD_CAP_VPD_ADDR_SHIFT;
-        iowrite32(control, hw->hw_addr + REG_VPD_CAP);
-        ioread32(hw->hw_addr + REG_VPD_CAP);
-
-        for (i = 0; i < 10; i++) {
-                msleep(2);
-                control = ioread32(hw->hw_addr + REG_VPD_CAP);
-                if (control & VPD_CAP_VPD_FLAG)
-                        break;
-        }
-        if (control & VPD_CAP_VPD_FLAG) {
-                *p_value = ioread32(hw->hw_addr + REG_VPD_DATA);
-                return true;
-        }
-        return false;           /* timeout */
-}
-
-/*
- * Reads the value from a PHY register
- * hw - Struct containing variables accessed by shared code
- * reg_addr - address of the PHY register to read
- */
-s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data)
-{
-        u32 val;
-        int i;
-
-        val = ((u32) (reg_addr & MDIO_REG_ADDR_MASK)) << MDIO_REG_ADDR_SHIFT |
-                MDIO_START | MDIO_SUP_PREAMBLE | MDIO_RW | MDIO_CLK_25_4 <<
-                MDIO_CLK_SEL_SHIFT;
-        iowrite32(val, hw->hw_addr + REG_MDIO_CTRL);
-        ioread32(hw->hw_addr + REG_MDIO_CTRL);
-
-        for (i = 0; i < MDIO_WAIT_TIMES; i++) {
-                udelay(2);
-                val = ioread32(hw->hw_addr + REG_MDIO_CTRL);
-                if (!(val & (MDIO_START | MDIO_BUSY)))
-                        break;
-        }
-        if (!(val & (MDIO_START | MDIO_BUSY))) {
-                *phy_data = (u16) val;
-                return ATL1_SUCCESS;
-        }
-        return ATL1_ERR_PHY;
-}
-
-#define CUSTOM_SPI_CS_SETUP     2
-#define CUSTOM_SPI_CLK_HI       2
-#define CUSTOM_SPI_CLK_LO       2
-#define CUSTOM_SPI_CS_HOLD      2
-#define CUSTOM_SPI_CS_HI        3
-
-static bool atl1_spi_read(struct atl1_hw *hw, u32 addr, u32 *buf)
-{
-        int i;
-        u32 value;
-
-        iowrite32(0, hw->hw_addr + REG_SPI_DATA);
-        iowrite32(addr, hw->hw_addr + REG_SPI_ADDR);
-
-        value = SPI_FLASH_CTRL_WAIT_READY |
-            (CUSTOM_SPI_CS_SETUP & SPI_FLASH_CTRL_CS_SETUP_MASK) <<
-            SPI_FLASH_CTRL_CS_SETUP_SHIFT | (CUSTOM_SPI_CLK_HI &
-                                             SPI_FLASH_CTRL_CLK_HI_MASK) <<
-            SPI_FLASH_CTRL_CLK_HI_SHIFT | (CUSTOM_SPI_CLK_LO &
-                                           SPI_FLASH_CTRL_CLK_LO_MASK) <<
-            SPI_FLASH_CTRL_CLK_LO_SHIFT | (CUSTOM_SPI_CS_HOLD &
-                                           SPI_FLASH_CTRL_CS_HOLD_MASK) <<
-            SPI_FLASH_CTRL_CS_HOLD_SHIFT | (CUSTOM_SPI_CS_HI &
-                                            SPI_FLASH_CTRL_CS_HI_MASK) <<
-            SPI_FLASH_CTRL_CS_HI_SHIFT | (1 & SPI_FLASH_CTRL_INS_MASK) <<
-            SPI_FLASH_CTRL_INS_SHIFT;
-
-        iowrite32(value, hw->hw_addr + REG_SPI_FLASH_CTRL);
-
-        value |= SPI_FLASH_CTRL_START;
-        iowrite32(value, hw->hw_addr + REG_SPI_FLASH_CTRL);
-        ioread32(hw->hw_addr + REG_SPI_FLASH_CTRL);
-
-        for (i = 0; i < 10; i++) {
-                msleep(1);      /* 1ms */
-                value = ioread32(hw->hw_addr + REG_SPI_FLASH_CTRL);
-                if (!(value & SPI_FLASH_CTRL_START))
-                        break;
-        }
-
-        if (value & SPI_FLASH_CTRL_START)
-                return false;
-
-        *buf = ioread32(hw->hw_addr + REG_SPI_DATA);
-
-        return true;
-}
-
-/*
- * get_permanent_address
- * return 0 if get valid mac address,
- */
-static int atl1_get_permanent_address(struct atl1_hw *hw)
-{
-        u32 addr[2];
-        u32 i, control;
-        u16 reg;
-        u8 eth_addr[ETH_ALEN];
-        bool key_valid;
-
-        if (is_valid_ether_addr(hw->perm_mac_addr))
-                return 0;
-
-        /* init */
-        addr[0] = addr[1] = 0;
-
-        if (!atl1_check_eeprom_exist(hw)) {     /* eeprom exist */
-                reg = 0;
-                key_valid = false;
-                /* Read out all EEPROM content */
-                i = 0;
-                while (1) {
-                        if (atl1_read_eeprom(hw, i + 0x100, &control)) {
-                                if (key_valid) {
-                                        if (reg == REG_MAC_STA_ADDR)
-                                                addr[0] = control;
-                                        else if (reg == (REG_MAC_STA_ADDR + 4))
-                                                addr[1] = control;
-                                        key_valid = false;
-                                } else if ((control & 0xff) == 0x5A) {
-                                        key_valid = true;
-                                        reg = (u16) (control >> 16);
-                                } else
-                                        break;  /* assume data end while encount an invalid KEYWORD */
-                        } else
-                                break;  /* read error */
-                        i += 4;
-                }
-
-                *(u32 *) &eth_addr[2] = swab32(addr[0]);
-                *(u16 *) &eth_addr[0] = swab16(*(u16 *) &addr[1]);
-                if (is_valid_ether_addr(eth_addr)) {
-                        memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
-                        return 0;
-                }
-                return 1;
-        }
-
-        /* see if SPI FLAGS exist ? */
-        addr[0] = addr[1] = 0;
-        reg = 0;
-        key_valid = false;
-        i = 0;
-        while (1) {
-                if (atl1_spi_read(hw, i + 0x1f000, &control)) {
-                        if (key_valid) {
-                                if (reg == REG_MAC_STA_ADDR)
-                                        addr[0] = control;
-                                else if (reg == (REG_MAC_STA_ADDR + 4))
-                                        addr[1] = control;
-                                key_valid = false;
-                        } else if ((control & 0xff) == 0x5A) {
-                                key_valid = true;
-                                reg = (u16) (control >> 16);
-                        } else
-                                break;  /* data end */
-                } else
-                        break;  /* read error */
-                i += 4;
-        }
-
-        *(u32 *) &eth_addr[2] = swab32(addr[0]);
-        *(u16 *) &eth_addr[0] = swab16(*(u16 *) &addr[1]);
-        if (is_valid_ether_addr(eth_addr)) {
-                memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
-                return 0;
-        }
-
-        /*
-         * On some motherboards, the MAC address is written by the
-         * BIOS directly to the MAC register during POST, and is
-         * not stored in eeprom.  If all else thus far has failed
-         * to fetch the permanent MAC address, try reading it directly.
-         */
-        addr[0] = ioread32(hw->hw_addr + REG_MAC_STA_ADDR);
-        addr[1] = ioread16(hw->hw_addr + (REG_MAC_STA_ADDR + 4));
-        *(u32 *) &eth_addr[2] = swab32(addr[0]);
-        *(u16 *) &eth_addr[0] = swab16(*(u16 *) &addr[1]);
-        if (is_valid_ether_addr(eth_addr)) {
-                memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
-                return 0;
-        }
-
-        return 1;
-}
-
-/*
- * Reads the adapter's MAC address from the EEPROM
- * hw - Struct containing variables accessed by shared code
- */
-s32 atl1_read_mac_addr(struct atl1_hw *hw)
-{
-        u16 i;
-
-        if (atl1_get_permanent_address(hw))
-                random_ether_addr(hw->perm_mac_addr);
-
-        for (i = 0; i < ETH_ALEN; i++)
-                hw->mac_addr[i] = hw->perm_mac_addr[i];
-        return ATL1_SUCCESS;
-}
-
-/*
- * Hashes an address to determine its location in the multicast table
- * hw - Struct containing variables accessed by shared code
- * mc_addr - the multicast address to hash
- *
- * atl1_hash_mc_addr
- *  purpose
- *      set hash value for a multicast address
- *      hash calcu processing :
- *          1. calcu 32bit CRC for multicast address
- *          2. reverse crc with MSB to LSB
- */
-u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr)
-{
-        u32 crc32, value = 0;
-        int i;
-
-        crc32 = ether_crc_le(6, mc_addr);
-        for (i = 0; i < 32; i++)
-                value |= (((crc32 >> i) & 1) << (31 - i));
-
-        return value;
-}
-
-/*
- * Sets the bit in the multicast table corresponding to the hash value.
- * hw - Struct containing variables accessed by shared code
- * hash_value - Multicast address hash value
- */
-void atl1_hash_set(struct atl1_hw *hw, u32 hash_value)
-{
-        u32 hash_bit, hash_reg;
-        u32 mta;
-
-        /*
-         * The HASH Table  is a register array of 2 32-bit registers.
-         * It is treated like an array of 64 bits.  We want to set
-         * bit BitArray[hash_value]. So we figure out what register
-         * the bit is in, read it, OR in the new bit, then write
-         * back the new value.  The register is determined by the
-         * upper 7 bits of the hash value and the bit within that
-         * register are determined by the lower 5 bits of the value.
-         */
-        hash_reg = (hash_value >> 31) & 0x1;
-        hash_bit = (hash_value >> 26) & 0x1F;
-        mta = ioread32((hw->hw_addr + REG_RX_HASH_TABLE) + (hash_reg << 2));
-        mta |= (1 << hash_bit);
-        iowrite32(mta, (hw->hw_addr + REG_RX_HASH_TABLE) + (hash_reg << 2));
-}
-
-/*
- * Writes a value to a PHY register
- * hw - Struct containing variables accessed by shared code
- * reg_addr - address of the PHY register to write
- * data - data to write to the PHY
- */
-s32 atl1_write_phy_reg(struct atl1_hw *hw, u32 reg_addr, u16 phy_data)
-{
-        int i;
-        u32 val;
-
-        val = ((u32) (phy_data & MDIO_DATA_MASK)) << MDIO_DATA_SHIFT |
-            (reg_addr & MDIO_REG_ADDR_MASK) << MDIO_REG_ADDR_SHIFT |
-            MDIO_SUP_PREAMBLE |
-            MDIO_START | MDIO_CLK_25_4 << MDIO_CLK_SEL_SHIFT;
-        iowrite32(val, hw->hw_addr + REG_MDIO_CTRL);
-        ioread32(hw->hw_addr + REG_MDIO_CTRL);
-
-        for (i = 0; i < MDIO_WAIT_TIMES; i++) {
-                udelay(2);
-                val = ioread32(hw->hw_addr + REG_MDIO_CTRL);
-                if (!(val & (MDIO_START | MDIO_BUSY)))
-                        break;
-        }
-
-        if (!(val & (MDIO_START | MDIO_BUSY)))
-                return ATL1_SUCCESS;
-
-        return ATL1_ERR_PHY;
-}
-
-/*
- * Make L001's PHY out of Power Saving State (bug)
- * hw - Struct containing variables accessed by shared code
- * when power on, L001's PHY always on Power saving State
- * (Gigabit Link forbidden)
- */
-static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw)
-{
-        s32 ret;
-        ret = atl1_write_phy_reg(hw, 29, 0x0029);
-        if (ret)
-                return ret;
-        return atl1_write_phy_reg(hw, 30, 0);
-}
-
-/*
- *TODO: do something or get rid of this
- */
-s32 atl1_phy_enter_power_saving(struct atl1_hw *hw)
-{
-/*    s32 ret_val;
- *    u16 phy_data;
- */
-
-/*
-    ret_val = atl1_write_phy_reg(hw, ...);
-    ret_val = atl1_write_phy_reg(hw, ...);
-    ....
-*/
-        return ATL1_SUCCESS;
-}
-
-/*
- * Resets the PHY and make all config validate
- * hw - Struct containing variables accessed by shared code
- *
- * Sets bit 15 and 12 of the MII Control regiser (for F001 bug)
- */
-static s32 atl1_phy_reset(struct atl1_hw *hw)
-{
-        struct pci_dev *pdev = hw->back->pdev;
-        s32 ret_val;
-        u16 phy_data;
-
-        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
-            hw->media_type == MEDIA_TYPE_1000M_FULL)
-                phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN;
-        else {
-                switch (hw->media_type) {
-                case MEDIA_TYPE_100M_FULL:
-                        phy_data =
-                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_100 |
-                            MII_CR_RESET;
-                        break;
-                case MEDIA_TYPE_100M_HALF:
-                        phy_data = MII_CR_SPEED_100 | MII_CR_RESET;
-                        break;
-                case MEDIA_TYPE_10M_FULL:
-                        phy_data =
-                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_10 | MII_CR_RESET;
-                        break;
-                default:        /* MEDIA_TYPE_10M_HALF: */
-                        phy_data = MII_CR_SPEED_10 | MII_CR_RESET;
-                        break;
-                }
-        }
-
-        ret_val = atl1_write_phy_reg(hw, MII_BMCR, phy_data);
-        if (ret_val) {
-                u32 val;
-                int i;
-                /* pcie serdes link may be down! */
-                dev_dbg(&pdev->dev, "pcie phy link down\n");
-
-                for (i = 0; i < 25; i++) {
-                        msleep(1);
-                        val = ioread32(hw->hw_addr + REG_MDIO_CTRL);
-                        if (!(val & (MDIO_START | MDIO_BUSY)))
-                                break;
-                }
-
-                if ((val & (MDIO_START | MDIO_BUSY)) != 0) {
-                        dev_warn(&pdev->dev, "pcie link down at least 25ms\n");
-                        return ret_val;
-                }
-        }
-        return ATL1_SUCCESS;
-}
-
-/*
- * Configures PHY autoneg and flow control advertisement settings
- * hw - Struct containing variables accessed by shared code
- */
-s32 atl1_phy_setup_autoneg_adv(struct atl1_hw *hw)
-{
-        s32 ret_val;
-        s16 mii_autoneg_adv_reg;
-        s16 mii_1000t_ctrl_reg;
-
-        /* Read the MII Auto-Neg Advertisement Register (Address 4). */
-        mii_autoneg_adv_reg = MII_AR_DEFAULT_CAP_MASK;
-
-        /* Read the MII 1000Base-T Control Register (Address 9). */
-        mii_1000t_ctrl_reg = MII_AT001_CR_1000T_DEFAULT_CAP_MASK;
-
-        /*
-         * First we clear all the 10/100 mb speed bits in the Auto-Neg
-         * Advertisement Register (Address 4) and the 1000 mb speed bits in
-         * the  1000Base-T Control Register (Address 9).
-         */
-        mii_autoneg_adv_reg &= ~MII_AR_SPEED_MASK;
-        mii_1000t_ctrl_reg &= ~MII_AT001_CR_1000T_SPEED_MASK;
-
-        /*
-         * Need to parse media_type  and set up
-         * the appropriate PHY registers.
-         */
-        switch (hw->media_type) {
-        case MEDIA_TYPE_AUTO_SENSOR:
-                mii_autoneg_adv_reg |= (MII_AR_10T_HD_CAPS |
-                                        MII_AR_10T_FD_CAPS |
-                                        MII_AR_100TX_HD_CAPS |
-                                        MII_AR_100TX_FD_CAPS);
-                mii_1000t_ctrl_reg |= MII_AT001_CR_1000T_FD_CAPS;
-                break;
-
-        case MEDIA_TYPE_1000M_FULL:
-                mii_1000t_ctrl_reg |= MII_AT001_CR_1000T_FD_CAPS;
-                break;
-
-        case MEDIA_TYPE_100M_FULL:
-                mii_autoneg_adv_reg |= MII_AR_100TX_FD_CAPS;
-                break;
-
-        case MEDIA_TYPE_100M_HALF:
-                mii_autoneg_adv_reg |= MII_AR_100TX_HD_CAPS;
-                break;
-
-        case MEDIA_TYPE_10M_FULL:
-                mii_autoneg_adv_reg |= MII_AR_10T_FD_CAPS;
-                break;
-
-        default:
-                mii_autoneg_adv_reg |= MII_AR_10T_HD_CAPS;
-                break;
-        }
-
-        /* flow control fixed to enable all */
-        mii_autoneg_adv_reg |= (MII_AR_ASM_DIR | MII_AR_PAUSE);
-
-        hw->mii_autoneg_adv_reg = mii_autoneg_adv_reg;
-        hw->mii_1000t_ctrl_reg = mii_1000t_ctrl_reg;
-
-        ret_val = atl1_write_phy_reg(hw, MII_ADVERTISE, mii_autoneg_adv_reg);
-        if (ret_val)
-                return ret_val;
-
-        ret_val = atl1_write_phy_reg(hw, MII_AT001_CR, mii_1000t_ctrl_reg);
-        if (ret_val)
-                return ret_val;
-
-        return ATL1_SUCCESS;
-}
-
-/*
- * Configures link settings.
- * hw - Struct containing variables accessed by shared code
- * Assumes the hardware has previously been reset and the
- * transmitter and receiver are not enabled.
- */
-static s32 atl1_setup_link(struct atl1_hw *hw)
-{
-        struct pci_dev *pdev = hw->back->pdev;
-        s32 ret_val;
-
-        /*
-         * Options:
-         *  PHY will advertise value(s) parsed from
-         *  autoneg_advertised and fc
-         *  no matter what autoneg is , We will not wait link result.
-         */
-        ret_val = atl1_phy_setup_autoneg_adv(hw);
-        if (ret_val) {
-                dev_dbg(&pdev->dev, "error setting up autonegotiation\n");
-                return ret_val;
-        }
-        /* SW.Reset , En-Auto-Neg if needed */
-        ret_val = atl1_phy_reset(hw);
-        if (ret_val) {
-                dev_dbg(&pdev->dev, "error resetting phy\n");
-                return ret_val;
-        }
-        hw->phy_configured = true;
-        return ret_val;
-}
-
-static struct atl1_spi_flash_dev flash_table[] = {
-/*      MFR_NAME  WRSR  READ  PRGM  WREN  WRDI  RDSR  RDID  SECTOR_ERASE CHIP_ERASE */
-        {"Atmel", 0x00, 0x03, 0x02, 0x06, 0x04, 0x05, 0x15, 0x52,        0x62},
-        {"SST",   0x01, 0x03, 0x02, 0x06, 0x04, 0x05, 0x90, 0x20,        0x60},
-        {"ST",    0x01, 0x03, 0x02, 0x06, 0x04, 0x05, 0xAB, 0xD8,        0xC7},
-};
-
-static void atl1_init_flash_opcode(struct atl1_hw *hw)
-{
-        if (hw->flash_vendor >= ARRAY_SIZE(flash_table))
-                hw->flash_vendor = 0;   /* ATMEL */
-
-        /* Init OP table */
-        iowrite8(flash_table[hw->flash_vendor].cmd_program,
-                hw->hw_addr + REG_SPI_FLASH_OP_PROGRAM);
-        iowrite8(flash_table[hw->flash_vendor].cmd_sector_erase,
-                hw->hw_addr + REG_SPI_FLASH_OP_SC_ERASE);
-        iowrite8(flash_table[hw->flash_vendor].cmd_chip_erase,
-                hw->hw_addr + REG_SPI_FLASH_OP_CHIP_ERASE);
-        iowrite8(flash_table[hw->flash_vendor].cmd_rdid,
-                hw->hw_addr + REG_SPI_FLASH_OP_RDID);
-        iowrite8(flash_table[hw->flash_vendor].cmd_wren,
-                hw->hw_addr + REG_SPI_FLASH_OP_WREN);
-        iowrite8(flash_table[hw->flash_vendor].cmd_rdsr,
-                hw->hw_addr + REG_SPI_FLASH_OP_RDSR);
-        iowrite8(flash_table[hw->flash_vendor].cmd_wrsr,
-                hw->hw_addr + REG_SPI_FLASH_OP_WRSR);
-        iowrite8(flash_table[hw->flash_vendor].cmd_read,
-                hw->hw_addr + REG_SPI_FLASH_OP_READ);
-}
-
-/*
- * Performs basic configuration of the adapter.
- * hw - Struct containing variables accessed by shared code
- * Assumes that the controller has previously been reset and is in a
- * post-reset uninitialized state. Initializes multicast table,
- * and  Calls routines to setup link
- * Leaves the transmit and receive units disabled and uninitialized.
- */
-s32 atl1_init_hw(struct atl1_hw *hw)
-{
-        u32 ret_val = 0;
-
-        /* Zero out the Multicast HASH table */
-        iowrite32(0, hw->hw_addr + REG_RX_HASH_TABLE);
-        /* clear the old settings from the multicast hash table */
-        iowrite32(0, (hw->hw_addr + REG_RX_HASH_TABLE) + (1 << 2));
-
-        atl1_init_flash_opcode(hw);
-
-        if (!hw->phy_configured) {
-                /* enable GPHY LinkChange Interrrupt */
-                ret_val = atl1_write_phy_reg(hw, 18, 0xC00);
-                if (ret_val)
-                        return ret_val;
-                /* make PHY out of power-saving state */
-                ret_val = atl1_phy_leave_power_saving(hw);
-                if (ret_val)
-                        return ret_val;
-                /* Call a subroutine to configure the link */
-                ret_val = atl1_setup_link(hw);
-        }
-        return ret_val;
-}
-
-/*
- * Detects the current speed and duplex settings of the hardware.
- * hw - Struct containing variables accessed by shared code
- * speed - Speed of the connection
- * duplex - Duplex setting of the connection
- */
-s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex)
-{
-        struct pci_dev *pdev = hw->back->pdev;
-        s32 ret_val;
-        u16 phy_data;
-
-        /* ; --- Read   PHY Specific Status Register (17) */
-        ret_val = atl1_read_phy_reg(hw, MII_AT001_PSSR, &phy_data);
-        if (ret_val)
-                return ret_val;
-
-        if (!(phy_data & MII_AT001_PSSR_SPD_DPLX_RESOLVED))
-                return ATL1_ERR_PHY_RES;
-
-        switch (phy_data & MII_AT001_PSSR_SPEED) {
-        case MII_AT001_PSSR_1000MBS:
-                *speed = SPEED_1000;
-                break;
-        case MII_AT001_PSSR_100MBS:
-                *speed = SPEED_100;
-                break;
-        case MII_AT001_PSSR_10MBS:
-                *speed = SPEED_10;
-                break;
-        default:
-                dev_dbg(&pdev->dev, "error getting speed\n");
-                return ATL1_ERR_PHY_SPEED;
-                break;
-        }
-        if (phy_data & MII_AT001_PSSR_DPLX)
-                *duplex = FULL_DUPLEX;
-        else
-                *duplex = HALF_DUPLEX;
-
-        return ATL1_SUCCESS;
-}
-
-void atl1_set_mac_addr(struct atl1_hw *hw)
-{
-        u32 value;
-        /*
-         * 00-0B-6A-F6-00-DC
-         * 0:  6AF600DC   1: 000B
-         * low dword
-         */
-        value = (((u32) hw->mac_addr[2]) << 24) |
-            (((u32) hw->mac_addr[3]) << 16) |
-            (((u32) hw->mac_addr[4]) << 8) | (((u32) hw->mac_addr[5]));
-        iowrite32(value, hw->hw_addr + REG_MAC_STA_ADDR);
-        /* high dword */
-        value = (((u32) hw->mac_addr[0]) << 8) | (((u32) hw->mac_addr[1]));
-        iowrite32(value, (hw->hw_addr + REG_MAC_STA_ADDR) + (1 << 2));
-}
diff --git a/drivers/net/atl1/atl1_hw.h b/drivers/net/atl1/atl1_hw.h
deleted file mode 100644
index 939aa0f53f6e..000000000000
--- a/drivers/net/atl1/atl1_hw.h
+++ /dev/null
@@ -1,946 +0,0 @@
-/*
- * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
- * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
- *
- * Derived from Intel e1000 driver
- * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * There are a lot of defines in here that are unused and/or have cryptic
- * names.  Please leave them alone, as they're the closest thing we have
- * to a spec from Attansic at present. *ahem* -- CHS
- */
-
-#ifndef _ATL1_HW_H_
-#define _ATL1_HW_H_
-
-#include <linux/types.h>
-#include <linux/mii.h>
-
-struct atl1_adapter;
-struct atl1_hw;
-
-/* function prototypes needed by multiple files */
-s32 atl1_phy_setup_autoneg_adv(struct atl1_hw *hw);
-s32 atl1_write_phy_reg(struct atl1_hw *hw, u32 reg_addr, u16 phy_data);
-s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex);
-s32 atl1_read_mac_addr(struct atl1_hw *hw);
-s32 atl1_init_hw(struct atl1_hw *hw);
-s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex);
-s32 atl1_set_speed_and_duplex(struct atl1_hw *hw, u16 speed, u16 duplex);
-u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr);
-void atl1_hash_set(struct atl1_hw *hw, u32 hash_value);
-s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data);
-void atl1_set_mac_addr(struct atl1_hw *hw);
-s32 atl1_phy_enter_power_saving(struct atl1_hw *hw);
-s32 atl1_reset_hw(struct atl1_hw *hw);
-void atl1_check_options(struct atl1_adapter *adapter);
-
-/* register definitions */
-#define REG_PCIE_CAP_LIST                       0x58
-
-#define REG_VPD_CAP                             0x6C
-#define VPD_CAP_ID_MASK                         0xff
-#define VPD_CAP_ID_SHIFT                        0
-#define VPD_CAP_NEXT_PTR_MASK                   0xFF
-#define VPD_CAP_NEXT_PTR_SHIFT                  8
-#define VPD_CAP_VPD_ADDR_MASK                   0x7FFF
-#define VPD_CAP_VPD_ADDR_SHIFT                  16
-#define VPD_CAP_VPD_FLAG                        0x80000000
-
-#define REG_VPD_DATA                            0x70
-
-#define REG_SPI_FLASH_CTRL                      0x200
-#define SPI_FLASH_CTRL_STS_NON_RDY              0x1
-#define SPI_FLASH_CTRL_STS_WEN                  0x2
-#define SPI_FLASH_CTRL_STS_WPEN                 0x80
-#define SPI_FLASH_CTRL_DEV_STS_MASK             0xFF
-#define SPI_FLASH_CTRL_DEV_STS_SHIFT            0
-#define SPI_FLASH_CTRL_INS_MASK                 0x7
-#define SPI_FLASH_CTRL_INS_SHIFT                8
-#define SPI_FLASH_CTRL_START                    0x800
-#define SPI_FLASH_CTRL_EN_VPD                   0x2000
-#define SPI_FLASH_CTRL_LDSTART                  0x8000
-#define SPI_FLASH_CTRL_CS_HI_MASK               0x3
-#define SPI_FLASH_CTRL_CS_HI_SHIFT              16
-#define SPI_FLASH_CTRL_CS_HOLD_MASK             0x3
-#define SPI_FLASH_CTRL_CS_HOLD_SHIFT            18
-#define SPI_FLASH_CTRL_CLK_LO_MASK              0x3
-#define SPI_FLASH_CTRL_CLK_LO_SHIFT             20
-#define SPI_FLASH_CTRL_CLK_HI_MASK              0x3
-#define SPI_FLASH_CTRL_CLK_HI_SHIFT             22
-#define SPI_FLASH_CTRL_CS_SETUP_MASK            0x3
-#define SPI_FLASH_CTRL_CS_SETUP_SHIFT           24
-#define SPI_FLASH_CTRL_EROM_PGSZ_MASK           0x3
-#define SPI_FLASH_CTRL_EROM_PGSZ_SHIFT          26
-#define SPI_FLASH_CTRL_WAIT_READY               0x10000000
-
-#define REG_SPI_ADDR                            0x204
-
-#define REG_SPI_DATA                            0x208
-
-#define REG_SPI_FLASH_CONFIG                    0x20C
-#define SPI_FLASH_CONFIG_LD_ADDR_MASK           0xFFFFFF
-#define SPI_FLASH_CONFIG_LD_ADDR_SHIFT          0
-#define SPI_FLASH_CONFIG_VPD_ADDR_MASK          0x3
-#define SPI_FLASH_CONFIG_VPD_ADDR_SHIFT         24
-#define SPI_FLASH_CONFIG_LD_EXIST               0x4000000
-
-#define REG_SPI_FLASH_OP_PROGRAM                0x210
-#define REG_SPI_FLASH_OP_SC_ERASE               0x211
-#define REG_SPI_FLASH_OP_CHIP_ERASE             0x212
-#define REG_SPI_FLASH_OP_RDID                   0x213
-#define REG_SPI_FLASH_OP_WREN                   0x214
-#define REG_SPI_FLASH_OP_RDSR                   0x215
-#define REG_SPI_FLASH_OP_WRSR                   0x216
-#define REG_SPI_FLASH_OP_READ                   0x217
-
-#define REG_TWSI_CTRL                           0x218
-#define TWSI_CTRL_LD_OFFSET_MASK                0xFF
-#define TWSI_CTRL_LD_OFFSET_SHIFT               0
-#define TWSI_CTRL_LD_SLV_ADDR_MASK              0x7
-#define TWSI_CTRL_LD_SLV_ADDR_SHIFT             8
-#define TWSI_CTRL_SW_LDSTART                    0x800
-#define TWSI_CTRL_HW_LDSTART                    0x1000
-#define TWSI_CTRL_SMB_SLV_ADDR_MASK             0x7F
-#define TWSI_CTRL_SMB_SLV_ADDR_SHIFT            15
-#define TWSI_CTRL_LD_EXIST                      0x400000
-#define TWSI_CTRL_READ_FREQ_SEL_MASK            0x3
-#define TWSI_CTRL_READ_FREQ_SEL_SHIFT           23
-#define TWSI_CTRL_FREQ_SEL_100K                 0
-#define TWSI_CTRL_FREQ_SEL_200K                 1
-#define TWSI_CTRL_FREQ_SEL_300K                 2
-#define TWSI_CTRL_FREQ_SEL_400K                 3
-#define TWSI_CTRL_SMB_SLV_ADDR
-#define TWSI_CTRL_WRITE_FREQ_SEL_MASK           0x3
-#define TWSI_CTRL_WRITE_FREQ_SEL_SHIFT          24
-
-#define REG_PCIE_DEV_MISC_CTRL                  0x21C
-#define PCIE_DEV_MISC_CTRL_EXT_PIPE             0x2
-#define PCIE_DEV_MISC_CTRL_RETRY_BUFDIS         0x1
-#define PCIE_DEV_MISC_CTRL_SPIROM_EXIST         0x4
-#define PCIE_DEV_MISC_CTRL_SERDES_ENDIAN        0x8
-#define PCIE_DEV_MISC_CTRL_SERDES_SEL_DIN       0x10
-
-/* Selene Master Control Register */
-#define REG_MASTER_CTRL                         0x1400
-#define MASTER_CTRL_SOFT_RST                    0x1
-#define MASTER_CTRL_MTIMER_EN                   0x2
-#define MASTER_CTRL_ITIMER_EN                   0x4
-#define MASTER_CTRL_MANUAL_INT                  0x8
-#define MASTER_CTRL_REV_NUM_SHIFT               16
-#define MASTER_CTRL_REV_NUM_MASK                0xff
-#define MASTER_CTRL_DEV_ID_SHIFT                24
-#define MASTER_CTRL_DEV_ID_MASK                 0xff
-
-/* Timer Initial Value Register */
-#define REG_MANUAL_TIMER_INIT                   0x1404
-
-/* IRQ ModeratorTimer Initial Value Register */
-#define REG_IRQ_MODU_TIMER_INIT                 0x1408
-
-#define REG_GPHY_ENABLE                         0x140C
-
-/* IRQ Anti-Lost Timer Initial Value Register */
-#define REG_CMBDISDMA_TIMER                     0x140E
-
-/* Block IDLE Status Register */
-#define REG_IDLE_STATUS                         0x1410
-#define IDLE_STATUS_RXMAC                       1
-#define IDLE_STATUS_TXMAC                       2
-#define IDLE_STATUS_RXQ                         4
-#define IDLE_STATUS_TXQ                         8
-#define IDLE_STATUS_DMAR                        0x10
-#define IDLE_STATUS_DMAW                        0x20
-#define IDLE_STATUS_SMB                         0x40
-#define IDLE_STATUS_CMB                         0x80
-
-/* MDIO Control Register */
-#define REG_MDIO_CTRL                           0x1414
-#define MDIO_DATA_MASK                          0xffff
-#define MDIO_DATA_SHIFT                         0
-#define MDIO_REG_ADDR_MASK                      0x1f
-#define MDIO_REG_ADDR_SHIFT                     16
-#define MDIO_RW                                 0x200000
-#define MDIO_SUP_PREAMBLE                       0x400000
-#define MDIO_START                              0x800000
-#define MDIO_CLK_SEL_SHIFT                      24
-#define MDIO_CLK_25_4                           0
-#define MDIO_CLK_25_6                           2
-#define MDIO_CLK_25_8                           3
-#define MDIO_CLK_25_10                          4
-#define MDIO_CLK_25_14                          5
-#define MDIO_CLK_25_20                          6
-#define MDIO_CLK_25_28                          7
-#define MDIO_BUSY                               0x8000000
-#define MDIO_WAIT_TIMES                         30
-
-/* MII PHY Status Register */
-#define REG_PHY_STATUS                          0x1418
-
-/* BIST Control and Status Register0 (for the Packet Memory) */
-#define REG_BIST0_CTRL                          0x141c
-#define BIST0_NOW                               0x1
-#define BIST0_SRAM_FAIL                         0x2
-#define BIST0_FUSE_FLAG                         0x4
-#define REG_BIST1_CTRL                          0x1420
-#define BIST1_NOW                               0x1
-#define BIST1_SRAM_FAIL                         0x2
-#define BIST1_FUSE_FLAG                         0x4
-
-/* MAC Control Register */
-#define REG_MAC_CTRL                            0x1480
-#define MAC_CTRL_TX_EN                          1
-#define MAC_CTRL_RX_EN                          2
-#define MAC_CTRL_TX_FLOW                        4
-#define MAC_CTRL_RX_FLOW                        8
-#define MAC_CTRL_LOOPBACK                       0x10
-#define MAC_CTRL_DUPLX                          0x20
-#define MAC_CTRL_ADD_CRC                        0x40
-#define MAC_CTRL_PAD                            0x80
-#define MAC_CTRL_LENCHK                         0x100
-#define MAC_CTRL_HUGE_EN                        0x200
-#define MAC_CTRL_PRMLEN_SHIFT                   10
-#define MAC_CTRL_PRMLEN_MASK                    0xf
-#define MAC_CTRL_RMV_VLAN                       0x4000
-#define MAC_CTRL_PROMIS_EN                      0x8000
-#define MAC_CTRL_TX_PAUSE                       0x10000
-#define MAC_CTRL_SCNT                           0x20000
-#define MAC_CTRL_SRST_TX                        0x40000
-#define MAC_CTRL_TX_SIMURST                     0x80000
-#define MAC_CTRL_SPEED_SHIFT                    20
-#define MAC_CTRL_SPEED_MASK                     0x300000
-#define MAC_CTRL_SPEED_1000                     2
-#define MAC_CTRL_SPEED_10_100                   1
-#define MAC_CTRL_DBG_TX_BKPRESURE               0x400000
-#define MAC_CTRL_TX_HUGE                        0x800000
-#define MAC_CTRL_RX_CHKSUM_EN                   0x1000000
-#define MAC_CTRL_MC_ALL_EN                      0x2000000
-#define MAC_CTRL_BC_EN                          0x4000000
-#define MAC_CTRL_DBG                            0x8000000
-
-/* MAC IPG/IFG Control Register */
-#define REG_MAC_IPG_IFG                         0x1484
-#define MAC_IPG_IFG_IPGT_SHIFT                  0
-#define MAC_IPG_IFG_IPGT_MASK                   0x7f
-#define MAC_IPG_IFG_MIFG_SHIFT                  8
-#define MAC_IPG_IFG_MIFG_MASK                   0xff
-#define MAC_IPG_IFG_IPGR1_SHIFT                 16
-#define MAC_IPG_IFG_IPGR1_MASK                  0x7f
-#define MAC_IPG_IFG_IPGR2_SHIFT                 24
-#define MAC_IPG_IFG_IPGR2_MASK                  0x7f
-
-/* MAC STATION ADDRESS */
-#define REG_MAC_STA_ADDR                        0x1488
-
-/* Hash table for multicast address */
-#define REG_RX_HASH_TABLE                       0x1490
-
-/* MAC Half-Duplex Control Register */
-#define REG_MAC_HALF_DUPLX_CTRL                 0x1498
-#define MAC_HALF_DUPLX_CTRL_LCOL_SHIFT          0
-#define MAC_HALF_DUPLX_CTRL_LCOL_MASK           0x3ff
-#define MAC_HALF_DUPLX_CTRL_RETRY_SHIFT         12
-#define MAC_HALF_DUPLX_CTRL_RETRY_MASK          0xf
-#define MAC_HALF_DUPLX_CTRL_EXC_DEF_EN          0x10000
-#define MAC_HALF_DUPLX_CTRL_NO_BACK_C           0x20000
-#define MAC_HALF_DUPLX_CTRL_NO_BACK_P           0x40000
-#define MAC_HALF_DUPLX_CTRL_ABEBE               0x80000
-#define MAC_HALF_DUPLX_CTRL_ABEBT_SHIFT         20
-#define MAC_HALF_DUPLX_CTRL_ABEBT_MASK          0xf
-#define MAC_HALF_DUPLX_CTRL_JAMIPG_SHIFT        24
-#define MAC_HALF_DUPLX_CTRL_JAMIPG_MASK         0xf
-
-/* Maximum Frame Length Control Register */
-#define REG_MTU                                 0x149c
-
-/* Wake-On-Lan control register */
-#define REG_WOL_CTRL                            0x14a0
-#define WOL_PATTERN_EN                          0x00000001
-#define WOL_PATTERN_PME_EN                      0x00000002
-#define WOL_MAGIC_EN                            0x00000004
-#define WOL_MAGIC_PME_EN                        0x00000008
-#define WOL_LINK_CHG_EN                         0x00000010
-#define WOL_LINK_CHG_PME_EN                     0x00000020
-#define WOL_PATTERN_ST                          0x00000100
-#define WOL_MAGIC_ST                            0x00000200
-#define WOL_LINKCHG_ST                          0x00000400
-#define WOL_CLK_SWITCH_EN                       0x00008000
-#define WOL_PT0_EN                              0x00010000
-#define WOL_PT1_EN                              0x00020000
-#define WOL_PT2_EN                              0x00040000
-#define WOL_PT3_EN                              0x00080000
-#define WOL_PT4_EN                              0x00100000
-#define WOL_PT5_EN                              0x00200000
-#define WOL_PT6_EN                              0x00400000
-
-/* WOL Length ( 2 DWORD ) */
-#define REG_WOL_PATTERN_LEN                     0x14a4
-#define WOL_PT_LEN_MASK                         0x7f
-#define WOL_PT0_LEN_SHIFT                       0
-#define WOL_PT1_LEN_SHIFT                       8
-#define WOL_PT2_LEN_SHIFT                       16
-#define WOL_PT3_LEN_SHIFT                       24
-#define WOL_PT4_LEN_SHIFT                       0
-#define WOL_PT5_LEN_SHIFT                       8
-#define WOL_PT6_LEN_SHIFT                       16
-
-/* Internal SRAM Partition Register */
-#define REG_SRAM_RFD_ADDR                       0x1500
-#define REG_SRAM_RFD_LEN                        (REG_SRAM_RFD_ADDR+ 4)
-#define REG_SRAM_RRD_ADDR                       (REG_SRAM_RFD_ADDR+ 8)
-#define REG_SRAM_RRD_LEN                        (REG_SRAM_RFD_ADDR+12)
-#define REG_SRAM_TPD_ADDR                       (REG_SRAM_RFD_ADDR+16)
-#define REG_SRAM_TPD_LEN                        (REG_SRAM_RFD_ADDR+20)
-#define REG_SRAM_TRD_ADDR                       (REG_SRAM_RFD_ADDR+24)
-#define REG_SRAM_TRD_LEN                        (REG_SRAM_RFD_ADDR+28)
-#define REG_SRAM_RXF_ADDR                       (REG_SRAM_RFD_ADDR+32)
-#define REG_SRAM_RXF_LEN                        (REG_SRAM_RFD_ADDR+36)
-#define REG_SRAM_TXF_ADDR                       (REG_SRAM_RFD_ADDR+40)
-#define REG_SRAM_TXF_LEN                        (REG_SRAM_RFD_ADDR+44)
-#define REG_SRAM_TCPH_PATH_ADDR                 (REG_SRAM_RFD_ADDR+48)
-#define SRAM_TCPH_ADDR_MASK                     0x0fff
-#define SRAM_TCPH_ADDR_SHIFT                    0
-#define SRAM_PATH_ADDR_MASK                     0x0fff
-#define SRAM_PATH_ADDR_SHIFT                    16
-
-/* Load Ptr Register */
-#define REG_LOAD_PTR                            (REG_SRAM_RFD_ADDR+52)
-
-/* Descriptor Control register */
-#define REG_DESC_BASE_ADDR_HI                   0x1540
-#define REG_DESC_RFD_ADDR_LO                    (REG_DESC_BASE_ADDR_HI+4)
-#define REG_DESC_RRD_ADDR_LO                    (REG_DESC_BASE_ADDR_HI+8)
-#define REG_DESC_TPD_ADDR_LO                    (REG_DESC_BASE_ADDR_HI+12)
-#define REG_DESC_CMB_ADDR_LO                    (REG_DESC_BASE_ADDR_HI+16)
-#define REG_DESC_SMB_ADDR_LO                    (REG_DESC_BASE_ADDR_HI+20)
-#define REG_DESC_RFD_RRD_RING_SIZE              (REG_DESC_BASE_ADDR_HI+24)
-#define DESC_RFD_RING_SIZE_MASK                 0x7ff
-#define DESC_RFD_RING_SIZE_SHIFT                0
-#define DESC_RRD_RING_SIZE_MASK                 0x7ff
-#define DESC_RRD_RING_SIZE_SHIFT                16
-#define REG_DESC_TPD_RING_SIZE                  (REG_DESC_BASE_ADDR_HI+28)
-#define DESC_TPD_RING_SIZE_MASK                 0x3ff
-#define DESC_TPD_RING_SIZE_SHIFT                0
-
-/* TXQ Control Register */
-#define REG_TXQ_CTRL                            0x1580
-#define TXQ_CTRL_TPD_BURST_NUM_SHIFT            0
-#define TXQ_CTRL_TPD_BURST_NUM_MASK             0x1f
-#define TXQ_CTRL_EN                             0x20
-#define TXQ_CTRL_ENH_MODE                       0x40
-#define TXQ_CTRL_TPD_FETCH_TH_SHIFT             8
-#define TXQ_CTRL_TPD_FETCH_TH_MASK              0x3f
-#define TXQ_CTRL_TXF_BURST_NUM_SHIFT            16
-#define TXQ_CTRL_TXF_BURST_NUM_MASK             0xffff
-
-/* Jumbo packet Threshold for task offload */
-#define REG_TX_JUMBO_TASK_TH_TPD_IPG            0x1584
-#define TX_JUMBO_TASK_TH_MASK                   0x7ff
-#define TX_JUMBO_TASK_TH_SHIFT                  0
-#define TX_TPD_MIN_IPG_MASK                     0x1f
-#define TX_TPD_MIN_IPG_SHIFT                    16
-
-/* RXQ Control Register */
-#define REG_RXQ_CTRL                            0x15a0
-#define RXQ_CTRL_RFD_BURST_NUM_SHIFT            0
-#define RXQ_CTRL_RFD_BURST_NUM_MASK             0xff
-#define RXQ_CTRL_RRD_BURST_THRESH_SHIFT         8
-#define RXQ_CTRL_RRD_BURST_THRESH_MASK          0xff
-#define RXQ_CTRL_RFD_PREF_MIN_IPG_SHIFT         16
-#define RXQ_CTRL_RFD_PREF_MIN_IPG_MASK          0x1f
-#define RXQ_CTRL_CUT_THRU_EN                    0x40000000
-#define RXQ_CTRL_EN                             0x80000000
-
-/* Rx jumbo packet threshold and rrd  retirement timer */
-#define REG_RXQ_JMBOSZ_RRDTIM                   (REG_RXQ_CTRL+ 4)
-#define RXQ_JMBOSZ_TH_MASK                      0x7ff
-#define RXQ_JMBOSZ_TH_SHIFT                     0
-#define RXQ_JMBO_LKAH_MASK                      0xf
-#define RXQ_JMBO_LKAH_SHIFT                     11
-#define RXQ_RRD_TIMER_MASK                      0xffff
-#define RXQ_RRD_TIMER_SHIFT                     16
-
-/* RFD flow control register */
-#define REG_RXQ_RXF_PAUSE_THRESH                (REG_RXQ_CTRL+ 8)
-#define RXQ_RXF_PAUSE_TH_HI_SHIFT               16
-#define RXQ_RXF_PAUSE_TH_HI_MASK                0xfff
-#define RXQ_RXF_PAUSE_TH_LO_SHIFT               0
-#define RXQ_RXF_PAUSE_TH_LO_MASK                0xfff
-
-/* RRD flow control register */
-#define REG_RXQ_RRD_PAUSE_THRESH                (REG_RXQ_CTRL+12)
-#define RXQ_RRD_PAUSE_TH_HI_SHIFT               0
-#define RXQ_RRD_PAUSE_TH_HI_MASK                0xfff
-#define RXQ_RRD_PAUSE_TH_LO_SHIFT               16
-#define RXQ_RRD_PAUSE_TH_LO_MASK                0xfff
-
-/* DMA Engine Control Register */
-#define REG_DMA_CTRL                            0x15c0
-#define DMA_CTRL_DMAR_IN_ORDER                  0x1
-#define DMA_CTRL_DMAR_ENH_ORDER                 0x2
-#define DMA_CTRL_DMAR_OUT_ORDER                 0x4
-#define DMA_CTRL_RCB_VALUE                      0x8
-#define DMA_CTRL_DMAR_BURST_LEN_SHIFT           4
-#define DMA_CTRL_DMAR_BURST_LEN_MASK            7
-#define DMA_CTRL_DMAW_BURST_LEN_SHIFT           7
-#define DMA_CTRL_DMAW_BURST_LEN_MASK            7
-#define DMA_CTRL_DMAR_EN                                0x400
-#define DMA_CTRL_DMAW_EN                                0x800
-
-/* CMB/SMB Control Register */
-#define REG_CSMB_CTRL                           0x15d0
-#define CSMB_CTRL_CMB_NOW                       1
-#define CSMB_CTRL_SMB_NOW                       2
-#define CSMB_CTRL_CMB_EN                        4
-#define CSMB_CTRL_SMB_EN                        8
-
-/* CMB DMA Write Threshold Register */
-#define REG_CMB_WRITE_TH                        (REG_CSMB_CTRL+ 4)
-#define CMB_RRD_TH_SHIFT                        0
-#define CMB_RRD_TH_MASK                         0x7ff
-#define CMB_TPD_TH_SHIFT                        16
-#define CMB_TPD_TH_MASK                         0x7ff
-
-/* RX/TX count-down timer to trigger CMB-write. 2us resolution. */
-#define REG_CMB_WRITE_TIMER                     (REG_CSMB_CTRL+ 8)
-#define CMB_RX_TM_SHIFT                         0
-#define CMB_RX_TM_MASK                          0xffff
-#define CMB_TX_TM_SHIFT                         16
-#define CMB_TX_TM_MASK                          0xffff
-
-/* Number of packet received since last CMB write */
-#define REG_CMB_RX_PKT_CNT                      (REG_CSMB_CTRL+12)
-
-/* Number of packet transmitted since last CMB write */
-#define REG_CMB_TX_PKT_CNT                      (REG_CSMB_CTRL+16)
-
-/* SMB auto DMA timer register */
-#define REG_SMB_TIMER                           (REG_CSMB_CTRL+20)
-
-/* Mailbox Register */
-#define REG_MAILBOX                             0x15f0
-#define MB_RFD_PROD_INDX_SHIFT                  0
-#define MB_RFD_PROD_INDX_MASK                   0x7ff
-#define MB_RRD_CONS_INDX_SHIFT                  11
-#define MB_RRD_CONS_INDX_MASK                   0x7ff
-#define MB_TPD_PROD_INDX_SHIFT                  22
-#define MB_TPD_PROD_INDX_MASK                   0x3ff
-
-/* Interrupt Status Register */
-#define REG_ISR                                 0x1600
-#define ISR_SMB                                 1
-#define ISR_TIMER                               2
-#define ISR_MANUAL                              4
-#define ISR_RXF_OV                              8
-#define ISR_RFD_UNRUN                           0x10
-#define ISR_RRD_OV                              0x20
-#define ISR_TXF_UNRUN                           0x40
-#define ISR_LINK                                0x80
-#define ISR_HOST_RFD_UNRUN                      0x100
-#define ISR_HOST_RRD_OV                         0x200
-#define ISR_DMAR_TO_RST                         0x400
-#define ISR_DMAW_TO_RST                         0x800
-#define ISR_GPHY                                0x1000
-#define ISR_RX_PKT                              0x10000
-#define ISR_TX_PKT                              0x20000
-#define ISR_TX_DMA                              0x40000
-#define ISR_RX_DMA                              0x80000
-#define ISR_CMB_RX                              0x100000
-#define ISR_CMB_TX                              0x200000
-#define ISR_MAC_RX                              0x400000
-#define ISR_MAC_TX                              0x800000
-#define ISR_UR_DETECTED                         0x1000000
-#define ISR_FERR_DETECTED                       0x2000000
-#define ISR_NFERR_DETECTED                      0x4000000
-#define ISR_CERR_DETECTED                       0x8000000
-#define ISR_PHY_LINKDOWN                        0x10000000
-#define ISR_DIS_SMB                             0x20000000
-#define ISR_DIS_DMA                             0x40000000
-#define ISR_DIS_INT                             0x80000000
-
-/* Interrupt Mask Register */
-#define REG_IMR                                 0x1604
-
-/* Normal Interrupt mask  */
-#define IMR_NORMAL_MASK (\
-        ISR_SMB         |\
-        ISR_GPHY        |\
-        ISR_PHY_LINKDOWN|\
-        ISR_DMAR_TO_RST |\
-        ISR_DMAW_TO_RST |\
-        ISR_CMB_TX      |\
-        ISR_CMB_RX      )
-
-/* Debug Interrupt Mask  (enable all interrupt) */
-#define IMR_DEBUG_MASK  (\
-        ISR_SMB         |\
-        ISR_TIMER       |\
-        ISR_MANUAL      |\
-        ISR_RXF_OV      |\
-        ISR_RFD_UNRUN   |\
-        ISR_RRD_OV      |\
-        ISR_TXF_UNRUN   |\
-        ISR_LINK        |\
-        ISR_CMB_TX      |\
-        ISR_CMB_RX      |\
-        ISR_RX_PKT      |\
-        ISR_TX_PKT      |\
-        ISR_MAC_RX      |\
-        ISR_MAC_TX      )
-
-/* Interrupt Status Register */
-#define REG_RFD_RRD_IDX                         0x1800
-#define REG_TPD_IDX                             0x1804
-
-/*  MII definition */
-/* PHY Common Register */
-#define MII_AT001_CR                                    0x09
-#define MII_AT001_SR                                    0x0A
-#define MII_AT001_ESR                                   0x0F
-#define MII_AT001_PSCR                                  0x10
-#define MII_AT001_PSSR                                  0x11
-
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB                         0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE                         0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX                              0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG                         0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE                                  0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN                               0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN                              0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB                         0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK                                 0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET                                    0x8000  /* 0 = normal, 1 = PHY reset */
-#define MII_CR_SPEED_MASK                               0x2040
-#define MII_CR_SPEED_1000                               0x0040
-#define MII_CR_SPEED_100                                0x2000
-#define MII_CR_SPEED_10                                 0x0000
-
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS                            0x0001  /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT                            0x0002  /* Jabber Detected */
-#define MII_SR_LINK_STATUS                              0x0004  /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS                             0x0008  /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT                             0x0010  /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE                         0x0020  /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS                        0x0040  /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS                          0x0100  /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS                            0x0200  /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS                            0x0400  /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS                              0x0800  /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS                              0x1000  /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS                             0x2000  /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS                             0x4000  /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS                               0x8000  /* 100T4 Capable */
-
-/* Link partner ability register. */
-#define MII_LPA_SLCT                                    0x001f  /* Same as advertise selector  */
-#define MII_LPA_10HALF                                  0x0020  /* Can do 10mbps half-duplex   */
-#define MII_LPA_10FULL                                  0x0040  /* Can do 10mbps full-duplex   */
-#define MII_LPA_100HALF                                 0x0080  /* Can do 100mbps half-duplex  */
-#define MII_LPA_100FULL                                 0x0100  /* Can do 100mbps full-duplex  */
-#define MII_LPA_100BASE4                                0x0200  /* 100BASE-T4  */
-#define MII_LPA_PAUSE                                   0x0400  /* PAUSE */
-#define MII_LPA_ASYPAUSE                                0x0800  /* Asymmetrical PAUSE */
-#define MII_LPA_RFAULT                                  0x2000  /* Link partner faulted        */
-#define MII_LPA_LPACK                                   0x4000  /* Link partner acked us       */
-#define MII_LPA_NPAGE                                   0x8000  /* Next page bit               */
-
-/* Autoneg Advertisement Register */
-#define MII_AR_SELECTOR_FIELD                           0x0001  /* indicates IEEE 802.3 CSMA/CD */
-#define MII_AR_10T_HD_CAPS                              0x0020  /* 10T   Half Duplex Capable */
-#define MII_AR_10T_FD_CAPS                              0x0040  /* 10T   Full Duplex Capable */
-#define MII_AR_100TX_HD_CAPS                            0x0080  /* 100TX Half Duplex Capable */
-#define MII_AR_100TX_FD_CAPS                            0x0100  /* 100TX Full Duplex Capable */
-#define MII_AR_100T4_CAPS                               0x0200  /* 100T4 Capable */
-#define MII_AR_PAUSE                                    0x0400  /* Pause operation desired */
-#define MII_AR_ASM_DIR                                  0x0800  /* Asymmetric Pause Direction bit */
-#define MII_AR_REMOTE_FAULT                             0x2000  /* Remote Fault detected */
-#define MII_AR_NEXT_PAGE                                0x8000  /* Next Page ability supported */
-#define MII_AR_SPEED_MASK                               0x01E0
-#define MII_AR_DEFAULT_CAP_MASK                         0x0DE0
-
-/* 1000BASE-T Control Register */
-#define MII_AT001_CR_1000T_HD_CAPS                      0x0100  /* Advertise 1000T HD capability */
-#define MII_AT001_CR_1000T_FD_CAPS                      0x0200  /* Advertise 1000T FD capability  */
-#define MII_AT001_CR_1000T_REPEATER_DTE                 0x0400  /* 1=Repeater/switch device port, 0=DTE device */
-#define MII_AT001_CR_1000T_MS_VALUE                     0x0800  /* 1=Configure PHY as Master, 0=Configure PHY as Slave */
-#define MII_AT001_CR_1000T_MS_ENABLE                    0x1000  /* 1=Master/Slave manual config value, 0=Automatic Master/Slave config */
-#define MII_AT001_CR_1000T_TEST_MODE_NORMAL             0x0000  /* Normal Operation */
-#define MII_AT001_CR_1000T_TEST_MODE_1                  0x2000  /* Transmit Waveform test */
-#define MII_AT001_CR_1000T_TEST_MODE_2                  0x4000  /* Master Transmit Jitter test */
-#define MII_AT001_CR_1000T_TEST_MODE_3                  0x6000  /* Slave Transmit Jitter test */
-#define MII_AT001_CR_1000T_TEST_MODE_4                  0x8000  /* Transmitter Distortion test */
-#define MII_AT001_CR_1000T_SPEED_MASK                   0x0300
-#define MII_AT001_CR_1000T_DEFAULT_CAP_MASK             0x0300
-
-/* 1000BASE-T Status Register */
-#define MII_AT001_SR_1000T_LP_HD_CAPS                   0x0400  /* LP is 1000T HD capable */
-#define MII_AT001_SR_1000T_LP_FD_CAPS                   0x0800  /* LP is 1000T FD capable */
-#define MII_AT001_SR_1000T_REMOTE_RX_STATUS             0x1000  /* Remote receiver OK */
-#define MII_AT001_SR_1000T_LOCAL_RX_STATUS              0x2000  /* Local receiver OK */
-#define MII_AT001_SR_1000T_MS_CONFIG_RES                0x4000  /* 1=Local TX is Master, 0=Slave */
-#define MII_AT001_SR_1000T_MS_CONFIG_FAULT              0x8000  /* Master/Slave config fault */
-#define MII_AT001_SR_1000T_REMOTE_RX_STATUS_SHIFT       12
-#define MII_AT001_SR_1000T_LOCAL_RX_STATUS_SHIFT        13
-
-/* Extended Status Register */
-#define MII_AT001_ESR_1000T_HD_CAPS                     0x1000  /* 1000T HD capable */
-#define MII_AT001_ESR_1000T_FD_CAPS                     0x2000  /* 1000T FD capable */
-#define MII_AT001_ESR_1000X_HD_CAPS                     0x4000  /* 1000X HD capable */
-#define MII_AT001_ESR_1000X_FD_CAPS                     0x8000  /* 1000X FD capable */
-
-/* AT001 PHY Specific Control Register */
-#define MII_AT001_PSCR_JABBER_DISABLE                   0x0001  /* 1=Jabber Function disabled */
-#define MII_AT001_PSCR_POLARITY_REVERSAL                0x0002  /* 1=Polarity Reversal enabled */
-#define MII_AT001_PSCR_SQE_TEST                         0x0004  /* 1=SQE Test enabled */
-#define MII_AT001_PSCR_MAC_POWERDOWN                    0x0008
-#define MII_AT001_PSCR_CLK125_DISABLE                   0x0010  /* 1=CLK125 low, 0=CLK125 toggling */
-#define MII_AT001_PSCR_MDI_MANUAL_MODE                  0x0000  /* MDI Crossover Mode bits 6:5, Manual MDI configuration */
-#define MII_AT001_PSCR_MDIX_MANUAL_MODE                 0x0020  /* Manual MDIX configuration */
-#define MII_AT001_PSCR_AUTO_X_1000T                     0x0040  /* 1000BASE-T: Auto crossover, 100BASE-TX/10BASE-T: MDI Mode */
-#define MII_AT001_PSCR_AUTO_X_MODE                      0x0060  /* Auto crossover enabled all speeds. */
-#define MII_AT001_PSCR_10BT_EXT_DIST_ENABLE             0x0080  /* 1=Enable Extended 10BASE-T distance (Lower 10BASE-T RX Threshold), 0=Normal 10BASE-T RX Threshold */
-#define MII_AT001_PSCR_MII_5BIT_ENABLE                  0x0100  /* 1=5-Bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
-#define MII_AT001_PSCR_SCRAMBLER_DISABLE                0x0200  /* 1=Scrambler disable */
-#define MII_AT001_PSCR_FORCE_LINK_GOOD                  0x0400  /* 1=Force link good */
-#define MII_AT001_PSCR_ASSERT_CRS_ON_TX                 0x0800  /* 1=Assert CRS on Transmit */
-#define MII_AT001_PSCR_POLARITY_REVERSAL_SHIFT          1
-#define MII_AT001_PSCR_AUTO_X_MODE_SHIFT                5
-#define MII_AT001_PSCR_10BT_EXT_DIST_ENABLE_SHIFT       7
-
-/* AT001 PHY Specific Status Register */
-#define MII_AT001_PSSR_SPD_DPLX_RESOLVED                0x0800  /* 1=Speed & Duplex resolved */
-#define MII_AT001_PSSR_DPLX                             0x2000  /* 1=Duplex 0=Half Duplex */
-#define MII_AT001_PSSR_SPEED                            0xC000  /* Speed, bits 14:15 */
-#define MII_AT001_PSSR_10MBS                            0x0000  /* 00=10Mbs */
-#define MII_AT001_PSSR_100MBS                           0x4000  /* 01=100Mbs */
-#define MII_AT001_PSSR_1000MBS                          0x8000  /* 10=1000Mbs */
-
-/* PCI Command Register Bit Definitions */
-#define PCI_REG_COMMAND                                 0x04    /* PCI Command Register */
-#define CMD_IO_SPACE                                    0x0001
-#define CMD_MEMORY_SPACE                                0x0002
-#define CMD_BUS_MASTER                                  0x0004
-
-/* Wake Up Filter Control */
-#define ATL1_WUFC_LNKC  0x00000001      /* Link Status Change Wakeup Enable */
-#define ATL1_WUFC_MAG   0x00000002      /* Magic Packet Wakeup Enable */
-#define ATL1_WUFC_EX    0x00000004      /* Directed Exact Wakeup Enable */
-#define ATL1_WUFC_MC    0x00000008      /* Multicast Wakeup Enable */
-#define ATL1_WUFC_BC    0x00000010      /* Broadcast Wakeup Enable */
-
-/* Error Codes */
-#define ATL1_SUCCESS                    0
-#define ATL1_ERR_EEPROM                 1
-#define ATL1_ERR_PHY                    2
-#define ATL1_ERR_CONFIG                 3
-#define ATL1_ERR_PARAM                  4
-#define ATL1_ERR_MAC_TYPE               5
-#define ATL1_ERR_PHY_TYPE               6
-#define ATL1_ERR_PHY_SPEED              7
-#define ATL1_ERR_PHY_RES                8
-
-#define SPEED_0         0xffff
-#define SPEED_10        10
-#define SPEED_100       100
-#define SPEED_1000      1000
-#define HALF_DUPLEX     1
-#define FULL_DUPLEX     2
-
-#define MEDIA_TYPE_AUTO_SENSOR  0
-#define MEDIA_TYPE_1000M_FULL   1
-#define MEDIA_TYPE_100M_FULL    2
-#define MEDIA_TYPE_100M_HALF    3
-#define MEDIA_TYPE_10M_FULL     4
-#define MEDIA_TYPE_10M_HALF     5
-
-#define ADVERTISE_10_HALF               0x0001
-#define ADVERTISE_10_FULL               0x0002
-#define ADVERTISE_100_HALF              0x0004
-#define ADVERTISE_100_FULL              0x0008
-#define ADVERTISE_1000_HALF             0x0010
-#define ADVERTISE_1000_FULL             0x0020
-#define AUTONEG_ADVERTISE_SPEED_DEFAULT 0x002F  /* Everything but 1000-Half */
-#define AUTONEG_ADVERTISE_10_100_ALL    0x000F  /* All 10/100 speeds */
-#define AUTONEG_ADVERTISE_10_ALL        0x0003  /* 10Mbps Full & Half speeds */
-
-#define MAX_JUMBO_FRAME_SIZE            0x2800
-
-#define PHY_AUTO_NEG_TIME       45      /* 4.5 Seconds */
-#define PHY_FORCE_TIME          20      /* 2.0 Seconds */
-
-/* For checksumming , the sum of all words in the EEPROM should equal 0xBABA */
-#define EEPROM_SUM              0xBABA
-
-#define ATL1_EEDUMP_LEN         48
-
-/* Statistics counters collected by the MAC */
-struct stats_msg_block {
-        /* rx */
-        u32 rx_ok;              /* The number of good packet received. */
-        u32 rx_bcast;           /* The number of good broadcast packet received. */
-        u32 rx_mcast;           /* The number of good multicast packet received. */
-        u32 rx_pause;           /* The number of Pause packet received. */
-        u32 rx_ctrl;            /* The number of Control packet received other than Pause frame. */
-        u32 rx_fcs_err;         /* The number of packets with bad FCS. */
-        u32 rx_len_err;         /* The number of packets with mismatch of length field and actual size. */
-        u32 rx_byte_cnt;        /* The number of bytes of good packet received. FCS is NOT included. */
-        u32 rx_runt;            /* The number of packets received that are less than 64 byte long and with good FCS. */
-        u32 rx_frag;            /* The number of packets received that are less than 64 byte long and with bad FCS. */
-        u32 rx_sz_64;           /* The number of good and bad packets received that are 64 byte long. */
-        u32 rx_sz_65_127;       /* The number of good and bad packets received that are between 65 and 127-byte long. */
-        u32 rx_sz_128_255;      /* The number of good and bad packets received that are between 128 and 255-byte long. */
-        u32 rx_sz_256_511;      /* The number of good and bad packets received that are between 256 and 511-byte long. */
-        u32 rx_sz_512_1023;     /* The number of good and bad packets received that are between 512 and 1023-byte long. */
-        u32 rx_sz_1024_1518;    /* The number of good and bad packets received that are between 1024 and 1518-byte long. */
-        u32 rx_sz_1519_max;     /* The number of good and bad packets received that are between 1519-byte and MTU. */
-        u32 rx_sz_ov;           /* The number of good and bad packets received that are more than MTU size šC truncated by Selene. */
-        u32 rx_rxf_ov;          /* The number of frame dropped due to occurrence of RX FIFO overflow. */
-        u32 rx_rrd_ov;          /* The number of frame dropped due to occurrence of RRD overflow. */
-        u32 rx_align_err;       /* Alignment Error */
-        u32 rx_bcast_byte_cnt;  /* The byte count of broadcast packet received, excluding FCS. */
-        u32 rx_mcast_byte_cnt;  /* The byte count of multicast packet received, excluding FCS. */
-        u32 rx_err_addr;        /* The number of packets dropped due to address filtering. */
-
-        /* tx */
-        u32 tx_ok;              /* The number of good packet transmitted. */
-        u32 tx_bcast;           /* The number of good broadcast packet transmitted. */
-        u32 tx_mcast;           /* The number of good multicast packet transmitted. */
-        u32 tx_pause;           /* The number of Pause packet transmitted. */
-        u32 tx_exc_defer;       /* The number of packets transmitted with excessive deferral. */
-        u32 tx_ctrl;            /* The number of packets transmitted is a control frame, excluding Pause frame. */
-        u32 tx_defer;           /* The number of packets transmitted that is deferred. */
-        u32 tx_byte_cnt;        /* The number of bytes of data transmitted. FCS is NOT included. */
-        u32 tx_sz_64;           /* The number of good and bad packets transmitted that are 64 byte long. */
-        u32 tx_sz_65_127;       /* The number of good and bad packets transmitted that are between 65 and 127-byte long. */
-        u32 tx_sz_128_255;      /* The number of good and bad packets transmitted that are between 128 and 255-byte long. */
-        u32 tx_sz_256_511;      /* The number of good and bad packets transmitted that are between 256 and 511-byte long. */
-        u32 tx_sz_512_1023;     /* The number of good and bad packets transmitted that are between 512 and 1023-byte long. */
-        u32 tx_sz_1024_1518;    /* The number of good and bad packets transmitted that are between 1024 and 1518-byte long. */
-        u32 tx_sz_1519_max;     /* The number of good and bad packets transmitted that are between 1519-byte and MTU. */
-        u32 tx_1_col;           /* The number of packets subsequently transmitted successfully with a single prior collision. */
-        u32 tx_2_col;           /* The number of packets subsequently transmitted successfully with multiple prior collisions. */
-        u32 tx_late_col;        /* The number of packets transmitted with late collisions. */
-        u32 tx_abort_col;       /* The number of transmit packets aborted due to excessive collisions. */
-        u32 tx_underrun;        /* The number of transmit packets aborted due to transmit FIFO underrun, or TRD FIFO underrun */
-        u32 tx_rd_eop;          /* The number of times that read beyond the EOP into the next frame area when TRD was not written timely */
-        u32 tx_len_err;         /* The number of transmit packets with length field does NOT match the actual frame size. */
-        u32 tx_trunc;           /* The number of transmit packets truncated due to size exceeding MTU. */
-        u32 tx_bcast_byte;      /* The byte count of broadcast packet transmitted, excluding FCS. */
-        u32 tx_mcast_byte;      /* The byte count of multicast packet transmitted, excluding FCS. */
-        u32 smb_updated;        /* 1: SMB Updated. This is used by software as the indication of the statistics update.
-                                 * Software should clear this bit as soon as retrieving the statistics information. */
-};
-
-/* Coalescing Message Block */
-struct coals_msg_block {
-        u32 int_stats;          /* interrupt status */
-        u16 rrd_prod_idx;       /* TRD Producer Index. */
-        u16 rfd_cons_idx;       /* RFD Consumer Index. */
-        u16 update;             /* Selene sets this bit every time it DMA the CMB to host memory.
-                                 * Software supposes to clear this bit when CMB information is processed. */
-        u16 tpd_cons_idx;       /* TPD Consumer Index. */
-};
-
-/* RRD descriptor */
-struct rx_return_desc {
-        u8 num_buf;             /* Number of RFD buffers used by the received packet */
-        u8 resved;
-        u16 buf_indx;           /* RFD Index of the first buffer */
-        union {
-                u32 valid;
-                struct {
-                        u16 rx_chksum;
-                        u16 pkt_size;
-                } xsum_sz;
-        } xsz;
-
-        u16 pkt_flg;            /* Packet flags */
-        u16 err_flg;            /* Error flags */
-        u16 resved2;
-        u16 vlan_tag;           /* VLAN TAG */
-};
-
-#define PACKET_FLAG_ETH_TYPE    0x0080
-#define PACKET_FLAG_VLAN_INS    0x0100
-#define PACKET_FLAG_ERR         0x0200
-#define PACKET_FLAG_IPV4        0x0400
-#define PACKET_FLAG_UDP         0x0800
-#define PACKET_FLAG_TCP         0x1000
-#define PACKET_FLAG_BCAST       0x2000
-#define PACKET_FLAG_MCAST       0x4000
-#define PACKET_FLAG_PAUSE       0x8000
-
-#define ERR_FLAG_CRC            0x0001
-#define ERR_FLAG_CODE           0x0002
-#define ERR_FLAG_DRIBBLE        0x0004
-#define ERR_FLAG_RUNT           0x0008
-#define ERR_FLAG_OV             0x0010
-#define ERR_FLAG_TRUNC          0x0020
-#define ERR_FLAG_IP_CHKSUM      0x0040
-#define ERR_FLAG_L4_CHKSUM      0x0080
-#define ERR_FLAG_LEN            0x0100
-#define ERR_FLAG_DES_ADDR       0x0200
-
-/* RFD descriptor */
-struct rx_free_desc {
-        __le64 buffer_addr;     /* Address of the descriptor's data buffer */
-        __le16 buf_len;         /* Size of the receive buffer in host memory, in byte */
-        u16 coalese;            /* Update consumer index to host after the reception of this frame */
-        /* __attribute__ ((packed)) is required */
-} __attribute__ ((packed));
-
-/* tsopu defines */
-#define TSO_PARAM_BUFLEN_MASK           0x3FFF
-#define TSO_PARAM_BUFLEN_SHIFT          0
-#define TSO_PARAM_DMAINT_MASK           0x0001
-#define TSO_PARAM_DMAINT_SHIFT          14
-#define TSO_PARAM_PKTNT_MASK            0x0001
-#define TSO_PARAM_PKTINT_SHIFT          15
-#define TSO_PARAM_VLANTAG_MASK          0xFFFF
-#define TSO_PARAM_VLAN_SHIFT            16
-
-/* tsopl defines */
-#define TSO_PARAM_EOP_MASK              0x0001
-#define TSO_PARAM_EOP_SHIFT             0
-#define TSO_PARAM_COALESCE_MASK         0x0001
-#define TSO_PARAM_COALESCE_SHIFT        1
-#define TSO_PARAM_INSVLAG_MASK          0x0001
-#define TSO_PARAM_INSVLAG_SHIFT         2
-#define TSO_PARAM_CUSTOMCKSUM_MASK      0x0001
-#define TSO_PARAM_CUSTOMCKSUM_SHIFT     3
-#define TSO_PARAM_SEGMENT_MASK          0x0001
-#define TSO_PARAM_SEGMENT_SHIFT         4
-#define TSO_PARAM_IPCKSUM_MASK          0x0001
-#define TSO_PARAM_IPCKSUM_SHIFT         5
-#define TSO_PARAM_TCPCKSUM_MASK         0x0001
-#define TSO_PARAM_TCPCKSUM_SHIFT        6
-#define TSO_PARAM_UDPCKSUM_MASK         0x0001
-#define TSO_PARAM_UDPCKSUM_SHIFT        7
-#define TSO_PARAM_VLANTAGGED_MASK       0x0001
-#define TSO_PARAM_VLANTAGGED_SHIFT      8
-#define TSO_PARAM_ETHTYPE_MASK          0x0001
-#define TSO_PARAM_ETHTYPE_SHIFT         9
-#define TSO_PARAM_IPHL_MASK             0x000F
-#define TSO_PARAM_IPHL_SHIFT            10
-#define TSO_PARAM_TCPHDRLEN_MASK        0x000F
-#define TSO_PARAM_TCPHDRLEN_SHIFT       14
-#define TSO_PARAM_HDRFLAG_MASK          0x0001
-#define TSO_PARAM_HDRFLAG_SHIFT         18
-#define TSO_PARAM_MSS_MASK              0x1FFF
-#define TSO_PARAM_MSS_SHIFT             19
-
-/* csumpu defines */
-#define CSUM_PARAM_BUFLEN_MASK          0x3FFF
-#define CSUM_PARAM_BUFLEN_SHIFT         0
-#define CSUM_PARAM_DMAINT_MASK          0x0001
-#define CSUM_PARAM_DMAINT_SHIFT         14
-#define CSUM_PARAM_PKTINT_MASK          0x0001
-#define CSUM_PARAM_PKTINT_SHIFT         15
-#define CSUM_PARAM_VALANTAG_MASK        0xFFFF
-#define CSUM_PARAM_VALAN_SHIFT          16
-
-/* csumpl defines*/
-#define CSUM_PARAM_EOP_MASK             0x0001
-#define CSUM_PARAM_EOP_SHIFT            0
-#define CSUM_PARAM_COALESCE_MASK        0x0001
-#define CSUM_PARAM_COALESCE_SHIFT       1
-#define CSUM_PARAM_INSVLAG_MASK         0x0001
-#define CSUM_PARAM_INSVLAG_SHIFT        2
-#define CSUM_PARAM_CUSTOMCKSUM_MASK     0x0001
-#define CSUM_PARAM_CUSTOMCKSUM_SHIFT    3
-#define CSUM_PARAM_SEGMENT_MASK         0x0001
-#define CSUM_PARAM_SEGMENT_SHIFT        4
-#define CSUM_PARAM_IPCKSUM_MASK         0x0001
-#define CSUM_PARAM_IPCKSUM_SHIFT        5
-#define CSUM_PARAM_TCPCKSUM_MASK        0x0001
-#define CSUM_PARAM_TCPCKSUM_SHIFT       6
-#define CSUM_PARAM_UDPCKSUM_MASK        0x0001
-#define CSUM_PARAM_UDPCKSUM_SHIFT       7
-#define CSUM_PARAM_VLANTAGGED_MASK      0x0001
-#define CSUM_PARAM_VLANTAGGED_SHIFT     8
-#define CSUM_PARAM_ETHTYPE_MASK         0x0001
-#define CSUM_PARAM_ETHTYPE_SHIFT        9
-#define CSUM_PARAM_IPHL_MASK            0x000F
-#define CSUM_PARAM_IPHL_SHIFT           10
-#define CSUM_PARAM_PLOADOFFSET_MASK     0x00FF
-#define CSUM_PARAM_PLOADOFFSET_SHIFT    16
-#define CSUM_PARAM_XSUMOFFSET_MASK      0x00FF
-#define CSUM_PARAM_XSUMOFFSET_SHIFT     24
-
-/* TPD descriptor */
-struct tso_param {
-        /* The order of these declarations is important -- don't change it */
-        u32 tsopu;      /* tso_param upper word */
-        u32 tsopl;      /* tso_param lower word */
-};
-
-struct csum_param {
-        /* The order of these declarations is important -- don't change it */
-        u32 csumpu;     /* csum_param upper word */
-        u32 csumpl;     /* csum_param lower word */
-};
-
-union tpd_descr {
-        u64 data;
-        struct csum_param csum;
-        struct tso_param tso;
-};
-
-struct tx_packet_desc {
-        __le64 buffer_addr;
-        union tpd_descr desc;
-};
-
-/* DMA Order Settings */
-enum atl1_dma_order {
-        atl1_dma_ord_in = 1,
-        atl1_dma_ord_enh = 2,
-        atl1_dma_ord_out = 4
-};
-
-enum atl1_dma_rcb {
-        atl1_rcb_64 = 0,
-        atl1_rcb_128 = 1
-};
-
-enum atl1_dma_req_block {
-        atl1_dma_req_128 = 0,
-        atl1_dma_req_256 = 1,
-        atl1_dma_req_512 = 2,
-        atl1_dma_req_1024 = 3,
-        atl1_dma_req_2048 = 4,
-        atl1_dma_req_4096 = 5
-};
-
-struct atl1_spi_flash_dev {
-        const char *manu_name;  /* manufacturer id */
-        /* op-code */
-        u8 cmd_wrsr;
-        u8 cmd_read;
-        u8 cmd_program;
-        u8 cmd_wren;
-        u8 cmd_wrdi;
-        u8 cmd_rdsr;
-        u8 cmd_rdid;
-        u8 cmd_sector_erase;
-        u8 cmd_chip_erase;
-};
-
-#endif  /* _ATL1_HW_H_ */
diff --git a/drivers/net/atl1/atl1_param.c b/drivers/net/atl1/atl1_param.c
deleted file mode 100644
index 4246bb9bd50e..000000000000
--- a/drivers/net/atl1/atl1_param.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
- * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
- *
- * Derived from Intel e1000 driver
- * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/types.h>
-#include <linux/moduleparam.h>
-#include <linux/pci.h>
-#include "atl1.h"
-
-/*
- * This is the only thing that needs to be changed to adjust the
- * maximum number of ports that the driver can manage.
- */
-#define ATL1_MAX_NIC 4
-
-#define OPTION_UNSET    -1
-#define OPTION_DISABLED 0
-#define OPTION_ENABLED  1
-
-#define ATL1_PARAM_INIT { [0 ... ATL1_MAX_NIC] = OPTION_UNSET }
-
-/*
- * Interrupt Moderate Timer in units of 2 us
- *
- * Valid Range: 10-65535
- *
- * Default Value: 100 (200us)
- */
-static int __devinitdata int_mod_timer[ATL1_MAX_NIC+1] = ATL1_PARAM_INIT;
-static int num_int_mod_timer = 0;
-module_param_array_named(int_mod_timer, int_mod_timer, int, &num_int_mod_timer, 0);
-MODULE_PARM_DESC(int_mod_timer, "Interrupt moderator timer");
-
-/*
- * flash_vendor
- *
- * Valid Range: 0-2
- *
- * 0 - Atmel
- * 1 - SST
- * 2 - ST
- *
- * Default Value: 0
- */
-static int __devinitdata flash_vendor[ATL1_MAX_NIC+1] = ATL1_PARAM_INIT;
-static int num_flash_vendor = 0;
-module_param_array_named(flash_vendor, flash_vendor, int, &num_flash_vendor, 0);
-MODULE_PARM_DESC(flash_vendor, "SPI flash vendor");
-
-#define DEFAULT_INT_MOD_CNT     100     /* 200us */
-#define MAX_INT_MOD_CNT         65000
-#define MIN_INT_MOD_CNT         50
-
-#define FLASH_VENDOR_DEFAULT    0
-#define FLASH_VENDOR_MIN        0
-#define FLASH_VENDOR_MAX        2
-
-struct atl1_option {
-        enum { enable_option, range_option, list_option } type;
-        char *name;
-        char *err;
-        int def;
-        union {
-                struct {        /* range_option info */
-                        int min;
-                        int max;
-                } r;
-                struct {        /* list_option info */
-                        int nr;
-                        struct atl1_opt_list {
-                                int i;
-                                char *str;
-                        } *p;
-                } l;
-        } arg;
-};
-
-static int __devinit atl1_validate_option(int *value, struct atl1_option *opt, struct pci_dev *pdev)
-{
-        if (*value == OPTION_UNSET) {
-                *value = opt->def;
-                return 0;
-        }
-
-        switch (opt->type) {
-        case enable_option:
-                switch (*value) {
-                case OPTION_ENABLED:
-                        dev_info(&pdev->dev, "%s enabled\n", opt->name);
-                        return 0;
-                case OPTION_DISABLED:
-                        dev_info(&pdev->dev, "%s disabled\n", opt->name);
-                        return 0;
-                }
-                break;
-        case range_option:
-                if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
-                        dev_info(&pdev->dev, "%s set to %i\n", opt->name,
-                                *value);
-                        return 0;
-                }
-                break;
-        case list_option:{
-                        int i;
-                        struct atl1_opt_list *ent;
-
-                        for (i = 0; i < opt->arg.l.nr; i++) {
-                                ent = &opt->arg.l.p[i];
-                                if (*value == ent->i) {
-                                        if (ent->str[0] != '\0')
-                                                dev_info(&pdev->dev, "%s\n",
-                                                        ent->str);
-                                        return 0;
-                                }
-                        }
-                }
-                break;
-
-        default:
-                break;
-        }
-
-        dev_info(&pdev->dev, "invalid %s specified (%i) %s\n",
-                opt->name, *value, opt->err);
-        *value = opt->def;
-        return -1;
-}
-
-/*
- * atl1_check_options - Range Checking for Command Line Parameters
- * @adapter: board private structure
- *
- * This routine checks all command line parameters for valid user
- * input.  If an invalid value is given, or if no user specified
- * value exists, a default value is used.  The final value is stored
- * in a variable in the adapter structure.
- */
-void __devinit atl1_check_options(struct atl1_adapter *adapter)
-{
-        struct pci_dev *pdev = adapter->pdev;
-        int bd = adapter->bd_number;
-        if (bd >= ATL1_MAX_NIC) {
-                dev_notice(&pdev->dev, "no configuration for board#%i\n", bd);
-                dev_notice(&pdev->dev, "using defaults for all values\n");
-        }
-        {                       /* Interrupt Moderate Timer */
-                struct atl1_option opt = {
-                        .type = range_option,
-                        .name = "Interrupt Moderator Timer",
-                        .err = "using default of "
-                                __MODULE_STRING(DEFAULT_INT_MOD_CNT),
-                        .def = DEFAULT_INT_MOD_CNT,
-                        .arg = {.r =
-                                {.min = MIN_INT_MOD_CNT,.max = MAX_INT_MOD_CNT}}
-                };
-                int val;
-                if (num_int_mod_timer > bd) {
-                        val = int_mod_timer[bd];
-                        atl1_validate_option(&val, &opt, pdev);
-                        adapter->imt = (u16) val;
-                } else
-                        adapter->imt = (u16) (opt.def);
-        }
-
-        {                       /* Flash Vendor */
-                struct atl1_option opt = {
-                        .type = range_option,
-                        .name = "SPI Flash Vendor",
-                        .err = "using default of "
-                                __MODULE_STRING(FLASH_VENDOR_DEFAULT),
-                        .def = DEFAULT_INT_MOD_CNT,
-                        .arg = {.r =
-                                {.min = FLASH_VENDOR_MIN,.max =
-                                 FLASH_VENDOR_MAX}}
-                };
-                int val;
-                if (num_flash_vendor > bd) {
-                        val = flash_vendor[bd];
-                        atl1_validate_option(&val, &opt, pdev);
-                        adapter->hw.flash_vendor = (u8) val;
-                } else
-                        adapter->hw.flash_vendor = (u8) (opt.def);
-        }
-}
diff --git a/drivers/net/atlx/Makefile b/drivers/net/atlx/Makefile
new file mode 100644
index 000000000000..ca45553a040d
--- /dev/null
+++ b/drivers/net/atlx/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ATL1)      += atl1.o
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atlx/atl1.c
index 129b8b3aa773..5586fc624688 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atlx/atl1.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
- * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
+ * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
  * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
  *
  * Derived from Intel e1000 driver
@@ -36,7 +36,6 @@
  * A very incomplete list of things that need to be dealt with:
  *
  * TODO:
- * Fix TSO; tx performance is horrible with TSO enabled.
  * Wake on LAN.
  * Add more ethtool functions.
  * Fix abstruse irq enable/disable condition described here:
@@ -50,51 +49,46 @@
  * SMP torture testing
  */
 
-#include <linux/types.h>
-#include <linux/netdevice.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/skbuff.h>
+#include <asm/atomic.h>
+#include <asm/byteorder.h>
+
+#include <linux/compiler.h>
+#include <linux/crc32.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
-#include <linux/if_vlan.h>
-#include <linux/if_ether.h>
-#include <linux/irqreturn.h>
-#include <linux/workqueue.h>
-#include <linux/timer.h>
-#include <linux/jiffies.h>
 #include <linux/hardirq.h>
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
+#include <linux/in.h>
 #include <linux/interrupt.h>
+#include <linux/ip.h>
 #include <linux/irqflags.h>
-#include <linux/dma-mapping.h>
+#include <linux/irqreturn.h>
+#include <linux/jiffies.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/net.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
 #include <linux/pm.h>
-#include <linux/in.h>
-#include <linux/ip.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
 #include <linux/tcp.h>
-#include <linux/compiler.h>
-#include <linux/delay.h>
-#include <linux/mii.h>
-#include <net/checksum.h>
+#include <linux/timer.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
 
-#include <asm/atomic.h>
-#include <asm/byteorder.h>
+#include <net/checksum.h>
 
 #include "atl1.h"
 
-#define DRIVER_VERSION "2.0.7"
-
-char atl1_driver_name[] = "atl1";
-static const char atl1_driver_string[] = "Attansic L1 Ethernet Network Driver";
-static const char atl1_copyright[] = "Copyright(c) 2005-2006 Attansic Corporation.";
-char atl1_driver_version[] = DRIVER_VERSION;
-
-MODULE_AUTHOR
-    ("Attansic Corporation <xiong_huang@attansic.com>, Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
-MODULE_DESCRIPTION("Attansic 1000M Ethernet Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRIVER_VERSION);
+/* Temporary hack for merging atl1 and atl2 */
+#include "atlx.c"
 
 /*
  * atl1_pci_tbl - PCI Device ID Table
@@ -104,9 +98,720 @@ static const struct pci_device_id atl1_pci_tbl[] = {
         /* required last entry */
         {0,}
 };
-
 MODULE_DEVICE_TABLE(pci, atl1_pci_tbl);
 
+static const u32 atl1_default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |
+        NETIF_MSG_LINK | NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP;
+
+static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Message level (0=none,...,16=all)");
+
+/*
+ * Reset the transmit and receive units; mask and clear all interrupts.
+ * hw - Struct containing variables accessed by shared code
+ * return : 0  or  idle status (if error)
+ */
+static s32 atl1_reset_hw(struct atl1_hw *hw)
+{
+        struct pci_dev *pdev = hw->back->pdev;
+        struct atl1_adapter *adapter = hw->back;
+        u32 icr;
+        int i;
+
+        /*
+         * Clear Interrupt mask to stop board from generating
+         * interrupts & Clear any pending interrupt events
+         */
+        /*
+         * iowrite32(0, hw->hw_addr + REG_IMR);
+         * iowrite32(0xffffffff, hw->hw_addr + REG_ISR);
+         */
+
+        /*
+         * Issue Soft Reset to the MAC.  This will reset the chip's
+         * transmit, receive, DMA.  It will not effect
+         * the current PCI configuration.  The global reset bit is self-
+         * clearing, and should clear within a microsecond.
+         */
+        iowrite32(MASTER_CTRL_SOFT_RST, hw->hw_addr + REG_MASTER_CTRL);
+        ioread32(hw->hw_addr + REG_MASTER_CTRL);
+
+        iowrite16(1, hw->hw_addr + REG_PHY_ENABLE);
+        ioread16(hw->hw_addr + REG_PHY_ENABLE);
+
+        /* delay about 1ms */
+        msleep(1);
+
+        /* Wait at least 10ms for All module to be Idle */
+        for (i = 0; i < 10; i++) {
+                icr = ioread32(hw->hw_addr + REG_IDLE_STATUS);
+                if (!icr)
+                        break;
+                /* delay 1 ms */
+                msleep(1);
+                /* FIXME: still the right way to do this? */
+                cpu_relax();
+        }
+
+        if (icr) {
+                if (netif_msg_hw(adapter))
+                        dev_dbg(&pdev->dev, "ICR = 0x%x\n", icr);
+                return icr;
+        }
+
+        return 0;
+}
+
+/* function about EEPROM
+ *
+ * check_eeprom_exist
+ * return 0 if eeprom exist
+ */
+static int atl1_check_eeprom_exist(struct atl1_hw *hw)
+{
+        u32 value;
+        value = ioread32(hw->hw_addr + REG_SPI_FLASH_CTRL);
+        if (value & SPI_FLASH_CTRL_EN_VPD) {
+                value &= ~SPI_FLASH_CTRL_EN_VPD;
+                iowrite32(value, hw->hw_addr + REG_SPI_FLASH_CTRL);
+        }
+
+        value = ioread16(hw->hw_addr + REG_PCIE_CAP_LIST);
+        return ((value & 0xFF00) == 0x6C00) ? 0 : 1;
+}
+
+static bool atl1_read_eeprom(struct atl1_hw *hw, u32 offset, u32 *p_value)
+{
+        int i;
+        u32 control;
+
+        if (offset & 3)
+                /* address do not align */
+                return false;
+
+        iowrite32(0, hw->hw_addr + REG_VPD_DATA);
+        control = (offset & VPD_CAP_VPD_ADDR_MASK) << VPD_CAP_VPD_ADDR_SHIFT;
+        iowrite32(control, hw->hw_addr + REG_VPD_CAP);
+        ioread32(hw->hw_addr + REG_VPD_CAP);
+
+        for (i = 0; i < 10; i++) {
+                msleep(2);
+                control = ioread32(hw->hw_addr + REG_VPD_CAP);
+                if (control & VPD_CAP_VPD_FLAG)
+                        break;
+        }
+        if (control & VPD_CAP_VPD_FLAG) {
+                *p_value = ioread32(hw->hw_addr + REG_VPD_DATA);
+                return true;
+        }
+        /* timeout */
+        return false;
+}
+
+/*
+ * Reads the value from a PHY register
+ * hw - Struct containing variables accessed by shared code
+ * reg_addr - address of the PHY register to read
+ */
+s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data)
+{
+        u32 val;
+        int i;
+
+        val = ((u32) (reg_addr & MDIO_REG_ADDR_MASK)) << MDIO_REG_ADDR_SHIFT |
+                MDIO_START | MDIO_SUP_PREAMBLE | MDIO_RW | MDIO_CLK_25_4 <<
+                MDIO_CLK_SEL_SHIFT;
+        iowrite32(val, hw->hw_addr + REG_MDIO_CTRL);
+        ioread32(hw->hw_addr + REG_MDIO_CTRL);
+
+        for (i = 0; i < MDIO_WAIT_TIMES; i++) {
+                udelay(2);
+                val = ioread32(hw->hw_addr + REG_MDIO_CTRL);
+                if (!(val & (MDIO_START | MDIO_BUSY)))
+                        break;
+        }
+        if (!(val & (MDIO_START | MDIO_BUSY))) {
+                *phy_data = (u16) val;
+                return 0;
+        }
+        return ATLX_ERR_PHY;
+}
+
+#define CUSTOM_SPI_CS_SETUP     2
+#define CUSTOM_SPI_CLK_HI       2
+#define CUSTOM_SPI_CLK_LO       2
+#define CUSTOM_SPI_CS_HOLD      2
+#define CUSTOM_SPI_CS_HI        3
+
+static bool atl1_spi_read(struct atl1_hw *hw, u32 addr, u32 *buf)
+{
+        int i;
+        u32 value;
+
+        iowrite32(0, hw->hw_addr + REG_SPI_DATA);
+        iowrite32(addr, hw->hw_addr + REG_SPI_ADDR);
+
+        value = SPI_FLASH_CTRL_WAIT_READY |
+            (CUSTOM_SPI_CS_SETUP & SPI_FLASH_CTRL_CS_SETUP_MASK) <<
+            SPI_FLASH_CTRL_CS_SETUP_SHIFT | (CUSTOM_SPI_CLK_HI &
+                                             SPI_FLASH_CTRL_CLK_HI_MASK) <<
+            SPI_FLASH_CTRL_CLK_HI_SHIFT | (CUSTOM_SPI_CLK_LO &
+                                           SPI_FLASH_CTRL_CLK_LO_MASK) <<
+            SPI_FLASH_CTRL_CLK_LO_SHIFT | (CUSTOM_SPI_CS_HOLD &
+                                           SPI_FLASH_CTRL_CS_HOLD_MASK) <<
+            SPI_FLASH_CTRL_CS_HOLD_SHIFT | (CUSTOM_SPI_CS_HI &
+                                            SPI_FLASH_CTRL_CS_HI_MASK) <<
+            SPI_FLASH_CTRL_CS_HI_SHIFT | (1 & SPI_FLASH_CTRL_INS_MASK) <<
+            SPI_FLASH_CTRL_INS_SHIFT;
+
+        iowrite32(value, hw->hw_addr + REG_SPI_FLASH_CTRL);
+
+        value |= SPI_FLASH_CTRL_START;
+        iowrite32(value, hw->hw_addr + REG_SPI_FLASH_CTRL);
+        ioread32(hw->hw_addr + REG_SPI_FLASH_CTRL);
+
+        for (i = 0; i < 10; i++) {
+                msleep(1);
+                value = ioread32(hw->hw_addr + REG_SPI_FLASH_CTRL);
+                if (!(value & SPI_FLASH_CTRL_START))
+                        break;
+        }
+
+        if (value & SPI_FLASH_CTRL_START)
+                return false;
+
+        *buf = ioread32(hw->hw_addr + REG_SPI_DATA);
+
+        return true;
+}
+
+/*
+ * get_permanent_address
+ * return 0 if get valid mac address,
+ */
+static int atl1_get_permanent_address(struct atl1_hw *hw)
+{
+        u32 addr[2];
+        u32 i, control;
+        u16 reg;
+        u8 eth_addr[ETH_ALEN];
+        bool key_valid;
+
+        if (is_valid_ether_addr(hw->perm_mac_addr))
+                return 0;
+
+        /* init */
+        addr[0] = addr[1] = 0;
+
+        if (!atl1_check_eeprom_exist(hw)) {
+                reg = 0;
+                key_valid = false;
+                /* Read out all EEPROM content */
+                i = 0;
+                while (1) {
+                        if (atl1_read_eeprom(hw, i + 0x100, &control)) {
+                                if (key_valid) {
+                                        if (reg == REG_MAC_STA_ADDR)
+                                                addr[0] = control;
+                                        else if (reg == (REG_MAC_STA_ADDR + 4))
+                                                addr[1] = control;
+                                        key_valid = false;
+                                } else if ((control & 0xff) == 0x5A) {
+                                        key_valid = true;
+                                        reg = (u16) (control >> 16);
+                                } else
+                                        break;
+                        } else
+                                /* read error */
+                                break;
+                        i += 4;
+                }
+
+                *(u32 *) &eth_addr[2] = swab32(addr[0]);
+                *(u16 *) &eth_addr[0] = swab16(*(u16 *) &addr[1]);
+                if (is_valid_ether_addr(eth_addr)) {
+                        memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
+                        return 0;
+                }
+                return 1;
+        }
+
+        /* see if SPI FLAGS exist ? */
+        addr[0] = addr[1] = 0;
+        reg = 0;
+        key_valid = false;
+        i = 0;
+        while (1) {
+                if (atl1_spi_read(hw, i + 0x1f000, &control)) {
+                        if (key_valid) {
+                                if (reg == REG_MAC_STA_ADDR)
+                                        addr[0] = control;
+                                else if (reg == (REG_MAC_STA_ADDR + 4))
+                                        addr[1] = control;
+                                key_valid = false;
+                        } else if ((control & 0xff) == 0x5A) {
+                                key_valid = true;
+                                reg = (u16) (control >> 16);
+                        } else
+                                /* data end */
+                                break;
+                } else
+                        /* read error */
+                        break;
+                i += 4;
+        }
+
+        *(u32 *) &eth_addr[2] = swab32(addr[0]);
+        *(u16 *) &eth_addr[0] = swab16(*(u16 *) &addr[1]);
+        if (is_valid_ether_addr(eth_addr)) {
+                memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
+                return 0;
+        }
+
+        /*
+         * On some motherboards, the MAC address is written by the
+         * BIOS directly to the MAC register during POST, and is
+         * not stored in eeprom.  If all else thus far has failed
+         * to fetch the permanent MAC address, try reading it directly.
+         */
+        addr[0] = ioread32(hw->hw_addr + REG_MAC_STA_ADDR);
+        addr[1] = ioread16(hw->hw_addr + (REG_MAC_STA_ADDR + 4));
+        *(u32 *) &eth_addr[2] = swab32(addr[0]);
+        *(u16 *) &eth_addr[0] = swab16(*(u16 *) &addr[1]);
+        if (is_valid_ether_addr(eth_addr)) {
+                memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
+                return 0;
+        }
+
+        return 1;
+}
+
+/*
+ * Reads the adapter's MAC address from the EEPROM
+ * hw - Struct containing variables accessed by shared code
+ */
+s32 atl1_read_mac_addr(struct atl1_hw *hw)
+{
+        u16 i;
+
+        if (atl1_get_permanent_address(hw))
+                random_ether_addr(hw->perm_mac_addr);
+
+        for (i = 0; i < ETH_ALEN; i++)
+                hw->mac_addr[i] = hw->perm_mac_addr[i];
+        return 0;
+}
+
+/*
+ * Hashes an address to determine its location in the multicast table
+ * hw - Struct containing variables accessed by shared code
+ * mc_addr - the multicast address to hash
+ *
+ * atl1_hash_mc_addr
+ *  purpose
+ *      set hash value for a multicast address
+ *      hash calcu processing :
+ *          1. calcu 32bit CRC for multicast address
+ *          2. reverse crc with MSB to LSB
+ */
+u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr)
+{
+        u32 crc32, value = 0;
+        int i;
+
+        crc32 = ether_crc_le(6, mc_addr);
+        for (i = 0; i < 32; i++)
+                value |= (((crc32 >> i) & 1) << (31 - i));
+
+        return value;
+}
+
+/*
+ * Sets the bit in the multicast table corresponding to the hash value.
+ * hw - Struct containing variables accessed by shared code
+ * hash_value - Multicast address hash value
+ */
+void atl1_hash_set(struct atl1_hw *hw, u32 hash_value)
+{
+        u32 hash_bit, hash_reg;
+        u32 mta;
+
+        /*
+         * The HASH Table  is a register array of 2 32-bit registers.
+         * It is treated like an array of 64 bits.  We want to set
+         * bit BitArray[hash_value]. So we figure out what register
+         * the bit is in, read it, OR in the new bit, then write
+         * back the new value.  The register is determined by the
+         * upper 7 bits of the hash value and the bit within that
+         * register are determined by the lower 5 bits of the value.
+         */
+        hash_reg = (hash_value >> 31) & 0x1;
+        hash_bit = (hash_value >> 26) & 0x1F;
+        mta = ioread32((hw->hw_addr + REG_RX_HASH_TABLE) + (hash_reg << 2));
+        mta |= (1 << hash_bit);
+        iowrite32(mta, (hw->hw_addr + REG_RX_HASH_TABLE) + (hash_reg << 2));
+}
+
+/*
+ * Writes a value to a PHY register
+ * hw - Struct containing variables accessed by shared code
+ * reg_addr - address of the PHY register to write
+ * data - data to write to the PHY
+ */
+static s32 atl1_write_phy_reg(struct atl1_hw *hw, u32 reg_addr, u16 phy_data)
+{
+        int i;
+        u32 val;
+
+        val = ((u32) (phy_data & MDIO_DATA_MASK)) << MDIO_DATA_SHIFT |
+            (reg_addr & MDIO_REG_ADDR_MASK) << MDIO_REG_ADDR_SHIFT |
+            MDIO_SUP_PREAMBLE |
+            MDIO_START | MDIO_CLK_25_4 << MDIO_CLK_SEL_SHIFT;
+        iowrite32(val, hw->hw_addr + REG_MDIO_CTRL);
+        ioread32(hw->hw_addr + REG_MDIO_CTRL);
+
+        for (i = 0; i < MDIO_WAIT_TIMES; i++) {
+                udelay(2);
+                val = ioread32(hw->hw_addr + REG_MDIO_CTRL);
+                if (!(val & (MDIO_START | MDIO_BUSY)))
+                        break;
+        }
+
+        if (!(val & (MDIO_START | MDIO_BUSY)))
+                return 0;
+
+        return ATLX_ERR_PHY;
+}
+
+/*
+ * Make L001's PHY out of Power Saving State (bug)
+ * hw - Struct containing variables accessed by shared code
+ * when power on, L001's PHY always on Power saving State
+ * (Gigabit Link forbidden)
+ */
+static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw)
+{
+        s32 ret;
+        ret = atl1_write_phy_reg(hw, 29, 0x0029);
+        if (ret)
+                return ret;
+        return atl1_write_phy_reg(hw, 30, 0);
+}
+
+/*
+ *TODO: do something or get rid of this
+ */
+#ifdef CONFIG_PM
+static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw)
+{
+/*    s32 ret_val;
+ *    u16 phy_data;
+ */
+
+/*
+    ret_val = atl1_write_phy_reg(hw, ...);
+    ret_val = atl1_write_phy_reg(hw, ...);
+    ....
+*/
+        return 0;
+}
+#endif
+
+/*
+ * Resets the PHY and make all config validate
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Sets bit 15 and 12 of the MII Control regiser (for F001 bug)
+ */
+static s32 atl1_phy_reset(struct atl1_hw *hw)
+{
+        struct pci_dev *pdev = hw->back->pdev;
+        struct atl1_adapter *adapter = hw->back;
+        s32 ret_val;
+        u16 phy_data;
+
+        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
+            hw->media_type == MEDIA_TYPE_1000M_FULL)
+                phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN;
+        else {
+                switch (hw->media_type) {
+                case MEDIA_TYPE_100M_FULL:
+                        phy_data =
+                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_100 |
+                            MII_CR_RESET;
+                        break;
+                case MEDIA_TYPE_100M_HALF:
+                        phy_data = MII_CR_SPEED_100 | MII_CR_RESET;
+                        break;
+                case MEDIA_TYPE_10M_FULL:
+                        phy_data =
+                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_10 | MII_CR_RESET;
+                        break;
+                default:
+                        /* MEDIA_TYPE_10M_HALF: */
+                        phy_data = MII_CR_SPEED_10 | MII_CR_RESET;
+                        break;
+                }
+        }
+
+        ret_val = atl1_write_phy_reg(hw, MII_BMCR, phy_data);
+        if (ret_val) {
+                u32 val;
+                int i;
+                /* pcie serdes link may be down! */
+                if (netif_msg_hw(adapter))
+                        dev_dbg(&pdev->dev, "pcie phy link down\n");
+
+                for (i = 0; i < 25; i++) {
+                        msleep(1);
+                        val = ioread32(hw->hw_addr + REG_MDIO_CTRL);
+                        if (!(val & (MDIO_START | MDIO_BUSY)))
+                                break;
+                }
+
+                if ((val & (MDIO_START | MDIO_BUSY)) != 0) {
+                        if (netif_msg_hw(adapter))
+                                dev_warn(&pdev->dev,
+                                        "pcie link down at least 25ms\n");
+                        return ret_val;
+                }
+        }
+        return 0;
+}
+
+/*
+ * Configures PHY autoneg and flow control advertisement settings
+ * hw - Struct containing variables accessed by shared code
+ */
+static s32 atl1_phy_setup_autoneg_adv(struct atl1_hw *hw)
+{
+        s32 ret_val;
+        s16 mii_autoneg_adv_reg;
+        s16 mii_1000t_ctrl_reg;
+
+        /* Read the MII Auto-Neg Advertisement Register (Address 4). */
+        mii_autoneg_adv_reg = MII_AR_DEFAULT_CAP_MASK;
+
+        /* Read the MII 1000Base-T Control Register (Address 9). */
+        mii_1000t_ctrl_reg = MII_ATLX_CR_1000T_DEFAULT_CAP_MASK;
+
+        /*
+         * First we clear all the 10/100 mb speed bits in the Auto-Neg
+         * Advertisement Register (Address 4) and the 1000 mb speed bits in
+         * the  1000Base-T Control Register (Address 9).
+         */
+        mii_autoneg_adv_reg &= ~MII_AR_SPEED_MASK;
+        mii_1000t_ctrl_reg &= ~MII_ATLX_CR_1000T_SPEED_MASK;
+
+        /*
+         * Need to parse media_type  and set up
+         * the appropriate PHY registers.
+         */
+        switch (hw->media_type) {
+        case MEDIA_TYPE_AUTO_SENSOR:
+                mii_autoneg_adv_reg |= (MII_AR_10T_HD_CAPS |
+                                        MII_AR_10T_FD_CAPS |
+                                        MII_AR_100TX_HD_CAPS |
+                                        MII_AR_100TX_FD_CAPS);
+                mii_1000t_ctrl_reg |= MII_ATLX_CR_1000T_FD_CAPS;
+                break;
+
+        case MEDIA_TYPE_1000M_FULL:
+                mii_1000t_ctrl_reg |= MII_ATLX_CR_1000T_FD_CAPS;
+                break;
+
+        case MEDIA_TYPE_100M_FULL:
+                mii_autoneg_adv_reg |= MII_AR_100TX_FD_CAPS;
+                break;
+
+        case MEDIA_TYPE_100M_HALF:
+                mii_autoneg_adv_reg |= MII_AR_100TX_HD_CAPS;
+                break;
+
+        case MEDIA_TYPE_10M_FULL:
+                mii_autoneg_adv_reg |= MII_AR_10T_FD_CAPS;
+                break;
+
+        default:
+                mii_autoneg_adv_reg |= MII_AR_10T_HD_CAPS;
+                break;
+        }
+
+        /* flow control fixed to enable all */
+        mii_autoneg_adv_reg |= (MII_AR_ASM_DIR | MII_AR_PAUSE);
+
+        hw->mii_autoneg_adv_reg = mii_autoneg_adv_reg;
+        hw->mii_1000t_ctrl_reg = mii_1000t_ctrl_reg;
+
+        ret_val = atl1_write_phy_reg(hw, MII_ADVERTISE, mii_autoneg_adv_reg);
+        if (ret_val)
+                return ret_val;
+
+        ret_val = atl1_write_phy_reg(hw, MII_ATLX_CR, mii_1000t_ctrl_reg);
+        if (ret_val)
+                return ret_val;
+
+        return 0;
+}
+
+/*
+ * Configures link settings.
+ * hw - Struct containing variables accessed by shared code
+ * Assumes the hardware has previously been reset and the
+ * transmitter and receiver are not enabled.
+ */
+static s32 atl1_setup_link(struct atl1_hw *hw)
+{
+        struct pci_dev *pdev = hw->back->pdev;
+        struct atl1_adapter *adapter = hw->back;
+        s32 ret_val;
+
+        /*
+         * Options:
+         *  PHY will advertise value(s) parsed from
+         *  autoneg_advertised and fc
+         *  no matter what autoneg is , We will not wait link result.
+         */
+        ret_val = atl1_phy_setup_autoneg_adv(hw);
+        if (ret_val) {
+                if (netif_msg_link(adapter))
+                        dev_dbg(&pdev->dev,
+                                "error setting up autonegotiation\n");
+                return ret_val;
+        }
+        /* SW.Reset , En-Auto-Neg if needed */
+        ret_val = atl1_phy_reset(hw);
+        if (ret_val) {
+                if (netif_msg_link(adapter))
+                        dev_dbg(&pdev->dev, "error resetting phy\n");
+                return ret_val;
+        }
+        hw->phy_configured = true;
+        return ret_val;
+}
+
+static void atl1_init_flash_opcode(struct atl1_hw *hw)
+{
+        if (hw->flash_vendor >= ARRAY_SIZE(flash_table))
+                /* Atmel */
+                hw->flash_vendor = 0;
+
+        /* Init OP table */
+        iowrite8(flash_table[hw->flash_vendor].cmd_program,
+                hw->hw_addr + REG_SPI_FLASH_OP_PROGRAM);
+        iowrite8(flash_table[hw->flash_vendor].cmd_sector_erase,
+                hw->hw_addr + REG_SPI_FLASH_OP_SC_ERASE);
+        iowrite8(flash_table[hw->flash_vendor].cmd_chip_erase,
+                hw->hw_addr + REG_SPI_FLASH_OP_CHIP_ERASE);
+        iowrite8(flash_table[hw->flash_vendor].cmd_rdid,
+                hw->hw_addr + REG_SPI_FLASH_OP_RDID);
+        iowrite8(flash_table[hw->flash_vendor].cmd_wren,
+                hw->hw_addr + REG_SPI_FLASH_OP_WREN);
+        iowrite8(flash_table[hw->flash_vendor].cmd_rdsr,
+                hw->hw_addr + REG_SPI_FLASH_OP_RDSR);
+        iowrite8(flash_table[hw->flash_vendor].cmd_wrsr,
+                hw->hw_addr + REG_SPI_FLASH_OP_WRSR);
+        iowrite8(flash_table[hw->flash_vendor].cmd_read,
+                hw->hw_addr + REG_SPI_FLASH_OP_READ);
+}
+
+/*
+ * Performs basic configuration of the adapter.
+ * hw - Struct containing variables accessed by shared code
+ * Assumes that the controller has previously been reset and is in a
+ * post-reset uninitialized state. Initializes multicast table,
+ * and  Calls routines to setup link
+ * Leaves the transmit and receive units disabled and uninitialized.
+ */
+static s32 atl1_init_hw(struct atl1_hw *hw)
+{
+        u32 ret_val = 0;
+
+        /* Zero out the Multicast HASH table */
+        iowrite32(0, hw->hw_addr + REG_RX_HASH_TABLE);
+        /* clear the old settings from the multicast hash table */
+        iowrite32(0, (hw->hw_addr + REG_RX_HASH_TABLE) + (1 << 2));
+
+        atl1_init_flash_opcode(hw);
+
+        if (!hw->phy_configured) {
+                /* enable GPHY LinkChange Interrrupt */
+                ret_val = atl1_write_phy_reg(hw, 18, 0xC00);
+                if (ret_val)
+                        return ret_val;
+                /* make PHY out of power-saving state */
+                ret_val = atl1_phy_leave_power_saving(hw);
+                if (ret_val)
+                        return ret_val;
+                /* Call a subroutine to configure the link */
+                ret_val = atl1_setup_link(hw);
+        }
+        return ret_val;
+}
+
+/*
+ * Detects the current speed and duplex settings of the hardware.
+ * hw - Struct containing variables accessed by shared code
+ * speed - Speed of the connection
+ * duplex - Duplex setting of the connection
+ */
+static s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex)
+{
+        struct pci_dev *pdev = hw->back->pdev;
+        struct atl1_adapter *adapter = hw->back;
+        s32 ret_val;
+        u16 phy_data;
+
+        /* ; --- Read   PHY Specific Status Register (17) */
+        ret_val = atl1_read_phy_reg(hw, MII_ATLX_PSSR, &phy_data);
+        if (ret_val)
+                return ret_val;
+
+        if (!(phy_data & MII_ATLX_PSSR_SPD_DPLX_RESOLVED))
+                return ATLX_ERR_PHY_RES;
+
+        switch (phy_data & MII_ATLX_PSSR_SPEED) {
+        case MII_ATLX_PSSR_1000MBS:
+                *speed = SPEED_1000;
+                break;
+        case MII_ATLX_PSSR_100MBS:
+                *speed = SPEED_100;
+                break;
+        case MII_ATLX_PSSR_10MBS:
+                *speed = SPEED_10;
+                break;
+        default:
+                if (netif_msg_hw(adapter))
+                        dev_dbg(&pdev->dev, "error getting speed\n");
+                return ATLX_ERR_PHY_SPEED;
+                break;
+        }
+        if (phy_data & MII_ATLX_PSSR_DPLX)
+                *duplex = FULL_DUPLEX;
+        else
+                *duplex = HALF_DUPLEX;
+
+        return 0;
+}
+
+void atl1_set_mac_addr(struct atl1_hw *hw)
+{
+        u32 value;
+        /*
+         * 00-0B-6A-F6-00-DC
+         * 0:  6AF600DC   1: 000B
+         * low dword
+         */
+        value = (((u32) hw->mac_addr[2]) << 24) |
+            (((u32) hw->mac_addr[3]) << 16) |
+            (((u32) hw->mac_addr[4]) << 8) | (((u32) hw->mac_addr[5]));
+        iowrite32(value, hw->hw_addr + REG_MAC_STA_ADDR);
+        /* high dword */
+        value = (((u32) hw->mac_addr[0]) << 8) | (((u32) hw->mac_addr[1]));
+        iowrite32(value, (hw->hw_addr + REG_MAC_STA_ADDR) + (1 << 2));
+}
+
 /*
  * atl1_sw_init - Initialize general software structures (struct atl1_adapter)
  * @adapter: board private structure to initialize
@@ -125,7 +830,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
 
         adapter->wol = 0;
         adapter->rx_buffer_len = (hw->max_frame_size + 7) & ~7;
-        adapter->ict = 50000;   /* 100ms */
+        adapter->ict = 50000;           /* 100ms */
         adapter->link_speed = SPEED_0;  /* hardware init */
         adapter->link_duplex = FULL_DUPLEX;
 
@@ -206,30 +911,12 @@ static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 }
 
 /*
- * atl1_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
-static int atl1_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-        switch (cmd) {
-        case SIOCGMIIPHY:
-        case SIOCGMIIREG:
-        case SIOCSMIIREG:
-                return atl1_mii_ioctl(netdev, ifr, cmd);
-        default:
-                return -EOPNOTSUPP;
-        }
-}
-
-/*
  * atl1_setup_mem_resources - allocate Tx / RX descriptor resources
  * @adapter: board private structure
  *
  * Return 0 on success, negative on failure
  */
-s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
+static s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
 {
         struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;
         struct atl1_rfd_ring *rfd_ring = &adapter->rfd_ring;
@@ -242,13 +929,16 @@ s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
         size = sizeof(struct atl1_buffer) * (tpd_ring->count + rfd_ring->count);
         tpd_ring->buffer_info = kzalloc(size, GFP_KERNEL);
         if (unlikely(!tpd_ring->buffer_info)) {
-                dev_err(&pdev->dev, "kzalloc failed , size = D%d\n", size);
+                if (netif_msg_drv(adapter))
+                        dev_err(&pdev->dev, "kzalloc failed , size = D%d\n",
+                                size);
                 goto err_nomem;
         }
         rfd_ring->buffer_info =
                 (struct atl1_buffer *)(tpd_ring->buffer_info + tpd_ring->count);
 
-        /* real ring DMA buffer
+        /*
+         * real ring DMA buffer
          * each ring/block may need up to 8 bytes for alignment, hence the
          * additional 40 bytes tacked onto the end.
          */
@@ -263,7 +953,8 @@ s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
         ring_header->desc = pci_alloc_consistent(pdev, ring_header->size,
                 &ring_header->dma);
         if (unlikely(!ring_header->desc)) {
-                dev_err(&pdev->dev, "pci_alloc_consistent failed\n");
+                if (netif_msg_drv(adapter))
+                        dev_err(&pdev->dev, "pci_alloc_consistent failed\n");
                 goto err_nomem;
         }
 
@@ -307,7 +998,7 @@ s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
                 ((u8 *) adapter->cmb.cmb +
                 (sizeof(struct coals_msg_block) + offset));
 
-        return ATL1_SUCCESS;
+        return 0;
 
 err_nomem:
         kfree(tpd_ring->buffer_info);
@@ -416,7 +1107,7 @@ static void atl1_clean_tx_ring(struct atl1_adapter *adapter)
  *
  * Free all transmit software resources
  */
-void atl1_free_ring_resources(struct atl1_adapter *adapter)
+static void atl1_free_ring_resources(struct atl1_adapter *adapter)
 {
         struct pci_dev *pdev = adapter->pdev;
         struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;
@@ -481,31 +1172,6 @@ static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter)
         iowrite32(value, hw->hw_addr + REG_MAC_CTRL);
 }
 
-/*
- * atl1_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- */
-static int atl1_set_mac(struct net_device *netdev, void *p)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct sockaddr *addr = p;
-
-        if (netif_running(netdev))
-                return -EBUSY;
-
-        if (!is_valid_ether_addr(addr->sa_data))
-                return -EADDRNOTAVAIL;
-
-        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-        memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len);
-
-        atl1_set_mac_addr(&adapter->hw);
-        return 0;
-}
-
 static u32 atl1_check_link(struct atl1_adapter *adapter)
 {
         struct atl1_hw *hw = &adapter->hw;
@@ -517,14 +1183,17 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
         /* MII_BMSR must read twice */
         atl1_read_phy_reg(hw, MII_BMSR, &phy_data);
         atl1_read_phy_reg(hw, MII_BMSR, &phy_data);
-        if (!(phy_data & BMSR_LSTATUS)) {       /* link down */
-                if (netif_carrier_ok(netdev)) { /* old link state: Up */
-                        dev_info(&adapter->pdev->dev, "link is down\n");
+        if (!(phy_data & BMSR_LSTATUS)) {
+                /* link down */
+                if (netif_carrier_ok(netdev)) {
+                        /* old link state: Up */
+                        if (netif_msg_link(adapter))
+                                dev_info(&adapter->pdev->dev, "link is down\n");
                         adapter->link_speed = SPEED_0;
                         netif_carrier_off(netdev);
                         netif_stop_queue(netdev);
                 }
-                return ATL1_SUCCESS;
+                return 0;
         }
 
         /* Link Up */
@@ -562,20 +1231,22 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
                         adapter->link_speed = speed;
                         adapter->link_duplex = duplex;
                         atl1_setup_mac_ctrl(adapter);
-                        dev_info(&adapter->pdev->dev,
-                                "%s link is up %d Mbps %s\n",
-                                netdev->name, adapter->link_speed,
-                                adapter->link_duplex == FULL_DUPLEX ?
-                                "full duplex" : "half duplex");
+                        if (netif_msg_link(adapter))
+                                dev_info(&adapter->pdev->dev,
+                                        "%s link is up %d Mbps %s\n",
+                                        netdev->name, adapter->link_speed,
+                                        adapter->link_duplex == FULL_DUPLEX ?
+                                        "full duplex" : "half duplex");
                 }
-                if (!netif_carrier_ok(netdev)) {        /* Link down -> Up */
+                if (!netif_carrier_ok(netdev)) {
+                        /* Link down -> Up */
                         netif_carrier_on(netdev);
                         netif_wake_queue(netdev);
                 }
-                return ATL1_SUCCESS;
+                return 0;
         }
 
-        /* change orignal link status */
+        /* change original link status */
         if (netif_carrier_ok(netdev)) {
                 adapter->link_speed = SPEED_0;
                 netif_carrier_off(netdev);
@@ -596,12 +1267,13 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
                         phy_data =
                             MII_CR_FULL_DUPLEX | MII_CR_SPEED_10 | MII_CR_RESET;
                         break;
-                default:        /* MEDIA_TYPE_10M_HALF: */
+                default:
+                        /* MEDIA_TYPE_10M_HALF: */
                         phy_data = MII_CR_SPEED_10 | MII_CR_RESET;
                         break;
                 }
                 atl1_write_phy_reg(hw, MII_BMCR, phy_data);
-                return ATL1_SUCCESS;
+                return 0;
         }
 
         /* auto-neg, insert timer to re-config phy */
@@ -610,103 +1282,6 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
                 mod_timer(&adapter->phy_config_timer, jiffies + 3 * HZ);
         }
 
-        return ATL1_SUCCESS;
-}
-
-static void atl1_check_for_link(struct atl1_adapter *adapter)
-{
-        struct net_device *netdev = adapter->netdev;
-        u16 phy_data = 0;
-
-        spin_lock(&adapter->lock);
-        adapter->phy_timer_pending = false;
-        atl1_read_phy_reg(&adapter->hw, MII_BMSR, &phy_data);
-        atl1_read_phy_reg(&adapter->hw, MII_BMSR, &phy_data);
-        spin_unlock(&adapter->lock);
-
-        /* notify upper layer link down ASAP */
-        if (!(phy_data & BMSR_LSTATUS)) {       /* Link Down */
-                if (netif_carrier_ok(netdev)) { /* old link state: Up */
-                        dev_info(&adapter->pdev->dev, "%s link is down\n",
-                                netdev->name);
-                        adapter->link_speed = SPEED_0;
-                        netif_carrier_off(netdev);
-                        netif_stop_queue(netdev);
-                }
-        }
-        schedule_work(&adapter->link_chg_task);
-}
-
-/*
- * atl1_set_multi - Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_multi entry point is called whenever the multicast address
- * list or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper multicast,
- * promiscuous mode, and all-multi behavior.
- */
-static void atl1_set_multi(struct net_device *netdev)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        struct atl1_hw *hw = &adapter->hw;
-        struct dev_mc_list *mc_ptr;
-        u32 rctl;
-        u32 hash_value;
-
-        /* Check for Promiscuous and All Multicast modes */
-        rctl = ioread32(hw->hw_addr + REG_MAC_CTRL);
-        if (netdev->flags & IFF_PROMISC)
-                rctl |= MAC_CTRL_PROMIS_EN;
-        else if (netdev->flags & IFF_ALLMULTI) {
-                rctl |= MAC_CTRL_MC_ALL_EN;
-                rctl &= ~MAC_CTRL_PROMIS_EN;
-        } else
-                rctl &= ~(MAC_CTRL_PROMIS_EN | MAC_CTRL_MC_ALL_EN);
-
-        iowrite32(rctl, hw->hw_addr + REG_MAC_CTRL);
-
-        /* clear the old settings from the multicast hash table */
-        iowrite32(0, hw->hw_addr + REG_RX_HASH_TABLE);
-        iowrite32(0, (hw->hw_addr + REG_RX_HASH_TABLE) + (1 << 2));
-
-        /* compute mc addresses' hash value ,and put it into hash table */
-        for (mc_ptr = netdev->mc_list; mc_ptr; mc_ptr = mc_ptr->next) {
-                hash_value = atl1_hash_mc_addr(hw, mc_ptr->dmi_addr);
-                atl1_hash_set(hw, hash_value);
-        }
-}
-
-/*
- * atl1_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- */
-static int atl1_change_mtu(struct net_device *netdev, int new_mtu)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        int old_mtu = netdev->mtu;
-        int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
-
-        if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||
-            (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-                dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");
-                return -EINVAL;
-        }
-
-        adapter->hw.max_frame_size = max_frame;
-        adapter->hw.tx_jumbo_task_th = (max_frame + 7) >> 3;
-        adapter->rx_buffer_len = (max_frame + 7) & ~7;
-        adapter->hw.rx_jumbo_th = adapter->rx_buffer_len / 8;
-
-        netdev->mtu = new_mtu;
-        if ((old_mtu != new_mtu) && netif_running(netdev)) {
-                atl1_down(adapter);
-                atl1_up(adapter);
-        }
-
         return 0;
 }
 
@@ -974,37 +1549,6 @@ static void atl1_via_workaround(struct atl1_adapter *adapter)
         iowrite32(value, adapter->hw.hw_addr + PCI_COMMAND);
 }
 
-/*
- * atl1_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- */
-static void atl1_irq_enable(struct atl1_adapter *adapter)
-{
-        iowrite32(IMR_NORMAL_MASK, adapter->hw.hw_addr + REG_IMR);
-        ioread32(adapter->hw.hw_addr + REG_IMR);
-}
-
-/*
- * atl1_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- */
-static void atl1_irq_disable(struct atl1_adapter *adapter)
-{
-        iowrite32(0, adapter->hw.hw_addr + REG_IMR);
-        ioread32(adapter->hw.hw_addr + REG_IMR);
-        synchronize_irq(adapter->pdev->irq);
-}
-
-static void atl1_clear_phy_int(struct atl1_adapter *adapter)
-{
-        u16 phy_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&adapter->lock, flags);
-        atl1_read_phy_reg(&adapter->hw, 19, &phy_data);
-        spin_unlock_irqrestore(&adapter->lock, flags);
-}
-
 static void atl1_inc_smb(struct atl1_adapter *adapter)
 {
         struct stats_msg_block *smb = adapter->smb.smb;
@@ -1076,19 +1620,6 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
                 adapter->soft_stats.tx_carrier_errors;
 }
 
-/*
- * atl1_get_stats - Get System Network Statistics
- * @netdev: network interface device structure
- *
- * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
- */
-static struct net_device_stats *atl1_get_stats(struct net_device *netdev)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        return &adapter->net_stats;
-}
-
 static void atl1_update_mailbox(struct atl1_adapter *adapter)
 {
         unsigned long flags;
@@ -1150,8 +1681,9 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
                 if (rrd->err_flg & (ERR_FLAG_CRC | ERR_FLAG_TRUNC |
                                         ERR_FLAG_CODE | ERR_FLAG_OV)) {
                         adapter->hw_csum_err++;
-                        dev_printk(KERN_DEBUG, &pdev->dev,
-                                "rx checksum error\n");
+                        if (netif_msg_rx_err(adapter))
+                                dev_printk(KERN_DEBUG, &pdev->dev,
+                                        "rx checksum error\n");
                         return;
                 }
         }
@@ -1170,9 +1702,10 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
         }
 
         /* IPv4, but hardware thinks its checksum is wrong */
-        dev_printk(KERN_DEBUG, &pdev->dev,
-                "hw csum wrong, pkt_flag:%x, err_flag:%x\n",
-                rrd->pkt_flg, rrd->err_flg);
+        if (netif_msg_rx_err(adapter))
+                dev_printk(KERN_DEBUG, &pdev->dev,
+                        "hw csum wrong, pkt_flag:%x, err_flag:%x\n",
+                        rrd->pkt_flg, rrd->err_flg);
         skb->ip_summed = CHECKSUM_COMPLETE;
         skb->csum = htons(rrd->xsz.xsum_sz.rx_chksum);
         adapter->hw_csum_err++;
@@ -1210,7 +1743,8 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter)
                 rfd_desc = ATL1_RFD_DESC(rfd_ring, rfd_next_to_use);
 
                 skb = dev_alloc_skb(adapter->rx_buffer_len + NET_IP_ALIGN);
-                if (unlikely(!skb)) {   /* Better luck next round */
+                if (unlikely(!skb)) {
+                        /* Better luck next round */
                         adapter->net_stats.rx_dropped++;
                         break;
                 }
@@ -1281,18 +1815,39 @@ chk_rrd:
                         /* check rrd status */
                         if (likely(rrd->num_buf == 1))
                                 goto rrd_ok;
+                        else if (netif_msg_rx_err(adapter)) {
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "unexpected RRD buffer count\n");
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "rx_buf_len = %d\n",
+                                        adapter->rx_buffer_len);
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "RRD num_buf = %d\n",
+                                        rrd->num_buf);
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "RRD pkt_len = %d\n",
+                                        rrd->xsz.xsum_sz.pkt_size);
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "RRD pkt_flg = 0x%08X\n",
+                                        rrd->pkt_flg);
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "RRD err_flg = 0x%08X\n",
+                                        rrd->err_flg);
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "RRD vlan_tag = 0x%08X\n",
+                                        rrd->vlan_tag);
+                        }
 
                         /* rrd seems to be bad */
                         if (unlikely(i-- > 0)) {
                                 /* rrd may not be DMAed completely */
-                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                        "incomplete RRD DMA transfer\n");
                                 udelay(1);
                                 goto chk_rrd;
                         }
                         /* bad rrd */
-                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                "bad RRD\n");
+                        if (netif_msg_rx_err(adapter))
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "bad RRD\n");
                         /* see if update RFD index */
                         if (rrd->num_buf > 1)
                                 atl1_update_rfd_index(adapter, rrd);
@@ -1411,8 +1966,6 @@ static void atl1_intr_tx(struct atl1_adapter *adapter)
                         dev_kfree_skb_irq(buffer_info->skb);
                         buffer_info->skb = NULL;
                 }
-                tpd->buffer_addr = 0;
-                tpd->desc.data = 0;
 
                 if (++sw_tpd_next_to_clean == tpd_ring->count)
                         sw_tpd_next_to_clean = 0;
@@ -1434,167 +1987,192 @@ static u16 atl1_tpd_avail(struct atl1_tpd_ring *tpd_ring)
 }
 
 static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
-                         struct tso_param *tso)
+        struct tx_packet_desc *ptpd)
 {
-        /* We enter this function holding a spinlock. */
-        u8 ipofst;
+        /* spinlock held */
+        u8 hdr_len, ip_off;
+        u32 real_len;
         int err;
 
         if (skb_shinfo(skb)->gso_size) {
                 if (skb_header_cloned(skb)) {
                         err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
                         if (unlikely(err))
-                                return err;
+                                return -1;
                 }
 
                 if (skb->protocol == ntohs(ETH_P_IP)) {
                         struct iphdr *iph = ip_hdr(skb);
 
-                        iph->tot_len = 0;
+                        real_len = (((unsigned char *)iph - skb->data) +
+                                ntohs(iph->tot_len));
+                        if (real_len < skb->len)
+                                pskb_trim(skb, real_len);
+                        hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
+                        if (skb->len == hdr_len) {
+                                iph->check = 0;
+                                tcp_hdr(skb)->check =
+                                        ~csum_tcpudp_magic(iph->saddr,
+                                        iph->daddr, tcp_hdrlen(skb),
+                                        IPPROTO_TCP, 0);
+                                ptpd->word3 |= (iph->ihl & TPD_IPHL_MASK) <<
+                                        TPD_IPHL_SHIFT;
+                                ptpd->word3 |= ((tcp_hdrlen(skb) >> 2) &
+                                        TPD_TCPHDRLEN_MASK) <<
+                                        TPD_TCPHDRLEN_SHIFT;
+                                ptpd->word3 |= 1 << TPD_IP_CSUM_SHIFT;
+                                ptpd->word3 |= 1 << TPD_TCP_CSUM_SHIFT;
+                                return 1;
+                        }
+
                         iph->check = 0;
                         tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                iph->daddr, 0, IPPROTO_TCP, 0);
-                        ipofst = skb_network_offset(skb);
-                        if (ipofst != ETH_HLEN) /* 802.3 frame */
-                                tso->tsopl |= 1 << TSO_PARAM_ETHTYPE_SHIFT;
-
-                        tso->tsopl |= (iph->ihl &
-                                CSUM_PARAM_IPHL_MASK) << CSUM_PARAM_IPHL_SHIFT;
-                        tso->tsopl |= (tcp_hdrlen(skb) &
-                                TSO_PARAM_TCPHDRLEN_MASK) <<
-                                TSO_PARAM_TCPHDRLEN_SHIFT;
-                        tso->tsopl |= (skb_shinfo(skb)->gso_size &
-                                TSO_PARAM_MSS_MASK) << TSO_PARAM_MSS_SHIFT;
-                        tso->tsopl |= 1 << TSO_PARAM_IPCKSUM_SHIFT;
-                        tso->tsopl |= 1 << TSO_PARAM_TCPCKSUM_SHIFT;
-                        tso->tsopl |= 1 << TSO_PARAM_SEGMENT_SHIFT;
-                        return true;
+                                        iph->daddr, 0, IPPROTO_TCP, 0);
+                        ip_off = (unsigned char *)iph -
+                                (unsigned char *) skb_network_header(skb);
+                        if (ip_off == 8) /* 802.3-SNAP frame */
+                                ptpd->word3 |= 1 << TPD_ETHTYPE_SHIFT;
+                        else if (ip_off != 0)
+                                return -2;
+
+                        ptpd->word3 |= (iph->ihl & TPD_IPHL_MASK) <<
+                                TPD_IPHL_SHIFT;
+                        ptpd->word3 |= ((tcp_hdrlen(skb) >> 2) &
+                                TPD_TCPHDRLEN_MASK) << TPD_TCPHDRLEN_SHIFT;
+                        ptpd->word3 |= (skb_shinfo(skb)->gso_size &
+                                TPD_MSS_MASK) << TPD_MSS_SHIFT;
+                        ptpd->word3 |= 1 << TPD_SEGMENT_EN_SHIFT;
+                        return 3;
                 }
         }
         return false;
 }
 
 static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
-        struct csum_param *csum)
+        struct tx_packet_desc *ptpd)
 {
         u8 css, cso;
 
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
-                cso = skb_transport_offset(skb);
-                css = cso + skb->csum_offset;
-                if (unlikely(cso & 0x1)) {
-                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                "payload offset not an even number\n");
+                css = (u8) (skb->csum_start - skb_headroom(skb));
+                cso = css + (u8) skb->csum_offset;
+                if (unlikely(css & 0x1)) {
+                        /* L1 hardware requires an even number here */
+                        if (netif_msg_tx_err(adapter))
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "payload offset not an even number\n");
                         return -1;
                 }
-                csum->csumpl |= (cso & CSUM_PARAM_PLOADOFFSET_MASK) <<
-                        CSUM_PARAM_PLOADOFFSET_SHIFT;
-                csum->csumpl |= (css & CSUM_PARAM_XSUMOFFSET_MASK) <<
-                        CSUM_PARAM_XSUMOFFSET_SHIFT;
-                csum->csumpl |= 1 << CSUM_PARAM_CUSTOMCKSUM_SHIFT;
+                ptpd->word3 |= (css & TPD_PLOADOFFSET_MASK) <<
+                        TPD_PLOADOFFSET_SHIFT;
+                ptpd->word3 |= (cso & TPD_CCSUMOFFSET_MASK) <<
+                        TPD_CCSUMOFFSET_SHIFT;
+                ptpd->word3 |= 1 << TPD_CUST_CSUM_EN_SHIFT;
                 return true;
         }
-
-        return true;
+        return 0;
 }
 
 static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,
-        bool tcp_seg)
+        struct tx_packet_desc *ptpd)
 {
-        /* We enter this function holding a spinlock. */
+        /* spinlock held */
         struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;
         struct atl1_buffer *buffer_info;
+        u16 buf_len = skb->len;
         struct page *page;
-        int first_buf_len = skb->len;
         unsigned long offset;
         unsigned int nr_frags;
         unsigned int f;
-        u16 tpd_next_to_use;
-        u16 proto_hdr_len;
-        u16 len12;
+        int retval;
+        u16 next_to_use;
+        u16 data_len;
+        u8 hdr_len;
 
-        first_buf_len -= skb->data_len;
+        buf_len -= skb->data_len;
         nr_frags = skb_shinfo(skb)->nr_frags;
-        tpd_next_to_use = atomic_read(&tpd_ring->next_to_use);
-        buffer_info = &tpd_ring->buffer_info[tpd_next_to_use];
+        next_to_use = atomic_read(&tpd_ring->next_to_use);
+        buffer_info = &tpd_ring->buffer_info[next_to_use];
         if (unlikely(buffer_info->skb))
                 BUG();
-        buffer_info->skb = NULL;        /* put skb in last TPD */
-
-        if (tcp_seg) {
-                /* TSO/GSO */
-                proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-                buffer_info->length = proto_hdr_len;
+        /* put skb in last TPD */
+        buffer_info->skb = NULL;
+
+        retval = (ptpd->word3 >> TPD_SEGMENT_EN_SHIFT) & TPD_SEGMENT_EN_MASK;
+        if (retval) {
+                /* TSO */
+                hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+                buffer_info->length = hdr_len;
                 page = virt_to_page(skb->data);
                 offset = (unsigned long)skb->data & ~PAGE_MASK;
                 buffer_info->dma = pci_map_page(adapter->pdev, page,
-                                                offset, proto_hdr_len,
+                                                offset, hdr_len,
                                                 PCI_DMA_TODEVICE);
 
-                if (++tpd_next_to_use == tpd_ring->count)
-                        tpd_next_to_use = 0;
+                if (++next_to_use == tpd_ring->count)
+                        next_to_use = 0;
 
-                if (first_buf_len > proto_hdr_len) {
-                        int i, m;
+                if (buf_len > hdr_len) {
+                        int i, nseg;
 
-                        len12 = first_buf_len - proto_hdr_len;
-                        m = (len12 + ATL1_MAX_TX_BUF_LEN - 1) /
+                        data_len = buf_len - hdr_len;
+                        nseg = (data_len + ATL1_MAX_TX_BUF_LEN - 1) /
                                 ATL1_MAX_TX_BUF_LEN;
-                        for (i = 0; i < m; i++) {
+                        for (i = 0; i < nseg; i++) {
                                 buffer_info =
-                                    &tpd_ring->buffer_info[tpd_next_to_use];
+                                    &tpd_ring->buffer_info[next_to_use];
                                 buffer_info->skb = NULL;
                                 buffer_info->length =
                                     (ATL1_MAX_TX_BUF_LEN >=
-                                     len12) ? ATL1_MAX_TX_BUF_LEN : len12;
-                                len12 -= buffer_info->length;
+                                     data_len) ? ATL1_MAX_TX_BUF_LEN : data_len;
+                                data_len -= buffer_info->length;
                                 page = virt_to_page(skb->data +
-                                        (proto_hdr_len +
-                                        i * ATL1_MAX_TX_BUF_LEN));
+                                        (hdr_len + i * ATL1_MAX_TX_BUF_LEN));
                                 offset = (unsigned long)(skb->data +
-                                        (proto_hdr_len +
-                                        i * ATL1_MAX_TX_BUF_LEN)) & ~PAGE_MASK;
+                                        (hdr_len + i * ATL1_MAX_TX_BUF_LEN)) &
+                                        ~PAGE_MASK;
                                 buffer_info->dma = pci_map_page(adapter->pdev,
                                         page, offset, buffer_info->length,
                                         PCI_DMA_TODEVICE);
-                                if (++tpd_next_to_use == tpd_ring->count)
-                                        tpd_next_to_use = 0;
+                                if (++next_to_use == tpd_ring->count)
+                                        next_to_use = 0;
                         }
                 }
         } else {
-                /* not TSO/GSO */
-                buffer_info->length = first_buf_len;
+                /* not TSO */
+                buffer_info->length = buf_len;
                 page = virt_to_page(skb->data);
                 offset = (unsigned long)skb->data & ~PAGE_MASK;
                 buffer_info->dma = pci_map_page(adapter->pdev, page,
-                        offset, first_buf_len, PCI_DMA_TODEVICE);
-                if (++tpd_next_to_use == tpd_ring->count)
-                        tpd_next_to_use = 0;
+                        offset, buf_len, PCI_DMA_TODEVICE);
+                if (++next_to_use == tpd_ring->count)
+                        next_to_use = 0;
         }
 
         for (f = 0; f < nr_frags; f++) {
                 struct skb_frag_struct *frag;
-                u16 lenf, i, m;
+                u16 i, nseg;
 
                 frag = &skb_shinfo(skb)->frags[f];
-                lenf = frag->size;
+                buf_len = frag->size;
 
-                m = (lenf + ATL1_MAX_TX_BUF_LEN - 1) / ATL1_MAX_TX_BUF_LEN;
-                for (i = 0; i < m; i++) {
-                        buffer_info = &tpd_ring->buffer_info[tpd_next_to_use];
+                nseg = (buf_len + ATL1_MAX_TX_BUF_LEN - 1) /
+                        ATL1_MAX_TX_BUF_LEN;
+                for (i = 0; i < nseg; i++) {
+                        buffer_info = &tpd_ring->buffer_info[next_to_use];
                         if (unlikely(buffer_info->skb))
                                 BUG();
                         buffer_info->skb = NULL;
-                        buffer_info->length = (lenf > ATL1_MAX_TX_BUF_LEN) ?
-                                ATL1_MAX_TX_BUF_LEN : lenf;
-                        lenf -= buffer_info->length;
+                        buffer_info->length = (buf_len > ATL1_MAX_TX_BUF_LEN) ?
+                                ATL1_MAX_TX_BUF_LEN : buf_len;
+                        buf_len -= buffer_info->length;
                         buffer_info->dma = pci_map_page(adapter->pdev,
                                 frag->page,
                                 frag->page_offset + (i * ATL1_MAX_TX_BUF_LEN),
                                 buffer_info->length, PCI_DMA_TODEVICE);
 
-                        if (++tpd_next_to_use == tpd_ring->count)
-                                tpd_next_to_use = 0;
+                        if (++next_to_use == tpd_ring->count)
+                                next_to_use = 0;
                 }
         }
 
@@ -1602,39 +2180,44 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,
         buffer_info->skb = skb;
 }
 
-static void atl1_tx_queue(struct atl1_adapter *adapter, int count,
-       union tpd_descr *descr)
+static void atl1_tx_queue(struct atl1_adapter *adapter, u16 count,
+       struct tx_packet_desc *ptpd)
 {
-        /* We enter this function holding a spinlock. */
+        /* spinlock held */
         struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;
-        int j;
-        u32 val;
         struct atl1_buffer *buffer_info;
         struct tx_packet_desc *tpd;
-        u16 tpd_next_to_use = atomic_read(&tpd_ring->next_to_use);
+        u16 j;
+        u32 val;
+        u16 next_to_use = (u16) atomic_read(&tpd_ring->next_to_use);
 
         for (j = 0; j < count; j++) {
-                buffer_info = &tpd_ring->buffer_info[tpd_next_to_use];
-                tpd = ATL1_TPD_DESC(&adapter->tpd_ring, tpd_next_to_use);
-                tpd->desc.csum.csumpu = descr->csum.csumpu;
-                tpd->desc.csum.csumpl = descr->csum.csumpl;
-                tpd->desc.tso.tsopu = descr->tso.tsopu;
-                tpd->desc.tso.tsopl = descr->tso.tsopl;
+                buffer_info = &tpd_ring->buffer_info[next_to_use];
+                tpd = ATL1_TPD_DESC(&adapter->tpd_ring, next_to_use);
+                if (tpd != ptpd)
+                        memcpy(tpd, ptpd, sizeof(struct tx_packet_desc));
                 tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
-                tpd->desc.data = descr->data;
-                tpd->desc.csum.csumpu |= (cpu_to_le16(buffer_info->length) &
-                        CSUM_PARAM_BUFLEN_MASK) << CSUM_PARAM_BUFLEN_SHIFT;
+                tpd->word2 = (cpu_to_le16(buffer_info->length) &
+                        TPD_BUFLEN_MASK) << TPD_BUFLEN_SHIFT;
 
-                val = (descr->tso.tsopl >> TSO_PARAM_SEGMENT_SHIFT) &
-                        TSO_PARAM_SEGMENT_MASK;
-                if (val && !j)
-                        tpd->desc.tso.tsopl |= 1 << TSO_PARAM_HDRFLAG_SHIFT;
+                /*
+                 * if this is the first packet in a TSO chain, set
+                 * TPD_HDRFLAG, otherwise, clear it.
+                 */
+                val = (tpd->word3 >> TPD_SEGMENT_EN_SHIFT) &
+                        TPD_SEGMENT_EN_MASK;
+                if (val) {
+                        if (!j)
+                                tpd->word3 |= 1 << TPD_HDRFLAG_SHIFT;
+                        else
+                                tpd->word3 &= ~(1 << TPD_HDRFLAG_SHIFT);
+                }
 
                 if (j == (count - 1))
-                        tpd->desc.csum.csumpl |= 1 << CSUM_PARAM_EOP_SHIFT;
+                        tpd->word3 |= 1 << TPD_EOP_SHIFT;
 
-                if (++tpd_next_to_use == tpd_ring->count)
-                        tpd_next_to_use = 0;
+                if (++next_to_use == tpd_ring->count)
+                        next_to_use = 0;
         }
         /*
          * Force memory writes to complete before letting h/w
@@ -1644,18 +2227,18 @@ static void atl1_tx_queue(struct atl1_adapter *adapter, int count,
          */
         wmb();
 
-        atomic_set(&tpd_ring->next_to_use, (int)tpd_next_to_use);
+        atomic_set(&tpd_ring->next_to_use, next_to_use);
 }
 
 static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 {
         struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;
         int len = skb->len;
         int tso;
         int count = 1;
         int ret_val;
-        u32 val;
-        union tpd_descr param;
+        struct tx_packet_desc *ptpd;
         u16 frag_size;
         u16 vlan_tag;
         unsigned long flags;
@@ -1666,18 +2249,11 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
         len -= skb->data_len;
 
-        if (unlikely(skb->len == 0)) {
+        if (unlikely(skb->len <= 0)) {
                 dev_kfree_skb_any(skb);
                 return NETDEV_TX_OK;
         }
 
-        param.data = 0;
-        param.tso.tsopu = 0;
-        param.tso.tsopl = 0;
-        param.csum.csumpu = 0;
-        param.csum.csumpl = 0;
-
-        /* nr_frags will be nonzero if we're doing scatter/gather (SG) */
         nr_frags = skb_shinfo(skb)->nr_frags;
         for (f = 0; f < nr_frags; f++) {
                 frag_size = skb_shinfo(skb)->frags[f].size;
@@ -1686,10 +2262,9 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                                 ATL1_MAX_TX_BUF_LEN;
         }
 
-        /* mss will be nonzero if we're doing segment offload (TSO/GSO) */
         mss = skb_shinfo(skb)->gso_size;
         if (mss) {
-                if (skb->protocol == htons(ETH_P_IP)) {
+                if (skb->protocol == ntohs(ETH_P_IP)) {
                         proto_hdr_len = (skb_transport_offset(skb) +
                                          tcp_hdrlen(skb));
                         if (unlikely(proto_hdr_len > len)) {
@@ -1706,7 +2281,9 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
         if (!spin_trylock_irqsave(&adapter->lock, flags)) {
                 /* Can't get lock - tell upper layer to requeue */
-                dev_printk(KERN_DEBUG, &adapter->pdev->dev, "tx locked\n");
+                if (netif_msg_tx_queued(adapter))
+                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                "tx locked\n");
                 return NETDEV_TX_LOCKED;
         }
 
@@ -1714,22 +2291,26 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 /* not enough descriptors */
                 netif_stop_queue(netdev);
                 spin_unlock_irqrestore(&adapter->lock, flags);
-                dev_printk(KERN_DEBUG, &adapter->pdev->dev, "tx busy\n");
+                if (netif_msg_tx_queued(adapter))
+                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                "tx busy\n");
                 return NETDEV_TX_BUSY;
         }
 
-        param.data = 0;
+        ptpd = ATL1_TPD_DESC(tpd_ring,
+                (u16) atomic_read(&tpd_ring->next_to_use));
+        memset(ptpd, 0, sizeof(struct tx_packet_desc));
 
         if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
                 vlan_tag = vlan_tx_tag_get(skb);
                 vlan_tag = (vlan_tag << 4) | (vlan_tag >> 13) |
                         ((vlan_tag >> 9) & 0x8);
-                param.csum.csumpl |= 1 << CSUM_PARAM_INSVLAG_SHIFT;
-                param.csum.csumpu |= (vlan_tag & CSUM_PARAM_VALANTAG_MASK) <<
-                        CSUM_PARAM_VALAN_SHIFT;
+                ptpd->word3 |= 1 << TPD_INS_VL_TAG_SHIFT;
+                ptpd->word3 |= (vlan_tag & TPD_VL_TAGGED_MASK) <<
+                        TPD_VL_TAGGED_SHIFT;
         }
 
-        tso = atl1_tso(adapter, skb, &param.tso);
+        tso = atl1_tso(adapter, skb, ptpd);
         if (tso < 0) {
                 spin_unlock_irqrestore(&adapter->lock, flags);
                 dev_kfree_skb_any(skb);
@@ -1737,7 +2318,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         }
 
         if (!tso) {
-                ret_val = atl1_tx_csum(adapter, skb, &param.csum);
+                ret_val = atl1_tx_csum(adapter, skb, ptpd);
                 if (ret_val < 0) {
                         spin_unlock_irqrestore(&adapter->lock, flags);
                         dev_kfree_skb_any(skb);
@@ -1745,13 +2326,11 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 }
         }
 
-        val = (param.csum.csumpl >> CSUM_PARAM_SEGMENT_SHIFT) &
-                CSUM_PARAM_SEGMENT_MASK;
-        atl1_tx_map(adapter, skb, 1 == val);
-        atl1_tx_queue(adapter, count, &param);
-        netdev->trans_start = jiffies;
-        spin_unlock_irqrestore(&adapter->lock, flags);
+        atl1_tx_map(adapter, skb, ptpd);
+        atl1_tx_queue(adapter, count, ptpd);
         atl1_update_mailbox(adapter);
+        spin_unlock_irqrestore(&adapter->lock, flags);
+        netdev->trans_start = jiffies;
         return NETDEV_TX_OK;
 }
 
@@ -1776,7 +2355,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
                 adapter->cmb.cmb->int_stats = 0;
 
                 if (status & ISR_GPHY)  /* clear phy status */
-                        atl1_clear_phy_int(adapter);
+                        atlx_clear_phy_int(adapter);
 
                 /* clear ISR status, and Enable CMB DMA/Disable Interrupt */
                 iowrite32(status | ISR_DIS_INT, adapter->hw.hw_addr + REG_ISR);
@@ -1787,8 +2366,9 @@ static irqreturn_t atl1_intr(int irq, void *data)
 
                 /* check if PCIE PHY Link down */
                 if (status & ISR_PHY_LINKDOWN) {
-                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                "pcie phy link down %x\n", status);
+                        if (netif_msg_intr(adapter))
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "pcie phy link down %x\n", status);
                         if (netif_running(adapter->netdev)) {   /* reset MAC */
                                 iowrite32(0, adapter->hw.hw_addr + REG_IMR);
                                 schedule_work(&adapter->pcie_dma_to_rst_task);
@@ -1798,9 +2378,10 @@ static irqreturn_t atl1_intr(int irq, void *data)
 
                 /* check if DMA read/write error ? */
                 if (status & (ISR_DMAR_TO_RST | ISR_DMAW_TO_RST)) {
-                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                "pcie DMA r/w error (status = 0x%x)\n",
-                                status);
+                        if (netif_msg_intr(adapter))
+                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                        "pcie DMA r/w error (status = 0x%x)\n",
+                                        status);
                         iowrite32(0, adapter->hw.hw_addr + REG_IMR);
                         schedule_work(&adapter->pcie_dma_to_rst_task);
                         return IRQ_HANDLED;
@@ -1823,8 +2404,11 @@ static irqreturn_t atl1_intr(int irq, void *data)
                         if (status & (ISR_RXF_OV | ISR_RFD_UNRUN |
                                 ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
                                 ISR_HOST_RRD_OV))
-                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                        "rx exception, ISR = 0x%x\n", status);
+                                if (netif_msg_intr(adapter))
+                                        dev_printk(KERN_DEBUG,
+                                                &adapter->pdev->dev,
+                                                "rx exception, ISR = 0x%x\n",
+                                                status);
                         atl1_intr_rx(adapter);
                 }
 
@@ -1863,23 +2447,12 @@ static void atl1_phy_config(unsigned long data)
         spin_lock_irqsave(&adapter->lock, flags);
         adapter->phy_timer_pending = false;
         atl1_write_phy_reg(hw, MII_ADVERTISE, hw->mii_autoneg_adv_reg);
-        atl1_write_phy_reg(hw, MII_AT001_CR, hw->mii_1000t_ctrl_reg);
+        atl1_write_phy_reg(hw, MII_ATLX_CR, hw->mii_1000t_ctrl_reg);
         atl1_write_phy_reg(hw, MII_BMCR, MII_CR_RESET | MII_CR_AUTO_NEG_EN);
         spin_unlock_irqrestore(&adapter->lock, flags);
 }
 
 /*
- * atl1_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- */
-static void atl1_tx_timeout(struct net_device *netdev)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        /* Do the reset outside of interrupt context */
-        schedule_work(&adapter->tx_timeout_task);
-}
-
-/*
  * Orphaned vendor comment left intact here:
  * <vendor comment>
  * If TPD Buffer size equal to 0, PCIE DMAR_TO_INT
@@ -1889,86 +2462,29 @@ static void atl1_tx_timeout(struct net_device *netdev)
  * assert again and again.
  * </vendor comment>
  */
-static void atl1_tx_timeout_task(struct work_struct *work)
-{
-        struct atl1_adapter *adapter =
-                container_of(work, struct atl1_adapter, tx_timeout_task);
-        struct net_device *netdev = adapter->netdev;
 
-        netif_device_detach(netdev);
-        atl1_down(adapter);
-        atl1_up(adapter);
-        netif_device_attach(netdev);
-}
-
-/*
- * atl1_link_chg_task - deal with link change event Out of interrupt context
- */
-static void atl1_link_chg_task(struct work_struct *work)
-{
-        struct atl1_adapter *adapter =
-               container_of(work, struct atl1_adapter, link_chg_task);
-        unsigned long flags;
-
-        spin_lock_irqsave(&adapter->lock, flags);
-        atl1_check_link(adapter);
-        spin_unlock_irqrestore(&adapter->lock, flags);
-}
-
-static void atl1_vlan_rx_register(struct net_device *netdev,
-        struct vlan_group *grp)
-{
-        struct atl1_adapter *adapter = netdev_priv(netdev);
-        unsigned long flags;
-        u32 ctrl;
-
-        spin_lock_irqsave(&adapter->lock, flags);
-        /* atl1_irq_disable(adapter); */
-        adapter->vlgrp = grp;
-
-        if (grp) {
-                /* enable VLAN tag insert/strip */
-                ctrl = ioread32(adapter->hw.hw_addr + REG_MAC_CTRL);
-                ctrl |= MAC_CTRL_RMV_VLAN;
-                iowrite32(ctrl, adapter->hw.hw_addr + REG_MAC_CTRL);
-        } else {
-                /* disable VLAN tag insert/strip */
-                ctrl = ioread32(adapter->hw.hw_addr + REG_MAC_CTRL);
-                ctrl &= ~MAC_CTRL_RMV_VLAN;
-                iowrite32(ctrl, adapter->hw.hw_addr + REG_MAC_CTRL);
-        }
-
-        /* atl1_irq_enable(adapter); */
-        spin_unlock_irqrestore(&adapter->lock, flags);
-}
-
-static void atl1_restore_vlan(struct atl1_adapter *adapter)
-{
-        atl1_vlan_rx_register(adapter->netdev, adapter->vlgrp);
-}
-
-int atl1_reset(struct atl1_adapter *adapter)
+static int atl1_reset(struct atl1_adapter *adapter)
 {
         int ret;
-
         ret = atl1_reset_hw(&adapter->hw);
-        if (ret != ATL1_SUCCESS)
+        if (ret)
                 return ret;
         return atl1_init_hw(&adapter->hw);
 }
 
-s32 atl1_up(struct atl1_adapter *adapter)
+static s32 atl1_up(struct atl1_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
         int err;
         int irq_flags = IRQF_SAMPLE_RANDOM;
 
         /* hardware has been reset, we need to reload some things */
-        atl1_set_multi(netdev);
+        atlx_set_multi(netdev);
         atl1_init_ring_ptrs(adapter);
-        atl1_restore_vlan(adapter);
+        atlx_restore_vlan(adapter);
         err = atl1_alloc_rx_buffers(adapter);
-        if (unlikely(!err))             /* no RX BUFFER allocated */
+        if (unlikely(!err))
+                /* no RX BUFFER allocated */
                 return -ENOMEM;
 
         if (unlikely(atl1_configure(adapter))) {
@@ -1978,8 +2494,9 @@ s32 atl1_up(struct atl1_adapter *adapter)
 
         err = pci_enable_msi(adapter->pdev);
         if (err) {
-                dev_info(&adapter->pdev->dev,
-                        "Unable to enable MSI: %d\n", err);
+                if (netif_msg_ifup(adapter))
+                        dev_info(&adapter->pdev->dev,
+                                "Unable to enable MSI: %d\n", err);
                 irq_flags |= IRQF_SHARED;
         }
 
@@ -1989,7 +2506,7 @@ s32 atl1_up(struct atl1_adapter *adapter)
                 goto err_up;
 
         mod_timer(&adapter->watchdog_timer, jiffies);
-        atl1_irq_enable(adapter);
+        atlx_irq_enable(adapter);
         atl1_check_link(adapter);
         return 0;
 
@@ -2000,7 +2517,7 @@ err_up:
         return err;
 }
 
-void atl1_down(struct atl1_adapter *adapter)
+static void atl1_down(struct atl1_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
 
@@ -2008,7 +2525,7 @@ void atl1_down(struct atl1_adapter *adapter)
         del_timer_sync(&adapter->phy_config_timer);
         adapter->phy_timer_pending = false;
 
-        atl1_irq_disable(adapter);
+        atlx_irq_disable(adapter);
         free_irq(adapter->pdev->irq, netdev);
         pci_disable_msi(adapter->pdev);
         atl1_reset_hw(&adapter->hw);
@@ -2023,6 +2540,52 @@ void atl1_down(struct atl1_adapter *adapter)
         atl1_clean_rx_ring(adapter);
 }
 
+static void atl1_tx_timeout_task(struct work_struct *work)
+{
+        struct atl1_adapter *adapter =
+                container_of(work, struct atl1_adapter, tx_timeout_task);
+        struct net_device *netdev = adapter->netdev;
+
+        netif_device_detach(netdev);
+        atl1_down(adapter);
+        atl1_up(adapter);
+        netif_device_attach(netdev);
+}
+
+/*
+ * atl1_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ */
+static int atl1_change_mtu(struct net_device *netdev, int new_mtu)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        int old_mtu = netdev->mtu;
+        int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
+
+        if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||
+            (max_frame > MAX_JUMBO_FRAME_SIZE)) {
+                if (netif_msg_link(adapter))
+                        dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");
+                return -EINVAL;
+        }
+
+        adapter->hw.max_frame_size = max_frame;
+        adapter->hw.tx_jumbo_task_th = (max_frame + 7) >> 3;
+        adapter->rx_buffer_len = (max_frame + 7) & ~7;
+        adapter->hw.rx_jumbo_th = adapter->rx_buffer_len / 8;
+
+        netdev->mtu = new_mtu;
+        if ((old_mtu != new_mtu) && netif_running(netdev)) {
+                atl1_down(adapter);
+                atl1_up(adapter);
+        }
+
+        return 0;
+}
+
 /*
  * atl1_open - Called when a network interface is made active
  * @netdev: network interface device structure
@@ -2091,7 +2654,7 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
         if (ctrl & BMSR_LSTATUS)
-                wufc &= ~ATL1_WUFC_LNKC;
+                wufc &= ~ATLX_WUFC_LNKC;
 
         /* reduce speed to 10/100M */
         if (wufc) {
@@ -2099,15 +2662,15 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
                 /* if resume, let driver to re- setup link */
                 hw->phy_configured = false;
                 atl1_set_mac_addr(hw);
-                atl1_set_multi(netdev);
+                atlx_set_multi(netdev);
 
                 ctrl = 0;
                 /* turn on magic packet wol */
-                if (wufc & ATL1_WUFC_MAG)
+                if (wufc & ATLX_WUFC_MAG)
                         ctrl = WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
 
                 /* turn on Link change WOL */
-                if (wufc & ATL1_WUFC_LNKC)
+                if (wufc & ATLX_WUFC_LNKC)
                         ctrl |= (WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN);
                 iowrite32(ctrl, hw->hw_addr + REG_WOL_CTRL);
 
@@ -2115,13 +2678,13 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
                 ctrl = ioread32(hw->hw_addr + REG_MAC_CTRL);
                 ctrl &= ~MAC_CTRL_DBG;
                 ctrl &= ~MAC_CTRL_PROMIS_EN;
-                if (wufc & ATL1_WUFC_MC)
+                if (wufc & ATLX_WUFC_MC)
                         ctrl |= MAC_CTRL_MC_ALL_EN;
                 else
                         ctrl &= ~MAC_CTRL_MC_ALL_EN;
 
                 /* turn on broadcast mode if wake on-BC is enabled */
-                if (wufc & ATL1_WUFC_BC)
+                if (wufc & ATLX_WUFC_BC)
                         ctrl |= MAC_CTRL_BC_EN;
                 else
                         ctrl &= ~MAC_CTRL_BC_EN;
@@ -2149,12 +2712,13 @@ static int atl1_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1_adapter *adapter = netdev_priv(netdev);
-        u32 ret_val;
+        u32 err;
 
-        pci_set_power_state(pdev, 0);
+        pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
 
-        ret_val = pci_enable_device(pdev);
+        /* FIXME: check and handle */
+        err = pci_enable_device(pdev);
         pci_enable_wake(pdev, PCI_D3hot, 0);
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
@@ -2221,14 +2785,16 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
                 dev_err(&pdev->dev, "no usable DMA configuration\n");
                 goto err_dma;
         }
-        /* Mark all PCI regions associated with PCI device
+        /*
+         * Mark all PCI regions associated with PCI device
          * pdev as being reserved by owner atl1_driver_name
          */
-        err = pci_request_regions(pdev, atl1_driver_name);
+        err = pci_request_regions(pdev, ATLX_DRIVER_NAME);
         if (err)
                 goto err_request_regions;
 
-        /* Enables bus-mastering on the device and calls
+        /*
+         * Enables bus-mastering on the device and calls
          * pcibios_set_master to do the needed arch specific settings
          */
         pci_set_master(pdev);
@@ -2245,6 +2811,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         adapter->netdev = netdev;
         adapter->pdev = pdev;
         adapter->hw.back = adapter;
+        adapter->msg_enable = netif_msg_init(debug, atl1_default_msg);
 
         adapter->hw.hw_addr = pci_iomap(pdev, 0, 0);
         if (!adapter->hw.hw_addr) {
@@ -2254,7 +2821,8 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         /* get device revision number */
         adapter->hw.dev_rev = ioread16(adapter->hw.hw_addr +
                 (REG_MASTER_CTRL + 2));
-        dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
+        if (netif_msg_probe(adapter))
+                dev_info(&pdev->dev, "version %s\n", ATLX_DRIVER_VERSION);
 
         /* set default ring resource counts */
         adapter->rfd_ring.count = adapter->rrd_ring.count = ATL1_DEFAULT_RFD;
@@ -2269,17 +2837,17 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         netdev->open = &atl1_open;
         netdev->stop = &atl1_close;
         netdev->hard_start_xmit = &atl1_xmit_frame;
-        netdev->get_stats = &atl1_get_stats;
-        netdev->set_multicast_list = &atl1_set_multi;
+        netdev->get_stats = &atlx_get_stats;
+        netdev->set_multicast_list = &atlx_set_multi;
         netdev->set_mac_address = &atl1_set_mac;
         netdev->change_mtu = &atl1_change_mtu;
-        netdev->do_ioctl = &atl1_ioctl;
-        netdev->tx_timeout = &atl1_tx_timeout;
+        netdev->do_ioctl = &atlx_ioctl;
+        netdev->tx_timeout = &atlx_tx_timeout;
         netdev->watchdog_timeo = 5 * HZ;
 #ifdef CONFIG_NET_POLL_CONTROLLER
         netdev->poll_controller = atl1_poll_controller;
 #endif
-        netdev->vlan_rx_register = atl1_vlan_rx_register;
+        netdev->vlan_rx_register = atlx_vlan_rx_register;
 
         netdev->ethtool_ops = &atl1_ethtool_ops;
         adapter->bd_number = cards_found;
@@ -2292,13 +2860,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         netdev->features = NETIF_F_HW_CSUM;
         netdev->features |= NETIF_F_SG;
         netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-
-        /*
-         * FIXME - Until tso performance gets fixed, disable the feature.
-         * Enable it with ethtool -K if desired.
-         */
-        /* netdev->features |= NETIF_F_TSO; */
-
+        netdev->features |= NETIF_F_TSO;
         netdev->features |= NETIF_F_LLTX;
 
         /*
@@ -2309,7 +2871,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         /* atl1_pcie_patch(adapter); */
 
         /* really reset GPHY core */
-        iowrite16(0, adapter->hw.hw_addr + REG_GPHY_ENABLE);
+        iowrite16(0, adapter->hw.hw_addr + REG_PHY_ENABLE);
 
         /*
          * reset the controller to
@@ -2354,7 +2916,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 
         INIT_WORK(&adapter->tx_timeout_task, atl1_tx_timeout_task);
 
-        INIT_WORK(&adapter->link_chg_task, atl1_link_chg_task);
+        INIT_WORK(&adapter->link_chg_task, atlx_link_chg_task);
 
         INIT_WORK(&adapter->pcie_dma_to_rst_task, atl1_tx_timeout_task);
 
@@ -2397,7 +2959,8 @@ static void __devexit atl1_remove(struct pci_dev *pdev)
 
         adapter = netdev_priv(netdev);
 
-        /* Some atl1 boards lack persistent storage for their MAC, and get it
+        /*
+         * Some atl1 boards lack persistent storage for their MAC, and get it
          * from the BIOS during POST.  If we've been messing with the MAC
          * address, we need to save the permanent one.
          */
@@ -2407,7 +2970,7 @@ static void __devexit atl1_remove(struct pci_dev *pdev)
                 atl1_set_mac_addr(&adapter->hw);
         }
 
-        iowrite16(0, adapter->hw.hw_addr + REG_GPHY_ENABLE);
+        iowrite16(0, adapter->hw.hw_addr + REG_PHY_ENABLE);
         unregister_netdev(netdev);
         pci_iounmap(pdev, adapter->hw.hw_addr);
         pci_release_regions(pdev);
@@ -2416,7 +2979,7 @@ static void __devexit atl1_remove(struct pci_dev *pdev)
 }
 
 static struct pci_driver atl1_driver = {
-        .name = atl1_driver_name,
+        .name = ATLX_DRIVER_NAME,
         .id_table = atl1_pci_tbl,
         .probe = atl1_probe,
         .remove = __devexit_p(atl1_remove),
@@ -2448,3 +3011,554 @@ static int __init atl1_init_module(void)
 
 module_init(atl1_init_module);
 module_exit(atl1_exit_module);
+
+struct atl1_stats {
+        char stat_string[ETH_GSTRING_LEN];
+        int sizeof_stat;
+        int stat_offset;
+};
+
+#define ATL1_STAT(m) \
+        sizeof(((struct atl1_adapter *)0)->m), offsetof(struct atl1_adapter, m)
+
+static struct atl1_stats atl1_gstrings_stats[] = {
+        {"rx_packets", ATL1_STAT(soft_stats.rx_packets)},
+        {"tx_packets", ATL1_STAT(soft_stats.tx_packets)},
+        {"rx_bytes", ATL1_STAT(soft_stats.rx_bytes)},
+        {"tx_bytes", ATL1_STAT(soft_stats.tx_bytes)},
+        {"rx_errors", ATL1_STAT(soft_stats.rx_errors)},
+        {"tx_errors", ATL1_STAT(soft_stats.tx_errors)},
+        {"rx_dropped", ATL1_STAT(net_stats.rx_dropped)},
+        {"tx_dropped", ATL1_STAT(net_stats.tx_dropped)},
+        {"multicast", ATL1_STAT(soft_stats.multicast)},
+        {"collisions", ATL1_STAT(soft_stats.collisions)},
+        {"rx_length_errors", ATL1_STAT(soft_stats.rx_length_errors)},
+        {"rx_over_errors", ATL1_STAT(soft_stats.rx_missed_errors)},
+        {"rx_crc_errors", ATL1_STAT(soft_stats.rx_crc_errors)},
+        {"rx_frame_errors", ATL1_STAT(soft_stats.rx_frame_errors)},
+        {"rx_fifo_errors", ATL1_STAT(soft_stats.rx_fifo_errors)},
+        {"rx_missed_errors", ATL1_STAT(soft_stats.rx_missed_errors)},
+        {"tx_aborted_errors", ATL1_STAT(soft_stats.tx_aborted_errors)},
+        {"tx_carrier_errors", ATL1_STAT(soft_stats.tx_carrier_errors)},
+        {"tx_fifo_errors", ATL1_STAT(soft_stats.tx_fifo_errors)},
+        {"tx_window_errors", ATL1_STAT(soft_stats.tx_window_errors)},
+        {"tx_abort_exce_coll", ATL1_STAT(soft_stats.excecol)},
+        {"tx_abort_late_coll", ATL1_STAT(soft_stats.latecol)},
+        {"tx_deferred_ok", ATL1_STAT(soft_stats.deffer)},
+        {"tx_single_coll_ok", ATL1_STAT(soft_stats.scc)},
+        {"tx_multi_coll_ok", ATL1_STAT(soft_stats.mcc)},
+        {"tx_underun", ATL1_STAT(soft_stats.tx_underun)},
+        {"tx_trunc", ATL1_STAT(soft_stats.tx_trunc)},
+        {"tx_pause", ATL1_STAT(soft_stats.tx_pause)},
+        {"rx_pause", ATL1_STAT(soft_stats.rx_pause)},
+        {"rx_rrd_ov", ATL1_STAT(soft_stats.rx_rrd_ov)},
+        {"rx_trunc", ATL1_STAT(soft_stats.rx_trunc)}
+};
+
+static void atl1_get_ethtool_stats(struct net_device *netdev,
+        struct ethtool_stats *stats, u64 *data)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        int i;
+        char *p;
+
+        for (i = 0; i < ARRAY_SIZE(atl1_gstrings_stats); i++) {
+                p = (char *)adapter+atl1_gstrings_stats[i].stat_offset;
+                data[i] = (atl1_gstrings_stats[i].sizeof_stat ==
+                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+        }
+
+}
+
+static int atl1_get_sset_count(struct net_device *netdev, int sset)
+{
+        switch (sset) {
+        case ETH_SS_STATS:
+                return ARRAY_SIZE(atl1_gstrings_stats);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+static int atl1_get_settings(struct net_device *netdev,
+        struct ethtool_cmd *ecmd)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_hw *hw = &adapter->hw;
+
+        ecmd->supported = (SUPPORTED_10baseT_Half |
+                           SUPPORTED_10baseT_Full |
+                           SUPPORTED_100baseT_Half |
+                           SUPPORTED_100baseT_Full |
+                           SUPPORTED_1000baseT_Full |
+                           SUPPORTED_Autoneg | SUPPORTED_TP);
+        ecmd->advertising = ADVERTISED_TP;
+        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
+            hw->media_type == MEDIA_TYPE_1000M_FULL) {
+                ecmd->advertising |= ADVERTISED_Autoneg;
+                if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR) {
+                        ecmd->advertising |= ADVERTISED_Autoneg;
+                        ecmd->advertising |=
+                            (ADVERTISED_10baseT_Half |
+                             ADVERTISED_10baseT_Full |
+                             ADVERTISED_100baseT_Half |
+                             ADVERTISED_100baseT_Full |
+                             ADVERTISED_1000baseT_Full);
+                } else
+                        ecmd->advertising |= (ADVERTISED_1000baseT_Full);
+        }
+        ecmd->port = PORT_TP;
+        ecmd->phy_address = 0;
+        ecmd->transceiver = XCVR_INTERNAL;
+
+        if (netif_carrier_ok(adapter->netdev)) {
+                u16 link_speed, link_duplex;
+                atl1_get_speed_and_duplex(hw, &link_speed, &link_duplex);
+                ecmd->speed = link_speed;
+                if (link_duplex == FULL_DUPLEX)
+                        ecmd->duplex = DUPLEX_FULL;
+                else
+                        ecmd->duplex = DUPLEX_HALF;
+        } else {
+                ecmd->speed = -1;
+                ecmd->duplex = -1;
+        }
+        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
+            hw->media_type == MEDIA_TYPE_1000M_FULL)
+                ecmd->autoneg = AUTONEG_ENABLE;
+        else
+                ecmd->autoneg = AUTONEG_DISABLE;
+
+        return 0;
+}
+
+static int atl1_set_settings(struct net_device *netdev,
+        struct ethtool_cmd *ecmd)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_hw *hw = &adapter->hw;
+        u16 phy_data;
+        int ret_val = 0;
+        u16 old_media_type = hw->media_type;
+
+        if (netif_running(adapter->netdev)) {
+                if (netif_msg_link(adapter))
+                        dev_dbg(&adapter->pdev->dev,
+                                "ethtool shutting down adapter\n");
+                atl1_down(adapter);
+        }
+
+        if (ecmd->autoneg == AUTONEG_ENABLE)
+                hw->media_type = MEDIA_TYPE_AUTO_SENSOR;
+        else {
+                if (ecmd->speed == SPEED_1000) {
+                        if (ecmd->duplex != DUPLEX_FULL) {
+                                if (netif_msg_link(adapter))
+                                        dev_warn(&adapter->pdev->dev,
+                                                "1000M half is invalid\n");
+                                ret_val = -EINVAL;
+                                goto exit_sset;
+                        }
+                        hw->media_type = MEDIA_TYPE_1000M_FULL;
+                } else if (ecmd->speed == SPEED_100) {
+                        if (ecmd->duplex == DUPLEX_FULL)
+                                hw->media_type = MEDIA_TYPE_100M_FULL;
+                        else
+                                hw->media_type = MEDIA_TYPE_100M_HALF;
+                } else {
+                        if (ecmd->duplex == DUPLEX_FULL)
+                                hw->media_type = MEDIA_TYPE_10M_FULL;
+                        else
+                                hw->media_type = MEDIA_TYPE_10M_HALF;
+                }
+        }
+        switch (hw->media_type) {
+        case MEDIA_TYPE_AUTO_SENSOR:
+                ecmd->advertising =
+                    ADVERTISED_10baseT_Half |
+                    ADVERTISED_10baseT_Full |
+                    ADVERTISED_100baseT_Half |
+                    ADVERTISED_100baseT_Full |
+                    ADVERTISED_1000baseT_Full |
+                    ADVERTISED_Autoneg | ADVERTISED_TP;
+                break;
+        case MEDIA_TYPE_1000M_FULL:
+                ecmd->advertising =
+                    ADVERTISED_1000baseT_Full |
+                    ADVERTISED_Autoneg | ADVERTISED_TP;
+                break;
+        default:
+                ecmd->advertising = 0;
+                break;
+        }
+        if (atl1_phy_setup_autoneg_adv(hw)) {
+                ret_val = -EINVAL;
+                if (netif_msg_link(adapter))
+                        dev_warn(&adapter->pdev->dev,
+                                "invalid ethtool speed/duplex setting\n");
+                goto exit_sset;
+        }
+        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
+            hw->media_type == MEDIA_TYPE_1000M_FULL)
+                phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN;
+        else {
+                switch (hw->media_type) {
+                case MEDIA_TYPE_100M_FULL:
+                        phy_data =
+                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_100 |
+                            MII_CR_RESET;
+                        break;
+                case MEDIA_TYPE_100M_HALF:
+                        phy_data = MII_CR_SPEED_100 | MII_CR_RESET;
+                        break;
+                case MEDIA_TYPE_10M_FULL:
+                        phy_data =
+                            MII_CR_FULL_DUPLEX | MII_CR_SPEED_10 | MII_CR_RESET;
+                        break;
+                default:
+                        /* MEDIA_TYPE_10M_HALF: */
+                        phy_data = MII_CR_SPEED_10 | MII_CR_RESET;
+                        break;
+                }
+        }
+        atl1_write_phy_reg(hw, MII_BMCR, phy_data);
+exit_sset:
+        if (ret_val)
+                hw->media_type = old_media_type;
+
+        if (netif_running(adapter->netdev)) {
+                if (netif_msg_link(adapter))
+                        dev_dbg(&adapter->pdev->dev,
+                                "ethtool starting adapter\n");
+                atl1_up(adapter);
+        } else if (!ret_val) {
+                if (netif_msg_link(adapter))
+                        dev_dbg(&adapter->pdev->dev,
+                                "ethtool resetting adapter\n");
+                atl1_reset(adapter);
+        }
+        return ret_val;
+}
+
+static void atl1_get_drvinfo(struct net_device *netdev,
+        struct ethtool_drvinfo *drvinfo)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+
+        strncpy(drvinfo->driver, ATLX_DRIVER_NAME, sizeof(drvinfo->driver));
+        strncpy(drvinfo->version, ATLX_DRIVER_VERSION,
+                sizeof(drvinfo->version));
+        strncpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
+        strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
+                sizeof(drvinfo->bus_info));
+        drvinfo->eedump_len = ATL1_EEDUMP_LEN;
+}
+
+static void atl1_get_wol(struct net_device *netdev,
+        struct ethtool_wolinfo *wol)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+
+        wol->supported = WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;
+        wol->wolopts = 0;
+        if (adapter->wol & ATLX_WUFC_EX)
+                wol->wolopts |= WAKE_UCAST;
+        if (adapter->wol & ATLX_WUFC_MC)
+                wol->wolopts |= WAKE_MCAST;
+        if (adapter->wol & ATLX_WUFC_BC)
+                wol->wolopts |= WAKE_BCAST;
+        if (adapter->wol & ATLX_WUFC_MAG)
+                wol->wolopts |= WAKE_MAGIC;
+        return;
+}
+
+static int atl1_set_wol(struct net_device *netdev,
+        struct ethtool_wolinfo *wol)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+
+        if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
+                return -EOPNOTSUPP;
+        adapter->wol = 0;
+        if (wol->wolopts & WAKE_UCAST)
+                adapter->wol |= ATLX_WUFC_EX;
+        if (wol->wolopts & WAKE_MCAST)
+                adapter->wol |= ATLX_WUFC_MC;
+        if (wol->wolopts & WAKE_BCAST)
+                adapter->wol |= ATLX_WUFC_BC;
+        if (wol->wolopts & WAKE_MAGIC)
+                adapter->wol |= ATLX_WUFC_MAG;
+        return 0;
+}
+
+static u32 atl1_get_msglevel(struct net_device *netdev)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        return adapter->msg_enable;
+}
+
+static void atl1_set_msglevel(struct net_device *netdev, u32 value)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        adapter->msg_enable = value;
+}
+
+static int atl1_get_regs_len(struct net_device *netdev)
+{
+        return ATL1_REG_COUNT * sizeof(u32);
+}
+
+static void atl1_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
+        void *p)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_hw *hw = &adapter->hw;
+        unsigned int i;
+        u32 *regbuf = p;
+
+        for (i = 0; i < ATL1_REG_COUNT; i++) {
+                /*
+                 * This switch statement avoids reserved regions
+                 * of register space.
+                 */
+                switch (i) {
+                case 6 ... 9:
+                case 14:
+                case 29 ... 31:
+                case 34 ... 63:
+                case 75 ... 127:
+                case 136 ... 1023:
+                case 1027 ... 1087:
+                case 1091 ... 1151:
+                case 1194 ... 1195:
+                case 1200 ... 1201:
+                case 1206 ... 1213:
+                case 1216 ... 1279:
+                case 1290 ... 1311:
+                case 1323 ... 1343:
+                case 1358 ... 1359:
+                case 1368 ... 1375:
+                case 1378 ... 1383:
+                case 1388 ... 1391:
+                case 1393 ... 1395:
+                case 1402 ... 1403:
+                case 1410 ... 1471:
+                case 1522 ... 1535:
+                        /* reserved region; don't read it */
+                        regbuf[i] = 0;
+                        break;
+                default:
+                        /* unreserved region */
+                        regbuf[i] = ioread32(hw->hw_addr + (i * sizeof(u32)));
+                }
+        }
+}
+
+static void atl1_get_ringparam(struct net_device *netdev,
+        struct ethtool_ringparam *ring)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_tpd_ring *txdr = &adapter->tpd_ring;
+        struct atl1_rfd_ring *rxdr = &adapter->rfd_ring;
+
+        ring->rx_max_pending = ATL1_MAX_RFD;
+        ring->tx_max_pending = ATL1_MAX_TPD;
+        ring->rx_mini_max_pending = 0;
+        ring->rx_jumbo_max_pending = 0;
+        ring->rx_pending = rxdr->count;
+        ring->tx_pending = txdr->count;
+        ring->rx_mini_pending = 0;
+        ring->rx_jumbo_pending = 0;
+}
+
+static int atl1_set_ringparam(struct net_device *netdev,
+        struct ethtool_ringparam *ring)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_tpd_ring *tpdr = &adapter->tpd_ring;
+        struct atl1_rrd_ring *rrdr = &adapter->rrd_ring;
+        struct atl1_rfd_ring *rfdr = &adapter->rfd_ring;
+
+        struct atl1_tpd_ring tpd_old, tpd_new;
+        struct atl1_rfd_ring rfd_old, rfd_new;
+        struct atl1_rrd_ring rrd_old, rrd_new;
+        struct atl1_ring_header rhdr_old, rhdr_new;
+        int err;
+
+        tpd_old = adapter->tpd_ring;
+        rfd_old = adapter->rfd_ring;
+        rrd_old = adapter->rrd_ring;
+        rhdr_old = adapter->ring_header;
+
+        if (netif_running(adapter->netdev))
+                atl1_down(adapter);
+
+        rfdr->count = (u16) max(ring->rx_pending, (u32) ATL1_MIN_RFD);
+        rfdr->count = rfdr->count > ATL1_MAX_RFD ? ATL1_MAX_RFD :
+                        rfdr->count;
+        rfdr->count = (rfdr->count + 3) & ~3;
+        rrdr->count = rfdr->count;
+
+        tpdr->count = (u16) max(ring->tx_pending, (u32) ATL1_MIN_TPD);
+        tpdr->count = tpdr->count > ATL1_MAX_TPD ? ATL1_MAX_TPD :
+                        tpdr->count;
+        tpdr->count = (tpdr->count + 3) & ~3;
+
+        if (netif_running(adapter->netdev)) {
+                /* try to get new resources before deleting old */
+                err = atl1_setup_ring_resources(adapter);
+                if (err)
+                        goto err_setup_ring;
+
+                /*
+                 * save the new, restore the old in order to free it,
+                 * then restore the new back again
+                 */
+
+                rfd_new = adapter->rfd_ring;
+                rrd_new = adapter->rrd_ring;
+                tpd_new = adapter->tpd_ring;
+                rhdr_new = adapter->ring_header;
+                adapter->rfd_ring = rfd_old;
+                adapter->rrd_ring = rrd_old;
+                adapter->tpd_ring = tpd_old;
+                adapter->ring_header = rhdr_old;
+                atl1_free_ring_resources(adapter);
+                adapter->rfd_ring = rfd_new;
+                adapter->rrd_ring = rrd_new;
+                adapter->tpd_ring = tpd_new;
+                adapter->ring_header = rhdr_new;
+
+                err = atl1_up(adapter);
+                if (err)
+                        return err;
+        }
+        return 0;
+
+err_setup_ring:
+        adapter->rfd_ring = rfd_old;
+        adapter->rrd_ring = rrd_old;
+        adapter->tpd_ring = tpd_old;
+        adapter->ring_header = rhdr_old;
+        atl1_up(adapter);
+        return err;
+}
+
+static void atl1_get_pauseparam(struct net_device *netdev,
+        struct ethtool_pauseparam *epause)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_hw *hw = &adapter->hw;
+
+        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
+            hw->media_type == MEDIA_TYPE_1000M_FULL) {
+                epause->autoneg = AUTONEG_ENABLE;
+        } else {
+                epause->autoneg = AUTONEG_DISABLE;
+        }
+        epause->rx_pause = 1;
+        epause->tx_pause = 1;
+}
+
+static int atl1_set_pauseparam(struct net_device *netdev,
+        struct ethtool_pauseparam *epause)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_hw *hw = &adapter->hw;
+
+        if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
+            hw->media_type == MEDIA_TYPE_1000M_FULL) {
+                epause->autoneg = AUTONEG_ENABLE;
+        } else {
+                epause->autoneg = AUTONEG_DISABLE;
+        }
+
+        epause->rx_pause = 1;
+        epause->tx_pause = 1;
+
+        return 0;
+}
+
+/* FIXME: is this right? -- CHS */
+static u32 atl1_get_rx_csum(struct net_device *netdev)
+{
+        return 1;
+}
+
+static void atl1_get_strings(struct net_device *netdev, u32 stringset,
+        u8 *data)
+{
+        u8 *p = data;
+        int i;
+
+        switch (stringset) {
+        case ETH_SS_STATS:
+                for (i = 0; i < ARRAY_SIZE(atl1_gstrings_stats); i++) {
+                        memcpy(p, atl1_gstrings_stats[i].stat_string,
+                                ETH_GSTRING_LEN);
+                        p += ETH_GSTRING_LEN;
+                }
+                break;
+        }
+}
+
+static int atl1_nway_reset(struct net_device *netdev)
+{
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+        struct atl1_hw *hw = &adapter->hw;
+
+        if (netif_running(netdev)) {
+                u16 phy_data;
+                atl1_down(adapter);
+
+                if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
+                        hw->media_type == MEDIA_TYPE_1000M_FULL) {
+                        phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN;
+                } else {
+                        switch (hw->media_type) {
+                        case MEDIA_TYPE_100M_FULL:
+                                phy_data = MII_CR_FULL_DUPLEX |
+                                        MII_CR_SPEED_100 | MII_CR_RESET;
+                                break;
+                        case MEDIA_TYPE_100M_HALF:
+                                phy_data = MII_CR_SPEED_100 | MII_CR_RESET;
+                                break;
+                        case MEDIA_TYPE_10M_FULL:
+                                phy_data = MII_CR_FULL_DUPLEX |
+                                        MII_CR_SPEED_10 | MII_CR_RESET;
+                                break;
+                        default:
+                                /* MEDIA_TYPE_10M_HALF */
+                                phy_data = MII_CR_SPEED_10 | MII_CR_RESET;
+                        }
+                }
+                atl1_write_phy_reg(hw, MII_BMCR, phy_data);
+                atl1_up(adapter);
+        }
+        return 0;
+}
+
+const struct ethtool_ops atl1_ethtool_ops = {
+        .get_settings           = atl1_get_settings,
+        .set_settings           = atl1_set_settings,
+        .get_drvinfo            = atl1_get_drvinfo,
+        .get_wol                = atl1_get_wol,
+        .set_wol                = atl1_set_wol,
+        .get_msglevel           = atl1_get_msglevel,
+        .set_msglevel           = atl1_set_msglevel,
+        .get_regs_len           = atl1_get_regs_len,
+        .get_regs               = atl1_get_regs,
+        .get_ringparam          = atl1_get_ringparam,
+        .set_ringparam          = atl1_set_ringparam,
+        .get_pauseparam         = atl1_get_pauseparam,
+        .set_pauseparam         = atl1_set_pauseparam,
+        .get_rx_csum            = atl1_get_rx_csum,
+        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
+        .get_link               = ethtool_op_get_link,
+        .set_sg                 = ethtool_op_set_sg,
+        .get_strings            = atl1_get_strings,
+        .nway_reset             = atl1_nway_reset,
+        .get_ethtool_stats      = atl1_get_ethtool_stats,
+        .get_sset_count         = atl1_get_sset_count,
+        .set_tso                = ethtool_op_set_tso,
+};
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
new file mode 100644
index 000000000000..51893d66eae1
--- /dev/null
+++ b/drivers/net/atlx/atl1.h
@@ -0,0 +1,796 @@
+/*
+ * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
+ * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
+ * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
+ *
+ * Derived from Intel e1000 driver
+ * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef ATL1_H
+#define ATL1_H
+
+#include <linux/compiler.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/timer.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+
+#include "atlx.h"
+
+#define ATLX_DRIVER_NAME "atl1"
+
+MODULE_DESCRIPTION("Atheros L1 Gigabit Ethernet Driver");
+
+#define atlx_adapter            atl1_adapter
+#define atlx_check_for_link     atl1_check_for_link
+#define atlx_check_link         atl1_check_link
+#define atlx_hash_mc_addr       atl1_hash_mc_addr
+#define atlx_hash_set           atl1_hash_set
+#define atlx_hw                 atl1_hw
+#define atlx_mii_ioctl          atl1_mii_ioctl
+#define atlx_read_phy_reg       atl1_read_phy_reg
+#define atlx_set_mac            atl1_set_mac
+#define atlx_set_mac_addr       atl1_set_mac_addr
+
+struct atl1_adapter;
+struct atl1_hw;
+
+/* function prototypes needed by multiple files */
+u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr);
+void atl1_hash_set(struct atl1_hw *hw, u32 hash_value);
+s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data);
+void atl1_set_mac_addr(struct atl1_hw *hw);
+static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
+        int cmd);
+static u32 atl1_check_link(struct atl1_adapter *adapter);
+
+extern const struct ethtool_ops atl1_ethtool_ops;
+
+/* hardware definitions specific to L1 */
+
+/* Block IDLE Status Register */
+#define IDLE_STATUS_RXMAC                       0x1
+#define IDLE_STATUS_TXMAC                       0x2
+#define IDLE_STATUS_RXQ                         0x4
+#define IDLE_STATUS_TXQ                         0x8
+#define IDLE_STATUS_DMAR                        0x10
+#define IDLE_STATUS_DMAW                        0x20
+#define IDLE_STATUS_SMB                         0x40
+#define IDLE_STATUS_CMB                         0x80
+
+/* MDIO Control Register */
+#define MDIO_WAIT_TIMES                         30
+
+/* MAC Control Register */
+#define MAC_CTRL_TX_PAUSE                       0x10000
+#define MAC_CTRL_SCNT                           0x20000
+#define MAC_CTRL_SRST_TX                        0x40000
+#define MAC_CTRL_TX_SIMURST                     0x80000
+#define MAC_CTRL_SPEED_SHIFT                    20
+#define MAC_CTRL_SPEED_MASK                     0x300000
+#define MAC_CTRL_SPEED_1000                     0x2
+#define MAC_CTRL_SPEED_10_100                   0x1
+#define MAC_CTRL_DBG_TX_BKPRESURE               0x400000
+#define MAC_CTRL_TX_HUGE                        0x800000
+#define MAC_CTRL_RX_CHKSUM_EN                   0x1000000
+#define MAC_CTRL_DBG                            0x8000000
+
+/* Wake-On-Lan control register */
+#define WOL_CLK_SWITCH_EN                       0x8000
+#define WOL_PT5_EN                              0x200000
+#define WOL_PT6_EN                              0x400000
+#define WOL_PT5_MATCH                           0x8000000
+#define WOL_PT6_MATCH                           0x10000000
+
+/* WOL Length ( 2 DWORD ) */
+#define REG_WOL_PATTERN_LEN                     0x14A4
+#define WOL_PT_LEN_MASK                         0x7F
+#define WOL_PT0_LEN_SHIFT                       0
+#define WOL_PT1_LEN_SHIFT                       8
+#define WOL_PT2_LEN_SHIFT                       16
+#define WOL_PT3_LEN_SHIFT                       24
+#define WOL_PT4_LEN_SHIFT                       0
+#define WOL_PT5_LEN_SHIFT                       8
+#define WOL_PT6_LEN_SHIFT                       16
+
+/* Internal SRAM Partition Registers, low 32 bits */
+#define REG_SRAM_RFD_LEN                        0x1504
+#define REG_SRAM_RRD_ADDR                       0x1508
+#define REG_SRAM_RRD_LEN                        0x150C
+#define REG_SRAM_TPD_ADDR                       0x1510
+#define REG_SRAM_TPD_LEN                        0x1514
+#define REG_SRAM_TRD_ADDR                       0x1518
+#define REG_SRAM_TRD_LEN                        0x151C
+#define REG_SRAM_RXF_ADDR                       0x1520
+#define REG_SRAM_RXF_LEN                        0x1524
+#define REG_SRAM_TXF_ADDR                       0x1528
+#define REG_SRAM_TXF_LEN                        0x152C
+#define REG_SRAM_TCPH_PATH_ADDR                 0x1530
+#define SRAM_TCPH_ADDR_MASK                     0xFFF
+#define SRAM_TCPH_ADDR_SHIFT                    0
+#define SRAM_PATH_ADDR_MASK                     0xFFF
+#define SRAM_PATH_ADDR_SHIFT                    16
+
+/* Load Ptr Register */
+#define REG_LOAD_PTR                            0x1534
+
+/* Descriptor Control registers, low 32 bits */
+#define REG_DESC_RFD_ADDR_LO                    0x1544
+#define REG_DESC_RRD_ADDR_LO                    0x1548
+#define REG_DESC_TPD_ADDR_LO                    0x154C
+#define REG_DESC_CMB_ADDR_LO                    0x1550
+#define REG_DESC_SMB_ADDR_LO                    0x1554
+#define REG_DESC_RFD_RRD_RING_SIZE              0x1558
+#define DESC_RFD_RING_SIZE_MASK                 0x7FF
+#define DESC_RFD_RING_SIZE_SHIFT                0
+#define DESC_RRD_RING_SIZE_MASK                 0x7FF
+#define DESC_RRD_RING_SIZE_SHIFT                16
+#define REG_DESC_TPD_RING_SIZE                  0x155C
+#define DESC_TPD_RING_SIZE_MASK                 0x3FF
+#define DESC_TPD_RING_SIZE_SHIFT                0
+
+/* TXQ Control Register */
+#define REG_TXQ_CTRL                            0x1580
+#define TXQ_CTRL_TPD_BURST_NUM_SHIFT            0
+#define TXQ_CTRL_TPD_BURST_NUM_MASK             0x1F
+#define TXQ_CTRL_EN                             0x20
+#define TXQ_CTRL_ENH_MODE                       0x40
+#define TXQ_CTRL_TPD_FETCH_TH_SHIFT             8
+#define TXQ_CTRL_TPD_FETCH_TH_MASK              0x3F
+#define TXQ_CTRL_TXF_BURST_NUM_SHIFT            16
+#define TXQ_CTRL_TXF_BURST_NUM_MASK             0xFFFF
+
+/* Jumbo packet Threshold for task offload */
+#define REG_TX_JUMBO_TASK_TH_TPD_IPG            0x1584
+#define TX_JUMBO_TASK_TH_MASK                   0x7FF
+#define TX_JUMBO_TASK_TH_SHIFT                  0
+#define TX_TPD_MIN_IPG_MASK                     0x1F
+#define TX_TPD_MIN_IPG_SHIFT                    16
+
+/* RXQ Control Register */
+#define REG_RXQ_CTRL                            0x15A0
+#define RXQ_CTRL_RFD_BURST_NUM_SHIFT            0
+#define RXQ_CTRL_RFD_BURST_NUM_MASK             0xFF
+#define RXQ_CTRL_RRD_BURST_THRESH_SHIFT         8
+#define RXQ_CTRL_RRD_BURST_THRESH_MASK          0xFF
+#define RXQ_CTRL_RFD_PREF_MIN_IPG_SHIFT         16
+#define RXQ_CTRL_RFD_PREF_MIN_IPG_MASK          0x1F
+#define RXQ_CTRL_CUT_THRU_EN                    0x40000000
+#define RXQ_CTRL_EN                             0x80000000
+
+/* Rx jumbo packet threshold and rrd  retirement timer */
+#define REG_RXQ_JMBOSZ_RRDTIM                   0x15A4
+#define RXQ_JMBOSZ_TH_MASK                      0x7FF
+#define RXQ_JMBOSZ_TH_SHIFT                     0
+#define RXQ_JMBO_LKAH_MASK                      0xF
+#define RXQ_JMBO_LKAH_SHIFT                     11
+#define RXQ_RRD_TIMER_MASK                      0xFFFF
+#define RXQ_RRD_TIMER_SHIFT                     16
+
+/* RFD flow control register */
+#define REG_RXQ_RXF_PAUSE_THRESH                0x15A8
+#define RXQ_RXF_PAUSE_TH_HI_SHIFT               16
+#define RXQ_RXF_PAUSE_TH_HI_MASK                0xFFF
+#define RXQ_RXF_PAUSE_TH_LO_SHIFT               0
+#define RXQ_RXF_PAUSE_TH_LO_MASK                0xFFF
+
+/* RRD flow control register */
+#define REG_RXQ_RRD_PAUSE_THRESH                0x15AC
+#define RXQ_RRD_PAUSE_TH_HI_SHIFT               0
+#define RXQ_RRD_PAUSE_TH_HI_MASK                0xFFF
+#define RXQ_RRD_PAUSE_TH_LO_SHIFT               16
+#define RXQ_RRD_PAUSE_TH_LO_MASK                0xFFF
+
+/* DMA Engine Control Register */
+#define REG_DMA_CTRL                            0x15C0
+#define DMA_CTRL_DMAR_IN_ORDER                  0x1
+#define DMA_CTRL_DMAR_ENH_ORDER                 0x2
+#define DMA_CTRL_DMAR_OUT_ORDER                 0x4
+#define DMA_CTRL_RCB_VALUE                      0x8
+#define DMA_CTRL_DMAR_BURST_LEN_SHIFT           4
+#define DMA_CTRL_DMAR_BURST_LEN_MASK            7
+#define DMA_CTRL_DMAW_BURST_LEN_SHIFT           7
+#define DMA_CTRL_DMAW_BURST_LEN_MASK            7
+#define DMA_CTRL_DMAR_EN                        0x400
+#define DMA_CTRL_DMAW_EN                        0x800
+
+/* CMB/SMB Control Register */
+#define REG_CSMB_CTRL                           0x15D0
+#define CSMB_CTRL_CMB_NOW                       1
+#define CSMB_CTRL_SMB_NOW                       2
+#define CSMB_CTRL_CMB_EN                        4
+#define CSMB_CTRL_SMB_EN                        8
+
+/* CMB DMA Write Threshold Register */
+#define REG_CMB_WRITE_TH                        0x15D4
+#define CMB_RRD_TH_SHIFT                        0
+#define CMB_RRD_TH_MASK                         0x7FF
+#define CMB_TPD_TH_SHIFT                        16
+#define CMB_TPD_TH_MASK                         0x7FF
+
+/* RX/TX count-down timer to trigger CMB-write. 2us resolution. */
+#define REG_CMB_WRITE_TIMER                     0x15D8
+#define CMB_RX_TM_SHIFT                         0
+#define CMB_RX_TM_MASK                          0xFFFF
+#define CMB_TX_TM_SHIFT                         16
+#define CMB_TX_TM_MASK                          0xFFFF
+
+/* Number of packet received since last CMB write */
+#define REG_CMB_RX_PKT_CNT                      0x15DC
+
+/* Number of packet transmitted since last CMB write */
+#define REG_CMB_TX_PKT_CNT                      0x15E0
+
+/* SMB auto DMA timer register */
+#define REG_SMB_TIMER                           0x15E4
+
+/* Mailbox Register */
+#define REG_MAILBOX                             0x15F0
+#define MB_RFD_PROD_INDX_SHIFT                  0
+#define MB_RFD_PROD_INDX_MASK                   0x7FF
+#define MB_RRD_CONS_INDX_SHIFT                  11
+#define MB_RRD_CONS_INDX_MASK                   0x7FF
+#define MB_TPD_PROD_INDX_SHIFT                  22
+#define MB_TPD_PROD_INDX_MASK                   0x3FF
+
+/* Interrupt Status Register */
+#define ISR_SMB                                 0x1
+#define ISR_TIMER                               0x2
+#define ISR_MANUAL                              0x4
+#define ISR_RXF_OV                              0x8
+#define ISR_RFD_UNRUN                           0x10
+#define ISR_RRD_OV                              0x20
+#define ISR_TXF_UNRUN                           0x40
+#define ISR_LINK                                0x80
+#define ISR_HOST_RFD_UNRUN                      0x100
+#define ISR_HOST_RRD_OV                         0x200
+#define ISR_DMAR_TO_RST                         0x400
+#define ISR_DMAW_TO_RST                         0x800
+#define ISR_GPHY                                0x1000
+#define ISR_RX_PKT                              0x10000
+#define ISR_TX_PKT                              0x20000
+#define ISR_TX_DMA                              0x40000
+#define ISR_RX_DMA                              0x80000
+#define ISR_CMB_RX                              0x100000
+#define ISR_CMB_TX                              0x200000
+#define ISR_MAC_RX                              0x400000
+#define ISR_MAC_TX                              0x800000
+#define ISR_DIS_SMB                             0x20000000
+#define ISR_DIS_DMA                             0x40000000
+
+/* Normal Interrupt mask  */
+#define IMR_NORMAL_MASK (\
+        ISR_SMB         |\
+        ISR_GPHY        |\
+        ISR_PHY_LINKDOWN|\
+        ISR_DMAR_TO_RST |\
+        ISR_DMAW_TO_RST |\
+        ISR_CMB_TX      |\
+        ISR_CMB_RX)
+
+/* Debug Interrupt Mask  (enable all interrupt) */
+#define IMR_DEBUG_MASK  (\
+        ISR_SMB         |\
+        ISR_TIMER       |\
+        ISR_MANUAL      |\
+        ISR_RXF_OV      |\
+        ISR_RFD_UNRUN   |\
+        ISR_RRD_OV      |\
+        ISR_TXF_UNRUN   |\
+        ISR_LINK        |\
+        ISR_CMB_TX      |\
+        ISR_CMB_RX      |\
+        ISR_RX_PKT      |\
+        ISR_TX_PKT      |\
+        ISR_MAC_RX      |\
+        ISR_MAC_TX)
+
+#define MEDIA_TYPE_1000M_FULL                   1
+#define MEDIA_TYPE_100M_FULL                    2
+#define MEDIA_TYPE_100M_HALF                    3
+#define MEDIA_TYPE_10M_FULL                     4
+#define MEDIA_TYPE_10M_HALF                     5
+
+#define AUTONEG_ADVERTISE_SPEED_DEFAULT         0x002F  /* All but 1000-Half */
+
+#define MAX_JUMBO_FRAME_SIZE                    10240
+
+#define ATL1_EEDUMP_LEN                         48
+
+/* Statistics counters collected by the MAC */
+struct stats_msg_block {
+        /* rx */
+        u32 rx_ok;              /* good RX packets */
+        u32 rx_bcast;           /* good RX broadcast packets */
+        u32 rx_mcast;           /* good RX multicast packets */
+        u32 rx_pause;           /* RX pause frames */
+        u32 rx_ctrl;            /* RX control packets other than pause frames */
+        u32 rx_fcs_err;         /* RX packets with bad FCS */
+        u32 rx_len_err;         /* RX packets with length != actual size */
+        u32 rx_byte_cnt;        /* good bytes received. FCS is NOT included */
+        u32 rx_runt;            /* RX packets < 64 bytes with good FCS */
+        u32 rx_frag;            /* RX packets < 64 bytes with bad FCS */
+        u32 rx_sz_64;           /* 64 byte RX packets */
+        u32 rx_sz_65_127;
+        u32 rx_sz_128_255;
+        u32 rx_sz_256_511;
+        u32 rx_sz_512_1023;
+        u32 rx_sz_1024_1518;
+        u32 rx_sz_1519_max;     /* 1519 byte to MTU RX packets */
+        u32 rx_sz_ov;           /* truncated RX packets > MTU */
+        u32 rx_rxf_ov;          /* frames dropped due to RX FIFO overflow */
+        u32 rx_rrd_ov;          /* frames dropped due to RRD overflow */
+        u32 rx_align_err;       /* alignment errors */
+        u32 rx_bcast_byte_cnt;  /* RX broadcast bytes, excluding FCS */
+        u32 rx_mcast_byte_cnt;  /* RX multicast bytes, excluding FCS */
+        u32 rx_err_addr;        /* packets dropped due to address filtering */
+
+        /* tx */
+        u32 tx_ok;              /* good TX packets */
+        u32 tx_bcast;           /* good TX broadcast packets */
+        u32 tx_mcast;           /* good TX multicast packets */
+        u32 tx_pause;           /* TX pause frames */
+        u32 tx_exc_defer;       /* TX packets deferred excessively */
+        u32 tx_ctrl;            /* TX control frames, excluding pause frames */
+        u32 tx_defer;           /* TX packets deferred */
+        u32 tx_byte_cnt;        /* bytes transmitted, FCS is NOT included */
+        u32 tx_sz_64;           /* 64 byte TX packets */
+        u32 tx_sz_65_127;
+        u32 tx_sz_128_255;
+        u32 tx_sz_256_511;
+        u32 tx_sz_512_1023;
+        u32 tx_sz_1024_1518;
+        u32 tx_sz_1519_max;     /* 1519 byte to MTU TX packets */
+        u32 tx_1_col;           /* packets TX after a single collision */
+        u32 tx_2_col;           /* packets TX after multiple collisions */
+        u32 tx_late_col;        /* TX packets with late collisions */
+        u32 tx_abort_col;       /* TX packets aborted w/excessive collisions */
+        u32 tx_underrun;        /* TX packets aborted due to TX FIFO underrun
+                                 * or TRD FIFO underrun */
+        u32 tx_rd_eop;          /* reads beyond the EOP into the next frame
+                                 * when TRD was not written timely */
+        u32 tx_len_err;         /* TX packets where length != actual size */
+        u32 tx_trunc;           /* TX packets truncated due to size > MTU */
+        u32 tx_bcast_byte;      /* broadcast bytes transmitted, excluding FCS */
+        u32 tx_mcast_byte;      /* multicast bytes transmitted, excluding FCS */
+        u32 smb_updated;        /* 1: SMB Updated. This is used by software to
+                                 * indicate the statistics update. Software
+                                 * should clear this bit after retrieving the
+                                 * statistics information. */
+};
+
+/* Coalescing Message Block */
+struct coals_msg_block {
+        u32 int_stats;          /* interrupt status */
+        u16 rrd_prod_idx;       /* TRD Producer Index. */
+        u16 rfd_cons_idx;       /* RFD Consumer Index. */
+        u16 update;             /* Selene sets this bit every time it DMAs the
+                                 * CMB to host memory. Software should clear
+                                 * this bit when CMB info is processed. */
+        u16 tpd_cons_idx;       /* TPD Consumer Index. */
+};
+
+/* RRD descriptor */
+struct rx_return_desc {
+        u8 num_buf;     /* Number of RFD buffers used by the received packet */
+        u8 resved;
+        u16 buf_indx;   /* RFD Index of the first buffer */
+        union {
+                u32 valid;
+                struct {
+                        u16 rx_chksum;
+                        u16 pkt_size;
+                } xsum_sz;
+        } xsz;
+
+        u16 pkt_flg;    /* Packet flags */
+        u16 err_flg;    /* Error flags */
+        u16 resved2;
+        u16 vlan_tag;   /* VLAN TAG */
+};
+
+#define PACKET_FLAG_ETH_TYPE    0x0080
+#define PACKET_FLAG_VLAN_INS    0x0100
+#define PACKET_FLAG_ERR         0x0200
+#define PACKET_FLAG_IPV4        0x0400
+#define PACKET_FLAG_UDP         0x0800
+#define PACKET_FLAG_TCP         0x1000
+#define PACKET_FLAG_BCAST       0x2000
+#define PACKET_FLAG_MCAST       0x4000
+#define PACKET_FLAG_PAUSE       0x8000
+
+#define ERR_FLAG_CRC            0x0001
+#define ERR_FLAG_CODE           0x0002
+#define ERR_FLAG_DRIBBLE        0x0004
+#define ERR_FLAG_RUNT           0x0008
+#define ERR_FLAG_OV             0x0010
+#define ERR_FLAG_TRUNC          0x0020
+#define ERR_FLAG_IP_CHKSUM      0x0040
+#define ERR_FLAG_L4_CHKSUM      0x0080
+#define ERR_FLAG_LEN            0x0100
+#define ERR_FLAG_DES_ADDR       0x0200
+
+/* RFD descriptor */
+struct rx_free_desc {
+        __le64 buffer_addr;     /* Address of the descriptor's data buffer */
+        __le16 buf_len;         /* Size of the receive buffer in host memory */
+        u16 coalese;            /* Update consumer index to host after the
+                                 * reception of this frame */
+        /* __attribute__ ((packed)) is required */
+} __attribute__ ((packed));
+
+/*
+ * The L1 transmit packet descriptor is comprised of four 32-bit words.
+ *
+ *      31                                      0
+ *      +---------------------------------------+
+ *      |       Word 0: Buffer addr lo          |
+ *      +---------------------------------------+
+ *      |       Word 1: Buffer addr hi          |
+ *      +---------------------------------------+
+ *      |               Word 2                  |
+ *      +---------------------------------------+
+ *      |               Word 3                  |
+ *      +---------------------------------------+
+ *
+ * Words 0 and 1 combine to form a 64-bit buffer address.
+ *
+ * Word 2 is self explanatory in the #define block below.
+ *
+ * Word 3 has two forms, depending upon the state of bits 3 and 4.
+ * If bits 3 and 4 are both zero, then bits 14:31 are unused by the
+ * hardware.  Otherwise, if either bit 3 or 4 is set, the definition
+ * of bits 14:31 vary according to the following depiction.
+ *
+ *      0       End of packet                   0       End of packet
+ *      1       Coalesce                        1       Coalesce
+ *      2       Insert VLAN tag                 2       Insert VLAN tag
+ *      3       Custom csum enable = 0          3       Custom csum enable = 1
+ *      4       Segment enable = 1              4       Segment enable = 0
+ *      5       Generate IP checksum            5       Generate IP checksum
+ *      6       Generate TCP checksum           6       Generate TCP checksum
+ *      7       Generate UDP checksum           7       Generate UDP checksum
+ *      8       VLAN tagged                     8       VLAN tagged
+ *      9       Ethernet frame type             9       Ethernet frame type
+ *      10-+                                    10-+
+ *      11 |    IP hdr length (10:13)           11 |    IP hdr length (10:13)
+ *      12 |    (num 32-bit words)              12 |    (num 32-bit words)
+ *      13-+                                    13-+
+ *      14-+                                    14      Unused
+ *      15 |    TCP hdr length (14:17)          15      Unused
+ *      16 |    (num 32-bit words)              16-+
+ *      17-+                                    17 |
+ *      18      Header TPD flag                 18 |
+ *      19-+                                    19 |    Payload offset
+ *      20 |                                    20 |        (16:23)
+ *      21 |                                    21 |
+ *      22 |                                    22 |
+ *      23 |                                    23-+
+ *      24 |                                    24-+
+ *      25 |    MSS (19:31)                     25 |
+ *      26 |                                    26 |
+ *      27 |                                    27 |    Custom csum offset
+ *      28 |                                    28 |         (24:31)
+ *      29 |                                    29 |
+ *      30 |                                    30 |
+ *      31-+                                    31-+
+ */
+
+/* tpd word 2 */
+#define TPD_BUFLEN_MASK         0x3FFF
+#define TPD_BUFLEN_SHIFT        0
+#define TPD_DMAINT_MASK         0x0001
+#define TPD_DMAINT_SHIFT        14
+#define TPD_PKTNT_MASK          0x0001
+#define TPD_PKTINT_SHIFT        15
+#define TPD_VLANTAG_MASK        0xFFFF
+#define TPD_VLAN_SHIFT          16
+
+/* tpd word 3 bits 0:13 */
+#define TPD_EOP_MASK            0x0001
+#define TPD_EOP_SHIFT           0
+#define TPD_COALESCE_MASK       0x0001
+#define TPD_COALESCE_SHIFT      1
+#define TPD_INS_VL_TAG_MASK     0x0001
+#define TPD_INS_VL_TAG_SHIFT    2
+#define TPD_CUST_CSUM_EN_MASK   0x0001
+#define TPD_CUST_CSUM_EN_SHIFT  3
+#define TPD_SEGMENT_EN_MASK     0x0001
+#define TPD_SEGMENT_EN_SHIFT    4
+#define TPD_IP_CSUM_MASK        0x0001
+#define TPD_IP_CSUM_SHIFT       5
+#define TPD_TCP_CSUM_MASK       0x0001
+#define TPD_TCP_CSUM_SHIFT      6
+#define TPD_UDP_CSUM_MASK       0x0001
+#define TPD_UDP_CSUM_SHIFT      7
+#define TPD_VL_TAGGED_MASK      0x0001
+#define TPD_VL_TAGGED_SHIFT     8
+#define TPD_ETHTYPE_MASK        0x0001
+#define TPD_ETHTYPE_SHIFT       9
+#define TPD_IPHL_MASK           0x000F
+#define TPD_IPHL_SHIFT          10
+
+/* tpd word 3 bits 14:31 if segment enabled */
+#define TPD_TCPHDRLEN_MASK      0x000F
+#define TPD_TCPHDRLEN_SHIFT     14
+#define TPD_HDRFLAG_MASK        0x0001
+#define TPD_HDRFLAG_SHIFT       18
+#define TPD_MSS_MASK            0x1FFF
+#define TPD_MSS_SHIFT           19
+
+/* tpd word 3 bits 16:31 if custom csum enabled */
+#define TPD_PLOADOFFSET_MASK    0x00FF
+#define TPD_PLOADOFFSET_SHIFT   16
+#define TPD_CCSUMOFFSET_MASK    0x00FF
+#define TPD_CCSUMOFFSET_SHIFT   24
+
+struct tx_packet_desc {
+        __le64 buffer_addr;
+        __le32 word2;
+        __le32 word3;
+};
+
+/* DMA Order Settings */
+enum atl1_dma_order {
+        atl1_dma_ord_in = 1,
+        atl1_dma_ord_enh = 2,
+        atl1_dma_ord_out = 4
+};
+
+enum atl1_dma_rcb {
+        atl1_rcb_64 = 0,
+        atl1_rcb_128 = 1
+};
+
+enum atl1_dma_req_block {
+        atl1_dma_req_128 = 0,
+        atl1_dma_req_256 = 1,
+        atl1_dma_req_512 = 2,
+        atl1_dma_req_1024 = 3,
+        atl1_dma_req_2048 = 4,
+        atl1_dma_req_4096 = 5
+};
+
+#define ATL1_MAX_INTR           3
+#define ATL1_MAX_TX_BUF_LEN     0x3000  /* 12288 bytes */
+
+#define ATL1_DEFAULT_TPD        256
+#define ATL1_MAX_TPD            1024
+#define ATL1_MIN_TPD            64
+#define ATL1_DEFAULT_RFD        512
+#define ATL1_MIN_RFD            128
+#define ATL1_MAX_RFD            2048
+#define ATL1_REG_COUNT          1538
+
+#define ATL1_GET_DESC(R, i, type)       (&(((type *)((R)->desc))[i]))
+#define ATL1_RFD_DESC(R, i)     ATL1_GET_DESC(R, i, struct rx_free_desc)
+#define ATL1_TPD_DESC(R, i)     ATL1_GET_DESC(R, i, struct tx_packet_desc)
+#define ATL1_RRD_DESC(R, i)     ATL1_GET_DESC(R, i, struct rx_return_desc)
+
+/*
+ * atl1_ring_header represents a single, contiguous block of DMA space
+ * mapped for the three descriptor rings (tpd, rfd, rrd) and the two
+ * message blocks (cmb, smb) described below
+ */
+struct atl1_ring_header {
+        void *desc;             /* virtual address */
+        dma_addr_t dma;         /* physical address*/
+        unsigned int size;      /* length in bytes */
+};
+
+/*
+ * atl1_buffer is wrapper around a pointer to a socket buffer
+ * so a DMA handle can be stored along with the skb
+ */
+struct atl1_buffer {
+        struct sk_buff *skb;    /* socket buffer */
+        u16 length;             /* rx buffer length */
+        u16 alloced;            /* 1 if skb allocated */
+        dma_addr_t dma;
+};
+
+/* transmit packet descriptor (tpd) ring */
+struct atl1_tpd_ring {
+        void *desc;             /* descriptor ring virtual address */
+        dma_addr_t dma;         /* descriptor ring physical address */
+        u16 size;               /* descriptor ring length in bytes */
+        u16 count;              /* number of descriptors in the ring */
+        u16 hw_idx;             /* hardware index */
+        atomic_t next_to_clean;
+        atomic_t next_to_use;
+        struct atl1_buffer *buffer_info;
+};
+
+/* receive free descriptor (rfd) ring */
+struct atl1_rfd_ring {
+        void *desc;             /* descriptor ring virtual address */
+        dma_addr_t dma;         /* descriptor ring physical address */
+        u16 size;               /* descriptor ring length in bytes */
+        u16 count;              /* number of descriptors in the ring */
+        atomic_t next_to_use;
+        u16 next_to_clean;
+        struct atl1_buffer *buffer_info;
+};
+
+/* receive return descriptor (rrd) ring */
+struct atl1_rrd_ring {
+        void *desc;             /* descriptor ring virtual address */
+        dma_addr_t dma;         /* descriptor ring physical address */
+        unsigned int size;      /* descriptor ring length in bytes */
+        u16 count;              /* number of descriptors in the ring */
+        u16 next_to_use;
+        atomic_t next_to_clean;
+};
+
+/* coalescing message block (cmb) */
+struct atl1_cmb {
+        struct coals_msg_block *cmb;
+        dma_addr_t dma;
+};
+
+/* statistics message block (smb) */
+struct atl1_smb {
+        struct stats_msg_block *smb;
+        dma_addr_t dma;
+};
+
+/* Statistics counters */
+struct atl1_sft_stats {
+        u64 rx_packets;
+        u64 tx_packets;
+        u64 rx_bytes;
+        u64 tx_bytes;
+        u64 multicast;
+        u64 collisions;
+        u64 rx_errors;
+        u64 rx_length_errors;
+        u64 rx_crc_errors;
+        u64 rx_frame_errors;
+        u64 rx_fifo_errors;
+        u64 rx_missed_errors;
+        u64 tx_errors;
+        u64 tx_fifo_errors;
+        u64 tx_aborted_errors;
+        u64 tx_window_errors;
+        u64 tx_carrier_errors;
+        u64 tx_pause;           /* TX pause frames */
+        u64 excecol;            /* TX packets w/ excessive collisions */
+        u64 deffer;             /* TX packets deferred */
+        u64 scc;                /* packets TX after a single collision */
+        u64 mcc;                /* packets TX after multiple collisions */
+        u64 latecol;            /* TX packets w/ late collisions */
+        u64 tx_underun;         /* TX packets aborted due to TX FIFO underrun
+                                 * or TRD FIFO underrun */
+        u64 tx_trunc;           /* TX packets truncated due to size > MTU */
+        u64 rx_pause;           /* num Pause packets received. */
+        u64 rx_rrd_ov;
+        u64 rx_trunc;
+};
+
+/* hardware structure */
+struct atl1_hw {
+        u8 __iomem *hw_addr;
+        struct atl1_adapter *back;
+        enum atl1_dma_order dma_ord;
+        enum atl1_dma_rcb rcb_value;
+        enum atl1_dma_req_block dmar_block;
+        enum atl1_dma_req_block dmaw_block;
+        u8 preamble_len;
+        u8 max_retry;
+        u8 jam_ipg;             /* IPG to start JAM for collision based flow
+                                 * control in half-duplex mode. In units of
+                                 * 8-bit time */
+        u8 ipgt;                /* Desired back to back inter-packet gap.
+                                 * The default is 96-bit time */
+        u8 min_ifg;             /* Minimum number of IFG to enforce in between
+                                 * receive frames. Frame gap below such IFP
+                                 * is dropped */
+        u8 ipgr1;               /* 64bit Carrier-Sense window */
+        u8 ipgr2;               /* 96-bit IPG window */
+        u8 tpd_burst;           /* Number of TPD to prefetch in cache-aligned
+                                 * burst. Each TPD is 16 bytes long */
+        u8 rfd_burst;           /* Number of RFD to prefetch in cache-aligned
+                                 * burst. Each RFD is 12 bytes long */
+        u8 rfd_fetch_gap;
+        u8 rrd_burst;           /* Threshold number of RRDs that can be retired
+                                 * in a burst. Each RRD is 16 bytes long */
+        u8 tpd_fetch_th;
+        u8 tpd_fetch_gap;
+        u16 tx_jumbo_task_th;
+        u16 txf_burst;          /* Number of data bytes to read in a cache-
+                                 * aligned burst. Each SRAM entry is 8 bytes */
+        u16 rx_jumbo_th;        /* Jumbo packet size for non-VLAN packet. VLAN
+                                 * packets should add 4 bytes */
+        u16 rx_jumbo_lkah;
+        u16 rrd_ret_timer;      /* RRD retirement timer. Decrement by 1 after
+                                 * every 512ns passes. */
+        u16 lcol;               /* Collision Window */
+
+        u16 cmb_tpd;
+        u16 cmb_rrd;
+        u16 cmb_rx_timer;
+        u16 cmb_tx_timer;
+        u32 smb_timer;
+        u16 media_type;
+        u16 autoneg_advertised;
+
+        u16 mii_autoneg_adv_reg;
+        u16 mii_1000t_ctrl_reg;
+
+        u32 max_frame_size;
+        u32 min_frame_size;
+
+        u16 dev_rev;
+
+        /* spi flash */
+        u8 flash_vendor;
+
+        u8 mac_addr[ETH_ALEN];
+        u8 perm_mac_addr[ETH_ALEN];
+
+        bool phy_configured;
+};
+
+struct atl1_adapter {
+        struct net_device *netdev;
+        struct pci_dev *pdev;
+        struct net_device_stats net_stats;
+        struct atl1_sft_stats soft_stats;
+        struct vlan_group *vlgrp;
+        u32 rx_buffer_len;
+        u32 wol;
+        u16 link_speed;
+        u16 link_duplex;
+        spinlock_t lock;
+        struct work_struct tx_timeout_task;
+        struct work_struct link_chg_task;
+        struct work_struct pcie_dma_to_rst_task;
+        struct timer_list watchdog_timer;
+        struct timer_list phy_config_timer;
+        bool phy_timer_pending;
+
+        /* all descriptor rings' memory */
+        struct atl1_ring_header ring_header;
+
+        /* TX */
+        struct atl1_tpd_ring tpd_ring;
+        spinlock_t mb_lock;
+
+        /* RX */
+        struct atl1_rfd_ring rfd_ring;
+        struct atl1_rrd_ring rrd_ring;
+        u64 hw_csum_err;
+        u64 hw_csum_good;
+        u32 msg_enable;
+        u16 imt;                /* interrupt moderator timer (2us resolution) */
+        u16 ict;                /* interrupt clear timer (2us resolution */
+        struct mii_if_info mii; /* MII interface info */
+
+        u32 bd_number;          /* board number */
+        bool pci_using_64;
+        struct atl1_hw hw;
+        struct atl1_smb smb;
+        struct atl1_cmb cmb;
+};
+
+#endif /* ATL1_H */
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c
new file mode 100644
index 000000000000..4186326d1b94
--- /dev/null
+++ b/drivers/net/atlx/atlx.c
@@ -0,0 +1,433 @@
+/* atlx.c -- common functions for Attansic network drivers
+ *
+ * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
+ * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
+ * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
+ * Copyright(c) 2007 Atheros Corporation. All rights reserved.
+ *
+ * Derived from Intel e1000 driver
+ * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/* Including this file like a header is a temporary hack, I promise. -- CHS */
+#ifndef ATLX_C
+#define ATLX_C
+
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/etherdevice.h>
+#include <linux/if.h>
+#include <linux/netdevice.h>
+#include <linux/socket.h>
+#include <linux/sockios.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+
+#include "atlx.h"
+
+static struct atlx_spi_flash_dev flash_table[] = {
+/*      MFR_NAME  WRSR  READ  PRGM  WREN  WRDI  RDSR  RDID  SEC_ERS CHIP_ERS */
+        {"Atmel", 0x00, 0x03, 0x02, 0x06, 0x04, 0x05, 0x15, 0x52,   0x62},
+        {"SST",   0x01, 0x03, 0x02, 0x06, 0x04, 0x05, 0x90, 0x20,   0x60},
+        {"ST",    0x01, 0x03, 0x02, 0x06, 0x04, 0x05, 0xAB, 0xD8,   0xC7},
+};
+
+static int atlx_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+        switch (cmd) {
+        case SIOCGMIIPHY:
+        case SIOCGMIIREG:
+        case SIOCSMIIREG:
+                return atlx_mii_ioctl(netdev, ifr, cmd);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+/*
+ * atlx_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ */
+static int atlx_set_mac(struct net_device *netdev, void *p)
+{
+        struct atlx_adapter *adapter = netdev_priv(netdev);
+        struct sockaddr *addr = p;
+
+        if (netif_running(netdev))
+                return -EBUSY;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+        memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len);
+
+        atlx_set_mac_addr(&adapter->hw);
+        return 0;
+}
+
+static void atlx_check_for_link(struct atlx_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+        u16 phy_data = 0;
+
+        spin_lock(&adapter->lock);
+        adapter->phy_timer_pending = false;
+        atlx_read_phy_reg(&adapter->hw, MII_BMSR, &phy_data);
+        atlx_read_phy_reg(&adapter->hw, MII_BMSR, &phy_data);
+        spin_unlock(&adapter->lock);
+
+        /* notify upper layer link down ASAP */
+        if (!(phy_data & BMSR_LSTATUS)) {
+                /* Link Down */
+                if (netif_carrier_ok(netdev)) {
+                        /* old link state: Up */
+                        dev_info(&adapter->pdev->dev, "%s link is down\n",
+                                netdev->name);
+                        adapter->link_speed = SPEED_0;
+                        netif_carrier_off(netdev);
+                        netif_stop_queue(netdev);
+                }
+        }
+        schedule_work(&adapter->link_chg_task);
+}
+
+/*
+ * atlx_set_multi - Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_multi entry point is called whenever the multicast address
+ * list or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper multicast,
+ * promiscuous mode, and all-multi behavior.
+ */
+static void atlx_set_multi(struct net_device *netdev)
+{
+        struct atlx_adapter *adapter = netdev_priv(netdev);
+        struct atlx_hw *hw = &adapter->hw;
+        struct dev_mc_list *mc_ptr;
+        u32 rctl;
+        u32 hash_value;
+
+        /* Check for Promiscuous and All Multicast modes */
+        rctl = ioread32(hw->hw_addr + REG_MAC_CTRL);
+        if (netdev->flags & IFF_PROMISC)
+                rctl |= MAC_CTRL_PROMIS_EN;
+        else if (netdev->flags & IFF_ALLMULTI) {
+                rctl |= MAC_CTRL_MC_ALL_EN;
+                rctl &= ~MAC_CTRL_PROMIS_EN;
+        } else
+                rctl &= ~(MAC_CTRL_PROMIS_EN | MAC_CTRL_MC_ALL_EN);
+
+        iowrite32(rctl, hw->hw_addr + REG_MAC_CTRL);
+
+        /* clear the old settings from the multicast hash table */
+        iowrite32(0, hw->hw_addr + REG_RX_HASH_TABLE);
+        iowrite32(0, (hw->hw_addr + REG_RX_HASH_TABLE) + (1 << 2));
+
+        /* compute mc addresses' hash value ,and put it into hash table */
+        for (mc_ptr = netdev->mc_list; mc_ptr; mc_ptr = mc_ptr->next) {
+                hash_value = atlx_hash_mc_addr(hw, mc_ptr->dmi_addr);
+                atlx_hash_set(hw, hash_value);
+        }
+}
+
+/*
+ * atlx_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ */
+static void atlx_irq_enable(struct atlx_adapter *adapter)
+{
+        iowrite32(IMR_NORMAL_MASK, adapter->hw.hw_addr + REG_IMR);
+        ioread32(adapter->hw.hw_addr + REG_IMR);
+}
+
+/*
+ * atlx_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ */
+static void atlx_irq_disable(struct atlx_adapter *adapter)
+{
+        iowrite32(0, adapter->hw.hw_addr + REG_IMR);
+        ioread32(adapter->hw.hw_addr + REG_IMR);
+        synchronize_irq(adapter->pdev->irq);
+}
+
+static void atlx_clear_phy_int(struct atlx_adapter *adapter)
+{
+        u16 phy_data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->lock, flags);
+        atlx_read_phy_reg(&adapter->hw, 19, &phy_data);
+        spin_unlock_irqrestore(&adapter->lock, flags);
+}
+
+/*
+ * atlx_get_stats - Get System Network Statistics
+ * @netdev: network interface device structure
+ *
+ * Returns the address of the device statistics structure.
+ * The statistics are actually updated from the timer callback.
+ */
+static struct net_device_stats *atlx_get_stats(struct net_device *netdev)
+{
+        struct atlx_adapter *adapter = netdev_priv(netdev);
+        return &adapter->net_stats;
+}
+
+/*
+ * atlx_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ */
+static void atlx_tx_timeout(struct net_device *netdev)
+{
+        struct atlx_adapter *adapter = netdev_priv(netdev);
+        /* Do the reset outside of interrupt context */
+        schedule_work(&adapter->tx_timeout_task);
+}
+
+/*
+ * atlx_link_chg_task - deal with link change event Out of interrupt context
+ */
+static void atlx_link_chg_task(struct work_struct *work)
+{
+        struct atlx_adapter *adapter;
+        unsigned long flags;
+
+        adapter = container_of(work, struct atlx_adapter, link_chg_task);
+
+        spin_lock_irqsave(&adapter->lock, flags);
+        atlx_check_link(adapter);
+        spin_unlock_irqrestore(&adapter->lock, flags);
+}
+
+static void atlx_vlan_rx_register(struct net_device *netdev,
+        struct vlan_group *grp)
+{
+        struct atlx_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
+        u32 ctrl;
+
+        spin_lock_irqsave(&adapter->lock, flags);
+        /* atlx_irq_disable(adapter); FIXME: confirm/remove */
+        adapter->vlgrp = grp;
+
+        if (grp) {
+                /* enable VLAN tag insert/strip */
+                ctrl = ioread32(adapter->hw.hw_addr + REG_MAC_CTRL);
+                ctrl |= MAC_CTRL_RMV_VLAN;
+                iowrite32(ctrl, adapter->hw.hw_addr + REG_MAC_CTRL);
+        } else {
+                /* disable VLAN tag insert/strip */
+                ctrl = ioread32(adapter->hw.hw_addr + REG_MAC_CTRL);
+                ctrl &= ~MAC_CTRL_RMV_VLAN;
+                iowrite32(ctrl, adapter->hw.hw_addr + REG_MAC_CTRL);
+        }
+
+        /* atlx_irq_enable(adapter); FIXME */
+        spin_unlock_irqrestore(&adapter->lock, flags);
+}
+
+static void atlx_restore_vlan(struct atlx_adapter *adapter)
+{
+        atlx_vlan_rx_register(adapter->netdev, adapter->vlgrp);
+}
+
+/*
+ * This is the only thing that needs to be changed to adjust the
+ * maximum number of ports that the driver can manage.
+ */
+#define ATL1_MAX_NIC 4
+
+#define OPTION_UNSET    -1
+#define OPTION_DISABLED 0
+#define OPTION_ENABLED  1
+
+#define ATL1_PARAM_INIT { [0 ... ATL1_MAX_NIC] = OPTION_UNSET }
+
+/*
+ * Interrupt Moderate Timer in units of 2 us
+ *
+ * Valid Range: 10-65535
+ *
+ * Default Value: 100 (200us)
+ */
+static int __devinitdata int_mod_timer[ATL1_MAX_NIC+1] = ATL1_PARAM_INIT;
+static int num_int_mod_timer;
+module_param_array_named(int_mod_timer, int_mod_timer, int,
+        &num_int_mod_timer, 0);
+MODULE_PARM_DESC(int_mod_timer, "Interrupt moderator timer");
+
+/*
+ * flash_vendor
+ *
+ * Valid Range: 0-2
+ *
+ * 0 - Atmel
+ * 1 - SST
+ * 2 - ST
+ *
+ * Default Value: 0
+ */
+static int __devinitdata flash_vendor[ATL1_MAX_NIC+1] = ATL1_PARAM_INIT;
+static int num_flash_vendor;
+module_param_array_named(flash_vendor, flash_vendor, int, &num_flash_vendor, 0);
+MODULE_PARM_DESC(flash_vendor, "SPI flash vendor");
+
+#define DEFAULT_INT_MOD_CNT     100     /* 200us */
+#define MAX_INT_MOD_CNT         65000
+#define MIN_INT_MOD_CNT         50
+
+#define FLASH_VENDOR_DEFAULT    0
+#define FLASH_VENDOR_MIN        0
+#define FLASH_VENDOR_MAX        2
+
+struct atl1_option {
+        enum { enable_option, range_option, list_option } type;
+        char *name;
+        char *err;
+        int def;
+        union {
+                struct {        /* range_option info */
+                        int min;
+                        int max;
+                } r;
+                struct {        /* list_option info */
+                        int nr;
+                        struct atl1_opt_list {
+                                int i;
+                                char *str;
+                        } *p;
+                } l;
+        } arg;
+};
+
+static int __devinit atl1_validate_option(int *value, struct atl1_option *opt,
+        struct pci_dev *pdev)
+{
+        if (*value == OPTION_UNSET) {
+                *value = opt->def;
+                return 0;
+        }
+
+        switch (opt->type) {
+        case enable_option:
+                switch (*value) {
+                case OPTION_ENABLED:
+                        dev_info(&pdev->dev, "%s enabled\n", opt->name);
+                        return 0;
+                case OPTION_DISABLED:
+                        dev_info(&pdev->dev, "%s disabled\n", opt->name);
+                        return 0;
+                }
+                break;
+        case range_option:
+                if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
+                        dev_info(&pdev->dev, "%s set to %i\n", opt->name,
+                                *value);
+                        return 0;
+                }
+                break;
+        case list_option:{
+                        int i;
+                        struct atl1_opt_list *ent;
+
+                        for (i = 0; i < opt->arg.l.nr; i++) {
+                                ent = &opt->arg.l.p[i];
+                                if (*value == ent->i) {
+                                        if (ent->str[0] != '\0')
+                                                dev_info(&pdev->dev, "%s\n",
+                                                        ent->str);
+                                        return 0;
+                                }
+                        }
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        dev_info(&pdev->dev, "invalid %s specified (%i) %s\n",
+                opt->name, *value, opt->err);
+        *value = opt->def;
+        return -1;
+}
+
+/*
+ * atl1_check_options - Range Checking for Command Line Parameters
+ * @adapter: board private structure
+ *
+ * This routine checks all command line parameters for valid user
+ * input.  If an invalid value is given, or if no user specified
+ * value exists, a default value is used.  The final value is stored
+ * in a variable in the adapter structure.
+ */
+void __devinit atl1_check_options(struct atl1_adapter *adapter)
+{
+        struct pci_dev *pdev = adapter->pdev;
+        int bd = adapter->bd_number;
+        if (bd >= ATL1_MAX_NIC) {
+                dev_notice(&pdev->dev, "no configuration for board#%i\n", bd);
+                dev_notice(&pdev->dev, "using defaults for all values\n");
+        }
+        {                       /* Interrupt Moderate Timer */
+                struct atl1_option opt = {
+                        .type = range_option,
+                        .name = "Interrupt Moderator Timer",
+                        .err = "using default of "
+                                __MODULE_STRING(DEFAULT_INT_MOD_CNT),
+                        .def = DEFAULT_INT_MOD_CNT,
+                        .arg = {.r = {.min = MIN_INT_MOD_CNT,
+                                        .max = MAX_INT_MOD_CNT} }
+                };
+                int val;
+                if (num_int_mod_timer > bd) {
+                        val = int_mod_timer[bd];
+                        atl1_validate_option(&val, &opt, pdev);
+                        adapter->imt = (u16) val;
+                } else
+                        adapter->imt = (u16) (opt.def);
+        }
+
+        {                       /* Flash Vendor */
+                struct atl1_option opt = {
+                        .type = range_option,
+                        .name = "SPI Flash Vendor",
+                        .err = "using default of "
+                                __MODULE_STRING(FLASH_VENDOR_DEFAULT),
+                        .def = DEFAULT_INT_MOD_CNT,
+                        .arg = {.r = {.min = FLASH_VENDOR_MIN,
+                                        .max = FLASH_VENDOR_MAX} }
+                };
+                int val;
+                if (num_flash_vendor > bd) {
+                        val = flash_vendor[bd];
+                        atl1_validate_option(&val, &opt, pdev);
+                        adapter->hw.flash_vendor = (u8) val;
+                } else
+                        adapter->hw.flash_vendor = (u8) (opt.def);
+        }
+}
+
+#endif /* ATLX_C */
diff --git a/drivers/net/atlx/atlx.h b/drivers/net/atlx/atlx.h
new file mode 100644
index 000000000000..3be7c09734d4
--- /dev/null
+++ b/drivers/net/atlx/atlx.h
@@ -0,0 +1,506 @@
+/* atlx_hw.h -- common hardware definitions for Attansic network drivers
+ *
+ * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
+ * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
+ * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
+ * Copyright(c) 2007 Atheros Corporation. All rights reserved.
+ *
+ * Derived from Intel e1000 driver
+ * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef ATLX_H
+#define ATLX_H
+
+#include <linux/module.h>
+#include <linux/types.h>
+
+#define ATLX_DRIVER_VERSION "2.1.1"
+MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \
+        Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(ATLX_DRIVER_VERSION);
+
+#define ATLX_ERR_PHY                    2
+#define ATLX_ERR_PHY_SPEED              7
+#define ATLX_ERR_PHY_RES                8
+
+#define SPEED_0                         0xffff
+#define SPEED_10                        10
+#define SPEED_100                       100
+#define SPEED_1000                      1000
+#define HALF_DUPLEX                     1
+#define FULL_DUPLEX                     2
+
+#define MEDIA_TYPE_AUTO_SENSOR          0
+
+/* register definitions */
+#define REG_PM_CTRLSTAT                 0x44
+
+#define REG_PCIE_CAP_LIST               0x58
+
+#define REG_VPD_CAP                     0x6C
+#define VPD_CAP_ID_MASK                 0xFF
+#define VPD_CAP_ID_SHIFT                0
+#define VPD_CAP_NEXT_PTR_MASK           0xFF
+#define VPD_CAP_NEXT_PTR_SHIFT          8
+#define VPD_CAP_VPD_ADDR_MASK           0x7FFF
+#define VPD_CAP_VPD_ADDR_SHIFT          16
+#define VPD_CAP_VPD_FLAG                0x80000000
+
+#define REG_VPD_DATA                    0x70
+
+#define REG_SPI_FLASH_CTRL              0x200
+#define SPI_FLASH_CTRL_STS_NON_RDY      0x1
+#define SPI_FLASH_CTRL_STS_WEN          0x2
+#define SPI_FLASH_CTRL_STS_WPEN         0x80
+#define SPI_FLASH_CTRL_DEV_STS_MASK     0xFF
+#define SPI_FLASH_CTRL_DEV_STS_SHIFT    0
+#define SPI_FLASH_CTRL_INS_MASK         0x7
+#define SPI_FLASH_CTRL_INS_SHIFT        8
+#define SPI_FLASH_CTRL_START            0x800
+#define SPI_FLASH_CTRL_EN_VPD           0x2000
+#define SPI_FLASH_CTRL_LDSTART          0x8000
+#define SPI_FLASH_CTRL_CS_HI_MASK       0x3
+#define SPI_FLASH_CTRL_CS_HI_SHIFT      16
+#define SPI_FLASH_CTRL_CS_HOLD_MASK     0x3
+#define SPI_FLASH_CTRL_CS_HOLD_SHIFT    18
+#define SPI_FLASH_CTRL_CLK_LO_MASK      0x3
+#define SPI_FLASH_CTRL_CLK_LO_SHIFT     20
+#define SPI_FLASH_CTRL_CLK_HI_MASK      0x3
+#define SPI_FLASH_CTRL_CLK_HI_SHIFT     22
+#define SPI_FLASH_CTRL_CS_SETUP_MASK    0x3
+#define SPI_FLASH_CTRL_CS_SETUP_SHIFT   24
+#define SPI_FLASH_CTRL_EROM_PGSZ_MASK   0x3
+#define SPI_FLASH_CTRL_EROM_PGSZ_SHIFT  26
+#define SPI_FLASH_CTRL_WAIT_READY       0x10000000
+
+#define REG_SPI_ADDR                    0x204
+
+#define REG_SPI_DATA                    0x208
+
+#define REG_SPI_FLASH_CONFIG            0x20C
+#define SPI_FLASH_CONFIG_LD_ADDR_MASK   0xFFFFFF
+#define SPI_FLASH_CONFIG_LD_ADDR_SHIFT  0
+#define SPI_FLASH_CONFIG_VPD_ADDR_MASK  0x3
+#define SPI_FLASH_CONFIG_VPD_ADDR_SHIFT 24
+#define SPI_FLASH_CONFIG_LD_EXIST       0x4000000
+
+#define REG_SPI_FLASH_OP_PROGRAM        0x210
+#define REG_SPI_FLASH_OP_SC_ERASE       0x211
+#define REG_SPI_FLASH_OP_CHIP_ERASE     0x212
+#define REG_SPI_FLASH_OP_RDID           0x213
+#define REG_SPI_FLASH_OP_WREN           0x214
+#define REG_SPI_FLASH_OP_RDSR           0x215
+#define REG_SPI_FLASH_OP_WRSR           0x216
+#define REG_SPI_FLASH_OP_READ           0x217
+
+#define REG_TWSI_CTRL                   0x218
+#define TWSI_CTRL_LD_OFFSET_MASK        0xFF
+#define TWSI_CTRL_LD_OFFSET_SHIFT       0
+#define TWSI_CTRL_LD_SLV_ADDR_MASK      0x7
+#define TWSI_CTRL_LD_SLV_ADDR_SHIFT     8
+#define TWSI_CTRL_SW_LDSTART            0x800
+#define TWSI_CTRL_HW_LDSTART            0x1000
+#define TWSI_CTRL_SMB_SLV_ADDR_MASK     0x7F
+#define TWSI_CTRL_SMB_SLV_ADDR_SHIFT    15
+#define TWSI_CTRL_LD_EXIST              0x400000
+#define TWSI_CTRL_READ_FREQ_SEL_MASK    0x3
+#define TWSI_CTRL_READ_FREQ_SEL_SHIFT   23
+#define TWSI_CTRL_FREQ_SEL_100K         0
+#define TWSI_CTRL_FREQ_SEL_200K         1
+#define TWSI_CTRL_FREQ_SEL_300K         2
+#define TWSI_CTRL_FREQ_SEL_400K         3
+#define TWSI_CTRL_SMB_SLV_ADDR          /* FIXME: define or remove */
+#define TWSI_CTRL_WRITE_FREQ_SEL_MASK   0x3
+#define TWSI_CTRL_WRITE_FREQ_SEL_SHIFT  24
+
+#define REG_PCIE_DEV_MISC_CTRL                  0x21C
+#define PCIE_DEV_MISC_CTRL_EXT_PIPE             0x2
+#define PCIE_DEV_MISC_CTRL_RETRY_BUFDIS         0x1
+#define PCIE_DEV_MISC_CTRL_SPIROM_EXIST         0x4
+#define PCIE_DEV_MISC_CTRL_SERDES_ENDIAN        0x8
+#define PCIE_DEV_MISC_CTRL_SERDES_SEL_DIN       0x10
+
+#define REG_PCIE_PHYMISC                0x1000
+#define PCIE_PHYMISC_FORCE_RCV_DET      0x4
+
+#define REG_PCIE_DLL_TX_CTRL1           0x1104
+#define PCIE_DLL_TX_CTRL1_SEL_NOR_CLK   0x400
+#define PCIE_DLL_TX_CTRL1_DEF           0x568
+
+#define REG_LTSSM_TEST_MODE             0x12FC
+#define LTSSM_TEST_MODE_DEF             0x6500
+
+/* Master Control Register */
+#define REG_MASTER_CTRL                 0x1400
+#define MASTER_CTRL_SOFT_RST            0x1
+#define MASTER_CTRL_MTIMER_EN           0x2
+#define MASTER_CTRL_ITIMER_EN           0x4
+#define MASTER_CTRL_MANUAL_INT          0x8
+#define MASTER_CTRL_REV_NUM_SHIFT       16
+#define MASTER_CTRL_REV_NUM_MASK        0xFF
+#define MASTER_CTRL_DEV_ID_SHIFT        24
+#define MASTER_CTRL_DEV_ID_MASK         0xFF
+
+/* Timer Initial Value Register */
+#define REG_MANUAL_TIMER_INIT           0x1404
+
+/* IRQ Moderator Timer Initial Value Register */
+#define REG_IRQ_MODU_TIMER_INIT         0x1408
+
+#define REG_PHY_ENABLE                  0x140C
+
+/* IRQ Anti-Lost Timer Initial Value Register */
+#define REG_CMBDISDMA_TIMER             0x140E
+
+/* Block IDLE Status Register */
+#define REG_IDLE_STATUS                 0x1410
+
+/* MDIO Control Register */
+#define REG_MDIO_CTRL                   0x1414
+#define MDIO_DATA_MASK                  0xFFFF
+#define MDIO_DATA_SHIFT                 0
+#define MDIO_REG_ADDR_MASK              0x1F
+#define MDIO_REG_ADDR_SHIFT             16
+#define MDIO_RW                         0x200000
+#define MDIO_SUP_PREAMBLE               0x400000
+#define MDIO_START                      0x800000
+#define MDIO_CLK_SEL_SHIFT              24
+#define MDIO_CLK_25_4                   0
+#define MDIO_CLK_25_6                   2
+#define MDIO_CLK_25_8                   3
+#define MDIO_CLK_25_10                  4
+#define MDIO_CLK_25_14                  5
+#define MDIO_CLK_25_20                  6
+#define MDIO_CLK_25_28                  7
+#define MDIO_BUSY                       0x8000000
+
+/* MII PHY Status Register */
+#define REG_PHY_STATUS                  0x1418
+
+/* BIST Control and Status Register0 (for the Packet Memory) */
+#define REG_BIST0_CTRL                  0x141C
+#define BIST0_NOW                       0x1
+#define BIST0_SRAM_FAIL                 0x2
+#define BIST0_FUSE_FLAG                 0x4
+#define REG_BIST1_CTRL                  0x1420
+#define BIST1_NOW                       0x1
+#define BIST1_SRAM_FAIL                 0x2
+#define BIST1_FUSE_FLAG                 0x4
+
+/* SerDes Lock Detect Control and Status Register */
+#define REG_SERDES_LOCK                 0x1424
+#define SERDES_LOCK_DETECT              1
+#define SERDES_LOCK_DETECT_EN           2
+
+/* MAC Control Register */
+#define REG_MAC_CTRL                    0x1480
+#define MAC_CTRL_TX_EN                  1
+#define MAC_CTRL_RX_EN                  2
+#define MAC_CTRL_TX_FLOW                4
+#define MAC_CTRL_RX_FLOW                8
+#define MAC_CTRL_LOOPBACK               0x10
+#define MAC_CTRL_DUPLX                  0x20
+#define MAC_CTRL_ADD_CRC                0x40
+#define MAC_CTRL_PAD                    0x80
+#define MAC_CTRL_LENCHK                 0x100
+#define MAC_CTRL_HUGE_EN                0x200
+#define MAC_CTRL_PRMLEN_SHIFT           10
+#define MAC_CTRL_PRMLEN_MASK            0xF
+#define MAC_CTRL_RMV_VLAN               0x4000
+#define MAC_CTRL_PROMIS_EN              0x8000
+#define MAC_CTRL_MC_ALL_EN              0x2000000
+#define MAC_CTRL_BC_EN                  0x4000000
+
+/* MAC IPG/IFG Control Register */
+#define REG_MAC_IPG_IFG                 0x1484
+#define MAC_IPG_IFG_IPGT_SHIFT          0
+#define MAC_IPG_IFG_IPGT_MASK           0x7F
+#define MAC_IPG_IFG_MIFG_SHIFT          8
+#define MAC_IPG_IFG_MIFG_MASK           0xFF
+#define MAC_IPG_IFG_IPGR1_SHIFT         16
+#define MAC_IPG_IFG_IPGR1_MASK          0x7F
+#define MAC_IPG_IFG_IPGR2_SHIFT         24
+#define MAC_IPG_IFG_IPGR2_MASK          0x7F
+
+/* MAC STATION ADDRESS */
+#define REG_MAC_STA_ADDR                0x1488
+
+/* Hash table for multicast address */
+#define REG_RX_HASH_TABLE               0x1490
+
+/* MAC Half-Duplex Control Register */
+#define REG_MAC_HALF_DUPLX_CTRL                 0x1498
+#define MAC_HALF_DUPLX_CTRL_LCOL_SHIFT          0
+#define MAC_HALF_DUPLX_CTRL_LCOL_MASK           0x3FF
+#define MAC_HALF_DUPLX_CTRL_RETRY_SHIFT         12
+#define MAC_HALF_DUPLX_CTRL_RETRY_MASK          0xF
+#define MAC_HALF_DUPLX_CTRL_EXC_DEF_EN          0x10000
+#define MAC_HALF_DUPLX_CTRL_NO_BACK_C           0x20000
+#define MAC_HALF_DUPLX_CTRL_NO_BACK_P           0x40000
+#define MAC_HALF_DUPLX_CTRL_ABEBE               0x80000
+#define MAC_HALF_DUPLX_CTRL_ABEBT_SHIFT         20
+#define MAC_HALF_DUPLX_CTRL_ABEBT_MASK          0xF
+#define MAC_HALF_DUPLX_CTRL_JAMIPG_SHIFT        24
+#define MAC_HALF_DUPLX_CTRL_JAMIPG_MASK         0xF
+
+/* Maximum Frame Length Control Register */
+#define REG_MTU                         0x149C
+
+/* Wake-On-Lan control register */
+#define REG_WOL_CTRL                    0x14A0
+#define WOL_PATTERN_EN                  0x1
+#define WOL_PATTERN_PME_EN              0x2
+#define WOL_MAGIC_EN                    0x4
+#define WOL_MAGIC_PME_EN                0x8
+#define WOL_LINK_CHG_EN                 0x10
+#define WOL_LINK_CHG_PME_EN             0x20
+#define WOL_PATTERN_ST                  0x100
+#define WOL_MAGIC_ST                    0x200
+#define WOL_LINKCHG_ST                  0x400
+#define WOL_PT0_EN                      0x10000
+#define WOL_PT1_EN                      0x20000
+#define WOL_PT2_EN                      0x40000
+#define WOL_PT3_EN                      0x80000
+#define WOL_PT4_EN                      0x100000
+#define WOL_PT0_MATCH                   0x1000000
+#define WOL_PT1_MATCH                   0x2000000
+#define WOL_PT2_MATCH                   0x4000000
+#define WOL_PT3_MATCH                   0x8000000
+#define WOL_PT4_MATCH                   0x10000000
+
+/* Internal SRAM Partition Register, high 32 bits */
+#define REG_SRAM_RFD_ADDR               0x1500
+
+/* Descriptor Control register, high 32 bits */
+#define REG_DESC_BASE_ADDR_HI           0x1540
+
+/* Interrupt Status Register */
+#define REG_ISR                         0x1600
+#define ISR_UR_DETECTED                 0x1000000
+#define ISR_FERR_DETECTED               0x2000000
+#define ISR_NFERR_DETECTED              0x4000000
+#define ISR_CERR_DETECTED               0x8000000
+#define ISR_PHY_LINKDOWN                0x10000000
+#define ISR_DIS_INT                     0x80000000
+
+/* Interrupt Mask Register */
+#define REG_IMR                         0x1604
+
+#define REG_RFD_RRD_IDX                 0x1800
+#define REG_TPD_IDX                     0x1804
+
+/* MII definitions */
+
+/* PHY Common Register */
+#define MII_ATLX_CR                     0x09
+#define MII_ATLX_SR                     0x0A
+#define MII_ATLX_ESR                    0x0F
+#define MII_ATLX_PSCR                   0x10
+#define MII_ATLX_PSSR                   0x11
+
+/* PHY Control Register */
+#define MII_CR_SPEED_SELECT_MSB         0x0040  /* bits 6,13: 10=1000, 01=100,
+                                                 * 00=10
+                                                 */
+#define MII_CR_COLL_TEST_ENABLE         0x0080  /* Collision test enable */
+#define MII_CR_FULL_DUPLEX              0x0100  /* FDX =1, half duplex =0 */
+#define MII_CR_RESTART_AUTO_NEG         0x0200  /* Restart auto negotiation */
+#define MII_CR_ISOLATE                  0x0400  /* Isolate PHY from MII */
+#define MII_CR_POWER_DOWN               0x0800  /* Power down */
+#define MII_CR_AUTO_NEG_EN              0x1000  /* Auto Neg Enable */
+#define MII_CR_SPEED_SELECT_LSB         0x2000  /* bits 6,13: 10=1000, 01=100,
+                                                 * 00=10
+                                                 */
+#define MII_CR_LOOPBACK                 0x4000  /* 0 = normal, 1 = loopback */
+#define MII_CR_RESET                    0x8000  /* 0 = normal, 1 = PHY reset */
+#define MII_CR_SPEED_MASK               0x2040
+#define MII_CR_SPEED_1000               0x0040
+#define MII_CR_SPEED_100                0x2000
+#define MII_CR_SPEED_10                 0x0000
+
+/* PHY Status Register */
+#define MII_SR_EXTENDED_CAPS            0x0001  /* Ext register capabilities */
+#define MII_SR_JABBER_DETECT            0x0002  /* Jabber Detected */
+#define MII_SR_LINK_STATUS              0x0004  /* Link Status 1 = link */
+#define MII_SR_AUTONEG_CAPS             0x0008  /* Auto Neg Capable */
+#define MII_SR_REMOTE_FAULT             0x0010  /* Remote Fault Detect */
+#define MII_SR_AUTONEG_COMPLETE         0x0020  /* Auto Neg Complete */
+#define MII_SR_PREAMBLE_SUPPRESS        0x0040  /* Preamble may be suppressed */
+#define MII_SR_EXTENDED_STATUS          0x0100  /* Ext stat info in Reg 0x0F */
+#define MII_SR_100T2_HD_CAPS            0x0200  /* 100T2 Half Duplex Capable */
+#define MII_SR_100T2_FD_CAPS            0x0400  /* 100T2 Full Duplex Capable */
+#define MII_SR_10T_HD_CAPS              0x0800  /* 10T   Half Duplex Capable */
+#define MII_SR_10T_FD_CAPS              0x1000  /* 10T   Full Duplex Capable */
+#define MII_SR_100X_HD_CAPS             0x2000  /* 100X  Half Duplex Capable */
+#define MII_SR_100X_FD_CAPS             0x4000  /* 100X  Full Duplex Capable */
+#define MII_SR_100T4_CAPS               0x8000  /* 100T4 Capable */
+
+/* Link partner ability register */
+#define MII_LPA_SLCT                    0x001f  /* Same as advertise selector */
+#define MII_LPA_10HALF                  0x0020  /* Can do 10mbps half-duplex */
+#define MII_LPA_10FULL                  0x0040  /* Can do 10mbps full-duplex */
+#define MII_LPA_100HALF                 0x0080  /* Can do 100mbps half-duplex */
+#define MII_LPA_100FULL                 0x0100  /* Can do 100mbps full-duplex */
+#define MII_LPA_100BASE4                0x0200  /* 100BASE-T4 */
+#define MII_LPA_PAUSE                   0x0400  /* PAUSE */
+#define MII_LPA_ASYPAUSE                0x0800  /* Asymmetrical PAUSE */
+#define MII_LPA_RFAULT                  0x2000  /* Link partner faulted */
+#define MII_LPA_LPACK                   0x4000  /* Link partner acked us */
+#define MII_LPA_NPAGE                   0x8000  /* Next page bit */
+
+/* Autoneg Advertisement Register */
+#define MII_AR_SELECTOR_FIELD           0x0001  /* IEEE 802.3 CSMA/CD */
+#define MII_AR_10T_HD_CAPS              0x0020  /* 10T   Half Duplex Capable */
+#define MII_AR_10T_FD_CAPS              0x0040  /* 10T   Full Duplex Capable */
+#define MII_AR_100TX_HD_CAPS            0x0080  /* 100TX Half Duplex Capable */
+#define MII_AR_100TX_FD_CAPS            0x0100  /* 100TX Full Duplex Capable */
+#define MII_AR_100T4_CAPS               0x0200  /* 100T4 Capable */
+#define MII_AR_PAUSE                    0x0400  /* Pause operation desired */
+#define MII_AR_ASM_DIR                  0x0800  /* Asymmetric Pause Dir bit */
+#define MII_AR_REMOTE_FAULT             0x2000  /* Remote Fault detected */
+#define MII_AR_NEXT_PAGE                0x8000  /* Next Page ability support */
+#define MII_AR_SPEED_MASK               0x01E0
+#define MII_AR_DEFAULT_CAP_MASK         0x0DE0
+
+/* 1000BASE-T Control Register */
+#define MII_ATLX_CR_1000T_HD_CAPS       0x0100  /* Adv 1000T HD cap */
+#define MII_ATLX_CR_1000T_FD_CAPS       0x0200  /* Adv 1000T FD cap */
+#define MII_ATLX_CR_1000T_REPEATER_DTE  0x0400  /* 1=Repeater/switch device,
+                                                 * 0=DTE device */
+#define MII_ATLX_CR_1000T_MS_VALUE      0x0800  /* 1=Config PHY as Master,
+                                                 * 0=Configure PHY as Slave */
+#define MII_ATLX_CR_1000T_MS_ENABLE     0x1000  /* 1=Man Master/Slave config,
+                                                 * 0=Auto Master/Slave config
+                                                 */
+#define MII_ATLX_CR_1000T_TEST_MODE_NORMAL      0x0000  /* Normal Operation */
+#define MII_ATLX_CR_1000T_TEST_MODE_1   0x2000  /* Transmit Waveform test */
+#define MII_ATLX_CR_1000T_TEST_MODE_2   0x4000  /* Master Xmit Jitter test */
+#define MII_ATLX_CR_1000T_TEST_MODE_3   0x6000  /* Slave Xmit Jitter test */
+#define MII_ATLX_CR_1000T_TEST_MODE_4   0x8000  /* Xmitter Distortion test */
+#define MII_ATLX_CR_1000T_SPEED_MASK    0x0300
+#define MII_ATLX_CR_1000T_DEFAULT_CAP_MASK      0x0300
+
+/* 1000BASE-T Status Register */
+#define MII_ATLX_SR_1000T_LP_HD_CAPS    0x0400  /* LP is 1000T HD capable */
+#define MII_ATLX_SR_1000T_LP_FD_CAPS    0x0800  /* LP is 1000T FD capable */
+#define MII_ATLX_SR_1000T_REMOTE_RX_STATUS      0x1000  /* Remote receiver OK */
+#define MII_ATLX_SR_1000T_LOCAL_RX_STATUS       0x2000  /* Local receiver OK */
+#define MII_ATLX_SR_1000T_MS_CONFIG_RES         0x4000  /* 1=Local TX is Master
+                                                         * 0=Slave
+                                                         */
+#define MII_ATLX_SR_1000T_MS_CONFIG_FAULT       0x8000  /* Master/Slave config
+                                                         * fault */
+#define MII_ATLX_SR_1000T_REMOTE_RX_STATUS_SHIFT        12
+#define MII_ATLX_SR_1000T_LOCAL_RX_STATUS_SHIFT         13
+
+/* Extended Status Register */
+#define MII_ATLX_ESR_1000T_HD_CAPS      0x1000  /* 1000T HD capable */
+#define MII_ATLX_ESR_1000T_FD_CAPS      0x2000  /* 1000T FD capable */
+#define MII_ATLX_ESR_1000X_HD_CAPS      0x4000  /* 1000X HD capable */
+#define MII_ATLX_ESR_1000X_FD_CAPS      0x8000  /* 1000X FD capable */
+
+/* ATLX PHY Specific Control Register */
+#define MII_ATLX_PSCR_JABBER_DISABLE    0x0001  /* 1=Jabber Func disabled */
+#define MII_ATLX_PSCR_POLARITY_REVERSAL 0x0002  /* 1=Polarity Reversal enbld */
+#define MII_ATLX_PSCR_SQE_TEST          0x0004  /* 1=SQE Test enabled */
+#define MII_ATLX_PSCR_MAC_POWERDOWN     0x0008
+#define MII_ATLX_PSCR_CLK125_DISABLE    0x0010  /* 1=CLK125 low
+                                                 * 0=CLK125 toggling
+                                                 */
+#define MII_ATLX_PSCR_MDI_MANUAL_MODE   0x0000  /* MDI Crossover Mode bits 6:5,
+                                                 * Manual MDI configuration
+                                                 */
+#define MII_ATLX_PSCR_MDIX_MANUAL_MODE  0x0020  /* Manual MDIX configuration */
+#define MII_ATLX_PSCR_AUTO_X_1000T      0x0040  /* 1000BASE-T: Auto crossover
+                                                 * 100BASE-TX/10BASE-T: MDI
+                                                 * Mode */
+#define MII_ATLX_PSCR_AUTO_X_MODE       0x0060  /* Auto crossover enabled
+                                                 * all speeds.
+                                                 */
+#define MII_ATLX_PSCR_10BT_EXT_DIST_ENABLE      0x0080  /* 1=Enable Extended
+                                                         * 10BASE-T distance
+                                                         * (Lower 10BASE-T RX
+                                                         * Threshold)
+                                                         * 0=Normal 10BASE-T RX
+                                                         * Threshold
+                                                         */
+#define MII_ATLX_PSCR_MII_5BIT_ENABLE   0x0100  /* 1=5-Bit interface in
+                                                 * 100BASE-TX
+                                                 * 0=MII interface in
+                                                 * 100BASE-TX
+                                                 */
+#define MII_ATLX_PSCR_SCRAMBLER_DISABLE 0x0200  /* 1=Scrambler dsbl */
+#define MII_ATLX_PSCR_FORCE_LINK_GOOD   0x0400  /* 1=Force link good */
+#define MII_ATLX_PSCR_ASSERT_CRS_ON_TX  0x0800  /* 1=Assert CRS on Transmit */
+#define MII_ATLX_PSCR_POLARITY_REVERSAL_SHIFT           1
+#define MII_ATLX_PSCR_AUTO_X_MODE_SHIFT                 5
+#define MII_ATLX_PSCR_10BT_EXT_DIST_ENABLE_SHIFT        7
+
+/* ATLX PHY Specific Status Register */
+#define MII_ATLX_PSSR_SPD_DPLX_RESOLVED 0x0800  /* 1=Speed & Duplex resolved */
+#define MII_ATLX_PSSR_DPLX              0x2000  /* 1=Duplex 0=Half Duplex */
+#define MII_ATLX_PSSR_SPEED             0xC000  /* Speed, bits 14:15 */
+#define MII_ATLX_PSSR_10MBS             0x0000  /* 00=10Mbs */
+#define MII_ATLX_PSSR_100MBS            0x4000  /* 01=100Mbs */
+#define MII_ATLX_PSSR_1000MBS           0x8000  /* 10=1000Mbs */
+
+/* PCI Command Register Bit Definitions */
+#define PCI_REG_COMMAND                 0x04    /* PCI Command Register */
+#define CMD_IO_SPACE                    0x0001
+#define CMD_MEMORY_SPACE                0x0002
+#define CMD_BUS_MASTER                  0x0004
+
+/* Wake Up Filter Control */
+#define ATLX_WUFC_LNKC  0x00000001      /* Link Status Change Wakeup Enable */
+#define ATLX_WUFC_MAG   0x00000002      /* Magic Packet Wakeup Enable */
+#define ATLX_WUFC_EX    0x00000004      /* Directed Exact Wakeup Enable */
+#define ATLX_WUFC_MC    0x00000008      /* Multicast Wakeup Enable */
+#define ATLX_WUFC_BC    0x00000010      /* Broadcast Wakeup Enable */
+
+#define ADVERTISE_10_HALF               0x0001
+#define ADVERTISE_10_FULL               0x0002
+#define ADVERTISE_100_HALF              0x0004
+#define ADVERTISE_100_FULL              0x0008
+#define ADVERTISE_1000_HALF             0x0010
+#define ADVERTISE_1000_FULL             0x0020
+#define AUTONEG_ADVERTISE_10_100_ALL    0x000F  /* All 10/100 speeds */
+#define AUTONEG_ADVERTISE_10_ALL        0x0003  /* 10Mbps Full & Half speeds */
+
+#define PHY_AUTO_NEG_TIME               45      /* 4.5 Seconds */
+#define PHY_FORCE_TIME                  20      /* 2.0 Seconds */
+
+/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA */
+#define EEPROM_SUM                      0xBABA
+#define NODE_ADDRESS_SIZE               6
+
+struct atlx_spi_flash_dev {
+        const char *manu_name;  /* manufacturer id */
+        /* op-code */
+        u8 cmd_wrsr;
+        u8 cmd_read;
+        u8 cmd_program;
+        u8 cmd_wren;
+        u8 cmd_wrdi;
+        u8 cmd_rdsr;
+        u8 cmd_rdid;
+        u8 cmd_sector_erase;
+        u8 cmd_chip_erase;
+};
+
+#endif /* ATLX_H */
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 62f09e59d9c4..3d4433358a36 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -378,8 +378,8 @@ static void __init get_node_ID(struct net_device *dev)
                 sa_offset = 15;
 
         for (i = 0; i < 3; i++)
-                ((u16 *)dev->dev_addr)[i] =
-                        be16_to_cpu(eeprom_op(ioaddr, EE_READ(sa_offset + i)));
+                ((__be16 *)dev->dev_addr)[i] =
+                        cpu_to_be16(eeprom_op(ioaddr, EE_READ(sa_offset + i)));
 
         write_reg(ioaddr, CMR2, CMR2_NULL);
 }
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 504b7ce2747d..3634b5fd7919 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -701,7 +701,7 @@ static struct net_device * au1000_probe(int port_num)
         aup->mii_bus.write = mdiobus_write;
         aup->mii_bus.reset = mdiobus_reset;
         aup->mii_bus.name = "au1000_eth_mii";
-        aup->mii_bus.id = aup->mac_id;
+        snprintf(aup->mii_bus.id, MII_BUS_ID_SIZE, "%x", aup->mac_id);
         aup->mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
         for(i = 0; i < PHY_MAX_ADDR; ++i)
                 aup->mii_bus.irq[i] = PHY_POLL;
@@ -709,11 +709,11 @@ static struct net_device * au1000_probe(int port_num)
         /* if known, set corresponding PHY IRQs */
 #if defined(AU1XXX_PHY_STATIC_CONFIG)
 # if defined(AU1XXX_PHY0_IRQ)
-        if (AU1XXX_PHY0_BUSID == aup->mii_bus.id)
+        if (AU1XXX_PHY0_BUSID == aup->mac_id)
                 aup->mii_bus.irq[AU1XXX_PHY0_ADDR] = AU1XXX_PHY0_IRQ;
 # endif
 # if defined(AU1XXX_PHY1_IRQ)
-        if (AU1XXX_PHY1_BUSID == aup->mii_bus.id)
+        if (AU1XXX_PHY1_BUSID == aup->mac_id)
                 aup->mii_bus.irq[AU1XXX_PHY1_ADDR] = AU1XXX_PHY1_IRQ;
 # endif
 #endif
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 26b2dd5016cd..717dcc1aa1e9 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -969,7 +969,7 @@ static int __init bf537mac_probe(struct net_device *dev)
         lp->mii_bus.write = mdiobus_write;
         lp->mii_bus.reset = mdiobus_reset;
         lp->mii_bus.name = "bfin_mac_mdio";
-        lp->mii_bus.id = 0;
+        snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "0");
         lp->mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
         for (i = 0; i < PHY_MAX_ADDR; ++i)
                 lp->mii_bus.irq[i] = PHY_POLL;
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index d16e0e1d2b30..ebb539e090c3 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2429,7 +2429,7 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
         struct slave *slave = NULL;
         int ret = NET_RX_DROP;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto out;
 
         if (!(dev->flags & IFF_MASTER))
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 3f58c3d0b710..5a673725471c 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -345,7 +345,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
         struct arp_pkt *arp = (struct arp_pkt *)skb->data;
         int res = NET_RX_DROP;
 
-        if (bond_dev->nd_net != &init_net)
+        if (dev_net(bond_dev) != &init_net)
                 goto out;
 
         if (!(bond_dev->flags & IFF_MASTER))
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0f0675319e9c..6e91b4b7aabb 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2629,7 +2629,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         unsigned char *arp_ptr;
         __be32 sip, tip;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto out;
 
         if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER))
@@ -2646,10 +2646,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         if (!slave || !slave_do_arp_validate(bond, slave))
                 goto out_unlock;
 
-        /* ARP header, plus 2 device addresses, plus 2 IP addresses.  */
-        if (!pskb_may_pull(skb, (sizeof(struct arphdr) +
-                                 (2 * dev->addr_len) +
-                                 (2 * sizeof(u32)))))
+        if (!pskb_may_pull(skb, arp_hdr_len(dev)))
                 goto out_unlock;
 
         arp = arp_hdr(skb);
@@ -3068,8 +3065,6 @@ out:
 
 #ifdef CONFIG_PROC_FS
 
-#define SEQ_START_TOKEN ((void *)1)
-
 static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct bonding *bond = seq->private;
@@ -3473,7 +3468,7 @@ static int bond_netdev_event(struct notifier_block *this, unsigned long event, v
 {
         struct net_device *event_dev = (struct net_device *)ptr;
 
-        if (event_dev->nd_net != &init_net)
+        if (dev_net(event_dev) != &init_net)
                 return NOTIFY_DONE;
 
         dprintk("event_dev: %s, event: %lx\n",
@@ -3511,6 +3506,9 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event,
         struct bonding *bond, *bond_next;
         struct vlan_entry *vlan, *vlan_next;
 
+        if (dev_net(ifa->ifa_dev->dev) != &init_net)
+                return NOTIFY_DONE;
+
         list_for_each_entry_safe(bond, bond_next, &bond_dev_list, bond_list) {
                 if (bond->dev == event_dev) {
                         switch (event) {
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 14299f8063af..93e13636f8dd 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -532,8 +532,7 @@ static void cas_spare_free(struct cas *cp)
         /* free spare buffers */
         INIT_LIST_HEAD(&list);
         spin_lock(&cp->rx_spare_lock);
-        list_splice(&cp->rx_spare_list, &list);
-        INIT_LIST_HEAD(&cp->rx_spare_list);
+        list_splice_init(&cp->rx_spare_list, &list);
         spin_unlock(&cp->rx_spare_lock);
         list_for_each_safe(elem, tmp, &list) {
                 cas_page_free(cp, list_entry(elem, cas_page_t, list));
@@ -546,13 +545,11 @@ static void cas_spare_free(struct cas *cp)
          * lock than used everywhere else to manipulate this list.
          */
         spin_lock(&cp->rx_inuse_lock);
-        list_splice(&cp->rx_inuse_list, &list);
-        INIT_LIST_HEAD(&cp->rx_inuse_list);
+        list_splice_init(&cp->rx_inuse_list, &list);
         spin_unlock(&cp->rx_inuse_lock);
 #else
         spin_lock(&cp->rx_spare_lock);
-        list_splice(&cp->rx_inuse_list, &list);
-        INIT_LIST_HEAD(&cp->rx_inuse_list);
+        list_splice_init(&cp->rx_inuse_list, &list);
         spin_unlock(&cp->rx_spare_lock);
 #endif
         list_for_each_safe(elem, tmp, &list) {
@@ -573,8 +570,7 @@ static void cas_spare_recover(struct cas *cp, const gfp_t flags)
         /* make a local copy of the list */
         INIT_LIST_HEAD(&list);
         spin_lock(&cp->rx_inuse_lock);
-        list_splice(&cp->rx_inuse_list, &list);
-        INIT_LIST_HEAD(&cp->rx_inuse_list);
+        list_splice_init(&cp->rx_inuse_list, &list);
         spin_unlock(&cp->rx_inuse_lock);
 
         list_for_each_safe(elem, tmp, &list) {
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index c85194f2cd2d..9da7ff437031 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -987,7 +987,7 @@ static int external_switch;
 static int __devinit cpmac_probe(struct platform_device *pdev)
 {
         int rc, phy_id, i;
-        int mdio_bus_id = cpmac_mii.id;
+        char *mdio_bus_id = "0";
         struct resource *mem;
         struct cpmac_priv *priv;
         struct net_device *dev;
@@ -1008,8 +1008,6 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
                 if (external_switch || dumb_switch) {
                         struct fixed_phy_status status = {};
 
-                        mdio_bus_id = 0;
-
                         /*
                          * FIXME: this should be in the platform code!
                          * Since there is not platform code at all (that is,
@@ -1143,6 +1141,7 @@ int __devinit cpmac_init(void)
         }
 
         cpmac_mii.phy_mask = ~(mask | 0x80000000);
+        snprintf(cpmac_mii.id, MII_BUS_ID_SIZE, "0");
 
         res = mdiobus_register(&cpmac_mii);
         if (res)
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index fd2e05bbb903..05e5f59e87fa 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1014,8 +1014,8 @@ static int offload_open(struct net_device *dev)
                      adapter->port[0]->mtu : 0xffff);
         init_smt(adapter);
 
-        /* Never mind if the next step fails */
-        sysfs_create_group(&tdev->lldev->dev.kobj, &offload_attr_group);
+        if (sysfs_create_group(&tdev->lldev->dev.kobj, &offload_attr_group))
+                dev_dbg(&dev->dev, "cannot create sysfs group\n");
 
         /* Call back all registered clients */
         cxgb3_add_clients(tdev);
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index 901c824bfe6d..ff9c013ce535 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -833,10 +833,26 @@ static int do_trace(struct t3cdev *dev, struct sk_buff *skb)
         return 0;
 }
 
+/*
+ * That skb would better have come from process_responses() where we abuse
+ * ->priority and ->csum to carry our data.  NB: if we get to per-arch
+ * ->csum, the things might get really interesting here.
+ */
+
+static inline u32 get_hwtid(struct sk_buff *skb)
+{
+        return ntohl((__force __be32)skb->priority) >> 8 & 0xfffff;
+}
+
+static inline u32 get_opcode(struct sk_buff *skb)
+{
+        return G_OPCODE(ntohl((__force __be32)skb->csum));
+}
+
 static int do_term(struct t3cdev *dev, struct sk_buff *skb)
 {
-        unsigned int hwtid = ntohl(skb->priority) >> 8 & 0xfffff;
-        unsigned int opcode = G_OPCODE(ntohl(skb->csum));
+        unsigned int hwtid = get_hwtid(skb);
+        unsigned int opcode = get_opcode(skb);
         struct t3c_tid_entry *t3c_tid;
 
         t3c_tid = lookup_tid(&(T3C_DATA(dev))->tid_maps, hwtid);
@@ -914,7 +930,7 @@ int process_rx(struct t3cdev *dev, struct sk_buff **skbs, int n)
 {
         while (n--) {
                 struct sk_buff *skb = *skbs++;
-                unsigned int opcode = G_OPCODE(ntohl(skb->csum));
+                unsigned int opcode = get_opcode(skb);
                 int ret = cpl_handlers[opcode] (dev, skb);
 
 #if VALIDATE_TID
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c
index 865faee53e17..f510140885ae 100644
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -407,7 +407,7 @@ found:
                         } else if (neigh->nud_state & (NUD_CONNECTED|NUD_STALE))
                                 setup_l2e_send_pending(dev, NULL, e);
                 } else {
-                        e->state = neigh_is_connected(neigh) ?
+                        e->state = neigh->nud_state & NUD_CONNECTED ?
                             L2T_STATE_VALID : L2T_STATE_STALE;
                         if (memcmp(e->dmac, neigh->ha, 6))
                                 setup_l2e_send_pending(dev, NULL, e);
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index ddc30c4bf34a..c062aacf229c 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -971,7 +971,8 @@ static int __devinit dfx_driver_init(struct net_device *dev,
         int alloc_size;                 /* total buffer size needed */
         char *top_v, *curr_v;           /* virtual addrs into memory block */
         dma_addr_t top_p, curr_p;       /* physical addrs into memory block */
-        u32 data, le32;                 /* host data register value */
+        u32 data;                       /* host data register value */
+        __le32 le32;
         char *board_name = NULL;
 
         DBG_printk("In dfx_driver_init...\n");
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 3b840283a9c3..31feae1ea390 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -161,13 +161,13 @@ struct e1000_buffer {
         struct sk_buff *skb;
         dma_addr_t dma;
         unsigned long time_stamp;
-        uint16_t length;
-        uint16_t next_to_watch;
+        u16 length;
+        u16 next_to_watch;
 };
 
 
 struct e1000_ps_page { struct page *ps_page[PS_PAGE_BUFFERS]; };
-struct e1000_ps_page_dma { uint64_t ps_page_dma[PS_PAGE_BUFFERS]; };
+struct e1000_ps_page_dma { u64 ps_page_dma[PS_PAGE_BUFFERS]; };
 
 struct e1000_tx_ring {
         /* pointer to the descriptor ring memory */
@@ -186,9 +186,9 @@ struct e1000_tx_ring {
         struct e1000_buffer *buffer_info;
 
         spinlock_t tx_lock;
-        uint16_t tdh;
-        uint16_t tdt;
-        boolean_t last_tx_tso;
+        u16 tdh;
+        u16 tdt;
+        bool last_tx_tso;
 };
 
 struct e1000_rx_ring {
@@ -213,8 +213,8 @@ struct e1000_rx_ring {
         /* cpu for rx queue */
         int cpu;
 
-        uint16_t rdh;
-        uint16_t rdt;
+        u16 rdh;
+        u16 rdt;
 };
 
 #define E1000_DESC_UNUSED(R) \
@@ -237,31 +237,30 @@ struct e1000_adapter {
         struct timer_list watchdog_timer;
         struct timer_list phy_info_timer;
         struct vlan_group *vlgrp;
-        uint16_t mng_vlan_id;
-        uint32_t bd_number;
-        uint32_t rx_buffer_len;
-        uint32_t wol;
-        uint32_t smartspeed;
-        uint32_t en_mng_pt;
-        uint16_t link_speed;
-        uint16_t link_duplex;
+        u16 mng_vlan_id;
+        u32 bd_number;
+        u32 rx_buffer_len;
+        u32 wol;
+        u32 smartspeed;
+        u32 en_mng_pt;
+        u16 link_speed;
+        u16 link_duplex;
         spinlock_t stats_lock;
 #ifdef CONFIG_E1000_NAPI
         spinlock_t tx_queue_lock;
 #endif
-        atomic_t irq_sem;
         unsigned int total_tx_bytes;
         unsigned int total_tx_packets;
         unsigned int total_rx_bytes;
         unsigned int total_rx_packets;
         /* Interrupt Throttle Rate */
-        uint32_t itr;
-        uint32_t itr_setting;
-        uint16_t tx_itr;
-        uint16_t rx_itr;
+        u32 itr;
+        u32 itr_setting;
+        u16 tx_itr;
+        u16 rx_itr;
 
         struct work_struct reset_task;
-        uint8_t fc_autoneg;
+        u8 fc_autoneg;
 
         struct timer_list blink_timer;
         unsigned long led_status;
@@ -270,30 +269,30 @@ struct e1000_adapter {
         struct e1000_tx_ring *tx_ring;      /* One per active queue */
         unsigned int restart_queue;
         unsigned long tx_queue_len;
-        uint32_t txd_cmd;
-        uint32_t tx_int_delay;
-        uint32_t tx_abs_int_delay;
-        uint32_t gotcl;
-        uint64_t gotcl_old;
-        uint64_t tpt_old;
-        uint64_t colc_old;
-        uint32_t tx_timeout_count;
-        uint32_t tx_fifo_head;
-        uint32_t tx_head_addr;
-        uint32_t tx_fifo_size;
-        uint8_t  tx_timeout_factor;
+        u32 txd_cmd;
+        u32 tx_int_delay;
+        u32 tx_abs_int_delay;
+        u32 gotcl;
+        u64 gotcl_old;
+        u64 tpt_old;
+        u64 colc_old;
+        u32 tx_timeout_count;
+        u32 tx_fifo_head;
+        u32 tx_head_addr;
+        u32 tx_fifo_size;
+        u8  tx_timeout_factor;
         atomic_t tx_fifo_stall;
-        boolean_t pcix_82544;
-        boolean_t detect_tx_hung;
+        bool pcix_82544;
+        bool detect_tx_hung;
 
         /* RX */
 #ifdef CONFIG_E1000_NAPI
-        boolean_t (*clean_rx) (struct e1000_adapter *adapter,
-                               struct e1000_rx_ring *rx_ring,
-                               int *work_done, int work_to_do);
+        bool (*clean_rx) (struct e1000_adapter *adapter,
+                          struct e1000_rx_ring *rx_ring,
+                          int *work_done, int work_to_do);
 #else
-        boolean_t (*clean_rx) (struct e1000_adapter *adapter,
-                               struct e1000_rx_ring *rx_ring);
+        bool (*clean_rx) (struct e1000_adapter *adapter,
+                          struct e1000_rx_ring *rx_ring);
 #endif
         void (*alloc_rx_buf) (struct e1000_adapter *adapter,
                               struct e1000_rx_ring *rx_ring,
@@ -306,17 +305,17 @@ struct e1000_adapter {
         int num_tx_queues;
         int num_rx_queues;
 
-        uint64_t hw_csum_err;
-        uint64_t hw_csum_good;
-        uint64_t rx_hdr_split;
-        uint32_t alloc_rx_buff_failed;
-        uint32_t rx_int_delay;
-        uint32_t rx_abs_int_delay;
-        boolean_t rx_csum;
+        u64 hw_csum_err;
+        u64 hw_csum_good;
+        u64 rx_hdr_split;
+        u32 alloc_rx_buff_failed;
+        u32 rx_int_delay;
+        u32 rx_abs_int_delay;
+        bool rx_csum;
         unsigned int rx_ps_pages;
-        uint32_t gorcl;
-        uint64_t gorcl_old;
-        uint16_t rx_ps_bsize0;
+        u32 gorcl;
+        u64 gorcl_old;
+        u16 rx_ps_bsize0;
 
 
         /* OS defined structs */
@@ -330,19 +329,19 @@ struct e1000_adapter {
         struct e1000_phy_info phy_info;
         struct e1000_phy_stats phy_stats;
 
-        uint32_t test_icr;
+        u32 test_icr;
         struct e1000_tx_ring test_tx_ring;
         struct e1000_rx_ring test_rx_ring;
 
         int msg_enable;
-        boolean_t have_msi;
+        bool have_msi;
 
         /* to not mess up cache alignment, always add to the bottom */
-        boolean_t tso_force;
-        boolean_t smart_power_down;     /* phy smart power down */
-        boolean_t quad_port_a;
+        bool tso_force;
+        bool smart_power_down;  /* phy smart power down */
+        bool quad_port_a;
         unsigned long flags;
-        uint32_t eeprom_wol;
+        u32 eeprom_wol;
 };
 
 enum e1000_state_t {
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 85e66f4c7886..701531e72e7b 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -36,7 +36,7 @@ extern int e1000_up(struct e1000_adapter *adapter);
 extern void e1000_down(struct e1000_adapter *adapter);
 extern void e1000_reinit_locked(struct e1000_adapter *adapter);
 extern void e1000_reset(struct e1000_adapter *adapter);
-extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
+extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
 extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
 extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
 extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
@@ -289,7 +289,7 @@ e1000_set_pauseparam(struct net_device *netdev,
         return retval;
 }
 
-static uint32_t
+static u32
 e1000_get_rx_csum(struct net_device *netdev)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -297,7 +297,7 @@ e1000_get_rx_csum(struct net_device *netdev)
 }
 
 static int
-e1000_set_rx_csum(struct net_device *netdev, uint32_t data)
+e1000_set_rx_csum(struct net_device *netdev, u32 data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         adapter->rx_csum = data;
@@ -309,14 +309,14 @@ e1000_set_rx_csum(struct net_device *netdev, uint32_t data)
         return 0;
 }
 
-static uint32_t
+static u32
 e1000_get_tx_csum(struct net_device *netdev)
 {
         return (netdev->features & NETIF_F_HW_CSUM) != 0;
 }
 
 static int
-e1000_set_tx_csum(struct net_device *netdev, uint32_t data)
+e1000_set_tx_csum(struct net_device *netdev, u32 data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
@@ -335,7 +335,7 @@ e1000_set_tx_csum(struct net_device *netdev, uint32_t data)
 }
 
 static int
-e1000_set_tso(struct net_device *netdev, uint32_t data)
+e1000_set_tso(struct net_device *netdev, u32 data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         if ((adapter->hw.mac_type < e1000_82544) ||
@@ -353,11 +353,11 @@ e1000_set_tso(struct net_device *netdev, uint32_t data)
                 netdev->features &= ~NETIF_F_TSO6;
 
         DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled");
-        adapter->tso_force = TRUE;
+        adapter->tso_force = true;
         return 0;
 }
 
-static uint32_t
+static u32
 e1000_get_msglevel(struct net_device *netdev)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -365,7 +365,7 @@ e1000_get_msglevel(struct net_device *netdev)
 }
 
 static void
-e1000_set_msglevel(struct net_device *netdev, uint32_t data)
+e1000_set_msglevel(struct net_device *netdev, u32 data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         adapter->msg_enable = data;
@@ -375,7 +375,7 @@ static int
 e1000_get_regs_len(struct net_device *netdev)
 {
 #define E1000_REGS_LEN 32
-        return E1000_REGS_LEN * sizeof(uint32_t);
+        return E1000_REGS_LEN * sizeof(u32);
 }
 
 static void
@@ -384,10 +384,10 @@ e1000_get_regs(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
-        uint32_t *regs_buff = p;
-        uint16_t phy_data;
+        u32 *regs_buff = p;
+        u16 phy_data;
 
-        memset(p, 0, E1000_REGS_LEN * sizeof(uint32_t));
+        memset(p, 0, E1000_REGS_LEN * sizeof(u32));
 
         regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;
 
@@ -412,44 +412,44 @@ e1000_get_regs(struct net_device *netdev,
                                     IGP01E1000_PHY_AGC_A);
                 e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_A &
                                    IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-                regs_buff[13] = (uint32_t)phy_data; /* cable length */
+                regs_buff[13] = (u32)phy_data; /* cable length */
                 e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
                                     IGP01E1000_PHY_AGC_B);
                 e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_B &
                                    IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-                regs_buff[14] = (uint32_t)phy_data; /* cable length */
+                regs_buff[14] = (u32)phy_data; /* cable length */
                 e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
                                     IGP01E1000_PHY_AGC_C);
                 e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_C &
                                    IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-                regs_buff[15] = (uint32_t)phy_data; /* cable length */
+                regs_buff[15] = (u32)phy_data; /* cable length */
                 e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
                                     IGP01E1000_PHY_AGC_D);
                 e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_D &
                                    IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-                regs_buff[16] = (uint32_t)phy_data; /* cable length */
+                regs_buff[16] = (u32)phy_data; /* cable length */
                 regs_buff[17] = 0; /* extended 10bt distance (not needed) */
                 e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
                 e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS &
                                    IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-                regs_buff[18] = (uint32_t)phy_data; /* cable polarity */
+                regs_buff[18] = (u32)phy_data; /* cable polarity */
                 e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
                                     IGP01E1000_PHY_PCS_INIT_REG);
                 e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG &
                                    IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-                regs_buff[19] = (uint32_t)phy_data; /* cable polarity */
+                regs_buff[19] = (u32)phy_data; /* cable polarity */
                 regs_buff[20] = 0; /* polarity correction enabled (always) */
                 regs_buff[22] = 0; /* phy receive errors (unavailable) */
                 regs_buff[23] = regs_buff[18]; /* mdix mode */
                 e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
         } else {
                 e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-                regs_buff[13] = (uint32_t)phy_data; /* cable length */
+                regs_buff[13] = (u32)phy_data; /* cable length */
                 regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
                 regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
                 regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
                 e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-                regs_buff[17] = (uint32_t)phy_data; /* extended 10bt distance */
+                regs_buff[17] = (u32)phy_data; /* extended 10bt distance */
                 regs_buff[18] = regs_buff[13]; /* cable polarity */
                 regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
                 regs_buff[20] = regs_buff[17]; /* polarity correction */
@@ -459,7 +459,7 @@ e1000_get_regs(struct net_device *netdev,
         }
         regs_buff[21] = adapter->phy_stats.idle_errors;  /* phy idle errors */
         e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
-        regs_buff[24] = (uint32_t)phy_data;  /* phy local receiver status */
+        regs_buff[24] = (u32)phy_data;  /* phy local receiver status */
         regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
         if (hw->mac_type >= e1000_82540 &&
             hw->mac_type < e1000_82571 &&
@@ -477,14 +477,14 @@ e1000_get_eeprom_len(struct net_device *netdev)
 
 static int
 e1000_get_eeprom(struct net_device *netdev,
-                      struct ethtool_eeprom *eeprom, uint8_t *bytes)
+                      struct ethtool_eeprom *eeprom, u8 *bytes)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
-        uint16_t *eeprom_buff;
+        u16 *eeprom_buff;
         int first_word, last_word;
         int ret_val = 0;
-        uint16_t i;
+        u16 i;
 
         if (eeprom->len == 0)
                 return -EINVAL;
@@ -494,7 +494,7 @@ e1000_get_eeprom(struct net_device *netdev,
         first_word = eeprom->offset >> 1;
         last_word = (eeprom->offset + eeprom->len - 1) >> 1;
 
-        eeprom_buff = kmalloc(sizeof(uint16_t) *
+        eeprom_buff = kmalloc(sizeof(u16) *
                         (last_word - first_word + 1), GFP_KERNEL);
         if (!eeprom_buff)
                 return -ENOMEM;
@@ -514,7 +514,7 @@ e1000_get_eeprom(struct net_device *netdev,
         for (i = 0; i < last_word - first_word + 1; i++)
                 le16_to_cpus(&eeprom_buff[i]);
 
-        memcpy(bytes, (uint8_t *)eeprom_buff + (eeprom->offset & 1),
+        memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
                         eeprom->len);
         kfree(eeprom_buff);
 
@@ -523,14 +523,14 @@ e1000_get_eeprom(struct net_device *netdev,
 
 static int
 e1000_set_eeprom(struct net_device *netdev,
-                      struct ethtool_eeprom *eeprom, uint8_t *bytes)
+                      struct ethtool_eeprom *eeprom, u8 *bytes)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
-        uint16_t *eeprom_buff;
+        u16 *eeprom_buff;
         void *ptr;
         int max_len, first_word, last_word, ret_val = 0;
-        uint16_t i;
+        u16 i;
 
         if (eeprom->len == 0)
                 return -EOPNOTSUPP;
@@ -590,7 +590,7 @@ e1000_get_drvinfo(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         char firmware_version[32];
-        uint16_t eeprom_data;
+        u16 eeprom_data;
 
         strncpy(drvinfo->driver,  e1000_driver_name, 32);
         strncpy(drvinfo->version, e1000_driver_version, 32);
@@ -674,13 +674,13 @@ e1000_set_ringparam(struct net_device *netdev,
         adapter->tx_ring = txdr;
         adapter->rx_ring = rxdr;
 
-        rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
-        rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
+        rxdr->count = max(ring->rx_pending,(u32)E1000_MIN_RXD);
+        rxdr->count = min(rxdr->count,(u32)(mac_type < e1000_82544 ?
                 E1000_MAX_RXD : E1000_MAX_82544_RXD));
         rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
 
-        txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
-        txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
+        txdr->count = max(ring->tx_pending,(u32)E1000_MIN_TXD);
+        txdr->count = min(txdr->count,(u32)(mac_type < e1000_82544 ?
                 E1000_MAX_TXD : E1000_MAX_82544_TXD));
         txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
 
@@ -728,13 +728,13 @@ err_setup:
         return err;
 }
 
-static bool reg_pattern_test(struct e1000_adapter *adapter, uint64_t *data,
-                             int reg, uint32_t mask, uint32_t write)
+static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
+                             int reg, u32 mask, u32 write)
 {
-        static const uint32_t test[] =
+        static const u32 test[] =
                 {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
-        uint8_t __iomem *address = adapter->hw.hw_addr + reg;
-        uint32_t read;
+        u8 __iomem *address = adapter->hw.hw_addr + reg;
+        u32 read;
         int i;
 
         for (i = 0; i < ARRAY_SIZE(test); i++) {
@@ -751,11 +751,11 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, uint64_t *data,
         return false;
 }
 
-static bool reg_set_and_check(struct e1000_adapter *adapter, uint64_t *data,
-                              int reg, uint32_t mask, uint32_t write)
+static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
+                              int reg, u32 mask, u32 write)
 {
-        uint8_t __iomem *address = adapter->hw.hw_addr + reg;
-        uint32_t read;
+        u8 __iomem *address = adapter->hw.hw_addr + reg;
+        u32 read;
 
         writel(write & mask, address);
         read = readl(address);
@@ -788,10 +788,10 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, uint64_t *data,
         } while (0)
 
 static int
-e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)
+e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
 {
-        uint32_t value, before, after;
-        uint32_t i, toggle;
+        u32 value, before, after;
+        u32 i, toggle;
 
         /* The status register is Read Only, so a write should fail.
          * Some bits that get toggled are ignored.
@@ -884,11 +884,11 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)
 }
 
 static int
-e1000_eeprom_test(struct e1000_adapter *adapter, uint64_t *data)
+e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
 {
-        uint16_t temp;
-        uint16_t checksum = 0;
-        uint16_t i;
+        u16 temp;
+        u16 checksum = 0;
+        u16 i;
 
         *data = 0;
         /* Read and add up the contents of the EEPROM */
@@ -901,7 +901,7 @@ e1000_eeprom_test(struct e1000_adapter *adapter, uint64_t *data)
         }
 
         /* If Checksum is not Correct return error else test passed */
-        if ((checksum != (uint16_t) EEPROM_SUM) && !(*data))
+        if ((checksum != (u16) EEPROM_SUM) && !(*data))
                 *data = 2;
 
         return *data;
@@ -919,11 +919,12 @@ e1000_test_intr(int irq, void *data)
 }
 
 static int
-e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
+e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
 {
         struct net_device *netdev = adapter->netdev;
-        uint32_t mask, i=0, shared_int = TRUE;
-        uint32_t irq = adapter->pdev->irq;
+        u32 mask, i = 0;
+        bool shared_int = true;
+        u32 irq = adapter->pdev->irq;
 
         *data = 0;
 
@@ -931,7 +932,7 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
         /* Hook up test interrupt handler just for this test */
         if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
                          netdev))
-                shared_int = FALSE;
+                shared_int = false;
         else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
                  netdev->name, netdev)) {
                 *data = 1;
@@ -1069,7 +1070,7 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
         struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
         struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
         struct pci_dev *pdev = adapter->pdev;
-        uint32_t rctl;
+        u32 rctl;
         int i, ret_val;
 
         /* Setup Tx descriptor ring and Tx buffers */
@@ -1095,8 +1096,8 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
         txdr->next_to_use = txdr->next_to_clean = 0;
 
         E1000_WRITE_REG(&adapter->hw, TDBAL,
-                        ((uint64_t) txdr->dma & 0x00000000FFFFFFFF));
-        E1000_WRITE_REG(&adapter->hw, TDBAH, ((uint64_t) txdr->dma >> 32));
+                        ((u64) txdr->dma & 0x00000000FFFFFFFF));
+        E1000_WRITE_REG(&adapter->hw, TDBAH, ((u64) txdr->dma >> 32));
         E1000_WRITE_REG(&adapter->hw, TDLEN,
                         txdr->count * sizeof(struct e1000_tx_desc));
         E1000_WRITE_REG(&adapter->hw, TDH, 0);
@@ -1152,8 +1153,8 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
         rctl = E1000_READ_REG(&adapter->hw, RCTL);
         E1000_WRITE_REG(&adapter->hw, RCTL, rctl & ~E1000_RCTL_EN);
         E1000_WRITE_REG(&adapter->hw, RDBAL,
-                        ((uint64_t) rxdr->dma & 0xFFFFFFFF));
-        E1000_WRITE_REG(&adapter->hw, RDBAH, ((uint64_t) rxdr->dma >> 32));
+                        ((u64) rxdr->dma & 0xFFFFFFFF));
+        E1000_WRITE_REG(&adapter->hw, RDBAH, ((u64) rxdr->dma >> 32));
         E1000_WRITE_REG(&adapter->hw, RDLEN, rxdr->size);
         E1000_WRITE_REG(&adapter->hw, RDH, 0);
         E1000_WRITE_REG(&adapter->hw, RDT, 0);
@@ -1201,7 +1202,7 @@ e1000_phy_disable_receiver(struct e1000_adapter *adapter)
 static void
 e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter)
 {
-        uint16_t phy_reg;
+        u16 phy_reg;
 
         /* Because we reset the PHY above, we need to re-force TX_CLK in the
          * Extended PHY Specific Control Register to 25MHz clock.  This
@@ -1225,8 +1226,8 @@ e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter)
 static int
 e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter)
 {
-        uint32_t ctrl_reg;
-        uint16_t phy_reg;
+        u32 ctrl_reg;
+        u16 phy_reg;
 
         /* Setup the Device Control Register for PHY loopback test. */
 
@@ -1292,10 +1293,10 @@ e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter)
 static int
 e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 {
-        uint32_t ctrl_reg = 0;
-        uint32_t stat_reg = 0;
+        u32 ctrl_reg = 0;
+        u32 stat_reg = 0;
 
-        adapter->hw.autoneg = FALSE;
+        adapter->hw.autoneg = false;
 
         if (adapter->hw.phy_type == e1000_phy_m88) {
                 /* Auto-MDI/MDIX Off */
@@ -1362,8 +1363,8 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 static int
 e1000_set_phy_loopback(struct e1000_adapter *adapter)
 {
-        uint16_t phy_reg = 0;
-        uint16_t count = 0;
+        u16 phy_reg = 0;
+        u16 count = 0;
 
         switch (adapter->hw.mac_type) {
         case e1000_82543:
@@ -1415,7 +1416,7 @@ static int
 e1000_setup_loopback_test(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
-        uint32_t rctl;
+        u32 rctl;
 
         if (hw->media_type == e1000_media_type_fiber ||
             hw->media_type == e1000_media_type_internal_serdes) {
@@ -1450,8 +1451,8 @@ static void
 e1000_loopback_cleanup(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
-        uint32_t rctl;
-        uint16_t phy_reg;
+        u32 rctl;
+        u16 phy_reg;
 
         rctl = E1000_READ_REG(hw, RCTL);
         rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
@@ -1473,7 +1474,7 @@ e1000_loopback_cleanup(struct e1000_adapter *adapter)
         case e1000_82545_rev_3:
         case e1000_82546_rev_3:
         default:
-                hw->autoneg = TRUE;
+                hw->autoneg = true;
                 if (hw->phy_type == e1000_phy_gg82563)
                         e1000_write_phy_reg(hw,
                                             GG82563_PHY_KMRN_MODE_CTRL,
@@ -1577,7 +1578,7 @@ e1000_run_loopback_test(struct e1000_adapter *adapter)
 }
 
 static int
-e1000_loopback_test(struct e1000_adapter *adapter, uint64_t *data)
+e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
 {
         /* PHY loopback cannot be performed if SoL/IDER
          * sessions are active */
@@ -1602,18 +1603,18 @@ out:
 }
 
 static int
-e1000_link_test(struct e1000_adapter *adapter, uint64_t *data)
+e1000_link_test(struct e1000_adapter *adapter, u64 *data)
 {
         *data = 0;
         if (adapter->hw.media_type == e1000_media_type_internal_serdes) {
                 int i = 0;
-                adapter->hw.serdes_link_down = TRUE;
+                adapter->hw.serdes_link_down = true;
 
                 /* On some blade server designs, link establishment
                  * could take as long as 2-3 minutes */
                 do {
                         e1000_check_for_link(&adapter->hw);
-                        if (adapter->hw.serdes_link_down == FALSE)
+                        if (!adapter->hw.serdes_link_down)
                                 return *data;
                         msleep(20);
                 } while (i++ < 3750);
@@ -1646,19 +1647,19 @@ e1000_get_sset_count(struct net_device *netdev, int sset)
 
 static void
 e1000_diag_test(struct net_device *netdev,
-                   struct ethtool_test *eth_test, uint64_t *data)
+                   struct ethtool_test *eth_test, u64 *data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        boolean_t if_running = netif_running(netdev);
+        bool if_running = netif_running(netdev);
 
         set_bit(__E1000_TESTING, &adapter->flags);
         if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
                 /* Offline tests */
 
                 /* save speed, duplex, autoneg settings */
-                uint16_t autoneg_advertised = adapter->hw.autoneg_advertised;
-                uint8_t forced_speed_duplex = adapter->hw.forced_speed_duplex;
-                uint8_t autoneg = adapter->hw.autoneg;
+                u16 autoneg_advertised = adapter->hw.autoneg_advertised;
+                u8 forced_speed_duplex = adapter->hw.forced_speed_duplex;
+                u8 autoneg = adapter->hw.autoneg;
 
                 DPRINTK(HW, INFO, "offline testing starting\n");
 
@@ -1876,7 +1877,7 @@ e1000_led_blink_callback(unsigned long data)
 }
 
 static int
-e1000_phys_id(struct net_device *netdev, uint32_t data)
+e1000_phys_id(struct net_device *netdev, u32 data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
@@ -1926,7 +1927,7 @@ e1000_nway_reset(struct net_device *netdev)
 
 static void
 e1000_get_ethtool_stats(struct net_device *netdev,
-                struct ethtool_stats *stats, uint64_t *data)
+                struct ethtool_stats *stats, u64 *data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         int i;
@@ -1935,15 +1936,15 @@ e1000_get_ethtool_stats(struct net_device *netdev,
         for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
                 char *p = (char *)adapter+e1000_gstrings_stats[i].stat_offset;
                 data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
-                        sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
+                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
         }
 /*      BUG_ON(i != E1000_STATS_LEN); */
 }
 
 static void
-e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
+e1000_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 {
-        uint8_t *p = data;
+        u8 *p = data;
         int i;
 
         switch (stringset) {
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 7c6888c58c21..9a4b6cbddf2c 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -33,106 +33,107 @@
 
 #include "e1000_hw.h"
 
-static int32_t e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask);
-static void e1000_swfw_sync_release(struct e1000_hw *hw, uint16_t mask);
-static int32_t e1000_read_kmrn_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *data);
-static int32_t e1000_write_kmrn_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t data);
-static int32_t e1000_get_software_semaphore(struct e1000_hw *hw);
+static s32 e1000_swfw_sync_acquire(struct e1000_hw *hw, u16 mask);
+static void e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask);
+static s32 e1000_read_kmrn_reg(struct e1000_hw *hw, u32 reg_addr, u16 *data);
+static s32 e1000_write_kmrn_reg(struct e1000_hw *hw, u32 reg_addr, u16 data);
+static s32 e1000_get_software_semaphore(struct e1000_hw *hw);
 static void e1000_release_software_semaphore(struct e1000_hw *hw);
 
-static uint8_t e1000_arc_subsystem_valid(struct e1000_hw *hw);
-static int32_t e1000_check_downshift(struct e1000_hw *hw);
-static int32_t e1000_check_polarity(struct e1000_hw *hw, e1000_rev_polarity *polarity);
+static u8 e1000_arc_subsystem_valid(struct e1000_hw *hw);
+static s32 e1000_check_downshift(struct e1000_hw *hw);
+static s32 e1000_check_polarity(struct e1000_hw *hw, e1000_rev_polarity *polarity);
 static void e1000_clear_hw_cntrs(struct e1000_hw *hw);
 static void e1000_clear_vfta(struct e1000_hw *hw);
-static int32_t e1000_commit_shadow_ram(struct e1000_hw *hw);
-static int32_t e1000_config_dsp_after_link_change(struct e1000_hw *hw, boolean_t link_up);
-static int32_t e1000_config_fc_after_link_up(struct e1000_hw *hw);
-static int32_t e1000_detect_gig_phy(struct e1000_hw *hw);
-static int32_t e1000_erase_ich8_4k_segment(struct e1000_hw *hw, uint32_t bank);
-static int32_t e1000_get_auto_rd_done(struct e1000_hw *hw);
-static int32_t e1000_get_cable_length(struct e1000_hw *hw, uint16_t *min_length, uint16_t *max_length);
-static int32_t e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw);
-static int32_t e1000_get_phy_cfg_done(struct e1000_hw *hw);
-static int32_t e1000_get_software_flag(struct e1000_hw *hw);
-static int32_t e1000_ich8_cycle_init(struct e1000_hw *hw);
-static int32_t e1000_ich8_flash_cycle(struct e1000_hw *hw, uint32_t timeout);
-static int32_t e1000_id_led_init(struct e1000_hw *hw);
-static int32_t e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw, uint32_t cnf_base_addr, uint32_t cnf_size);
-static int32_t e1000_init_lcd_from_nvm(struct e1000_hw *hw);
+static s32 e1000_commit_shadow_ram(struct e1000_hw *hw);
+static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw,
+                                                  bool link_up);
+static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw);
+static s32 e1000_detect_gig_phy(struct e1000_hw *hw);
+static s32 e1000_erase_ich8_4k_segment(struct e1000_hw *hw, u32 bank);
+static s32 e1000_get_auto_rd_done(struct e1000_hw *hw);
+static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length, u16 *max_length);
+static s32 e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw);
+static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
+static s32 e1000_get_software_flag(struct e1000_hw *hw);
+static s32 e1000_ich8_cycle_init(struct e1000_hw *hw);
+static s32 e1000_ich8_flash_cycle(struct e1000_hw *hw, u32 timeout);
+static s32 e1000_id_led_init(struct e1000_hw *hw);
+static s32 e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw, u32 cnf_base_addr, u32 cnf_size);
+static s32 e1000_init_lcd_from_nvm(struct e1000_hw *hw);
 static void e1000_init_rx_addrs(struct e1000_hw *hw);
 static void e1000_initialize_hardware_bits(struct e1000_hw *hw);
-static boolean_t e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw);
-static int32_t e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw);
-static int32_t e1000_mng_enable_host_if(struct e1000_hw *hw);
-static int32_t e1000_mng_host_if_write(struct e1000_hw *hw, uint8_t *buffer, uint16_t length, uint16_t offset, uint8_t *sum);
-static int32_t e1000_mng_write_cmd_header(struct e1000_hw* hw, struct e1000_host_mng_command_header* hdr);
-static int32_t e1000_mng_write_commit(struct e1000_hw *hw);
-static int32_t e1000_phy_ife_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-static int32_t e1000_phy_igp_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-static int32_t e1000_read_eeprom_eerd(struct e1000_hw *hw, uint16_t offset, uint16_t words, uint16_t *data);
-static int32_t e1000_write_eeprom_eewr(struct e1000_hw *hw, uint16_t offset, uint16_t words, uint16_t *data);
-static int32_t e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd);
-static int32_t e1000_phy_m88_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
+static bool e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw);
+static s32 e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw);
+static s32 e1000_mng_enable_host_if(struct e1000_hw *hw);
+static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer, u16 length, u16 offset, u8 *sum);
+static s32 e1000_mng_write_cmd_header(struct e1000_hw* hw, struct e1000_host_mng_command_header* hdr);
+static s32 e1000_mng_write_commit(struct e1000_hw *hw);
+static s32 e1000_phy_ife_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
+static s32 e1000_phy_igp_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
+static s32 e1000_read_eeprom_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+static s32 e1000_write_eeprom_eewr(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+static s32 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd);
+static s32 e1000_phy_m88_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
 static void e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw);
-static int32_t e1000_read_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t *data);
-static int32_t e1000_verify_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t byte);
-static int32_t e1000_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t byte);
-static int32_t e1000_read_ich8_word(struct e1000_hw *hw, uint32_t index, uint16_t *data);
-static int32_t e1000_read_ich8_data(struct e1000_hw *hw, uint32_t index, uint32_t size, uint16_t *data);
-static int32_t e1000_write_ich8_data(struct e1000_hw *hw, uint32_t index, uint32_t size, uint16_t data);
-static int32_t e1000_read_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words, uint16_t *data);
-static int32_t e1000_write_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words, uint16_t *data);
+static s32 e1000_read_ich8_byte(struct e1000_hw *hw, u32 index, u8 *data);
+static s32 e1000_verify_write_ich8_byte(struct e1000_hw *hw, u32 index, u8 byte);
+static s32 e1000_write_ich8_byte(struct e1000_hw *hw, u32 index, u8 byte);
+static s32 e1000_read_ich8_word(struct e1000_hw *hw, u32 index, u16 *data);
+static s32 e1000_read_ich8_data(struct e1000_hw *hw, u32 index, u32 size, u16 *data);
+static s32 e1000_write_ich8_data(struct e1000_hw *hw, u32 index, u32 size, u16 data);
+static s32 e1000_read_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+static s32 e1000_write_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 static void e1000_release_software_flag(struct e1000_hw *hw);
-static int32_t e1000_set_d3_lplu_state(struct e1000_hw *hw, boolean_t active);
-static int32_t e1000_set_d0_lplu_state(struct e1000_hw *hw, boolean_t active);
-static int32_t e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, uint32_t no_snoop);
+static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active);
+static s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active);
+static s32 e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, u32 no_snoop);
 static void e1000_set_pci_express_master_disable(struct e1000_hw *hw);
-static int32_t e1000_wait_autoneg(struct e1000_hw *hw);
-static void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset, uint32_t value);
-static int32_t e1000_set_phy_type(struct e1000_hw *hw);
+static s32 e1000_wait_autoneg(struct e1000_hw *hw);
+static void e1000_write_reg_io(struct e1000_hw *hw, u32 offset, u32 value);
+static s32 e1000_set_phy_type(struct e1000_hw *hw);
 static void e1000_phy_init_script(struct e1000_hw *hw);
-static int32_t e1000_setup_copper_link(struct e1000_hw *hw);
-static int32_t e1000_setup_fiber_serdes_link(struct e1000_hw *hw);
-static int32_t e1000_adjust_serdes_amplitude(struct e1000_hw *hw);
-static int32_t e1000_phy_force_speed_duplex(struct e1000_hw *hw);
-static int32_t e1000_config_mac_to_phy(struct e1000_hw *hw);
-static void e1000_raise_mdi_clk(struct e1000_hw *hw, uint32_t *ctrl);
-static void e1000_lower_mdi_clk(struct e1000_hw *hw, uint32_t *ctrl);
-static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, uint32_t data,
-                                     uint16_t count);
-static uint16_t e1000_shift_in_mdi_bits(struct e1000_hw *hw);
-static int32_t e1000_phy_reset_dsp(struct e1000_hw *hw);
-static int32_t e1000_write_eeprom_spi(struct e1000_hw *hw, uint16_t offset,
-                                      uint16_t words, uint16_t *data);
-static int32_t e1000_write_eeprom_microwire(struct e1000_hw *hw,
-                                            uint16_t offset, uint16_t words,
-                                            uint16_t *data);
-static int32_t e1000_spi_eeprom_ready(struct e1000_hw *hw);
-static void e1000_raise_ee_clk(struct e1000_hw *hw, uint32_t *eecd);
-static void e1000_lower_ee_clk(struct e1000_hw *hw, uint32_t *eecd);
-static void e1000_shift_out_ee_bits(struct e1000_hw *hw, uint16_t data,
-                                    uint16_t count);
-static int32_t e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
-                                      uint16_t phy_data);
-static int32_t e1000_read_phy_reg_ex(struct e1000_hw *hw,uint32_t reg_addr,
-                                     uint16_t *phy_data);
-static uint16_t e1000_shift_in_ee_bits(struct e1000_hw *hw, uint16_t count);
-static int32_t e1000_acquire_eeprom(struct e1000_hw *hw);
+static s32 e1000_setup_copper_link(struct e1000_hw *hw);
+static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw);
+static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw);
+static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
+static s32 e1000_config_mac_to_phy(struct e1000_hw *hw);
+static void e1000_raise_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
+static void e1000_lower_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
+static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data,
+                                     u16 count);
+static u16 e1000_shift_in_mdi_bits(struct e1000_hw *hw);
+static s32 e1000_phy_reset_dsp(struct e1000_hw *hw);
+static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset,
+                                      u16 words, u16 *data);
+static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw,
+                                            u16 offset, u16 words,
+                                            u16 *data);
+static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw);
+static void e1000_raise_ee_clk(struct e1000_hw *hw, u32 *eecd);
+static void e1000_lower_ee_clk(struct e1000_hw *hw, u32 *eecd);
+static void e1000_shift_out_ee_bits(struct e1000_hw *hw, u16 data,
+                                    u16 count);
+static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
+                                      u16 phy_data);
+static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw,u32 reg_addr,
+                                     u16 *phy_data);
+static u16 e1000_shift_in_ee_bits(struct e1000_hw *hw, u16 count);
+static s32 e1000_acquire_eeprom(struct e1000_hw *hw);
 static void e1000_release_eeprom(struct e1000_hw *hw);
 static void e1000_standby_eeprom(struct e1000_hw *hw);
-static int32_t e1000_set_vco_speed(struct e1000_hw *hw);
-static int32_t e1000_polarity_reversal_workaround(struct e1000_hw *hw);
-static int32_t e1000_set_phy_mode(struct e1000_hw *hw);
-static int32_t e1000_host_if_read_cookie(struct e1000_hw *hw, uint8_t *buffer);
-static uint8_t e1000_calculate_mng_checksum(char *buffer, uint32_t length);
-static int32_t e1000_configure_kmrn_for_10_100(struct e1000_hw *hw,
-                                               uint16_t duplex);
-static int32_t e1000_configure_kmrn_for_1000(struct e1000_hw *hw);
+static s32 e1000_set_vco_speed(struct e1000_hw *hw);
+static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw);
+static s32 e1000_set_phy_mode(struct e1000_hw *hw);
+static s32 e1000_host_if_read_cookie(struct e1000_hw *hw, u8 *buffer);
+static u8 e1000_calculate_mng_checksum(char *buffer, u32 length);
+static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw,
+                                               u16 duplex);
+static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw);
 
 /* IGP cable length table */
 static const
-uint16_t e1000_igp_cable_length_table[IGP01E1000_AGC_LENGTH_TABLE_SIZE] =
+u16 e1000_igp_cable_length_table[IGP01E1000_AGC_LENGTH_TABLE_SIZE] =
     { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
       5, 10, 10, 10, 10, 10, 10, 10, 20, 20, 20, 20, 20, 25, 25, 25,
       25, 25, 25, 25, 30, 30, 30, 30, 40, 40, 40, 40, 40, 40, 40, 40,
@@ -143,7 +144,7 @@ uint16_t e1000_igp_cable_length_table[IGP01E1000_AGC_LENGTH_TABLE_SIZE] =
       110, 110, 110, 110, 110, 110, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120};
 
 static const
-uint16_t e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] =
+u16 e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] =
     { 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
       0, 0, 0, 3, 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41,
       6, 10, 14, 18, 22, 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61,
@@ -158,7 +159,7 @@ uint16_t e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] =
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static int32_t
+static s32
 e1000_set_phy_type(struct e1000_hw *hw)
 {
     DEBUGFUNC("e1000_set_phy_type");
@@ -212,8 +213,8 @@ e1000_set_phy_type(struct e1000_hw *hw)
 static void
 e1000_phy_init_script(struct e1000_hw *hw)
 {
-    uint32_t ret_val;
-    uint16_t phy_saved_data;
+    u32 ret_val;
+    u16 phy_saved_data;
 
     DEBUGFUNC("e1000_phy_init_script");
 
@@ -271,7 +272,7 @@ e1000_phy_init_script(struct e1000_hw *hw)
         e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
 
         if (hw->mac_type == e1000_82547) {
-            uint16_t fused, fine, coarse;
+            u16 fused, fine, coarse;
 
             /* Move to analog registers page */
             e1000_read_phy_reg(hw, IGP01E1000_ANALOG_SPARE_FUSE_STATUS, &fused);
@@ -305,7 +306,7 @@ e1000_phy_init_script(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_set_mac_type(struct e1000_hw *hw)
 {
         DEBUGFUNC("e1000_set_mac_type");
@@ -425,22 +426,22 @@ e1000_set_mac_type(struct e1000_hw *hw)
 
         switch (hw->mac_type) {
         case e1000_ich8lan:
-                hw->swfwhw_semaphore_present = TRUE;
-                hw->asf_firmware_present = TRUE;
+                hw->swfwhw_semaphore_present = true;
+                hw->asf_firmware_present = true;
                 break;
         case e1000_80003es2lan:
-                hw->swfw_sync_present = TRUE;
+                hw->swfw_sync_present = true;
                 /* fall through */
         case e1000_82571:
         case e1000_82572:
         case e1000_82573:
-                hw->eeprom_semaphore_present = TRUE;
+                hw->eeprom_semaphore_present = true;
                 /* fall through */
         case e1000_82541:
         case e1000_82547:
         case e1000_82541_rev_2:
         case e1000_82547_rev_2:
-                hw->asf_firmware_present = TRUE;
+                hw->asf_firmware_present = true;
                 break;
         default:
                 break;
@@ -450,20 +451,20 @@ e1000_set_mac_type(struct e1000_hw *hw)
          * FD mode
          */
         if (hw->mac_type == e1000_82543)
-                hw->bad_tx_carr_stats_fd = TRUE;
+                hw->bad_tx_carr_stats_fd = true;
 
         /* capable of receiving management packets to the host */
         if (hw->mac_type >= e1000_82571)
-                hw->has_manc2h = TRUE;
+                hw->has_manc2h = true;
 
         /* In rare occasions, ESB2 systems would end up started without
          * the RX unit being turned on.
          */
         if (hw->mac_type == e1000_80003es2lan)
-                hw->rx_needs_kicking = TRUE;
+                hw->rx_needs_kicking = true;
 
         if (hw->mac_type > e1000_82544)
-                hw->has_smbus = TRUE;
+                hw->has_smbus = true;
 
         return E1000_SUCCESS;
 }
@@ -476,13 +477,13 @@ e1000_set_mac_type(struct e1000_hw *hw)
 void
 e1000_set_media_type(struct e1000_hw *hw)
 {
-    uint32_t status;
+    u32 status;
 
     DEBUGFUNC("e1000_set_media_type");
 
     if (hw->mac_type != e1000_82543) {
         /* tbi_compatibility is only valid on 82543 */
-        hw->tbi_compatibility_en = FALSE;
+        hw->tbi_compatibility_en = false;
     }
 
     switch (hw->device_id) {
@@ -513,7 +514,7 @@ e1000_set_media_type(struct e1000_hw *hw)
             if (status & E1000_STATUS_TBIMODE) {
                 hw->media_type = e1000_media_type_fiber;
                 /* tbi_compatibility not valid on fiber */
-                hw->tbi_compatibility_en = FALSE;
+                hw->tbi_compatibility_en = false;
             } else {
                 hw->media_type = e1000_media_type_copper;
             }
@@ -527,17 +528,17 @@ e1000_set_media_type(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_reset_hw(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
-    uint32_t ctrl_ext;
-    uint32_t icr;
-    uint32_t manc;
-    uint32_t led_ctrl;
-    uint32_t timeout;
-    uint32_t extcnf_ctrl;
-    int32_t ret_val;
+    u32 ctrl;
+    u32 ctrl_ext;
+    u32 icr;
+    u32 manc;
+    u32 led_ctrl;
+    u32 timeout;
+    u32 extcnf_ctrl;
+    s32 ret_val;
 
     DEBUGFUNC("e1000_reset_hw");
 
@@ -569,7 +570,7 @@ e1000_reset_hw(struct e1000_hw *hw)
     E1000_WRITE_FLUSH(hw);
 
     /* The tbi_compatibility_on Flag must be cleared when Rctl is cleared. */
-    hw->tbi_compatibility_on = FALSE;
+    hw->tbi_compatibility_on = false;
 
     /* Delay to allow any outstanding PCI transactions to complete before
      * resetting the device
@@ -682,7 +683,7 @@ e1000_reset_hw(struct e1000_hw *hw)
             msleep(20);
             break;
         case e1000_82573:
-            if (e1000_is_onboard_nvm_eeprom(hw) == FALSE) {
+            if (!e1000_is_onboard_nvm_eeprom(hw)) {
                 udelay(10);
                 ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);
                 ctrl_ext |= E1000_CTRL_EXT_EE_RST;
@@ -729,7 +730,7 @@ e1000_reset_hw(struct e1000_hw *hw)
     }
 
     if (hw->mac_type == e1000_ich8lan) {
-        uint32_t kab = E1000_READ_REG(hw, KABGTXD);
+        u32 kab = E1000_READ_REG(hw, KABGTXD);
         kab |= E1000_KABGTXD_BGSQLBIAS;
         E1000_WRITE_REG(hw, KABGTXD, kab);
     }
@@ -751,10 +752,10 @@ e1000_initialize_hardware_bits(struct e1000_hw *hw)
 {
     if ((hw->mac_type >= e1000_82571) && (!hw->initialize_hw_bits_disable)) {
         /* Settings common to all PCI-express silicon */
-        uint32_t reg_ctrl, reg_ctrl_ext;
-        uint32_t reg_tarc0, reg_tarc1;
-        uint32_t reg_tctl;
-        uint32_t reg_txdctl, reg_txdctl1;
+        u32 reg_ctrl, reg_ctrl_ext;
+        u32 reg_tarc0, reg_tarc1;
+        u32 reg_tctl;
+        u32 reg_txdctl, reg_txdctl1;
 
         /* link autonegotiation/sync workarounds */
         reg_tarc0 = E1000_READ_REG(hw, TARC0);
@@ -865,15 +866,15 @@ e1000_initialize_hardware_bits(struct e1000_hw *hw)
  * configuration and flow control settings. Clears all on-chip counters. Leaves
  * the transmit and receive units disabled and uninitialized.
  *****************************************************************************/
-int32_t
+s32
 e1000_init_hw(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
-    uint32_t i;
-    int32_t ret_val;
-    uint32_t mta_size;
-    uint32_t reg_data;
-    uint32_t ctrl_ext;
+    u32 ctrl;
+    u32 i;
+    s32 ret_val;
+    u32 mta_size;
+    u32 reg_data;
+    u32 ctrl_ext;
 
     DEBUGFUNC("e1000_init_hw");
 
@@ -1019,7 +1020,7 @@ e1000_init_hw(struct e1000_hw *hw)
 
 
     if (hw->mac_type == e1000_82573) {
-        uint32_t gcr = E1000_READ_REG(hw, GCR);
+        u32 gcr = E1000_READ_REG(hw, GCR);
         gcr |= E1000_GCR_L1_ACT_WITHOUT_L0S_RX;
         E1000_WRITE_REG(hw, GCR, gcr);
     }
@@ -1053,11 +1054,11 @@ e1000_init_hw(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code.
  *****************************************************************************/
-static int32_t
+static s32
 e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
 {
-    uint16_t eeprom_data;
-    int32_t  ret_val;
+    u16 eeprom_data;
+    s32  ret_val;
 
     DEBUGFUNC("e1000_adjust_serdes_amplitude");
 
@@ -1099,12 +1100,12 @@ e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
  * established. Assumes the hardware has previously been reset and the
  * transmitter and receiver are not enabled.
  *****************************************************************************/
-int32_t
+s32
 e1000_setup_link(struct e1000_hw *hw)
 {
-    uint32_t ctrl_ext;
-    int32_t ret_val;
-    uint16_t eeprom_data;
+    u32 ctrl_ext;
+    s32 ret_val;
+    u16 eeprom_data;
 
     DEBUGFUNC("e1000_setup_link");
 
@@ -1232,15 +1233,15 @@ e1000_setup_link(struct e1000_hw *hw)
  * link. Assumes the hardware has been previously reset and the transmitter
  * and receiver are not enabled.
  *****************************************************************************/
-static int32_t
+static s32
 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
-    uint32_t status;
-    uint32_t txcw = 0;
-    uint32_t i;
-    uint32_t signal = 0;
-    int32_t ret_val;
+    u32 ctrl;
+    u32 status;
+    u32 txcw = 0;
+    u32 i;
+    u32 signal = 0;
+    s32 ret_val;
 
     DEBUGFUNC("e1000_setup_fiber_serdes_link");
 
@@ -1379,12 +1380,12 @@ e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_copper_link_preconfig(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
-    int32_t ret_val;
-    uint16_t phy_data;
+    u32 ctrl;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_copper_link_preconfig");
 
@@ -1428,7 +1429,7 @@ e1000_copper_link_preconfig(struct e1000_hw *hw)
     if (hw->mac_type <= e1000_82543 ||
         hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547 ||
         hw->mac_type == e1000_82541_rev_2 || hw->mac_type == e1000_82547_rev_2)
-        hw->phy_reset_disable = FALSE;
+        hw->phy_reset_disable = false;
 
    return E1000_SUCCESS;
 }
@@ -1439,12 +1440,12 @@ e1000_copper_link_preconfig(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 *********************************************************************/
-static int32_t
+static s32
 e1000_copper_link_igp_setup(struct e1000_hw *hw)
 {
-    uint32_t led_ctrl;
-    int32_t ret_val;
-    uint16_t phy_data;
+    u32 led_ctrl;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_copper_link_igp_setup");
 
@@ -1470,7 +1471,7 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
     /* The NVM settings will configure LPLU in D3 for IGP2 and IGP3 PHYs */
     if (hw->phy_type == e1000_phy_igp) {
         /* disable lplu d3 during driver init */
-        ret_val = e1000_set_d3_lplu_state(hw, FALSE);
+        ret_val = e1000_set_d3_lplu_state(hw, false);
         if (ret_val) {
             DEBUGOUT("Error Disabling LPLU D3\n");
             return ret_val;
@@ -1478,7 +1479,7 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
     }
 
     /* disable lplu d0 during driver init */
-    ret_val = e1000_set_d0_lplu_state(hw, FALSE);
+    ret_val = e1000_set_d0_lplu_state(hw, false);
     if (ret_val) {
         DEBUGOUT("Error Disabling LPLU D0\n");
         return ret_val;
@@ -1586,12 +1587,12 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 *********************************************************************/
-static int32_t
+static s32
 e1000_copper_link_ggp_setup(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
-    uint32_t reg_data;
+    s32 ret_val;
+    u16 phy_data;
+    u32 reg_data;
 
     DEBUGFUNC("e1000_copper_link_ggp_setup");
 
@@ -1691,7 +1692,7 @@ e1000_copper_link_ggp_setup(struct e1000_hw *hw)
          * firmware will have already initialized them.  We only initialize
          * them if the HW is not in IAMT mode.
          */
-        if (e1000_check_mng_mode(hw) == FALSE) {
+        if (!e1000_check_mng_mode(hw)) {
             /* Enable Electrical Idle on the PHY */
             phy_data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE;
             ret_val = e1000_write_phy_reg(hw, GG82563_PHY_PWR_MGMT_CTRL,
@@ -1734,11 +1735,11 @@ e1000_copper_link_ggp_setup(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 *********************************************************************/
-static int32_t
+static s32
 e1000_copper_link_mgp_setup(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_copper_link_mgp_setup");
 
@@ -1838,11 +1839,11 @@ e1000_copper_link_mgp_setup(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 *********************************************************************/
-static int32_t
+static s32
 e1000_copper_link_autoneg(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_copper_link_autoneg");
 
@@ -1892,7 +1893,7 @@ e1000_copper_link_autoneg(struct e1000_hw *hw)
         }
     }
 
-    hw->get_link_status = TRUE;
+    hw->get_link_status = true;
 
     return E1000_SUCCESS;
 }
@@ -1909,10 +1910,10 @@ e1000_copper_link_autoneg(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_copper_link_postconfig(struct e1000_hw *hw)
 {
-    int32_t ret_val;
+    s32 ret_val;
     DEBUGFUNC("e1000_copper_link_postconfig");
 
     if (hw->mac_type >= e1000_82544) {
@@ -1932,7 +1933,7 @@ e1000_copper_link_postconfig(struct e1000_hw *hw)
 
     /* Config DSP to improve Giga link quality */
     if (hw->phy_type == e1000_phy_igp) {
-        ret_val = e1000_config_dsp_after_link_change(hw, TRUE);
+        ret_val = e1000_config_dsp_after_link_change(hw, true);
         if (ret_val) {
             DEBUGOUT("Error Configuring DSP after link up\n");
             return ret_val;
@@ -1947,13 +1948,13 @@ e1000_copper_link_postconfig(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_setup_copper_link(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t i;
-    uint16_t phy_data;
-    uint16_t reg_data;
+    s32 ret_val;
+    u16 i;
+    u16 phy_data;
+    u16 reg_data;
 
     DEBUGFUNC("e1000_setup_copper_link");
 
@@ -2061,12 +2062,12 @@ e1000_setup_copper_link(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
-e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, uint16_t duplex)
+static s32
+e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex)
 {
-    int32_t ret_val = E1000_SUCCESS;
-    uint32_t tipg;
-    uint16_t reg_data;
+    s32 ret_val = E1000_SUCCESS;
+    u32 tipg;
+    u16 reg_data;
 
     DEBUGFUNC("e1000_configure_kmrn_for_10_100");
 
@@ -2097,12 +2098,12 @@ e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, uint16_t duplex)
     return ret_val;
 }
 
-static int32_t
+static s32
 e1000_configure_kmrn_for_1000(struct e1000_hw *hw)
 {
-    int32_t ret_val = E1000_SUCCESS;
-    uint16_t reg_data;
-    uint32_t tipg;
+    s32 ret_val = E1000_SUCCESS;
+    u16 reg_data;
+    u32 tipg;
 
     DEBUGFUNC("e1000_configure_kmrn_for_1000");
 
@@ -2134,12 +2135,12 @@ e1000_configure_kmrn_for_1000(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-int32_t
+s32
 e1000_phy_setup_autoneg(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t mii_autoneg_adv_reg;
-    uint16_t mii_1000t_ctrl_reg;
+    s32 ret_val;
+    u16 mii_autoneg_adv_reg;
+    u16 mii_1000t_ctrl_reg;
 
     DEBUGFUNC("e1000_phy_setup_autoneg");
 
@@ -2283,15 +2284,15 @@ e1000_phy_setup_autoneg(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
-    int32_t ret_val;
-    uint16_t mii_ctrl_reg;
-    uint16_t mii_status_reg;
-    uint16_t phy_data;
-    uint16_t i;
+    u32 ctrl;
+    s32 ret_val;
+    u16 mii_ctrl_reg;
+    u16 mii_status_reg;
+    u16 phy_data;
+    u16 i;
 
     DEBUGFUNC("e1000_phy_force_speed_duplex");
 
@@ -2537,7 +2538,7 @@ e1000_phy_force_speed_duplex(struct e1000_hw *hw)
 void
 e1000_config_collision_dist(struct e1000_hw *hw)
 {
-    uint32_t tctl, coll_dist;
+    u32 tctl, coll_dist;
 
     DEBUGFUNC("e1000_config_collision_dist");
 
@@ -2564,12 +2565,12 @@ e1000_config_collision_dist(struct e1000_hw *hw)
 * The contents of the PHY register containing the needed information need to
 * be passed in.
 ******************************************************************************/
-static int32_t
+static s32
 e1000_config_mac_to_phy(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
-    int32_t ret_val;
-    uint16_t phy_data;
+    u32 ctrl;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_config_mac_to_phy");
 
@@ -2623,10 +2624,10 @@ e1000_config_mac_to_phy(struct e1000_hw *hw)
  * by the PHY rather than the MAC. Software must also configure these
  * bits when link is forced on a fiber connection.
  *****************************************************************************/
-int32_t
+s32
 e1000_force_mac_fc(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
+    u32 ctrl;
 
     DEBUGFUNC("e1000_force_mac_fc");
 
@@ -2690,15 +2691,15 @@ e1000_force_mac_fc(struct e1000_hw *hw)
  * based on the flow control negotiated by the PHY. In TBI mode, the TFCE
  * and RFCE bits will be automaticaly set to the negotiated flow control mode.
  *****************************************************************************/
-static int32_t
+static s32
 e1000_config_fc_after_link_up(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t mii_status_reg;
-    uint16_t mii_nway_adv_reg;
-    uint16_t mii_nway_lp_ability_reg;
-    uint16_t speed;
-    uint16_t duplex;
+    s32 ret_val;
+    u16 mii_status_reg;
+    u16 mii_nway_adv_reg;
+    u16 mii_nway_lp_ability_reg;
+    u16 speed;
+    u16 duplex;
 
     DEBUGFUNC("e1000_config_fc_after_link_up");
 
@@ -2895,17 +2896,17 @@ e1000_config_fc_after_link_up(struct e1000_hw *hw)
  *
  * Called by any function that needs to check the link status of the adapter.
  *****************************************************************************/
-int32_t
+s32
 e1000_check_for_link(struct e1000_hw *hw)
 {
-    uint32_t rxcw = 0;
-    uint32_t ctrl;
-    uint32_t status;
-    uint32_t rctl;
-    uint32_t icr;
-    uint32_t signal = 0;
-    int32_t ret_val;
-    uint16_t phy_data;
+    u32 rxcw = 0;
+    u32 ctrl;
+    u32 status;
+    u32 rctl;
+    u32 icr;
+    u32 signal = 0;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_check_for_link");
 
@@ -2923,7 +2924,7 @@ e1000_check_for_link(struct e1000_hw *hw)
         if (hw->media_type == e1000_media_type_fiber) {
             signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
             if (status & E1000_STATUS_LU)
-                hw->get_link_status = FALSE;
+                hw->get_link_status = false;
         }
     }
 
@@ -2947,7 +2948,7 @@ e1000_check_for_link(struct e1000_hw *hw)
             return ret_val;
 
         if (phy_data & MII_SR_LINK_STATUS) {
-            hw->get_link_status = FALSE;
+            hw->get_link_status = false;
             /* Check if there was DownShift, must be checked immediately after
              * link-up */
             e1000_check_downshift(hw);
@@ -2973,7 +2974,7 @@ e1000_check_for_link(struct e1000_hw *hw)
 
         } else {
             /* No link detected */
-            e1000_config_dsp_after_link_change(hw, FALSE);
+            e1000_config_dsp_after_link_change(hw, false);
             return 0;
         }
 
@@ -2983,7 +2984,7 @@ e1000_check_for_link(struct e1000_hw *hw)
         if (!hw->autoneg) return -E1000_ERR_CONFIG;
 
         /* optimize the dsp settings for the igp phy */
-        e1000_config_dsp_after_link_change(hw, TRUE);
+        e1000_config_dsp_after_link_change(hw, true);
 
         /* We have a M88E1000 PHY and Auto-Neg is enabled.  If we
          * have Si on board that is 82544 or newer, Auto
@@ -3021,7 +3022,7 @@ e1000_check_for_link(struct e1000_hw *hw)
          * at gigabit speed, we turn on TBI compatibility.
          */
         if (hw->tbi_compatibility_en) {
-            uint16_t speed, duplex;
+            u16 speed, duplex;
             ret_val = e1000_get_speed_and_duplex(hw, &speed, &duplex);
             if (ret_val) {
                 DEBUGOUT("Error getting link speed and duplex\n");
@@ -3036,7 +3037,7 @@ e1000_check_for_link(struct e1000_hw *hw)
                     rctl = E1000_READ_REG(hw, RCTL);
                     rctl &= ~E1000_RCTL_SBP;
                     E1000_WRITE_REG(hw, RCTL, rctl);
-                    hw->tbi_compatibility_on = FALSE;
+                    hw->tbi_compatibility_on = false;
                 }
             } else {
                 /* If TBI compatibility is was previously off, turn it on. For
@@ -3045,7 +3046,7 @@ e1000_check_for_link(struct e1000_hw *hw)
                  * will look like CRC errors to to the hardware.
                  */
                 if (!hw->tbi_compatibility_on) {
-                    hw->tbi_compatibility_on = TRUE;
+                    hw->tbi_compatibility_on = true;
                     rctl = E1000_READ_REG(hw, RCTL);
                     rctl |= E1000_RCTL_SBP;
                     E1000_WRITE_REG(hw, RCTL, rctl);
@@ -3098,7 +3099,7 @@ e1000_check_for_link(struct e1000_hw *hw)
         E1000_WRITE_REG(hw, TXCW, hw->txcw);
         E1000_WRITE_REG(hw, CTRL, (ctrl & ~E1000_CTRL_SLU));
 
-        hw->serdes_link_down = FALSE;
+        hw->serdes_link_down = false;
     }
     /* If we force link for non-auto-negotiation switch, check link status
      * based on MAC synchronization for internal serdes media type.
@@ -3109,11 +3110,11 @@ e1000_check_for_link(struct e1000_hw *hw)
         udelay(10);
         if (E1000_RXCW_SYNCH & E1000_READ_REG(hw, RXCW)) {
             if (!(rxcw & E1000_RXCW_IV)) {
-                hw->serdes_link_down = FALSE;
+                hw->serdes_link_down = false;
                 DEBUGOUT("SERDES: Link is up.\n");
             }
         } else {
-            hw->serdes_link_down = TRUE;
+            hw->serdes_link_down = true;
             DEBUGOUT("SERDES: Link is down.\n");
         }
     }
@@ -3131,14 +3132,14 @@ e1000_check_for_link(struct e1000_hw *hw)
  * speed - Speed of the connection
  * duplex - Duplex setting of the connection
  *****************************************************************************/
-int32_t
+s32
 e1000_get_speed_and_duplex(struct e1000_hw *hw,
-                           uint16_t *speed,
-                           uint16_t *duplex)
+                           u16 *speed,
+                           u16 *duplex)
 {
-    uint32_t status;
-    int32_t ret_val;
-    uint16_t phy_data;
+    u32 status;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_get_speed_and_duplex");
 
@@ -3213,12 +3214,12 @@ e1000_get_speed_and_duplex(struct e1000_hw *hw,
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_wait_autoneg(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t i;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 i;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_wait_autoneg");
     DEBUGOUT("Waiting for Auto-Neg to complete.\n");
@@ -3250,7 +3251,7 @@ e1000_wait_autoneg(struct e1000_hw *hw)
 ******************************************************************************/
 static void
 e1000_raise_mdi_clk(struct e1000_hw *hw,
-                    uint32_t *ctrl)
+                    u32 *ctrl)
 {
     /* Raise the clock input to the Management Data Clock (by setting the MDC
      * bit), and then delay 10 microseconds.
@@ -3268,7 +3269,7 @@ e1000_raise_mdi_clk(struct e1000_hw *hw,
 ******************************************************************************/
 static void
 e1000_lower_mdi_clk(struct e1000_hw *hw,
-                    uint32_t *ctrl)
+                    u32 *ctrl)
 {
     /* Lower the clock input to the Management Data Clock (by clearing the MDC
      * bit), and then delay 10 microseconds.
@@ -3289,11 +3290,11 @@ e1000_lower_mdi_clk(struct e1000_hw *hw,
 ******************************************************************************/
 static void
 e1000_shift_out_mdi_bits(struct e1000_hw *hw,
-                         uint32_t data,
-                         uint16_t count)
+                         u32 data,
+                         u16 count)
 {
-    uint32_t ctrl;
-    uint32_t mask;
+    u32 ctrl;
+    u32 mask;
 
     /* We need to shift "count" number of bits out to the PHY. So, the value
      * in the "data" parameter will be shifted out to the PHY one bit at a
@@ -3337,12 +3338,12 @@ e1000_shift_out_mdi_bits(struct e1000_hw *hw,
 *
 * Bits are shifted in in MSB to LSB order.
 ******************************************************************************/
-static uint16_t
+static u16
 e1000_shift_in_mdi_bits(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
-    uint16_t data = 0;
-    uint8_t i;
+    u32 ctrl;
+    u16 data = 0;
+    u8 i;
 
     /* In order to read a register from the PHY, we need to shift in a total
      * of 18 bits from the PHY. The first two bit (turnaround) times are used
@@ -3383,13 +3384,13 @@ e1000_shift_in_mdi_bits(struct e1000_hw *hw)
     return data;
 }
 
-static int32_t
-e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask)
+static s32
+e1000_swfw_sync_acquire(struct e1000_hw *hw, u16 mask)
 {
-    uint32_t swfw_sync = 0;
-    uint32_t swmask = mask;
-    uint32_t fwmask = mask << 16;
-    int32_t timeout = 200;
+    u32 swfw_sync = 0;
+    u32 swmask = mask;
+    u32 fwmask = mask << 16;
+    s32 timeout = 200;
 
     DEBUGFUNC("e1000_swfw_sync_acquire");
 
@@ -3428,10 +3429,10 @@ e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask)
 }
 
 static void
-e1000_swfw_sync_release(struct e1000_hw *hw, uint16_t mask)
+e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask)
 {
-    uint32_t swfw_sync;
-    uint32_t swmask = mask;
+    u32 swfw_sync;
+    u32 swmask = mask;
 
     DEBUGFUNC("e1000_swfw_sync_release");
 
@@ -3463,13 +3464,13 @@ e1000_swfw_sync_release(struct e1000_hw *hw, uint16_t mask)
 * hw - Struct containing variables accessed by shared code
 * reg_addr - address of the PHY register to read
 ******************************************************************************/
-int32_t
+s32
 e1000_read_phy_reg(struct e1000_hw *hw,
-                   uint32_t reg_addr,
-                   uint16_t *phy_data)
+                   u32 reg_addr,
+                   u16 *phy_data)
 {
-    uint32_t ret_val;
-    uint16_t swfw;
+    u32 ret_val;
+    u16 swfw;
 
     DEBUGFUNC("e1000_read_phy_reg");
 
@@ -3487,7 +3488,7 @@ e1000_read_phy_reg(struct e1000_hw *hw,
         hw->phy_type == e1000_phy_igp_2) &&
        (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
         ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                         (uint16_t)reg_addr);
+                                         (u16)reg_addr);
         if (ret_val) {
             e1000_swfw_sync_release(hw, swfw);
             return ret_val;
@@ -3498,14 +3499,14 @@ e1000_read_phy_reg(struct e1000_hw *hw,
             /* Select Configuration Page */
             if ((reg_addr & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
                 ret_val = e1000_write_phy_reg_ex(hw, GG82563_PHY_PAGE_SELECT,
-                          (uint16_t)((uint16_t)reg_addr >> GG82563_PAGE_SHIFT));
+                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
             } else {
                 /* Use Alternative Page Select register to access
                  * registers 30 and 31
                  */
                 ret_val = e1000_write_phy_reg_ex(hw,
                                                  GG82563_PHY_PAGE_SELECT_ALT,
-                          (uint16_t)((uint16_t)reg_addr >> GG82563_PAGE_SHIFT));
+                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
             }
 
             if (ret_val) {
@@ -3522,13 +3523,13 @@ e1000_read_phy_reg(struct e1000_hw *hw,
     return ret_val;
 }
 
-static int32_t
-e1000_read_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
-                      uint16_t *phy_data)
+static s32
+e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
+                      u16 *phy_data)
 {
-    uint32_t i;
-    uint32_t mdic = 0;
-    const uint32_t phy_addr = 1;
+    u32 i;
+    u32 mdic = 0;
+    const u32 phy_addr = 1;
 
     DEBUGFUNC("e1000_read_phy_reg_ex");
 
@@ -3562,7 +3563,7 @@ e1000_read_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
             DEBUGOUT("MDI Error\n");
             return -E1000_ERR_PHY;
         }
-        *phy_data = (uint16_t) mdic;
+        *phy_data = (u16) mdic;
     } else {
         /* We must first send a preamble through the MDIO pin to signal the
          * beginning of an MII instruction.  This is done by sending 32
@@ -3602,12 +3603,12 @@ e1000_read_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
 * reg_addr - address of the PHY register to write
 * data - data to write to the PHY
 ******************************************************************************/
-int32_t
-e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr,
-                    uint16_t phy_data)
+s32
+e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr,
+                    u16 phy_data)
 {
-    uint32_t ret_val;
-    uint16_t swfw;
+    u32 ret_val;
+    u16 swfw;
 
     DEBUGFUNC("e1000_write_phy_reg");
 
@@ -3625,7 +3626,7 @@ e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr,
         hw->phy_type == e1000_phy_igp_2) &&
        (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
         ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                         (uint16_t)reg_addr);
+                                         (u16)reg_addr);
         if (ret_val) {
             e1000_swfw_sync_release(hw, swfw);
             return ret_val;
@@ -3636,14 +3637,14 @@ e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr,
             /* Select Configuration Page */
             if ((reg_addr & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
                 ret_val = e1000_write_phy_reg_ex(hw, GG82563_PHY_PAGE_SELECT,
-                          (uint16_t)((uint16_t)reg_addr >> GG82563_PAGE_SHIFT));
+                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
             } else {
                 /* Use Alternative Page Select register to access
                  * registers 30 and 31
                  */
                 ret_val = e1000_write_phy_reg_ex(hw,
                                                  GG82563_PHY_PAGE_SELECT_ALT,
-                          (uint16_t)((uint16_t)reg_addr >> GG82563_PAGE_SHIFT));
+                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
             }
 
             if (ret_val) {
@@ -3660,13 +3661,13 @@ e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr,
     return ret_val;
 }
 
-static int32_t
-e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
-                       uint16_t phy_data)
+static s32
+e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
+                       u16 phy_data)
 {
-    uint32_t i;
-    uint32_t mdic = 0;
-    const uint32_t phy_addr = 1;
+    u32 i;
+    u32 mdic = 0;
+    const u32 phy_addr = 1;
 
     DEBUGFUNC("e1000_write_phy_reg_ex");
 
@@ -3680,7 +3681,7 @@ e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
          * for the PHY register in the MDI Control register.  The MAC will take
          * care of interfacing with the PHY to send the desired data.
          */
-        mdic = (((uint32_t) phy_data) |
+        mdic = (((u32) phy_data) |
                 (reg_addr << E1000_MDIC_REG_SHIFT) |
                 (phy_addr << E1000_MDIC_PHY_SHIFT) |
                 (E1000_MDIC_OP_WRITE));
@@ -3714,7 +3715,7 @@ e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
         mdic = ((PHY_TURNAROUND) | (reg_addr << 2) | (phy_addr << 7) |
                 (PHY_OP_WRITE << 12) | (PHY_SOF << 14));
         mdic <<= 16;
-        mdic |= (uint32_t) phy_data;
+        mdic |= (u32) phy_data;
 
         e1000_shift_out_mdi_bits(hw, mdic, 32);
     }
@@ -3722,13 +3723,13 @@ e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
     return E1000_SUCCESS;
 }
 
-static int32_t
+static s32
 e1000_read_kmrn_reg(struct e1000_hw *hw,
-                    uint32_t reg_addr,
-                    uint16_t *data)
+                    u32 reg_addr,
+                    u16 *data)
 {
-    uint32_t reg_val;
-    uint16_t swfw;
+    u32 reg_val;
+    u16 swfw;
     DEBUGFUNC("e1000_read_kmrn_reg");
 
     if ((hw->mac_type == e1000_80003es2lan) &&
@@ -3749,19 +3750,19 @@ e1000_read_kmrn_reg(struct e1000_hw *hw,
 
     /* Read the data returned */
     reg_val = E1000_READ_REG(hw, KUMCTRLSTA);
-    *data = (uint16_t)reg_val;
+    *data = (u16)reg_val;
 
     e1000_swfw_sync_release(hw, swfw);
     return E1000_SUCCESS;
 }
 
-static int32_t
+static s32
 e1000_write_kmrn_reg(struct e1000_hw *hw,
-                     uint32_t reg_addr,
-                     uint16_t data)
+                     u32 reg_addr,
+                     u16 data)
 {
-    uint32_t reg_val;
-    uint16_t swfw;
+    u32 reg_val;
+    u16 swfw;
     DEBUGFUNC("e1000_write_kmrn_reg");
 
     if ((hw->mac_type == e1000_80003es2lan) &&
@@ -3787,13 +3788,13 @@ e1000_write_kmrn_reg(struct e1000_hw *hw,
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-int32_t
+s32
 e1000_phy_hw_reset(struct e1000_hw *hw)
 {
-    uint32_t ctrl, ctrl_ext;
-    uint32_t led_ctrl;
-    int32_t ret_val;
-    uint16_t swfw;
+    u32 ctrl, ctrl_ext;
+    u32 led_ctrl;
+    s32 ret_val;
+    u16 swfw;
 
     DEBUGFUNC("e1000_phy_hw_reset");
 
@@ -3881,11 +3882,11 @@ e1000_phy_hw_reset(struct e1000_hw *hw)
 *
 * Sets bit 15 of the MII Control register
 ******************************************************************************/
-int32_t
+s32
 e1000_phy_reset(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_phy_reset");
 
@@ -3936,9 +3937,9 @@ e1000_phy_reset(struct e1000_hw *hw)
 void
 e1000_phy_powerdown_workaround(struct e1000_hw *hw)
 {
-    int32_t reg;
-    uint16_t phy_data;
-    int32_t retry = 0;
+    s32 reg;
+    u16 phy_data;
+    s32 retry = 0;
 
     DEBUGFUNC("e1000_phy_powerdown_workaround");
 
@@ -3986,13 +3987,13 @@ e1000_phy_powerdown_workaround(struct e1000_hw *hw)
 *
 * hw - struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    int32_t reg;
-    int32_t cnt;
-    uint16_t phy_data;
+    s32 ret_val;
+    s32 reg;
+    s32 cnt;
+    u16 phy_data;
 
     if (hw->kmrn_lock_loss_workaround_disabled)
         return E1000_SUCCESS;
@@ -4039,12 +4040,12 @@ e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_detect_gig_phy(struct e1000_hw *hw)
 {
-    int32_t phy_init_status, ret_val;
-    uint16_t phy_id_high, phy_id_low;
-    boolean_t match = FALSE;
+    s32 phy_init_status, ret_val;
+    u16 phy_id_high, phy_id_low;
+    bool match = false;
 
     DEBUGFUNC("e1000_detect_gig_phy");
 
@@ -4075,46 +4076,46 @@ e1000_detect_gig_phy(struct e1000_hw *hw)
     if (ret_val)
         return ret_val;
 
-    hw->phy_id = (uint32_t) (phy_id_high << 16);
+    hw->phy_id = (u32) (phy_id_high << 16);
     udelay(20);
     ret_val = e1000_read_phy_reg(hw, PHY_ID2, &phy_id_low);
     if (ret_val)
         return ret_val;
 
-    hw->phy_id |= (uint32_t) (phy_id_low & PHY_REVISION_MASK);
-    hw->phy_revision = (uint32_t) phy_id_low & ~PHY_REVISION_MASK;
+    hw->phy_id |= (u32) (phy_id_low & PHY_REVISION_MASK);
+    hw->phy_revision = (u32) phy_id_low & ~PHY_REVISION_MASK;
 
     switch (hw->mac_type) {
     case e1000_82543:
-        if (hw->phy_id == M88E1000_E_PHY_ID) match = TRUE;
+        if (hw->phy_id == M88E1000_E_PHY_ID) match = true;
         break;
     case e1000_82544:
-        if (hw->phy_id == M88E1000_I_PHY_ID) match = TRUE;
+        if (hw->phy_id == M88E1000_I_PHY_ID) match = true;
         break;
     case e1000_82540:
     case e1000_82545:
     case e1000_82545_rev_3:
     case e1000_82546:
     case e1000_82546_rev_3:
-        if (hw->phy_id == M88E1011_I_PHY_ID) match = TRUE;
+        if (hw->phy_id == M88E1011_I_PHY_ID) match = true;
         break;
     case e1000_82541:
     case e1000_82541_rev_2:
     case e1000_82547:
     case e1000_82547_rev_2:
-        if (hw->phy_id == IGP01E1000_I_PHY_ID) match = TRUE;
+        if (hw->phy_id == IGP01E1000_I_PHY_ID) match = true;
         break;
     case e1000_82573:
-        if (hw->phy_id == M88E1111_I_PHY_ID) match = TRUE;
+        if (hw->phy_id == M88E1111_I_PHY_ID) match = true;
         break;
     case e1000_80003es2lan:
-        if (hw->phy_id == GG82563_E_PHY_ID) match = TRUE;
+        if (hw->phy_id == GG82563_E_PHY_ID) match = true;
         break;
     case e1000_ich8lan:
-        if (hw->phy_id == IGP03E1000_E_PHY_ID) match = TRUE;
-        if (hw->phy_id == IFE_E_PHY_ID) match = TRUE;
-        if (hw->phy_id == IFE_PLUS_E_PHY_ID) match = TRUE;
-        if (hw->phy_id == IFE_C_E_PHY_ID) match = TRUE;
+        if (hw->phy_id == IGP03E1000_E_PHY_ID) match = true;
+        if (hw->phy_id == IFE_E_PHY_ID) match = true;
+        if (hw->phy_id == IFE_PLUS_E_PHY_ID) match = true;
+        if (hw->phy_id == IFE_C_E_PHY_ID) match = true;
         break;
     default:
         DEBUGOUT1("Invalid MAC type %d\n", hw->mac_type);
@@ -4135,10 +4136,10 @@ e1000_detect_gig_phy(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-static int32_t
+static s32
 e1000_phy_reset_dsp(struct e1000_hw *hw)
 {
-    int32_t ret_val;
+    s32 ret_val;
     DEBUGFUNC("e1000_phy_reset_dsp");
 
     do {
@@ -4162,12 +4163,12 @@ e1000_phy_reset_dsp(struct e1000_hw *hw)
 * hw - Struct containing variables accessed by shared code
 * phy_info - PHY information structure
 ******************************************************************************/
-static int32_t
+static s32
 e1000_phy_igp_get_info(struct e1000_hw *hw,
                        struct e1000_phy_info *phy_info)
 {
-    int32_t ret_val;
-    uint16_t phy_data, min_length, max_length, average;
+    s32 ret_val;
+    u16 phy_data, min_length, max_length, average;
     e1000_rev_polarity polarity;
 
     DEBUGFUNC("e1000_phy_igp_get_info");
@@ -4239,12 +4240,12 @@ e1000_phy_igp_get_info(struct e1000_hw *hw,
 * hw - Struct containing variables accessed by shared code
 * phy_info - PHY information structure
 ******************************************************************************/
-static int32_t
+static s32
 e1000_phy_ife_get_info(struct e1000_hw *hw,
                        struct e1000_phy_info *phy_info)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
     e1000_rev_polarity polarity;
 
     DEBUGFUNC("e1000_phy_ife_get_info");
@@ -4289,12 +4290,12 @@ e1000_phy_ife_get_info(struct e1000_hw *hw,
 * hw - Struct containing variables accessed by shared code
 * phy_info - PHY information structure
 ******************************************************************************/
-static int32_t
+static s32
 e1000_phy_m88_get_info(struct e1000_hw *hw,
                        struct e1000_phy_info *phy_info)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
     e1000_rev_polarity polarity;
 
     DEBUGFUNC("e1000_phy_m88_get_info");
@@ -4368,12 +4369,12 @@ e1000_phy_m88_get_info(struct e1000_hw *hw,
 * hw - Struct containing variables accessed by shared code
 * phy_info - PHY information structure
 ******************************************************************************/
-int32_t
+s32
 e1000_phy_get_info(struct e1000_hw *hw,
                    struct e1000_phy_info *phy_info)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_phy_get_info");
 
@@ -4414,7 +4415,7 @@ e1000_phy_get_info(struct e1000_hw *hw,
         return e1000_phy_m88_get_info(hw, phy_info);
 }
 
-int32_t
+s32
 e1000_validate_mdi_setting(struct e1000_hw *hw)
 {
     DEBUGFUNC("e1000_validate_mdi_settings");
@@ -4435,13 +4436,13 @@ e1000_validate_mdi_setting(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_init_eeprom_params(struct e1000_hw *hw)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    uint32_t eecd = E1000_READ_REG(hw, EECD);
-    int32_t ret_val = E1000_SUCCESS;
-    uint16_t eeprom_size;
+    u32 eecd = E1000_READ_REG(hw, EECD);
+    s32 ret_val = E1000_SUCCESS;
+    u16 eeprom_size;
 
     DEBUGFUNC("e1000_init_eeprom_params");
 
@@ -4455,8 +4456,8 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
         eeprom->opcode_bits = 3;
         eeprom->address_bits = 6;
         eeprom->delay_usec = 50;
-        eeprom->use_eerd = FALSE;
-        eeprom->use_eewr = FALSE;
+        eeprom->use_eerd = false;
+        eeprom->use_eewr = false;
         break;
     case e1000_82540:
     case e1000_82545:
@@ -4473,8 +4474,8 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
             eeprom->word_size = 64;
             eeprom->address_bits = 6;
         }
-        eeprom->use_eerd = FALSE;
-        eeprom->use_eewr = FALSE;
+        eeprom->use_eerd = false;
+        eeprom->use_eewr = false;
         break;
     case e1000_82541:
     case e1000_82541_rev_2:
@@ -4503,8 +4504,8 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
                 eeprom->address_bits = 6;
             }
         }
-        eeprom->use_eerd = FALSE;
-        eeprom->use_eewr = FALSE;
+        eeprom->use_eerd = false;
+        eeprom->use_eewr = false;
         break;
     case e1000_82571:
     case e1000_82572:
@@ -4518,8 +4519,8 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
             eeprom->page_size = 8;
             eeprom->address_bits = 8;
         }
-        eeprom->use_eerd = FALSE;
-        eeprom->use_eewr = FALSE;
+        eeprom->use_eerd = false;
+        eeprom->use_eewr = false;
         break;
     case e1000_82573:
         eeprom->type = e1000_eeprom_spi;
@@ -4532,9 +4533,9 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
             eeprom->page_size = 8;
             eeprom->address_bits = 8;
         }
-        eeprom->use_eerd = TRUE;
-        eeprom->use_eewr = TRUE;
-        if (e1000_is_onboard_nvm_eeprom(hw) == FALSE) {
+        eeprom->use_eerd = true;
+        eeprom->use_eewr = true;
+        if (!e1000_is_onboard_nvm_eeprom(hw)) {
             eeprom->type = e1000_eeprom_flash;
             eeprom->word_size = 2048;
 
@@ -4555,24 +4556,24 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
             eeprom->page_size = 8;
             eeprom->address_bits = 8;
         }
-        eeprom->use_eerd = TRUE;
-        eeprom->use_eewr = FALSE;
+        eeprom->use_eerd = true;
+        eeprom->use_eewr = false;
         break;
     case e1000_ich8lan:
         {
-        int32_t  i = 0;
-        uint32_t flash_size = E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_GFPREG);
+        s32  i = 0;
+        u32 flash_size = E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_GFPREG);
 
         eeprom->type = e1000_eeprom_ich8;
-        eeprom->use_eerd = FALSE;
-        eeprom->use_eewr = FALSE;
+        eeprom->use_eerd = false;
+        eeprom->use_eewr = false;
         eeprom->word_size = E1000_SHADOW_RAM_WORDS;
 
         /* Zero the shadow RAM structure. But don't load it from NVM
          * so as to save time for driver init */
         if (hw->eeprom_shadow_ram != NULL) {
             for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {
-                hw->eeprom_shadow_ram[i].modified = FALSE;
+                hw->eeprom_shadow_ram[i].modified = false;
                 hw->eeprom_shadow_ram[i].eeprom_word = 0xFFFF;
             }
         }
@@ -4585,7 +4586,7 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
 
         hw->flash_bank_size *= ICH_FLASH_SECTOR_SIZE;
 
-        hw->flash_bank_size /= 2 * sizeof(uint16_t);
+        hw->flash_bank_size /= 2 * sizeof(u16);
 
         break;
         }
@@ -4610,7 +4611,7 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
             if (eeprom_size)
                 eeprom_size++;
         } else {
-            eeprom_size = (uint16_t)((eecd & E1000_EECD_SIZE_EX_MASK) >>
+            eeprom_size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
                           E1000_EECD_SIZE_EX_SHIFT);
         }
 
@@ -4627,7 +4628,7 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
  *****************************************************************************/
 static void
 e1000_raise_ee_clk(struct e1000_hw *hw,
-                   uint32_t *eecd)
+                   u32 *eecd)
 {
     /* Raise the clock input to the EEPROM (by setting the SK bit), and then
      * wait <delay> microseconds.
@@ -4646,7 +4647,7 @@ e1000_raise_ee_clk(struct e1000_hw *hw,
  *****************************************************************************/
 static void
 e1000_lower_ee_clk(struct e1000_hw *hw,
-                   uint32_t *eecd)
+                   u32 *eecd)
 {
     /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
      * wait 50 microseconds.
@@ -4666,12 +4667,12 @@ e1000_lower_ee_clk(struct e1000_hw *hw,
  *****************************************************************************/
 static void
 e1000_shift_out_ee_bits(struct e1000_hw *hw,
-                        uint16_t data,
-                        uint16_t count)
+                        u16 data,
+                        u16 count)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    uint32_t eecd;
-    uint32_t mask;
+    u32 eecd;
+    u32 mask;
 
     /* We need to shift "count" bits out to the EEPROM. So, value in the
      * "data" parameter will be shifted out to the EEPROM one bit at a time.
@@ -4717,13 +4718,13 @@ e1000_shift_out_ee_bits(struct e1000_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static uint16_t
+static u16
 e1000_shift_in_ee_bits(struct e1000_hw *hw,
-                       uint16_t count)
+                       u16 count)
 {
-    uint32_t eecd;
-    uint32_t i;
-    uint16_t data;
+    u32 eecd;
+    u32 i;
+    u16 data;
 
     /* In order to read a register from the EEPROM, we need to shift 'count'
      * bits in from the EEPROM. Bits are "shifted in" by raising the clock
@@ -4761,11 +4762,11 @@ e1000_shift_in_ee_bits(struct e1000_hw *hw,
  * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This
  * function should be called before issuing a command to the EEPROM.
  *****************************************************************************/
-static int32_t
+static s32
 e1000_acquire_eeprom(struct e1000_hw *hw)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    uint32_t eecd, i=0;
+    u32 eecd, i=0;
 
     DEBUGFUNC("e1000_acquire_eeprom");
 
@@ -4824,7 +4825,7 @@ static void
 e1000_standby_eeprom(struct e1000_hw *hw)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    uint32_t eecd;
+    u32 eecd;
 
     eecd = E1000_READ_REG(hw, EECD);
 
@@ -4872,7 +4873,7 @@ e1000_standby_eeprom(struct e1000_hw *hw)
 static void
 e1000_release_eeprom(struct e1000_hw *hw)
 {
-    uint32_t eecd;
+    u32 eecd;
 
     DEBUGFUNC("e1000_release_eeprom");
 
@@ -4920,11 +4921,11 @@ e1000_release_eeprom(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static int32_t
+static s32
 e1000_spi_eeprom_ready(struct e1000_hw *hw)
 {
-    uint16_t retry_count = 0;
-    uint8_t spi_stat_reg;
+    u16 retry_count = 0;
+    u8 spi_stat_reg;
 
     DEBUGFUNC("e1000_spi_eeprom_ready");
 
@@ -4937,7 +4938,7 @@ e1000_spi_eeprom_ready(struct e1000_hw *hw)
     do {
         e1000_shift_out_ee_bits(hw, EEPROM_RDSR_OPCODE_SPI,
                                 hw->eeprom.opcode_bits);
-        spi_stat_reg = (uint8_t)e1000_shift_in_ee_bits(hw, 8);
+        spi_stat_reg = (u8)e1000_shift_in_ee_bits(hw, 8);
         if (!(spi_stat_reg & EEPROM_STATUS_RDY_SPI))
             break;
 
@@ -4966,14 +4967,14 @@ e1000_spi_eeprom_ready(struct e1000_hw *hw)
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-int32_t
+s32
 e1000_read_eeprom(struct e1000_hw *hw,
-                  uint16_t offset,
-                  uint16_t words,
-                  uint16_t *data)
+                  u16 offset,
+                  u16 words,
+                  u16 *data)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    uint32_t i = 0;
+    u32 i = 0;
 
     DEBUGFUNC("e1000_read_eeprom");
 
@@ -4994,15 +4995,14 @@ e1000_read_eeprom(struct e1000_hw *hw,
      * directly. In this case, we need to acquire the EEPROM so that
      * FW or other port software does not interrupt.
      */
-    if (e1000_is_onboard_nvm_eeprom(hw) == TRUE &&
-        hw->eeprom.use_eerd == FALSE) {
+    if (e1000_is_onboard_nvm_eeprom(hw) && !hw->eeprom.use_eerd) {
         /* Prepare the EEPROM for bit-bang reading */
         if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
             return -E1000_ERR_EEPROM;
     }
 
     /* Eerd register EEPROM access requires no eeprom aquire/release */
-    if (eeprom->use_eerd == TRUE)
+    if (eeprom->use_eerd)
         return e1000_read_eeprom_eerd(hw, offset, words, data);
 
     /* ICH EEPROM access is done via the ICH flash controller */
@@ -5012,8 +5012,8 @@ e1000_read_eeprom(struct e1000_hw *hw,
     /* Set up the SPI or Microwire EEPROM for bit-bang reading.  We have
      * acquired the EEPROM at this point, so any returns should relase it */
     if (eeprom->type == e1000_eeprom_spi) {
-        uint16_t word_in;
-        uint8_t read_opcode = EEPROM_READ_OPCODE_SPI;
+        u16 word_in;
+        u8 read_opcode = EEPROM_READ_OPCODE_SPI;
 
         if (e1000_spi_eeprom_ready(hw)) {
             e1000_release_eeprom(hw);
@@ -5028,7 +5028,7 @@ e1000_read_eeprom(struct e1000_hw *hw,
 
         /* Send the READ command (opcode + addr)  */
         e1000_shift_out_ee_bits(hw, read_opcode, eeprom->opcode_bits);
-        e1000_shift_out_ee_bits(hw, (uint16_t)(offset*2), eeprom->address_bits);
+        e1000_shift_out_ee_bits(hw, (u16)(offset*2), eeprom->address_bits);
 
         /* Read the data.  The address of the eeprom internally increments with
          * each byte (spi) being read, saving on the overhead of eeprom setup
@@ -5044,7 +5044,7 @@ e1000_read_eeprom(struct e1000_hw *hw,
             /* Send the READ command (opcode + addr)  */
             e1000_shift_out_ee_bits(hw, EEPROM_READ_OPCODE_MICROWIRE,
                                     eeprom->opcode_bits);
-            e1000_shift_out_ee_bits(hw, (uint16_t)(offset + i),
+            e1000_shift_out_ee_bits(hw, (u16)(offset + i),
                                     eeprom->address_bits);
 
             /* Read the data.  For microwire, each word requires the overhead
@@ -5068,14 +5068,14 @@ e1000_read_eeprom(struct e1000_hw *hw,
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-static int32_t
+static s32
 e1000_read_eeprom_eerd(struct e1000_hw *hw,
-                  uint16_t offset,
-                  uint16_t words,
-                  uint16_t *data)
+                  u16 offset,
+                  u16 words,
+                  u16 *data)
 {
-    uint32_t i, eerd = 0;
-    int32_t error = 0;
+    u32 i, eerd = 0;
+    s32 error = 0;
 
     for (i = 0; i < words; i++) {
         eerd = ((offset+i) << E1000_EEPROM_RW_ADDR_SHIFT) +
@@ -5102,15 +5102,15 @@ e1000_read_eeprom_eerd(struct e1000_hw *hw,
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-static int32_t
+static s32
 e1000_write_eeprom_eewr(struct e1000_hw *hw,
-                   uint16_t offset,
-                   uint16_t words,
-                   uint16_t *data)
+                   u16 offset,
+                   u16 words,
+                   u16 *data)
 {
-    uint32_t    register_value = 0;
-    uint32_t    i              = 0;
-    int32_t     error          = 0;
+    u32    register_value = 0;
+    u32    i              = 0;
+    s32     error          = 0;
 
     if (e1000_swfw_sync_acquire(hw, E1000_SWFW_EEP_SM))
         return -E1000_ERR_SWFW_SYNC;
@@ -5143,12 +5143,12 @@ e1000_write_eeprom_eewr(struct e1000_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static int32_t
+static s32
 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd)
 {
-    uint32_t attempts = 100000;
-    uint32_t i, reg = 0;
-    int32_t done = E1000_ERR_EEPROM;
+    u32 attempts = 100000;
+    u32 i, reg = 0;
+    s32 done = E1000_ERR_EEPROM;
 
     for (i = 0; i < attempts; i++) {
         if (eerd == E1000_EEPROM_POLL_READ)
@@ -5171,15 +5171,15 @@ e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd)
 *
 * hw - Struct containing variables accessed by shared code
 ****************************************************************************/
-static boolean_t
+static bool
 e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw)
 {
-    uint32_t eecd = 0;
+    u32 eecd = 0;
 
     DEBUGFUNC("e1000_is_onboard_nvm_eeprom");
 
     if (hw->mac_type == e1000_ich8lan)
-        return FALSE;
+        return false;
 
     if (hw->mac_type == e1000_82573) {
         eecd = E1000_READ_REG(hw, EECD);
@@ -5189,10 +5189,10 @@ e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw)
 
         /* If both bits are set, device is Flash type */
         if (eecd == 0x03) {
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 /******************************************************************************
@@ -5204,16 +5204,15 @@ e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw)
  * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
  * valid.
  *****************************************************************************/
-int32_t
+s32
 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
 {
-    uint16_t checksum = 0;
-    uint16_t i, eeprom_data;
+    u16 checksum = 0;
+    u16 i, eeprom_data;
 
     DEBUGFUNC("e1000_validate_eeprom_checksum");
 
-    if ((hw->mac_type == e1000_82573) &&
-        (e1000_is_onboard_nvm_eeprom(hw) == FALSE)) {
+    if ((hw->mac_type == e1000_82573) && !e1000_is_onboard_nvm_eeprom(hw)) {
         /* Check bit 4 of word 10h.  If it is 0, firmware is done updating
          * 10h-12h.  Checksum may need to be fixed. */
         e1000_read_eeprom(hw, 0x10, 1, &eeprom_data);
@@ -5253,7 +5252,7 @@ e1000_validate_eeprom_checksum(struct e1000_hw *hw)
         checksum += eeprom_data;
     }
 
-    if (checksum == (uint16_t) EEPROM_SUM)
+    if (checksum == (u16) EEPROM_SUM)
         return E1000_SUCCESS;
     else {
         DEBUGOUT("EEPROM Checksum Invalid\n");
@@ -5269,12 +5268,12 @@ e1000_validate_eeprom_checksum(struct e1000_hw *hw)
  * Sums the first 63 16 bit words of the EEPROM. Subtracts the sum from 0xBABA.
  * Writes the difference to word offset 63 of the EEPROM.
  *****************************************************************************/
-int32_t
+s32
 e1000_update_eeprom_checksum(struct e1000_hw *hw)
 {
-    uint32_t ctrl_ext;
-    uint16_t checksum = 0;
-    uint16_t i, eeprom_data;
+    u32 ctrl_ext;
+    u16 checksum = 0;
+    u16 i, eeprom_data;
 
     DEBUGFUNC("e1000_update_eeprom_checksum");
 
@@ -5285,7 +5284,7 @@ e1000_update_eeprom_checksum(struct e1000_hw *hw)
         }
         checksum += eeprom_data;
     }
-    checksum = (uint16_t) EEPROM_SUM - checksum;
+    checksum = (u16) EEPROM_SUM - checksum;
     if (e1000_write_eeprom(hw, EEPROM_CHECKSUM_REG, 1, &checksum) < 0) {
         DEBUGOUT("EEPROM Write Error\n");
         return -E1000_ERR_EEPROM;
@@ -5314,14 +5313,14 @@ e1000_update_eeprom_checksum(struct e1000_hw *hw)
  * If e1000_update_eeprom_checksum is not called after this function, the
  * EEPROM will most likely contain an invalid checksum.
  *****************************************************************************/
-int32_t
+s32
 e1000_write_eeprom(struct e1000_hw *hw,
-                   uint16_t offset,
-                   uint16_t words,
-                   uint16_t *data)
+                   u16 offset,
+                   u16 words,
+                   u16 *data)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    int32_t status = 0;
+    s32 status = 0;
 
     DEBUGFUNC("e1000_write_eeprom");
 
@@ -5339,7 +5338,7 @@ e1000_write_eeprom(struct e1000_hw *hw,
     }
 
     /* 82573 writes only through eewr */
-    if (eeprom->use_eewr == TRUE)
+    if (eeprom->use_eewr)
         return e1000_write_eeprom_eewr(hw, offset, words, data);
 
     if (eeprom->type == e1000_eeprom_ich8)
@@ -5371,19 +5370,19 @@ e1000_write_eeprom(struct e1000_hw *hw,
  * data - pointer to array of 8 bit words to be written to the EEPROM
  *
  *****************************************************************************/
-static int32_t
+static s32
 e1000_write_eeprom_spi(struct e1000_hw *hw,
-                       uint16_t offset,
-                       uint16_t words,
-                       uint16_t *data)
+                       u16 offset,
+                       u16 words,
+                       u16 *data)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    uint16_t widx = 0;
+    u16 widx = 0;
 
     DEBUGFUNC("e1000_write_eeprom_spi");
 
     while (widx < words) {
-        uint8_t write_opcode = EEPROM_WRITE_OPCODE_SPI;
+        u8 write_opcode = EEPROM_WRITE_OPCODE_SPI;
 
         if (e1000_spi_eeprom_ready(hw)) return -E1000_ERR_EEPROM;
 
@@ -5402,14 +5401,14 @@ e1000_write_eeprom_spi(struct e1000_hw *hw,
         /* Send the Write command (8-bit opcode + addr) */
         e1000_shift_out_ee_bits(hw, write_opcode, eeprom->opcode_bits);
 
-        e1000_shift_out_ee_bits(hw, (uint16_t)((offset + widx)*2),
+        e1000_shift_out_ee_bits(hw, (u16)((offset + widx)*2),
                                 eeprom->address_bits);
 
         /* Send the data */
 
         /* Loop to allow for up to whole page write (32 bytes) of eeprom */
         while (widx < words) {
-            uint16_t word_out = data[widx];
+            u16 word_out = data[widx];
             word_out = (word_out >> 8) | (word_out << 8);
             e1000_shift_out_ee_bits(hw, word_out, 16);
             widx++;
@@ -5437,16 +5436,16 @@ e1000_write_eeprom_spi(struct e1000_hw *hw,
  * data - pointer to array of 16 bit words to be written to the EEPROM
  *
  *****************************************************************************/
-static int32_t
+static s32
 e1000_write_eeprom_microwire(struct e1000_hw *hw,
-                             uint16_t offset,
-                             uint16_t words,
-                             uint16_t *data)
+                             u16 offset,
+                             u16 words,
+                             u16 *data)
 {
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    uint32_t eecd;
-    uint16_t words_written = 0;
-    uint16_t i = 0;
+    u32 eecd;
+    u16 words_written = 0;
+    u16 i = 0;
 
     DEBUGFUNC("e1000_write_eeprom_microwire");
 
@@ -5457,9 +5456,9 @@ e1000_write_eeprom_microwire(struct e1000_hw *hw,
      * EEPROM into write/erase mode.
      */
     e1000_shift_out_ee_bits(hw, EEPROM_EWEN_OPCODE_MICROWIRE,
-                            (uint16_t)(eeprom->opcode_bits + 2));
+                            (u16)(eeprom->opcode_bits + 2));
 
-    e1000_shift_out_ee_bits(hw, 0, (uint16_t)(eeprom->address_bits - 2));
+    e1000_shift_out_ee_bits(hw, 0, (u16)(eeprom->address_bits - 2));
 
     /* Prepare the EEPROM */
     e1000_standby_eeprom(hw);
@@ -5469,7 +5468,7 @@ e1000_write_eeprom_microwire(struct e1000_hw *hw,
         e1000_shift_out_ee_bits(hw, EEPROM_WRITE_OPCODE_MICROWIRE,
                                 eeprom->opcode_bits);
 
-        e1000_shift_out_ee_bits(hw, (uint16_t)(offset + words_written),
+        e1000_shift_out_ee_bits(hw, (u16)(offset + words_written),
                                 eeprom->address_bits);
 
         /* Send the data */
@@ -5507,9 +5506,9 @@ e1000_write_eeprom_microwire(struct e1000_hw *hw,
      * EEPROM out of write/erase mode.
      */
     e1000_shift_out_ee_bits(hw, EEPROM_EWDS_OPCODE_MICROWIRE,
-                            (uint16_t)(eeprom->opcode_bits + 2));
+                            (u16)(eeprom->opcode_bits + 2));
 
-    e1000_shift_out_ee_bits(hw, 0, (uint16_t)(eeprom->address_bits - 2));
+    e1000_shift_out_ee_bits(hw, 0, (u16)(eeprom->address_bits - 2));
 
     return E1000_SUCCESS;
 }
@@ -5524,19 +5523,19 @@ e1000_write_eeprom_microwire(struct e1000_hw *hw,
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-static int32_t
+static s32
 e1000_commit_shadow_ram(struct e1000_hw *hw)
 {
-    uint32_t attempts = 100000;
-    uint32_t eecd = 0;
-    uint32_t flop = 0;
-    uint32_t i = 0;
-    int32_t error = E1000_SUCCESS;
-    uint32_t old_bank_offset = 0;
-    uint32_t new_bank_offset = 0;
-    uint8_t low_byte = 0;
-    uint8_t high_byte = 0;
-    boolean_t sector_write_failed = FALSE;
+    u32 attempts = 100000;
+    u32 eecd = 0;
+    u32 flop = 0;
+    u32 i = 0;
+    s32 error = E1000_SUCCESS;
+    u32 old_bank_offset = 0;
+    u32 new_bank_offset = 0;
+    u8 low_byte = 0;
+    u8 high_byte = 0;
+    bool sector_write_failed = false;
 
     if (hw->mac_type == e1000_82573) {
         /* The flop register will be used to determine if flash type is STM */
@@ -5588,24 +5587,24 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
             e1000_erase_ich8_4k_segment(hw, 0);
         }
 
-        sector_write_failed = FALSE;
+        sector_write_failed = false;
         /* Loop for every byte in the shadow RAM,
          * which is in units of words. */
         for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {
             /* Determine whether to write the value stored
              * in the other NVM bank or a modified value stored
              * in the shadow RAM */
-            if (hw->eeprom_shadow_ram[i].modified == TRUE) {
-                low_byte = (uint8_t)hw->eeprom_shadow_ram[i].eeprom_word;
+            if (hw->eeprom_shadow_ram[i].modified) {
+                low_byte = (u8)hw->eeprom_shadow_ram[i].eeprom_word;
                 udelay(100);
                 error = e1000_verify_write_ich8_byte(hw,
                             (i << 1) + new_bank_offset, low_byte);
 
                 if (error != E1000_SUCCESS)
-                    sector_write_failed = TRUE;
+                    sector_write_failed = true;
                 else {
                     high_byte =
-                        (uint8_t)(hw->eeprom_shadow_ram[i].eeprom_word >> 8);
+                        (u8)(hw->eeprom_shadow_ram[i].eeprom_word >> 8);
                     udelay(100);
                 }
             } else {
@@ -5616,7 +5615,7 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
                             (i << 1) + new_bank_offset, low_byte);
 
                 if (error != E1000_SUCCESS)
-                    sector_write_failed = TRUE;
+                    sector_write_failed = true;
                 else {
                     e1000_read_ich8_byte(hw, (i << 1) + old_bank_offset + 1,
                                          &high_byte);
@@ -5624,10 +5623,10 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
                 }
             }
 
-            /* If the write of the low byte was successful, go ahread and
+            /* If the write of the low byte was successful, go ahead and
              * write the high byte while checking to make sure that if it
              * is the signature byte, then it is handled properly */
-            if (sector_write_failed == FALSE) {
+            if (!sector_write_failed) {
                 /* If the word is 0x13, then make sure the signature bits
                  * (15:14) are 11b until the commit has completed.
                  * This will allow us to write 10b which indicates the
@@ -5640,7 +5639,7 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
                 error = e1000_verify_write_ich8_byte(hw,
                             (i << 1) + new_bank_offset + 1, high_byte);
                 if (error != E1000_SUCCESS)
-                    sector_write_failed = TRUE;
+                    sector_write_failed = true;
 
             } else {
                 /* If the write failed then break from the loop and
@@ -5651,7 +5650,7 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
 
         /* Don't bother writing the segment valid bits if sector
          * programming failed. */
-        if (sector_write_failed == FALSE) {
+        if (!sector_write_failed) {
             /* Finally validate the new segment by setting bit 15:14
              * to 10b in word 0x13 , this can be done without an
              * erase as well since these bits are 11 to start with
@@ -5673,7 +5672,7 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
 
             /* Clear the now not used entry in the cache */
             for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {
-                hw->eeprom_shadow_ram[i].modified = FALSE;
+                hw->eeprom_shadow_ram[i].modified = false;
                 hw->eeprom_shadow_ram[i].eeprom_word = 0xFFFF;
             }
         }
@@ -5688,11 +5687,11 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_read_mac_addr(struct e1000_hw * hw)
 {
-    uint16_t offset;
-    uint16_t eeprom_data, i;
+    u16 offset;
+    u16 eeprom_data, i;
 
     DEBUGFUNC("e1000_read_mac_addr");
 
@@ -5702,8 +5701,8 @@ e1000_read_mac_addr(struct e1000_hw * hw)
             DEBUGOUT("EEPROM Read Error\n");
             return -E1000_ERR_EEPROM;
         }
-        hw->perm_mac_addr[i] = (uint8_t) (eeprom_data & 0x00FF);
-        hw->perm_mac_addr[i+1] = (uint8_t) (eeprom_data >> 8);
+        hw->perm_mac_addr[i] = (u8) (eeprom_data & 0x00FF);
+        hw->perm_mac_addr[i+1] = (u8) (eeprom_data >> 8);
     }
 
     switch (hw->mac_type) {
@@ -5735,8 +5734,8 @@ e1000_read_mac_addr(struct e1000_hw * hw)
 static void
 e1000_init_rx_addrs(struct e1000_hw *hw)
 {
-    uint32_t i;
-    uint32_t rar_num;
+    u32 i;
+    u32 rar_num;
 
     DEBUGFUNC("e1000_init_rx_addrs");
 
@@ -5750,7 +5749,7 @@ e1000_init_rx_addrs(struct e1000_hw *hw)
     /* Reserve a spot for the Locally Administered Address to work around
      * an 82571 issue in which a reset on one port will reload the MAC on
      * the other port. */
-    if ((hw->mac_type == e1000_82571) && (hw->laa_is_present == TRUE))
+    if ((hw->mac_type == e1000_82571) && (hw->laa_is_present))
         rar_num -= 1;
     if (hw->mac_type == e1000_ich8lan)
         rar_num = E1000_RAR_ENTRIES_ICH8LAN;
@@ -5771,11 +5770,11 @@ e1000_init_rx_addrs(struct e1000_hw *hw)
  * hw - Struct containing variables accessed by shared code
  * mc_addr - the multicast address to hash
  *****************************************************************************/
-uint32_t
+u32
 e1000_hash_mc_addr(struct e1000_hw *hw,
-                   uint8_t *mc_addr)
+                   u8 *mc_addr)
 {
-    uint32_t hash_value = 0;
+    u32 hash_value = 0;
 
     /* The portion of the address that is used for the hash table is
      * determined by the mc_filter_type setting.
@@ -5788,37 +5787,37 @@ e1000_hash_mc_addr(struct e1000_hw *hw,
     case 0:
         if (hw->mac_type == e1000_ich8lan) {
             /* [47:38] i.e. 0x158 for above example address */
-            hash_value = ((mc_addr[4] >> 6) | (((uint16_t) mc_addr[5]) << 2));
+            hash_value = ((mc_addr[4] >> 6) | (((u16) mc_addr[5]) << 2));
         } else {
             /* [47:36] i.e. 0x563 for above example address */
-            hash_value = ((mc_addr[4] >> 4) | (((uint16_t) mc_addr[5]) << 4));
+            hash_value = ((mc_addr[4] >> 4) | (((u16) mc_addr[5]) << 4));
         }
         break;
     case 1:
         if (hw->mac_type == e1000_ich8lan) {
             /* [46:37] i.e. 0x2B1 for above example address */
-            hash_value = ((mc_addr[4] >> 5) | (((uint16_t) mc_addr[5]) << 3));
+            hash_value = ((mc_addr[4] >> 5) | (((u16) mc_addr[5]) << 3));
         } else {
             /* [46:35] i.e. 0xAC6 for above example address */
-            hash_value = ((mc_addr[4] >> 3) | (((uint16_t) mc_addr[5]) << 5));
+            hash_value = ((mc_addr[4] >> 3) | (((u16) mc_addr[5]) << 5));
         }
         break;
     case 2:
         if (hw->mac_type == e1000_ich8lan) {
             /*[45:36] i.e. 0x163 for above example address */
-            hash_value = ((mc_addr[4] >> 4) | (((uint16_t) mc_addr[5]) << 4));
+            hash_value = ((mc_addr[4] >> 4) | (((u16) mc_addr[5]) << 4));
         } else {
             /* [45:34] i.e. 0x5D8 for above example address */
-            hash_value = ((mc_addr[4] >> 2) | (((uint16_t) mc_addr[5]) << 6));
+            hash_value = ((mc_addr[4] >> 2) | (((u16) mc_addr[5]) << 6));
         }
         break;
     case 3:
         if (hw->mac_type == e1000_ich8lan) {
             /* [43:34] i.e. 0x18D for above example address */
-            hash_value = ((mc_addr[4] >> 2) | (((uint16_t) mc_addr[5]) << 6));
+            hash_value = ((mc_addr[4] >> 2) | (((u16) mc_addr[5]) << 6));
         } else {
             /* [43:32] i.e. 0x634 for above example address */
-            hash_value = ((mc_addr[4]) | (((uint16_t) mc_addr[5]) << 8));
+            hash_value = ((mc_addr[4]) | (((u16) mc_addr[5]) << 8));
         }
         break;
     }
@@ -5838,11 +5837,11 @@ e1000_hash_mc_addr(struct e1000_hw *hw,
  *****************************************************************************/
 void
 e1000_mta_set(struct e1000_hw *hw,
-              uint32_t hash_value)
+              u32 hash_value)
 {
-    uint32_t hash_bit, hash_reg;
-    uint32_t mta;
-    uint32_t temp;
+    u32 hash_bit, hash_reg;
+    u32 mta;
+    u32 temp;
 
     /* The MTA is a register array of 128 32-bit registers.
      * It is treated like an array of 4096 bits.  We want to set
@@ -5887,18 +5886,18 @@ e1000_mta_set(struct e1000_hw *hw,
  *****************************************************************************/
 void
 e1000_rar_set(struct e1000_hw *hw,
-              uint8_t *addr,
-              uint32_t index)
+              u8 *addr,
+              u32 index)
 {
-    uint32_t rar_low, rar_high;
+    u32 rar_low, rar_high;
 
     /* HW expects these in little endian so we reverse the byte order
      * from network order (big endian) to little endian
      */
-    rar_low = ((uint32_t) addr[0] |
-               ((uint32_t) addr[1] << 8) |
-               ((uint32_t) addr[2] << 16) | ((uint32_t) addr[3] << 24));
-    rar_high = ((uint32_t) addr[4] | ((uint32_t) addr[5] << 8));
+    rar_low = ((u32) addr[0] |
+               ((u32) addr[1] << 8) |
+               ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
+    rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
 
     /* Disable Rx and flush all Rx frames before enabling RSS to avoid Rx
      * unit hang.
@@ -5922,7 +5921,7 @@ e1000_rar_set(struct e1000_hw *hw,
     case e1000_82571:
     case e1000_82572:
     case e1000_80003es2lan:
-        if (hw->leave_av_bit_off == TRUE)
+        if (hw->leave_av_bit_off)
             break;
     default:
         /* Indicate to hardware the Address is Valid. */
@@ -5945,10 +5944,10 @@ e1000_rar_set(struct e1000_hw *hw,
  *****************************************************************************/
 void
 e1000_write_vfta(struct e1000_hw *hw,
-                 uint32_t offset,
-                 uint32_t value)
+                 u32 offset,
+                 u32 value)
 {
-    uint32_t temp;
+    u32 temp;
 
     if (hw->mac_type == e1000_ich8lan)
         return;
@@ -5973,10 +5972,10 @@ e1000_write_vfta(struct e1000_hw *hw,
 static void
 e1000_clear_vfta(struct e1000_hw *hw)
 {
-    uint32_t offset;
-    uint32_t vfta_value = 0;
-    uint32_t vfta_offset = 0;
-    uint32_t vfta_bit_in_reg = 0;
+    u32 offset;
+    u32 vfta_value = 0;
+    u32 vfta_offset = 0;
+    u32 vfta_bit_in_reg = 0;
 
     if (hw->mac_type == e1000_ich8lan)
         return;
@@ -6004,15 +6003,15 @@ e1000_clear_vfta(struct e1000_hw *hw)
     }
 }
 
-static int32_t
+static s32
 e1000_id_led_init(struct e1000_hw * hw)
 {
-    uint32_t ledctl;
-    const uint32_t ledctl_mask = 0x000000FF;
-    const uint32_t ledctl_on = E1000_LEDCTL_MODE_LED_ON;
-    const uint32_t ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
-    uint16_t eeprom_data, i, temp;
-    const uint16_t led_mask = 0x0F;
+    u32 ledctl;
+    const u32 ledctl_mask = 0x000000FF;
+    const u32 ledctl_on = E1000_LEDCTL_MODE_LED_ON;
+    const u32 ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
+    u16 eeprom_data, i, temp;
+    const u16 led_mask = 0x0F;
 
     DEBUGFUNC("e1000_id_led_init");
 
@@ -6087,11 +6086,11 @@ e1000_id_led_init(struct e1000_hw * hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_setup_led(struct e1000_hw *hw)
 {
-    uint32_t ledctl;
-    int32_t ret_val = E1000_SUCCESS;
+    u32 ledctl;
+    s32 ret_val = E1000_SUCCESS;
 
     DEBUGFUNC("e1000_setup_led");
 
@@ -6112,7 +6111,7 @@ e1000_setup_led(struct e1000_hw *hw)
         if (ret_val)
             return ret_val;
         ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                      (uint16_t)(hw->phy_spd_default &
+                                      (u16)(hw->phy_spd_default &
                                       ~IGP01E1000_GMII_SPD));
         if (ret_val)
             return ret_val;
@@ -6146,11 +6145,11 @@ e1000_setup_led(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_blink_led_start(struct e1000_hw *hw)
 {
-    int16_t  i;
-    uint32_t ledctl_blink = 0;
+    s16  i;
+    u32 ledctl_blink = 0;
 
     DEBUGFUNC("e1000_id_led_blink_on");
 
@@ -6181,10 +6180,10 @@ e1000_blink_led_start(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_cleanup_led(struct e1000_hw *hw)
 {
-    int32_t ret_val = E1000_SUCCESS;
+    s32 ret_val = E1000_SUCCESS;
 
     DEBUGFUNC("e1000_cleanup_led");
 
@@ -6223,10 +6222,10 @@ e1000_cleanup_led(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_led_on(struct e1000_hw *hw)
 {
-    uint32_t ctrl = E1000_READ_REG(hw, CTRL);
+    u32 ctrl = E1000_READ_REG(hw, CTRL);
 
     DEBUGFUNC("e1000_led_on");
 
@@ -6274,10 +6273,10 @@ e1000_led_on(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+s32
 e1000_led_off(struct e1000_hw *hw)
 {
-    uint32_t ctrl = E1000_READ_REG(hw, CTRL);
+    u32 ctrl = E1000_READ_REG(hw, CTRL);
 
     DEBUGFUNC("e1000_led_off");
 
@@ -6328,7 +6327,7 @@ e1000_led_off(struct e1000_hw *hw)
 static void
 e1000_clear_hw_cntrs(struct e1000_hw *hw)
 {
-    volatile uint32_t temp;
+    volatile u32 temp;
 
     temp = E1000_READ_REG(hw, CRCERRS);
     temp = E1000_READ_REG(hw, SYMERRS);
@@ -6425,7 +6424,7 @@ e1000_clear_hw_cntrs(struct e1000_hw *hw)
  * hw - Struct containing variables accessed by shared code
  *
  * Call this after e1000_init_hw. You may override the IFS defaults by setting
- * hw->ifs_params_forced to TRUE. However, you must initialize hw->
+ * hw->ifs_params_forced to true. However, you must initialize hw->
  * current_ifs_val, ifs_min_val, ifs_max_val, ifs_step_size, and ifs_ratio
  * before calling this function.
  *****************************************************************************/
@@ -6442,7 +6441,7 @@ e1000_reset_adaptive(struct e1000_hw *hw)
             hw->ifs_step_size = IFS_STEP;
             hw->ifs_ratio = IFS_RATIO;
         }
-        hw->in_ifs_mode = FALSE;
+        hw->in_ifs_mode = false;
         E1000_WRITE_REG(hw, AIT, 0);
     } else {
         DEBUGOUT("Not in Adaptive IFS mode!\n");
@@ -6465,7 +6464,7 @@ e1000_update_adaptive(struct e1000_hw *hw)
     if (hw->adaptive_ifs) {
         if ((hw->collision_delta * hw->ifs_ratio) > hw->tx_packet_delta) {
             if (hw->tx_packet_delta > MIN_NUM_XMITS) {
-                hw->in_ifs_mode = TRUE;
+                hw->in_ifs_mode = true;
                 if (hw->current_ifs_val < hw->ifs_max_val) {
                     if (hw->current_ifs_val == 0)
                         hw->current_ifs_val = hw->ifs_min_val;
@@ -6477,7 +6476,7 @@ e1000_update_adaptive(struct e1000_hw *hw)
         } else {
             if (hw->in_ifs_mode && (hw->tx_packet_delta <= MIN_NUM_XMITS)) {
                 hw->current_ifs_val = 0;
-                hw->in_ifs_mode = FALSE;
+                hw->in_ifs_mode = false;
                 E1000_WRITE_REG(hw, AIT, 0);
             }
         }
@@ -6496,10 +6495,10 @@ e1000_update_adaptive(struct e1000_hw *hw)
 void
 e1000_tbi_adjust_stats(struct e1000_hw *hw,
                        struct e1000_hw_stats *stats,
-                       uint32_t frame_len,
-                       uint8_t *mac_addr)
+                       u32 frame_len,
+                       u8 *mac_addr)
 {
-    uint64_t carry_bit;
+    u64 carry_bit;
 
     /* First adjust the frame length. */
     frame_len--;
@@ -6528,7 +6527,7 @@ e1000_tbi_adjust_stats(struct e1000_hw *hw,
      * since the test for a multicast frame will test positive on
      * a broadcast frame.
      */
-    if ((mac_addr[0] == (uint8_t) 0xff) && (mac_addr[1] == (uint8_t) 0xff))
+    if ((mac_addr[0] == (u8) 0xff) && (mac_addr[1] == (u8) 0xff))
         /* Broadcast packet */
         stats->bprc++;
     else if (*mac_addr & 0x01)
@@ -6574,9 +6573,9 @@ e1000_tbi_adjust_stats(struct e1000_hw *hw,
 void
 e1000_get_bus_info(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t pci_ex_link_status;
-    uint32_t status;
+    s32 ret_val;
+    u16 pci_ex_link_status;
+    u32 status;
 
     switch (hw->mac_type) {
     case e1000_82542_rev2_0:
@@ -6648,8 +6647,8 @@ e1000_get_bus_info(struct e1000_hw *hw)
  *****************************************************************************/
 static void
 e1000_write_reg_io(struct e1000_hw *hw,
-                   uint32_t offset,
-                   uint32_t value)
+                   u32 offset,
+                   u32 value)
 {
     unsigned long io_addr = hw->io_base;
     unsigned long io_data = hw->io_base + 4;
@@ -6673,15 +6672,15 @@ e1000_write_reg_io(struct e1000_hw *hw,
  * register to the minimum and maximum range.
  * For IGP phy's, the function calculates the range by the AGC registers.
  *****************************************************************************/
-static int32_t
+static s32
 e1000_get_cable_length(struct e1000_hw *hw,
-                       uint16_t *min_length,
-                       uint16_t *max_length)
+                       u16 *min_length,
+                       u16 *max_length)
 {
-    int32_t ret_val;
-    uint16_t agc_value = 0;
-    uint16_t i, phy_data;
-    uint16_t cable_length;
+    s32 ret_val;
+    u16 agc_value = 0;
+    u16 i, phy_data;
+    u16 cable_length;
 
     DEBUGFUNC("e1000_get_cable_length");
 
@@ -6752,9 +6751,9 @@ e1000_get_cable_length(struct e1000_hw *hw,
             break;
         }
     } else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */
-        uint16_t cur_agc_value;
-        uint16_t min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
-        uint16_t agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
+        u16 cur_agc_value;
+        u16 min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
+        u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
                                                          {IGP01E1000_PHY_AGC_A,
                                                           IGP01E1000_PHY_AGC_B,
                                                           IGP01E1000_PHY_AGC_C,
@@ -6800,9 +6799,9 @@ e1000_get_cable_length(struct e1000_hw *hw,
                       IGP01E1000_AGC_RANGE;
     } else if (hw->phy_type == e1000_phy_igp_2 ||
                hw->phy_type == e1000_phy_igp_3) {
-        uint16_t cur_agc_index, max_agc_index = 0;
-        uint16_t min_agc_index = IGP02E1000_AGC_LENGTH_TABLE_SIZE - 1;
-        uint16_t agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
+        u16 cur_agc_index, max_agc_index = 0;
+        u16 min_agc_index = IGP02E1000_AGC_LENGTH_TABLE_SIZE - 1;
+        u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
                                                          {IGP02E1000_PHY_AGC_A,
                                                           IGP02E1000_PHY_AGC_B,
                                                           IGP02E1000_PHY_AGC_C,
@@ -6864,12 +6863,12 @@ e1000_get_cable_length(struct e1000_hw *hw,
  * return 0.  If the link speed is 1000 Mbps the polarity status is in the
  * IGP01E1000_PHY_PCS_INIT_REG.
  *****************************************************************************/
-static int32_t
+static s32
 e1000_check_polarity(struct e1000_hw *hw,
                      e1000_rev_polarity *polarity)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_check_polarity");
 
@@ -6940,11 +6939,11 @@ e1000_check_polarity(struct e1000_hw *hw,
  * Link Health register.  In IGP this bit is latched high, so the driver must
  * read it immediately after link is established.
  *****************************************************************************/
-static int32_t
+static s32
 e1000_check_downshift(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t phy_data;
+    s32 ret_val;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_check_downshift");
 
@@ -6968,7 +6967,7 @@ e1000_check_downshift(struct e1000_hw *hw)
                                M88E1000_PSSR_DOWNSHIFT_SHIFT;
     } else if (hw->phy_type == e1000_phy_ife) {
         /* e1000_phy_ife supports 10/100 speed only */
-        hw->speed_downgraded = FALSE;
+        hw->speed_downgraded = false;
     }
 
     return E1000_SUCCESS;
@@ -6986,18 +6985,18 @@ e1000_check_downshift(struct e1000_hw *hw)
  *
  ****************************************************************************/
 
-static int32_t
+static s32
 e1000_config_dsp_after_link_change(struct e1000_hw *hw,
-                                   boolean_t link_up)
+                                   bool link_up)
 {
-    int32_t ret_val;
-    uint16_t phy_data, phy_saved_data, speed, duplex, i;
-    uint16_t dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
+    s32 ret_val;
+    u16 phy_data, phy_saved_data, speed, duplex, i;
+    u16 dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
                                         {IGP01E1000_PHY_AGC_PARAM_A,
                                         IGP01E1000_PHY_AGC_PARAM_B,
                                         IGP01E1000_PHY_AGC_PARAM_C,
                                         IGP01E1000_PHY_AGC_PARAM_D};
-    uint16_t min_length, max_length;
+    u16 min_length, max_length;
 
     DEBUGFUNC("e1000_config_dsp_after_link_change");
 
@@ -7039,8 +7038,8 @@ e1000_config_dsp_after_link_change(struct e1000_hw *hw,
             if ((hw->ffe_config_state == e1000_ffe_config_enabled) &&
                (min_length < e1000_igp_cable_length_50)) {
 
-                uint16_t ffe_idle_err_timeout = FFE_IDLE_ERR_COUNT_TIMEOUT_20;
-                uint32_t idle_errs = 0;
+                u16 ffe_idle_err_timeout = FFE_IDLE_ERR_COUNT_TIMEOUT_20;
+                u32 idle_errs = 0;
 
                 /* clear previous idle error counts */
                 ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS,
@@ -7174,11 +7173,11 @@ e1000_config_dsp_after_link_change(struct e1000_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  ****************************************************************************/
-static int32_t
+static s32
 e1000_set_phy_mode(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t eeprom_data;
+    s32 ret_val;
+    u16 eeprom_data;
 
     DEBUGFUNC("e1000_set_phy_mode");
 
@@ -7198,7 +7197,7 @@ e1000_set_phy_mode(struct e1000_hw *hw)
             if (ret_val)
                 return ret_val;
 
-            hw->phy_reset_disable = FALSE;
+            hw->phy_reset_disable = false;
         }
     }
 
@@ -7219,13 +7218,13 @@ e1000_set_phy_mode(struct e1000_hw *hw)
  *
  ****************************************************************************/
 
-static int32_t
+static s32
 e1000_set_d3_lplu_state(struct e1000_hw *hw,
-                        boolean_t active)
+                        bool active)
 {
-    uint32_t phy_ctrl = 0;
-    int32_t ret_val;
-    uint16_t phy_data;
+    u32 phy_ctrl = 0;
+    s32 ret_val;
+    u16 phy_data;
     DEBUGFUNC("e1000_set_d3_lplu_state");
 
     if (hw->phy_type != e1000_phy_igp && hw->phy_type != e1000_phy_igp_2
@@ -7349,13 +7348,13 @@ e1000_set_d3_lplu_state(struct e1000_hw *hw,
  *
  ****************************************************************************/
 
-static int32_t
+static s32
 e1000_set_d0_lplu_state(struct e1000_hw *hw,
-                        boolean_t active)
+                        bool active)
 {
-    uint32_t phy_ctrl = 0;
-    int32_t ret_val;
-    uint16_t phy_data;
+    u32 phy_ctrl = 0;
+    s32 ret_val;
+    u16 phy_data;
     DEBUGFUNC("e1000_set_d0_lplu_state");
 
     if (hw->mac_type <= e1000_82547_rev_2)
@@ -7440,12 +7439,12 @@ e1000_set_d0_lplu_state(struct e1000_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static int32_t
+static s32
 e1000_set_vco_speed(struct e1000_hw *hw)
 {
-    int32_t  ret_val;
-    uint16_t default_page = 0;
-    uint16_t phy_data;
+    s32  ret_val;
+    u16 default_page = 0;
+    u16 phy_data;
 
     DEBUGFUNC("e1000_set_vco_speed");
 
@@ -7504,18 +7503,18 @@ e1000_set_vco_speed(struct e1000_hw *hw)
  *
  * returns: - E1000_SUCCESS .
  ****************************************************************************/
-static int32_t
-e1000_host_if_read_cookie(struct e1000_hw * hw, uint8_t *buffer)
+static s32
+e1000_host_if_read_cookie(struct e1000_hw * hw, u8 *buffer)
 {
-    uint8_t i;
-    uint32_t offset = E1000_MNG_DHCP_COOKIE_OFFSET;
-    uint8_t length = E1000_MNG_DHCP_COOKIE_LENGTH;
+    u8 i;
+    u32 offset = E1000_MNG_DHCP_COOKIE_OFFSET;
+    u8 length = E1000_MNG_DHCP_COOKIE_LENGTH;
 
     length = (length >> 2);
     offset = (offset >> 2);
 
     for (i = 0; i < length; i++) {
-        *((uint32_t *) buffer + i) =
+        *((u32 *) buffer + i) =
             E1000_READ_REG_ARRAY_DWORD(hw, HOST_IF, offset + i);
     }
     return E1000_SUCCESS;
@@ -7531,11 +7530,11 @@ e1000_host_if_read_cookie(struct e1000_hw * hw, uint8_t *buffer)
  *            timeout
  *          - E1000_SUCCESS for success.
  ****************************************************************************/
-static int32_t
+static s32
 e1000_mng_enable_host_if(struct e1000_hw * hw)
 {
-    uint32_t hicr;
-    uint8_t i;
+    u32 hicr;
+    u8 i;
 
     /* Check that the host interface is enabled. */
     hicr = E1000_READ_REG(hw, HICR);
@@ -7565,14 +7564,14 @@ e1000_mng_enable_host_if(struct e1000_hw * hw)
  *
  * returns  - E1000_SUCCESS for success.
  ****************************************************************************/
-static int32_t
-e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
-                        uint16_t length, uint16_t offset, uint8_t *sum)
+static s32
+e1000_mng_host_if_write(struct e1000_hw * hw, u8 *buffer,
+                        u16 length, u16 offset, u8 *sum)
 {
-    uint8_t *tmp;
-    uint8_t *bufptr = buffer;
-    uint32_t data = 0;
-    uint16_t remaining, i, j, prev_bytes;
+    u8 *tmp;
+    u8 *bufptr = buffer;
+    u32 data = 0;
+    u16 remaining, i, j, prev_bytes;
 
     /* sum = only sum of the data and it is not checksum */
 
@@ -7580,14 +7579,14 @@ e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
         return -E1000_ERR_PARAM;
     }
 
-    tmp = (uint8_t *)&data;
+    tmp = (u8 *)&data;
     prev_bytes = offset & 0x3;
     offset &= 0xFFFC;
     offset >>= 2;
 
     if (prev_bytes) {
         data = E1000_READ_REG_ARRAY_DWORD(hw, HOST_IF, offset);
-        for (j = prev_bytes; j < sizeof(uint32_t); j++) {
+        for (j = prev_bytes; j < sizeof(u32); j++) {
             *(tmp + j) = *bufptr++;
             *sum += *(tmp + j);
         }
@@ -7605,7 +7604,7 @@ e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
     /* The device driver writes the relevant command block into the
      * ram area. */
     for (i = 0; i < length; i++) {
-        for (j = 0; j < sizeof(uint32_t); j++) {
+        for (j = 0; j < sizeof(u32); j++) {
             *(tmp + j) = *bufptr++;
             *sum += *(tmp + j);
         }
@@ -7613,7 +7612,7 @@ e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
         E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, offset + i, data);
     }
     if (remaining) {
-        for (j = 0; j < sizeof(uint32_t); j++) {
+        for (j = 0; j < sizeof(u32); j++) {
             if (j < remaining)
                 *(tmp + j) = *bufptr++;
             else
@@ -7633,23 +7632,23 @@ e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
  *
  * returns  - E1000_SUCCESS for success.
  ****************************************************************************/
-static int32_t
+static s32
 e1000_mng_write_cmd_header(struct e1000_hw * hw,
                            struct e1000_host_mng_command_header * hdr)
 {
-    uint16_t i;
-    uint8_t sum;
-    uint8_t *buffer;
+    u16 i;
+    u8 sum;
+    u8 *buffer;
 
     /* Write the whole command header structure which includes sum of
      * the buffer */
 
-    uint16_t length = sizeof(struct e1000_host_mng_command_header);
+    u16 length = sizeof(struct e1000_host_mng_command_header);
 
     sum = hdr->checksum;
     hdr->checksum = 0;
 
-    buffer = (uint8_t *) hdr;
+    buffer = (u8 *) hdr;
     i = length;
     while (i--)
         sum += buffer[i];
@@ -7659,7 +7658,7 @@ e1000_mng_write_cmd_header(struct e1000_hw * hw,
     length >>= 2;
     /* The device driver writes the relevant command block into the ram area. */
     for (i = 0; i < length; i++) {
-        E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, i, *((uint32_t *) hdr + i));
+        E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, i, *((u32 *) hdr + i));
         E1000_WRITE_FLUSH(hw);
     }
 
@@ -7673,10 +7672,10 @@ e1000_mng_write_cmd_header(struct e1000_hw * hw,
  *
  * returns  - E1000_SUCCESS for success.
  ****************************************************************************/
-static int32_t
+static s32
 e1000_mng_write_commit(struct e1000_hw * hw)
 {
-    uint32_t hicr;
+    u32 hicr;
 
     hicr = E1000_READ_REG(hw, HICR);
     /* Setting this bit tells the ARC that a new command is pending. */
@@ -7689,35 +7688,35 @@ e1000_mng_write_commit(struct e1000_hw * hw)
 /*****************************************************************************
  * This function checks the mode of the firmware.
  *
- * returns  - TRUE when the mode is IAMT or FALSE.
+ * returns  - true when the mode is IAMT or false.
  ****************************************************************************/
-boolean_t
+bool
 e1000_check_mng_mode(struct e1000_hw *hw)
 {
-    uint32_t fwsm;
+    u32 fwsm;
 
     fwsm = E1000_READ_REG(hw, FWSM);
 
     if (hw->mac_type == e1000_ich8lan) {
         if ((fwsm & E1000_FWSM_MODE_MASK) ==
             (E1000_MNG_ICH_IAMT_MODE << E1000_FWSM_MODE_SHIFT))
-            return TRUE;
+            return true;
     } else if ((fwsm & E1000_FWSM_MODE_MASK) ==
                (E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT))
-        return TRUE;
+        return true;
 
-    return FALSE;
+    return false;
 }
 
 
 /*****************************************************************************
  * This function writes the dhcp info .
  ****************************************************************************/
-int32_t
-e1000_mng_write_dhcp_info(struct e1000_hw * hw, uint8_t *buffer,
-                          uint16_t length)
+s32
+e1000_mng_write_dhcp_info(struct e1000_hw * hw, u8 *buffer,
+                          u16 length)
 {
-    int32_t ret_val;
+    s32 ret_val;
     struct e1000_host_mng_command_header hdr;
 
     hdr.command_id = E1000_MNG_DHCP_TX_PAYLOAD_CMD;
@@ -7745,11 +7744,11 @@ e1000_mng_write_dhcp_info(struct e1000_hw * hw, uint8_t *buffer,
  *
  * returns  - checksum of buffer contents.
  ****************************************************************************/
-static uint8_t
-e1000_calculate_mng_checksum(char *buffer, uint32_t length)
+static u8
+e1000_calculate_mng_checksum(char *buffer, u32 length)
 {
-    uint8_t sum = 0;
-    uint32_t i;
+    u8 sum = 0;
+    u32 i;
 
     if (!buffer)
         return 0;
@@ -7757,23 +7756,23 @@ e1000_calculate_mng_checksum(char *buffer, uint32_t length)
     for (i=0; i < length; i++)
         sum += buffer[i];
 
-    return (uint8_t) (0 - sum);
+    return (u8) (0 - sum);
 }
 
 /*****************************************************************************
  * This function checks whether tx pkt filtering needs to be enabled or not.
  *
- * returns  - TRUE for packet filtering or FALSE.
+ * returns  - true for packet filtering or false.
  ****************************************************************************/
-boolean_t
+bool
 e1000_enable_tx_pkt_filtering(struct e1000_hw *hw)
 {
     /* called in init as well as watchdog timer functions */
 
-    int32_t ret_val, checksum;
-    boolean_t tx_filter = FALSE;
+    s32 ret_val, checksum;
+    bool tx_filter = false;
     struct e1000_host_mng_dhcp_cookie *hdr = &(hw->mng_cookie);
-    uint8_t *buffer = (uint8_t *) &(hw->mng_cookie);
+    u8 *buffer = (u8 *) &(hw->mng_cookie);
 
     if (e1000_check_mng_mode(hw)) {
         ret_val = e1000_mng_enable_host_if(hw);
@@ -7787,11 +7786,11 @@ e1000_enable_tx_pkt_filtering(struct e1000_hw *hw)
                                                E1000_MNG_DHCP_COOKIE_LENGTH)) {
                     if (hdr->status &
                         E1000_MNG_DHCP_COOKIE_STATUS_PARSING_SUPPORT)
-                        tx_filter = TRUE;
+                        tx_filter = true;
                 } else
-                    tx_filter = TRUE;
+                    tx_filter = true;
             } else
-                tx_filter = TRUE;
+                tx_filter = true;
         }
     }
 
@@ -7804,41 +7803,41 @@ e1000_enable_tx_pkt_filtering(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *
- * returns: - TRUE/FALSE
+ * returns: - true/false
  *
  *****************************************************************************/
-uint32_t
+u32
 e1000_enable_mng_pass_thru(struct e1000_hw *hw)
 {
-    uint32_t manc;
-    uint32_t fwsm, factps;
+    u32 manc;
+    u32 fwsm, factps;
 
     if (hw->asf_firmware_present) {
         manc = E1000_READ_REG(hw, MANC);
 
         if (!(manc & E1000_MANC_RCV_TCO_EN) ||
             !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
-            return FALSE;
-        if (e1000_arc_subsystem_valid(hw) == TRUE) {
+            return false;
+        if (e1000_arc_subsystem_valid(hw)) {
             fwsm = E1000_READ_REG(hw, FWSM);
             factps = E1000_READ_REG(hw, FACTPS);
 
             if ((((fwsm & E1000_FWSM_MODE_MASK) >> E1000_FWSM_MODE_SHIFT) ==
                    e1000_mng_mode_pt) && !(factps & E1000_FACTPS_MNGCG))
-                return TRUE;
+                return true;
         } else
             if ((manc & E1000_MANC_SMBUS_EN) && !(manc & E1000_MANC_ASF_EN))
-                return TRUE;
+                return true;
     }
-    return FALSE;
+    return false;
 }
 
-static int32_t
+static s32
 e1000_polarity_reversal_workaround(struct e1000_hw *hw)
 {
-    int32_t ret_val;
-    uint16_t mii_status_reg;
-    uint16_t i;
+    s32 ret_val;
+    u16 mii_status_reg;
+    u16 i;
 
     /* Polarity reversal workaround for forced 10F/10H links. */
 
@@ -7930,7 +7929,7 @@ e1000_polarity_reversal_workaround(struct e1000_hw *hw)
 static void
 e1000_set_pci_express_master_disable(struct e1000_hw *hw)
 {
-    uint32_t ctrl;
+    u32 ctrl;
 
     DEBUGFUNC("e1000_set_pci_express_master_disable");
 
@@ -7953,10 +7952,10 @@ e1000_set_pci_express_master_disable(struct e1000_hw *hw)
  *            E1000_SUCCESS master requests disabled.
  *
  ******************************************************************************/
-int32_t
+s32
 e1000_disable_pciex_master(struct e1000_hw *hw)
 {
-    int32_t timeout = MASTER_DISABLE_TIMEOUT;   /* 80ms */
+    s32 timeout = MASTER_DISABLE_TIMEOUT;   /* 80ms */
 
     DEBUGFUNC("e1000_disable_pciex_master");
 
@@ -7991,10 +7990,10 @@ e1000_disable_pciex_master(struct e1000_hw *hw)
  *            E1000_SUCCESS at any other case.
  *
  ******************************************************************************/
-static int32_t
+static s32
 e1000_get_auto_rd_done(struct e1000_hw *hw)
 {
-    int32_t timeout = AUTO_READ_DONE_TIMEOUT;
+    s32 timeout = AUTO_READ_DONE_TIMEOUT;
 
     DEBUGFUNC("e1000_get_auto_rd_done");
 
@@ -8039,11 +8038,11 @@ e1000_get_auto_rd_done(struct e1000_hw *hw)
  *            E1000_SUCCESS at any other case.
  *
  ***************************************************************************/
-static int32_t
+static s32
 e1000_get_phy_cfg_done(struct e1000_hw *hw)
 {
-    int32_t timeout = PHY_CFG_TIMEOUT;
-    uint32_t cfg_mask = E1000_EEPROM_CFG_DONE;
+    s32 timeout = PHY_CFG_TIMEOUT;
+    u32 cfg_mask = E1000_EEPROM_CFG_DONE;
 
     DEBUGFUNC("e1000_get_phy_cfg_done");
 
@@ -8086,11 +8085,11 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw)
  *            E1000_SUCCESS at any other case.
  *
  ***************************************************************************/
-static int32_t
+static s32
 e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw)
 {
-    int32_t timeout;
-    uint32_t swsm;
+    s32 timeout;
+    u32 swsm;
 
     DEBUGFUNC("e1000_get_hw_eeprom_semaphore");
 
@@ -8139,7 +8138,7 @@ e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw)
 static void
 e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw)
 {
-    uint32_t swsm;
+    u32 swsm;
 
     DEBUGFUNC("e1000_put_hw_eeprom_semaphore");
 
@@ -8165,11 +8164,11 @@ e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw)
  *            E1000_SUCCESS at any other case.
  *
  ***************************************************************************/
-static int32_t
+static s32
 e1000_get_software_semaphore(struct e1000_hw *hw)
 {
-    int32_t timeout = hw->eeprom.word_size + 1;
-    uint32_t swsm;
+    s32 timeout = hw->eeprom.word_size + 1;
+    u32 swsm;
 
     DEBUGFUNC("e1000_get_software_semaphore");
 
@@ -8204,7 +8203,7 @@ e1000_get_software_semaphore(struct e1000_hw *hw)
 static void
 e1000_release_software_semaphore(struct e1000_hw *hw)
 {
-    uint32_t swsm;
+    u32 swsm;
 
     DEBUGFUNC("e1000_release_software_semaphore");
 
@@ -8229,11 +8228,11 @@ e1000_release_software_semaphore(struct e1000_hw *hw)
  *            E1000_SUCCESS
  *
  *****************************************************************************/
-int32_t
+s32
 e1000_check_phy_reset_block(struct e1000_hw *hw)
 {
-    uint32_t manc = 0;
-    uint32_t fwsm = 0;
+    u32 manc = 0;
+    u32 fwsm = 0;
 
     if (hw->mac_type == e1000_ich8lan) {
         fwsm = E1000_READ_REG(hw, FWSM);
@@ -8247,10 +8246,10 @@ e1000_check_phy_reset_block(struct e1000_hw *hw)
         E1000_BLK_PHY_RESET : E1000_SUCCESS;
 }
 
-static uint8_t
+static u8
 e1000_arc_subsystem_valid(struct e1000_hw *hw)
 {
-    uint32_t fwsm;
+    u32 fwsm;
 
     /* On 8257x silicon, registers in the range of 0x8800 - 0x8FFC
      * may not be provided a DMA clock when no manageability features are
@@ -8264,14 +8263,14 @@ e1000_arc_subsystem_valid(struct e1000_hw *hw)
     case e1000_80003es2lan:
         fwsm = E1000_READ_REG(hw, FWSM);
         if ((fwsm & E1000_FWSM_MODE_MASK) != 0)
-            return TRUE;
+            return true;
         break;
     case e1000_ich8lan:
-        return TRUE;
+        return true;
     default:
         break;
     }
-    return FALSE;
+    return false;
 }
 
 
@@ -8284,10 +8283,10 @@ e1000_arc_subsystem_valid(struct e1000_hw *hw)
  * returns: E1000_SUCCESS
  *
  *****************************************************************************/
-static int32_t
-e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, uint32_t no_snoop)
+static s32
+e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, u32 no_snoop)
 {
-    uint32_t gcr_reg = 0;
+    u32 gcr_reg = 0;
 
     DEBUGFUNC("e1000_set_pci_ex_no_snoop");
 
@@ -8304,7 +8303,7 @@ e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, uint32_t no_snoop)
         E1000_WRITE_REG(hw, GCR, gcr_reg);
     }
     if (hw->mac_type == e1000_ich8lan) {
-        uint32_t ctrl_ext;
+        u32 ctrl_ext;
 
         E1000_WRITE_REG(hw, GCR, PCI_EX_82566_SNOOP_ALL);
 
@@ -8325,11 +8324,11 @@ e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, uint32_t no_snoop)
  * hw: Struct containing variables accessed by shared code
  *
  ***************************************************************************/
-static int32_t
+static s32
 e1000_get_software_flag(struct e1000_hw *hw)
 {
-    int32_t timeout = PHY_CFG_TIMEOUT;
-    uint32_t extcnf_ctrl;
+    s32 timeout = PHY_CFG_TIMEOUT;
+    u32 extcnf_ctrl;
 
     DEBUGFUNC("e1000_get_software_flag");
 
@@ -8367,7 +8366,7 @@ e1000_get_software_flag(struct e1000_hw *hw)
 static void
 e1000_release_software_flag(struct e1000_hw *hw)
 {
-    uint32_t extcnf_ctrl;
+    u32 extcnf_ctrl;
 
     DEBUGFUNC("e1000_release_software_flag");
 
@@ -8389,16 +8388,16 @@ e1000_release_software_flag(struct e1000_hw *hw)
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-static int32_t
-e1000_read_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,
-                       uint16_t *data)
+static s32
+e1000_read_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words,
+                       u16 *data)
 {
-    int32_t  error = E1000_SUCCESS;
-    uint32_t flash_bank = 0;
-    uint32_t act_offset = 0;
-    uint32_t bank_offset = 0;
-    uint16_t word = 0;
-    uint16_t i = 0;
+    s32  error = E1000_SUCCESS;
+    u32 flash_bank = 0;
+    u32 act_offset = 0;
+    u32 bank_offset = 0;
+    u16 word = 0;
+    u16 i = 0;
 
     /* We need to know which is the valid flash bank.  In the event
      * that we didn't allocate eeprom_shadow_ram, we may not be
@@ -8417,7 +8416,7 @@ e1000_read_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,
 
     for (i = 0; i < words; i++) {
         if (hw->eeprom_shadow_ram != NULL &&
-            hw->eeprom_shadow_ram[offset+i].modified == TRUE) {
+            hw->eeprom_shadow_ram[offset+i].modified) {
             data[i] = hw->eeprom_shadow_ram[offset+i].eeprom_word;
         } else {
             /* The NVM part needs a byte offset, hence * 2 */
@@ -8445,12 +8444,12 @@ e1000_read_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,
  * words - number of words to write
  * data - words to write to the EEPROM
  *****************************************************************************/
-static int32_t
-e1000_write_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,
-                        uint16_t *data)
+static s32
+e1000_write_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words,
+                        u16 *data)
 {
-    uint32_t i = 0;
-    int32_t error = E1000_SUCCESS;
+    u32 i = 0;
+    s32 error = E1000_SUCCESS;
 
     error = e1000_get_software_flag(hw);
     if (error != E1000_SUCCESS)
@@ -8466,7 +8465,7 @@ e1000_write_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,
     if (hw->eeprom_shadow_ram != NULL) {
         for (i = 0; i < words; i++) {
             if ((offset + i) < E1000_SHADOW_RAM_WORDS) {
-                hw->eeprom_shadow_ram[offset+i].modified = TRUE;
+                hw->eeprom_shadow_ram[offset+i].modified = true;
                 hw->eeprom_shadow_ram[offset+i].eeprom_word = data[i];
             } else {
                 error = -E1000_ERR_EEPROM;
@@ -8492,12 +8491,12 @@ e1000_write_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,
  *
  * hw - The pointer to the hw structure
  ****************************************************************************/
-static int32_t
+static s32
 e1000_ich8_cycle_init(struct e1000_hw *hw)
 {
     union ich8_hws_flash_status hsfsts;
-    int32_t error = E1000_ERR_EEPROM;
-    int32_t i     = 0;
+    s32 error = E1000_ERR_EEPROM;
+    s32 i     = 0;
 
     DEBUGFUNC("e1000_ich8_cycle_init");
 
@@ -8559,13 +8558,13 @@ e1000_ich8_cycle_init(struct e1000_hw *hw)
  *
  * hw - The pointer to the hw structure
  ****************************************************************************/
-static int32_t
-e1000_ich8_flash_cycle(struct e1000_hw *hw, uint32_t timeout)
+static s32
+e1000_ich8_flash_cycle(struct e1000_hw *hw, u32 timeout)
 {
     union ich8_hws_flash_ctrl hsflctl;
     union ich8_hws_flash_status hsfsts;
-    int32_t error = E1000_ERR_EEPROM;
-    uint32_t i = 0;
+    s32 error = E1000_ERR_EEPROM;
+    u32 i = 0;
 
     /* Start a cycle by writing 1 in Flash Cycle Go in Hw Flash Control */
     hsflctl.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
@@ -8594,16 +8593,16 @@ e1000_ich8_flash_cycle(struct e1000_hw *hw, uint32_t timeout)
  * size - Size of data to read, 1=byte 2=word
  * data - Pointer to the word to store the value read.
  *****************************************************************************/
-static int32_t
-e1000_read_ich8_data(struct e1000_hw *hw, uint32_t index,
-                     uint32_t size, uint16_t* data)
+static s32
+e1000_read_ich8_data(struct e1000_hw *hw, u32 index,
+                     u32 size, u16* data)
 {
     union ich8_hws_flash_status hsfsts;
     union ich8_hws_flash_ctrl hsflctl;
-    uint32_t flash_linear_address;
-    uint32_t flash_data = 0;
-    int32_t error = -E1000_ERR_EEPROM;
-    int32_t count = 0;
+    u32 flash_linear_address;
+    u32 flash_data = 0;
+    s32 error = -E1000_ERR_EEPROM;
+    s32 count = 0;
 
     DEBUGFUNC("e1000_read_ich8_data");
 
@@ -8641,9 +8640,9 @@ e1000_read_ich8_data(struct e1000_hw *hw, uint32_t index,
         if (error == E1000_SUCCESS) {
             flash_data = E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_FDATA0);
             if (size == 1) {
-                *data = (uint8_t)(flash_data & 0x000000FF);
+                *data = (u8)(flash_data & 0x000000FF);
             } else if (size == 2) {
-                *data = (uint16_t)(flash_data & 0x0000FFFF);
+                *data = (u16)(flash_data & 0x0000FFFF);
             }
             break;
         } else {
@@ -8673,16 +8672,16 @@ e1000_read_ich8_data(struct e1000_hw *hw, uint32_t index,
  * size - Size of data to read, 1=byte 2=word
  * data - The byte(s) to write to the NVM.
  *****************************************************************************/
-static int32_t
-e1000_write_ich8_data(struct e1000_hw *hw, uint32_t index, uint32_t size,
-                      uint16_t data)
+static s32
+e1000_write_ich8_data(struct e1000_hw *hw, u32 index, u32 size,
+                      u16 data)
 {
     union ich8_hws_flash_status hsfsts;
     union ich8_hws_flash_ctrl hsflctl;
-    uint32_t flash_linear_address;
-    uint32_t flash_data = 0;
-    int32_t error = -E1000_ERR_EEPROM;
-    int32_t count = 0;
+    u32 flash_linear_address;
+    u32 flash_data = 0;
+    s32 error = -E1000_ERR_EEPROM;
+    s32 count = 0;
 
     DEBUGFUNC("e1000_write_ich8_data");
 
@@ -8711,9 +8710,9 @@ e1000_write_ich8_data(struct e1000_hw *hw, uint32_t index, uint32_t size,
         E1000_WRITE_ICH_FLASH_REG(hw, ICH_FLASH_FADDR, flash_linear_address);
 
         if (size == 1)
-            flash_data = (uint32_t)data & 0x00FF;
+            flash_data = (u32)data & 0x00FF;
         else
-            flash_data = (uint32_t)data;
+            flash_data = (u32)data;
 
         E1000_WRITE_ICH_FLASH_REG(hw, ICH_FLASH_FDATA0, flash_data);
 
@@ -8748,15 +8747,15 @@ e1000_write_ich8_data(struct e1000_hw *hw, uint32_t index, uint32_t size,
  * index - The index of the byte to read.
  * data - Pointer to a byte to store the value read.
  *****************************************************************************/
-static int32_t
-e1000_read_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t* data)
+static s32
+e1000_read_ich8_byte(struct e1000_hw *hw, u32 index, u8* data)
 {
-    int32_t status = E1000_SUCCESS;
-    uint16_t word = 0;
+    s32 status = E1000_SUCCESS;
+    u16 word = 0;
 
     status = e1000_read_ich8_data(hw, index, 1, &word);
     if (status == E1000_SUCCESS) {
-        *data = (uint8_t)word;
+        *data = (u8)word;
     }
 
     return status;
@@ -8771,11 +8770,11 @@ e1000_read_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t* data)
  * index - The index of the byte to write.
  * byte - The byte to write to the NVM.
  *****************************************************************************/
-static int32_t
-e1000_verify_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t byte)
+static s32
+e1000_verify_write_ich8_byte(struct e1000_hw *hw, u32 index, u8 byte)
 {
-    int32_t error = E1000_SUCCESS;
-    int32_t program_retries = 0;
+    s32 error = E1000_SUCCESS;
+    s32 program_retries = 0;
 
     DEBUGOUT2("Byte := %2.2X Offset := %d\n", byte, index);
 
@@ -8804,11 +8803,11 @@ e1000_verify_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t byte)
  * index - The index of the byte to read.
  * data - The byte to write to the NVM.
  *****************************************************************************/
-static int32_t
-e1000_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t data)
+static s32
+e1000_write_ich8_byte(struct e1000_hw *hw, u32 index, u8 data)
 {
-    int32_t status = E1000_SUCCESS;
-    uint16_t word = (uint16_t)data;
+    s32 status = E1000_SUCCESS;
+    u16 word = (u16)data;
 
     status = e1000_write_ich8_data(hw, index, 1, word);
 
@@ -8822,10 +8821,10 @@ e1000_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t data)
  * index - The starting byte index of the word to read.
  * data - Pointer to a word to store the value read.
  *****************************************************************************/
-static int32_t
-e1000_read_ich8_word(struct e1000_hw *hw, uint32_t index, uint16_t *data)
+static s32
+e1000_read_ich8_word(struct e1000_hw *hw, u32 index, u16 *data)
 {
-    int32_t status = E1000_SUCCESS;
+    s32 status = E1000_SUCCESS;
     status = e1000_read_ich8_data(hw, index, 2, data);
     return status;
 }
@@ -8841,19 +8840,19 @@ e1000_read_ich8_word(struct e1000_hw *hw, uint32_t index, uint16_t *data)
  * amount of NVM used in each bank is a *minimum* of 4 KBytes, but in fact the
  * bank size may be 4, 8 or 64 KBytes
  *****************************************************************************/
-static int32_t
-e1000_erase_ich8_4k_segment(struct e1000_hw *hw, uint32_t bank)
+static s32
+e1000_erase_ich8_4k_segment(struct e1000_hw *hw, u32 bank)
 {
     union ich8_hws_flash_status hsfsts;
     union ich8_hws_flash_ctrl hsflctl;
-    uint32_t flash_linear_address;
-    int32_t  count = 0;
-    int32_t  error = E1000_ERR_EEPROM;
-    int32_t  iteration;
-    int32_t  sub_sector_size = 0;
-    int32_t  bank_size;
-    int32_t  j = 0;
-    int32_t  error_flag = 0;
+    u32 flash_linear_address;
+    s32  count = 0;
+    s32  error = E1000_ERR_EEPROM;
+    s32  iteration;
+    s32  sub_sector_size = 0;
+    s32  bank_size;
+    s32  j = 0;
+    s32  error_flag = 0;
 
     hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS);
 
@@ -8931,16 +8930,16 @@ e1000_erase_ich8_4k_segment(struct e1000_hw *hw, uint32_t bank)
     return error;
 }
 
-static int32_t
+static s32
 e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw,
-                                      uint32_t cnf_base_addr, uint32_t cnf_size)
+                                      u32 cnf_base_addr, u32 cnf_size)
 {
-    uint32_t ret_val = E1000_SUCCESS;
-    uint16_t word_addr, reg_data, reg_addr;
-    uint16_t i;
+    u32 ret_val = E1000_SUCCESS;
+    u16 word_addr, reg_data, reg_addr;
+    u16 i;
 
     /* cnf_base_addr is in DWORD */
-    word_addr = (uint16_t)(cnf_base_addr << 1);
+    word_addr = (u16)(cnf_base_addr << 1);
 
     /* cnf_size is returned in size of dwords */
     for (i = 0; i < cnf_size; i++) {
@@ -8956,7 +8955,7 @@ e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw,
         if (ret_val != E1000_SUCCESS)
             return ret_val;
 
-        ret_val = e1000_write_phy_reg_ex(hw, (uint32_t)reg_addr, reg_data);
+        ret_val = e1000_write_phy_reg_ex(hw, (u32)reg_addr, reg_data);
 
         e1000_release_software_flag(hw);
     }
@@ -8973,10 +8972,10 @@ e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw,
  *
  * hw: Struct containing variables accessed by shared code
  *****************************************************************************/
-static int32_t
+static s32
 e1000_init_lcd_from_nvm(struct e1000_hw *hw)
 {
-    uint32_t reg_data, cnf_base_addr, cnf_size, ret_val, loop;
+    u32 reg_data, cnf_base_addr, cnf_size, ret_val, loop;
 
     if (hw->phy_type != e1000_phy_igp_3)
           return E1000_SUCCESS;
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index a6c3c34feb98..99fce2c5dd26 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -100,8 +100,8 @@ typedef enum {
 } e1000_fc_type;
 
 struct e1000_shadow_ram {
-    uint16_t    eeprom_word;
-    boolean_t   modified;
+    u16 eeprom_word;
+    bool modified;
 };
 
 /* PCI bus types */
@@ -263,19 +263,19 @@ struct e1000_phy_info {
 };
 
 struct e1000_phy_stats {
-    uint32_t idle_errors;
-    uint32_t receive_errors;
+    u32 idle_errors;
+    u32 receive_errors;
 };
 
 struct e1000_eeprom_info {
     e1000_eeprom_type type;
-    uint16_t word_size;
-    uint16_t opcode_bits;
-    uint16_t address_bits;
-    uint16_t delay_usec;
-    uint16_t page_size;
-    boolean_t use_eerd;
-    boolean_t use_eewr;
+    u16 word_size;
+    u16 opcode_bits;
+    u16 address_bits;
+    u16 delay_usec;
+    u16 page_size;
+    bool use_eerd;
+    bool use_eewr;
 };
 
 /* Flex ASF Information */
@@ -308,34 +308,34 @@ typedef enum {
 
 /* Function prototypes */
 /* Initialization */
-int32_t e1000_reset_hw(struct e1000_hw *hw);
-int32_t e1000_init_hw(struct e1000_hw *hw);
-int32_t e1000_set_mac_type(struct e1000_hw *hw);
+s32 e1000_reset_hw(struct e1000_hw *hw);
+s32 e1000_init_hw(struct e1000_hw *hw);
+s32 e1000_set_mac_type(struct e1000_hw *hw);
 void e1000_set_media_type(struct e1000_hw *hw);
 
 /* Link Configuration */
-int32_t e1000_setup_link(struct e1000_hw *hw);
-int32_t e1000_phy_setup_autoneg(struct e1000_hw *hw);
+s32 e1000_setup_link(struct e1000_hw *hw);
+s32 e1000_phy_setup_autoneg(struct e1000_hw *hw);
 void e1000_config_collision_dist(struct e1000_hw *hw);
-int32_t e1000_check_for_link(struct e1000_hw *hw);
-int32_t e1000_get_speed_and_duplex(struct e1000_hw *hw, uint16_t *speed, uint16_t *duplex);
-int32_t e1000_force_mac_fc(struct e1000_hw *hw);
+s32 e1000_check_for_link(struct e1000_hw *hw);
+s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex);
+s32 e1000_force_mac_fc(struct e1000_hw *hw);
 
 /* PHY */
-int32_t e1000_read_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *phy_data);
-int32_t e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t data);
-int32_t e1000_phy_hw_reset(struct e1000_hw *hw);
-int32_t e1000_phy_reset(struct e1000_hw *hw);
-int32_t e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-int32_t e1000_validate_mdi_setting(struct e1000_hw *hw);
+s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 *phy_data);
+s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 data);
+s32 e1000_phy_hw_reset(struct e1000_hw *hw);
+s32 e1000_phy_reset(struct e1000_hw *hw);
+s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
+s32 e1000_validate_mdi_setting(struct e1000_hw *hw);
 
 void e1000_phy_powerdown_workaround(struct e1000_hw *hw);
 
 /* EEPROM Functions */
-int32_t e1000_init_eeprom_params(struct e1000_hw *hw);
+s32 e1000_init_eeprom_params(struct e1000_hw *hw);
 
 /* MNG HOST IF functions */
-uint32_t e1000_enable_mng_pass_thru(struct e1000_hw *hw);
+u32 e1000_enable_mng_pass_thru(struct e1000_hw *hw);
 
 #define E1000_MNG_DHCP_TX_PAYLOAD_CMD   64
 #define E1000_HI_MAX_MNG_DATA_LENGTH    0x6F8   /* Host Interface data length */
@@ -354,80 +354,80 @@ uint32_t e1000_enable_mng_pass_thru(struct e1000_hw *hw);
 #define E1000_VFTA_ENTRY_BIT_SHIFT_MASK              0x1F
 
 struct e1000_host_mng_command_header {
-    uint8_t command_id;
-    uint8_t checksum;
-    uint16_t reserved1;
-    uint16_t reserved2;
-    uint16_t command_length;
+    u8 command_id;
+    u8 checksum;
+    u16 reserved1;
+    u16 reserved2;
+    u16 command_length;
 };
 
 struct e1000_host_mng_command_info {
     struct e1000_host_mng_command_header command_header;  /* Command Head/Command Result Head has 4 bytes */
-    uint8_t command_data[E1000_HI_MAX_MNG_DATA_LENGTH];   /* Command data can length 0..0x658*/
+    u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];   /* Command data can length 0..0x658*/
 };
 #ifdef __BIG_ENDIAN
 struct e1000_host_mng_dhcp_cookie{
-    uint32_t signature;
-    uint16_t vlan_id;
-    uint8_t reserved0;
-    uint8_t status;
-    uint32_t reserved1;
-    uint8_t checksum;
-    uint8_t reserved3;
-    uint16_t reserved2;
+    u32 signature;
+    u16 vlan_id;
+    u8 reserved0;
+    u8 status;
+    u32 reserved1;
+    u8 checksum;
+    u8 reserved3;
+    u16 reserved2;
 };
 #else
 struct e1000_host_mng_dhcp_cookie{
-    uint32_t signature;
-    uint8_t status;
-    uint8_t reserved0;
-    uint16_t vlan_id;
-    uint32_t reserved1;
-    uint16_t reserved2;
-    uint8_t reserved3;
-    uint8_t checksum;
+    u32 signature;
+    u8 status;
+    u8 reserved0;
+    u16 vlan_id;
+    u32 reserved1;
+    u16 reserved2;
+    u8 reserved3;
+    u8 checksum;
 };
 #endif
 
-int32_t e1000_mng_write_dhcp_info(struct e1000_hw *hw, uint8_t *buffer,
-                                  uint16_t length);
-boolean_t e1000_check_mng_mode(struct e1000_hw *hw);
-boolean_t e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);
-int32_t e1000_read_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t words, uint16_t *data);
-int32_t e1000_validate_eeprom_checksum(struct e1000_hw *hw);
-int32_t e1000_update_eeprom_checksum(struct e1000_hw *hw);
-int32_t e1000_write_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t words, uint16_t *data);
-int32_t e1000_read_mac_addr(struct e1000_hw * hw);
+s32 e1000_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer,
+                                  u16 length);
+bool e1000_check_mng_mode(struct e1000_hw *hw);
+bool e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);
+s32 e1000_read_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 *data);
+s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw);
+s32 e1000_update_eeprom_checksum(struct e1000_hw *hw);
+s32 e1000_write_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 *data);
+s32 e1000_read_mac_addr(struct e1000_hw * hw);
 
 /* Filters (multicast, vlan, receive) */
-uint32_t e1000_hash_mc_addr(struct e1000_hw *hw, uint8_t * mc_addr);
-void e1000_mta_set(struct e1000_hw *hw, uint32_t hash_value);
-void e1000_rar_set(struct e1000_hw *hw, uint8_t * mc_addr, uint32_t rar_index);
-void e1000_write_vfta(struct e1000_hw *hw, uint32_t offset, uint32_t value);
+u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 * mc_addr);
+void e1000_mta_set(struct e1000_hw *hw, u32 hash_value);
+void e1000_rar_set(struct e1000_hw *hw, u8 * mc_addr, u32 rar_index);
+void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value);
 
 /* LED functions */
-int32_t e1000_setup_led(struct e1000_hw *hw);
-int32_t e1000_cleanup_led(struct e1000_hw *hw);
-int32_t e1000_led_on(struct e1000_hw *hw);
-int32_t e1000_led_off(struct e1000_hw *hw);
-int32_t e1000_blink_led_start(struct e1000_hw *hw);
+s32 e1000_setup_led(struct e1000_hw *hw);
+s32 e1000_cleanup_led(struct e1000_hw *hw);
+s32 e1000_led_on(struct e1000_hw *hw);
+s32 e1000_led_off(struct e1000_hw *hw);
+s32 e1000_blink_led_start(struct e1000_hw *hw);
 
 /* Adaptive IFS Functions */
 
 /* Everything else */
 void e1000_reset_adaptive(struct e1000_hw *hw);
 void e1000_update_adaptive(struct e1000_hw *hw);
-void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats, uint32_t frame_len, uint8_t * mac_addr);
+void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats, u32 frame_len, u8 * mac_addr);
 void e1000_get_bus_info(struct e1000_hw *hw);
 void e1000_pci_set_mwi(struct e1000_hw *hw);
 void e1000_pci_clear_mwi(struct e1000_hw *hw);
-int32_t e1000_read_pcie_cap_reg(struct e1000_hw *hw, uint32_t reg, uint16_t *value);
+s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
 void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc);
 int e1000_pcix_get_mmrbc(struct e1000_hw *hw);
 /* Port I/O is only supported on 82544 and newer */
-void e1000_io_write(struct e1000_hw *hw, unsigned long port, uint32_t value);
-int32_t e1000_disable_pciex_master(struct e1000_hw *hw);
-int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);
+void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value);
+s32 e1000_disable_pciex_master(struct e1000_hw *hw);
+s32 e1000_check_phy_reset_block(struct e1000_hw *hw);
 
 
 #define E1000_READ_REG_IO(a, reg) \
@@ -596,8 +596,8 @@ struct e1000_rx_desc {
     __le64 buffer_addr; /* Address of the descriptor's data buffer */
     __le16 length;     /* Length of data DMAed into data buffer */
     __le16 csum;       /* Packet checksum */
-    uint8_t status;      /* Descriptor status */
-    uint8_t errors;      /* Descriptor Errors */
+    u8 status;      /* Descriptor status */
+    u8 errors;      /* Descriptor Errors */
     __le16 special;
 };
 
@@ -718,15 +718,15 @@ struct e1000_tx_desc {
         __le32 data;
         struct {
             __le16 length;    /* Data buffer length */
-            uint8_t cso;        /* Checksum offset */
-            uint8_t cmd;        /* Descriptor control */
+            u8 cso;        /* Checksum offset */
+            u8 cmd;        /* Descriptor control */
         } flags;
     } lower;
     union {
         __le32 data;
         struct {
-            uint8_t status;     /* Descriptor status */
-            uint8_t css;        /* Checksum start */
+            u8 status;     /* Descriptor status */
+            u8 css;        /* Checksum start */
             __le16 special;
         } fields;
     } upper;
@@ -759,16 +759,16 @@ struct e1000_context_desc {
     union {
         __le32 ip_config;
         struct {
-            uint8_t ipcss;      /* IP checksum start */
-            uint8_t ipcso;      /* IP checksum offset */
+            u8 ipcss;      /* IP checksum start */
+            u8 ipcso;      /* IP checksum offset */
             __le16 ipcse;     /* IP checksum end */
         } ip_fields;
     } lower_setup;
     union {
         __le32 tcp_config;
         struct {
-            uint8_t tucss;      /* TCP checksum start */
-            uint8_t tucso;      /* TCP checksum offset */
+            u8 tucss;      /* TCP checksum start */
+            u8 tucso;      /* TCP checksum offset */
             __le16 tucse;     /* TCP checksum end */
         } tcp_fields;
     } upper_setup;
@@ -776,8 +776,8 @@ struct e1000_context_desc {
     union {
         __le32 data;
         struct {
-            uint8_t status;     /* Descriptor status */
-            uint8_t hdr_len;    /* Header length */
+            u8 status;     /* Descriptor status */
+            u8 hdr_len;    /* Header length */
             __le16 mss;       /* Maximum segment size */
         } fields;
     } tcp_seg_setup;
@@ -790,15 +790,15 @@ struct e1000_data_desc {
         __le32 data;
         struct {
             __le16 length;    /* Data buffer length */
-            uint8_t typ_len_ext;        /* */
-            uint8_t cmd;        /* */
+            u8 typ_len_ext;        /* */
+            u8 cmd;        /* */
         } flags;
     } lower;
     union {
         __le32 data;
         struct {
-            uint8_t status;     /* Descriptor status */
-            uint8_t popts;      /* Packet Options */
+            u8 status;     /* Descriptor status */
+            u8 popts;      /* Packet Options */
             __le16 special;   /* */
         } fields;
     } upper;
@@ -825,8 +825,8 @@ struct e1000_rar {
 
 /* IPv4 Address Table Entry */
 struct e1000_ipv4_at_entry {
-    volatile uint32_t ipv4_addr;        /* IP Address (RW) */
-    volatile uint32_t reserved;
+    volatile u32 ipv4_addr;        /* IP Address (RW) */
+    volatile u32 reserved;
 };
 
 /* Four wakeup IP addresses are supported */
@@ -837,25 +837,25 @@ struct e1000_ipv4_at_entry {
 
 /* IPv6 Address Table Entry */
 struct e1000_ipv6_at_entry {
-    volatile uint8_t ipv6_addr[16];
+    volatile u8 ipv6_addr[16];
 };
 
 /* Flexible Filter Length Table Entry */
 struct e1000_fflt_entry {
-    volatile uint32_t length;   /* Flexible Filter Length (RW) */
-    volatile uint32_t reserved;
+    volatile u32 length;   /* Flexible Filter Length (RW) */
+    volatile u32 reserved;
 };
 
 /* Flexible Filter Mask Table Entry */
 struct e1000_ffmt_entry {
-    volatile uint32_t mask;     /* Flexible Filter Mask (RW) */
-    volatile uint32_t reserved;
+    volatile u32 mask;     /* Flexible Filter Mask (RW) */
+    volatile u32 reserved;
 };
 
 /* Flexible Filter Value Table Entry */
 struct e1000_ffvt_entry {
-    volatile uint32_t value;    /* Flexible Filter Value (RW) */
-    volatile uint32_t reserved;
+    volatile u32 value;    /* Flexible Filter Value (RW) */
+    volatile u32 reserved;
 };
 
 /* Four Flexible Filters are supported */
@@ -1309,89 +1309,89 @@ struct e1000_ffvt_entry {
 
 /* Statistics counters collected by the MAC */
 struct e1000_hw_stats {
-        uint64_t                crcerrs;
-        uint64_t                algnerrc;
-        uint64_t                symerrs;
-        uint64_t                rxerrc;
-        uint64_t                txerrc;
-        uint64_t                mpc;
-        uint64_t                scc;
-        uint64_t                ecol;
-        uint64_t                mcc;
-        uint64_t                latecol;
-        uint64_t                colc;
-        uint64_t                dc;
-        uint64_t                tncrs;
-        uint64_t                sec;
-        uint64_t                cexterr;
-        uint64_t                rlec;
-        uint64_t                xonrxc;
-        uint64_t                xontxc;
-        uint64_t                xoffrxc;
-        uint64_t                xofftxc;
-        uint64_t                fcruc;
-        uint64_t                prc64;
-        uint64_t                prc127;
-        uint64_t                prc255;
-        uint64_t                prc511;
-        uint64_t                prc1023;
-        uint64_t                prc1522;
-        uint64_t                gprc;
-        uint64_t                bprc;
-        uint64_t                mprc;
-        uint64_t                gptc;
-        uint64_t                gorcl;
-        uint64_t                gorch;
-        uint64_t                gotcl;
-        uint64_t                gotch;
-        uint64_t                rnbc;
-        uint64_t                ruc;
-        uint64_t                rfc;
-        uint64_t                roc;
-        uint64_t                rlerrc;
-        uint64_t                rjc;
-        uint64_t                mgprc;
-        uint64_t                mgpdc;
-        uint64_t                mgptc;
-        uint64_t                torl;
-        uint64_t                torh;
-        uint64_t                totl;
-        uint64_t                toth;
-        uint64_t                tpr;
-        uint64_t                tpt;
-        uint64_t                ptc64;
-        uint64_t                ptc127;
-        uint64_t                ptc255;
-        uint64_t                ptc511;
-        uint64_t                ptc1023;
-        uint64_t                ptc1522;
-        uint64_t                mptc;
-        uint64_t                bptc;
-        uint64_t                tsctc;
-        uint64_t                tsctfc;
-        uint64_t                iac;
-        uint64_t                icrxptc;
-        uint64_t                icrxatc;
-        uint64_t                ictxptc;
-        uint64_t                ictxatc;
-        uint64_t                ictxqec;
-        uint64_t                ictxqmtc;
-        uint64_t                icrxdmtc;
-        uint64_t                icrxoc;
+        u64             crcerrs;
+        u64             algnerrc;
+        u64             symerrs;
+        u64             rxerrc;
+        u64             txerrc;
+        u64             mpc;
+        u64             scc;
+        u64             ecol;
+        u64             mcc;
+        u64             latecol;
+        u64             colc;
+        u64             dc;
+        u64             tncrs;
+        u64             sec;
+        u64             cexterr;
+        u64             rlec;
+        u64             xonrxc;
+        u64             xontxc;
+        u64             xoffrxc;
+        u64             xofftxc;
+        u64             fcruc;
+        u64             prc64;
+        u64             prc127;
+        u64             prc255;
+        u64             prc511;
+        u64             prc1023;
+        u64             prc1522;
+        u64             gprc;
+        u64             bprc;
+        u64             mprc;
+        u64             gptc;
+        u64             gorcl;
+        u64             gorch;
+        u64             gotcl;
+        u64             gotch;
+        u64             rnbc;
+        u64             ruc;
+        u64             rfc;
+        u64             roc;
+        u64             rlerrc;
+        u64             rjc;
+        u64             mgprc;
+        u64             mgpdc;
+        u64             mgptc;
+        u64             torl;
+        u64             torh;
+        u64             totl;
+        u64             toth;
+        u64             tpr;
+        u64             tpt;
+        u64             ptc64;
+        u64             ptc127;
+        u64             ptc255;
+        u64             ptc511;
+        u64             ptc1023;
+        u64             ptc1522;
+        u64             mptc;
+        u64             bptc;
+        u64             tsctc;
+        u64             tsctfc;
+        u64             iac;
+        u64             icrxptc;
+        u64             icrxatc;
+        u64             ictxptc;
+        u64             ictxatc;
+        u64             ictxqec;
+        u64             ictxqmtc;
+        u64             icrxdmtc;
+        u64             icrxoc;
 };
 
 /* Structure containing variables used by the shared code (e1000_hw.c) */
 struct e1000_hw {
-        uint8_t __iomem         *hw_addr;
-        uint8_t __iomem         *flash_address;
+        u8 __iomem              *hw_addr;
+        u8 __iomem              *flash_address;
         e1000_mac_type          mac_type;
         e1000_phy_type          phy_type;
-        uint32_t                phy_init_script;
+        u32             phy_init_script;
         e1000_media_type        media_type;
         void                    *back;
         struct e1000_shadow_ram *eeprom_shadow_ram;
-        uint32_t                flash_bank_size;
-        uint32_t                flash_base_addr;
+        u32             flash_bank_size;
+        u32             flash_base_addr;
         e1000_fc_type           fc;
         e1000_bus_speed         bus_speed;
         e1000_bus_width         bus_width;
@@ -1400,75 +1400,75 @@ struct e1000_hw {
         e1000_ms_type           master_slave;
         e1000_ms_type           original_master_slave;
         e1000_ffe_config        ffe_config_state;
-        uint32_t                asf_firmware_present;
-        uint32_t                eeprom_semaphore_present;
-        uint32_t                swfw_sync_present;
-        uint32_t                swfwhw_semaphore_present;
+        u32             asf_firmware_present;
+        u32             eeprom_semaphore_present;
+        u32             swfw_sync_present;
+        u32             swfwhw_semaphore_present;
         unsigned long           io_base;
-        uint32_t                phy_id;
-        uint32_t                phy_revision;
-        uint32_t                phy_addr;
-        uint32_t                original_fc;
-        uint32_t                txcw;
-        uint32_t                autoneg_failed;
-        uint32_t                max_frame_size;
-        uint32_t                min_frame_size;
-        uint32_t                mc_filter_type;
-        uint32_t                num_mc_addrs;
-        uint32_t                collision_delta;
-        uint32_t                tx_packet_delta;
-        uint32_t                ledctl_default;
-        uint32_t                ledctl_mode1;
-        uint32_t                ledctl_mode2;
-        boolean_t               tx_pkt_filtering;
+        u32             phy_id;
+        u32             phy_revision;
+        u32             phy_addr;
+        u32             original_fc;
+        u32             txcw;
+        u32             autoneg_failed;
+        u32             max_frame_size;
+        u32             min_frame_size;
+        u32             mc_filter_type;
+        u32             num_mc_addrs;
+        u32             collision_delta;
+        u32             tx_packet_delta;
+        u32             ledctl_default;
+        u32             ledctl_mode1;
+        u32             ledctl_mode2;
+        bool                    tx_pkt_filtering;
         struct e1000_host_mng_dhcp_cookie mng_cookie;
-        uint16_t                phy_spd_default;
-        uint16_t                autoneg_advertised;
-        uint16_t                pci_cmd_word;
-        uint16_t                fc_high_water;
-        uint16_t                fc_low_water;
-        uint16_t                fc_pause_time;
-        uint16_t                current_ifs_val;
-        uint16_t                ifs_min_val;
-        uint16_t                ifs_max_val;
-        uint16_t                ifs_step_size;
-        uint16_t                ifs_ratio;
-        uint16_t                device_id;
-        uint16_t                vendor_id;
-        uint16_t                subsystem_id;
-        uint16_t                subsystem_vendor_id;
-        uint8_t                 revision_id;
-        uint8_t                 autoneg;
-        uint8_t                 mdix;
-        uint8_t                 forced_speed_duplex;
-        uint8_t                 wait_autoneg_complete;
-        uint8_t                 dma_fairness;
-        uint8_t                 mac_addr[NODE_ADDRESS_SIZE];
-        uint8_t                 perm_mac_addr[NODE_ADDRESS_SIZE];
-        boolean_t               disable_polarity_correction;
-        boolean_t               speed_downgraded;
+        u16             phy_spd_default;
+        u16             autoneg_advertised;
+        u16             pci_cmd_word;
+        u16             fc_high_water;
+        u16             fc_low_water;
+        u16             fc_pause_time;
+        u16             current_ifs_val;
+        u16             ifs_min_val;
+        u16             ifs_max_val;
+        u16             ifs_step_size;
+        u16             ifs_ratio;
+        u16             device_id;
+        u16             vendor_id;
+        u16             subsystem_id;
+        u16             subsystem_vendor_id;
+        u8                      revision_id;
+        u8                      autoneg;
+        u8                      mdix;
+        u8                      forced_speed_duplex;
+        u8                      wait_autoneg_complete;
+        u8                      dma_fairness;
+        u8                      mac_addr[NODE_ADDRESS_SIZE];
+        u8                      perm_mac_addr[NODE_ADDRESS_SIZE];
+        bool                    disable_polarity_correction;
+        bool                    speed_downgraded;
         e1000_smart_speed       smart_speed;
         e1000_dsp_config        dsp_config_state;
-        boolean_t               get_link_status;
-        boolean_t               serdes_link_down;
-        boolean_t               tbi_compatibility_en;
-        boolean_t               tbi_compatibility_on;
-        boolean_t               laa_is_present;
-        boolean_t               phy_reset_disable;
-        boolean_t               initialize_hw_bits_disable;
-        boolean_t               fc_send_xon;
-        boolean_t               fc_strict_ieee;
-        boolean_t               report_tx_early;
-        boolean_t               adaptive_ifs;
-        boolean_t               ifs_params_forced;
-        boolean_t               in_ifs_mode;
-        boolean_t               mng_reg_access_disabled;
-        boolean_t               leave_av_bit_off;
-        boolean_t               kmrn_lock_loss_workaround_disabled;
-        boolean_t               bad_tx_carr_stats_fd;
-        boolean_t               has_manc2h;
-        boolean_t               rx_needs_kicking;
-        boolean_t               has_smbus;
+        bool                    get_link_status;
+        bool                    serdes_link_down;
+        bool                    tbi_compatibility_en;
+        bool                    tbi_compatibility_on;
+        bool                    laa_is_present;
+        bool                    phy_reset_disable;
+        bool                    initialize_hw_bits_disable;
+        bool                    fc_send_xon;
+        bool                    fc_strict_ieee;
+        bool                    report_tx_early;
+        bool                    adaptive_ifs;
+        bool                    ifs_params_forced;
+        bool                    in_ifs_mode;
+        bool                    mng_reg_access_disabled;
+        bool                    leave_av_bit_off;
+        bool                    kmrn_lock_loss_workaround_disabled;
+        bool                    bad_tx_carr_stats_fd;
+        bool                    has_manc2h;
+        bool                    rx_needs_kicking;
+        bool                    has_smbus;
 };
 
 
@@ -2165,14 +2165,14 @@ typedef enum {
 #define E1000_HI_COMMAND_TIMEOUT         500 /* Time in ms to process HI command */
 
 struct e1000_host_command_header {
-    uint8_t command_id;
-    uint8_t command_length;
-    uint8_t command_options;   /* I/F bits for command, status for return */
-    uint8_t checksum;
+    u8 command_id;
+    u8 command_length;
+    u8 command_options;   /* I/F bits for command, status for return */
+    u8 checksum;
 };
 struct e1000_host_command_info {
     struct e1000_host_command_header command_header;  /* Command Head/Command Result Head has 4 bytes */
-    uint8_t command_data[E1000_HI_MAX_DATA_LENGTH];   /* Command data can length 0..252 */
+    u8 command_data[E1000_HI_MAX_DATA_LENGTH];   /* Command data can length 0..252 */
 };
 
 /* Host SMB register #0 */
@@ -2495,7 +2495,7 @@ struct e1000_host_command_info {
 /* Number of milliseconds we wait for PHY configuration done after MAC reset */
 #define PHY_CFG_TIMEOUT             100
 
-#define E1000_TX_BUFFER_SIZE ((uint32_t)1514)
+#define E1000_TX_BUFFER_SIZE ((u32)1514)
 
 /* The carrier extension symbol, as received by the NIC. */
 #define CARRIER_EXTENSION   0x0F
@@ -2518,11 +2518,11 @@ struct e1000_host_command_info {
  * Typical use:
  *  ...
  *  if (TBI_ACCEPT) {
- *      accept_frame = TRUE;
+ *      accept_frame = true;
  *      e1000_tbi_adjust_stats(adapter, MacAddress);
  *      frame_length--;
  *  } else {
- *      accept_frame = FALSE;
+ *      accept_frame = false;
  *  }
  *  ...
  */
@@ -3312,68 +3312,68 @@ struct e1000_host_command_info {
 /* Offset 04h HSFSTS */
 union ich8_hws_flash_status {
     struct ich8_hsfsts {
-#ifdef E1000_BIG_ENDIAN
-        uint16_t reserved2      :6;
-        uint16_t fldesvalid     :1;
-        uint16_t flockdn        :1;
-        uint16_t flcdone        :1;
-        uint16_t flcerr         :1;
-        uint16_t dael           :1;
-        uint16_t berasesz       :2;
-        uint16_t flcinprog      :1;
-        uint16_t reserved1      :2;
+#ifdef __BIG_ENDIAN
+        u16 reserved2      :6;
+        u16 fldesvalid     :1;
+        u16 flockdn        :1;
+        u16 flcdone        :1;
+        u16 flcerr         :1;
+        u16 dael           :1;
+        u16 berasesz       :2;
+        u16 flcinprog      :1;
+        u16 reserved1      :2;
 #else
-        uint16_t flcdone        :1;   /* bit 0 Flash Cycle Done */
-        uint16_t flcerr         :1;   /* bit 1 Flash Cycle Error */
-        uint16_t dael           :1;   /* bit 2 Direct Access error Log */
-        uint16_t berasesz       :2;   /* bit 4:3 Block/Sector Erase Size */
-        uint16_t flcinprog      :1;   /* bit 5 flash SPI cycle in Progress */
-        uint16_t reserved1      :2;   /* bit 13:6 Reserved */
-        uint16_t reserved2      :6;   /* bit 13:6 Reserved */
-        uint16_t fldesvalid     :1;   /* bit 14 Flash Descriptor Valid */
-        uint16_t flockdn        :1;   /* bit 15 Flash Configuration Lock-Down */
+        u16 flcdone        :1;   /* bit 0 Flash Cycle Done */
+        u16 flcerr         :1;   /* bit 1 Flash Cycle Error */
+        u16 dael           :1;   /* bit 2 Direct Access error Log */
+        u16 berasesz       :2;   /* bit 4:3 Block/Sector Erase Size */
+        u16 flcinprog      :1;   /* bit 5 flash SPI cycle in Progress */
+        u16 reserved1      :2;   /* bit 13:6 Reserved */
+        u16 reserved2      :6;   /* bit 13:6 Reserved */
+        u16 fldesvalid     :1;   /* bit 14 Flash Descriptor Valid */
+        u16 flockdn        :1;   /* bit 15 Flash Configuration Lock-Down */
 #endif
     } hsf_status;
-    uint16_t regval;
+    u16 regval;
 };
 
 /* ICH8 GbE Flash Hardware Sequencing Flash control Register bit breakdown */
 /* Offset 06h FLCTL */
 union ich8_hws_flash_ctrl {
     struct ich8_hsflctl {
-#ifdef E1000_BIG_ENDIAN
-        uint16_t fldbcount      :2;
-        uint16_t flockdn        :6;
-        uint16_t flcgo          :1;
-        uint16_t flcycle        :2;
-        uint16_t reserved       :5;
+#ifdef __BIG_ENDIAN
+        u16 fldbcount      :2;
+        u16 flockdn        :6;
+        u16 flcgo          :1;
+        u16 flcycle        :2;
+        u16 reserved       :5;
 #else
-        uint16_t flcgo          :1;   /* 0 Flash Cycle Go */
-        uint16_t flcycle        :2;   /* 2:1 Flash Cycle */
-        uint16_t reserved       :5;   /* 7:3 Reserved  */
-        uint16_t fldbcount      :2;   /* 9:8 Flash Data Byte Count */
-        uint16_t flockdn        :6;   /* 15:10 Reserved */
+        u16 flcgo          :1;   /* 0 Flash Cycle Go */
+        u16 flcycle        :2;   /* 2:1 Flash Cycle */
+        u16 reserved       :5;   /* 7:3 Reserved  */
+        u16 fldbcount      :2;   /* 9:8 Flash Data Byte Count */
+        u16 flockdn        :6;   /* 15:10 Reserved */
 #endif
     } hsf_ctrl;
-    uint16_t regval;
+    u16 regval;
 };
 
 /* ICH8 Flash Region Access Permissions */
 union ich8_hws_flash_regacc {
     struct ich8_flracc {
-#ifdef E1000_BIG_ENDIAN
-        uint32_t gmwag          :8;
-        uint32_t gmrag          :8;
-        uint32_t grwa           :8;
-        uint32_t grra           :8;
+#ifdef __BIG_ENDIAN
+        u32 gmwag          :8;
+        u32 gmrag          :8;
+        u32 grwa           :8;
+        u32 grra           :8;
 #else
-        uint32_t grra           :8;   /* 0:7 GbE region Read Access */
-        uint32_t grwa           :8;   /* 8:15 GbE region Write Access */
-        uint32_t gmrag          :8;   /* 23:16 GbE Master Read Access Grant  */
-        uint32_t gmwag          :8;   /* 31:24 GbE Master Write Access Grant */
+        u32 grra           :8;   /* 0:7 GbE region Read Access */
+        u32 grwa           :8;   /* 8:15 GbE region Write Access */
+        u32 gmrag          :8;   /* 23:16 GbE Master Read Access Grant  */
+        u32 gmwag          :8;   /* 31:24 GbE Master Write Access Grant */
 #endif
     } hsf_flregacc;
-    uint16_t regval;
+    u16 regval;
 };
 
 /* Miscellaneous PHY bit definitions. */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 0991648c53dc..59579b1d8843 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -127,7 +127,7 @@ int e1000_up(struct e1000_adapter *adapter);
 void e1000_down(struct e1000_adapter *adapter);
 void e1000_reinit_locked(struct e1000_adapter *adapter);
 void e1000_reset(struct e1000_adapter *adapter);
-int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
+int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
 int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
 int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
 void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
@@ -169,21 +169,21 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
 static int e1000_set_mac(struct net_device *netdev, void *p);
 static irqreturn_t e1000_intr(int irq, void *data);
 static irqreturn_t e1000_intr_msi(int irq, void *data);
-static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_tx_ring *tx_ring);
+static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
+                               struct e1000_tx_ring *tx_ring);
 #ifdef CONFIG_E1000_NAPI
 static int e1000_clean(struct napi_struct *napi, int budget);
-static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_rx_ring *rx_ring,
-                                    int *work_done, int work_to_do);
-static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
-                                       struct e1000_rx_ring *rx_ring,
-                                       int *work_done, int work_to_do);
+static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                               struct e1000_rx_ring *rx_ring,
+                               int *work_done, int work_to_do);
+static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
+                                  struct e1000_rx_ring *rx_ring,
+                                  int *work_done, int work_to_do);
 #else
-static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_rx_ring *rx_ring);
-static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
-                                       struct e1000_rx_ring *rx_ring);
+static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                               struct e1000_rx_ring *rx_ring);
+static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
+                                  struct e1000_rx_ring *rx_ring);
 #endif
 static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
                                    struct e1000_rx_ring *rx_ring,
@@ -203,8 +203,8 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
                                        struct sk_buff *skb);
 
 static void e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp);
-static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
+static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);
 
 static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
@@ -347,7 +347,6 @@ static void e1000_free_irq(struct e1000_adapter *adapter)
 static void
 e1000_irq_disable(struct e1000_adapter *adapter)
 {
-        atomic_inc(&adapter->irq_sem);
         E1000_WRITE_REG(&adapter->hw, IMC, ~0);
         E1000_WRITE_FLUSH(&adapter->hw);
         synchronize_irq(adapter->pdev->irq);
@@ -361,18 +360,16 @@ e1000_irq_disable(struct e1000_adapter *adapter)
 static void
 e1000_irq_enable(struct e1000_adapter *adapter)
 {
-        if (likely(atomic_dec_and_test(&adapter->irq_sem))) {
-                E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);
-                E1000_WRITE_FLUSH(&adapter->hw);
-        }
+        E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);
+        E1000_WRITE_FLUSH(&adapter->hw);
 }
 
 static void
 e1000_update_mng_vlan(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        uint16_t vid = adapter->hw.mng_cookie.vlan_id;
-        uint16_t old_vid = adapter->mng_vlan_id;
+        u16 vid = adapter->hw.mng_cookie.vlan_id;
+        u16 old_vid = adapter->mng_vlan_id;
         if (adapter->vlgrp) {
                 if (!vlan_group_get_device(adapter->vlgrp, vid)) {
                         if (adapter->hw.mng_cookie.status &
@@ -382,7 +379,7 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)
                         } else
                                 adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
 
-                        if ((old_vid != (uint16_t)E1000_MNG_VLAN_NONE) &&
+                        if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&
                                         (vid != old_vid) &&
                             !vlan_group_get_device(adapter->vlgrp, old_vid))
                                 e1000_vlan_rx_kill_vid(netdev, old_vid);
@@ -405,8 +402,8 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)
 static void
 e1000_release_hw_control(struct e1000_adapter *adapter)
 {
-        uint32_t ctrl_ext;
-        uint32_t swsm;
+        u32 ctrl_ext;
+        u32 swsm;
 
         /* Let firmware taken over control of h/w */
         switch (adapter->hw.mac_type) {
@@ -442,8 +439,8 @@ e1000_release_hw_control(struct e1000_adapter *adapter)
 static void
 e1000_get_hw_control(struct e1000_adapter *adapter)
 {
-        uint32_t ctrl_ext;
-        uint32_t swsm;
+        u32 ctrl_ext;
+        u32 swsm;
 
         /* Let firmware know the driver has taken over */
         switch (adapter->hw.mac_type) {
@@ -469,7 +466,7 @@ static void
 e1000_init_manageability(struct e1000_adapter *adapter)
 {
         if (adapter->en_mng_pt) {
-                uint32_t manc = E1000_READ_REG(&adapter->hw, MANC);
+                u32 manc = E1000_READ_REG(&adapter->hw, MANC);
 
                 /* disable hardware interception of ARP */
                 manc &= ~(E1000_MANC_ARP_EN);
@@ -478,7 +475,7 @@ e1000_init_manageability(struct e1000_adapter *adapter)
                 /* this will probably generate destination unreachable messages
                  * from the host OS, but the packets will be handled on SMBUS */
                 if (adapter->hw.has_manc2h) {
-                        uint32_t manc2h = E1000_READ_REG(&adapter->hw, MANC2H);
+                        u32 manc2h = E1000_READ_REG(&adapter->hw, MANC2H);
 
                         manc |= E1000_MANC_EN_MNG2HOST;
 #define E1000_MNG2HOST_PORT_623 (1 << 5)
@@ -496,7 +493,7 @@ static void
 e1000_release_manageability(struct e1000_adapter *adapter)
 {
         if (adapter->en_mng_pt) {
-                uint32_t manc = E1000_READ_REG(&adapter->hw, MANC);
+                u32 manc = E1000_READ_REG(&adapter->hw, MANC);
 
                 /* re-enable hardware interception of ARP */
                 manc |= E1000_MANC_ARP_EN;
@@ -569,7 +566,7 @@ int e1000_up(struct e1000_adapter *adapter)
 
 void e1000_power_up_phy(struct e1000_adapter *adapter)
 {
-        uint16_t mii_reg = 0;
+        u16 mii_reg = 0;
 
         /* Just clear the power down bit to wake the phy back up */
         if (adapter->hw.media_type == e1000_media_type_copper) {
@@ -584,13 +581,13 @@ void e1000_power_up_phy(struct e1000_adapter *adapter)
 static void e1000_power_down_phy(struct e1000_adapter *adapter)
 {
         /* Power down the PHY so no link is implied when interface is down *
-         * The PHY cannot be powered down if any of the following is TRUE *
+         * The PHY cannot be powered down if any of the following is true *
          * (a) WoL is enabled
          * (b) AMT is active
          * (c) SoL/IDER session is active */
         if (!adapter->wol && adapter->hw.mac_type >= e1000_82540 &&
            adapter->hw.media_type == e1000_media_type_copper) {
-                uint16_t mii_reg = 0;
+                u16 mii_reg = 0;
 
                 switch (adapter->hw.mac_type) {
                 case e1000_82540:
@@ -638,7 +635,6 @@ e1000_down(struct e1000_adapter *adapter)
 
 #ifdef CONFIG_E1000_NAPI
         napi_disable(&adapter->napi);
-        atomic_set(&adapter->irq_sem, 0);
 #endif
         e1000_irq_disable(adapter);
 
@@ -671,9 +667,9 @@ e1000_reinit_locked(struct e1000_adapter *adapter)
 void
 e1000_reset(struct e1000_adapter *adapter)
 {
-        uint32_t pba = 0, tx_space, min_tx_space, min_rx_space;
-        uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF;
-        boolean_t legacy_pba_adjust = FALSE;
+        u32 pba = 0, tx_space, min_tx_space, min_rx_space;
+        u16 fc_high_water_mark = E1000_FC_HIGH_DIFF;
+        bool legacy_pba_adjust = false;
 
         /* Repartition Pba for greater than 9k mtu
          * To take effect CTRL.RST is required.
@@ -687,7 +683,7 @@ e1000_reset(struct e1000_adapter *adapter)
         case e1000_82540:
         case e1000_82541:
         case e1000_82541_rev_2:
-                legacy_pba_adjust = TRUE;
+                legacy_pba_adjust = true;
                 pba = E1000_PBA_48K;
                 break;
         case e1000_82545:
@@ -698,7 +694,7 @@ e1000_reset(struct e1000_adapter *adapter)
                 break;
         case e1000_82547:
         case e1000_82547_rev_2:
-                legacy_pba_adjust = TRUE;
+                legacy_pba_adjust = true;
                 pba = E1000_PBA_30K;
                 break;
         case e1000_82571:
@@ -716,7 +712,7 @@ e1000_reset(struct e1000_adapter *adapter)
                 break;
         }
 
-        if (legacy_pba_adjust == TRUE) {
+        if (legacy_pba_adjust) {
                 if (adapter->netdev->mtu > E1000_RXBUFFER_8192)
                         pba -= 8; /* allocate more FIFO for Tx */
 
@@ -819,7 +815,7 @@ e1000_reset(struct e1000_adapter *adapter)
             adapter->hw.mac_type <= e1000_82547_rev_2 &&
             adapter->hw.autoneg == 1 &&
             adapter->hw.autoneg_advertised == ADVERTISE_1000_FULL) {
-                uint32_t ctrl = E1000_READ_REG(&adapter->hw, CTRL);
+                u32 ctrl = E1000_READ_REG(&adapter->hw, CTRL);
                 /* clear phy power management bit if we are in gig only mode,
                  * which if enabled will attempt negotiation to 100Mb, which
                  * can cause a loss of link at power off or driver unload */
@@ -836,7 +832,7 @@ e1000_reset(struct e1000_adapter *adapter)
         if (!adapter->smart_power_down &&
             (adapter->hw.mac_type == e1000_82571 ||
              adapter->hw.mac_type == e1000_82572)) {
-                uint16_t phy_data = 0;
+                u16 phy_data = 0;
                 /* speed up time to link by disabling smart power down, ignore
                  * the return value of this function because there is nothing
                  * different we would do if it failed */
@@ -930,8 +926,8 @@ e1000_probe(struct pci_dev *pdev,
         static int cards_found = 0;
         static int global_quad_port_a = 0; /* global ksp3 port a indication */
         int i, err, pci_using_dac;
-        uint16_t eeprom_data = 0;
-        uint16_t eeprom_apme_mask = E1000_EEPROM_APME;
+        u16 eeprom_data = 0;
+        u16 eeprom_apme_mask = E1000_EEPROM_APME;
         DECLARE_MAC_BUF(mac);
 
         if ((err = pci_enable_device(pdev)))
@@ -1366,15 +1362,15 @@ e1000_sw_init(struct e1000_adapter *adapter)
 
         e1000_set_media_type(hw);
 
-        hw->wait_autoneg_complete = FALSE;
-        hw->tbi_compatibility_en = TRUE;
-        hw->adaptive_ifs = TRUE;
+        hw->wait_autoneg_complete = false;
+        hw->tbi_compatibility_en = true;
+        hw->adaptive_ifs = true;
 
         /* Copper options */
 
         if (hw->media_type == e1000_media_type_copper) {
                 hw->mdix = AUTO_ALL_MODES;
-                hw->disable_polarity_correction = FALSE;
+                hw->disable_polarity_correction = false;
                 hw->master_slave = E1000_MASTER_SLAVE;
         }
 
@@ -1396,7 +1392,6 @@ e1000_sw_init(struct e1000_adapter *adapter)
 #endif
 
         /* Explicitly disable IRQ since the NIC can be in any state. */
-        atomic_set(&adapter->irq_sem, 0);
         e1000_irq_disable(adapter);
 
         spin_lock_init(&adapter->stats_lock);
@@ -1576,7 +1571,7 @@ e1000_close(struct net_device *netdev)
  * @start: address of beginning of memory
  * @len: length of memory
  **/
-static boolean_t
+static bool
 e1000_check_64k_bound(struct e1000_adapter *adapter,
                       void *start, unsigned long len)
 {
@@ -1587,10 +1582,10 @@ e1000_check_64k_bound(struct e1000_adapter *adapter,
          * write location to cross 64k boundary due to errata 23 */
         if (adapter->hw.mac_type == e1000_82545 ||
             adapter->hw.mac_type == e1000_82546) {
-                return ((begin ^ (end - 1)) >> 16) != 0 ? FALSE : TRUE;
+                return ((begin ^ (end - 1)) >> 16) != 0 ? false : true;
         }
 
-        return TRUE;
+        return true;
 }
 
 /**
@@ -1707,10 +1702,10 @@ e1000_setup_all_tx_resources(struct e1000_adapter *adapter)
 static void
 e1000_configure_tx(struct e1000_adapter *adapter)
 {
-        uint64_t tdba;
+        u64 tdba;
         struct e1000_hw *hw = &adapter->hw;
-        uint32_t tdlen, tctl, tipg, tarc;
-        uint32_t ipgr1, ipgr2;
+        u32 tdlen, tctl, tipg, tarc;
+        u32 ipgr1, ipgr2;
 
         /* Setup the HW Tx Head and Tail descriptor pointers */
 
@@ -1952,10 +1947,10 @@ e1000_setup_all_rx_resources(struct e1000_adapter *adapter)
 static void
 e1000_setup_rctl(struct e1000_adapter *adapter)
 {
-        uint32_t rctl, rfctl;
-        uint32_t psrctl = 0;
+        u32 rctl, rfctl;
+        u32 psrctl = 0;
 #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
-        uint32_t pages = 0;
+        u32 pages = 0;
 #endif
 
         rctl = E1000_READ_REG(&adapter->hw, RCTL);
@@ -2070,9 +2065,9 @@ e1000_setup_rctl(struct e1000_adapter *adapter)
 static void
 e1000_configure_rx(struct e1000_adapter *adapter)
 {
-        uint64_t rdba;
+        u64 rdba;
         struct e1000_hw *hw = &adapter->hw;
-        uint32_t rdlen, rctl, rxcsum, ctrl_ext;
+        u32 rdlen, rctl, rxcsum, ctrl_ext;
 
         if (adapter->rx_ps_pages) {
                 /* this is a 32 byte descriptor */
@@ -2133,7 +2128,7 @@ e1000_configure_rx(struct e1000_adapter *adapter)
         /* Enable 82543 Receive Checksum Offload for TCP and UDP */
         if (hw->mac_type >= e1000_82543) {
                 rxcsum = E1000_READ_REG(hw, RXCSUM);
-                if (adapter->rx_csum == TRUE) {
+                if (adapter->rx_csum) {
                         rxcsum |= E1000_RXCSUM_TUOFL;
 
                         /* Enable 82571 IPv4 payload checksum for UDP fragments
@@ -2392,7 +2387,7 @@ static void
 e1000_enter_82542_rst(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        uint32_t rctl;
+        u32 rctl;
 
         e1000_pci_clear_mwi(&adapter->hw);
 
@@ -2410,7 +2405,7 @@ static void
 e1000_leave_82542_rst(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        uint32_t rctl;
+        u32 rctl;
 
         rctl = E1000_READ_REG(&adapter->hw, RCTL);
         rctl &= ~E1000_RCTL_RST;
@@ -2495,8 +2490,8 @@ e1000_set_rx_mode(struct net_device *netdev)
         struct e1000_hw *hw = &adapter->hw;
         struct dev_addr_list *uc_ptr;
         struct dev_addr_list *mc_ptr;
-        uint32_t rctl;
-        uint32_t hash_value;
+        u32 rctl;
+        u32 hash_value;
         int i, rar_entries = E1000_RAR_ENTRIES;
         int mta_reg_count = (hw->mac_type == e1000_ich8lan) ?
                                 E1000_NUM_MTA_REGISTERS_ICH8LAN :
@@ -2600,7 +2595,7 @@ e1000_82547_tx_fifo_stall(unsigned long data)
 {
         struct e1000_adapter *adapter = (struct e1000_adapter *) data;
         struct net_device *netdev = adapter->netdev;
-        uint32_t tctl;
+        u32 tctl;
 
         if (atomic_read(&adapter->tx_fifo_stall)) {
                 if ((E1000_READ_REG(&adapter->hw, TDT) ==
@@ -2642,8 +2637,8 @@ e1000_watchdog(unsigned long data)
         struct e1000_adapter *adapter = (struct e1000_adapter *) data;
         struct net_device *netdev = adapter->netdev;
         struct e1000_tx_ring *txdr = adapter->tx_ring;
-        uint32_t link, tctl;
-        int32_t ret_val;
+        u32 link, tctl;
+        s32 ret_val;
 
         ret_val = e1000_check_for_link(&adapter->hw);
         if ((ret_val == E1000_ERR_PHY) &&
@@ -2668,8 +2663,8 @@ e1000_watchdog(unsigned long data)
 
         if (link) {
                 if (!netif_carrier_ok(netdev)) {
-                        uint32_t ctrl;
-                        boolean_t txb2b = 1;
+                        u32 ctrl;
+                        bool txb2b = true;
                         e1000_get_speed_and_duplex(&adapter->hw,
                                                    &adapter->link_speed,
                                                    &adapter->link_duplex);
@@ -2691,12 +2686,12 @@ e1000_watchdog(unsigned long data)
                         adapter->tx_timeout_factor = 1;
                         switch (adapter->link_speed) {
                         case SPEED_10:
-                                txb2b = 0;
+                                txb2b = false;
                                 netdev->tx_queue_len = 10;
                                 adapter->tx_timeout_factor = 8;
                                 break;
                         case SPEED_100:
-                                txb2b = 0;
+                                txb2b = false;
                                 netdev->tx_queue_len = 100;
                                 /* maybe add some timeout factor ? */
                                 break;
@@ -2704,8 +2699,8 @@ e1000_watchdog(unsigned long data)
 
                         if ((adapter->hw.mac_type == e1000_82571 ||
                              adapter->hw.mac_type == e1000_82572) &&
-                            txb2b == 0) {
-                                uint32_t tarc0;
+                            !txb2b) {
+                                u32 tarc0;
                                 tarc0 = E1000_READ_REG(&adapter->hw, TARC0);
                                 tarc0 &= ~(1 << 21);
                                 E1000_WRITE_REG(&adapter->hw, TARC0, tarc0);
@@ -2747,7 +2742,7 @@ e1000_watchdog(unsigned long data)
                         /* make sure the receive unit is started */
                         if (adapter->hw.rx_needs_kicking) {
                                 struct e1000_hw *hw = &adapter->hw;
-                                uint32_t rctl = E1000_READ_REG(hw, RCTL);
+                                u32 rctl = E1000_READ_REG(hw, RCTL);
                                 E1000_WRITE_REG(hw, RCTL, rctl | E1000_RCTL_EN);
                         }
                 }
@@ -2802,7 +2797,7 @@ e1000_watchdog(unsigned long data)
         E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_RXDMT0);
 
         /* Force detection of hung controller every watchdog period */
-        adapter->detect_tx_hung = TRUE;
+        adapter->detect_tx_hung = true;
 
         /* With 82571 controllers, LAA may be overwritten due to controller
          * reset from the other port. Set the appropriate LAA in RAR[0] */
@@ -2837,7 +2832,7 @@ enum latency_range {
  * @bytes: the number of bytes during this measurement interval
  **/
 static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
-                                   uint16_t itr_setting,
+                                   u16 itr_setting,
                                    int packets,
                                    int bytes)
 {
@@ -2889,8 +2884,8 @@ update_itr_done:
 static void e1000_set_itr(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
-        uint16_t current_itr;
-        uint32_t new_itr = adapter->itr;
+        u16 current_itr;
+        u32 new_itr = adapter->itr;
 
         if (unlikely(hw->mac_type < e1000_82540))
                 return;
@@ -2964,9 +2959,9 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
         unsigned int i;
-        uint32_t cmd_length = 0;
-        uint16_t ipcse = 0, tucse, mss;
-        uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
+        u32 cmd_length = 0;
+        u16 ipcse = 0, tucse, mss;
+        u8 ipcss, ipcso, tucss, tucso, hdr_len;
         int err;
 
         if (skb_is_gso(skb)) {
@@ -3025,19 +3020,19 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 if (++i == tx_ring->count) i = 0;
                 tx_ring->next_to_use = i;
 
-                return TRUE;
+                return true;
         }
-        return FALSE;
+        return false;
 }
 
-static boolean_t
+static bool
 e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
               struct sk_buff *skb)
 {
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
         unsigned int i;
-        uint8_t css;
+        u8 css;
 
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 css = skb_transport_offset(skb);
@@ -3060,10 +3055,10 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 if (unlikely(++i == tx_ring->count)) i = 0;
                 tx_ring->next_to_use = i;
 
-                return TRUE;
+                return true;
         }
 
-        return FALSE;
+        return false;
 }
 
 #define E1000_MAX_TXD_PWR       12
@@ -3182,7 +3177,7 @@ e1000_tx_queue(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 {
         struct e1000_tx_desc *tx_desc = NULL;
         struct e1000_buffer *buffer_info;
-        uint32_t txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
+        u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
         unsigned int i;
 
         if (likely(tx_flags & E1000_TX_FLAGS_TSO)) {
@@ -3246,8 +3241,8 @@ e1000_tx_queue(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 static int
 e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
 {
-        uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
-        uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
+        u32 fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
+        u32 skb_fifo_len = skb->len + E1000_FIFO_HDR;
 
         skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
 
@@ -3274,7 +3269,7 @@ static int
 e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb)
 {
         struct e1000_hw *hw =  &adapter->hw;
-        uint16_t length, offset;
+        u16 length, offset;
         if (vlan_tx_tag_present(skb)) {
                 if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) &&
                         ( adapter->hw.mng_cookie.status &
@@ -3285,17 +3280,17 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb)
                 struct ethhdr *eth = (struct ethhdr *) skb->data;
                 if ((htons(ETH_P_IP) == eth->h_proto)) {
                         const struct iphdr *ip =
-                                (struct iphdr *)((uint8_t *)skb->data+14);
+                                (struct iphdr *)((u8 *)skb->data+14);
                         if (IPPROTO_UDP == ip->protocol) {
                                 struct udphdr *udp =
-                                        (struct udphdr *)((uint8_t *)ip +
+                                        (struct udphdr *)((u8 *)ip +
                                                 (ip->ihl << 2));
                                 if (ntohs(udp->dest) == 67) {
-                                        offset = (uint8_t *)udp + 8 - skb->data;
+                                        offset = (u8 *)udp + 8 - skb->data;
                                         length = skb->len - offset;
 
                                         return e1000_mng_write_dhcp_info(hw,
-                                                        (uint8_t *)udp + 8,
+                                                        (u8 *)udp + 8,
                                                         length);
                                 }
                         }
@@ -3375,7 +3370,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
          * overrun the FIFO, adjust the max buffer len if mss
          * drops. */
         if (mss) {
-                uint8_t hdr_len;
+                u8 hdr_len;
                 max_per_txd = min(mss << 2, max_per_txd);
                 max_txd_pwr = fls(max_per_txd) - 1;
 
@@ -3562,7 +3557,7 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
-        uint16_t eeprom_data = 0;
+        u16 eeprom_data = 0;
 
         if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
             (max_frame > MAX_JUMBO_FRAME_SIZE)) {
@@ -3657,7 +3652,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         struct pci_dev *pdev = adapter->pdev;
         unsigned long flags;
-        uint16_t phy_tmp;
+        u16 phy_tmp;
 
 #define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
 
@@ -3834,13 +3829,10 @@ e1000_intr_msi(int irq, void *data)
 #ifndef CONFIG_E1000_NAPI
         int i;
 #endif
-        uint32_t icr = E1000_READ_REG(hw, ICR);
+        u32 icr = E1000_READ_REG(hw, ICR);
+
+        /* in NAPI mode read ICR disables interrupts using IAM */
 
-#ifdef CONFIG_E1000_NAPI
-        /* read ICR disables interrupts using IAM, so keep up with our
-         * enable/disable accounting */
-        atomic_inc(&adapter->irq_sem);
-#endif
         if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
                 hw->get_link_status = 1;
                 /* 80003ES2LAN workaround-- For packet buffer work-around on
@@ -3849,7 +3841,7 @@ e1000_intr_msi(int irq, void *data)
                 if (netif_carrier_ok(netdev) &&
                     (adapter->hw.mac_type == e1000_80003es2lan)) {
                         /* disable receives */
-                        uint32_t rctl = E1000_READ_REG(hw, RCTL);
+                        u32 rctl = E1000_READ_REG(hw, RCTL);
                         E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
                 }
                 /* guard against interrupt when we're going down */
@@ -3896,7 +3888,7 @@ e1000_intr(int irq, void *data)
         struct net_device *netdev = data;
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
-        uint32_t rctl, icr = E1000_READ_REG(hw, ICR);
+        u32 rctl, icr = E1000_READ_REG(hw, ICR);
 #ifndef CONFIG_E1000_NAPI
         int i;
 #endif
@@ -3910,12 +3902,8 @@ e1000_intr(int irq, void *data)
                      !(icr & E1000_ICR_INT_ASSERTED)))
                 return IRQ_NONE;
 
-        /* Interrupt Auto-Mask...upon reading ICR,
-         * interrupts are masked.  No need for the
-         * IMC write, but it does mean we should
-         * account for it ASAP. */
-        if (likely(hw->mac_type >= e1000_82571))
-                atomic_inc(&adapter->irq_sem);
+        /* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No
+         * need for the IMC write */
 #endif
 
         if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
@@ -3939,7 +3927,6 @@ e1000_intr(int irq, void *data)
 #ifdef CONFIG_E1000_NAPI
         if (unlikely(hw->mac_type < e1000_82571)) {
                 /* disable interrupts, without the synchronize_irq bit */
-                atomic_inc(&adapter->irq_sem);
                 E1000_WRITE_REG(hw, IMC, ~0);
                 E1000_WRITE_FLUSH(hw);
         }
@@ -3964,10 +3951,8 @@ e1000_intr(int irq, void *data)
          * in dead lock. Writing IMC forces 82547 into
          * de-assertion state.
          */
-        if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) {
-                atomic_inc(&adapter->irq_sem);
+        if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
                 E1000_WRITE_REG(hw, IMC, ~0);
-        }
 
         adapter->total_tx_bytes = 0;
         adapter->total_rx_bytes = 0;
@@ -4038,7 +4023,7 @@ e1000_clean(struct napi_struct *napi, int budget)
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 e1000_clean_tx_irq(struct e1000_adapter *adapter,
                    struct e1000_tx_ring *tx_ring)
 {
@@ -4049,7 +4034,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
         unsigned int count = 0;
 #endif
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
         unsigned int total_tx_bytes=0, total_tx_packets=0;
 
         i = tx_ring->next_to_clean;
@@ -4057,7 +4042,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
         eop_desc = E1000_TX_DESC(*tx_ring, eop);
 
         while (eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
-                for (cleaned = FALSE; !cleaned; ) {
+                for (cleaned = false; !cleaned; ) {
                         tx_desc = E1000_TX_DESC(*tx_ring, i);
                         buffer_info = &tx_ring->buffer_info[i];
                         cleaned = (i == eop);
@@ -4105,7 +4090,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
         if (adapter->detect_tx_hung) {
                 /* Detect a transmit hang in hardware, this serializes the
                  * check with the clearing of time_stamp and movement of i */
-                adapter->detect_tx_hung = FALSE;
+                adapter->detect_tx_hung = false;
                 if (tx_ring->buffer_info[eop].dma &&
                     time_after(jiffies, tx_ring->buffer_info[eop].time_stamp +
                                (adapter->tx_timeout_factor * HZ))
@@ -4154,11 +4139,11 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 
 static void
 e1000_rx_checksum(struct e1000_adapter *adapter,
-                  uint32_t status_err, uint32_t csum,
+                  u32 status_err, u32 csum,
                   struct sk_buff *skb)
 {
-        uint16_t status = (uint16_t)status_err;
-        uint8_t errors = (uint8_t)(status_err >> 24);
+        u16 status = (u16)status_err;
+        u8 errors = (u8)(status_err >> 24);
         skb->ip_summed = CHECKSUM_NONE;
 
         /* 82543 or newer only */
@@ -4200,7 +4185,7 @@ e1000_rx_checksum(struct e1000_adapter *adapter,
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 #ifdef CONFIG_E1000_NAPI
 e1000_clean_rx_irq(struct e1000_adapter *adapter,
                    struct e1000_rx_ring *rx_ring,
@@ -4215,11 +4200,11 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
         struct e1000_rx_desc *rx_desc, *next_rxd;
         struct e1000_buffer *buffer_info, *next_buffer;
         unsigned long flags;
-        uint32_t length;
-        uint8_t last_byte;
+        u32 length;
+        u8 last_byte;
         unsigned int i;
         int cleaned_count = 0;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
         unsigned int total_rx_bytes=0, total_rx_packets=0;
 
         i = rx_ring->next_to_clean;
@@ -4247,7 +4232,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 next_buffer = &rx_ring->buffer_info[i];
 
-                cleaned = TRUE;
+                cleaned = true;
                 cleaned_count++;
                 pci_unmap_single(pdev,
                                  buffer_info->dma,
@@ -4316,8 +4301,8 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 /* Receive Checksum Offload */
                 e1000_rx_checksum(adapter,
-                                  (uint32_t)(status) |
-                                  ((uint32_t)(rx_desc->errors) << 24),
+                                  (u32)(status) |
+                                  ((u32)(rx_desc->errors) << 24),
                                   le16_to_cpu(rx_desc->csum), skb);
 
                 skb->protocol = eth_type_trans(skb, netdev);
@@ -4373,7 +4358,7 @@ next_desc:
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 #ifdef CONFIG_E1000_NAPI
 e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                       struct e1000_rx_ring *rx_ring,
@@ -4391,9 +4376,9 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
         struct e1000_ps_page_dma *ps_page_dma;
         struct sk_buff *skb;
         unsigned int i, j;
-        uint32_t length, staterr;
+        u32 length, staterr;
         int cleaned_count = 0;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
         unsigned int total_rx_bytes=0, total_rx_packets=0;
 
         i = rx_ring->next_to_clean;
@@ -4420,7 +4405,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
 
                 next_buffer = &rx_ring->buffer_info[i];
 
-                cleaned = TRUE;
+                cleaned = true;
                 cleaned_count++;
                 pci_unmap_single(pdev, buffer_info->dma,
                                  buffer_info->length,
@@ -4774,8 +4759,8 @@ no_buffers:
 static void
 e1000_smartspeed(struct e1000_adapter *adapter)
 {
-        uint16_t phy_status;
-        uint16_t phy_ctrl;
+        u16 phy_status;
+        u16 phy_ctrl;
 
         if ((adapter->hw.phy_type != e1000_phy_igp) || !adapter->hw.autoneg ||
            !(adapter->hw.autoneg_advertised & ADVERTISE_1000_FULL))
@@ -4854,8 +4839,8 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct mii_ioctl_data *data = if_mii(ifr);
         int retval;
-        uint16_t mii_reg;
-        uint16_t spddplx;
+        u16 mii_reg;
+        u16 spddplx;
         unsigned long flags;
 
         if (adapter->hw.media_type != e1000_media_type_copper)
@@ -4974,11 +4959,11 @@ e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc)
         pcix_set_mmrbc(adapter->pdev, mmrbc);
 }
 
-int32_t
-e1000_read_pcie_cap_reg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
+s32
+e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
 {
     struct e1000_adapter *adapter = hw->back;
-    uint16_t cap_offset;
+    u16 cap_offset;
 
     cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
     if (!cap_offset)
@@ -4990,7 +4975,7 @@ e1000_read_pcie_cap_reg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
 }
 
 void
-e1000_io_write(struct e1000_hw *hw, unsigned long port, uint32_t value)
+e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value)
 {
         outl(value, port);
 }
@@ -4999,9 +4984,10 @@ static void
 e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t ctrl, rctl;
+        u32 ctrl, rctl;
 
-        e1000_irq_disable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_disable(adapter);
         adapter->vlgrp = grp;
 
         if (grp) {
@@ -5030,7 +5016,7 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                         rctl &= ~E1000_RCTL_VFE;
                         E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
                         if (adapter->mng_vlan_id !=
-                            (uint16_t)E1000_MNG_VLAN_NONE) {
+                            (u16)E1000_MNG_VLAN_NONE) {
                                 e1000_vlan_rx_kill_vid(netdev,
                                                        adapter->mng_vlan_id);
                                 adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
@@ -5038,14 +5024,15 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                 }
         }
 
-        e1000_irq_enable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_enable(adapter);
 }
 
 static void
-e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
+e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t vfta, index;
+        u32 vfta, index;
 
         if ((adapter->hw.mng_cookie.status &
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
@@ -5059,14 +5046,16 @@ e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
 }
 
 static void
-e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
+e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t vfta, index;
+        u32 vfta, index;
 
-        e1000_irq_disable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_disable(adapter);
         vlan_group_set_device(adapter->vlgrp, vid, NULL);
-        e1000_irq_enable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_enable(adapter);
 
         if ((adapter->hw.mng_cookie.status &
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
@@ -5089,7 +5078,7 @@ e1000_restore_vlan(struct e1000_adapter *adapter)
         e1000_vlan_rx_register(adapter->netdev, adapter->vlgrp);
 
         if (adapter->vlgrp) {
-                uint16_t vid;
+                u16 vid;
                 for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
                         if (!vlan_group_get_device(adapter->vlgrp, vid))
                                 continue;
@@ -5099,7 +5088,7 @@ e1000_restore_vlan(struct e1000_adapter *adapter)
 }
 
 int
-e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
+e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
 {
         adapter->hw.autoneg = 0;
 
@@ -5140,8 +5129,8 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t ctrl, ctrl_ext, rctl, status;
-        uint32_t wufc = adapter->wol;
+        u32 ctrl, ctrl_ext, rctl, status;
+        u32 wufc = adapter->wol;
 #ifdef CONFIG_PM
         int retval = 0;
 #endif
@@ -5238,7 +5227,7 @@ e1000_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t err;
+        u32 err;
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
index 10af742d8a20..365626d3177e 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -41,13 +41,6 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 
-typedef enum {
-#undef FALSE
-    FALSE = 0,
-#undef TRUE
-    TRUE = 1
-} boolean_t;
-
 #ifdef DBG
 #define DEBUGOUT(S)             printk(KERN_DEBUG S "\n")
 #define DEBUGOUT1(S, A...)      printk(KERN_DEBUG S "\n", A)
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 7fe20310eb5f..01c88664bad3 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -29,6 +29,9 @@
 /*
  * 82571EB Gigabit Ethernet Controller
  * 82571EB Gigabit Ethernet Controller (Fiber)
+ * 82571EB Dual Port Gigabit Mezzanine Adapter
+ * 82571EB Quad Port Gigabit Mezzanine Adapter
+ * 82571PT Gigabit PT Quad Port Server ExpressModule
  * 82572EI Gigabit Ethernet Controller (Copper)
  * 82572EI Gigabit Ethernet Controller (Fiber)
  * 82572EI Gigabit Ethernet Controller
@@ -72,7 +75,7 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
         struct e1000_phy_info *phy = &hw->phy;
         s32 ret_val;
 
-        if (hw->media_type != e1000_media_type_copper) {
+        if (hw->phy.media_type != e1000_media_type_copper) {
                 phy->type = e1000_phy_none;
                 return 0;
         }
@@ -150,7 +153,8 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
                 if (((eecd >> 15) & 0x3) == 0x3) {
                         nvm->type = e1000_nvm_flash_hw;
                         nvm->word_size = 2048;
-                        /* Autonomous Flash update bit must be cleared due
+                        /*
+                         * Autonomous Flash update bit must be cleared due
                          * to Flash update issue.
                          */
                         eecd &= ~E1000_EECD_AUPDEN;
@@ -159,13 +163,18 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
                 }
                 /* Fall Through */
         default:
-                nvm->type       = e1000_nvm_eeprom_spi;
+                nvm->type = e1000_nvm_eeprom_spi;
                 size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
                                   E1000_EECD_SIZE_EX_SHIFT);
-                /* Added to a constant, "size" becomes the left-shift value
+                /*
+                 * Added to a constant, "size" becomes the left-shift value
                  * for setting word_size.
                  */
                 size += NVM_WORD_SIZE_BASE_SHIFT;
+
+                /* EEPROM access above 16k is unsupported */
+                if (size > 14)
+                        size = 14;
                 nvm->word_size  = 1 << size;
                 break;
         }
@@ -190,16 +199,16 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
         case E1000_DEV_ID_82571EB_FIBER:
         case E1000_DEV_ID_82572EI_FIBER:
         case E1000_DEV_ID_82571EB_QUAD_FIBER:
-                hw->media_type = e1000_media_type_fiber;
+                hw->phy.media_type = e1000_media_type_fiber;
                 break;
         case E1000_DEV_ID_82571EB_SERDES:
         case E1000_DEV_ID_82572EI_SERDES:
         case E1000_DEV_ID_82571EB_SERDES_DUAL:
         case E1000_DEV_ID_82571EB_SERDES_QUAD:
-                hw->media_type = e1000_media_type_internal_serdes;
+                hw->phy.media_type = e1000_media_type_internal_serdes;
                 break;
         default:
-                hw->media_type = e1000_media_type_copper;
+                hw->phy.media_type = e1000_media_type_copper;
                 break;
         }
 
@@ -208,25 +217,28 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
         /* Set rar entry count */
         mac->rar_entry_count = E1000_RAR_ENTRIES;
         /* Set if manageability features are enabled. */
-        mac->arc_subsystem_valid =
-                (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0;
+        mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0;
 
         /* check for link */
-        switch (hw->media_type) {
+        switch (hw->phy.media_type) {
         case e1000_media_type_copper:
                 func->setup_physical_interface = e1000_setup_copper_link_82571;
                 func->check_for_link = e1000e_check_for_copper_link;
                 func->get_link_up_info = e1000e_get_speed_and_duplex_copper;
                 break;
         case e1000_media_type_fiber:
-                func->setup_physical_interface = e1000_setup_fiber_serdes_link_82571;
+                func->setup_physical_interface =
+                        e1000_setup_fiber_serdes_link_82571;
                 func->check_for_link = e1000e_check_for_fiber_link;
-                func->get_link_up_info = e1000e_get_speed_and_duplex_fiber_serdes;
+                func->get_link_up_info =
+                        e1000e_get_speed_and_duplex_fiber_serdes;
                 break;
         case e1000_media_type_internal_serdes:
-                func->setup_physical_interface = e1000_setup_fiber_serdes_link_82571;
+                func->setup_physical_interface =
+                        e1000_setup_fiber_serdes_link_82571;
                 func->check_for_link = e1000e_check_for_serdes_link;
-                func->get_link_up_info = e1000e_get_speed_and_duplex_fiber_serdes;
+                func->get_link_up_info =
+                        e1000e_get_speed_and_duplex_fiber_serdes;
                 break;
         default:
                 return -E1000_ERR_CONFIG;
@@ -236,7 +248,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
         return 0;
 }
 
-static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)
+static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         static int global_quad_port_a; /* global port a indication */
@@ -322,10 +334,12 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)
         switch (hw->mac.type) {
         case e1000_82571:
         case e1000_82572:
-                /* The 82571 firmware may still be configuring the PHY.
+                /*
+                 * The 82571 firmware may still be configuring the PHY.
                  * In this case, we cannot access the PHY until the
                  * configuration is done.  So we explicitly set the
-                 * PHY ID. */
+                 * PHY ID.
+                 */
                 phy->id = IGP01E1000_I_PHY_ID;
                 break;
         case e1000_82573:
@@ -479,8 +493,10 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* If our nvm is an EEPROM, then we're done
-         * otherwise, commit the checksum to the flash NVM. */
+        /*
+         * If our nvm is an EEPROM, then we're done
+         * otherwise, commit the checksum to the flash NVM.
+         */
         if (hw->nvm.type != e1000_nvm_flash_hw)
                 return ret_val;
 
@@ -496,7 +512,8 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
 
         /* Reset the firmware if using STM opcode. */
         if ((er32(FLOP) & 0xFF00) == E1000_STM_OPCODE) {
-                /* The enabling of and the actual reset must be done
+                /*
+                 * The enabling of and the actual reset must be done
                  * in two write cycles.
                  */
                 ew32(HICR, E1000_HICR_FW_RESET_ENABLE);
@@ -557,8 +574,10 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
         u32 eewr = 0;
         s32 ret_val = 0;
 
-        /* A check for invalid values:  offset too large, too many words,
-         * and not enough words. */
+        /*
+         * A check for invalid values:  offset too large, too many words,
+         * and not enough words.
+         */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
             (words == 0)) {
                 hw_dbg(hw, "nvm parameter(s) out of bounds\n");
@@ -645,30 +664,32 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
         } else {
                 data &= ~IGP02E1000_PM_D0_LPLU;
                 ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, data);
-                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /*
+                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
-                 * SmartSpeed, so performance is maintained. */
+                 * SmartSpeed, so performance is maintained.
+                 */
                 if (phy->smart_speed == e1000_smart_speed_on) {
                         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     &data);
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data |= IGP01E1000_PSCFR_SMART_SPEED;
                         ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 } else if (phy->smart_speed == e1000_smart_speed_off) {
                         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     &data);
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                         ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 }
@@ -693,7 +714,8 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
         s32 ret_val;
         u16 i = 0;
 
-        /* Prevent the PCI-E bus from sticking if there is no TLP connection
+        /*
+         * Prevent the PCI-E bus from sticking if there is no TLP connection
          * on the last TLP read/write transaction when MAC is reset.
          */
         ret_val = e1000e_disable_pcie_master(hw);
@@ -709,8 +731,10 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 
         msleep(10);
 
-        /* Must acquire the MDIO ownership before MAC reset.
-         * Ownership defaults to firmware after a reset. */
+        /*
+         * Must acquire the MDIO ownership before MAC reset.
+         * Ownership defaults to firmware after a reset.
+         */
         if (hw->mac.type == e1000_82573) {
                 extcnf_ctrl = er32(EXTCNF_CTRL);
                 extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
@@ -747,7 +771,8 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
                 /* We don't want to continue accessing MAC registers. */
                 return ret_val;
 
-        /* Phy configuration from NVM just starts after EECD_AUTO_RD is set.
+        /*
+         * Phy configuration from NVM just starts after EECD_AUTO_RD is set.
          * Need to wait for Phy configuration completion before accessing
          * NVM and Phy.
          */
@@ -793,7 +818,8 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
         e1000e_clear_vfta(hw);
 
         /* Setup the receive address. */
-        /* If, however, a locally administered address was assigned to the
+        /*
+         * If, however, a locally administered address was assigned to the
          * 82571, we must reserve a RAR for it to work around an issue where
          * resetting one port will reload the MAC on the other port.
          */
@@ -810,19 +836,19 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
         ret_val = e1000_setup_link_82571(hw);
 
         /* Set the transmit descriptor write-back policy */
-        reg_data = er32(TXDCTL);
+        reg_data = er32(TXDCTL(0));
         reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                    E1000_TXDCTL_FULL_TX_DESC_WB |
                    E1000_TXDCTL_COUNT_DESC;
-        ew32(TXDCTL, reg_data);
+        ew32(TXDCTL(0), reg_data);
 
         /* ...for both queues. */
         if (mac->type != e1000_82573) {
-                reg_data = er32(TXDCTL1);
+                reg_data = er32(TXDCTL(1));
                 reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                            E1000_TXDCTL_FULL_TX_DESC_WB |
                            E1000_TXDCTL_COUNT_DESC;
-                ew32(TXDCTL1, reg_data);
+                ew32(TXDCTL(1), reg_data);
         } else {
                 e1000e_enable_tx_pkt_filtering(hw);
                 reg_data = er32(GCR);
@@ -830,7 +856,8 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
                 ew32(GCR, reg_data);
         }
 
-        /* Clear all of the statistics registers (clear on read).  It is
+        /*
+         * Clear all of the statistics registers (clear on read).  It is
          * important that we do this after we have tried to establish link
          * because the symbol error count will increment wildly if there
          * is no link.
@@ -851,17 +878,17 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
         u32 reg;
 
         /* Transmit Descriptor Control 0 */
-        reg = er32(TXDCTL);
+        reg = er32(TXDCTL(0));
         reg |= (1 << 22);
-        ew32(TXDCTL, reg);
+        ew32(TXDCTL(0), reg);
 
         /* Transmit Descriptor Control 1 */
-        reg = er32(TXDCTL1);
+        reg = er32(TXDCTL(1));
         reg |= (1 << 22);
-        ew32(TXDCTL1, reg);
+        ew32(TXDCTL(1), reg);
 
         /* Transmit Arbitration Control 0 */
-        reg = er32(TARC0);
+        reg = er32(TARC(0));
         reg &= ~(0xF << 27); /* 30:27 */
         switch (hw->mac.type) {
         case e1000_82571:
@@ -871,10 +898,10 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
         default:
                 break;
         }
-        ew32(TARC0, reg);
+        ew32(TARC(0), reg);
 
         /* Transmit Arbitration Control 1 */
-        reg = er32(TARC1);
+        reg = er32(TARC(1));
         switch (hw->mac.type) {
         case e1000_82571:
         case e1000_82572:
@@ -884,7 +911,7 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
                         reg &= ~(1 << 28);
                 else
                         reg |= (1 << 28);
-                ew32(TARC1, reg);
+                ew32(TARC(1), reg);
                 break;
         default:
                 break;
@@ -922,7 +949,8 @@ void e1000e_clear_vfta(struct e1000_hw *hw)
 
         if (hw->mac.type == e1000_82573) {
                 if (hw->mng_cookie.vlan_id != 0) {
-                        /* The VFTA is a 4096b bit-field, each identifying
+                        /*
+                         * The VFTA is a 4096b bit-field, each identifying
                          * a single VLAN ID.  The following operations
                          * determine which 32b entry (i.e. offset) into the
                          * array we want to set the VLAN ID (i.e. bit) of
@@ -936,7 +964,8 @@ void e1000e_clear_vfta(struct e1000_hw *hw)
                 }
         }
         for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-                /* If the offset we want to clear is the same offset of the
+                /*
+                 * If the offset we want to clear is the same offset of the
                  * manageability VLAN ID, then clear all bits except that of
                  * the manageability unit.
                  */
@@ -947,7 +976,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw)
 }
 
 /**
- *  e1000_mc_addr_list_update_82571 - Update Multicast addresses
+ *  e1000_update_mc_addr_list_82571 - Update Multicast addresses
  *  @hw: pointer to the HW structure
  *  @mc_addr_list: array of multicast addresses to program
  *  @mc_addr_count: number of multicast addresses to program
@@ -959,7 +988,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw)
  *  The parameter rar_count will usually be hw->mac.rar_entry_count
  *  unless there are workarounds that change this.
  **/
-static void e1000_mc_addr_list_update_82571(struct e1000_hw *hw,
+static void e1000_update_mc_addr_list_82571(struct e1000_hw *hw,
                                             u8 *mc_addr_list,
                                             u32 mc_addr_count,
                                             u32 rar_used_count,
@@ -968,8 +997,8 @@ static void e1000_mc_addr_list_update_82571(struct e1000_hw *hw,
         if (e1000e_get_laa_state_82571(hw))
                 rar_count--;
 
-        e1000e_mc_addr_list_update_generic(hw, mc_addr_list, mc_addr_count,
-                                          rar_used_count, rar_count);
+        e1000e_update_mc_addr_list_generic(hw, mc_addr_list, mc_addr_count,
+                                           rar_used_count, rar_count);
 }
 
 /**
@@ -984,12 +1013,13 @@ static void e1000_mc_addr_list_update_82571(struct e1000_hw *hw,
  **/
 static s32 e1000_setup_link_82571(struct e1000_hw *hw)
 {
-        /* 82573 does not have a word in the NVM to determine
+        /*
+         * 82573 does not have a word in the NVM to determine
          * the default flow control setting, so we explicitly
          * set it to full.
          */
         if (hw->mac.type == e1000_82573)
-                hw->mac.fc = e1000_fc_full;
+                hw->fc.type = e1000_fc_full;
 
         return e1000e_setup_link(hw);
 }
@@ -1050,14 +1080,14 @@ static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw)
         switch (hw->mac.type) {
         case e1000_82571:
         case e1000_82572:
-                /* If SerDes loopback mode is entered, there is no form
+                /*
+                 * If SerDes loopback mode is entered, there is no form
                  * of reset to take the adapter out of that mode.  So we
                  * have to explicitly take the adapter out of loopback
                  * mode.  This prevents drivers from twiddling their thumbs
                  * if another tool failed to take it out of loopback mode.
                  */
-                ew32(SCTL,
-                                E1000_SCTL_DISABLE_SERDES_LOOPBACK);
+                ew32(SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
                 break;
         default:
                 break;
@@ -1124,7 +1154,8 @@ void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state)
 
         /* If workaround is activated... */
         if (state)
-                /* Hold a copy of the LAA in RAR[14] This is done so that
+                /*
+                 * Hold a copy of the LAA in RAR[14] This is done so that
                  * between the time RAR[0] gets clobbered and the time it
                  * gets fixed, the actual LAA is in one of the RARs and no
                  * incoming packets directed to this port are dropped.
@@ -1152,7 +1183,8 @@ static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw)
         if (nvm->type != e1000_nvm_flash_hw)
                 return 0;
 
-        /* Check bit 4 of word 10h.  If it is 0, firmware is done updating
+        /*
+         * Check bit 4 of word 10h.  If it is 0, firmware is done updating
          * 10h-12h.  Checksum may need to be fixed.
          */
         ret_val = e1000_read_nvm(hw, 0x10, 1, &data);
@@ -1160,7 +1192,8 @@ static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw)
                 return ret_val;
 
         if (!(data & 0x10)) {
-                /* Read 0x23 and check bit 15.  This bit is a 1
+                /*
+                 * Read 0x23 and check bit 15.  This bit is a 1
                  * when the checksum has already been fixed.  If
                  * the checksum is still wrong and this bit is a
                  * 1, we need to return bad checksum.  Otherwise,
@@ -1240,7 +1273,7 @@ static struct e1000_mac_operations e82571_mac_ops = {
         /* .get_link_up_info: media type dependent */
         .led_on                 = e1000e_led_on_generic,
         .led_off                = e1000e_led_off_generic,
-        .mc_addr_list_update    = e1000_mc_addr_list_update_82571,
+        .update_mc_addr_list    = e1000_update_mc_addr_list_82571,
         .reset_hw               = e1000_reset_hw_82571,
         .init_hw                = e1000_init_hw_82571,
         .setup_link             = e1000_setup_link_82571,
@@ -1304,7 +1337,7 @@ struct e1000_info e1000_82571_info = {
                                   | FLAG_TARC_SPEED_MODE_BIT /* errata */
                                   | FLAG_APME_CHECK_PORT_B,
         .pba                    = 38,
-        .get_invariants         = e1000_get_invariants_82571,
+        .get_variants           = e1000_get_variants_82571,
         .mac_ops                = &e82571_mac_ops,
         .phy_ops                = &e82_phy_ops_igp,
         .nvm_ops                = &e82571_nvm_ops,
@@ -1322,7 +1355,7 @@ struct e1000_info e1000_82572_info = {
                                   | FLAG_HAS_STATS_ICR_ICT
                                   | FLAG_TARC_SPEED_MODE_BIT, /* errata */
         .pba                    = 38,
-        .get_invariants         = e1000_get_invariants_82571,
+        .get_variants           = e1000_get_variants_82571,
         .mac_ops                = &e82571_mac_ops,
         .phy_ops                = &e82_phy_ops_igp,
         .nvm_ops                = &e82571_nvm_ops,
@@ -1342,7 +1375,7 @@ struct e1000_info e1000_82573_info = {
                                   | FLAG_HAS_ERT
                                   | FLAG_HAS_SWSM_ON_LOAD,
         .pba                    = 20,
-        .get_invariants         = e1000_get_invariants_82571,
+        .get_variants           = e1000_get_variants_82571,
         .mac_ops                = &e82571_mac_ops,
         .phy_ops                = &e82_phy_ops_m88,
         .nvm_ops                = &e82571_nvm_ops,
diff --git a/drivers/net/e1000e/Makefile b/drivers/net/e1000e/Makefile
index 650f866e7ac2..360c91369f35 100644
--- a/drivers/net/e1000e/Makefile
+++ b/drivers/net/e1000e/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel PRO/1000 Linux driver
-# Copyright(c) 1999 - 2007 Intel Corporation.
+# Copyright(c) 1999 - 2008 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index a4f511f549f7..572cfd44397a 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -120,10 +120,10 @@
 #define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
 #define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
 #define E1000_MANC_BLK_PHY_RST_ON_IDE   0x00040000 /* Block phy resets */
-#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000 /* Enable MAC address
-                                                    * filtering */
-#define E1000_MANC_EN_MNG2HOST   0x00200000 /* Enable MNG packets to host
-                                             * memory */
+/* Enable MAC address filtering */
+#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000
+/* Enable MNG packets to host memory */
+#define E1000_MANC_EN_MNG2HOST   0x00200000
 
 /* Receive Control */
 #define E1000_RCTL_EN             0x00000002    /* enable */
@@ -135,25 +135,26 @@
 #define E1000_RCTL_LBM_MAC        0x00000040    /* MAC loopback mode */
 #define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */
 #define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */
-#define E1000_RCTL_RDMTS_HALF     0x00000000    /* rx desc min threshold size */
+#define E1000_RCTL_RDMTS_HALF     0x00000000    /* Rx desc min threshold size */
 #define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
 #define E1000_RCTL_BAM            0x00008000    /* broadcast enable */
 /* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
-#define E1000_RCTL_SZ_2048        0x00000000    /* rx buffer size 2048 */
-#define E1000_RCTL_SZ_1024        0x00010000    /* rx buffer size 1024 */
-#define E1000_RCTL_SZ_512         0x00020000    /* rx buffer size 512 */
-#define E1000_RCTL_SZ_256         0x00030000    /* rx buffer size 256 */
+#define E1000_RCTL_SZ_2048        0x00000000    /* Rx buffer size 2048 */
+#define E1000_RCTL_SZ_1024        0x00010000    /* Rx buffer size 1024 */
+#define E1000_RCTL_SZ_512         0x00020000    /* Rx buffer size 512 */
+#define E1000_RCTL_SZ_256         0x00030000    /* Rx buffer size 256 */
 /* these buffer sizes are valid if E1000_RCTL_BSEX is 1 */
-#define E1000_RCTL_SZ_16384       0x00010000    /* rx buffer size 16384 */
-#define E1000_RCTL_SZ_8192        0x00020000    /* rx buffer size 8192 */
-#define E1000_RCTL_SZ_4096        0x00030000    /* rx buffer size 4096 */
+#define E1000_RCTL_SZ_16384       0x00010000    /* Rx buffer size 16384 */
+#define E1000_RCTL_SZ_8192        0x00020000    /* Rx buffer size 8192 */
+#define E1000_RCTL_SZ_4096        0x00030000    /* Rx buffer size 4096 */
 #define E1000_RCTL_VFE            0x00040000    /* vlan filter enable */
 #define E1000_RCTL_CFIEN          0x00080000    /* canonical form enable */
 #define E1000_RCTL_CFI            0x00100000    /* canonical form indicator */
 #define E1000_RCTL_BSEX           0x02000000    /* Buffer size extension */
 #define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
 
-/* Use byte values for the following shift parameters
+/*
+ * Use byte values for the following shift parameters
  * Usage:
  *     psrctl |= (((ROUNDUP(value0, 128) >> E1000_PSRCTL_BSIZE0_SHIFT) &
  *                  E1000_PSRCTL_BSIZE0_MASK) |
@@ -206,7 +207,8 @@
 #define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */
 #define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
 
-/* Bit definitions for the Management Data IO (MDIO) and Management Data
+/*
+ * Bit definitions for the Management Data IO (MDIO) and Management Data
  * Clock (MDC) pins in the Device Control Register.
  */
 
@@ -279,7 +281,7 @@
 #define E1000_TXD_STAT_TC    0x00000004 /* Tx Underrun */
 
 /* Transmit Control */
-#define E1000_TCTL_EN     0x00000002    /* enable tx */
+#define E1000_TCTL_EN     0x00000002    /* enable Tx */
 #define E1000_TCTL_PSP    0x00000008    /* pad short packets */
 #define E1000_TCTL_CT     0x00000ff0    /* collision threshold */
 #define E1000_TCTL_COLD   0x003ff000    /* collision distance */
@@ -337,8 +339,8 @@
 #define E1000_KABGTXD_BGSQLBIAS           0x00050000
 
 /* PBA constants */
-#define E1000_PBA_8K  0x0008    /* 8KB, default Rx allocation */
-#define E1000_PBA_16K 0x0010    /* 16KB, default TX allocation */
+#define E1000_PBA_8K  0x0008    /* 8KB */
+#define E1000_PBA_16K 0x0010    /* 16KB */
 
 #define E1000_PBS_16K E1000_PBA_16K
 
@@ -356,12 +358,13 @@
 /* Interrupt Cause Read */
 #define E1000_ICR_TXDW          0x00000001 /* Transmit desc written back */
 #define E1000_ICR_LSC           0x00000004 /* Link Status Change */
-#define E1000_ICR_RXSEQ         0x00000008 /* rx sequence error */
-#define E1000_ICR_RXDMT0        0x00000010 /* rx desc min. threshold (0) */
-#define E1000_ICR_RXT0          0x00000080 /* rx timer intr (ring 0) */
+#define E1000_ICR_RXSEQ         0x00000008 /* Rx sequence error */
+#define E1000_ICR_RXDMT0        0x00000010 /* Rx desc min. threshold (0) */
+#define E1000_ICR_RXT0          0x00000080 /* Rx timer intr (ring 0) */
 #define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver should claim the interrupt */
 
-/* This defines the bits that are set in the Interrupt Mask
+/*
+ * This defines the bits that are set in the Interrupt Mask
  * Set/Read Register.  Each bit is documented below:
  *   o RXT0   = Receiver Timer Interrupt (ring 0)
  *   o TXDW   = Transmit Descriptor Written Back
@@ -379,21 +382,22 @@
 /* Interrupt Mask Set */
 #define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Transmit desc written back */
 #define E1000_IMS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
+#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */
+#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */
+#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* Rx timer intr */
 
 /* Interrupt Cause Set */
 #define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
 #define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
+#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */
 
 /* Transmit Descriptor Control */
 #define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
 #define E1000_TXDCTL_WTHRESH 0x003F0000 /* TXDCTL Writeback Threshold */
 #define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
 #define E1000_TXDCTL_MAX_TX_DESC_PREFETCH 0x0100001F /* GRAN=1, PTHRESH=31 */
-#define E1000_TXDCTL_COUNT_DESC 0x00400000 /* Enable the counting of desc.
-                                              still to be processed. */
+/* Enable the counting of desc. still to be processed. */
+#define E1000_TXDCTL_COUNT_DESC 0x00400000
 
 /* Flow Control Constants */
 #define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
@@ -404,7 +408,8 @@
 #define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
 
 /* Receive Address */
-/* Number of high/low register pairs in the RAR. The RAR (Receive Address
+/*
+ * Number of high/low register pairs in the RAR. The RAR (Receive Address
  * Registers) holds the directed and multicast addresses that we monitor.
  * Technically, we have 16 spots.  However, we reserve one of these spots
  * (RAR[15]) for our directed address used by controllers with
@@ -533,8 +538,8 @@
 #define E1000_EECD_REQ       0x00000040 /* NVM Access Request */
 #define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */
 #define E1000_EECD_SIZE      0x00000200 /* NVM Size (0=64 word 1=256 word) */
-#define E1000_EECD_ADDR_BITS 0x00000400 /* NVM Addressing bits based on type
-                                         * (0-small, 1-large) */
+/* NVM Addressing bits based on type (0-small, 1-large) */
+#define E1000_EECD_ADDR_BITS 0x00000400
 #define E1000_NVM_GRANT_ATTEMPTS   1000 /* NVM # attempts to gain grant */
 #define E1000_EECD_AUTO_RD          0x00000200  /* NVM Auto Read done */
 #define E1000_EECD_SIZE_EX_MASK     0x00007800  /* NVM Size */
@@ -626,7 +631,8 @@
 #define MAX_PHY_MULTI_PAGE_REG 0xF
 
 /* Bit definitions for valid PHY IDs. */
-/* I = Integrated
+/*
+ * I = Integrated
  * E = External
  */
 #define M88E1000_E_PHY_ID    0x01410C50
@@ -653,37 +659,37 @@
 #define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000  /* MDI Crossover Mode bits 6:5 */
                                                /* Manual MDI configuration */
 #define M88E1000_PSCR_MDIX_MANUAL_MODE 0x0020  /* Manual MDIX configuration */
-#define M88E1000_PSCR_AUTO_X_1000T     0x0040  /* 1000BASE-T: Auto crossover,
-                                                *  100BASE-TX/10BASE-T:
-                                                *  MDI Mode
-                                                */
-#define M88E1000_PSCR_AUTO_X_MODE      0x0060  /* Auto crossover enabled
-                                                * all speeds.
-                                                */
-                                        /* 1=Enable Extended 10BASE-T distance
-                                         * (Lower 10BASE-T RX Threshold)
-                                         * 0=Normal 10BASE-T RX Threshold */
-                                        /* 1=5-Bit interface in 100BASE-TX
-                                         * 0=MII interface in 100BASE-TX */
-#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Transmit */
+/* 1000BASE-T: Auto crossover, 100BASE-TX/10BASE-T: MDI Mode */
+#define M88E1000_PSCR_AUTO_X_1000T     0x0040
+/* Auto crossover enabled all speeds */
+#define M88E1000_PSCR_AUTO_X_MODE      0x0060
+/*
+ * 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold)
+ * 0=Normal 10BASE-T Rx Threshold
+ */
+#define M88E1000_PSCR_ASSERT_CRS_ON_TX 0x0800 /* 1=Assert CRS on Transmit */
 
 /* M88E1000 PHY Specific Status Register */
 #define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
 #define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
 #define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
-#define M88E1000_PSSR_CABLE_LENGTH       0x0380 /* 0=<50M;1=50-80M;2=80-110M;
-                                            * 3=110-140M;4=>140M */
+/* 0=<50M; 1=50-80M; 2=80-110M; 3=110-140M; 4=>140M */
+#define M88E1000_PSSR_CABLE_LENGTH       0x0380
 #define M88E1000_PSSR_SPEED              0xC000 /* Speed, bits 14:15 */
 #define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
 
 #define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
 
-/* Number of times we will attempt to autonegotiate before downshifting if we
- * are the master */
+/*
+ * Number of times we will attempt to autonegotiate before downshifting if we
+ * are the master
+ */
 #define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
 #define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000
-/* Number of times we will attempt to autonegotiate before downshifting if we
- * are the slave */
+/*
+ * Number of times we will attempt to autonegotiate before downshifting if we
+ * are the slave
+ */
 #define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
 #define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X    0x0100
 #define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
@@ -692,7 +698,8 @@
 #define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
 #define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
 
-/* Bits...
+/*
+ * Bits...
  * 15-5: page
  * 4-0: register offset
  */
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 327c0620da31..5a89dff52264 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -61,7 +61,7 @@ struct e1000_info;
         ndev_printk(KERN_NOTICE , netdev, format, ## arg)
 
 
-/* TX/RX descriptor defines */
+/* Tx/Rx descriptor defines */
 #define E1000_DEFAULT_TXD               256
 #define E1000_MAX_TXD                   4096
 #define E1000_MIN_TXD                   80
@@ -114,13 +114,13 @@ struct e1000_buffer {
         dma_addr_t dma;
         struct sk_buff *skb;
         union {
-                /* TX */
+                /* Tx */
                 struct {
                         unsigned long time_stamp;
                         u16 length;
                         u16 next_to_watch;
                 };
-                /* RX */
+                /* Rx */
                 /* arrays of page information for packet split */
                 struct e1000_ps_page *ps_pages;
         };
@@ -167,9 +167,6 @@ struct e1000_adapter {
 
         spinlock_t tx_queue_lock; /* prevent concurrent tail updates */
 
-        /* this is still needed for 82571 and above */
-        atomic_t irq_sem;
-
         /* track device up/down/testing state */
         unsigned long state;
 
@@ -180,7 +177,7 @@ struct e1000_adapter {
         u16 rx_itr;
 
         /*
-         * TX
+         * Tx
          */
         struct e1000_ring *tx_ring /* One per active queue */
                                                 ____cacheline_aligned_in_smp;
@@ -202,7 +199,7 @@ struct e1000_adapter {
         unsigned int total_rx_bytes;
         unsigned int total_rx_packets;
 
-        /* TX stats */
+        /* Tx stats */
         u64 tpt_old;
         u64 colc_old;
         u64 gotcl_old;
@@ -214,7 +211,7 @@ struct e1000_adapter {
         u32 tx_dma_failed;
 
         /*
-         * RX
+         * Rx
          */
         bool (*clean_rx) (struct e1000_adapter *adapter,
                           int *work_done, int work_to_do)
@@ -226,7 +223,7 @@ struct e1000_adapter {
         u32 rx_int_delay;
         u32 rx_abs_int_delay;
 
-        /* RX stats */
+        /* Rx stats */
         u64 hw_csum_err;
         u64 hw_csum_good;
         u64 rx_hdr_split;
@@ -237,6 +234,8 @@ struct e1000_adapter {
 
         unsigned int rx_ps_pages;
         u16 rx_ps_bsize0;
+        u32 max_frame_size;
+        u32 min_frame_size;
 
         /* OS defined structs */
         struct net_device *netdev;
@@ -261,7 +260,7 @@ struct e1000_adapter {
         u32 wol;
         u32 pba;
 
-        u8 fc_autoneg;
+        bool fc_autoneg;
 
         unsigned long led_status;
 
@@ -272,7 +271,7 @@ struct e1000_info {
         enum e1000_mac_type     mac;
         unsigned int            flags;
         u32                     pba;
-        s32                     (*get_invariants)(struct e1000_adapter *);
+        s32                     (*get_variants)(struct e1000_adapter *);
         struct e1000_mac_operations *mac_ops;
         struct e1000_phy_operations *phy_ops;
         struct e1000_nvm_operations *nvm_ops;
@@ -308,6 +307,7 @@ struct e1000_info {
 #define FLAG_MSI_ENABLED                  (1 << 27)
 #define FLAG_RX_CSUM_ENABLED              (1 << 28)
 #define FLAG_TSO_FORCE                    (1 << 29)
+#define FLAG_RX_RESTART_NOW               (1 << 30)
 
 #define E1000_RX_DESC_PS(R, i)      \
         (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
@@ -357,7 +357,7 @@ extern struct e1000_info e1000_ich8_info;
 extern struct e1000_info e1000_ich9_info;
 extern struct e1000_info e1000_es2_info;
 
-extern s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num);
+extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);
 
 extern s32  e1000e_commit_phy(struct e1000_hw *hw);
 
@@ -390,9 +390,11 @@ extern s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw);
 extern s32 e1000e_setup_link(struct e1000_hw *hw);
 extern void e1000e_clear_vfta(struct e1000_hw *hw);
 extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
-extern void e1000e_mc_addr_list_update_generic(struct e1000_hw *hw,
-                                       u8 *mc_addr_list, u32 mc_addr_count,
-                                       u32 rar_used_count, u32 rar_count);
+extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
+                                               u8 *mc_addr_list,
+                                               u32 mc_addr_count,
+                                               u32 rar_used_count,
+                                               u32 rar_count);
 extern void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
 extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);
 extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
@@ -462,7 +464,6 @@ extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);
 extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);
 extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-extern s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);
 extern void e1000e_release_nvm(struct e1000_hw *hw);
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 88657adf965f..d59a99ae44be 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -92,7 +92,8 @@
 /* In-Band Control Register (Page 194, Register 18) */
 #define GG82563_ICR_DIS_PADDING                  0x0010 /* Disable Padding */
 
-/* A table for the GG82563 cable length where the range is defined
+/*
+ * A table for the GG82563 cable length where the range is defined
  * with a lower bound at "index" and the upper bound at
  * "index + 5".
  */
@@ -118,7 +119,7 @@ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
         struct e1000_phy_info *phy = &hw->phy;
         s32 ret_val;
 
-        if (hw->media_type != e1000_media_type_copper) {
+        if (hw->phy.media_type != e1000_media_type_copper) {
                 phy->type       = e1000_phy_none;
                 return 0;
         }
@@ -167,15 +168,20 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
                 break;
         }
 
-        nvm->type              = e1000_nvm_eeprom_spi;
+        nvm->type = e1000_nvm_eeprom_spi;
 
         size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
                           E1000_EECD_SIZE_EX_SHIFT);
 
-        /* Added to a constant, "size" becomes the left-shift value
+        /*
+         * Added to a constant, "size" becomes the left-shift value
          * for setting word_size.
          */
         size += NVM_WORD_SIZE_BASE_SHIFT;
+
+        /* EEPROM access above 16k is unsupported */
+        if (size > 14)
+                size = 14;
         nvm->word_size  = 1 << size;
 
         return 0;
@@ -196,10 +202,10 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         /* Set media type */
         switch (adapter->pdev->device) {
         case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
-                hw->media_type = e1000_media_type_internal_serdes;
+                hw->phy.media_type = e1000_media_type_internal_serdes;
                 break;
         default:
-                hw->media_type = e1000_media_type_copper;
+                hw->phy.media_type = e1000_media_type_copper;
                 break;
         }
 
@@ -208,11 +214,10 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         /* Set rar entry count */
         mac->rar_entry_count = E1000_RAR_ENTRIES;
         /* Set if manageability features are enabled. */
-        mac->arc_subsystem_valid =
-                (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0;
+        mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0;
 
         /* check for link */
-        switch (hw->media_type) {
+        switch (hw->phy.media_type) {
         case e1000_media_type_copper:
                 func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
                 func->check_for_link = e1000e_check_for_copper_link;
@@ -233,7 +238,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         return 0;
 }
 
-static s32 e1000_get_invariants_80003es2lan(struct e1000_adapter *adapter)
+static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         s32 rc;
@@ -344,8 +349,10 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
                 if (!(swfw_sync & (fwmask | swmask)))
                         break;
 
-                /* Firmware currently using resource (fwmask)
-                 * or other software thread using resource (swmask) */
+                /*
+                 * Firmware currently using resource (fwmask)
+                 * or other software thread using resource (swmask)
+                 */
                 e1000e_put_hw_semaphore(hw);
                 mdelay(5);
                 i++;
@@ -407,7 +414,8 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
         if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG)
                 page_select = GG82563_PHY_PAGE_SELECT;
         else
-                /* Use Alternative Page Select register to access
+                /*
+                 * Use Alternative Page Select register to access
                  * registers 30 and 31
                  */
                 page_select = GG82563_PHY_PAGE_SELECT_ALT;
@@ -417,7 +425,8 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
         if (ret_val)
                 return ret_val;
 
-        /* The "ready" bit in the MDIC register may be incorrectly set
+        /*
+         * The "ready" bit in the MDIC register may be incorrectly set
          * before the device has completed the "Page Select" MDI
          * transaction.  So we wait 200us after each MDI command...
          */
@@ -462,7 +471,8 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
         if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG)
                 page_select = GG82563_PHY_PAGE_SELECT;
         else
-                /* Use Alternative Page Select register to access
+                /*
+                 * Use Alternative Page Select register to access
                  * registers 30 and 31
                  */
                 page_select = GG82563_PHY_PAGE_SELECT_ALT;
@@ -473,7 +483,8 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                 return ret_val;
 
 
-        /* The "ready" bit in the MDIC register may be incorrectly set
+        /*
+         * The "ready" bit in the MDIC register may be incorrectly set
          * before the device has completed the "Page Select" MDI
          * transaction.  So we wait 200us after each MDI command...
          */
@@ -554,7 +565,8 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
         u16 phy_data;
         bool link;
 
-        /* Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
+        /*
+         * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
          * forced whenever speed and duplex are forced.
          */
         ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
@@ -583,7 +595,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 
         udelay(1);
 
-        if (hw->phy.wait_for_link) {
+        if (hw->phy.autoneg_wait_to_complete) {
                 hw_dbg(hw, "Waiting for forced speed/duplex link "
                          "on GG82563 phy.\n");
 
@@ -593,7 +605,8 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
                         return ret_val;
 
                 if (!link) {
-                        /* We didn't get link.
+                        /*
+                         * We didn't get link.
                          * Reset the DSP and cross our fingers.
                          */
                         ret_val = e1000e_phy_reset_dsp(hw);
@@ -612,7 +625,8 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Resetting the phy means we need to verify the TX_CLK corresponds
+        /*
+         * Resetting the phy means we need to verify the TX_CLK corresponds
          * to the link speed.  10Mbps -> 2.5MHz, else 25MHz.
          */
         phy_data &= ~GG82563_MSCR_TX_CLK_MASK;
@@ -621,7 +635,8 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
         else
                 phy_data |= GG82563_MSCR_TX_CLK_100MBPS_25;
 
-        /* In addition, we must re-enable CRS on Tx for both half and full
+        /*
+         * In addition, we must re-enable CRS on Tx for both half and full
          * duplex.
          */
         phy_data |= GG82563_MSCR_ASSERT_CRS_ON_TX;
@@ -671,7 +686,7 @@ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
 {
         s32 ret_val;
 
-        if (hw->media_type == e1000_media_type_copper) {
+        if (hw->phy.media_type == e1000_media_type_copper) {
                 ret_val = e1000e_get_speed_and_duplex_copper(hw,
                                                                     speed,
                                                                     duplex);
@@ -704,7 +719,8 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
         u32 icr;
         s32 ret_val;
 
-        /* Prevent the PCI-E bus from sticking if there is no TLP connection
+        /*
+         * Prevent the PCI-E bus from sticking if there is no TLP connection
          * on the last TLP read/write transaction when MAC is reset.
          */
         ret_val = e1000e_disable_pcie_master(hw);
@@ -776,16 +792,16 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
         ret_val = e1000e_setup_link(hw);
 
         /* Set the transmit descriptor write-back policy */
-        reg_data = er32(TXDCTL);
+        reg_data = er32(TXDCTL(0));
         reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
-        ew32(TXDCTL, reg_data);
+        ew32(TXDCTL(0), reg_data);
 
         /* ...for both queues. */
-        reg_data = er32(TXDCTL1);
+        reg_data = er32(TXDCTL(1));
         reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
-        ew32(TXDCTL1, reg_data);
+        ew32(TXDCTL(1), reg_data);
 
         /* Enable retransmit on late collisions */
         reg_data = er32(TCTL);
@@ -808,7 +824,8 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
         reg_data &= ~0x00100000;
         E1000_WRITE_REG_ARRAY(hw, E1000_FFLT, 0x0001, reg_data);
 
-        /* Clear all of the statistics registers (clear on read).  It is
+        /*
+         * Clear all of the statistics registers (clear on read).  It is
          * important that we do this after we have tried to establish link
          * because the symbol error count will increment wildly if there
          * is no link.
@@ -829,29 +846,29 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
         u32 reg;
 
         /* Transmit Descriptor Control 0 */
-        reg = er32(TXDCTL);
+        reg = er32(TXDCTL(0));
         reg |= (1 << 22);
-        ew32(TXDCTL, reg);
+        ew32(TXDCTL(0), reg);
 
         /* Transmit Descriptor Control 1 */
-        reg = er32(TXDCTL1);
+        reg = er32(TXDCTL(1));
         reg |= (1 << 22);
-        ew32(TXDCTL1, reg);
+        ew32(TXDCTL(1), reg);
 
         /* Transmit Arbitration Control 0 */
-        reg = er32(TARC0);
+        reg = er32(TARC(0));
         reg &= ~(0xF << 27); /* 30:27 */
-        if (hw->media_type != e1000_media_type_copper)
+        if (hw->phy.media_type != e1000_media_type_copper)
                 reg &= ~(1 << 20);
-        ew32(TARC0, reg);
+        ew32(TARC(0), reg);
 
         /* Transmit Arbitration Control 1 */
-        reg = er32(TARC1);
+        reg = er32(TARC(1));
         if (er32(TCTL) & E1000_TCTL_MULR)
                 reg &= ~(1 << 28);
         else
                 reg |= (1 << 28);
-        ew32(TARC1, reg);
+        ew32(TARC(1), reg);
 }
 
 /**
@@ -881,7 +898,8 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Options:
+        /*
+         * Options:
          *   MDI/MDI-X = 0 (default)
          *   0 - Auto for all speeds
          *   1 - MDI mode
@@ -907,7 +925,8 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
                 break;
         }
 
-        /* Options:
+        /*
+         * Options:
          *   disable_polarity_correction = 0 (default)
          *       Automatic Correction for Reversed Cable Polarity
          *   0 - Disabled
@@ -928,10 +947,9 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
                 return ret_val;
         }
 
-        /* Bypass RX and TX FIFO's */
-        ret_val = e1000e_write_kmrn_reg(hw,
-                                E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL,
-                                E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS |
+        /* Bypass Rx and Tx FIFO's */
+        ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL,
+                                        E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS |
                                         E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS);
         if (ret_val)
                 return ret_val;
@@ -953,7 +971,8 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Do not init these registers when the HW is in IAMT mode, since the
+        /*
+         * Do not init these registers when the HW is in IAMT mode, since the
          * firmware will have already initialized them.  We only initialize
          * them if the HW is not in IAMT mode.
          */
@@ -974,7 +993,8 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
                         return ret_val;
         }
 
-        /* Workaround: Disable padding in Kumeran interface in the MAC
+        /*
+         * Workaround: Disable padding in Kumeran interface in the MAC
          * and in the PHY to avoid CRC errors.
          */
         ret_val = e1e_rphy(hw, GG82563_PHY_INBAND_CTRL, &data);
@@ -1007,9 +1027,11 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
         ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
         ew32(CTRL, ctrl);
 
-        /* Set the mac to wait the maximum time between each
+        /*
+         * Set the mac to wait the maximum time between each
          * iteration and increase the max iterations when
-         * polling the phy; this fixes erroneous timeouts at 10Mbps. */
+         * polling the phy; this fixes erroneous timeouts at 10Mbps.
+         */
         ret_val = e1000e_write_kmrn_reg(hw, GG82563_REG(0x34, 4), 0xFFFF);
         if (ret_val)
                 return ret_val;
@@ -1026,9 +1048,8 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
         reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING;
-        ret_val = e1000e_write_kmrn_reg(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                       reg_data);
+        ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+                                        reg_data);
         if (ret_val)
                 return ret_val;
 
@@ -1056,9 +1077,8 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
         u16 reg_data;
 
         reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;
-        ret_val = e1000e_write_kmrn_reg(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                       reg_data);
+        ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                        reg_data);
         if (ret_val)
                 return ret_val;
 
@@ -1096,9 +1116,8 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
         u32 tipg;
 
         reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
-        ret_val = e1000e_write_kmrn_reg(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                       reg_data);
+        ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                        reg_data);
         if (ret_val)
                 return ret_val;
 
@@ -1175,7 +1194,7 @@ static struct e1000_mac_operations es2_mac_ops = {
         .get_link_up_info       = e1000_get_link_up_info_80003es2lan,
         .led_on                 = e1000e_led_on_generic,
         .led_off                = e1000e_led_off_generic,
-        .mc_addr_list_update    = e1000e_mc_addr_list_update_generic,
+        .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
         .reset_hw               = e1000_reset_hw_80003es2lan,
         .init_hw                = e1000_init_hw_80003es2lan,
         .setup_link             = e1000e_setup_link,
@@ -1224,7 +1243,7 @@ struct e1000_info e1000_es2_info = {
                                   | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
                                   | FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
         .pba                    = 38,
-        .get_invariants         = e1000_get_invariants_80003es2lan,
+        .get_variants           = e1000_get_variants_80003es2lan,
         .mac_ops                = &es2_mac_ops,
         .phy_ops                = &es2_phy_ops,
         .nvm_ops                = &es2_nvm_ops,
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index f77a7427d3a0..6d1b257bbda6 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -102,7 +102,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
         "Interrupt test (offline)", "Loopback test  (offline)",
         "Link test   (on/offline)"
 };
-#define E1000_TEST_LEN  ARRAY_SIZE(e1000_gstrings_test)
+#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
 
 static int e1000_get_settings(struct net_device *netdev,
                               struct ethtool_cmd *ecmd)
@@ -111,7 +111,7 @@ static int e1000_get_settings(struct net_device *netdev,
         struct e1000_hw *hw = &adapter->hw;
         u32 status;
 
-        if (hw->media_type == e1000_media_type_copper) {
+        if (hw->phy.media_type == e1000_media_type_copper) {
 
                 ecmd->supported = (SUPPORTED_10baseT_Half |
                                    SUPPORTED_10baseT_Full |
@@ -165,7 +165,7 @@ static int e1000_get_settings(struct net_device *netdev,
                 ecmd->duplex = -1;
         }
 
-        ecmd->autoneg = ((hw->media_type == e1000_media_type_fiber) ||
+        ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) ||
                          hw->mac.autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
         return 0;
 }
@@ -187,7 +187,7 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
         mac->autoneg = 0;
 
         /* Fiber NICs only allow 1000 gbps Full duplex */
-        if ((adapter->hw.media_type == e1000_media_type_fiber) &&
+        if ((adapter->hw.phy.media_type == e1000_media_type_fiber) &&
                 spddplx != (SPEED_1000 + DUPLEX_FULL)) {
                 ndev_err(adapter->netdev, "Unsupported Speed/Duplex "
                          "configuration\n");
@@ -226,8 +226,10 @@ static int e1000_set_settings(struct net_device *netdev,
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
-        /* When SoL/IDER sessions are active, autoneg/speed/duplex
-         * cannot be changed */
+        /*
+         * When SoL/IDER sessions are active, autoneg/speed/duplex
+         * cannot be changed
+         */
         if (e1000_check_reset_block(hw)) {
                 ndev_err(netdev, "Cannot change link "
                          "characteristics when SoL/IDER is active.\n");
@@ -239,7 +241,7 @@ static int e1000_set_settings(struct net_device *netdev,
 
         if (ecmd->autoneg == AUTONEG_ENABLE) {
                 hw->mac.autoneg = 1;
-                if (hw->media_type == e1000_media_type_fiber)
+                if (hw->phy.media_type == e1000_media_type_fiber)
                         hw->phy.autoneg_advertised = ADVERTISED_1000baseT_Full |
                                                      ADVERTISED_FIBRE |
                                                      ADVERTISED_Autoneg;
@@ -248,6 +250,8 @@ static int e1000_set_settings(struct net_device *netdev,
                                                      ADVERTISED_TP |
                                                      ADVERTISED_Autoneg;
                 ecmd->advertising = hw->phy.autoneg_advertised;
+                if (adapter->fc_autoneg)
+                        hw->fc.original_type = e1000_fc_default;
         } else {
                 if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) {
                         clear_bit(__E1000_RESETTING, &adapter->state);
@@ -277,11 +281,11 @@ static void e1000_get_pauseparam(struct net_device *netdev,
         pause->autoneg =
                 (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
 
-        if (hw->mac.fc == e1000_fc_rx_pause) {
+        if (hw->fc.type == e1000_fc_rx_pause) {
                 pause->rx_pause = 1;
-        } else if (hw->mac.fc == e1000_fc_tx_pause) {
+        } else if (hw->fc.type == e1000_fc_tx_pause) {
                 pause->tx_pause = 1;
-        } else if (hw->mac.fc == e1000_fc_full) {
+        } else if (hw->fc.type == e1000_fc_full) {
                 pause->rx_pause = 1;
                 pause->tx_pause = 1;
         }
@@ -300,18 +304,18 @@ static int e1000_set_pauseparam(struct net_device *netdev,
                 msleep(1);
 
         if (pause->rx_pause && pause->tx_pause)
-                hw->mac.fc = e1000_fc_full;
+                hw->fc.type = e1000_fc_full;
         else if (pause->rx_pause && !pause->tx_pause)
-                hw->mac.fc = e1000_fc_rx_pause;
+                hw->fc.type = e1000_fc_rx_pause;
         else if (!pause->rx_pause && pause->tx_pause)
-                hw->mac.fc = e1000_fc_tx_pause;
+                hw->fc.type = e1000_fc_tx_pause;
         else if (!pause->rx_pause && !pause->tx_pause)
-                hw->mac.fc = e1000_fc_none;
+                hw->fc.type = e1000_fc_none;
 
-        hw->mac.original_fc = hw->mac.fc;
+        hw->fc.original_type = hw->fc.type;
 
         if (adapter->fc_autoneg == AUTONEG_ENABLE) {
-                hw->mac.fc = e1000_fc_default;
+                hw->fc.type = e1000_fc_default;
                 if (netif_running(adapter->netdev)) {
                         e1000e_down(adapter);
                         e1000e_up(adapter);
@@ -319,7 +323,7 @@ static int e1000_set_pauseparam(struct net_device *netdev,
                         e1000e_reset(adapter);
                 }
         } else {
-                retval = ((hw->media_type == e1000_media_type_fiber) ?
+                retval = ((hw->phy.media_type == e1000_media_type_fiber) ?
                           hw->mac.ops.setup_link(hw) : e1000e_force_mac_fc(hw));
         }
 
@@ -558,8 +562,10 @@ static int e1000_set_eeprom(struct net_device *netdev,
         ret_val = e1000_write_nvm(hw, first_word,
                                   last_word - first_word + 1, eeprom_buff);
 
-        /* Update the checksum over the first part of the EEPROM if needed
-         * and flush shadow RAM for 82573 controllers */
+        /*
+         * Update the checksum over the first part of the EEPROM if needed
+         * and flush shadow RAM for 82573 controllers
+         */
         if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG) ||
                                (hw->mac.type == e1000_82573)))
                 e1000e_update_nvm_checksum(hw);
@@ -578,8 +584,10 @@ static void e1000_get_drvinfo(struct net_device *netdev,
         strncpy(drvinfo->driver,  e1000e_driver_name, 32);
         strncpy(drvinfo->version, e1000e_driver_version, 32);
 
-        /* EEPROM image version # is reported as firmware version # for
-         * PCI-E controllers */
+        /*
+         * EEPROM image version # is reported as firmware version # for
+         * PCI-E controllers
+         */
         e1000_read_nvm(&adapter->hw, 5, 1, &eeprom_data);
         sprintf(firmware_version, "%d.%d-%d",
                 (eeprom_data & 0xF000) >> 12,
@@ -633,10 +641,17 @@ static int e1000_set_ringparam(struct net_device *netdev,
         tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
         if (!tx_ring)
                 goto err_alloc_tx;
+        /*
+         * use a memcpy to save any previously configured
+         * items like napi structs from having to be
+         * reinitialized
+         */
+        memcpy(tx_ring, tx_old, sizeof(struct e1000_ring));
 
         rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
         if (!rx_ring)
                 goto err_alloc_rx;
+        memcpy(rx_ring, rx_old, sizeof(struct e1000_ring));
 
         adapter->tx_ring = tx_ring;
         adapter->rx_ring = rx_ring;
@@ -658,8 +673,10 @@ static int e1000_set_ringparam(struct net_device *netdev,
                 if (err)
                         goto err_setup_tx;
 
-                /* save the new, restore the old in order to free it,
-                 * then restore the new back again */
+                /*
+                 * restore the old in order to free it,
+                 * then add in the new
+                 */
                 adapter->rx_ring = rx_old;
                 adapter->tx_ring = tx_old;
                 e1000e_free_rx_resources(adapter);
@@ -690,61 +707,55 @@ err_setup:
         return err;
 }
 
-static bool reg_pattern_test_array(struct e1000_adapter *adapter, u64 *data,
-                                   int reg, int offset, u32 mask, u32 write)
+static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
+                             int reg, int offset, u32 mask, u32 write)
 {
-        int i;
-        u32 read;
+        u32 pat, val;
         static const u32 test[] =
                 {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
-        for (i = 0; i < ARRAY_SIZE(test); i++) {
+        for (pat = 0; pat < ARRAY_SIZE(test); pat++) {
                 E1000_WRITE_REG_ARRAY(&adapter->hw, reg, offset,
-                                      (test[i] & write));
-                read = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
-                if (read != (test[i] & write & mask)) {
+                                      (test[pat] & write));
+                val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
+                if (val != (test[pat] & write & mask)) {
                         ndev_err(adapter->netdev, "pattern test reg %04X "
                                  "failed: got 0x%08X expected 0x%08X\n",
                                  reg + offset,
-                                 read, (test[i] & write & mask));
+                                 val, (test[pat] & write & mask));
                         *data = reg;
-                        return true;
+                        return 1;
                 }
         }
-        return false;
+        return 0;
 }
 
 static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
                               int reg, u32 mask, u32 write)
 {
-        u32 read;
+        u32 val;
         __ew32(&adapter->hw, reg, write & mask);
-        read = __er32(&adapter->hw, reg);
-        if ((write & mask) != (read & mask)) {
+        val = __er32(&adapter->hw, reg);
+        if ((write & mask) != (val & mask)) {
                 ndev_err(adapter->netdev, "set/check reg %04X test failed: "
-                         "got 0x%08X expected 0x%08X\n", reg, (read & mask),
+                         "got 0x%08X expected 0x%08X\n", reg, (val & mask),
                          (write & mask));
                 *data = reg;
-                return true;
+                return 1;
         }
-        return false;
+        return 0;
 }
-
-#define REG_PATTERN_TEST(R, M, W) \
-        do { \
-                if (reg_pattern_test_array(adapter, data, R, 0, M, W)) \
-                        return 1; \
+#define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write)                       \
+        do {                                                                   \
+                if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \
+                        return 1;                                              \
         } while (0)
+#define REG_PATTERN_TEST(reg, mask, write)                                     \
+        REG_PATTERN_TEST_ARRAY(reg, 0, mask, write)
 
-#define REG_PATTERN_TEST_ARRAY(R, offset, M, W) \
-        do { \
-                if (reg_pattern_test_array(adapter, data, R, offset, M, W)) \
-                        return 1; \
-        } while (0)
-
-#define REG_SET_AND_CHECK(R, M, W) \
-        do { \
-                if (reg_set_and_check(adapter, data, R, M, W)) \
-                        return 1; \
+#define REG_SET_AND_CHECK(reg, mask, write)                                    \
+        do {                                                                   \
+                if (reg_set_and_check(adapter, data, reg, mask, write))        \
+                        return 1;                                              \
         } while (0)
 
 static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
@@ -758,7 +769,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         u32 i;
         u32 toggle;
 
-        /* The status register is Read Only, so a write should fail.
+        /*
+         * The status register is Read Only, so a write should fail.
          * Some bits that get toggled are ignored.
          */
         switch (mac->type) {
@@ -908,7 +920,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
                 mask = 1 << i;
 
                 if (!shared_int) {
-                        /* Disable the interrupt to be reported in
+                        /*
+                         * Disable the interrupt to be reported in
                          * the cause register and then force the same
                          * interrupt and see if one gets posted.  If
                          * an interrupt was posted to the bus, the
@@ -925,7 +938,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
                         }
                 }
 
-                /* Enable the interrupt to be reported in
+                /*
+                 * Enable the interrupt to be reported in
                  * the cause register and then force the same
                  * interrupt and see if one gets posted.  If
                  * an interrupt was not posted to the bus, the
@@ -942,7 +956,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
                 }
 
                 if (!shared_int) {
-                        /* Disable the other interrupts to be reported in
+                        /*
+                         * Disable the other interrupts to be reported in
                          * the cause register and then force the other
                          * interrupts and see if any get posted.  If
                          * an interrupt was posted to the bus, the
@@ -1024,7 +1039,6 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         struct pci_dev *pdev = adapter->pdev;
         struct e1000_hw *hw = &adapter->hw;
         u32 rctl;
-        int size;
         int i;
         int ret_val;
 
@@ -1033,13 +1047,13 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         if (!tx_ring->count)
                 tx_ring->count = E1000_DEFAULT_TXD;
 
-        size = tx_ring->count * sizeof(struct e1000_buffer);
-        tx_ring->buffer_info = kmalloc(size, GFP_KERNEL);
-        if (!tx_ring->buffer_info) {
+        tx_ring->buffer_info = kcalloc(tx_ring->count,
+                                       sizeof(struct e1000_buffer),
+                                       GFP_KERNEL);
+        if (!(tx_ring->buffer_info)) {
                 ret_val = 1;
                 goto err_nomem;
         }
-        memset(tx_ring->buffer_info, 0, size);
 
         tx_ring->size = tx_ring->count * sizeof(struct e1000_tx_desc);
         tx_ring->size = ALIGN(tx_ring->size, 4096);
@@ -1049,21 +1063,17 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 ret_val = 2;
                 goto err_nomem;
         }
-        memset(tx_ring->desc, 0, tx_ring->size);
         tx_ring->next_to_use = 0;
         tx_ring->next_to_clean = 0;
 
-        ew32(TDBAL,
-                        ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
+        ew32(TDBAL, ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
         ew32(TDBAH, ((u64) tx_ring->dma >> 32));
-        ew32(TDLEN,
-                        tx_ring->count * sizeof(struct e1000_tx_desc));
+        ew32(TDLEN, tx_ring->count * sizeof(struct e1000_tx_desc));
         ew32(TDH, 0);
         ew32(TDT, 0);
-        ew32(TCTL,
-                        E1000_TCTL_PSP | E1000_TCTL_EN |
-                        E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
-                        E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT);
+        ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN | E1000_TCTL_MULR |
+             E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
+             E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT);
 
         for (i = 0; i < tx_ring->count; i++) {
                 struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*tx_ring, i);
@@ -1085,12 +1095,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                         ret_val = 4;
                         goto err_nomem;
                 }
-                tx_desc->buffer_addr = cpu_to_le64(
-                                         tx_ring->buffer_info[i].dma);
+                tx_desc->buffer_addr = cpu_to_le64(tx_ring->buffer_info[i].dma);
                 tx_desc->lower.data = cpu_to_le32(skb->len);
                 tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
                                                    E1000_TXD_CMD_IFCS |
-                                                   E1000_TXD_CMD_RPS);
+                                                   E1000_TXD_CMD_RS);
                 tx_desc->upper.data = 0;
         }
 
@@ -1099,13 +1108,13 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         if (!rx_ring->count)
                 rx_ring->count = E1000_DEFAULT_RXD;
 
-        size = rx_ring->count * sizeof(struct e1000_buffer);
-        rx_ring->buffer_info = kmalloc(size, GFP_KERNEL);
-        if (!rx_ring->buffer_info) {
+        rx_ring->buffer_info = kcalloc(rx_ring->count,
+                                       sizeof(struct e1000_buffer),
+                                       GFP_KERNEL);
+        if (!(rx_ring->buffer_info)) {
                 ret_val = 5;
                 goto err_nomem;
         }
-        memset(rx_ring->buffer_info, 0, size);
 
         rx_ring->size = rx_ring->count * sizeof(struct e1000_rx_desc);
         rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
@@ -1114,7 +1123,6 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 ret_val = 6;
                 goto err_nomem;
         }
-        memset(rx_ring->desc, 0, rx_ring->size);
         rx_ring->next_to_use = 0;
         rx_ring->next_to_clean = 0;
 
@@ -1126,6 +1134,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         ew32(RDH, 0);
         ew32(RDT, 0);
         rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
+                E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_LPE |
+                E1000_RCTL_SBP | E1000_RCTL_SECRC |
                 E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
                 (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
         ew32(RCTL, rctl);
@@ -1175,21 +1185,22 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
         u32 ctrl_reg = 0;
         u32 stat_reg = 0;
 
-        adapter->hw.mac.autoneg = 0;
+        hw->mac.autoneg = 0;
 
-        if (adapter->hw.phy.type == e1000_phy_m88) {
+        if (hw->phy.type == e1000_phy_m88) {
                 /* Auto-MDI/MDIX Off */
                 e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
                 /* reset to update Auto-MDI/MDIX */
                 e1e_wphy(hw, PHY_CONTROL, 0x9140);
                 /* autoneg off */
                 e1e_wphy(hw, PHY_CONTROL, 0x8140);
-        } else if (adapter->hw.phy.type == e1000_phy_gg82563)
+        } else if (hw->phy.type == e1000_phy_gg82563)
                 e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, 0x1CC);
 
         ctrl_reg = er32(CTRL);
 
-        if (adapter->hw.phy.type == e1000_phy_ife) {
+        switch (hw->phy.type) {
+        case e1000_phy_ife:
                 /* force 100, set loopback */
                 e1e_wphy(hw, PHY_CONTROL, 0x6100);
 
@@ -1199,9 +1210,11 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
                              E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
                              E1000_CTRL_SPD_100 |/* Force Speed to 100 */
                              E1000_CTRL_FD);     /* Force Duplex to FULL */
-        } else {
+                break;
+        default:
                 /* force 1000, set loopback */
                 e1e_wphy(hw, PHY_CONTROL, 0x4140);
+                mdelay(250);
 
                 /* Now set up the MAC to the same speed/duplex as the PHY. */
                 ctrl_reg = er32(CTRL);
@@ -1210,14 +1223,20 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
                              E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
                              E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
                              E1000_CTRL_FD);     /* Force Duplex to FULL */
+
+                if ((adapter->hw.mac.type == e1000_ich8lan) ||
+                    (adapter->hw.mac.type == e1000_ich9lan))
+                        ctrl_reg |= E1000_CTRL_SLU;     /* Set Link Up */
         }
 
-        if (adapter->hw.media_type == e1000_media_type_copper &&
-           adapter->hw.phy.type == e1000_phy_m88) {
+        if (hw->phy.media_type == e1000_media_type_copper &&
+            hw->phy.type == e1000_phy_m88) {
                 ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
         } else {
-                /* Set the ILOS bit on the fiber Nic if half duplex link is
-                 * detected. */
+                /*
+                 * Set the ILOS bit on the fiber Nic if half duplex link is
+                 * detected.
+                 */
                 stat_reg = er32(STATUS);
                 if ((stat_reg & E1000_STATUS_FD) == 0)
                         ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
@@ -1225,10 +1244,11 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 
         ew32(CTRL, ctrl_reg);
 
-        /* Disable the receiver on the PHY so when a cable is plugged in, the
+        /*
+         * Disable the receiver on the PHY so when a cable is plugged in, the
          * PHY does not begin to autoneg when a cable is reconnected to the NIC.
          */
-        if (adapter->hw.phy.type == e1000_phy_m88)
+        if (hw->phy.type == e1000_phy_m88)
                 e1000_phy_disable_receiver(adapter);
 
         udelay(500);
@@ -1244,8 +1264,10 @@ static int e1000_set_82571_fiber_loopback(struct e1000_adapter *adapter)
 
         /* special requirements for 82571/82572 fiber adapters */
 
-        /* jump through hoops to make sure link is up because serdes
-         * link is hardwired up */
+        /*
+         * jump through hoops to make sure link is up because serdes
+         * link is hardwired up
+         */
         ctrl |= E1000_CTRL_SLU;
         ew32(CTRL, ctrl);
 
@@ -1263,8 +1285,10 @@ static int e1000_set_82571_fiber_loopback(struct e1000_adapter *adapter)
                 ew32(CTRL, ctrl);
         }
 
-        /* special write to serdes control register to enable SerDes analog
-         * loopback */
+        /*
+         * special write to serdes control register to enable SerDes analog
+         * loopback
+         */
 #define E1000_SERDES_LB_ON 0x410
         ew32(SCTL, E1000_SERDES_LB_ON);
         msleep(10);
@@ -1279,8 +1303,10 @@ static int e1000_set_es2lan_mac_loopback(struct e1000_adapter *adapter)
         u32 ctrlext = er32(CTRL_EXT);
         u32 ctrl = er32(CTRL);
 
-        /* save CTRL_EXT to restore later, reuse an empty variable (unused
-           on mac_type 80003es2lan) */
+        /*
+         * save CTRL_EXT to restore later, reuse an empty variable (unused
+         * on mac_type 80003es2lan)
+         */
         adapter->tx_fifo_head = ctrlext;
 
         /* clear the serdes mode bits, putting the device into mac loopback */
@@ -1302,7 +1328,7 @@ static int e1000_set_es2lan_mac_loopback(struct e1000_adapter *adapter)
 #define KMRNCTRLSTA_OPMODE (0x1F << 16)
 #define KMRNCTRLSTA_OPMODE_1GB_FD_GMII 0x0582
         ew32(KMRNCTRLSTA,
-                (KMRNCTRLSTA_OPMODE | KMRNCTRLSTA_OPMODE_1GB_FD_GMII));
+             (KMRNCTRLSTA_OPMODE | KMRNCTRLSTA_OPMODE_1GB_FD_GMII));
 
         return 0;
 }
@@ -1312,8 +1338,8 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         u32 rctl;
 
-        if (hw->media_type == e1000_media_type_fiber ||
-            hw->media_type == e1000_media_type_internal_serdes) {
+        if (hw->phy.media_type == e1000_media_type_fiber ||
+            hw->phy.media_type == e1000_media_type_internal_serdes) {
                 switch (hw->mac.type) {
                 case e1000_80003es2lan:
                         return e1000_set_es2lan_mac_loopback(adapter);
@@ -1328,7 +1354,7 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
                         ew32(RCTL, rctl);
                         return 0;
                 }
-        } else if (hw->media_type == e1000_media_type_copper) {
+        } else if (hw->phy.media_type == e1000_media_type_copper) {
                 return e1000_integrated_phy_loopback(adapter);
         }
 
@@ -1347,18 +1373,17 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
 
         switch (hw->mac.type) {
         case e1000_80003es2lan:
-                if (hw->media_type == e1000_media_type_fiber ||
-                    hw->media_type == e1000_media_type_internal_serdes) {
+                if (hw->phy.media_type == e1000_media_type_fiber ||
+                    hw->phy.media_type == e1000_media_type_internal_serdes) {
                         /* restore CTRL_EXT, stealing space from tx_fifo_head */
-                        ew32(CTRL_EXT,
-                                        adapter->tx_fifo_head);
+                        ew32(CTRL_EXT, adapter->tx_fifo_head);
                         adapter->tx_fifo_head = 0;
                 }
                 /* fall through */
         case e1000_82571:
         case e1000_82572:
-                if (hw->media_type == e1000_media_type_fiber ||
-                    hw->media_type == e1000_media_type_internal_serdes) {
+                if (hw->phy.media_type == e1000_media_type_fiber ||
+                    hw->phy.media_type == e1000_media_type_internal_serdes) {
 #define E1000_SERDES_LB_OFF 0x400
                         ew32(SCTL, E1000_SERDES_LB_OFF);
                         msleep(10);
@@ -1414,7 +1439,8 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
 
         ew32(RDT, rx_ring->count - 1);
 
-        /* Calculate the loop count based on the largest descriptor ring
+        /*
+         * Calculate the loop count based on the largest descriptor ring
          * The idea is to wrap the largest ring a number of times using 64
          * send/receive pairs during each loop
          */
@@ -1428,8 +1454,8 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
         l = 0;
         for (j = 0; j <= lc; j++) { /* loop count loop */
                 for (i = 0; i < 64; i++) { /* send the packets */
-                        e1000_create_lbtest_frame(
-                                tx_ring->buffer_info[i].skb, 1024);
+                        e1000_create_lbtest_frame(tx_ring->buffer_info[k].skb,
+                                                  1024);
                         pci_dma_sync_single_for_device(pdev,
                                         tx_ring->buffer_info[k].dma,
                                         tx_ring->buffer_info[k].length,
@@ -1454,7 +1480,8 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
                         l++;
                         if (l == rx_ring->count)
                                 l = 0;
-                        /* time + 20 msecs (200 msecs on 2.4) is more than
+                        /*
+                         * time + 20 msecs (200 msecs on 2.4) is more than
                          * enough time to complete the receives, if it's
                          * exceeded, break and error off
                          */
@@ -1463,7 +1490,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
                         ret_val = 13; /* ret_val is the same as mis-compare */
                         break;
                 }
-                if (jiffies >= (time + 2)) {
+                if (jiffies >= (time + 20)) {
                         ret_val = 14; /* error code for time out error */
                         break;
                 }
@@ -1473,8 +1500,10 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
 
 static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
 {
-        /* PHY loopback cannot be performed if SoL/IDER
-         * sessions are active */
+        /*
+         * PHY loopback cannot be performed if SoL/IDER
+         * sessions are active
+         */
         if (e1000_check_reset_block(&adapter->hw)) {
                 ndev_err(adapter->netdev, "Cannot do PHY loopback test "
                          "when SoL/IDER is active.\n");
@@ -1504,12 +1533,14 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
         struct e1000_hw *hw = &adapter->hw;
 
         *data = 0;
-        if (hw->media_type == e1000_media_type_internal_serdes) {
+        if (hw->phy.media_type == e1000_media_type_internal_serdes) {
                 int i = 0;
                 hw->mac.serdes_has_link = 0;
 
-                /* On some blade server designs, link establishment
-                 * could take as long as 2-3 minutes */
+                /*
+                 * On some blade server designs, link establishment
+                 * could take as long as 2-3 minutes
+                 */
                 do {
                         hw->mac.ops.check_for_link(hw);
                         if (hw->mac.serdes_has_link)
@@ -1562,8 +1593,10 @@ static void e1000_diag_test(struct net_device *netdev,
 
                 ndev_info(netdev, "offline testing starting\n");
 
-                /* Link test performed before hardware reset so autoneg doesn't
-                 * interfere with test result */
+                /*
+                 * Link test performed before hardware reset so autoneg doesn't
+                 * interfere with test result
+                 */
                 if (e1000_link_test(adapter, &data[4]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
@@ -1596,9 +1629,9 @@ static void e1000_diag_test(struct net_device *netdev,
                 adapter->hw.mac.autoneg = autoneg;
 
                 /* force this routine to wait until autoneg complete/timeout */
-                adapter->hw.phy.wait_for_link = 1;
+                adapter->hw.phy.autoneg_wait_to_complete = 1;
                 e1000e_reset(adapter);
-                adapter->hw.phy.wait_for_link = 0;
+                adapter->hw.phy.autoneg_wait_to_complete = 0;
 
                 clear_bit(__E1000_TESTING, &adapter->state);
                 if (if_running)
@@ -1768,8 +1801,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
 
         switch (stringset) {
         case ETH_SS_TEST:
-                memcpy(data, *e1000_gstrings_test,
-                        sizeof(e1000_gstrings_test));
+                memcpy(data, *e1000_gstrings_test, sizeof(e1000_gstrings_test));
                 break;
         case ETH_SS_STATS:
                 for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 916025b30fc3..53f1ac6327fa 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -66,14 +66,14 @@ enum e1e_registers {
         E1000_IMS      = 0x000D0, /* Interrupt Mask Set - RW */
         E1000_IMC      = 0x000D8, /* Interrupt Mask Clear - WO */
         E1000_IAM      = 0x000E0, /* Interrupt Acknowledge Auto Mask */
-        E1000_RCTL     = 0x00100, /* RX Control - RW */
+        E1000_RCTL     = 0x00100, /* Rx Control - RW */
         E1000_FCTTV    = 0x00170, /* Flow Control Transmit Timer Value - RW */
-        E1000_TXCW     = 0x00178, /* TX Configuration Word - RW */
-        E1000_RXCW     = 0x00180, /* RX Configuration Word - RO */
-        E1000_TCTL     = 0x00400, /* TX Control - RW */
-        E1000_TCTL_EXT = 0x00404, /* Extended TX Control - RW */
-        E1000_TIPG     = 0x00410, /* TX Inter-packet gap -RW */
-        E1000_AIT      = 0x00458, /* Adaptive Interframe Spacing Throttle - RW */
+        E1000_TXCW     = 0x00178, /* Tx Configuration Word - RW */
+        E1000_RXCW     = 0x00180, /* Rx Configuration Word - RO */
+        E1000_TCTL     = 0x00400, /* Tx Control - RW */
+        E1000_TCTL_EXT = 0x00404, /* Extended Tx Control - RW */
+        E1000_TIPG     = 0x00410, /* Tx Inter-packet gap -RW */
+        E1000_AIT      = 0x00458, /* Adaptive Interframe Spacing Throttle -RW */
         E1000_LEDCTL   = 0x00E00, /* LED Control - RW */
         E1000_EXTCNF_CTRL  = 0x00F00, /* Extended Configuration Control */
         E1000_EXTCNF_SIZE  = 0x00F08, /* Extended Configuration Size */
@@ -87,12 +87,14 @@ enum e1e_registers {
         E1000_FCRTL    = 0x02160, /* Flow Control Receive Threshold Low - RW */
         E1000_FCRTH    = 0x02168, /* Flow Control Receive Threshold High - RW */
         E1000_PSRCTL   = 0x02170, /* Packet Split Receive Control - RW */
-        E1000_RDBAL    = 0x02800, /* RX Descriptor Base Address Low - RW */
-        E1000_RDBAH    = 0x02804, /* RX Descriptor Base Address High - RW */
-        E1000_RDLEN    = 0x02808, /* RX Descriptor Length - RW */
-        E1000_RDH      = 0x02810, /* RX Descriptor Head - RW */
-        E1000_RDT      = 0x02818, /* RX Descriptor Tail - RW */
-        E1000_RDTR     = 0x02820, /* RX Delay Timer - RW */
+        E1000_RDBAL    = 0x02800, /* Rx Descriptor Base Address Low - RW */
+        E1000_RDBAH    = 0x02804, /* Rx Descriptor Base Address High - RW */
+        E1000_RDLEN    = 0x02808, /* Rx Descriptor Length - RW */
+        E1000_RDH      = 0x02810, /* Rx Descriptor Head - RW */
+        E1000_RDT      = 0x02818, /* Rx Descriptor Tail - RW */
+        E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
+        E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */
+#define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))
         E1000_RADV     = 0x0282C, /* RX Interrupt Absolute Delay Timer - RW */
 
 /* Convenience macros
@@ -105,17 +107,17 @@ enum e1e_registers {
  */
 #define E1000_RDBAL_REG(_n)   (E1000_RDBAL + (_n << 8))
         E1000_KABGTXD  = 0x03004, /* AFE Band Gap Transmit Ref Data */
-        E1000_TDBAL    = 0x03800, /* TX Descriptor Base Address Low - RW */
-        E1000_TDBAH    = 0x03804, /* TX Descriptor Base Address High - RW */
-        E1000_TDLEN    = 0x03808, /* TX Descriptor Length - RW */
-        E1000_TDH      = 0x03810, /* TX Descriptor Head - RW */
-        E1000_TDT      = 0x03818, /* TX Descriptor Tail - RW */
-        E1000_TIDV     = 0x03820, /* TX Interrupt Delay Value - RW */
-        E1000_TXDCTL   = 0x03828, /* TX Descriptor Control - RW */
-        E1000_TADV     = 0x0382C, /* TX Interrupt Absolute Delay Val - RW */
-        E1000_TARC0    = 0x03840, /* TX Arbitration Count (0) */
-        E1000_TXDCTL1  = 0x03928, /* TX Descriptor Control (1) - RW */
-        E1000_TARC1    = 0x03940, /* TX Arbitration Count (1) */
+        E1000_TDBAL    = 0x03800, /* Tx Descriptor Base Address Low - RW */
+        E1000_TDBAH    = 0x03804, /* Tx Descriptor Base Address High - RW */
+        E1000_TDLEN    = 0x03808, /* Tx Descriptor Length - RW */
+        E1000_TDH      = 0x03810, /* Tx Descriptor Head - RW */
+        E1000_TDT      = 0x03818, /* Tx Descriptor Tail - RW */
+        E1000_TIDV     = 0x03820, /* Tx Interrupt Delay Value - RW */
+        E1000_TXDCTL_BASE = 0x03828, /* Tx Descriptor Control - RW */
+#define E1000_TXDCTL(_n)   (E1000_TXDCTL_BASE + (_n << 8))
+        E1000_TADV     = 0x0382C, /* Tx Interrupt Absolute Delay Val - RW */
+        E1000_TARC_BASE = 0x03840, /* Tx Arbitration Count (0) */
+#define E1000_TARC(_n)   (E1000_TARC_BASE + (_n << 8))
         E1000_CRCERRS  = 0x04000, /* CRC Error Count - R/clr */
         E1000_ALGNERRC = 0x04004, /* Alignment Error Count - R/clr */
         E1000_SYMERRS  = 0x04008, /* Symbol Error Count - R/clr */
@@ -127,53 +129,53 @@ enum e1e_registers {
         E1000_LATECOL  = 0x04020, /* Late Collision Count - R/clr */
         E1000_COLC     = 0x04028, /* Collision Count - R/clr */
         E1000_DC       = 0x04030, /* Defer Count - R/clr */
-        E1000_TNCRS    = 0x04034, /* TX-No CRS - R/clr */
+        E1000_TNCRS    = 0x04034, /* Tx-No CRS - R/clr */
         E1000_SEC      = 0x04038, /* Sequence Error Count - R/clr */
         E1000_CEXTERR  = 0x0403C, /* Carrier Extension Error Count - R/clr */
         E1000_RLEC     = 0x04040, /* Receive Length Error Count - R/clr */
-        E1000_XONRXC   = 0x04048, /* XON RX Count - R/clr */
-        E1000_XONTXC   = 0x0404C, /* XON TX Count - R/clr */
-        E1000_XOFFRXC  = 0x04050, /* XOFF RX Count - R/clr */
-        E1000_XOFFTXC  = 0x04054, /* XOFF TX Count - R/clr */
-        E1000_FCRUC    = 0x04058, /* Flow Control RX Unsupported Count- R/clr */
-        E1000_PRC64    = 0x0405C, /* Packets RX (64 bytes) - R/clr */
-        E1000_PRC127   = 0x04060, /* Packets RX (65-127 bytes) - R/clr */
-        E1000_PRC255   = 0x04064, /* Packets RX (128-255 bytes) - R/clr */
-        E1000_PRC511   = 0x04068, /* Packets RX (255-511 bytes) - R/clr */
-        E1000_PRC1023  = 0x0406C, /* Packets RX (512-1023 bytes) - R/clr */
-        E1000_PRC1522  = 0x04070, /* Packets RX (1024-1522 bytes) - R/clr */
-        E1000_GPRC     = 0x04074, /* Good Packets RX Count - R/clr */
-        E1000_BPRC     = 0x04078, /* Broadcast Packets RX Count - R/clr */
-        E1000_MPRC     = 0x0407C, /* Multicast Packets RX Count - R/clr */
-        E1000_GPTC     = 0x04080, /* Good Packets TX Count - R/clr */
-        E1000_GORCL    = 0x04088, /* Good Octets RX Count Low - R/clr */
-        E1000_GORCH    = 0x0408C, /* Good Octets RX Count High - R/clr */
-        E1000_GOTCL    = 0x04090, /* Good Octets TX Count Low - R/clr */
-        E1000_GOTCH    = 0x04094, /* Good Octets TX Count High - R/clr */
-        E1000_RNBC     = 0x040A0, /* RX No Buffers Count - R/clr */
-        E1000_RUC      = 0x040A4, /* RX Undersize Count - R/clr */
-        E1000_RFC      = 0x040A8, /* RX Fragment Count - R/clr */
-        E1000_ROC      = 0x040AC, /* RX Oversize Count - R/clr */
-        E1000_RJC      = 0x040B0, /* RX Jabber Count - R/clr */
-        E1000_MGTPRC   = 0x040B4, /* Management Packets RX Count - R/clr */
+        E1000_XONRXC   = 0x04048, /* XON Rx Count - R/clr */
+        E1000_XONTXC   = 0x0404C, /* XON Tx Count - R/clr */
+        E1000_XOFFRXC  = 0x04050, /* XOFF Rx Count - R/clr */
+        E1000_XOFFTXC  = 0x04054, /* XOFF Tx Count - R/clr */
+        E1000_FCRUC    = 0x04058, /* Flow Control Rx Unsupported Count- R/clr */
+        E1000_PRC64    = 0x0405C, /* Packets Rx (64 bytes) - R/clr */
+        E1000_PRC127   = 0x04060, /* Packets Rx (65-127 bytes) - R/clr */
+        E1000_PRC255   = 0x04064, /* Packets Rx (128-255 bytes) - R/clr */
+        E1000_PRC511   = 0x04068, /* Packets Rx (255-511 bytes) - R/clr */
+        E1000_PRC1023  = 0x0406C, /* Packets Rx (512-1023 bytes) - R/clr */
+        E1000_PRC1522  = 0x04070, /* Packets Rx (1024-1522 bytes) - R/clr */
+        E1000_GPRC     = 0x04074, /* Good Packets Rx Count - R/clr */
+        E1000_BPRC     = 0x04078, /* Broadcast Packets Rx Count - R/clr */
+        E1000_MPRC     = 0x0407C, /* Multicast Packets Rx Count - R/clr */
+        E1000_GPTC     = 0x04080, /* Good Packets Tx Count - R/clr */
+        E1000_GORCL    = 0x04088, /* Good Octets Rx Count Low - R/clr */
+        E1000_GORCH    = 0x0408C, /* Good Octets Rx Count High - R/clr */
+        E1000_GOTCL    = 0x04090, /* Good Octets Tx Count Low - R/clr */
+        E1000_GOTCH    = 0x04094, /* Good Octets Tx Count High - R/clr */
+        E1000_RNBC     = 0x040A0, /* Rx No Buffers Count - R/clr */
+        E1000_RUC      = 0x040A4, /* Rx Undersize Count - R/clr */
+        E1000_RFC      = 0x040A8, /* Rx Fragment Count - R/clr */
+        E1000_ROC      = 0x040AC, /* Rx Oversize Count - R/clr */
+        E1000_RJC      = 0x040B0, /* Rx Jabber Count - R/clr */
+        E1000_MGTPRC   = 0x040B4, /* Management Packets Rx Count - R/clr */
         E1000_MGTPDC   = 0x040B8, /* Management Packets Dropped Count - R/clr */
-        E1000_MGTPTC   = 0x040BC, /* Management Packets TX Count - R/clr */
-        E1000_TORL     = 0x040C0, /* Total Octets RX Low - R/clr */
-        E1000_TORH     = 0x040C4, /* Total Octets RX High - R/clr */
-        E1000_TOTL     = 0x040C8, /* Total Octets TX Low - R/clr */
-        E1000_TOTH     = 0x040CC, /* Total Octets TX High - R/clr */
-        E1000_TPR      = 0x040D0, /* Total Packets RX - R/clr */
-        E1000_TPT      = 0x040D4, /* Total Packets TX - R/clr */
-        E1000_PTC64    = 0x040D8, /* Packets TX (64 bytes) - R/clr */
-        E1000_PTC127   = 0x040DC, /* Packets TX (65-127 bytes) - R/clr */
-        E1000_PTC255   = 0x040E0, /* Packets TX (128-255 bytes) - R/clr */
-        E1000_PTC511   = 0x040E4, /* Packets TX (256-511 bytes) - R/clr */
-        E1000_PTC1023  = 0x040E8, /* Packets TX (512-1023 bytes) - R/clr */
-        E1000_PTC1522  = 0x040EC, /* Packets TX (1024-1522 Bytes) - R/clr */
-        E1000_MPTC     = 0x040F0, /* Multicast Packets TX Count - R/clr */
-        E1000_BPTC     = 0x040F4, /* Broadcast Packets TX Count - R/clr */
-        E1000_TSCTC    = 0x040F8, /* TCP Segmentation Context TX - R/clr */
-        E1000_TSCTFC   = 0x040FC, /* TCP Segmentation Context TX Fail - R/clr */
+        E1000_MGTPTC   = 0x040BC, /* Management Packets Tx Count - R/clr */
+        E1000_TORL     = 0x040C0, /* Total Octets Rx Low - R/clr */
+        E1000_TORH     = 0x040C4, /* Total Octets Rx High - R/clr */
+        E1000_TOTL     = 0x040C8, /* Total Octets Tx Low - R/clr */
+        E1000_TOTH     = 0x040CC, /* Total Octets Tx High - R/clr */
+        E1000_TPR      = 0x040D0, /* Total Packets Rx - R/clr */
+        E1000_TPT      = 0x040D4, /* Total Packets Tx - R/clr */
+        E1000_PTC64    = 0x040D8, /* Packets Tx (64 bytes) - R/clr */
+        E1000_PTC127   = 0x040DC, /* Packets Tx (65-127 bytes) - R/clr */
+        E1000_PTC255   = 0x040E0, /* Packets Tx (128-255 bytes) - R/clr */
+        E1000_PTC511   = 0x040E4, /* Packets Tx (256-511 bytes) - R/clr */
+        E1000_PTC1023  = 0x040E8, /* Packets Tx (512-1023 bytes) - R/clr */
+        E1000_PTC1522  = 0x040EC, /* Packets Tx (1024-1522 Bytes) - R/clr */
+        E1000_MPTC     = 0x040F0, /* Multicast Packets Tx Count - R/clr */
+        E1000_BPTC     = 0x040F4, /* Broadcast Packets Tx Count - R/clr */
+        E1000_TSCTC    = 0x040F8, /* TCP Segmentation Context Tx - R/clr */
+        E1000_TSCTFC   = 0x040FC, /* TCP Segmentation Context Tx Fail - R/clr */
         E1000_IAC      = 0x04100, /* Interrupt Assertion Count */
         E1000_ICRXPTC  = 0x04104, /* Irq Cause Rx Packet Timer Expire Count */
         E1000_ICRXATC  = 0x04108, /* Irq Cause Rx Abs Timer Expire Count */
@@ -183,7 +185,7 @@ enum e1e_registers {
         E1000_ICTXQMTC = 0x0411C, /* Irq Cause Tx Queue MinThreshold Count */
         E1000_ICRXDMTC = 0x04120, /* Irq Cause Rx Desc MinThreshold Count */
         E1000_ICRXOC   = 0x04124, /* Irq Cause Receiver Overrun Count */
-        E1000_RXCSUM   = 0x05000, /* RX Checksum Control - RW */
+        E1000_RXCSUM   = 0x05000, /* Rx Checksum Control - RW */
         E1000_RFCTL    = 0x05008, /* Receive Filter Control */
         E1000_MTA      = 0x05200, /* Multicast Table Array - RW Array */
         E1000_RA       = 0x05400, /* Receive Address - RW Array */
@@ -250,8 +252,8 @@ enum e1e_registers {
 #define E1000_VFTA_ENTRY_BIT_SHIFT_MASK 0x1F
 
 #define E1000_HICR_EN                   0x01  /* Enable bit - RO */
-#define E1000_HICR_C                    0x02  /* Driver sets this bit when done
-                                               * to put command in RAM */
+/* Driver sets this bit when done to put command in RAM */
+#define E1000_HICR_C                    0x02
 #define E1000_HICR_FW_RESET_ENABLE      0x40
 #define E1000_HICR_FW_RESET             0x80
 
@@ -400,7 +402,7 @@ enum e1000_rev_polarity{
         e1000_rev_polarity_undefined = 0xFF
 };
 
-enum e1000_fc_mode {
+enum e1000_fc_type {
         e1000_fc_none = 0,
         e1000_fc_rx_pause,
         e1000_fc_tx_pause,
@@ -685,8 +687,7 @@ struct e1000_mac_operations {
         s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
         s32  (*led_on)(struct e1000_hw *);
         s32  (*led_off)(struct e1000_hw *);
-        void (*mc_addr_list_update)(struct e1000_hw *, u8 *, u32, u32,
-                                         u32);
+        void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32, u32, u32);
         s32  (*reset_hw)(struct e1000_hw *);
         s32  (*init_hw)(struct e1000_hw *);
         s32  (*setup_link)(struct e1000_hw *);
@@ -728,16 +729,12 @@ struct e1000_mac_info {
         u8 perm_addr[6];
 
         enum e1000_mac_type type;
-        enum e1000_fc_mode  fc;
-        enum e1000_fc_mode  original_fc;
 
         u32 collision_delta;
         u32 ledctl_default;
         u32 ledctl_mode1;
         u32 ledctl_mode2;
-        u32 max_frame_size;
         u32 mc_filter_type;
-        u32 min_frame_size;
         u32 tx_packet_delta;
         u32 txcw;
 
@@ -748,9 +745,6 @@ struct e1000_mac_info {
         u16 ifs_step_size;
         u16 mta_reg_count;
         u16 rar_entry_count;
-        u16 fc_high_water;
-        u16 fc_low_water;
-        u16 fc_pause_time;
 
         u8  forced_speed_duplex;
 
@@ -780,6 +774,8 @@ struct e1000_phy_info {
         u32 reset_delay_us; /* in usec */
         u32 revision;
 
+        enum e1000_media_type media_type;
+
         u16 autoneg_advertised;
         u16 autoneg_mask;
         u16 cable_length;
@@ -792,7 +788,7 @@ struct e1000_phy_info {
         bool is_mdix;
         bool polarity_correction;
         bool speed_downgraded;
-        bool wait_for_link;
+        bool autoneg_wait_to_complete;
 };
 
 struct e1000_nvm_info {
@@ -817,6 +813,16 @@ struct e1000_bus_info {
         u16 func;
 };
 
+struct e1000_fc_info {
+        u32 high_water;          /* Flow control high-water mark */
+        u32 low_water;           /* Flow control low-water mark */
+        u16 pause_time;          /* Flow control pause timer */
+        bool send_xon;           /* Flow control send XON */
+        bool strict_ieee;        /* Strict IEEE mode */
+        enum e1000_fc_type type; /* Type of flow control */
+        enum e1000_fc_type original_type;
+};
+
 struct e1000_dev_spec_82571 {
         bool laa_is_present;
         bool alt_mac_addr_is_present;
@@ -841,6 +847,7 @@ struct e1000_hw {
         u8 __iomem *flash_address;
 
         struct e1000_mac_info  mac;
+        struct e1000_fc_info   fc;
         struct e1000_phy_info  phy;
         struct e1000_nvm_info  nvm;
         struct e1000_bus_info  bus;
@@ -850,8 +857,6 @@ struct e1000_hw {
                 struct e1000_dev_spec_82571     e82571;
                 struct e1000_dev_spec_ich8lan   ich8lan;
         } dev_spec;
-
-        enum e1000_media_type media_type;
 };
 
 #ifdef DEBUG
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 0ae39550768d..768485dbb2c6 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -243,8 +243,7 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
         u32 sector_end_addr;
         u16 i;
 
-        /* Can't read flash registers if the register set isn't mapped.
-         */
+        /* Can't read flash registers if the register set isn't mapped. */
         if (!hw->flash_address) {
                 hw_dbg(hw, "ERROR: Flash registers not mapped\n");
                 return -E1000_ERR_CONFIG;
@@ -254,17 +253,21 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
 
         gfpreg = er32flash(ICH_FLASH_GFPREG);
 
-        /* sector_X_addr is a "sector"-aligned address (4096 bytes)
+        /*
+         * sector_X_addr is a "sector"-aligned address (4096 bytes)
          * Add 1 to sector_end_addr since this sector is included in
-         * the overall size. */
+         * the overall size.
+         */
         sector_base_addr = gfpreg & FLASH_GFPREG_BASE_MASK;
         sector_end_addr = ((gfpreg >> 16) & FLASH_GFPREG_BASE_MASK) + 1;
 
         /* flash_base_addr is byte-aligned */
         nvm->flash_base_addr = sector_base_addr << FLASH_SECTOR_ADDR_SHIFT;
 
-        /* find total size of the NVM, then cut in half since the total
-         * size represents two separate NVM banks. */
+        /*
+         * find total size of the NVM, then cut in half since the total
+         * size represents two separate NVM banks.
+         */
         nvm->flash_bank_size = (sector_end_addr - sector_base_addr)
                                 << FLASH_SECTOR_ADDR_SHIFT;
         nvm->flash_bank_size /= 2;
@@ -295,7 +298,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
         struct e1000_mac_info *mac = &hw->mac;
 
         /* Set media type function pointer */
-        hw->media_type = e1000_media_type_copper;
+        hw->phy.media_type = e1000_media_type_copper;
 
         /* Set mta register count */
         mac->mta_reg_count = 32;
@@ -313,7 +316,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
         return 0;
 }
 
-static s32 e1000_get_invariants_ich8lan(struct e1000_adapter *adapter)
+static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         s32 rc;
@@ -450,7 +453,7 @@ static s32 e1000_phy_force_speed_duplex_ich8lan(struct e1000_hw *hw)
 
         udelay(1);
 
-        if (phy->wait_for_link) {
+        if (phy->autoneg_wait_to_complete) {
                 hw_dbg(hw, "Waiting for forced speed/duplex link on IFE phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw,
@@ -496,7 +499,8 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Initialize the PHY from the NVM on ICH platforms.  This
+        /*
+         * Initialize the PHY from the NVM on ICH platforms.  This
          * is needed due to an issue where the NVM configuration is
          * not properly autoloaded after power transitions.
          * Therefore, after each PHY reset, we will load the
@@ -523,7 +527,8 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
                         udelay(100);
                 } while ((!data) && --loop);
 
-                /* If basic configuration is incomplete before the above loop
+                /*
+                 * If basic configuration is incomplete before the above loop
                  * count reaches 0, loading the configuration from NVM will
                  * leave the PHY in a bad state possibly resulting in no link.
                  */
@@ -536,8 +541,10 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
                 data &= ~E1000_STATUS_LAN_INIT_DONE;
                 ew32(STATUS, data);
 
-                /* Make sure HW does not configure LCD from PHY
-                 * extended configuration before SW configuration */
+                /*
+                 * Make sure HW does not configure LCD from PHY
+                 * extended configuration before SW configuration
+                 */
                 data = er32(EXTCNF_CTRL);
                 if (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE)
                         return 0;
@@ -551,8 +558,7 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
                 cnf_base_addr = data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK;
                 cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT;
 
-                /* Configure LCD from extended configuration
-                 * region. */
+                /* Configure LCD from extended configuration region. */
 
                 /* cnf_base_addr is in DWORD */
                 word_addr = (u16)(cnf_base_addr << 1);
@@ -681,8 +687,8 @@ static s32 e1000_check_polarity_ife_ich8lan(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data, offset, mask;
 
-        /* Polarity is determined based on the reversal feature
-         * being enabled.
+        /*
+         * Polarity is determined based on the reversal feature being enabled.
          */
         if (phy->polarity_correction) {
                 offset  = IFE_PHY_EXTENDED_STATUS_CONTROL;
@@ -731,8 +737,10 @@ static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
                 phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU;
                 ew32(PHY_CTRL, phy_ctrl);
 
-                /* Call gig speed drop workaround on LPLU before accessing
-                 * any PHY registers */
+                /*
+                 * Call gig speed drop workaround on LPLU before accessing
+                 * any PHY registers
+                 */
                 if ((hw->mac.type == e1000_ich8lan) &&
                     (hw->phy.type == e1000_phy_igp_3))
                         e1000e_gig_downshift_workaround_ich8lan(hw);
@@ -747,30 +755,32 @@ static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
                 phy_ctrl &= ~E1000_PHY_CTRL_D0A_LPLU;
                 ew32(PHY_CTRL, phy_ctrl);
 
-                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /*
+                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
-                 * SmartSpeed, so performance is maintained. */
+                 * SmartSpeed, so performance is maintained.
+                 */
                 if (phy->smart_speed == e1000_smart_speed_on) {
                         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data |= IGP01E1000_PSCFR_SMART_SPEED;
                         ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 } else if (phy->smart_speed == e1000_smart_speed_off) {
                         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                         ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 }
@@ -804,34 +814,32 @@ static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
         if (!active) {
                 phy_ctrl &= ~E1000_PHY_CTRL_NOND0A_LPLU;
                 ew32(PHY_CTRL, phy_ctrl);
-                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /*
+                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
-                 * SmartSpeed, so performance is maintained. */
+                 * SmartSpeed, so performance is maintained.
+                 */
                 if (phy->smart_speed == e1000_smart_speed_on) {
-                        ret_val = e1e_rphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
+                        ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data |= IGP01E1000_PSCFR_SMART_SPEED;
-                        ret_val = e1e_wphy(hw,
-                                                     IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                        ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 } else if (phy->smart_speed == e1000_smart_speed_off) {
-                        ret_val = e1e_rphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
+                        ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                        ret_val = e1e_wphy(hw,
-                                                     IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                        ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 }
@@ -841,23 +849,21 @@ static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
                 phy_ctrl |= E1000_PHY_CTRL_NOND0A_LPLU;
                 ew32(PHY_CTRL, phy_ctrl);
 
-                /* Call gig speed drop workaround on LPLU before accessing
-                 * any PHY registers */
+                /*
+                 * Call gig speed drop workaround on LPLU before accessing
+                 * any PHY registers
+                 */
                 if ((hw->mac.type == e1000_ich8lan) &&
                     (hw->phy.type == e1000_phy_igp_3))
                         e1000e_gig_downshift_workaround_ich8lan(hw);
 
                 /* When LPLU is enabled, we should disable SmartSpeed */
-                ret_val = e1e_rphy(hw,
-                                            IGP01E1000_PHY_PORT_CONFIG,
-                                            &data);
+                ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG, &data);
                 if (ret_val)
                         return ret_val;
 
                 data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                ret_val = e1e_wphy(hw,
-                                             IGP01E1000_PHY_PORT_CONFIG,
-                                             data);
+                ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG, data);
         }
 
         return 0;
@@ -944,7 +950,8 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
 
         ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
 
-        /* Either we should have a hardware SPI cycle in progress
+        /*
+         * Either we should have a hardware SPI cycle in progress
          * bit to check against, in order to start a new cycle or
          * FDONE bit should be changed in the hardware so that it
          * is 1 after hardware reset, which can then be used as an
@@ -953,15 +960,19 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
          */
 
         if (hsfsts.hsf_status.flcinprog == 0) {
-                /* There is no cycle running at present,
-                 * so we can start a cycle */
-                /* Begin by setting Flash Cycle Done. */
+                /*
+                 * There is no cycle running at present,
+                 * so we can start a cycle
+                 * Begin by setting Flash Cycle Done.
+                 */
                 hsfsts.hsf_status.flcdone = 1;
                 ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
                 ret_val = 0;
         } else {
-                /* otherwise poll for sometime so the current
-                 * cycle has a chance to end before giving up. */
+                /*
+                 * otherwise poll for sometime so the current
+                 * cycle has a chance to end before giving up.
+                 */
                 for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
                         hsfsts.regval = __er16flash(hw, ICH_FLASH_HSFSTS);
                         if (hsfsts.hsf_status.flcinprog == 0) {
@@ -971,8 +982,10 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                         udelay(1);
                 }
                 if (ret_val == 0) {
-                        /* Successful in waiting for previous cycle to timeout,
-                         * now set the Flash Cycle Done. */
+                        /*
+                         * Successful in waiting for previous cycle to timeout,
+                         * now set the Flash Cycle Done.
+                         */
                         hsfsts.hsf_status.flcdone = 1;
                         ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
                 } else {
@@ -1077,10 +1090,12 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                 ret_val = e1000_flash_cycle_ich8lan(hw,
                                                 ICH_FLASH_READ_COMMAND_TIMEOUT);
 
-                /* Check if FCERR is set to 1, if set to 1, clear it
+                /*
+                 * Check if FCERR is set to 1, if set to 1, clear it
                  * and try the whole sequence a few more times, else
                  * read in (shift in) the Flash Data0, the order is
-                 * least significant byte first msb to lsb */
+                 * least significant byte first msb to lsb
+                 */
                 if (ret_val == 0) {
                         flash_data = er32flash(ICH_FLASH_FDATA0);
                         if (size == 1) {
@@ -1090,7 +1105,8 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                         }
                         break;
                 } else {
-                        /* If we've gotten here, then things are probably
+                        /*
+                         * If we've gotten here, then things are probably
                          * completely hosed, but if the error condition is
                          * detected, it won't hurt to give it another try...
                          * ICH_FLASH_CYCLE_REPEAT_COUNT times.
@@ -1168,18 +1184,20 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 
         ret_val = e1000e_update_nvm_checksum_generic(hw);
         if (ret_val)
-                return ret_val;;
+                return ret_val;
 
         if (nvm->type != e1000_nvm_flash_sw)
-                return ret_val;;
+                return ret_val;
 
         ret_val = e1000_acquire_swflag_ich8lan(hw);
         if (ret_val)
-                return ret_val;;
+                return ret_val;
 
-        /* We're writing to the opposite bank so if we're on bank 1,
+        /*
+         * We're writing to the opposite bank so if we're on bank 1,
          * write to bank 0 etc.  We also need to erase the segment that
-         * is going to be written */
+         * is going to be written
+         */
         if (!(er32(EECD) & E1000_EECD_SEC1VAL)) {
                 new_bank_offset = nvm->flash_bank_size;
                 old_bank_offset = 0;
@@ -1191,9 +1209,11 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
         }
 
         for (i = 0; i < E1000_ICH8_SHADOW_RAM_WORDS; i++) {
-                /* Determine whether to write the value stored
+                /*
+                 * Determine whether to write the value stored
                  * in the other NVM bank or a modified value stored
-                 * in the shadow RAM */
+                 * in the shadow RAM
+                 */
                 if (dev_spec->shadow_ram[i].modified) {
                         data = dev_spec->shadow_ram[i].value;
                 } else {
@@ -1202,12 +1222,14 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
                                                       &data);
                 }
 
-                /* If the word is 0x13, then make sure the signature bits
+                /*
+                 * If the word is 0x13, then make sure the signature bits
                  * (15:14) are 11b until the commit has completed.
                  * This will allow us to write 10b which indicates the
                  * signature is valid.  We want to do this after the write
                  * has completed so that we don't mark the segment valid
-                 * while the write is still in progress */
+                 * while the write is still in progress
+                 */
                 if (i == E1000_ICH_NVM_SIG_WORD)
                         data |= E1000_ICH_NVM_SIG_MASK;
 
@@ -1230,18 +1252,22 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
                         break;
         }
 
-        /* Don't bother writing the segment valid bits if sector
-         * programming failed. */
+        /*
+         * Don't bother writing the segment valid bits if sector
+         * programming failed.
+         */
         if (ret_val) {
                 hw_dbg(hw, "Flash commit failed.\n");
                 e1000_release_swflag_ich8lan(hw);
                 return ret_val;
         }
 
-        /* Finally validate the new segment by setting bit 15:14
+        /*
+         * Finally validate the new segment by setting bit 15:14
          * to 10b in word 0x13 , this can be done without an
          * erase as well since these bits are 11 to start with
-         * and we need to change bit 14 to 0b */
+         * and we need to change bit 14 to 0b
+         */
         act_offset = new_bank_offset + E1000_ICH_NVM_SIG_WORD;
         e1000_read_flash_word_ich8lan(hw, act_offset, &data);
         data &= 0xBFFF;
@@ -1253,10 +1279,12 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
                 return ret_val;
         }
 
-        /* And invalidate the previously valid segment by setting
+        /*
+         * And invalidate the previously valid segment by setting
          * its signature word (0x13) high_byte to 0b. This can be
          * done without an erase because flash erase sets all bits
-         * to 1's. We can write 1's to 0's without an erase */
+         * to 1's. We can write 1's to 0's without an erase
+         */
         act_offset = (old_bank_offset + E1000_ICH_NVM_SIG_WORD) * 2 + 1;
         ret_val = e1000_retry_write_flash_byte_ich8lan(hw, act_offset, 0);
         if (ret_val) {
@@ -1272,7 +1300,8 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 
         e1000_release_swflag_ich8lan(hw);
 
-        /* Reload the EEPROM, or else modifications will not appear
+        /*
+         * Reload the EEPROM, or else modifications will not appear
          * until after the next adapter reset.
          */
         e1000e_reload_nvm(hw);
@@ -1294,7 +1323,8 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
         s32 ret_val;
         u16 data;
 
-        /* Read 0x19 and check bit 6.  If this bit is 0, the checksum
+        /*
+         * Read 0x19 and check bit 6.  If this bit is 0, the checksum
          * needs to be fixed.  This bit is an indication that the NVM
          * was prepared by OEM software and did not calculate the
          * checksum...a likely scenario.
@@ -1364,14 +1394,17 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
                 ew32flash(ICH_FLASH_FDATA0, flash_data);
 
-                /* check if FCERR is set to 1 , if set to 1, clear it
-                 * and try the whole sequence a few more times else done */
+                /*
+                 * check if FCERR is set to 1 , if set to 1, clear it
+                 * and try the whole sequence a few more times else done
+                 */
                 ret_val = e1000_flash_cycle_ich8lan(hw,
                                                ICH_FLASH_WRITE_COMMAND_TIMEOUT);
                 if (!ret_val)
                         break;
 
-                /* If we're here, then things are most likely
+                /*
+                 * If we're here, then things are most likely
                  * completely hosed, but if the error condition
                  * is detected, it won't hurt to give it another
                  * try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
@@ -1462,9 +1495,10 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
 
         hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
 
-        /* Determine HW Sector size: Read BERASE bits of hw flash status
-         * register */
-        /* 00: The Hw sector is 256 bytes, hence we need to erase 16
+        /*
+         * Determine HW Sector size: Read BERASE bits of hw flash status
+         * register
+         * 00: The Hw sector is 256 bytes, hence we need to erase 16
          *     consecutive sectors.  The start index for the nth Hw sector
          *     can be calculated as = bank * 4096 + n * 256
          * 01: The Hw sector is 4K bytes, hence we need to erase 1 sector.
@@ -1511,13 +1545,16 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
                         if (ret_val)
                                 return ret_val;
 
-                        /* Write a value 11 (block Erase) in Flash
-                         * Cycle field in hw flash control */
+                        /*
+                         * Write a value 11 (block Erase) in Flash
+                         * Cycle field in hw flash control
+                         */
                         hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
                         hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_ERASE;
                         ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
 
-                        /* Write the last 24 bits of an index within the
+                        /*
+                         * Write the last 24 bits of an index within the
                          * block into Flash Linear address field in Flash
                          * Address.
                          */
@@ -1529,13 +1566,14 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
                         if (ret_val == 0)
                                 break;
 
-                        /* Check if FCERR is set to 1.  If 1,
+                        /*
+                         * Check if FCERR is set to 1.  If 1,
                          * clear it and try the whole sequence
-                         * a few more times else Done */
+                         * a few more times else Done
+                         */
                         hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
                         if (hsfsts.hsf_status.flcerr == 1)
-                                /* repeat for some time before
-                                 * giving up */
+                                /* repeat for some time before giving up */
                                 continue;
                         else if (hsfsts.hsf_status.flcdone == 0)
                                 return ret_val;
@@ -1585,7 +1623,8 @@ static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw)
 
         ret_val = e1000e_get_bus_info_pcie(hw);
 
-        /* ICH devices are "PCI Express"-ish.  They have
+        /*
+         * ICH devices are "PCI Express"-ish.  They have
          * a configuration space, but do not contain
          * PCI Express Capability registers, so bus width
          * must be hardcoded.
@@ -1608,7 +1647,8 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         u32 ctrl, icr, kab;
         s32 ret_val;
 
-        /* Prevent the PCI-E bus from sticking if there is no TLP connection
+        /*
+         * Prevent the PCI-E bus from sticking if there is no TLP connection
          * on the last TLP read/write transaction when MAC is reset.
          */
         ret_val = e1000e_disable_pcie_master(hw);
@@ -1619,7 +1659,8 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         hw_dbg(hw, "Masking off all interrupts\n");
         ew32(IMC, 0xffffffff);
 
-        /* Disable the Transmit and Receive units.  Then delay to allow
+        /*
+         * Disable the Transmit and Receive units.  Then delay to allow
          * any pending transactions to complete before we hit the MAC
          * with the global reset.
          */
@@ -1640,7 +1681,8 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         ctrl = er32(CTRL);
 
         if (!e1000_check_reset_block(hw)) {
-                /* PHY HW reset requires MAC CORE reset at the same
+                /*
+                 * PHY HW reset requires MAC CORE reset at the same
                  * time to make sure the interface between MAC and the
                  * external PHY is reset.
                  */
@@ -1711,21 +1753,23 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
         ret_val = e1000_setup_link_ich8lan(hw);
 
         /* Set the transmit descriptor write-back policy for both queues */
-        txdctl = er32(TXDCTL);
+        txdctl = er32(TXDCTL(0));
         txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
                  E1000_TXDCTL_FULL_TX_DESC_WB;
         txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
                  E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
-        ew32(TXDCTL, txdctl);
-        txdctl = er32(TXDCTL1);
+        ew32(TXDCTL(0), txdctl);
+        txdctl = er32(TXDCTL(1));
         txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
                  E1000_TXDCTL_FULL_TX_DESC_WB;
         txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
                  E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
-        ew32(TXDCTL1, txdctl);
+        ew32(TXDCTL(1), txdctl);
 
-        /* ICH8 has opposite polarity of no_snoop bits.
-         * By default, we should use snoop behavior. */
+        /*
+         * ICH8 has opposite polarity of no_snoop bits.
+         * By default, we should use snoop behavior.
+         */
         if (mac->type == e1000_ich8lan)
                 snoop = PCIE_ICH8_SNOOP_ALL;
         else
@@ -1736,7 +1780,8 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
         ctrl_ext |= E1000_CTRL_EXT_RO_DIS;
         ew32(CTRL_EXT, ctrl_ext);
 
-        /* Clear all of the statistics registers (clear on read).  It is
+        /*
+         * Clear all of the statistics registers (clear on read).  It is
          * important that we do this after we have tried to establish link
          * because the symbol error count will increment wildly if there
          * is no link.
@@ -1762,30 +1807,30 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
         ew32(CTRL_EXT, reg);
 
         /* Transmit Descriptor Control 0 */
-        reg = er32(TXDCTL);
+        reg = er32(TXDCTL(0));
         reg |= (1 << 22);
-        ew32(TXDCTL, reg);
+        ew32(TXDCTL(0), reg);
 
         /* Transmit Descriptor Control 1 */
-        reg = er32(TXDCTL1);
+        reg = er32(TXDCTL(1));
         reg |= (1 << 22);
-        ew32(TXDCTL1, reg);
+        ew32(TXDCTL(1), reg);
 
         /* Transmit Arbitration Control 0 */
-        reg = er32(TARC0);
+        reg = er32(TARC(0));
         if (hw->mac.type == e1000_ich8lan)
                 reg |= (1 << 28) | (1 << 29);
         reg |= (1 << 23) | (1 << 24) | (1 << 26) | (1 << 27);
-        ew32(TARC0, reg);
+        ew32(TARC(0), reg);
 
         /* Transmit Arbitration Control 1 */
-        reg = er32(TARC1);
+        reg = er32(TARC(1));
         if (er32(TCTL) & E1000_TCTL_MULR)
                 reg &= ~(1 << 28);
         else
                 reg |= (1 << 28);
         reg |= (1 << 24) | (1 << 26) | (1 << 30);
-        ew32(TARC1, reg);
+        ew32(TARC(1), reg);
 
         /* Device Status */
         if (hw->mac.type == e1000_ich8lan) {
@@ -1807,29 +1852,29 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
  **/
 static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 {
-        struct e1000_mac_info *mac = &hw->mac;
         s32 ret_val;
 
         if (e1000_check_reset_block(hw))
                 return 0;
 
-        /* ICH parts do not have a word in the NVM to determine
+        /*
+         * ICH parts do not have a word in the NVM to determine
          * the default flow control setting, so we explicitly
          * set it to full.
          */
-        if (mac->fc == e1000_fc_default)
-                mac->fc = e1000_fc_full;
+        if (hw->fc.type == e1000_fc_default)
+                hw->fc.type = e1000_fc_full;
 
-        mac->original_fc = mac->fc;
+        hw->fc.original_type = hw->fc.type;
 
-        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n", mac->fc);
+        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n", hw->fc.type);
 
         /* Continue to configure the copper link. */
         ret_val = e1000_setup_copper_link_ich8lan(hw);
         if (ret_val)
                 return ret_val;
 
-        ew32(FCTTV, mac->fc_pause_time);
+        ew32(FCTTV, hw->fc.pause_time);
 
         return e1000e_set_fc_watermarks(hw);
 }
@@ -1853,9 +1898,11 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
         ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
         ew32(CTRL, ctrl);
 
-        /* Set the mac to wait the maximum time between each iteration
+        /*
+         * Set the mac to wait the maximum time between each iteration
          * and increase the max iterations when polling the phy;
-         * this fixes erroneous timeouts at 10Mbps. */
+         * this fixes erroneous timeouts at 10Mbps.
+         */
         ret_val = e1000e_write_kmrn_reg(hw, GG82563_REG(0x34, 4), 0xFFFF);
         if (ret_val)
                 return ret_val;
@@ -1882,7 +1929,7 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
  *  @speed: pointer to store current link speed
  *  @duplex: pointer to store the current link duplex
  *
- *  Calls the generic get_speed_and_duplex to retreive the current link
+ *  Calls the generic get_speed_and_duplex to retrieve the current link
  *  information and then calls the Kumeran lock loss workaround for links at
  *  gigabit speeds.
  **/
@@ -1930,9 +1977,11 @@ static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
         if (!dev_spec->kmrn_lock_loss_workaround_enabled)
                 return 0;
 
-        /* Make sure link is up before proceeding.  If not just return.
+        /*
+         * Make sure link is up before proceeding.  If not just return.
          * Attempting this while link is negotiating fouled up link
-         * stability */
+         * stability
+         */
         ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
         if (!link)
                 return 0;
@@ -1961,8 +2010,10 @@ static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
                      E1000_PHY_CTRL_NOND0A_GBE_DISABLE);
         ew32(PHY_CTRL, phy_ctrl);
 
-        /* Call gig speed drop workaround on Gig disable before accessing
-         * any PHY registers */
+        /*
+         * Call gig speed drop workaround on Gig disable before accessing
+         * any PHY registers
+         */
         e1000e_gig_downshift_workaround_ich8lan(hw);
 
         /* unable to acquire PCS lock */
@@ -1970,7 +2021,7 @@ static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
 }
 
 /**
- *  e1000_set_kmrn_lock_loss_workaound_ich8lan - Set Kumeran workaround state
+ *  e1000_set_kmrn_lock_loss_workaround_ich8lan - Set Kumeran workaround state
  *  @hw: pointer to the HW structure
  *  @state: boolean value used to set the current Kumeran workaround state
  *
@@ -2017,8 +2068,10 @@ void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw)
                         E1000_PHY_CTRL_NOND0A_GBE_DISABLE);
                 ew32(PHY_CTRL, reg);
 
-                /* Call gig speed drop workaround on Gig disable before
-                 * accessing any PHY registers */
+                /*
+                 * Call gig speed drop workaround on Gig disable before
+                 * accessing any PHY registers
+                 */
                 if (hw->mac.type == e1000_ich8lan)
                         e1000e_gig_downshift_workaround_ich8lan(hw);
 
@@ -2158,7 +2211,7 @@ static struct e1000_mac_operations ich8_mac_ops = {
         .get_link_up_info       = e1000_get_link_up_info_ich8lan,
         .led_on                 = e1000_led_on_ich8lan,
         .led_off                = e1000_led_off_ich8lan,
-        .mc_addr_list_update    = e1000e_mc_addr_list_update_generic,
+        .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
         .reset_hw               = e1000_reset_hw_ich8lan,
         .init_hw                = e1000_init_hw_ich8lan,
         .setup_link             = e1000_setup_link_ich8lan,
@@ -2200,7 +2253,7 @@ struct e1000_info e1000_ich8_info = {
                                   | FLAG_HAS_FLASH
                                   | FLAG_APME_IN_WUC,
         .pba                    = 8,
-        .get_invariants         = e1000_get_invariants_ich8lan,
+        .get_variants           = e1000_get_variants_ich8lan,
         .mac_ops                = &ich8_mac_ops,
         .phy_ops                = &ich8_phy_ops,
         .nvm_ops                = &ich8_nvm_ops,
@@ -2217,7 +2270,7 @@ struct e1000_info e1000_ich9_info = {
                                   | FLAG_HAS_FLASH
                                   | FLAG_APME_IN_WUC,
         .pba                    = 10,
-        .get_invariants         = e1000_get_invariants_ich8lan,
+        .get_variants           = e1000_get_variants_ich8lan,
         .mac_ops                = &ich8_mac_ops,
         .phy_ops                = &ich8_phy_ops,
         .nvm_ops                = &ich8_nvm_ops,
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 95f75a43c9f9..f1f4e9dfd0a0 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -43,8 +43,8 @@ enum e1000_mng_mode {
 
 #define E1000_FACTPS_MNGCG              0x20000000
 
-#define E1000_IAMT_SIGNATURE            0x544D4149 /* Intel(R) Active Management
-                                                    * Technology signature */
+/* Intel(R) Active Management Technology signature */
+#define E1000_IAMT_SIGNATURE            0x544D4149
 
 /**
  *  e1000e_get_bus_info_pcie - Get PCIe bus information
@@ -142,7 +142,8 @@ void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
 {
         u32 rar_low, rar_high;
 
-        /* HW expects these in little endian so we reverse the byte order
+        /*
+         * HW expects these in little endian so we reverse the byte order
          * from network order (big endian) to little endian
          */
         rar_low = ((u32) addr[0] |
@@ -171,7 +172,8 @@ static void e1000_mta_set(struct e1000_hw *hw, u32 hash_value)
 {
         u32 hash_bit, hash_reg, mta;
 
-        /* The MTA is a register array of 32-bit registers. It is
+        /*
+         * The MTA is a register array of 32-bit registers. It is
          * treated like an array of (32*mta_reg_count) bits.  We want to
          * set bit BitArray[hash_value]. So we figure out what register
          * the bit is in, read it, OR in the new bit, then write
@@ -208,12 +210,15 @@ static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
         /* Register count multiplied by bits per register */
         hash_mask = (hw->mac.mta_reg_count * 32) - 1;
 
-        /* For a mc_filter_type of 0, bit_shift is the number of left-shifts
-         * where 0xFF would still fall within the hash mask. */
+        /*
+         * For a mc_filter_type of 0, bit_shift is the number of left-shifts
+         * where 0xFF would still fall within the hash mask.
+         */
         while (hash_mask >> bit_shift != 0xFF)
                 bit_shift++;
 
-        /* The portion of the address that is used for the hash table
+        /*
+         * The portion of the address that is used for the hash table
          * is determined by the mc_filter_type setting.
          * The algorithm is such that there is a total of 8 bits of shifting.
          * The bit_shift for a mc_filter_type of 0 represents the number of
@@ -224,8 +229,8 @@ static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
          * cases are a variation of this algorithm...essentially raising the
          * number of bits to shift mc_addr[5] left, while still keeping the
          * 8-bit shifting total.
-         */
-        /* For example, given the following Destination MAC Address and an
+         *
+         * For example, given the following Destination MAC Address and an
          * mta register count of 128 (thus a 4096-bit vector and 0xFFF mask),
          * we can see that the bit_shift for case 0 is 4.  These are the hash
          * values resulting from each mc_filter_type...
@@ -260,7 +265,7 @@ static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
 }
 
 /**
- *  e1000e_mc_addr_list_update_generic - Update Multicast addresses
+ *  e1000e_update_mc_addr_list_generic - Update Multicast addresses
  *  @hw: pointer to the HW structure
  *  @mc_addr_list: array of multicast addresses to program
  *  @mc_addr_count: number of multicast addresses to program
@@ -272,14 +277,15 @@ static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
  *  The parameter rar_count will usually be hw->mac.rar_entry_count
  *  unless there are workarounds that change this.
  **/
-void e1000e_mc_addr_list_update_generic(struct e1000_hw *hw,
-                                       u8 *mc_addr_list, u32 mc_addr_count,
-                                       u32 rar_used_count, u32 rar_count)
+void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
+                                        u8 *mc_addr_list, u32 mc_addr_count,
+                                        u32 rar_used_count, u32 rar_count)
 {
         u32 hash_value;
         u32 i;
 
-        /* Load the first set of multicast addresses into the exact
+        /*
+         * Load the first set of multicast addresses into the exact
          * filters (RAR).  If there are not enough to fill the RAR
          * array, clear the filters.
          */
@@ -375,7 +381,8 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
         s32 ret_val;
         bool link;
 
-        /* We only want to go out to the PHY registers to see if Auto-Neg
+        /*
+         * We only want to go out to the PHY registers to see if Auto-Neg
          * has completed and/or if our link status has changed.  The
          * get_link_status flag is set upon receiving a Link Status
          * Change or Rx Sequence Error interrupt.
@@ -383,7 +390,8 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
         if (!mac->get_link_status)
                 return 0;
 
-        /* First we want to see if the MII Status Register reports
+        /*
+         * First we want to see if the MII Status Register reports
          * link.  If so, then we want to get the current speed/duplex
          * of the PHY.
          */
@@ -396,11 +404,14 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
 
         mac->get_link_status = 0;
 
-        /* Check if there was DownShift, must be checked
-         * immediately after link-up */
+        /*
+         * Check if there was DownShift, must be checked
+         * immediately after link-up
+         */
         e1000e_check_downshift(hw);
 
-        /* If we are forcing speed/duplex, then we simply return since
+        /*
+         * If we are forcing speed/duplex, then we simply return since
          * we have already determined whether we have link or not.
          */
         if (!mac->autoneg) {
@@ -408,13 +419,15 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
                 return ret_val;
         }
 
-        /* Auto-Neg is enabled.  Auto Speed Detection takes care
+        /*
+         * Auto-Neg is enabled.  Auto Speed Detection takes care
          * of MAC speed/duplex configuration.  So we only need to
          * configure Collision Distance in the MAC.
          */
         e1000e_config_collision_dist(hw);
 
-        /* Configure Flow Control now that Auto-Neg has completed.
+        /*
+         * Configure Flow Control now that Auto-Neg has completed.
          * First, we need to restore the desired flow control
          * settings because we may have had to re-autoneg with a
          * different link partner.
@@ -446,7 +459,8 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
         status = er32(STATUS);
         rxcw = er32(RXCW);
 
-        /* If we don't have link (auto-negotiation failed or link partner
+        /*
+         * If we don't have link (auto-negotiation failed or link partner
          * cannot auto-negotiate), the cable is plugged in (we have signal),
          * and our link partner is not trying to auto-negotiate with us (we
          * are receiving idles or data), we need to force link up. We also
@@ -477,7 +491,8 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
                         return ret_val;
                 }
         } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-                /* If we are forcing link and we are receiving /C/ ordered
+                /*
+                 * If we are forcing link and we are receiving /C/ ordered
                  * sets, re-enable auto-negotiation in the TXCW register
                  * and disable forced link in the Device Control register
                  * in an attempt to auto-negotiate with our link partner.
@@ -511,7 +526,8 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
         status = er32(STATUS);
         rxcw = er32(RXCW);
 
-        /* If we don't have link (auto-negotiation failed or link partner
+        /*
+         * If we don't have link (auto-negotiation failed or link partner
          * cannot auto-negotiate), and our link partner is not trying to
          * auto-negotiate with us (we are receiving idles or data),
          * we need to force link up. We also need to give auto-negotiation
@@ -540,7 +556,8 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                         return ret_val;
                 }
         } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-                /* If we are forcing link and we are receiving /C/ ordered
+                /*
+                 * If we are forcing link and we are receiving /C/ ordered
                  * sets, re-enable auto-negotiation in the TXCW register
                  * and disable forced link in the Device Control register
                  * in an attempt to auto-negotiate with our link partner.
@@ -551,7 +568,8 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
 
                 mac->serdes_has_link = 1;
         } else if (!(E1000_TXCW_ANE & er32(TXCW))) {
-                /* If we force link for non-auto-negotiation switch, check
+                /*
+                 * If we force link for non-auto-negotiation switch, check
                  * link status based on MAC synchronization for internal
                  * serdes media type.
                  */
@@ -585,11 +603,11 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
  **/
 static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
 {
-        struct e1000_mac_info *mac = &hw->mac;
         s32 ret_val;
         u16 nvm_data;
 
-        /* Read and store word 0x0F of the EEPROM. This word contains bits
+        /*
+         * Read and store word 0x0F of the EEPROM. This word contains bits
          * that determine the hardware's default PAUSE (flow control) mode,
          * a bit that determines whether the HW defaults to enabling or
          * disabling auto-negotiation, and the direction of the
@@ -605,12 +623,12 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
         }
 
         if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
-                mac->fc = e1000_fc_none;
+                hw->fc.type = e1000_fc_none;
         else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) ==
                  NVM_WORD0F_ASM_DIR)
-                mac->fc = e1000_fc_tx_pause;
+                hw->fc.type = e1000_fc_tx_pause;
         else
-                mac->fc = e1000_fc_full;
+                hw->fc.type = e1000_fc_full;
 
         return 0;
 }
@@ -630,7 +648,8 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
         struct e1000_mac_info *mac = &hw->mac;
         s32 ret_val;
 
-        /* In the case of the phy reset being blocked, we already have a link.
+        /*
+         * In the case of the phy reset being blocked, we already have a link.
          * We do not need to set it up again.
          */
         if (e1000_check_reset_block(hw))
@@ -640,26 +659,28 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
          * If flow control is set to default, set flow control based on
          * the EEPROM flow control settings.
          */
-        if (mac->fc == e1000_fc_default) {
+        if (hw->fc.type == e1000_fc_default) {
                 ret_val = e1000_set_default_fc_generic(hw);
                 if (ret_val)
                         return ret_val;
         }
 
-        /* We want to save off the original Flow Control configuration just
+        /*
+         * We want to save off the original Flow Control configuration just
          * in case we get disconnected and then reconnected into a different
          * hub or switch with different Flow Control capabilities.
          */
-        mac->original_fc = mac->fc;
+        hw->fc.original_type = hw->fc.type;
 
-        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n", mac->fc);
+        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n", hw->fc.type);
 
         /* Call the necessary media_type subroutine to configure the link. */
         ret_val = mac->ops.setup_physical_interface(hw);
         if (ret_val)
                 return ret_val;
 
-        /* Initialize the flow control address, type, and PAUSE timer
+        /*
+         * Initialize the flow control address, type, and PAUSE timer
          * registers to their default values.  This is done even if flow
          * control is disabled, because it does not hurt anything to
          * initialize these registers.
@@ -669,7 +690,7 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
         ew32(FCAH, FLOW_CONTROL_ADDRESS_HIGH);
         ew32(FCAL, FLOW_CONTROL_ADDRESS_LOW);
 
-        ew32(FCTTV, mac->fc_pause_time);
+        ew32(FCTTV, hw->fc.pause_time);
 
         return e1000e_set_fc_watermarks(hw);
 }
@@ -686,7 +707,8 @@ static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
         struct e1000_mac_info *mac = &hw->mac;
         u32 txcw;
 
-        /* Check for a software override of the flow control settings, and
+        /*
+         * Check for a software override of the flow control settings, and
          * setup the device accordingly.  If auto-negotiation is enabled, then
          * software will have to set the "PAUSE" bits to the correct value in
          * the Transmit Config Word Register (TXCW) and re-start auto-
@@ -700,31 +722,34 @@ static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
          *        but not send pause frames).
          *      2:  Tx flow control is enabled (we can send pause frames but we
          *        do not support receiving pause frames).
-         *      3:  Both Rx and TX flow control (symmetric) are enabled.
+         *      3:  Both Rx and Tx flow control (symmetric) are enabled.
          */
-        switch (mac->fc) {
+        switch (hw->fc.type) {
         case e1000_fc_none:
                 /* Flow control completely disabled by a software over-ride. */
                 txcw = (E1000_TXCW_ANE | E1000_TXCW_FD);
                 break;
         case e1000_fc_rx_pause:
-                /* RX Flow control is enabled and TX Flow control is disabled
+                /*
+                 * Rx Flow control is enabled and Tx Flow control is disabled
                  * by a software over-ride. Since there really isn't a way to
-                 * advertise that we are capable of RX Pause ONLY, we will
-                 * advertise that we support both symmetric and asymmetric RX
+                 * advertise that we are capable of Rx Pause ONLY, we will
+                 * advertise that we support both symmetric and asymmetric Rx
                  * PAUSE.  Later, we will disable the adapter's ability to send
                  * PAUSE frames.
                  */
                 txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
                 break;
         case e1000_fc_tx_pause:
-                /* TX Flow control is enabled, and RX Flow control is disabled,
+                /*
+                 * Tx Flow control is enabled, and Rx Flow control is disabled,
                  * by a software over-ride.
                  */
                 txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_ASM_DIR);
                 break;
         case e1000_fc_full:
-                /* Flow control (both RX and TX) is enabled by a software
+                /*
+                 * Flow control (both Rx and Tx) is enabled by a software
                  * over-ride.
                  */
                 txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
@@ -754,7 +779,8 @@ static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
         u32 i, status;
         s32 ret_val;
 
-        /* If we have a signal (the cable is plugged in, or assumed true for
+        /*
+         * If we have a signal (the cable is plugged in, or assumed true for
          * serdes media) then poll for a "Link-Up" indication in the Device
          * Status Register.  Time-out if a link isn't seen in 500 milliseconds
          * seconds (Auto-negotiation should complete in less than 500
@@ -769,7 +795,8 @@ static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
         if (i == FIBER_LINK_UP_LIMIT) {
                 hw_dbg(hw, "Never got a valid link from auto-neg!!!\n");
                 mac->autoneg_failed = 1;
-                /* AutoNeg failed to achieve a link, so we'll call
+                /*
+                 * AutoNeg failed to achieve a link, so we'll call
                  * mac->check_for_link. This routine will force the
                  * link up if we detect a signal. This will allow us to
                  * communicate with non-autonegotiating link partners.
@@ -811,7 +838,8 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Since auto-negotiation is enabled, take the link out of reset (the
+        /*
+         * Since auto-negotiation is enabled, take the link out of reset (the
          * link will be in reset, because we previously reset the chip). This
          * will restart auto-negotiation.  If auto-negotiation is successful
          * then the link-up status bit will be set and the flow control enable
@@ -823,11 +851,12 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
         e1e_flush();
         msleep(1);
 
-        /* For these adapters, the SW defineable pin 1 is set when the optics
+        /*
+         * For these adapters, the SW definable pin 1 is set when the optics
          * detect a signal.  If we have a signal, then poll for a "Link-Up"
          * indication.
          */
-        if (hw->media_type == e1000_media_type_internal_serdes ||
+        if (hw->phy.media_type == e1000_media_type_internal_serdes ||
             (er32(CTRL) & E1000_CTRL_SWDPIN1)) {
                 ret_val = e1000_poll_fiber_serdes_link_generic(hw);
         } else {
@@ -864,27 +893,28 @@ void e1000e_config_collision_dist(struct e1000_hw *hw)
  *
  *  Sets the flow control high/low threshold (watermark) registers.  If
  *  flow control XON frame transmission is enabled, then set XON frame
- *  tansmission as well.
+ *  transmission as well.
  **/
 s32 e1000e_set_fc_watermarks(struct e1000_hw *hw)
 {
-        struct e1000_mac_info *mac = &hw->mac;
         u32 fcrtl = 0, fcrth = 0;
 
-        /* Set the flow control receive threshold registers.  Normally,
+        /*
+         * Set the flow control receive threshold registers.  Normally,
          * these registers will be set to a default threshold that may be
          * adjusted later by the driver's runtime code.  However, if the
          * ability to transmit pause frames is not enabled, then these
          * registers will be set to 0.
          */
-        if (mac->fc & e1000_fc_tx_pause) {
-                /* We need to set up the Receive Threshold high and low water
+        if (hw->fc.type & e1000_fc_tx_pause) {
+                /*
+                 * We need to set up the Receive Threshold high and low water
                  * marks as well as (optionally) enabling the transmission of
                  * XON frames.
                  */
-                fcrtl = mac->fc_low_water;
+                fcrtl = hw->fc.low_water;
                 fcrtl |= E1000_FCRTL_XONE;
-                fcrth = mac->fc_high_water;
+                fcrth = hw->fc.high_water;
         }
         ew32(FCRTL, fcrtl);
         ew32(FCRTH, fcrth);
@@ -904,18 +934,18 @@ s32 e1000e_set_fc_watermarks(struct e1000_hw *hw)
  **/
 s32 e1000e_force_mac_fc(struct e1000_hw *hw)
 {
-        struct e1000_mac_info *mac = &hw->mac;
         u32 ctrl;
 
         ctrl = er32(CTRL);
 
-        /* Because we didn't get link via the internal auto-negotiation
+        /*
+         * Because we didn't get link via the internal auto-negotiation
          * mechanism (we either forced link or we got link via PHY
          * auto-neg), we have to manually enable/disable transmit an
          * receive flow control.
          *
          * The "Case" statement below enables/disable flow control
-         * according to the "mac->fc" parameter.
+         * according to the "hw->fc.type" parameter.
          *
          * The possible values of the "fc" parameter are:
          *      0:  Flow control is completely disabled
@@ -923,12 +953,12 @@ s32 e1000e_force_mac_fc(struct e1000_hw *hw)
          *        frames but not send pause frames).
          *      2:  Tx flow control is enabled (we can send pause frames
          *        frames but we do not receive pause frames).
-         *      3:  Both Rx and TX flow control (symmetric) is enabled.
+         *      3:  Both Rx and Tx flow control (symmetric) is enabled.
          *  other:  No other values should be possible at this point.
          */
-        hw_dbg(hw, "mac->fc = %u\n", mac->fc);
+        hw_dbg(hw, "hw->fc.type = %u\n", hw->fc.type);
 
-        switch (mac->fc) {
+        switch (hw->fc.type) {
         case e1000_fc_none:
                 ctrl &= (~(E1000_CTRL_TFCE | E1000_CTRL_RFCE));
                 break;
@@ -970,16 +1000,17 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
         u16 mii_status_reg, mii_nway_adv_reg, mii_nway_lp_ability_reg;
         u16 speed, duplex;
 
-        /* Check for the case where we have fiber media and auto-neg failed
+        /*
+         * Check for the case where we have fiber media and auto-neg failed
          * so we had to force link.  In this case, we need to force the
          * configuration of the MAC to match the "fc" parameter.
          */
         if (mac->autoneg_failed) {
-                if (hw->media_type == e1000_media_type_fiber ||
-                    hw->media_type == e1000_media_type_internal_serdes)
+                if (hw->phy.media_type == e1000_media_type_fiber ||
+                    hw->phy.media_type == e1000_media_type_internal_serdes)
                         ret_val = e1000e_force_mac_fc(hw);
         } else {
-                if (hw->media_type == e1000_media_type_copper)
+                if (hw->phy.media_type == e1000_media_type_copper)
                         ret_val = e1000e_force_mac_fc(hw);
         }
 
@@ -988,13 +1019,15 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                 return ret_val;
         }
 
-        /* Check for the case where we have copper media and auto-neg is
+        /*
+         * Check for the case where we have copper media and auto-neg is
          * enabled.  In this case, we need to check and see if Auto-Neg
          * has completed, and if so, how the PHY and link partner has
          * flow control configured.
          */
-        if ((hw->media_type == e1000_media_type_copper) && mac->autoneg) {
-                /* Read the MII Status Register and check to see if AutoNeg
+        if ((hw->phy.media_type == e1000_media_type_copper) && mac->autoneg) {
+                /*
+                 * Read the MII Status Register and check to see if AutoNeg
                  * has completed.  We read this twice because this reg has
                  * some "sticky" (latched) bits.
                  */
@@ -1011,7 +1044,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                         return ret_val;
                 }
 
-                /* The AutoNeg process has completed, so we now need to
+                /*
+                 * The AutoNeg process has completed, so we now need to
                  * read both the Auto Negotiation Advertisement
                  * Register (Address 4) and the Auto_Negotiation Base
                  * Page Ability Register (Address 5) to determine how
@@ -1024,7 +1058,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                 if (ret_val)
                         return ret_val;
 
-                /* Two bits in the Auto Negotiation Advertisement Register
+                /*
+                 * Two bits in the Auto Negotiation Advertisement Register
                  * (Address 4) and two bits in the Auto Negotiation Base
                  * Page Ability Register (Address 5) determine flow control
                  * for both the PHY and the link partner.  The following
@@ -1045,8 +1080,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                  *   1   |    1    |   0   |    0    | e1000_fc_none
                  *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
                  *
-                 */
-                /* Are both PAUSE bits set to 1?  If so, this implies
+                 *
+                 * Are both PAUSE bits set to 1?  If so, this implies
                  * Symmetric Flow Control is enabled at both ends.  The
                  * ASM_DIR bits are irrelevant per the spec.
                  *
@@ -1060,22 +1095,24 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                  */
                 if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
                     (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
-                        /* Now we need to check if the user selected RX ONLY
+                        /*
+                         * Now we need to check if the user selected Rx ONLY
                          * of pause frames.  In this case, we had to advertise
-                         * FULL flow control because we could not advertise RX
+                         * FULL flow control because we could not advertise Rx
                          * ONLY. Hence, we must now check to see if we need to
                          * turn OFF  the TRANSMISSION of PAUSE frames.
                          */
-                        if (mac->original_fc == e1000_fc_full) {
-                                mac->fc = e1000_fc_full;
+                        if (hw->fc.original_type == e1000_fc_full) {
+                                hw->fc.type = e1000_fc_full;
                                 hw_dbg(hw, "Flow Control = FULL.\r\n");
                         } else {
-                                mac->fc = e1000_fc_rx_pause;
+                                hw->fc.type = e1000_fc_rx_pause;
                                 hw_dbg(hw, "Flow Control = "
                                          "RX PAUSE frames only.\r\n");
                         }
                 }
-                /* For receiving PAUSE frames ONLY.
+                /*
+                 * For receiving PAUSE frames ONLY.
                  *
                  *   LOCAL DEVICE  |   LINK PARTNER
                  * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
@@ -1087,10 +1124,11 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                           (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
                           (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
                           (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                        mac->fc = e1000_fc_tx_pause;
-                        hw_dbg(hw, "Flow Control = TX PAUSE frames only.\r\n");
+                        hw->fc.type = e1000_fc_tx_pause;
+                        hw_dbg(hw, "Flow Control = Tx PAUSE frames only.\r\n");
                 }
-                /* For transmitting PAUSE frames ONLY.
+                /*
+                 * For transmitting PAUSE frames ONLY.
                  *
                  *   LOCAL DEVICE  |   LINK PARTNER
                  * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
@@ -1102,18 +1140,19 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                          (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
                          !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
                          (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                        mac->fc = e1000_fc_rx_pause;
-                        hw_dbg(hw, "Flow Control = RX PAUSE frames only.\r\n");
+                        hw->fc.type = e1000_fc_rx_pause;
+                        hw_dbg(hw, "Flow Control = Rx PAUSE frames only.\r\n");
                 } else {
                         /*
                          * Per the IEEE spec, at this point flow control
                          * should be disabled.
                          */
-                        mac->fc = e1000_fc_none;
+                        hw->fc.type = e1000_fc_none;
                         hw_dbg(hw, "Flow Control = NONE.\r\n");
                 }
 
-                /* Now we need to do one last check...  If we auto-
+                /*
+                 * Now we need to do one last check...  If we auto-
                  * negotiated to HALF DUPLEX, flow control should not be
                  * enabled per IEEE 802.3 spec.
                  */
@@ -1124,9 +1163,10 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                 }
 
                 if (duplex == HALF_DUPLEX)
-                        mac->fc = e1000_fc_none;
+                        hw->fc.type = e1000_fc_none;
 
-                /* Now we call a subroutine to actually force the MAC
+                /*
+                 * Now we call a subroutine to actually force the MAC
                  * controller to use the correct flow control settings.
                  */
                 ret_val = e1000e_force_mac_fc(hw);
@@ -1393,13 +1433,15 @@ s32 e1000e_blink_led(struct e1000_hw *hw)
         u32 ledctl_blink = 0;
         u32 i;
 
-        if (hw->media_type == e1000_media_type_fiber) {
+        if (hw->phy.media_type == e1000_media_type_fiber) {
                 /* always blink LED0 for PCI-E fiber */
                 ledctl_blink = E1000_LEDCTL_LED0_BLINK |
                      (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED0_MODE_SHIFT);
         } else {
-                /* set the blink bit for each LED that's "on" (0x0E)
-                 * in ledctl_mode2 */
+                /*
+                 * set the blink bit for each LED that's "on" (0x0E)
+                 * in ledctl_mode2
+                 */
                 ledctl_blink = hw->mac.ledctl_mode2;
                 for (i = 0; i < 4; i++)
                         if (((hw->mac.ledctl_mode2 >> (i * 8)) & 0xFF) ==
@@ -1423,7 +1465,7 @@ s32 e1000e_led_on_generic(struct e1000_hw *hw)
 {
         u32 ctrl;
 
-        switch (hw->media_type) {
+        switch (hw->phy.media_type) {
         case e1000_media_type_fiber:
                 ctrl = er32(CTRL);
                 ctrl &= ~E1000_CTRL_SWDPIN0;
@@ -1450,7 +1492,7 @@ s32 e1000e_led_off_generic(struct e1000_hw *hw)
 {
         u32 ctrl;
 
-        switch (hw->media_type) {
+        switch (hw->phy.media_type) {
         case e1000_media_type_fiber:
                 ctrl = er32(CTRL);
                 ctrl |= E1000_CTRL_SWDPIN0;
@@ -1562,8 +1604,7 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                                 else
                                         mac->current_ifs_val +=
                                                 mac->ifs_step_size;
-                                ew32(AIT,
-                                                mac->current_ifs_val);
+                                ew32(AIT, mac->current_ifs_val);
                         }
                 }
         } else {
@@ -1826,10 +1867,12 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
                 udelay(1);
                 timeout = NVM_MAX_RETRY_SPI;
 
-                /* Read "Status Register" repeatedly until the LSB is cleared.
+                /*
+                 * Read "Status Register" repeatedly until the LSB is cleared.
                  * The EEPROM will signal that the command has been completed
                  * by clearing bit 0 of the internal status register.  If it's
-                 * not cleared within 'timeout', then error out. */
+                 * not cleared within 'timeout', then error out.
+                 */
                 while (timeout) {
                         e1000_shift_out_eec_bits(hw, NVM_RDSR_OPCODE_SPI,
                                                  hw->nvm.opcode_bits);
@@ -1852,62 +1895,6 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
 }
 
 /**
- *  e1000e_read_nvm_spi - Reads EEPROM using SPI
- *  @hw: pointer to the HW structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of words to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM.
- **/
-s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-        struct e1000_nvm_info *nvm = &hw->nvm;
-        u32 i = 0;
-        s32 ret_val;
-        u16 word_in;
-        u8 read_opcode = NVM_READ_OPCODE_SPI;
-
-        /* A check for invalid values:  offset too large, too many words,
-         * and not enough words. */
-        if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-            (words == 0)) {
-                hw_dbg(hw, "nvm parameter(s) out of bounds\n");
-                return -E1000_ERR_NVM;
-        }
-
-        ret_val = nvm->ops.acquire_nvm(hw);
-        if (ret_val)
-                return ret_val;
-
-        ret_val = e1000_ready_nvm_eeprom(hw);
-        if (ret_val) {
-                nvm->ops.release_nvm(hw);
-                return ret_val;
-        }
-
-        e1000_standby_nvm(hw);
-
-        if ((nvm->address_bits == 8) && (offset >= 128))
-                read_opcode |= NVM_A8_OPCODE_SPI;
-
-        /* Send the READ command (opcode + addr) */
-        e1000_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);
-        e1000_shift_out_eec_bits(hw, (u16)(offset*2), nvm->address_bits);
-
-        /* Read the data.  SPI NVMs increment the address with each byte
-         * read and will roll over if reading beyond the end.  This allows
-         * us to read the whole NVM from any offset */
-        for (i = 0; i < words; i++) {
-                word_in = e1000_shift_in_eec_bits(hw, 16);
-                data[i] = (word_in >> 8) | (word_in << 8);
-        }
-
-        nvm->ops.release_nvm(hw);
-        return 0;
-}
-
-/**
  *  e1000e_read_nvm_eerd - Reads EEPROM using EERD register
  *  @hw: pointer to the HW structure
  *  @offset: offset of word in the EEPROM to read
@@ -1922,8 +1909,10 @@ s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         u32 i, eerd = 0;
         s32 ret_val = 0;
 
-        /* A check for invalid values:  offset too large, too many words,
-         * and not enough words. */
+        /*
+         * A check for invalid values:  offset too large, too many words,
+         * too many words for the offset, and not enough words.
+         */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
             (words == 0)) {
                 hw_dbg(hw, "nvm parameter(s) out of bounds\n");
@@ -1939,8 +1928,7 @@ s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
                 if (ret_val)
                         break;
 
-                data[i] = (er32(EERD) >>
-                           E1000_NVM_RW_REG_DATA);
+                data[i] = (er32(EERD) >> E1000_NVM_RW_REG_DATA);
         }
 
         return ret_val;
@@ -1964,8 +1952,10 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         s32 ret_val;
         u16 widx = 0;
 
-        /* A check for invalid values:  offset too large, too many words,
-         * and not enough words. */
+        /*
+         * A check for invalid values:  offset too large, too many words,
+         * and not enough words.
+         */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
             (words == 0)) {
                 hw_dbg(hw, "nvm parameter(s) out of bounds\n");
@@ -1995,8 +1985,10 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 
                 e1000_standby_nvm(hw);
 
-                /* Some SPI eeproms use the 8th address bit embedded in the
-                 * opcode */
+                /*
+                 * Some SPI eeproms use the 8th address bit embedded in the
+                 * opcode
+                 */
                 if ((nvm->address_bits == 8) && (offset >= 128))
                         write_opcode |= NVM_A8_OPCODE_SPI;
 
@@ -2041,9 +2033,9 @@ s32 e1000e_read_mac_addr(struct e1000_hw *hw)
                 /* Check for an alternate MAC address.  An alternate MAC
                  * address can be setup by pre-boot software and must be
                  * treated like a permanent address and must override the
-                 * actual permanent MAC address. */
+                 * actual permanent MAC address.*/
                 ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,
-                                                &mac_addr_offset);
+                                         &mac_addr_offset);
                 if (ret_val) {
                         hw_dbg(hw, "NVM Read Error\n");
                         return ret_val;
@@ -2056,7 +2048,7 @@ s32 e1000e_read_mac_addr(struct e1000_hw *hw)
                                 mac_addr_offset += ETH_ALEN/sizeof(u16);
 
                         /* make sure we have a valid mac address here
-                         * before using it */
+                        * before using it */
                         ret_val = e1000_read_nvm(hw, mac_addr_offset, 1,
                                                  &nvm_data);
                         if (ret_val) {
@@ -2068,7 +2060,7 @@ s32 e1000e_read_mac_addr(struct e1000_hw *hw)
                 }
 
                 if (mac_addr_offset)
-                        hw->dev_spec.e82571.alt_mac_addr_is_present = 1;
+                hw->dev_spec.e82571.alt_mac_addr_is_present = 1;
         }
 
         for (i = 0; i < ETH_ALEN; i += 2) {
@@ -2244,7 +2236,7 @@ bool e1000e_check_mng_mode(struct e1000_hw *hw)
 }
 
 /**
- *  e1000e_enable_tx_pkt_filtering - Enable packet filtering on TX
+ *  e1000e_enable_tx_pkt_filtering - Enable packet filtering on Tx
  *  @hw: pointer to the HW structure
  *
  *  Enables packet filtering on transmit packets if manageability is enabled
@@ -2264,7 +2256,8 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
                 return 0;
         }
 
-        /* If we can't read from the host interface for whatever
+        /*
+         * If we can't read from the host interface for whatever
          * reason, disable filtering.
          */
         ret_val = e1000_mng_enable_host_if(hw);
@@ -2282,7 +2275,8 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         hdr->checksum = 0;
         csum = e1000_calculate_checksum((u8 *)hdr,
                                         E1000_MNG_DHCP_COOKIE_LENGTH);
-        /* If either the checksums or signature don't match, then
+        /*
+         * If either the checksums or signature don't match, then
          * the cookie area isn't considered valid, in which case we
          * take the safe route of assuming Tx filtering is enabled.
          */
@@ -2374,8 +2368,10 @@ static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer,
         /* Calculate length in DWORDs */
         length >>= 2;
 
-        /* The device driver writes the relevant command block into the
-         * ram area. */
+        /*
+         * The device driver writes the relevant command block into the
+         * ram area.
+         */
         for (i = 0; i < length; i++) {
                 for (j = 0; j < sizeof(u32); j++) {
                         *(tmp + j) = *bufptr++;
@@ -2481,7 +2477,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
         return ret_val;
 }
 
-s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num)
+s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num)
 {
         s32 ret_val;
         u16 nvm_data;
@@ -2491,14 +2487,14 @@ s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num)
                 hw_dbg(hw, "NVM Read Error\n");
                 return ret_val;
         }
-        *part_num = (u32)(nvm_data << 16);
+        *pba_num = (u32)(nvm_data << 16);
 
         ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
         if (ret_val) {
                 hw_dbg(hw, "NVM Read Error\n");
                 return ret_val;
         }
-        *part_num |= nvm_data;
+        *pba_num |= nvm_data;
 
         return 0;
 }
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index fc5c63f4f578..c8dc47fd132a 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -82,7 +82,7 @@ static int e1000_desc_unused(struct e1000_ring *ring)
 }
 
 /**
- * e1000_receive_skb - helper function to handle rx indications
+ * e1000_receive_skb - helper function to handle Rx indications
  * @adapter: board private structure
  * @status: descriptor status field as written by hardware
  * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
@@ -138,8 +138,9 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
                 /* TCP checksum is good */
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         } else {
-                /* IP fragment with UDP payload */
-                /* Hardware complements the payload checksum, so we undo it
+                /*
+                 * IP fragment with UDP payload
+                 * Hardware complements the payload checksum, so we undo it
                  * and then put the value in host order for further stack use.
                  */
                 __sum16 sum = (__force __sum16)htons(csum);
@@ -182,7 +183,8 @@ static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
                         break;
                 }
 
-                /* Make buffer alignment 2 beyond a 16 byte boundary
+                /*
+                 * Make buffer alignment 2 beyond a 16 byte boundary
                  * this will result in a 16 byte aligned IP header after
                  * the 14 byte MAC header is removed
                  */
@@ -213,10 +215,12 @@ map_skb:
                 if (i-- == 0)
                         i = (rx_ring->count - 1);
 
-                /* Force memory writes to complete before letting h/w
+                /*
+                 * Force memory writes to complete before letting h/w
                  * know there are new descriptors to fetch.  (Only
                  * applicable for weak-ordered memory model archs,
-                 * such as IA-64). */
+                 * such as IA-64).
+                 */
                 wmb();
                 writel(i, adapter->hw.hw_addr + rx_ring->tail);
         }
@@ -285,7 +289,8 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                         break;
                 }
 
-                /* Make buffer alignment 2 beyond a 16 byte boundary
+                /*
+                 * Make buffer alignment 2 beyond a 16 byte boundary
                  * this will result in a 16 byte aligned IP header after
                  * the 14 byte MAC header is removed
                  */
@@ -319,12 +324,15 @@ no_buffers:
                 if (!(i--))
                         i = (rx_ring->count - 1);
 
-                /* Force memory writes to complete before letting h/w
+                /*
+                 * Force memory writes to complete before letting h/w
                  * know there are new descriptors to fetch.  (Only
                  * applicable for weak-ordered memory model archs,
-                 * such as IA-64). */
+                 * such as IA-64).
+                 */
                 wmb();
-                /* Hardware increments by 16 bytes, but packet split
+                /*
+                 * Hardware increments by 16 bytes, but packet split
                  * descriptors are 32 bytes...so we increment tail
                  * twice as much.
                  */
@@ -409,9 +417,11 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
                 total_rx_bytes += length;
                 total_rx_packets++;
 
-                /* code added for copybreak, this should improve
+                /*
+                 * code added for copybreak, this should improve
                  * performance for small packets with large amounts
-                 * of reassembly being done in the stack */
+                 * of reassembly being done in the stack
+                 */
                 if (length < copybreak) {
                         struct sk_buff *new_skb =
                             netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
@@ -581,14 +591,15 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
         }
 
         if (adapter->detect_tx_hung) {
-                /* Detect a transmit hang in hardware, this serializes the
-                 * check with the clearing of time_stamp and movement of i */
+                /*
+                 * Detect a transmit hang in hardware, this serializes the
+                 * check with the clearing of time_stamp and movement of i
+                 */
                 adapter->detect_tx_hung = 0;
                 if (tx_ring->buffer_info[eop].dma &&
                     time_after(jiffies, tx_ring->buffer_info[eop].time_stamp
                                + (adapter->tx_timeout_factor * HZ))
-                    && !(er32(STATUS) &
-                         E1000_STATUS_TXOFF)) {
+                    && !(er32(STATUS) & E1000_STATUS_TXOFF)) {
                         e1000_print_tx_hang(adapter);
                         netif_stop_queue(netdev);
                 }
@@ -677,21 +688,28 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                 skb_put(skb, length);
 
                 {
-                /* this looks ugly, but it seems compiler issues make it
-                   more efficient than reusing j */
+                /*
+                 * this looks ugly, but it seems compiler issues make it
+                 * more efficient than reusing j
+                 */
                 int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
 
-                /* page alloc/put takes too long and effects small packet
-                 * throughput, so unsplit small packets and save the alloc/put*/
+                /*
+                 * page alloc/put takes too long and effects small packet
+                 * throughput, so unsplit small packets and save the alloc/put
+                 * only valid in softirq (napi) context to call kmap_*
+                 */
                 if (l1 && (l1 <= copybreak) &&
                     ((length + l1) <= adapter->rx_ps_bsize0)) {
                         u8 *vaddr;
 
                         ps_page = &buffer_info->ps_pages[0];
 
-                        /* there is no documentation about how to call
+                        /*
+                         * there is no documentation about how to call
                          * kmap_atomic, so we can't hold the mapping
-                         * very long */
+                         * very long
+                         */
                         pci_dma_sync_single_for_cpu(pdev, ps_page->dma,
                                 PAGE_SIZE, PCI_DMA_FROMDEVICE);
                         vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
@@ -836,26 +854,31 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
         struct e1000_hw *hw = &adapter->hw;
         u32 icr = er32(ICR);
 
-        /* read ICR disables interrupts using IAM, so keep up with our
-         * enable/disable accounting */
-        atomic_inc(&adapter->irq_sem);
+        /*
+         * read ICR disables interrupts using IAM
+         */
 
         if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
                 hw->mac.get_link_status = 1;
-                /* ICH8 workaround-- Call gig speed drop workaround on cable
-                 * disconnect (LSC) before accessing any PHY registers */
+                /*
+                 * ICH8 workaround-- Call gig speed drop workaround on cable
+                 * disconnect (LSC) before accessing any PHY registers
+                 */
                 if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
                     (!(er32(STATUS) & E1000_STATUS_LU)))
                         e1000e_gig_downshift_workaround_ich8lan(hw);
 
-                /* 80003ES2LAN workaround-- For packet buffer work-around on
+                /*
+                 * 80003ES2LAN workaround-- For packet buffer work-around on
                  * link down event; disable receives here in the ISR and reset
-                 * adapter in watchdog */
+                 * adapter in watchdog
+                 */
                 if (netif_carrier_ok(netdev) &&
                     adapter->flags & FLAG_RX_NEEDS_RESTART) {
                         /* disable receives */
                         u32 rctl = er32(RCTL);
                         ew32(RCTL, rctl & ~E1000_RCTL_EN);
+                        adapter->flags |= FLAG_RX_RESTART_NOW;
                 }
                 /* guard against interrupt when we're going down */
                 if (!test_bit(__E1000_DOWN, &adapter->state))
@@ -868,8 +891,6 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
                 adapter->total_rx_bytes = 0;
                 adapter->total_rx_packets = 0;
                 __netif_rx_schedule(netdev, &adapter->napi);
-        } else {
-                atomic_dec(&adapter->irq_sem);
         }
 
         return IRQ_HANDLED;
@@ -890,26 +911,31 @@ static irqreturn_t e1000_intr(int irq, void *data)
         if (!icr)
                 return IRQ_NONE;  /* Not our interrupt */
 
-        /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is
-         * not set, then the adapter didn't send an interrupt */
+        /*
+         * IMS will not auto-mask if INT_ASSERTED is not set, and if it is
+         * not set, then the adapter didn't send an interrupt
+         */
         if (!(icr & E1000_ICR_INT_ASSERTED))
                 return IRQ_NONE;
 
-        /* Interrupt Auto-Mask...upon reading ICR,
+        /*
+         * Interrupt Auto-Mask...upon reading ICR,
          * interrupts are masked.  No need for the
-         * IMC write, but it does mean we should
-         * account for it ASAP. */
-        atomic_inc(&adapter->irq_sem);
+         * IMC write
+         */
 
         if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
                 hw->mac.get_link_status = 1;
-                /* ICH8 workaround-- Call gig speed drop workaround on cable
-                 * disconnect (LSC) before accessing any PHY registers */
+                /*
+                 * ICH8 workaround-- Call gig speed drop workaround on cable
+                 * disconnect (LSC) before accessing any PHY registers
+                 */
                 if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
                     (!(er32(STATUS) & E1000_STATUS_LU)))
                         e1000e_gig_downshift_workaround_ich8lan(hw);
 
-                /* 80003ES2LAN workaround--
+                /*
+                 * 80003ES2LAN workaround--
                  * For packet buffer work-around on link down event;
                  * disable receives here in the ISR and
                  * reset adapter in watchdog
@@ -919,6 +945,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
                         /* disable receives */
                         rctl = er32(RCTL);
                         ew32(RCTL, rctl & ~E1000_RCTL_EN);
+                        adapter->flags |= FLAG_RX_RESTART_NOW;
                 }
                 /* guard against interrupt when we're going down */
                 if (!test_bit(__E1000_DOWN, &adapter->state))
@@ -931,8 +958,6 @@ static irqreturn_t e1000_intr(int irq, void *data)
                 adapter->total_rx_bytes = 0;
                 adapter->total_rx_packets = 0;
                 __netif_rx_schedule(netdev, &adapter->napi);
-        } else {
-                atomic_dec(&adapter->irq_sem);
         }
 
         return IRQ_HANDLED;
@@ -983,7 +1008,6 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
 
-        atomic_inc(&adapter->irq_sem);
         ew32(IMC, ~0);
         e1e_flush();
         synchronize_irq(adapter->pdev->irq);
@@ -996,10 +1020,8 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
 
-        if (atomic_dec_and_test(&adapter->irq_sem)) {
-                ew32(IMS, IMS_ENABLE_MASK);
-                e1e_flush();
-        }
+        ew32(IMS, IMS_ENABLE_MASK);
+        e1e_flush();
 }
 
 /**
@@ -1023,8 +1045,7 @@ static void e1000_get_hw_control(struct e1000_adapter *adapter)
                 ew32(SWSM, swsm | E1000_SWSM_DRV_LOAD);
         } else if (adapter->flags & FLAG_HAS_CTRLEXT_ON_LOAD) {
                 ctrl_ext = er32(CTRL_EXT);
-                ew32(CTRL_EXT,
-                                ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
+                ew32(CTRL_EXT, ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
         }
 }
 
@@ -1050,8 +1071,7 @@ static void e1000_release_hw_control(struct e1000_adapter *adapter)
                 ew32(SWSM, swsm & ~E1000_SWSM_DRV_LOAD);
         } else if (adapter->flags & FLAG_HAS_CTRLEXT_ON_LOAD) {
                 ctrl_ext = er32(CTRL_EXT);
-                ew32(CTRL_EXT,
-                                ctrl_ext & ~E1000_CTRL_EXT_DRV_LOAD);
+                ew32(CTRL_EXT, ctrl_ext & ~E1000_CTRL_EXT_DRV_LOAD);
         }
 }
 
@@ -1353,9 +1373,11 @@ static void e1000_set_itr(struct e1000_adapter *adapter)
 
 set_itr_now:
         if (new_itr != adapter->itr) {
-                /* this attempts to bias the interrupt rate towards Bulk
+                /*
+                 * this attempts to bias the interrupt rate towards Bulk
                  * by adding intermediate steps when interrupt rate is
-                 * increasing */
+                 * increasing
+                 */
                 new_itr = new_itr > adapter->itr ?
                              min(adapter->itr + (new_itr >> 2), new_itr) :
                              new_itr;
@@ -1366,7 +1388,7 @@ set_itr_now:
 
 /**
  * e1000_clean - NAPI Rx polling callback
- * @adapter: board private structure
+ * @napi: struct associated with this polling callback
  * @budget: amount of packets driver is allowed to process this poll
  **/
 static int e1000_clean(struct napi_struct *napi, int budget)
@@ -1378,10 +1400,12 @@ static int e1000_clean(struct napi_struct *napi, int budget)
         /* Must NOT use netdev_priv macro here. */
         adapter = poll_dev->priv;
 
-        /* e1000_clean is called per-cpu.  This lock protects
+        /*
+         * e1000_clean is called per-cpu.  This lock protects
          * tx_ring from being cleaned by multiple cpus
          * simultaneously.  A failure obtaining the lock means
-         * tx_ring is currently being cleaned anyway. */
+         * tx_ring is currently being cleaned anyway.
+         */
         if (spin_trylock(&adapter->tx_queue_lock)) {
                 tx_cleaned = e1000_clean_tx_irq(adapter);
                 spin_unlock(&adapter->tx_queue_lock);
@@ -1427,9 +1451,12 @@ static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
         struct e1000_hw *hw = &adapter->hw;
         u32 vfta, index;
 
-        e1000_irq_disable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->state))
+                e1000_irq_disable(adapter);
         vlan_group_set_device(adapter->vlgrp, vid, NULL);
-        e1000_irq_enable(adapter);
+
+        if (!test_bit(__E1000_DOWN, &adapter->state))
+                e1000_irq_enable(adapter);
 
         if ((adapter->hw.mng_cookie.status &
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
@@ -1480,7 +1507,8 @@ static void e1000_vlan_rx_register(struct net_device *netdev,
         struct e1000_hw *hw = &adapter->hw;
         u32 ctrl, rctl;
 
-        e1000_irq_disable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->state))
+                e1000_irq_disable(adapter);
         adapter->vlgrp = grp;
 
         if (grp) {
@@ -1517,7 +1545,8 @@ static void e1000_vlan_rx_register(struct net_device *netdev,
                 }
         }
 
-        e1000_irq_enable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->state))
+                e1000_irq_enable(adapter);
 }
 
 static void e1000_restore_vlan(struct e1000_adapter *adapter)
@@ -1546,9 +1575,11 @@ static void e1000_init_manageability(struct e1000_adapter *adapter)
 
         manc = er32(MANC);
 
-        /* enable receiving management packets to the host. this will probably
+        /*
+         * enable receiving management packets to the host. this will probably
          * generate destination unreachable messages from the host OS, but
-         * the packets will be handled on SMBUS */
+         * the packets will be handled on SMBUS
+         */
         manc |= E1000_MANC_EN_MNG2HOST;
         manc2h = er32(MANC2H);
 #define E1000_MNG2HOST_PORT_623 (1 << 5)
@@ -1598,7 +1629,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
 
         /* Set the Tx Interrupt Delay register */
         ew32(TIDV, adapter->tx_int_delay);
-        /* tx irq moderation */
+        /* Tx irq moderation */
         ew32(TADV, adapter->tx_abs_int_delay);
 
         /* Program the Transmit Control Register */
@@ -1608,22 +1639,24 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
                 (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
 
         if (adapter->flags & FLAG_TARC_SPEED_MODE_BIT) {
-                tarc = er32(TARC0);
-                /* set the speed mode bit, we'll clear it if we're not at
-                 * gigabit link later */
+                tarc = er32(TARC(0));
+                /*
+                 * set the speed mode bit, we'll clear it if we're not at
+                 * gigabit link later
+                 */
 #define SPEED_MODE_BIT (1 << 21)
                 tarc |= SPEED_MODE_BIT;
-                ew32(TARC0, tarc);
+                ew32(TARC(0), tarc);
         }
 
         /* errata: program both queues to unweighted RR */
         if (adapter->flags & FLAG_TARC_SET_BIT_ZERO) {
-                tarc = er32(TARC0);
+                tarc = er32(TARC(0));
                 tarc |= 1;
-                ew32(TARC0, tarc);
-                tarc = er32(TARC1);
+                ew32(TARC(0), tarc);
+                tarc = er32(TARC(1));
                 tarc |= 1;
-                ew32(TARC1, tarc);
+                ew32(TARC(1), tarc);
         }
 
         e1000e_config_collision_dist(hw);
@@ -1731,8 +1764,10 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                 /* Configure extra packet-split registers */
                 rfctl = er32(RFCTL);
                 rfctl |= E1000_RFCTL_EXTEN;
-                /* disable packet split support for IPv6 extension headers,
-                 * because some malformed IPv6 headers can hang the RX */
+                /*
+                 * disable packet split support for IPv6 extension headers,
+                 * because some malformed IPv6 headers can hang the Rx
+                 */
                 rfctl |= (E1000_RFCTL_IPV6_EX_DIS |
                           E1000_RFCTL_NEW_IPV6_EXT_DIS);
 
@@ -1761,6 +1796,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         }
 
         ew32(RCTL, rctl);
+        /* just started the receive unit, no need to restart */
+        adapter->flags &= ~FLAG_RX_RESTART_NOW;
 }
 
 /**
@@ -1801,8 +1838,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         /* irq moderation */
         ew32(RADV, adapter->rx_abs_int_delay);
         if (adapter->itr_setting != 0)
-                ew32(ITR,
-                        1000000000 / (adapter->itr * 256));
+                ew32(ITR, 1000000000 / (adapter->itr * 256));
 
         ctrl_ext = er32(CTRL_EXT);
         /* Reset delay timers after every interrupt */
@@ -1813,8 +1849,10 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         ew32(CTRL_EXT, ctrl_ext);
         e1e_flush();
 
-        /* Setup the HW Rx Head and Tail Descriptor Pointers and
-         * the Base and Length of the Rx Descriptor Ring */
+        /*
+         * Setup the HW Rx Head and Tail Descriptor Pointers and
+         * the Base and Length of the Rx Descriptor Ring
+         */
         rdba = rx_ring->dma;
         ew32(RDBAL, (rdba & DMA_32BIT_MASK));
         ew32(RDBAH, (rdba >> 32));
@@ -1829,8 +1867,10 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         if (adapter->flags & FLAG_RX_CSUM_ENABLED) {
                 rxcsum |= E1000_RXCSUM_TUOFL;
 
-                /* IPv4 payload checksum for UDP fragments must be
-                 * used in conjunction with packet-split. */
+                /*
+                 * IPv4 payload checksum for UDP fragments must be
+                 * used in conjunction with packet-split.
+                 */
                 if (adapter->rx_ps_pages)
                         rxcsum |= E1000_RXCSUM_IPPCSE;
         } else {
@@ -1839,9 +1879,11 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         }
         ew32(RXCSUM, rxcsum);
 
-        /* Enable early receives on supported devices, only takes effect when
+        /*
+         * Enable early receives on supported devices, only takes effect when
          * packet size is equal or larger than the specified value (in 8 byte
-         * units), e.g. using jumbo frames when setting to E1000_ERT_2048 */
+         * units), e.g. using jumbo frames when setting to E1000_ERT_2048
+         */
         if ((adapter->flags & FLAG_HAS_ERT) &&
             (adapter->netdev->mtu > ETH_DATA_LEN))
                 ew32(ERT, E1000_ERT_2048);
@@ -1851,7 +1893,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
 }
 
 /**
- *  e1000_mc_addr_list_update - Update Multicast addresses
+ *  e1000_update_mc_addr_list - Update Multicast addresses
  *  @hw: pointer to the HW structure
  *  @mc_addr_list: array of multicast addresses to program
  *  @mc_addr_count: number of multicast addresses to program
@@ -1865,11 +1907,11 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
  *  exists and all implementations are handled in the generic version of this
  *  function.
  **/
-static void e1000_mc_addr_list_update(struct e1000_hw *hw, u8 *mc_addr_list,
-                               u32 mc_addr_count, u32 rar_used_count,
-                               u32 rar_count)
+static void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
+                                      u32 mc_addr_count, u32 rar_used_count,
+                                      u32 rar_count)
 {
-        hw->mac.ops.mc_addr_list_update(hw, mc_addr_list, mc_addr_count,
+        hw->mac.ops.update_mc_addr_list(hw, mc_addr_list, mc_addr_count,
                                         rar_used_count, rar_count);
 }
 
@@ -1923,7 +1965,7 @@ static void e1000_set_multi(struct net_device *netdev)
                         mc_ptr = mc_ptr->next;
                 }
 
-                e1000_mc_addr_list_update(hw, mta_list, i, 1,
+                e1000_update_mc_addr_list(hw, mta_list, i, 1,
                                           mac->rar_entry_count);
                 kfree(mta_list);
         } else {
@@ -1931,13 +1973,12 @@ static void e1000_set_multi(struct net_device *netdev)
                  * if we're called from probe, we might not have
                  * anything to do here, so clear out the list
                  */
-                e1000_mc_addr_list_update(hw, NULL, 0, 1,
-                                          mac->rar_entry_count);
+                e1000_update_mc_addr_list(hw, NULL, 0, 1, mac->rar_entry_count);
         }
 }
 
 /**
- * e1000_configure - configure the hardware for RX and TX
+ * e1000_configure - configure the hardware for Rx and Tx
  * @adapter: private board structure
  **/
 static void e1000_configure(struct e1000_adapter *adapter)
@@ -1950,8 +1991,7 @@ static void e1000_configure(struct e1000_adapter *adapter)
         e1000_configure_tx(adapter);
         e1000_setup_rctl(adapter);
         e1000_configure_rx(adapter);
-        adapter->alloc_rx_buf(adapter,
-                              e1000_desc_unused(adapter->rx_ring));
+        adapter->alloc_rx_buf(adapter, e1000_desc_unused(adapter->rx_ring));
 }
 
 /**
@@ -1967,9 +2007,11 @@ void e1000e_power_up_phy(struct e1000_adapter *adapter)
         u16 mii_reg = 0;
 
         /* Just clear the power down bit to wake the phy back up */
-        if (adapter->hw.media_type == e1000_media_type_copper) {
-                /* according to the manual, the phy will retain its
-                 * settings across a power-down/up cycle */
+        if (adapter->hw.phy.media_type == e1000_media_type_copper) {
+                /*
+                 * According to the manual, the phy will retain its
+                 * settings across a power-down/up cycle
+                 */
                 e1e_rphy(&adapter->hw, PHY_CONTROL, &mii_reg);
                 mii_reg &= ~MII_CR_POWER_DOWN;
                 e1e_wphy(&adapter->hw, PHY_CONTROL, mii_reg);
@@ -1994,12 +2036,11 @@ static void e1000_power_down_phy(struct e1000_adapter *adapter)
                 return;
 
         /* non-copper PHY? */
-        if (adapter->hw.media_type != e1000_media_type_copper)
+        if (adapter->hw.phy.media_type != e1000_media_type_copper)
                 return;
 
         /* reset is blocked because of a SoL/IDER session */
-        if (e1000e_check_mng_mode(hw) ||
-            e1000_check_reset_block(hw))
+        if (e1000e_check_mng_mode(hw) || e1000_check_reset_block(hw))
                 return;
 
         /* manageability (AMT) is enabled */
@@ -2019,51 +2060,61 @@ static void e1000_power_down_phy(struct e1000_adapter *adapter)
  * This function boots the hardware and enables some settings that
  * require a configuration cycle of the hardware - those cannot be
  * set/changed during runtime. After reset the device needs to be
- * properly configured for rx, tx etc.
+ * properly configured for Rx, Tx etc.
  */
 void e1000e_reset(struct e1000_adapter *adapter)
 {
         struct e1000_mac_info *mac = &adapter->hw.mac;
+        struct e1000_fc_info *fc = &adapter->hw.fc;
         struct e1000_hw *hw = &adapter->hw;
         u32 tx_space, min_tx_space, min_rx_space;
-        u32 pba;
+        u32 pba = adapter->pba;
         u16 hwm;
 
-        ew32(PBA, adapter->pba);
+        /* reset Packet Buffer Allocation to default */
+        ew32(PBA, pba);
 
-        if (mac->max_frame_size > ETH_FRAME_LEN + ETH_FCS_LEN ) {
-                /* To maintain wire speed transmits, the Tx FIFO should be
+        if (adapter->max_frame_size > ETH_FRAME_LEN + ETH_FCS_LEN) {
+                /*
+                 * To maintain wire speed transmits, the Tx FIFO should be
                  * large enough to accommodate two full transmit packets,
                  * rounded up to the next 1KB and expressed in KB.  Likewise,
                  * the Rx FIFO should be large enough to accommodate at least
                  * one full receive packet and is similarly rounded up and
-                 * expressed in KB. */
+                 * expressed in KB.
+                 */
                 pba = er32(PBA);
                 /* upper 16 bits has Tx packet buffer allocation size in KB */
                 tx_space = pba >> 16;
                 /* lower 16 bits has Rx packet buffer allocation size in KB */
                 pba &= 0xffff;
-                /* the tx fifo also stores 16 bytes of information about the tx
-                 * but don't include ethernet FCS because hardware appends it */
-                min_tx_space = (mac->max_frame_size +
+                /*
+                 * the Tx fifo also stores 16 bytes of information about the tx
+                 * but don't include ethernet FCS because hardware appends it
+                 */
+                min_tx_space = (adapter->max_frame_size +
                                 sizeof(struct e1000_tx_desc) -
                                 ETH_FCS_LEN) * 2;
                 min_tx_space = ALIGN(min_tx_space, 1024);
                 min_tx_space >>= 10;
                 /* software strips receive CRC, so leave room for it */
-                min_rx_space = mac->max_frame_size;
+                min_rx_space = adapter->max_frame_size;
                 min_rx_space = ALIGN(min_rx_space, 1024);
                 min_rx_space >>= 10;
 
-                /* If current Tx allocation is less than the min Tx FIFO size,
+                /*
+                 * If current Tx allocation is less than the min Tx FIFO size,
                  * and the min Tx FIFO size is less than the current Rx FIFO
-                 * allocation, take space away from current Rx allocation */
+                 * allocation, take space away from current Rx allocation
+                 */
                 if ((tx_space < min_tx_space) &&
                     ((min_tx_space - tx_space) < pba)) {
                         pba -= min_tx_space - tx_space;
 
-                        /* if short on rx space, rx wins and must trump tx
-                         * adjustment or use Early Receive if available */
+                        /*
+                         * if short on Rx space, Rx wins and must trump tx
+                         * adjustment or use Early Receive if available
+                         */
                         if ((pba < min_rx_space) &&
                             (!(adapter->flags & FLAG_HAS_ERT)))
                                 /* ERT enabled in e1000_configure_rx */
@@ -2074,29 +2125,33 @@ void e1000e_reset(struct e1000_adapter *adapter)
         }
 
 
-        /* flow control settings */
-        /* The high water mark must be low enough to fit one full frame
+        /*
+         * flow control settings
+         *
+         * The high water mark must be low enough to fit one full frame
          * (or the size used for early receive) above it in the Rx FIFO.
          * Set it to the lower of:
          * - 90% of the Rx FIFO size, and
          * - the full Rx FIFO size minus the early receive size (for parts
          *   with ERT support assuming ERT set to E1000_ERT_2048), or
-         * - the full Rx FIFO size minus one full frame */
+         * - the full Rx FIFO size minus one full frame
+         */
         if (adapter->flags & FLAG_HAS_ERT)
-                hwm = min(((adapter->pba << 10) * 9 / 10),
-                          ((adapter->pba << 10) - (E1000_ERT_2048 << 3)));
+                hwm = min(((pba << 10) * 9 / 10),
+                          ((pba << 10) - (E1000_ERT_2048 << 3)));
         else
-                hwm = min(((adapter->pba << 10) * 9 / 10),
-                          ((adapter->pba << 10) - mac->max_frame_size));
+                hwm = min(((pba << 10) * 9 / 10),
+                          ((pba << 10) - adapter->max_frame_size));
 
-        mac->fc_high_water = hwm & 0xFFF8; /* 8-byte granularity */
-        mac->fc_low_water = mac->fc_high_water - 8;
+        fc->high_water = hwm & 0xFFF8; /* 8-byte granularity */
+        fc->low_water = fc->high_water - 8;
 
         if (adapter->flags & FLAG_DISABLE_FC_PAUSE_TIME)
-                mac->fc_pause_time = 0xFFFF;
+                fc->pause_time = 0xFFFF;
         else
-                mac->fc_pause_time = E1000_FC_PAUSE_TIME;
-        mac->fc = mac->original_fc;
+                fc->pause_time = E1000_FC_PAUSE_TIME;
+        fc->send_xon = 1;
+        fc->type = fc->original_type;
 
         /* Allow time for pending master requests to run */
         mac->ops.reset_hw(hw);
@@ -2115,9 +2170,11 @@ void e1000e_reset(struct e1000_adapter *adapter)
 
         if (!(adapter->flags & FLAG_SMART_POWER_DOWN)) {
                 u16 phy_data = 0;
-                /* speed up time to link by disabling smart power down, ignore
+                /*
+                 * speed up time to link by disabling smart power down, ignore
                  * the return value of this function because there is nothing
-                 * different we would do if it failed */
+                 * different we would do if it failed
+                 */
                 e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &phy_data);
                 phy_data &= ~IGP02E1000_PM_SPD;
                 e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);
@@ -2147,8 +2204,10 @@ void e1000e_down(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         u32 tctl, rctl;
 
-        /* signal that we're down so the interrupt handler does not
-         * reschedule our watchdog timer */
+        /*
+         * signal that we're down so the interrupt handler does not
+         * reschedule our watchdog timer
+         */
         set_bit(__E1000_DOWN, &adapter->state);
 
         /* disable receives in the hardware */
@@ -2167,7 +2226,6 @@ void e1000e_down(struct e1000_adapter *adapter)
         msleep(10);
 
         napi_disable(&adapter->napi);
-        atomic_set(&adapter->irq_sem, 0);
         e1000_irq_disable(adapter);
 
         del_timer_sync(&adapter->watchdog_timer);
@@ -2208,13 +2266,12 @@ void e1000e_reinit_locked(struct e1000_adapter *adapter)
  **/
 static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
 {
-        struct e1000_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
 
         adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN;
         adapter->rx_ps_bsize0 = 128;
-        hw->mac.max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-        hw->mac.min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
+        adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
 
         adapter->tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
         if (!adapter->tx_ring)
@@ -2227,7 +2284,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
         spin_lock_init(&adapter->tx_queue_lock);
 
         /* Explicitly disable IRQ since the NIC can be in any state. */
-        atomic_set(&adapter->irq_sem, 0);
         e1000_irq_disable(adapter);
 
         spin_lock_init(&adapter->stats_lock);
@@ -2281,16 +2337,20 @@ static int e1000_open(struct net_device *netdev)
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
                 e1000_update_mng_vlan(adapter);
 
-        /* If AMT is enabled, let the firmware know that the network
-         * interface is now open */
+        /*
+         * If AMT is enabled, let the firmware know that the network
+         * interface is now open
+         */
         if ((adapter->flags & FLAG_HAS_AMT) &&
             e1000e_check_mng_mode(&adapter->hw))
                 e1000_get_hw_control(adapter);
 
-        /* before we allocate an interrupt, we must be ready to handle it.
+        /*
+         * before we allocate an interrupt, we must be ready to handle it.
          * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
          * as soon as we call pci_request_irq, so we have to setup our
-         * clean_rx handler before we do so.  */
+         * clean_rx handler before we do so.
+         */
         e1000_configure(adapter);
 
         err = e1000_request_irq(adapter);
@@ -2344,16 +2404,20 @@ static int e1000_close(struct net_device *netdev)
         e1000e_free_tx_resources(adapter);
         e1000e_free_rx_resources(adapter);
 
-        /* kill manageability vlan ID if supported, but not if a vlan with
-         * the same ID is registered on the host OS (let 8021q kill it) */
+        /*
+         * kill manageability vlan ID if supported, but not if a vlan with
+         * the same ID is registered on the host OS (let 8021q kill it)
+         */
         if ((adapter->hw.mng_cookie.status &
                           E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
              !(adapter->vlgrp &&
                vlan_group_get_device(adapter->vlgrp, adapter->mng_vlan_id)))
                 e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
 
-        /* If AMT is enabled, let the firmware know that the network
-         * interface is now closed */
+        /*
+         * If AMT is enabled, let the firmware know that the network
+         * interface is now closed
+         */
         if ((adapter->flags & FLAG_HAS_AMT) &&
             e1000e_check_mng_mode(&adapter->hw))
                 e1000_release_hw_control(adapter);
@@ -2384,12 +2448,14 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
                 /* activate the work around */
                 e1000e_set_laa_state_82571(&adapter->hw, 1);
 
-                /* Hold a copy of the LAA in RAR[14] This is done so that
+                /*
+                 * Hold a copy of the LAA in RAR[14] This is done so that
                  * between the time RAR[0] gets clobbered  and the time it
                  * gets fixed (in e1000_watchdog), the actual LAA is in one
                  * of the RARs and no incoming packets directed to this port
                  * are dropped. Eventually the LAA will be in RAR[0] and
-                 * RAR[14] */
+                 * RAR[14]
+                 */
                 e1000e_rar_set(&adapter->hw,
                               adapter->hw.mac.addr,
                               adapter->hw.mac.rar_entry_count - 1);
@@ -2398,8 +2464,10 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
         return 0;
 }
 
-/* Need to wait a few seconds after link up to get diagnostic information from
- * the phy */
+/*
+ * Need to wait a few seconds after link up to get diagnostic information from
+ * the phy
+ */
 static void e1000_update_phy_info(unsigned long data)
 {
         struct e1000_adapter *adapter = (struct e1000_adapter *) data;
@@ -2430,7 +2498,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
 
         spin_lock_irqsave(&adapter->stats_lock, irq_flags);
 
-        /* these counters are modified from e1000_adjust_tbi_stats,
+        /*
+         * these counters are modified from e1000_adjust_tbi_stats,
          * called from the interrupt context, so they must only
          * be written while holding adapter->stats_lock
          */
@@ -2524,8 +2593,10 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
 
         /* Rx Errors */
 
-        /* RLEC on some newer hardware can be incorrect so build
-        * our own version based on RUC and ROC */
+        /*
+         * RLEC on some newer hardware can be incorrect so build
+         * our own version based on RUC and ROC
+         */
         adapter->net_stats.rx_errors = adapter->stats.rxerrc +
                 adapter->stats.crcerrs + adapter->stats.algnerrc +
                 adapter->stats.ruc + adapter->stats.roc +
@@ -2546,7 +2617,7 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         /* Tx Dropped needs to be maintained elsewhere */
 
         /* Phy Stats */
-        if (hw->media_type == e1000_media_type_copper) {
+        if (hw->phy.media_type == e1000_media_type_copper) {
                 if ((adapter->link_speed == SPEED_1000) &&
                    (!e1e_rphy(hw, PHY_1000T_STATUS, &phy_tmp))) {
                         phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
@@ -2564,8 +2635,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
 
 static void e1000_print_link_info(struct e1000_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
         struct e1000_hw *hw = &adapter->hw;
+        struct net_device *netdev = adapter->netdev;
         u32 ctrl = er32(CTRL);
 
         ndev_info(netdev,
@@ -2579,6 +2650,62 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
                 ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" )));
 }
 
+static bool e1000_has_link(struct e1000_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        bool link_active = 0;
+        s32 ret_val = 0;
+
+        /*
+         * get_link_status is set on LSC (link status) interrupt or
+         * Rx sequence error interrupt.  get_link_status will stay
+         * false until the check_for_link establishes link
+         * for copper adapters ONLY
+         */
+        switch (hw->phy.media_type) {
+        case e1000_media_type_copper:
+                if (hw->mac.get_link_status) {
+                        ret_val = hw->mac.ops.check_for_link(hw);
+                        link_active = !hw->mac.get_link_status;
+                } else {
+                        link_active = 1;
+                }
+                break;
+        case e1000_media_type_fiber:
+                ret_val = hw->mac.ops.check_for_link(hw);
+                link_active = !!(er32(STATUS) & E1000_STATUS_LU);
+                break;
+        case e1000_media_type_internal_serdes:
+                ret_val = hw->mac.ops.check_for_link(hw);
+                link_active = adapter->hw.mac.serdes_has_link;
+                break;
+        default:
+        case e1000_media_type_unknown:
+                break;
+        }
+
+        if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
+            (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
+                /* See e1000_kmrn_lock_loss_workaround_ich8lan() */
+                ndev_info(adapter->netdev,
+                          "Gigabit has been disabled, downgrading speed\n");
+        }
+
+        return link_active;
+}
+
+static void e1000e_enable_receives(struct e1000_adapter *adapter)
+{
+        /* make sure the receive unit is started */
+        if ((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
+            (adapter->flags & FLAG_RX_RESTART_NOW)) {
+                struct e1000_hw *hw = &adapter->hw;
+                u32 rctl = er32(RCTL);
+                ew32(RCTL, rctl | E1000_RCTL_EN);
+                adapter->flags &= ~FLAG_RX_RESTART_NOW;
+        }
+}
+
 /**
  * e1000_watchdog - Timer Call-back
  * @data: pointer to adapter cast into an unsigned long
@@ -2597,48 +2724,35 @@ static void e1000_watchdog_task(struct work_struct *work)
 {
         struct e1000_adapter *adapter = container_of(work,
                                         struct e1000_adapter, watchdog_task);
-
         struct net_device *netdev = adapter->netdev;
         struct e1000_mac_info *mac = &adapter->hw.mac;
         struct e1000_ring *tx_ring = adapter->tx_ring;
         struct e1000_hw *hw = &adapter->hw;
         u32 link, tctl;
-        s32 ret_val;
         int tx_pending = 0;
 
-        if ((netif_carrier_ok(netdev)) &&
-            (er32(STATUS) & E1000_STATUS_LU))
+        link = e1000_has_link(adapter);
+        if ((netif_carrier_ok(netdev)) && link) {
+                e1000e_enable_receives(adapter);
                 goto link_up;
-
-        ret_val = mac->ops.check_for_link(hw);
-        if ((ret_val == E1000_ERR_PHY) &&
-            (adapter->hw.phy.type == e1000_phy_igp_3) &&
-            (er32(CTRL) &
-             E1000_PHY_CTRL_GBE_DISABLE)) {
-                /* See e1000_kmrn_lock_loss_workaround_ich8lan() */
-                ndev_info(netdev,
-                        "Gigabit has been disabled, downgrading speed\n");
         }
 
         if ((e1000e_enable_tx_pkt_filtering(hw)) &&
             (adapter->mng_vlan_id != adapter->hw.mng_cookie.vlan_id))
                 e1000_update_mng_vlan(adapter);
 
-        if ((adapter->hw.media_type == e1000_media_type_internal_serdes) &&
-           !(er32(TXCW) & E1000_TXCW_ANE))
-                link = adapter->hw.mac.serdes_has_link;
-        else
-                link = er32(STATUS) & E1000_STATUS_LU;
-
         if (link) {
                 if (!netif_carrier_ok(netdev)) {
                         bool txb2b = 1;
+                        /* update snapshot of PHY registers on LSC */
                         mac->ops.get_link_up_info(&adapter->hw,
                                                    &adapter->link_speed,
                                                    &adapter->link_duplex);
                         e1000_print_link_info(adapter);
-                        /* tweak tx_queue_len according to speed/duplex
-                         * and adjust the timeout factor */
+                        /*
+                         * tweak tx_queue_len according to speed/duplex
+                         * and adjust the timeout factor
+                         */
                         netdev->tx_queue_len = adapter->tx_queue_len;
                         adapter->tx_timeout_factor = 1;
                         switch (adapter->link_speed) {
@@ -2654,18 +2768,22 @@ static void e1000_watchdog_task(struct work_struct *work)
                                 break;
                         }
 
-                        /* workaround: re-program speed mode bit after
-                         * link-up event */
+                        /*
+                         * workaround: re-program speed mode bit after
+                         * link-up event
+                         */
                         if ((adapter->flags & FLAG_TARC_SPEED_MODE_BIT) &&
                             !txb2b) {
                                 u32 tarc0;
-                                tarc0 = er32(TARC0);
+                                tarc0 = er32(TARC(0));
                                 tarc0 &= ~SPEED_MODE_BIT;
-                                ew32(TARC0, tarc0);
+                                ew32(TARC(0), tarc0);
                         }
 
-                        /* disable TSO for pcie and 10/100 speeds, to avoid
-                         * some hardware issues */
+                        /*
+                         * disable TSO for pcie and 10/100 speeds, to avoid
+                         * some hardware issues
+                         */
                         if (!(adapter->flags & FLAG_TSO_FORCE)) {
                                 switch (adapter->link_speed) {
                                 case SPEED_10:
@@ -2685,8 +2803,10 @@ static void e1000_watchdog_task(struct work_struct *work)
                                 }
                         }
 
-                        /* enable transmits in the hardware, need to do this
-                         * after setting TARC0 */
+                        /*
+                         * enable transmits in the hardware, need to do this
+                         * after setting TARC(0)
+                         */
                         tctl = er32(TCTL);
                         tctl |= E1000_TCTL_EN;
                         ew32(TCTL, tctl);
@@ -2697,13 +2817,6 @@ static void e1000_watchdog_task(struct work_struct *work)
                         if (!test_bit(__E1000_DOWN, &adapter->state))
                                 mod_timer(&adapter->phy_info_timer,
                                           round_jiffies(jiffies + 2 * HZ));
-                } else {
-                        /* make sure the receive unit is started */
-                        if (adapter->flags & FLAG_RX_NEEDS_RESTART) {
-                                u32 rctl = er32(RCTL);
-                                ew32(RCTL, rctl |
-                                                E1000_RCTL_EN);
-                        }
                 }
         } else {
                 if (netif_carrier_ok(netdev)) {
@@ -2740,23 +2853,27 @@ link_up:
                 tx_pending = (e1000_desc_unused(tx_ring) + 1 <
                                tx_ring->count);
                 if (tx_pending) {
-                        /* We've lost link, so the controller stops DMA,
+                        /*
+                         * We've lost link, so the controller stops DMA,
                          * but we've got queued Tx work that's never going
                          * to get done, so reset controller to flush Tx.
-                         * (Do the reset outside of interrupt context). */
+                         * (Do the reset outside of interrupt context).
+                         */
                         adapter->tx_timeout_count++;
                         schedule_work(&adapter->reset_task);
                 }
         }
 
-        /* Cause software interrupt to ensure rx ring is cleaned */
+        /* Cause software interrupt to ensure Rx ring is cleaned */
         ew32(ICS, E1000_ICS_RXDMT0);
 
         /* Force detection of hung controller every watchdog period */
         adapter->detect_tx_hung = 1;
 
-        /* With 82571 controllers, LAA may be overwritten due to controller
-         * reset from the other port. Set the appropriate LAA in RAR[0] */
+        /*
+         * With 82571 controllers, LAA may be overwritten due to controller
+         * reset from the other port. Set the appropriate LAA in RAR[0]
+         */
         if (e1000e_get_laa_state_82571(hw))
                 e1000e_rar_set(hw, adapter->hw.mac.addr, 0);
 
@@ -3032,16 +3149,20 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,
 
         tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
 
-        /* Force memory writes to complete before letting h/w
+        /*
+         * Force memory writes to complete before letting h/w
          * know there are new descriptors to fetch.  (Only
          * applicable for weak-ordered memory model archs,
-         * such as IA-64). */
+         * such as IA-64).
+         */
         wmb();
 
         tx_ring->next_to_use = i;
         writel(i, adapter->hw.hw_addr + tx_ring->tail);
-        /* we need this if more than one processor can write to our tail
-         * at a time, it synchronizes IO on IA64/Altix systems */
+        /*
+         * we need this if more than one processor can write to our tail
+         * at a time, it synchronizes IO on IA64/Altix systems
+         */
         mmiowb();
 }
 
@@ -3089,13 +3210,17 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
         netif_stop_queue(netdev);
-        /* Herbert's original patch had:
+        /*
+         * Herbert's original patch had:
          *  smp_mb__after_netif_stop_queue();
-         * but since that doesn't exist yet, just open code it. */
+         * but since that doesn't exist yet, just open code it.
+         */
         smp_mb();
 
-        /* We need to check again in a case another CPU has just
-         * made room available. */
+        /*
+         * We need to check again in a case another CPU has just
+         * made room available.
+         */
         if (e1000_desc_unused(adapter->tx_ring) < size)
                 return -EBUSY;
 
@@ -3142,21 +3267,29 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         }
 
         mss = skb_shinfo(skb)->gso_size;
-        /* The controller does a simple calculation to
+        /*
+         * The controller does a simple calculation to
          * make sure there is enough room in the FIFO before
          * initiating the DMA for each buffer.  The calc is:
          * 4 = ceil(buffer len/mss).  To make sure we don't
          * overrun the FIFO, adjust the max buffer len if mss
-         * drops. */
+         * drops.
+         */
         if (mss) {
                 u8 hdr_len;
                 max_per_txd = min(mss << 2, max_per_txd);
                 max_txd_pwr = fls(max_per_txd) - 1;
 
-                /* TSO Workaround for 82571/2/3 Controllers -- if skb->data
-                * points to just header, pull a few bytes of payload from
-                * frags into skb->data */
+                /*
+                 * TSO Workaround for 82571/2/3 Controllers -- if skb->data
+                 * points to just header, pull a few bytes of payload from
+                 * frags into skb->data
+                 */
                 hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+                /*
+                 * we do this workaround for ES2LAN, but it is un-necessary,
+                 * avoiding it could save a lot of cycles
+                 */
                 if (skb->data_len && (hdr_len == len)) {
                         unsigned int pull_size;
 
@@ -3190,8 +3323,10 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 /* Collision - tell upper layer to requeue */
                 return NETDEV_TX_LOCKED;
 
-        /* need: count + 2 desc gap to keep tail from touching
-         * head, otherwise try next time */
+        /*
+         * need: count + 2 desc gap to keep tail from touching
+         * head, otherwise try next time
+         */
         if (e1000_maybe_stop_tx(netdev, count + 2)) {
                 spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags);
                 return NETDEV_TX_BUSY;
@@ -3216,9 +3351,11 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         else if (e1000_tx_csum(adapter, skb))
                 tx_flags |= E1000_TX_FLAGS_CSUM;
 
-        /* Old method was to assume IPv4 packet by default if TSO was enabled.
+        /*
+         * Old method was to assume IPv4 packet by default if TSO was enabled.
          * 82571 hardware supports TSO capabilities for IPv6 as well...
-         * no longer assume, we must. */
+         * no longer assume, we must.
+         */
         if (skb->protocol == htons(ETH_P_IP))
                 tx_flags |= E1000_TX_FLAGS_IPV4;
 
@@ -3316,14 +3453,16 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
         while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
                 msleep(1);
         /* e1000e_down has a dependency on max_frame_size */
-        adapter->hw.mac.max_frame_size = max_frame;
+        adapter->max_frame_size = max_frame;
         if (netif_running(netdev))
                 e1000e_down(adapter);
 
-        /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
+        /*
+         * NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
          * means we reserve 2 more, this pushes us to allocate from the next
          * larger slab size.
-         * i.e. RXBUFFER_2048 --> size-4096 slab */
+         * i.e. RXBUFFER_2048 --> size-4096 slab
+         */
 
         if (max_frame <= 256)
                 adapter->rx_buffer_len = 256;
@@ -3340,7 +3479,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
         if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||
              (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
                 adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN
-                                         + ETH_FCS_LEN ;
+                                         + ETH_FCS_LEN;
 
         ndev_info(netdev, "changing MTU from %d to %d\n",
                 netdev->mtu, new_mtu);
@@ -3363,7 +3502,7 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
         struct mii_ioctl_data *data = if_mii(ifr);
         unsigned long irq_flags;
 
-        if (adapter->hw.media_type != e1000_media_type_copper)
+        if (adapter->hw.phy.media_type != e1000_media_type_copper)
                 return -EOPNOTSUPP;
 
         switch (cmd) {
@@ -3445,8 +3584,9 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
                         E1000_CTRL_EN_PHY_PWR_MGMT;
                 ew32(CTRL, ctrl);
 
-                if (adapter->hw.media_type == e1000_media_type_fiber ||
-                   adapter->hw.media_type == e1000_media_type_internal_serdes) {
+                if (adapter->hw.phy.media_type == e1000_media_type_fiber ||
+                    adapter->hw.phy.media_type ==
+                    e1000_media_type_internal_serdes) {
                         /* keep the laser running in D3 */
                         ctrl_ext = er32(CTRL_EXT);
                         ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA;
@@ -3476,8 +3616,10 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
         if (adapter->hw.phy.type == e1000_phy_igp_3)
                 e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
 
-        /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-         * would have already happened in close and is redundant. */
+        /*
+         * Release control of h/w to f/w.  If f/w is AMT enabled, this
+         * would have already happened in close and is redundant.
+         */
         e1000_release_hw_control(adapter);
 
         pci_disable_device(pdev);
@@ -3552,9 +3694,11 @@ static int e1000_resume(struct pci_dev *pdev)
 
         netif_device_attach(netdev);
 
-        /* If the controller has AMT, do not set DRV_LOAD until the interface
+        /*
+         * If the controller has AMT, do not set DRV_LOAD until the interface
          * is up.  For all other cases, let the f/w know that the h/w is now
-         * under the control of the driver. */
+         * under the control of the driver.
+         */
         if (!(adapter->flags & FLAG_HAS_AMT) || !e1000e_check_mng_mode(&adapter->hw))
                 e1000_get_hw_control(adapter);
 
@@ -3665,9 +3809,11 @@ static void e1000_io_resume(struct pci_dev *pdev)
 
         netif_device_attach(netdev);
 
-        /* If the controller has AMT, do not set DRV_LOAD until the interface
+        /*
+         * If the controller has AMT, do not set DRV_LOAD until the interface
          * is up.  For all other cases, let the f/w know that the h/w is now
-         * under the control of the driver. */
+         * under the control of the driver.
+         */
         if (!(adapter->flags & FLAG_HAS_AMT) ||
             !e1000e_check_mng_mode(&adapter->hw))
                 e1000_get_hw_control(adapter);
@@ -3678,7 +3824,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
-        u32 part_num;
+        u32 pba_num;
 
         /* print bus type/speed/width info */
         ndev_info(netdev, "(PCI Express:2.5GB/s:%s) "
@@ -3693,10 +3839,10 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
         ndev_info(netdev, "Intel(R) PRO/%s Network Connection\n",
                   (hw->phy.type == e1000_phy_ife)
                    ? "10/100" : "1000");
-        e1000e_read_part_num(hw, &part_num);
+        e1000e_read_pba_num(hw, &pba_num);
         ndev_info(netdev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
                   hw->mac.type, hw->phy.type,
-                  (part_num >> 8), (part_num & 0xff));
+                  (pba_num >> 8), (pba_num & 0xff));
 }
 
 /**
@@ -3828,16 +3974,16 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
         memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
 
-        err = ei->get_invariants(adapter);
+        err = ei->get_variants(adapter);
         if (err)
                 goto err_hw_init;
 
         hw->mac.ops.get_bus_info(&adapter->hw);
 
-        adapter->hw.phy.wait_for_link = 0;
+        adapter->hw.phy.autoneg_wait_to_complete = 0;
 
         /* Copper options */
-        if (adapter->hw.media_type == e1000_media_type_copper) {
+        if (adapter->hw.phy.media_type == e1000_media_type_copper) {
                 adapter->hw.phy.mdix = AUTO_ALL_MODES;
                 adapter->hw.phy.disable_polarity_correction = 0;
                 adapter->hw.phy.ms_type = e1000_ms_hw_default;
@@ -3861,15 +4007,19 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
 
-        /* We should not be using LLTX anymore, but we are still TX faster with
-         * it. */
+        /*
+         * We should not be using LLTX anymore, but we are still Tx faster with
+         * it.
+         */
         netdev->features |= NETIF_F_LLTX;
 
         if (e1000e_enable_mng_pass_thru(&adapter->hw))
                 adapter->flags |= FLAG_MNG_PT_ENABLED;
 
-        /* before reading the NVM, reset the controller to
-         * put the device in a known good starting state */
+        /*
+         * before reading the NVM, reset the controller to
+         * put the device in a known good starting state
+         */
         adapter->hw.mac.ops.reset_hw(&adapter->hw);
 
         /*
@@ -3919,8 +4069,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         /* Initialize link parameters. User can change them with ethtool */
         adapter->hw.mac.autoneg = 1;
         adapter->fc_autoneg = 1;
-        adapter->hw.mac.original_fc = e1000_fc_default;
-        adapter->hw.mac.fc = e1000_fc_default;
+        adapter->hw.fc.original_type = e1000_fc_default;
+        adapter->hw.fc.type = e1000_fc_default;
         adapter->hw.phy.autoneg_advertised = 0x2f;
 
         /* ring size defaults */
@@ -3963,9 +4113,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         /* reset the hardware with the new settings */
         e1000e_reset(adapter);
 
-        /* If the controller has AMT, do not set DRV_LOAD until the interface
+        /*
+         * If the controller has AMT, do not set DRV_LOAD until the interface
          * is up.  For all other cases, let the f/w know that the h/w is now
-         * under the control of the driver. */
+         * under the control of the driver.
+         */
         if (!(adapter->flags & FLAG_HAS_AMT) ||
             !e1000e_check_mng_mode(&adapter->hw))
                 e1000_get_hw_control(adapter);
@@ -4022,16 +4174,20 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
-        /* flush_scheduled work may reschedule our watchdog task, so
-         * explicitly disable watchdog tasks from being rescheduled  */
+        /*
+         * flush_scheduled work may reschedule our watchdog task, so
+         * explicitly disable watchdog tasks from being rescheduled
+         */
         set_bit(__E1000_DOWN, &adapter->state);
         del_timer_sync(&adapter->watchdog_timer);
         del_timer_sync(&adapter->phy_info_timer);
 
         flush_scheduled_work();
 
-        /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-         * would have already happened in close and is redundant. */
+        /*
+         * Release control of h/w to f/w.  If f/w is AMT enabled, this
+         * would have already happened in close and is redundant.
+         */
         e1000_release_hw_control(adapter);
 
         unregister_netdev(netdev);
@@ -4069,13 +4225,16 @@ static struct pci_device_id e1000_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_DUAL), board_82571 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_QUAD), board_82571 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571PT_QUAD_COPPER), board_82571 },
+
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI), board_82572 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_COPPER), board_82572 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_FIBER), board_82572 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_SERDES), board_82572 },
+
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E), board_82573 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT), board_82573 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L), board_82573 },
+
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_DPT),
           board_80003es2lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),
@@ -4084,6 +4243,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
           board_80003es2lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_SPT),
           board_80003es2lan },
+
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE), board_ich8lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_G), board_ich8lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_GT), board_ich8lan },
@@ -4091,6 +4251,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_C), board_ich8lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M), board_ich8lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M_AMT), board_ich8lan },
+
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE), board_ich9lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
@@ -4108,7 +4269,7 @@ static struct pci_driver e1000_driver = {
         .probe    = e1000_probe,
         .remove   = __devexit_p(e1000_remove),
 #ifdef CONFIG_PM
-        /* Power Managment Hooks */
+        /* Power Management Hooks */
         .suspend  = e1000_suspend,
         .resume   = e1000_resume,
 #endif
@@ -4127,7 +4288,7 @@ static int __init e1000_init_module(void)
         int ret;
         printk(KERN_INFO "%s: Intel(R) PRO/1000 Network Driver - %s\n",
                e1000e_driver_name, e1000e_driver_version);
-        printk(KERN_INFO "%s: Copyright (c) 1999-2007 Intel Corporation.\n",
+        printk(KERN_INFO "%s: Copyright (c) 1999-2008 Intel Corporation.\n",
                e1000e_driver_name);
         ret = pci_register_driver(&e1000_driver);
 
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index df266c32ac4b..a66b92efcf80 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -30,7 +30,8 @@
 
 #include "e1000.h"
 
-/* This is the only thing that needs to be changed to adjust the
+/*
+ * This is the only thing that needs to be changed to adjust the
  * maximum number of ports that the driver can manage.
  */
 
@@ -46,7 +47,8 @@ module_param(copybreak, uint, 0644);
 MODULE_PARM_DESC(copybreak,
         "Maximum size of packet that is copied to a new buffer on receive");
 
-/* All parameters are treated the same, as an integer array of values.
+/*
+ * All parameters are treated the same, as an integer array of values.
  * This macro just reduces the need to repeat the same declaration code
  * over and over (plus this helps to avoid typo bugs).
  */
@@ -60,8 +62,9 @@ MODULE_PARM_DESC(copybreak,
         MODULE_PARM_DESC(X, desc);
 
 
-/* Transmit Interrupt Delay in units of 1.024 microseconds
- *  Tx interrupt delay needs to typically be set to something non zero
+/*
+ * Transmit Interrupt Delay in units of 1.024 microseconds
+ * Tx interrupt delay needs to typically be set to something non zero
  *
  * Valid Range: 0-65535
  */
@@ -70,7 +73,8 @@ E1000_PARAM(TxIntDelay, "Transmit Interrupt Delay");
 #define MAX_TXDELAY 0xFFFF
 #define MIN_TXDELAY 0
 
-/* Transmit Absolute Interrupt Delay in units of 1.024 microseconds
+/*
+ * Transmit Absolute Interrupt Delay in units of 1.024 microseconds
  *
  * Valid Range: 0-65535
  */
@@ -79,8 +83,9 @@ E1000_PARAM(TxAbsIntDelay, "Transmit Absolute Interrupt Delay");
 #define MAX_TXABSDELAY 0xFFFF
 #define MIN_TXABSDELAY 0
 
-/* Receive Interrupt Delay in units of 1.024 microseconds
- *   hardware will likely hang if you set this to anything but zero.
+/*
+ * Receive Interrupt Delay in units of 1.024 microseconds
+ * hardware will likely hang if you set this to anything but zero.
  *
  * Valid Range: 0-65535
  */
@@ -89,7 +94,8 @@ E1000_PARAM(RxIntDelay, "Receive Interrupt Delay");
 #define MAX_RXDELAY 0xFFFF
 #define MIN_RXDELAY 0
 
-/* Receive Absolute Interrupt Delay in units of 1.024 microseconds
+/*
+ * Receive Absolute Interrupt Delay in units of 1.024 microseconds
  *
  * Valid Range: 0-65535
  */
@@ -98,7 +104,8 @@ E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
 #define MAX_RXABSDELAY 0xFFFF
 #define MIN_RXABSDELAY 0
 
-/* Interrupt Throttle Rate (interrupts/sec)
+/*
+ * Interrupt Throttle Rate (interrupts/sec)
  *
  * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
  */
@@ -107,7 +114,8 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
 #define MAX_ITR 100000
 #define MIN_ITR 100
 
-/* Enable Smart Power Down of the PHY
+/*
+ * Enable Smart Power Down of the PHY
  *
  * Valid Range: 0, 1
  *
@@ -115,7 +123,8 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
  */
 E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
 
-/* Enable Kumeran Lock Loss workaround
+/*
+ * Enable Kumeran Lock Loss workaround
  *
  * Valid Range: 0, 1
  *
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index dab3c468a768..3a4574caa75b 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -134,7 +134,8 @@ static s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
                 return -E1000_ERR_PARAM;
         }
 
-        /* Set up Op-code, Phy Address, and register offset in the MDI
+        /*
+         * Set up Op-code, Phy Address, and register offset in the MDI
          * Control register.  The MAC will take care of interfacing with the
          * PHY to retrieve the desired data.
          */
@@ -144,7 +145,11 @@ static s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
 
         ew32(MDIC, mdic);
 
-        /* Poll the ready bit to see if the MDI read completed */
+        /*
+         * Poll the ready bit to see if the MDI read completed
+         * Increasing the time out as testing showed failures with
+         * the lower time out
+         */
         for (i = 0; i < 64; i++) {
                 udelay(50);
                 mdic = er32(MDIC);
@@ -182,7 +187,8 @@ static s32 e1000_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
                 return -E1000_ERR_PARAM;
         }
 
-        /* Set up Op-code, Phy Address, and register offset in the MDI
+        /*
+         * Set up Op-code, Phy Address, and register offset in the MDI
          * Control register.  The MAC will take care of interfacing with the
          * PHY to retrieve the desired data.
          */
@@ -409,14 +415,15 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        /* Enable CRS on TX. This must be set for half-duplex operation. */
+        /* Enable CRS on Tx. This must be set for half-duplex operation. */
         ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
         if (ret_val)
                 return ret_val;
 
         phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
 
-        /* Options:
+        /*
+         * Options:
          *   MDI/MDI-X = 0 (default)
          *   0 - Auto for all speeds
          *   1 - MDI mode
@@ -441,7 +448,8 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
                 break;
         }
 
-        /* Options:
+        /*
+         * Options:
          *   disable_polarity_correction = 0 (default)
          *       Automatic Correction for Reversed Cable Polarity
          *   0 - Disabled
@@ -456,7 +464,8 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
                 return ret_val;
 
         if (phy->revision < 4) {
-                /* Force TX_CLK in the Extended PHY Specific Control Register
+                /*
+                 * Force TX_CLK in the Extended PHY Specific Control Register
                  * to 25MHz clock.
                  */
                 ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
@@ -543,19 +552,21 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
 
         /* set auto-master slave resolution settings */
         if (hw->mac.autoneg) {
-                /* when autonegotiation advertisement is only 1000Mbps then we
+                /*
+                 * when autonegotiation advertisement is only 1000Mbps then we
                  * should disable SmartSpeed and enable Auto MasterSlave
-                 * resolution as hardware default. */
+                 * resolution as hardware default.
+                 */
                 if (phy->autoneg_advertised == ADVERTISE_1000_FULL) {
                         /* Disable SmartSpeed */
                         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     &data);
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                         ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                                           data);
                         if (ret_val)
                                 return ret_val;
 
@@ -630,14 +641,16 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
                         return ret_val;
         }
 
-        /* Need to parse both autoneg_advertised and fc and set up
+        /*
+         * Need to parse both autoneg_advertised and fc and set up
          * the appropriate PHY registers.  First we will parse for
          * autoneg_advertised software override.  Since we can advertise
          * a plethora of combinations, we need to check each bit
          * individually.
          */
 
-        /* First we clear all the 10/100 mb speed bits in the Auto-Neg
+        /*
+         * First we clear all the 10/100 mb speed bits in the Auto-Neg
          * Advertisement Register (Address 4) and the 1000 mb speed bits in
          * the  1000Base-T Control Register (Address 9).
          */
@@ -683,7 +696,8 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
                 mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
         }
 
-        /* Check for a software override of the flow control settings, and
+        /*
+         * Check for a software override of the flow control settings, and
          * setup the PHY advertisement registers accordingly.  If
          * auto-negotiation is enabled, then software will have to set the
          * "PAUSE" bits to the correct value in the Auto-Negotiation
@@ -696,38 +710,42 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
          *        but not send pause frames).
          *      2:  Tx flow control is enabled (we can send pause frames
          *        but we do not support receiving pause frames).
-         *      3:  Both Rx and TX flow control (symmetric) are enabled.
+         *      3:  Both Rx and Tx flow control (symmetric) are enabled.
          *  other:  No software override.  The flow control configuration
          *        in the EEPROM is used.
          */
-        switch (hw->mac.fc) {
+        switch (hw->fc.type) {
         case e1000_fc_none:
-                /* Flow control (RX & TX) is completely disabled by a
+                /*
+                 * Flow control (Rx & Tx) is completely disabled by a
                  * software over-ride.
                  */
                 mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                 break;
         case e1000_fc_rx_pause:
-                /* RX Flow control is enabled, and TX Flow control is
+                /*
+                 * Rx Flow control is enabled, and Tx Flow control is
                  * disabled, by a software over-ride.
-                 */
-                /* Since there really isn't a way to advertise that we are
-                 * capable of RX Pause ONLY, we will advertise that we
-                 * support both symmetric and asymmetric RX PAUSE.  Later
+                 *
+                 * Since there really isn't a way to advertise that we are
+                 * capable of Rx Pause ONLY, we will advertise that we
+                 * support both symmetric and asymmetric Rx PAUSE.  Later
                  * (in e1000e_config_fc_after_link_up) we will disable the
                  * hw's ability to send PAUSE frames.
                  */
                 mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                 break;
         case e1000_fc_tx_pause:
-                /* TX Flow control is enabled, and RX Flow control is
+                /*
+                 * Tx Flow control is enabled, and Rx Flow control is
                  * disabled, by a software over-ride.
                  */
                 mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
                 mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
                 break;
         case e1000_fc_full:
-                /* Flow control (both RX and TX) is enabled by a software
+                /*
+                 * Flow control (both Rx and Tx) is enabled by a software
                  * over-ride.
                  */
                 mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
@@ -758,7 +776,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
  *  Performs initial bounds checking on autoneg advertisement parameter, then
  *  configure to advertise the full capability.  Setup the PHY to autoneg
  *  and restart the negotiation process between the link partner.  If
- *  wait_for_link, then wait for autoneg to complete before exiting.
+ *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
  **/
 static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
 {
@@ -766,12 +784,14 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_ctrl;
 
-        /* Perform some bounds checking on the autoneg advertisement
+        /*
+         * Perform some bounds checking on the autoneg advertisement
          * parameter.
          */
         phy->autoneg_advertised &= phy->autoneg_mask;
 
-        /* If autoneg_advertised is zero, we assume it was not defaulted
+        /*
+         * If autoneg_advertised is zero, we assume it was not defaulted
          * by the calling code so we set to advertise full capability.
          */
         if (phy->autoneg_advertised == 0)
@@ -785,7 +805,8 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         }
         hw_dbg(hw, "Restarting Auto-Neg\n");
 
-        /* Restart auto-negotiation by setting the Auto Neg Enable bit and
+        /*
+         * Restart auto-negotiation by setting the Auto Neg Enable bit and
          * the Auto Neg Restart bit in the PHY control register.
          */
         ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_ctrl);
@@ -797,10 +818,11 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Does the user want to wait for Auto-Neg to complete here, or
+        /*
+         * Does the user want to wait for Auto-Neg to complete here, or
          * check at a later time (for example, callback routine).
          */
-        if (phy->wait_for_link) {
+        if (phy->autoneg_wait_to_complete) {
                 ret_val = e1000_wait_autoneg(hw);
                 if (ret_val) {
                         hw_dbg(hw, "Error while waiting for "
@@ -829,14 +851,18 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
         bool link;
 
         if (hw->mac.autoneg) {
-                /* Setup autoneg and flow control advertisement and perform
-                 * autonegotiation. */
+                /*
+                 * Setup autoneg and flow control advertisement and perform
+                 * autonegotiation.
+                 */
                 ret_val = e1000_copper_link_autoneg(hw);
                 if (ret_val)
                         return ret_val;
         } else {
-                /* PHY will be set to 10H, 10F, 100H or 100F
-                 * depending on user settings. */
+                /*
+                 * PHY will be set to 10H, 10F, 100H or 100F
+                 * depending on user settings.
+                 */
                 hw_dbg(hw, "Forcing Speed and Duplex\n");
                 ret_val = e1000_phy_force_speed_duplex(hw);
                 if (ret_val) {
@@ -845,7 +871,8 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
                 }
         }
 
-        /* Check link status. Wait up to 100 microseconds for link to become
+        /*
+         * Check link status. Wait up to 100 microseconds for link to become
          * valid.
          */
         ret_val = e1000e_phy_has_link_generic(hw,
@@ -891,7 +918,8 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Clear Auto-Crossover to force MDI manually.  IGP requires MDI
+        /*
+         * Clear Auto-Crossover to force MDI manually.  IGP requires MDI
          * forced whenever speed and duplex are forced.
          */
         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
@@ -909,7 +937,7 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
 
         udelay(1);
 
-        if (phy->wait_for_link) {
+        if (phy->autoneg_wait_to_complete) {
                 hw_dbg(hw, "Waiting for forced speed/duplex link on IGP phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw,
@@ -941,7 +969,7 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
  *  Calls the PHY setup function to force speed and duplex.  Clears the
  *  auto-crossover to force MDI manually.  Resets the PHY to commit the
  *  changes.  If time expires while waiting for link up, we reset the DSP.
- *  After reset, TX_CLK and CRS on TX must be set.  Return successful upon
+ *  After reset, TX_CLK and CRS on Tx must be set.  Return successful upon
  *  successful completion, else return corresponding error code.
  **/
 s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
@@ -951,7 +979,8 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
         u16 phy_data;
         bool link;
 
-        /* Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
+        /*
+         * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
          * forced whenever speed and duplex are forced.
          */
         ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
@@ -980,7 +1009,7 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 
         udelay(1);
 
-        if (phy->wait_for_link) {
+        if (phy->autoneg_wait_to_complete) {
                 hw_dbg(hw, "Waiting for forced speed/duplex link on M88 phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
@@ -989,10 +1018,12 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
                         return ret_val;
 
                 if (!link) {
-                        /* We didn't get link.
+                        /*
+                         * We didn't get link.
                          * Reset the DSP and cross our fingers.
                          */
-                        ret_val = e1e_wphy(hw, M88E1000_PHY_PAGE_SELECT, 0x001d);
+                        ret_val = e1e_wphy(hw, M88E1000_PHY_PAGE_SELECT,
+                                           0x001d);
                         if (ret_val)
                                 return ret_val;
                         ret_val = e1000e_phy_reset_dsp(hw);
@@ -1011,7 +1042,8 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* Resetting the phy means we need to re-force TX_CLK in the
+        /*
+         * Resetting the phy means we need to re-force TX_CLK in the
          * Extended PHY Specific Control Register to 25MHz clock from
          * the reset value of 2.5MHz.
          */
@@ -1020,7 +1052,8 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        /* In addition, we must re-enable CRS on Tx for both half and full
+        /*
+         * In addition, we must re-enable CRS on Tx for both half and full
          * duplex.
          */
         ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
@@ -1051,7 +1084,7 @@ void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
         u32 ctrl;
 
         /* Turn off flow control when forcing speed/duplex */
-        mac->fc = e1000_fc_none;
+        hw->fc.type = e1000_fc_none;
 
         /* Force speed/duplex on the mac */
         ctrl = er32(CTRL);
@@ -1124,30 +1157,32 @@ s32 e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active)
                                              data);
                 if (ret_val)
                         return ret_val;
-                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /*
+                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
-                 * SmartSpeed, so performance is maintained. */
+                 * SmartSpeed, so performance is maintained.
+                 */
                 if (phy->smart_speed == e1000_smart_speed_on) {
                         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data |= IGP01E1000_PSCFR_SMART_SPEED;
                         ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 } else if (phy->smart_speed == e1000_smart_speed_off) {
                         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     &data);
+                                           &data);
                         if (ret_val)
                                 return ret_val;
 
                         data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                         ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                                     data);
+                                           data);
                         if (ret_val)
                                 return ret_val;
                 }
@@ -1249,8 +1284,10 @@ static s32 e1000_check_polarity_igp(struct e1000_hw *hw)
         s32 ret_val;
         u16 data, offset, mask;
 
-        /* Polarity is determined based on the speed of
-         * our connection. */
+        /*
+         * Polarity is determined based on the speed of
+         * our connection.
+         */
         ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_STATUS, &data);
         if (ret_val)
                 return ret_val;
@@ -1260,7 +1297,8 @@ static s32 e1000_check_polarity_igp(struct e1000_hw *hw)
                 offset  = IGP01E1000_PHY_PCS_INIT_REG;
                 mask    = IGP01E1000_PHY_POLARITY_MASK;
         } else {
-                /* This really only applies to 10Mbps since
+                /*
+                 * This really only applies to 10Mbps since
                  * there is no polarity for 100Mbps (always 0).
                  */
                 offset  = IGP01E1000_PHY_PORT_STATUS;
@@ -1278,7 +1316,7 @@ static s32 e1000_check_polarity_igp(struct e1000_hw *hw)
 }
 
 /**
- *  e1000_wait_autoneg - Wait for auto-neg compeletion
+ *  e1000_wait_autoneg - Wait for auto-neg completion
  *  @hw: pointer to the HW structure
  *
  *  Waits for auto-negotiation to complete or for the auto-negotiation time
@@ -1302,7 +1340,8 @@ static s32 e1000_wait_autoneg(struct e1000_hw *hw)
                 msleep(100);
         }
 
-        /* PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
+        /*
+         * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
          * has completed.
          */
         return ret_val;
@@ -1324,7 +1363,8 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
         u16 i, phy_status;
 
         for (i = 0; i < iterations; i++) {
-                /* Some PHYs require the PHY_STATUS register to be read
+                /*
+                 * Some PHYs require the PHY_STATUS register to be read
                  * twice due to the link bit being sticky.  No harm doing
                  * it across the board.
                  */
@@ -1412,10 +1452,12 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
                 if (ret_val)
                         return ret_val;
 
-                /* Getting bits 15:9, which represent the combination of
+                /*
+                 * Getting bits 15:9, which represent the combination of
                  * course and fine gain values.  The result is a number
                  * that can be put into the lookup table to obtain the
-                 * approximate cable length. */
+                 * approximate cable length.
+                 */
                 cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
                                 IGP02E1000_AGC_LENGTH_MASK;
 
@@ -1466,7 +1508,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
         u16 phy_data;
         bool link;
 
-        if (hw->media_type != e1000_media_type_copper) {
+        if (hw->phy.media_type != e1000_media_type_copper) {
                 hw_dbg(hw, "Phy info is only valid for copper media\n");
                 return -E1000_ERR_CONFIG;
         }
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index a8d3280923e8..f5dacceab95b 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -422,7 +422,7 @@ struct ehea_fw_handle_entry {
 struct ehea_fw_handle_array {
         struct ehea_fw_handle_entry *arr;
         int num_entries;
-        struct semaphore lock;
+        struct mutex lock;
 };
 
 struct ehea_bcmc_reg_entry {
@@ -435,7 +435,7 @@ struct ehea_bcmc_reg_entry {
 struct ehea_bcmc_reg_array {
         struct ehea_bcmc_reg_entry *arr;
         int num_entries;
-        struct semaphore lock;
+        struct mutex lock;
 };
 
 #define EHEA_PORT_UP 1
@@ -453,7 +453,7 @@ struct ehea_port {
         struct vlan_group *vgrp;
         struct ehea_eq *qp_eq;
         struct work_struct reset_task;
-        struct semaphore port_lock;
+        struct mutex port_lock;
         char int_aff_name[EHEA_IRQ_NAME_SIZE];
         int allmulti;                    /* Indicates IFF_ALLMULTI state */
         int promisc;                     /* Indicates IFF_PROMISC state */
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index f460b623c077..9ff7538b7595 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -36,6 +36,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <asm/kexec.h>
+#include <linux/mutex.h>
 
 #include <net/ip.h>
 
@@ -99,7 +100,7 @@ static int port_name_cnt;
 static LIST_HEAD(adapter_list);
 u64 ehea_driver_flags;
 struct work_struct ehea_rereg_mr_task;
-struct semaphore dlpar_mem_lock;
+static DEFINE_MUTEX(dlpar_mem_lock);
 struct ehea_fw_handle_array ehea_fw_handles;
 struct ehea_bcmc_reg_array ehea_bcmc_regs;
 
@@ -1761,7 +1762,7 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa)
 
         memcpy(dev->dev_addr, mac_addr->sa_data, dev->addr_len);
 
-        down(&ehea_bcmc_regs.lock);
+        mutex_lock(&ehea_bcmc_regs.lock);
 
         /* Deregister old MAC in pHYP */
         ret = ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
@@ -1779,7 +1780,7 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa)
 
 out_upregs:
         ehea_update_bcmc_registrations();
-        up(&ehea_bcmc_regs.lock);
+        mutex_unlock(&ehea_bcmc_regs.lock);
 out_free:
         kfree(cb0);
 out:
@@ -1941,7 +1942,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
         }
         ehea_promiscuous(dev, 0);
 
-        down(&ehea_bcmc_regs.lock);
+        mutex_lock(&ehea_bcmc_regs.lock);
 
         if (dev->flags & IFF_ALLMULTI) {
                 ehea_allmulti(dev, 1);
@@ -1972,7 +1973,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
         }
 out:
         ehea_update_bcmc_registrations();
-        up(&ehea_bcmc_regs.lock);
+        mutex_unlock(&ehea_bcmc_regs.lock);
         return;
 }
 
@@ -2455,7 +2456,7 @@ static int ehea_up(struct net_device *dev)
         if (port->state == EHEA_PORT_UP)
                 return 0;
 
-        down(&ehea_fw_handles.lock);
+        mutex_lock(&ehea_fw_handles.lock);
 
         ret = ehea_port_res_setup(port, port->num_def_qps,
                                   port->num_add_tx_qps);
@@ -2493,7 +2494,7 @@ static int ehea_up(struct net_device *dev)
                 }
         }
 
-        down(&ehea_bcmc_regs.lock);
+        mutex_lock(&ehea_bcmc_regs.lock);
 
         ret = ehea_broadcast_reg_helper(port, H_REG_BCMC);
         if (ret) {
@@ -2516,10 +2517,10 @@ out:
                 ehea_info("Failed starting %s. ret=%i", dev->name, ret);
 
         ehea_update_bcmc_registrations();
-        up(&ehea_bcmc_regs.lock);
+        mutex_unlock(&ehea_bcmc_regs.lock);
 
         ehea_update_firmware_handles();
-        up(&ehea_fw_handles.lock);
+        mutex_unlock(&ehea_fw_handles.lock);
 
         return ret;
 }
@@ -2545,7 +2546,7 @@ static int ehea_open(struct net_device *dev)
         int ret;
         struct ehea_port *port = netdev_priv(dev);
 
-        down(&port->port_lock);
+        mutex_lock(&port->port_lock);
 
         if (netif_msg_ifup(port))
                 ehea_info("enabling port %s", dev->name);
@@ -2556,7 +2557,7 @@ static int ehea_open(struct net_device *dev)
                 netif_start_queue(dev);
         }
 
-        up(&port->port_lock);
+        mutex_unlock(&port->port_lock);
 
         return ret;
 }
@@ -2569,18 +2570,18 @@ static int ehea_down(struct net_device *dev)
         if (port->state == EHEA_PORT_DOWN)
                 return 0;
 
-        down(&ehea_bcmc_regs.lock);
+        mutex_lock(&ehea_fw_handles.lock);
+
+        mutex_lock(&ehea_bcmc_regs.lock);
         ehea_drop_multicast_list(dev);
         ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
 
         ehea_free_interrupts(dev);
 
-        down(&ehea_fw_handles.lock);
-
         port->state = EHEA_PORT_DOWN;
 
         ehea_update_bcmc_registrations();
-        up(&ehea_bcmc_regs.lock);
+        mutex_unlock(&ehea_bcmc_regs.lock);
 
         ret = ehea_clean_all_portres(port);
         if (ret)
@@ -2588,7 +2589,7 @@ static int ehea_down(struct net_device *dev)
                           dev->name, ret);
 
         ehea_update_firmware_handles();
-        up(&ehea_fw_handles.lock);
+        mutex_unlock(&ehea_fw_handles.lock);
 
         return ret;
 }
@@ -2602,11 +2603,11 @@ static int ehea_stop(struct net_device *dev)
                 ehea_info("disabling port %s", dev->name);
 
         flush_scheduled_work();
-        down(&port->port_lock);
+        mutex_lock(&port->port_lock);
         netif_stop_queue(dev);
         port_napi_disable(port);
         ret = ehea_down(dev);
-        up(&port->port_lock);
+        mutex_unlock(&port->port_lock);
         return ret;
 }
 
@@ -2820,7 +2821,7 @@ static void ehea_reset_port(struct work_struct *work)
         struct net_device *dev = port->netdev;
 
         port->resets++;
-        down(&port->port_lock);
+        mutex_lock(&port->port_lock);
         netif_stop_queue(dev);
 
         port_napi_disable(port);
@@ -2840,7 +2841,7 @@ static void ehea_reset_port(struct work_struct *work)
 
         netif_wake_queue(dev);
 out:
-        up(&port->port_lock);
+        mutex_unlock(&port->port_lock);
         return;
 }
 
@@ -2849,7 +2850,7 @@ static void ehea_rereg_mrs(struct work_struct *work)
         int ret, i;
         struct ehea_adapter *adapter;
 
-        down(&dlpar_mem_lock);
+        mutex_lock(&dlpar_mem_lock);
         ehea_info("LPAR memory enlarged - re-initializing driver");
 
         list_for_each_entry(adapter, &adapter_list, list)
@@ -2857,22 +2858,24 @@ static void ehea_rereg_mrs(struct work_struct *work)
                         /* Shutdown all ports */
                         for (i = 0; i < EHEA_MAX_PORTS; i++) {
                                 struct ehea_port *port = adapter->port[i];
+                                struct net_device *dev;
 
-                                if (port) {
-                                        struct net_device *dev = port->netdev;
+                                if (!port)
+                                        continue;
 
-                                        if (dev->flags & IFF_UP) {
-                                                down(&port->port_lock);
-                                                netif_stop_queue(dev);
-                                                ehea_flush_sq(port);
-                                                ret = ehea_stop_qps(dev);
-                                                if (ret) {
-                                                        up(&port->port_lock);
-                                                        goto out;
-                                                }
-                                                port_napi_disable(port);
-                                                up(&port->port_lock);
+                                dev = port->netdev;
+
+                                if (dev->flags & IFF_UP) {
+                                        mutex_lock(&port->port_lock);
+                                        netif_stop_queue(dev);
+                                        ehea_flush_sq(port);
+                                        ret = ehea_stop_qps(dev);
+                                        if (ret) {
+                                                mutex_unlock(&port->port_lock);
+                                                goto out;
                                         }
+                                        port_napi_disable(port);
+                                        mutex_unlock(&port->port_lock);
                                 }
                         }
 
@@ -2912,17 +2915,17 @@ static void ehea_rereg_mrs(struct work_struct *work)
                                         struct net_device *dev = port->netdev;
 
                                         if (dev->flags & IFF_UP) {
-                                                down(&port->port_lock);
+                                                mutex_lock(&port->port_lock);
                                                 port_napi_enable(port);
                                                 ret = ehea_restart_qps(dev);
                                                 if (!ret)
                                                         netif_wake_queue(dev);
-                                                up(&port->port_lock);
+                                                mutex_unlock(&port->port_lock);
                                         }
                                 }
                         }
                 }
-       up(&dlpar_mem_lock);
+       mutex_unlock(&dlpar_mem_lock);
        ehea_info("re-initializing driver complete");
 out:
         return;
@@ -3083,7 +3086,7 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
 
         port = netdev_priv(dev);
 
-        sema_init(&port->port_lock, 1);
+        mutex_init(&port->port_lock);
         port->state = EHEA_PORT_DOWN;
         port->sig_comp_iv = sq_entries / 10;
 
@@ -3362,7 +3365,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
                 ehea_error("Invalid ibmebus device probed");
                 return -EINVAL;
         }
-        down(&ehea_fw_handles.lock);
+        mutex_lock(&ehea_fw_handles.lock);
 
         adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
         if (!adapter) {
@@ -3446,7 +3449,7 @@ out_free_ad:
 
 out:
         ehea_update_firmware_handles();
-        up(&ehea_fw_handles.lock);
+        mutex_unlock(&ehea_fw_handles.lock);
         return ret;
 }
 
@@ -3465,7 +3468,7 @@ static int __devexit ehea_remove(struct of_device *dev)
 
         flush_scheduled_work();
 
-        down(&ehea_fw_handles.lock);
+        mutex_lock(&ehea_fw_handles.lock);
 
         ibmebus_free_irq(adapter->neq->attr.ist1, adapter);
         tasklet_kill(&adapter->neq_tasklet);
@@ -3476,7 +3479,7 @@ static int __devexit ehea_remove(struct of_device *dev)
         kfree(adapter);
 
         ehea_update_firmware_handles();
-        up(&ehea_fw_handles.lock);
+        mutex_unlock(&ehea_fw_handles.lock);
 
         return 0;
 }
@@ -3563,9 +3566,8 @@ int __init ehea_module_init(void)
         memset(&ehea_fw_handles, 0, sizeof(ehea_fw_handles));
         memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs));
 
-        sema_init(&dlpar_mem_lock, 1);
-        sema_init(&ehea_fw_handles.lock, 1);
-        sema_init(&ehea_bcmc_regs.lock, 1);
+        mutex_init(&ehea_fw_handles.lock);
+        mutex_init(&ehea_bcmc_regs.lock);
 
         ret = check_module_parm();
         if (ret)
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index fe59c27c09e3..e5e6352556fa 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -198,7 +198,7 @@ static int mpc52xx_fec_init_phy(struct net_device *dev)
         struct phy_device *phydev;
         char phy_id[BUS_ID_SIZE];
 
-        snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT,
+        snprintf(phy_id, BUS_ID_SIZE, "%x:%02x",
                         (unsigned int)dev->base_addr, priv->phy_addr);
 
         priv->link = PHY_DOWN;
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 1d0cd1dd955e..f5634447276d 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -124,7 +124,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i
                 goto out_free;
         }
 
-        bus->id = res.start;
+        snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
         bus->priv = priv;
 
         bus->dev = dev;
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 9f088a47d8b1..8c4214b0ee1f 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -29,90 +29,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Changelog:
- *      0.01: 05 Oct 2003: First release that compiles without warnings.
- *      0.02: 05 Oct 2003: Fix bug for nv_drain_tx: do not try to free NULL skbs.
- *                         Check all PCI BARs for the register window.
- *                         udelay added to mii_rw.
- *      0.03: 06 Oct 2003: Initialize dev->irq.
- *      0.04: 07 Oct 2003: Initialize np->lock, reduce handled irqs, add printks.
- *      0.05: 09 Oct 2003: printk removed again, irq status print tx_timeout.
- *      0.06: 10 Oct 2003: MAC Address read updated, pff flag generation updated,
- *                         irq mask updated
- *      0.07: 14 Oct 2003: Further irq mask updates.
- *      0.08: 20 Oct 2003: rx_desc.Length initialization added, nv_alloc_rx refill
- *                         added into irq handler, NULL check for drain_ring.
- *      0.09: 20 Oct 2003: Basic link speed irq implementation. Only handle the
- *                         requested interrupt sources.
- *      0.10: 20 Oct 2003: First cleanup for release.
- *      0.11: 21 Oct 2003: hexdump for tx added, rx buffer sizes increased.
- *                         MAC Address init fix, set_multicast cleanup.
- *      0.12: 23 Oct 2003: Cleanups for release.
- *      0.13: 25 Oct 2003: Limit for concurrent tx packets increased to 10.
- *                         Set link speed correctly. start rx before starting
- *                         tx (nv_start_rx sets the link speed).
- *      0.14: 25 Oct 2003: Nic dependant irq mask.
- *      0.15: 08 Nov 2003: fix smp deadlock with set_multicast_list during
- *                         open.
- *      0.16: 15 Nov 2003: include file cleanup for ppc64, rx buffer size
- *                         increased to 1628 bytes.
- *      0.17: 16 Nov 2003: undo rx buffer size increase. Substract 1 from
- *                         the tx length.
- *      0.18: 17 Nov 2003: fix oops due to late initialization of dev_stats
- *      0.19: 29 Nov 2003: Handle RxNoBuf, detect & handle invalid mac
- *                         addresses, really stop rx if already running
- *                         in nv_start_rx, clean up a bit.
- *      0.20: 07 Dec 2003: alloc fixes
- *      0.21: 12 Jan 2004: additional alloc fix, nic polling fix.
- *      0.22: 19 Jan 2004: reprogram timer to a sane rate, avoid lockup
- *                         on close.
- *      0.23: 26 Jan 2004: various small cleanups
- *      0.24: 27 Feb 2004: make driver even less anonymous in backtraces
- *      0.25: 09 Mar 2004: wol support
- *      0.26: 03 Jun 2004: netdriver specific annotation, sparse-related fixes
- *      0.27: 19 Jun 2004: Gigabit support, new descriptor rings,
- *                         added CK804/MCP04 device IDs, code fixes
- *                         for registers, link status and other minor fixes.
- *      0.28: 21 Jun 2004: Big cleanup, making driver mostly endian safe
- *      0.29: 31 Aug 2004: Add backup timer for link change notification.
- *      0.30: 25 Sep 2004: rx checksum support for nf 250 Gb. Add rx reset
- *                         into nv_close, otherwise reenabling for wol can
- *                         cause DMA to kfree'd memory.
- *      0.31: 14 Nov 2004: ethtool support for getting/setting link
- *                         capabilities.
- *      0.32: 16 Apr 2005: RX_ERROR4 handling added.
- *      0.33: 16 May 2005: Support for MCP51 added.
- *      0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics.
- *      0.35: 26 Jun 2005: Support for MCP55 added.
- *      0.36: 28 Jun 2005: Add jumbo frame support.
- *      0.37: 10 Jul 2005: Additional ethtool support, cleanup of pci id list
- *      0.38: 16 Jul 2005: tx irq rewrite: Use global flags instead of
- *                         per-packet flags.
- *      0.39: 18 Jul 2005: Add 64bit descriptor support.
- *      0.40: 19 Jul 2005: Add support for mac address change.
- *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
- *                         of nv_remove
- *      0.42: 06 Aug 2005: Fix lack of link speed initialization
- *                         in the second (and later) nv_open call
- *      0.43: 10 Aug 2005: Add support for tx checksum.
- *      0.44: 20 Aug 2005: Add support for scatter gather and segmentation.
- *      0.45: 18 Sep 2005: Remove nv_stop/start_rx from every link check
- *      0.46: 20 Oct 2005: Add irq optimization modes.
- *      0.47: 26 Oct 2005: Add phyaddr 0 in phy scan.
- *      0.48: 24 Dec 2005: Disable TSO, bugfix for pci_map_single
- *      0.49: 10 Dec 2005: Fix tso for large buffers.
- *      0.50: 20 Jan 2006: Add 8021pq tagging support.
- *      0.51: 20 Jan 2006: Add 64bit consistent memory allocation for rings.
- *      0.52: 20 Jan 2006: Add MSI/MSIX support.
- *      0.53: 19 Mar 2006: Fix init from low power mode and add hw reset.
- *      0.54: 21 Mar 2006: Fix spin locks for multi irqs and cleanup.
- *      0.55: 22 Mar 2006: Add flow control (pause frame).
- *      0.56: 22 Mar 2006: Additional ethtool config and moduleparam support.
- *      0.57: 14 May 2006: Mac address set in probe/remove and order corrections.
- *      0.58: 30 Oct 2006: Added support for sideband management unit.
- *      0.59: 30 Oct 2006: Added support for recoverable error.
- *      0.60: 20 Jan 2007: Code optimizations for rings, rx & tx data paths, and stats.
- *
  * Known bugs:
  * We suspect that on some hardware no TX done interrupts are generated.
  * This means recovery from netif_stop_queue only happens if the hw timer
@@ -123,11 +39,6 @@
  * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
  * superfluous timer interrupts from the nic.
  */
-#ifdef CONFIG_FORCEDETH_NAPI
-#define DRIVERNAPI "-NAPI"
-#else
-#define DRIVERNAPI
-#endif
 #define FORCEDETH_VERSION               "0.61"
 #define DRV_NAME                        "forcedeth"
 
@@ -930,6 +841,13 @@ static inline u32 nv_descr_getlength_ex(struct ring_desc_ex *prd, u32 v)
         return le32_to_cpu(prd->flaglen) & LEN_MASK_V2;
 }
 
+static bool nv_optimized(struct fe_priv *np)
+{
+        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
+                return false;
+        return true;
+}
+
 static int reg_delay(struct net_device *dev, int offset, u32 mask, u32 target,
                                 int delay, int delaymax, const char *msg)
 {
@@ -966,7 +884,7 @@ static void setup_hw_rings(struct net_device *dev, int rxtx_flags)
         struct fe_priv *np = get_nvpriv(dev);
         u8 __iomem *base = get_hwbase(dev);
 
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+        if (!nv_optimized(np)) {
                 if (rxtx_flags & NV_SETUP_RX_RING) {
                         writel(dma_low(np->ring_addr), base + NvRegRxRingPhysAddr);
                 }
@@ -989,7 +907,7 @@ static void free_rings(struct net_device *dev)
 {
         struct fe_priv *np = get_nvpriv(dev);
 
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+        if (!nv_optimized(np)) {
                 if (np->rx_ring.orig)
                         pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (np->rx_ring_size + np->tx_ring_size),
                                             np->rx_ring.orig, np->ring_addr);
@@ -1435,6 +1353,18 @@ static void nv_stop_tx(struct net_device *dev)
                        base + NvRegTransmitPoll);
 }
 
+static void nv_start_rxtx(struct net_device *dev)
+{
+        nv_start_rx(dev);
+        nv_start_tx(dev);
+}
+
+static void nv_stop_rxtx(struct net_device *dev)
+{
+        nv_stop_rx(dev);
+        nv_stop_tx(dev);
+}
+
 static void nv_txrx_reset(struct net_device *dev)
 {
         struct fe_priv *np = netdev_priv(dev);
@@ -1657,7 +1587,7 @@ static void nv_do_rx_refill(unsigned long data)
         } else {
                 disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
         }
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
+        if (!nv_optimized(np))
                 retcode = nv_alloc_rx(dev);
         else
                 retcode = nv_alloc_rx_optimized(dev);
@@ -1682,8 +1612,10 @@ static void nv_init_rx(struct net_device *dev)
 {
         struct fe_priv *np = netdev_priv(dev);
         int i;
+
         np->get_rx = np->put_rx = np->first_rx = np->rx_ring;
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
+
+        if (!nv_optimized(np))
                 np->last_rx.orig = &np->rx_ring.orig[np->rx_ring_size-1];
         else
                 np->last_rx.ex = &np->rx_ring.ex[np->rx_ring_size-1];
@@ -1691,7 +1623,7 @@ static void nv_init_rx(struct net_device *dev)
         np->last_rx_ctx = &np->rx_skb[np->rx_ring_size-1];
 
         for (i = 0; i < np->rx_ring_size; i++) {
-                if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+                if (!nv_optimized(np)) {
                         np->rx_ring.orig[i].flaglen = 0;
                         np->rx_ring.orig[i].buf = 0;
                 } else {
@@ -1709,8 +1641,10 @@ static void nv_init_tx(struct net_device *dev)
 {
         struct fe_priv *np = netdev_priv(dev);
         int i;
+
         np->get_tx = np->put_tx = np->first_tx = np->tx_ring;
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
+
+        if (!nv_optimized(np))
                 np->last_tx.orig = &np->tx_ring.orig[np->tx_ring_size-1];
         else
                 np->last_tx.ex = &np->tx_ring.ex[np->tx_ring_size-1];
@@ -1721,7 +1655,7 @@ static void nv_init_tx(struct net_device *dev)
         np->tx_end_flip = NULL;
 
         for (i = 0; i < np->tx_ring_size; i++) {
-                if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+                if (!nv_optimized(np)) {
                         np->tx_ring.orig[i].flaglen = 0;
                         np->tx_ring.orig[i].buf = 0;
                 } else {
@@ -1744,7 +1678,8 @@ static int nv_init_ring(struct net_device *dev)
 
         nv_init_tx(dev);
         nv_init_rx(dev);
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
+
+        if (!nv_optimized(np))
                 return nv_alloc_rx(dev);
         else
                 return nv_alloc_rx_optimized(dev);
@@ -1775,7 +1710,7 @@ static void nv_drain_tx(struct net_device *dev)
         unsigned int i;
 
         for (i = 0; i < np->tx_ring_size; i++) {
-                if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+                if (!nv_optimized(np)) {
                         np->tx_ring.orig[i].flaglen = 0;
                         np->tx_ring.orig[i].buf = 0;
                 } else {
@@ -1802,7 +1737,7 @@ static void nv_drain_rx(struct net_device *dev)
         int i;
 
         for (i = 0; i < np->rx_ring_size; i++) {
-                if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+                if (!nv_optimized(np)) {
                         np->rx_ring.orig[i].flaglen = 0;
                         np->rx_ring.orig[i].buf = 0;
                 } else {
@@ -1823,7 +1758,7 @@ static void nv_drain_rx(struct net_device *dev)
         }
 }
 
-static void drain_ring(struct net_device *dev)
+static void nv_drain_rxtx(struct net_device *dev)
 {
         nv_drain_tx(dev);
         nv_drain_rx(dev);
@@ -2260,7 +2195,7 @@ static void nv_tx_timeout(struct net_device *dev)
                 }
                 printk(KERN_INFO "%s: Dumping tx ring\n", dev->name);
                 for (i=0;i<np->tx_ring_size;i+= 4) {
-                        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+                        if (!nv_optimized(np)) {
                                 printk(KERN_INFO "%03x: %08x %08x // %08x %08x // %08x %08x // %08x %08x\n",
                                        i,
                                        le32_to_cpu(np->tx_ring.orig[i].buf),
@@ -2296,7 +2231,7 @@ static void nv_tx_timeout(struct net_device *dev)
         nv_stop_tx(dev);
 
         /* 2) check that the packets were not sent already: */
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
+        if (!nv_optimized(np))
                 nv_tx_done(dev);
         else
                 nv_tx_done_optimized(dev, np->tx_ring_size);
@@ -2663,12 +2598,10 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
                 netif_tx_lock_bh(dev);
                 spin_lock(&np->lock);
                 /* stop engines */
-                nv_stop_rx(dev);
-                nv_stop_tx(dev);
+                nv_stop_rxtx(dev);
                 nv_txrx_reset(dev);
                 /* drain rx queue */
-                nv_drain_rx(dev);
-                nv_drain_tx(dev);
+                nv_drain_rxtx(dev);
                 /* reinit driver view of the rx queue */
                 set_bufsize(dev);
                 if (nv_init_ring(dev)) {
@@ -2685,8 +2618,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
                 pci_push(base);
 
                 /* restart rx engine */
-                nv_start_rx(dev);
-                nv_start_tx(dev);
+                nv_start_rxtx(dev);
                 spin_unlock(&np->lock);
                 netif_tx_unlock_bh(dev);
                 nv_enable_irq(dev);
@@ -3393,7 +3325,7 @@ static int nv_napi_poll(struct napi_struct *napi, int budget)
         unsigned long flags;
         int pkts, retcode;
 
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+        if (!nv_optimized(np)) {
                 pkts = nv_rx_process(dev, budget);
                 retcode = nv_alloc_rx(dev);
         } else {
@@ -3634,7 +3566,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
         if (intr_test) {
                 handler = nv_nic_irq_test;
         } else {
-                if (np->desc_ver == DESC_VER_3)
+                if (nv_optimized(np))
                         handler = nv_nic_irq_optimized;
                 else
                         handler = nv_nic_irq;
@@ -3787,12 +3719,10 @@ static void nv_do_nic_poll(unsigned long data)
                         netif_tx_lock_bh(dev);
                         spin_lock(&np->lock);
                         /* stop engines */
-                        nv_stop_rx(dev);
-                        nv_stop_tx(dev);
+                        nv_stop_rxtx(dev);
                         nv_txrx_reset(dev);
                         /* drain rx queue */
-                        nv_drain_rx(dev);
-                        nv_drain_tx(dev);
+                        nv_drain_rxtx(dev);
                         /* reinit driver view of the rx queue */
                         set_bufsize(dev);
                         if (nv_init_ring(dev)) {
@@ -3809,8 +3739,7 @@ static void nv_do_nic_poll(unsigned long data)
                         pci_push(base);
 
                         /* restart rx engine */
-                        nv_start_rx(dev);
-                        nv_start_tx(dev);
+                        nv_start_rxtx(dev);
                         spin_unlock(&np->lock);
                         netif_tx_unlock_bh(dev);
                 }
@@ -3821,7 +3750,7 @@ static void nv_do_nic_poll(unsigned long data)
         pci_push(base);
 
         if (!using_multi_irqs(dev)) {
-                if (np->desc_ver == DESC_VER_3)
+                if (nv_optimized(np))
                         nv_nic_irq_optimized(0, dev);
                 else
                         nv_nic_irq(0, dev);
@@ -3860,7 +3789,8 @@ static void nv_do_stats_poll(unsigned long data)
         nv_get_hw_stats(dev);
 
         if (!np->in_shutdown)
-                mod_timer(&np->stats_poll, jiffies + STATS_INTERVAL);
+                mod_timer(&np->stats_poll,
+                        round_jiffies(jiffies + STATS_INTERVAL));
 }
 
 static void nv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
@@ -4018,8 +3948,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 netif_tx_lock_bh(dev);
                 spin_lock(&np->lock);
                 /* stop engines */
-                nv_stop_rx(dev);
-                nv_stop_tx(dev);
+                nv_stop_rxtx(dev);
                 spin_unlock(&np->lock);
                 netif_tx_unlock_bh(dev);
         }
@@ -4125,8 +4054,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         }
 
         if (netif_running(dev)) {
-                nv_start_rx(dev);
-                nv_start_tx(dev);
+                nv_start_rxtx(dev);
                 nv_enable_irq(dev);
         }
 
@@ -4169,8 +4097,7 @@ static int nv_nway_reset(struct net_device *dev)
                         netif_tx_lock_bh(dev);
                         spin_lock(&np->lock);
                         /* stop engines */
-                        nv_stop_rx(dev);
-                        nv_stop_tx(dev);
+                        nv_stop_rxtx(dev);
                         spin_unlock(&np->lock);
                         netif_tx_unlock_bh(dev);
                         printk(KERN_INFO "%s: link down.\n", dev->name);
@@ -4190,8 +4117,7 @@ static int nv_nway_reset(struct net_device *dev)
                 }
 
                 if (netif_running(dev)) {
-                        nv_start_rx(dev);
-                        nv_start_tx(dev);
+                        nv_start_rxtx(dev);
                         nv_enable_irq(dev);
                 }
                 ret = 0;
@@ -4248,7 +4174,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
         }
 
         /* allocate new rings */
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+        if (!nv_optimized(np)) {
                 rxtx_ring = pci_alloc_consistent(np->pci_dev,
                                             sizeof(struct ring_desc) * (ring->rx_pending + ring->tx_pending),
                                             &ring_addr);
@@ -4261,7 +4187,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
         tx_skbuff = kmalloc(sizeof(struct nv_skb_map) * ring->tx_pending, GFP_KERNEL);
         if (!rxtx_ring || !rx_skbuff || !tx_skbuff) {
                 /* fall back to old rings */
-                if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+                if (!nv_optimized(np)) {
                         if (rxtx_ring)
                                 pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (ring->rx_pending + ring->tx_pending),
                                                     rxtx_ring, ring_addr);
@@ -4282,12 +4208,10 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
                 netif_tx_lock_bh(dev);
                 spin_lock(&np->lock);
                 /* stop engines */
-                nv_stop_rx(dev);
-                nv_stop_tx(dev);
+                nv_stop_rxtx(dev);
                 nv_txrx_reset(dev);
                 /* drain queues */
-                nv_drain_rx(dev);
-                nv_drain_tx(dev);
+                nv_drain_rxtx(dev);
                 /* delete queues */
                 free_rings(dev);
         }
@@ -4295,7 +4219,8 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
         /* set new values */
         np->rx_ring_size = ring->rx_pending;
         np->tx_ring_size = ring->tx_pending;
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+
+        if (!nv_optimized(np)) {
                 np->rx_ring.orig = (struct ring_desc*)rxtx_ring;
                 np->tx_ring.orig = &np->rx_ring.orig[np->rx_ring_size];
         } else {
@@ -4327,8 +4252,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
                 pci_push(base);
 
                 /* restart engines */
-                nv_start_rx(dev);
-                nv_start_tx(dev);
+                nv_start_rxtx(dev);
                 spin_unlock(&np->lock);
                 netif_tx_unlock_bh(dev);
                 nv_enable_irq(dev);
@@ -4369,8 +4293,7 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*
                 netif_tx_lock_bh(dev);
                 spin_lock(&np->lock);
                 /* stop engines */
-                nv_stop_rx(dev);
-                nv_stop_tx(dev);
+                nv_stop_rxtx(dev);
                 spin_unlock(&np->lock);
                 netif_tx_unlock_bh(dev);
         }
@@ -4411,8 +4334,7 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*
         }
 
         if (netif_running(dev)) {
-                nv_start_rx(dev);
-                nv_start_tx(dev);
+                nv_start_rxtx(dev);
                 nv_enable_irq(dev);
         }
         return 0;
@@ -4648,8 +4570,7 @@ static int nv_loopback_test(struct net_device *dev)
         pci_push(base);
 
         /* restart rx engine */
-        nv_start_rx(dev);
-        nv_start_tx(dev);
+        nv_start_rxtx(dev);
 
         /* setup packet for tx */
         pkt_len = ETH_DATA_LEN;
@@ -4667,7 +4588,7 @@ static int nv_loopback_test(struct net_device *dev)
         for (i = 0; i < pkt_len; i++)
                 pkt_data[i] = (u8)(i & 0xff);
 
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+        if (!nv_optimized(np)) {
                 np->tx_ring.orig[0].buf = cpu_to_le32(test_dma_addr);
                 np->tx_ring.orig[0].flaglen = cpu_to_le32((pkt_len-1) | np->tx_flags | tx_flags_extra);
         } else {
@@ -4681,7 +4602,7 @@ static int nv_loopback_test(struct net_device *dev)
         msleep(500);
 
         /* check for rx of the packet */
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+        if (!nv_optimized(np)) {
                 flags = le32_to_cpu(np->rx_ring.orig[0].flaglen);
                 len = nv_descr_getlength(&np->rx_ring.orig[0], np->desc_ver);
 
@@ -4727,12 +4648,10 @@ static int nv_loopback_test(struct net_device *dev)
         dev_kfree_skb_any(tx_skb);
  out:
         /* stop engines */
-        nv_stop_rx(dev);
-        nv_stop_tx(dev);
+        nv_stop_rxtx(dev);
         nv_txrx_reset(dev);
         /* drain rx queue */
-        nv_drain_rx(dev);
-        nv_drain_tx(dev);
+        nv_drain_rxtx(dev);
 
         if (netif_running(dev)) {
                 writel(misc1_flags, base + NvRegMisc1);
@@ -4770,12 +4689,10 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64
                                 writel(NVREG_IRQSTAT_MASK, base + NvRegMSIXIrqStatus);
                         }
                         /* stop engines */
-                        nv_stop_rx(dev);
-                        nv_stop_tx(dev);
+                        nv_stop_rxtx(dev);
                         nv_txrx_reset(dev);
                         /* drain rx queue */
-                        nv_drain_rx(dev);
-                        nv_drain_tx(dev);
+                        nv_drain_rxtx(dev);
                         spin_unlock_irq(&np->lock);
                         netif_tx_unlock_bh(dev);
                 }
@@ -4816,8 +4733,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64
                         writel(NVREG_TXRXCTL_KICK|np->txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);
                         pci_push(base);
                         /* restart rx engine */
-                        nv_start_rx(dev);
-                        nv_start_tx(dev);
+                        nv_start_rxtx(dev);
                         netif_start_queue(dev);
 #ifdef CONFIG_FORCEDETH_NAPI
                         napi_enable(&np->napi);
@@ -5046,8 +4962,7 @@ static int nv_open(struct net_device *dev)
          * to init hw */
         np->linkspeed = 0;
         ret = nv_update_linkspeed(dev);
-        nv_start_rx(dev);
-        nv_start_tx(dev);
+        nv_start_rxtx(dev);
         netif_start_queue(dev);
 #ifdef CONFIG_FORCEDETH_NAPI
         napi_enable(&np->napi);
@@ -5064,13 +4979,14 @@ static int nv_open(struct net_device *dev)
 
         /* start statistics timer */
         if (np->driver_data & (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2))
-                mod_timer(&np->stats_poll, jiffies + STATS_INTERVAL);
+                mod_timer(&np->stats_poll,
+                        round_jiffies(jiffies + STATS_INTERVAL));
 
         spin_unlock_irq(&np->lock);
 
         return 0;
 out_drain:
-        drain_ring(dev);
+        nv_drain_rxtx(dev);
         return ret;
 }
 
@@ -5093,8 +5009,7 @@ static int nv_close(struct net_device *dev)
 
         netif_stop_queue(dev);
         spin_lock_irq(&np->lock);
-        nv_stop_tx(dev);
-        nv_stop_rx(dev);
+        nv_stop_rxtx(dev);
         nv_txrx_reset(dev);
 
         /* disable interrupts on the nic or we will lock up */
@@ -5107,7 +5022,7 @@ static int nv_close(struct net_device *dev)
 
         nv_free_irq(dev);
 
-        drain_ring(dev);
+        nv_drain_rxtx(dev);
 
         if (np->wolenabled) {
                 writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
@@ -5267,7 +5182,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         np->rx_ring_size = RX_RING_DEFAULT;
         np->tx_ring_size = TX_RING_DEFAULT;
 
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+        if (!nv_optimized(np)) {
                 np->rx_ring.orig = pci_alloc_consistent(pci_dev,
                                         sizeof(struct ring_desc) * (np->rx_ring_size + np->tx_ring_size),
                                         &np->ring_addr);
@@ -5289,7 +5204,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 
         dev->open = nv_open;
         dev->stop = nv_close;
-        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
+
+        if (!nv_optimized(np))
                 dev->hard_start_xmit = nv_start_xmit;
         else
                 dev->hard_start_xmit = nv_start_xmit_optimized;
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 940e2041ba38..67b4b0728fce 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1178,7 +1178,7 @@ static int __devinit find_phy(struct device_node *np,
 
         data  = of_get_property(np, "fixed-link", NULL);
         if (data) {
-                snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data);
+                snprintf(fpi->bus_id, 16, "%x:%02x", 0, *data);
                 return 0;
         }
 
@@ -1202,7 +1202,7 @@ static int __devinit find_phy(struct device_node *np,
         if (!data || len != 4)
                 goto out_put_mdio;
 
-        snprintf(fpi->bus_id, 16, PHY_ID_FMT, res.start, *data);
+        snprintf(fpi->bus_id, 16, "%x:%02x", res.start, *data);
 
 out_put_mdio:
         of_node_put(mdionode);
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index b8e4a736a130..1620030cd33c 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -130,7 +130,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
          * we get is an int, and the odds of multiple bitbang mdio buses
          * is low enough that it's not worth going too crazy.
          */
-        bus->id = res.start;
+        snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
         data = of_get_property(np, "fsl,mdio-pin", &len);
         if (!data || len != 4)
@@ -307,7 +307,7 @@ static int __devinit fs_enet_mdio_probe(struct device *dev)
                 return -ENOMEM;
 
         new_bus->name = "BB MII Bus",
-        new_bus->id = pdev->id;
+        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
 
         new_bus->phy_mask = ~0x9;
         pdata = (struct fs_mii_bb_platform_info *)pdev->dev.platform_data;
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index a89cf15090b8..ba75efc9f5b5 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -196,7 +196,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
         if (ret)
                 return ret;
 
-        new_bus->id = res.start;
+        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
         fec->fecp = ioremap(res.start, res.end - res.start + 1);
         if (!fec->fecp)
@@ -309,7 +309,7 @@ static int __devinit fs_enet_fec_mdio_probe(struct device *dev)
         new_bus->read = &fs_enet_fec_mii_read,
         new_bus->write = &fs_enet_fec_mii_write,
         new_bus->reset = &fs_enet_fec_mii_reset,
-        new_bus->id = pdev->id;
+        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
 
         pdata = (struct fs_mii_fec_platform_info *)pdev->dev.platform_data;
 
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 718cf77e345a..c8c3df737d73 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1185,7 +1185,7 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
         int frame_size = new_mtu + ETH_HLEN;
 
         if (priv->vlan_enable)
-                frame_size += VLAN_ETH_HLEN;
+                frame_size += VLAN_HLEN;
 
         if (gfar_uses_fcb(priv))
                 frame_size += GMAC_FCB_LEN;
@@ -1250,17 +1250,12 @@ static void gfar_timeout(struct net_device *dev)
 }
 
 /* Interrupt Handler for Transmit complete */
-static irqreturn_t gfar_transmit(int irq, void *dev_id)
+int gfar_clean_tx_ring(struct net_device *dev)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct gfar_private *priv = netdev_priv(dev);
         struct txbd8 *bdp;
+        struct gfar_private *priv = netdev_priv(dev);
+        int howmany = 0;
 
-        /* Clear IEVENT */
-        gfar_write(&priv->regs->ievent, IEVENT_TX_MASK);
-
-        /* Lock priv */
-        spin_lock(&priv->txlock);
         bdp = priv->dirty_tx;
         while ((bdp->status & TXBD_READY) == 0) {
                 /* If dirty_tx and cur_tx are the same, then either the */
@@ -1269,7 +1264,7 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id)
                 if ((bdp == priv->cur_tx) && (netif_queue_stopped(dev) == 0))
                         break;
 
-                dev->stats.tx_packets++;
+                howmany++;
 
                 /* Deferred means some collisions occurred during transmit, */
                 /* but we eventually sent the packet. */
@@ -1278,11 +1273,15 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id)
 
                 /* Free the sk buffer associated with this TxBD */
                 dev_kfree_skb_irq(priv->tx_skbuff[priv->skb_dirtytx]);
+
                 priv->tx_skbuff[priv->skb_dirtytx] = NULL;
                 priv->skb_dirtytx =
                     (priv->skb_dirtytx +
                      1) & TX_RING_MOD_MASK(priv->tx_ring_size);
 
+                /* Clean BD length for empty detection */
+                bdp->length = 0;
+
                 /* update bdp to point at next bd in the ring (wrapping if necessary) */
                 if (bdp->status & TXBD_WRAP)
                         bdp = priv->tx_bd_base;
@@ -1297,13 +1296,32 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id)
                         netif_wake_queue(dev);
         } /* while ((bdp->status & TXBD_READY) == 0) */
 
+        dev->stats.tx_packets += howmany;
+
+        return howmany;
+}
+
+/* Interrupt Handler for Transmit complete */
+static irqreturn_t gfar_transmit(int irq, void *dev_id)
+{
+        struct net_device *dev = (struct net_device *) dev_id;
+        struct gfar_private *priv = netdev_priv(dev);
+
+        /* Clear IEVENT */
+        gfar_write(&priv->regs->ievent, IEVENT_TX_MASK);
+
+        /* Lock priv */
+        spin_lock(&priv->txlock);
+
+        gfar_clean_tx_ring(dev);
+
         /* If we are coalescing the interrupts, reset the timer */
         /* Otherwise, clear it */
-        if (priv->txcoalescing)
+        if (likely(priv->txcoalescing)) {
+                gfar_write(&priv->regs->txic, 0);
                 gfar_write(&priv->regs->txic,
                            mk_ic_value(priv->txcount, priv->txtime));
-        else
-                gfar_write(&priv->regs->txic, 0);
+        }
 
         spin_unlock(&priv->txlock);
 
@@ -1392,15 +1410,15 @@ irqreturn_t gfar_receive(int irq, void *dev_id)
         unsigned long flags;
 #endif
 
-        /* Clear IEVENT, so rx interrupt isn't called again
-         * because of this interrupt */
-        gfar_write(&priv->regs->ievent, IEVENT_RX_MASK);
-
         /* support NAPI */
 #ifdef CONFIG_GFAR_NAPI
+        /* Clear IEVENT, so interrupts aren't called again
+         * because of the packets that have already arrived */
+        gfar_write(&priv->regs->ievent, IEVENT_RTX_MASK);
+
         if (netif_rx_schedule_prep(dev, &priv->napi)) {
                 tempval = gfar_read(&priv->regs->imask);
-                tempval &= IMASK_RX_DISABLED;
+                tempval &= IMASK_RTX_DISABLED;
                 gfar_write(&priv->regs->imask, tempval);
 
                 __netif_rx_schedule(dev, &priv->napi);
@@ -1411,17 +1429,20 @@ irqreturn_t gfar_receive(int irq, void *dev_id)
                                 gfar_read(&priv->regs->imask));
         }
 #else
+        /* Clear IEVENT, so rx interrupt isn't called again
+         * because of this interrupt */
+        gfar_write(&priv->regs->ievent, IEVENT_RX_MASK);
 
         spin_lock_irqsave(&priv->rxlock, flags);
         gfar_clean_rx_ring(dev, priv->rx_ring_size);
 
         /* If we are coalescing interrupts, update the timer */
         /* Otherwise, clear it */
-        if (priv->rxcoalescing)
+        if (likely(priv->rxcoalescing)) {
+                gfar_write(&priv->regs->rxic, 0);
                 gfar_write(&priv->regs->rxic,
                            mk_ic_value(priv->rxcount, priv->rxtime));
-        else
-                gfar_write(&priv->regs->rxic, 0);
+        }
 
         spin_unlock_irqrestore(&priv->rxlock, flags);
 #endif
@@ -1526,9 +1547,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
                 rmb();
                 skb = priv->rx_skbuff[priv->skb_currx];
 
-                if (!(bdp->status &
-                      (RXBD_LARGE | RXBD_SHORT | RXBD_NONOCTET
-                       | RXBD_CRCERR | RXBD_OVERRUN | RXBD_TRUNCATED))) {
+                if ((bdp->status & RXBD_LAST) && !(bdp->status & RXBD_ERR)) {
                         /* Increment the number of packets */
                         dev->stats.rx_packets++;
                         howmany++;
@@ -1582,6 +1601,13 @@ static int gfar_poll(struct napi_struct *napi, int budget)
         struct gfar_private *priv = container_of(napi, struct gfar_private, napi);
         struct net_device *dev = priv->dev;
         int howmany;
+        unsigned long flags;
+
+        /* If we fail to get the lock, don't bother with the TX BDs */
+        if (spin_trylock_irqsave(&priv->txlock, flags)) {
+                gfar_clean_tx_ring(dev);
+                spin_unlock_irqrestore(&priv->txlock, flags);
+        }
 
         howmany = gfar_clean_rx_ring(dev, budget);
 
@@ -1595,11 +1621,11 @@ static int gfar_poll(struct napi_struct *napi, int budget)
 
                 /* If we are coalescing interrupts, update the timer */
                 /* Otherwise, clear it */
-                if (priv->rxcoalescing)
+                if (likely(priv->rxcoalescing)) {
+                        gfar_write(&priv->regs->rxic, 0);
                         gfar_write(&priv->regs->rxic,
                                    mk_ic_value(priv->rxcount, priv->rxtime));
-                else
-                        gfar_write(&priv->regs->rxic, 0);
+                }
         }
 
         return howmany;
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 46cd7735e6fe..0d0883609469 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -102,7 +102,7 @@ extern const char gfar_driver_version[];
 #define DEFAULT_FIFO_TX_STARVE 0x40
 #define DEFAULT_FIFO_TX_STARVE_OFF 0x80
 #define DEFAULT_BD_STASH 1
-#define DEFAULT_STASH_LENGTH    64
+#define DEFAULT_STASH_LENGTH    96
 #define DEFAULT_STASH_INDEX     0
 
 /* The number of Exact Match registers */
@@ -124,11 +124,18 @@ extern const char gfar_driver_version[];
 
 #define DEFAULT_TX_COALESCE 1
 #define DEFAULT_TXCOUNT 16
-#define DEFAULT_TXTIME  4
+#define DEFAULT_TXTIME  21
 
+#define DEFAULT_RXTIME  21
+
+/* Non NAPI Case */
+#ifndef CONFIG_GFAR_NAPI
 #define DEFAULT_RX_COALESCE 1
 #define DEFAULT_RXCOUNT 16
-#define DEFAULT_RXTIME  4
+#else
+#define DEFAULT_RX_COALESCE 0
+#define DEFAULT_RXCOUNT 0
+#endif /* CONFIG_GFAR_NAPI */
 
 #define TBIPA_VALUE             0x1f
 #define MIIMCFG_INIT_VALUE      0x00000007
@@ -242,6 +249,7 @@ extern const char gfar_driver_version[];
 #define IEVENT_PERR             0x00000001
 #define IEVENT_RX_MASK          (IEVENT_RXB0 | IEVENT_RXF0)
 #define IEVENT_TX_MASK          (IEVENT_TXB | IEVENT_TXF)
+#define IEVENT_RTX_MASK         (IEVENT_RX_MASK | IEVENT_TX_MASK)
 #define IEVENT_ERR_MASK         \
 (IEVENT_RXC | IEVENT_BSY | IEVENT_EBERR | IEVENT_MSRO | \
  IEVENT_BABT | IEVENT_TXC | IEVENT_TXE | IEVENT_LC \
@@ -269,11 +277,12 @@ extern const char gfar_driver_version[];
 #define IMASK_FIQ               0x00000004
 #define IMASK_DPE               0x00000002
 #define IMASK_PERR              0x00000001
-#define IMASK_RX_DISABLED ~(IMASK_RXFEN0 | IMASK_BSY)
 #define IMASK_DEFAULT  (IMASK_TXEEN | IMASK_TXFEN | IMASK_TXBEN | \
                 IMASK_RXFEN0 | IMASK_BSY | IMASK_EBERR | IMASK_BABR | \
                 IMASK_XFUN | IMASK_RXC | IMASK_BABT | IMASK_DPE \
                 | IMASK_PERR)
+#define IMASK_RTX_DISABLED ((~(IMASK_RXFEN0 | IMASK_TXFEN | IMASK_BSY)) \
+                           & IMASK_DEFAULT)
 
 /* Fifo management */
 #define FIFO_TX_THR_MASK        0x01ff
@@ -340,6 +349,9 @@ extern const char gfar_driver_version[];
 #define RXBD_OVERRUN            0x0002
 #define RXBD_TRUNCATED          0x0001
 #define RXBD_STATS              0x01ff
+#define RXBD_ERR                (RXBD_LARGE | RXBD_SHORT | RXBD_NONOCTET        \
+                                | RXBD_CRCERR | RXBD_OVERRUN                    \
+                                | RXBD_TRUNCATED)
 
 /* Rx FCB status field bits */
 #define RXFCB_VLN               0x8000
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index 24327629bf03..b8898927236a 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -173,7 +173,7 @@ int gfar_mdio_probe(struct device *dev)
         new_bus->read = &gfar_mdio_read,
         new_bus->write = &gfar_mdio_write,
         new_bus->reset = &gfar_mdio_reset,
-        new_bus->id = pdev->id;
+        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
 
         pdata = (struct gianfar_mdio_data *)pdev->dev.platform_data;
 
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 5ddf8b0c34f9..5f4b4c6c9f76 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -172,7 +172,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
         struct ethhdr *eth;
         struct bpqdev *bpq;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto drop;
 
         if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
@@ -553,7 +553,7 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
 {
         struct net_device *dev = (struct net_device *)ptr;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         if (!dev_is_ethdev(dev))
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 57772bebff56..bb31e09899fc 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1259,26 +1259,7 @@ static void ibmveth_proc_unregister_driver(void)
         remove_proc_entry(IBMVETH_PROC_DIR, init_net.proc_net);
 }
 
-static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos)
-{
-        if (*pos == 0) {
-                return (void *)1;
-        } else {
-                return NULL;
-        }
-}
-
-static void *ibmveth_seq_next(struct seq_file *seq, void *v, loff_t *pos)
-{
-        ++*pos;
-        return NULL;
-}
-
-static void ibmveth_seq_stop(struct seq_file *seq, void *v)
-{
-}
-
-static int ibmveth_seq_show(struct seq_file *seq, void *v)
+static int ibmveth_show(struct seq_file *seq, void *v)
 {
         struct ibmveth_adapter *adapter = seq->private;
         char *current_mac = ((char*) &adapter->netdev->dev_addr);
@@ -1302,27 +1283,10 @@ static int ibmveth_seq_show(struct seq_file *seq, void *v)
 
         return 0;
 }
-static struct seq_operations ibmveth_seq_ops = {
-        .start = ibmveth_seq_start,
-        .next  = ibmveth_seq_next,
-        .stop  = ibmveth_seq_stop,
-        .show  = ibmveth_seq_show,
-};
 
 static int ibmveth_proc_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        struct proc_dir_entry *proc;
-        int rc;
-
-        rc = seq_open(file, &ibmveth_seq_ops);
-        if (!rc) {
-                /* recover the pointer buried in proc_dir_entry data */
-                seq = file->private_data;
-                proc = PDE(inode);
-                seq->private = proc->data;
-        }
-        return rc;
+        return single_open(file, ibmveth_show, PDE(inode)->data);
 }
 
 static const struct file_operations ibmveth_proc_fops = {
@@ -1330,7 +1294,7 @@ static const struct file_operations ibmveth_proc_fops = {
         .open    = ibmveth_proc_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
-        .release = seq_release,
+        .release = single_release,
 };
 
 static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index 3d2e7217e9af..16f9c756aa46 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -117,8 +117,8 @@ struct ixgb_buffer {
         struct sk_buff *skb;
         dma_addr_t dma;
         unsigned long time_stamp;
-        uint16_t length;
-        uint16_t next_to_watch;
+        u16 length;
+        u16 next_to_watch;
 };
 
 struct ixgb_desc_ring {
@@ -152,13 +152,12 @@ struct ixgb_desc_ring {
 struct ixgb_adapter {
         struct timer_list watchdog_timer;
         struct vlan_group *vlgrp;
-        uint32_t bd_number;
-        uint32_t rx_buffer_len;
-        uint32_t part_num;
-        uint16_t link_speed;
-        uint16_t link_duplex;
+        u32 bd_number;
+        u32 rx_buffer_len;
+        u32 part_num;
+        u16 link_speed;
+        u16 link_duplex;
         spinlock_t tx_lock;
-        atomic_t irq_sem;
         struct work_struct tx_timeout_task;
 
         struct timer_list blink_timer;
@@ -168,20 +167,20 @@ struct ixgb_adapter {
         struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp;
         unsigned int restart_queue;
         unsigned long timeo_start;
-        uint32_t tx_cmd_type;
-        uint64_t hw_csum_tx_good;
-        uint64_t hw_csum_tx_error;
-        uint32_t tx_int_delay;
-        uint32_t tx_timeout_count;
-        boolean_t tx_int_delay_enable;
-        boolean_t detect_tx_hung;
+        u32 tx_cmd_type;
+        u64 hw_csum_tx_good;
+        u64 hw_csum_tx_error;
+        u32 tx_int_delay;
+        u32 tx_timeout_count;
+        bool tx_int_delay_enable;
+        bool detect_tx_hung;
 
         /* RX */
         struct ixgb_desc_ring rx_ring;
-        uint64_t hw_csum_rx_error;
-        uint64_t hw_csum_rx_good;
-        uint32_t rx_int_delay;
-        boolean_t rx_csum;
+        u64 hw_csum_rx_error;
+        u64 hw_csum_rx_good;
+        u32 rx_int_delay;
+        bool rx_csum;
 
         /* OS defined structs */
         struct napi_struct napi;
@@ -193,8 +192,17 @@ struct ixgb_adapter {
         struct ixgb_hw hw;
         u16 msg_enable;
         struct ixgb_hw_stats stats;
-        uint32_t alloc_rx_buff_failed;
-        boolean_t have_msi;
+        u32 alloc_rx_buff_failed;
+        bool have_msi;
+        unsigned long flags;
+};
+
+enum ixgb_state_t {
+        /* TBD
+        __IXGB_TESTING,
+        __IXGB_RESETTING,
+        */
+        __IXGB_DOWN
 };
 
 /* Exported from other modules */
@@ -203,4 +211,14 @@ extern void ixgb_set_ethtool_ops(struct net_device *netdev);
 extern char ixgb_driver_name[];
 extern const char ixgb_driver_version[];
 
+extern int ixgb_up(struct ixgb_adapter *adapter);
+extern void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);
+extern void ixgb_reset(struct ixgb_adapter *adapter);
+extern int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
+extern int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
+extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);
+extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);
+extern void ixgb_update_stats(struct ixgb_adapter *adapter);
+
+
 #endif /* _IXGB_H_ */
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index e8eb0fd6c576..2f7ed52c7502 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -29,14 +29,14 @@
 #include "ixgb_hw.h"
 #include "ixgb_ee.h"
 /* Local prototypes */
-static uint16_t ixgb_shift_in_bits(struct ixgb_hw *hw);
+static u16 ixgb_shift_in_bits(struct ixgb_hw *hw);
 
 static void ixgb_shift_out_bits(struct ixgb_hw *hw,
-                                uint16_t data,
-                                uint16_t count);
+                                u16 data,
+                                u16 count);
 static void ixgb_standby_eeprom(struct ixgb_hw *hw);
 
-static boolean_t ixgb_wait_eeprom_command(struct ixgb_hw *hw);
+static bool ixgb_wait_eeprom_command(struct ixgb_hw *hw);
 
 static void ixgb_cleanup_eeprom(struct ixgb_hw *hw);
 
@@ -48,7 +48,7 @@ static void ixgb_cleanup_eeprom(struct ixgb_hw *hw);
  *****************************************************************************/
 static void
 ixgb_raise_clock(struct ixgb_hw *hw,
-                  uint32_t *eecd_reg)
+                  u32 *eecd_reg)
 {
         /* Raise the clock input to the EEPROM (by setting the SK bit), and then
          *  wait 50 microseconds.
@@ -67,7 +67,7 @@ ixgb_raise_clock(struct ixgb_hw *hw,
  *****************************************************************************/
 static void
 ixgb_lower_clock(struct ixgb_hw *hw,
-                  uint32_t *eecd_reg)
+                  u32 *eecd_reg)
 {
         /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
          * wait 50 microseconds.
@@ -87,11 +87,11 @@ ixgb_lower_clock(struct ixgb_hw *hw,
  *****************************************************************************/
 static void
 ixgb_shift_out_bits(struct ixgb_hw *hw,
-                                         uint16_t data,
-                                         uint16_t count)
+                                         u16 data,
+                                         u16 count)
 {
-        uint32_t eecd_reg;
-        uint32_t mask;
+        u32 eecd_reg;
+        u32 mask;
 
         /* We need to shift "count" bits out to the EEPROM. So, value in the
          * "data" parameter will be shifted out to the EEPROM one bit at a time.
@@ -133,12 +133,12 @@ ixgb_shift_out_bits(struct ixgb_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static uint16_t
+static u16
 ixgb_shift_in_bits(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
-        uint32_t i;
-        uint16_t data;
+        u32 eecd_reg;
+        u32 i;
+        u16 data;
 
         /* In order to read a register from the EEPROM, we need to shift 16 bits
          * in from the EEPROM. Bits are "shifted in" by raising the clock input to
@@ -179,7 +179,7 @@ ixgb_shift_in_bits(struct ixgb_hw *hw)
 static void
 ixgb_setup_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -201,7 +201,7 @@ ixgb_setup_eeprom(struct ixgb_hw *hw)
 static void
 ixgb_standby_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -235,7 +235,7 @@ ixgb_standby_eeprom(struct ixgb_hw *hw)
 static void
 ixgb_clock_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -259,7 +259,7 @@ ixgb_clock_eeprom(struct ixgb_hw *hw)
 static void
 ixgb_cleanup_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -279,14 +279,14 @@ ixgb_cleanup_eeprom(struct ixgb_hw *hw)
  * The command is done when the EEPROM's data out pin goes high.
  *
  * Returns:
- *      TRUE: EEPROM data pin is high before timeout.
- *      FALSE:  Time expired.
+ *      true: EEPROM data pin is high before timeout.
+ *      false:  Time expired.
  *****************************************************************************/
-static boolean_t
+static bool
 ixgb_wait_eeprom_command(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
-        uint32_t i;
+        u32 eecd_reg;
+        u32 i;
 
         /* Toggle the CS line.  This in effect tells to EEPROM to actually execute
          * the command in question.
@@ -301,12 +301,12 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw)
                 eecd_reg = IXGB_READ_REG(hw, EECD);
 
                 if(eecd_reg & IXGB_EECD_DO)
-                        return (TRUE);
+                        return (true);
 
                 udelay(50);
         }
         ASSERT(0);
-        return (FALSE);
+        return (false);
 }
 
 /******************************************************************************
@@ -319,22 +319,22 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw)
  * valid.
  *
  * Returns:
- *  TRUE: Checksum is valid
- *  FALSE: Checksum is not valid.
+ *  true: Checksum is valid
+ *  false: Checksum is not valid.
  *****************************************************************************/
-boolean_t
+bool
 ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
 {
-        uint16_t checksum = 0;
-        uint16_t i;
+        u16 checksum = 0;
+        u16 i;
 
         for(i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++)
                 checksum += ixgb_read_eeprom(hw, i);
 
-        if(checksum == (uint16_t) EEPROM_SUM)
-                return (TRUE);
+        if(checksum == (u16) EEPROM_SUM)
+                return (true);
         else
-                return (FALSE);
+                return (false);
 }
 
 /******************************************************************************
@@ -348,13 +348,13 @@ ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
 void
 ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
 {
-        uint16_t checksum = 0;
-        uint16_t i;
+        u16 checksum = 0;
+        u16 i;
 
         for(i = 0; i < EEPROM_CHECKSUM_REG; i++)
                 checksum += ixgb_read_eeprom(hw, i);
 
-        checksum = (uint16_t) EEPROM_SUM - checksum;
+        checksum = (u16) EEPROM_SUM - checksum;
 
         ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum);
         return;
@@ -372,7 +372,7 @@ ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
  *
  *****************************************************************************/
 void
-ixgb_write_eeprom(struct ixgb_hw *hw, uint16_t offset, uint16_t data)
+ixgb_write_eeprom(struct ixgb_hw *hw, u16 offset, u16 data)
 {
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
@@ -425,11 +425,11 @@ ixgb_write_eeprom(struct ixgb_hw *hw, uint16_t offset, uint16_t data)
  * Returns:
  *  The 16-bit value read from the eeprom
  *****************************************************************************/
-uint16_t
+u16
 ixgb_read_eeprom(struct ixgb_hw *hw,
-                  uint16_t offset)
+                  u16 offset)
 {
-        uint16_t data;
+        u16 data;
 
         /*  Prepare the EEPROM for reading  */
         ixgb_setup_eeprom(hw);
@@ -457,14 +457,14 @@ ixgb_read_eeprom(struct ixgb_hw *hw,
  * hw - Struct containing variables accessed by shared code
  *
  * Returns:
- *      TRUE: if eeprom read is successful
- *      FALSE: otherwise.
+ *      true: if eeprom read is successful
+ *      false: otherwise.
  *****************************************************************************/
-boolean_t
+bool
 ixgb_get_eeprom_data(struct ixgb_hw *hw)
 {
-        uint16_t i;
-        uint16_t checksum = 0;
+        u16 i;
+        u16 checksum = 0;
         struct ixgb_ee_map_type *ee_map;
 
         DEBUGFUNC("ixgb_get_eeprom_data");
@@ -473,27 +473,27 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw)
 
         DEBUGOUT("ixgb_ee: Reading eeprom data\n");
         for(i = 0; i < IXGB_EEPROM_SIZE ; i++) {
-                uint16_t ee_data;
+                u16 ee_data;
                 ee_data = ixgb_read_eeprom(hw, i);
                 checksum += ee_data;
                 hw->eeprom[i] = cpu_to_le16(ee_data);
         }
 
-        if (checksum != (uint16_t) EEPROM_SUM) {
+        if (checksum != (u16) EEPROM_SUM) {
                 DEBUGOUT("ixgb_ee: Checksum invalid.\n");
                 /* clear the init_ctrl_reg_1 to signify that the cache is
                  * invalidated */
                 ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
-                return (FALSE);
+                return (false);
         }
 
         if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
                  != cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
                 DEBUGOUT("ixgb_ee: Signature invalid.\n");
-                return(FALSE);
+                return(false);
         }
 
-        return(TRUE);
+        return(true);
 }
 
 /******************************************************************************
@@ -503,17 +503,17 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw)
  * hw - Struct containing variables accessed by shared code
  *
  * Returns:
- *      TRUE: eeprom signature was good and the eeprom read was successful
- *      FALSE: otherwise.
+ *      true: eeprom signature was good and the eeprom read was successful
+ *      false: otherwise.
  ******************************************************************************/
-static boolean_t
+static bool
 ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw)
 {
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
         if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
             == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
-                return (TRUE);
+                return (true);
         } else {
                 return ixgb_get_eeprom_data(hw);
         }
@@ -529,11 +529,11 @@ ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw)
  *          Word at indexed offset in eeprom, if valid, 0 otherwise.
  ******************************************************************************/
 __le16
-ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index)
+ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index)
 {
 
         if ((index < IXGB_EEPROM_SIZE) &&
-                (ixgb_check_and_get_eeprom_data(hw) == TRUE)) {
+                (ixgb_check_and_get_eeprom_data(hw) == true)) {
            return(hw->eeprom[index]);
         }
 
@@ -550,14 +550,14 @@ ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index)
  ******************************************************************************/
 void
 ixgb_get_ee_mac_addr(struct ixgb_hw *hw,
-                        uint8_t *mac_addr)
+                        u8 *mac_addr)
 {
         int i;
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
         DEBUGFUNC("ixgb_get_ee_mac_addr");
 
-        if (ixgb_check_and_get_eeprom_data(hw) == TRUE) {
+        if (ixgb_check_and_get_eeprom_data(hw) == true) {
                 for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) {
                         mac_addr[i] = ee_map->mac_addr[i];
                         DEBUGOUT2("mac(%d) = %.2X\n", i, mac_addr[i]);
@@ -574,10 +574,10 @@ ixgb_get_ee_mac_addr(struct ixgb_hw *hw,
  * Returns:
  *          PBA number if EEPROM contents are valid, 0 otherwise
  ******************************************************************************/
-uint32_t
+u32
 ixgb_get_ee_pba_number(struct ixgb_hw *hw)
 {
-        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
+        if (ixgb_check_and_get_eeprom_data(hw) == true)
                 return (le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG])
                         | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16));
 
@@ -593,12 +593,12 @@ ixgb_get_ee_pba_number(struct ixgb_hw *hw)
  * Returns:
  *          Device Id if EEPROM contents are valid, 0 otherwise
  ******************************************************************************/
-uint16_t
+u16
 ixgb_get_ee_device_id(struct ixgb_hw *hw)
 {
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
-        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
+        if (ixgb_check_and_get_eeprom_data(hw) == true)
                 return (le16_to_cpu(ee_map->device_id));
 
         return (0);
diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ixgb/ixgb_ee.h
index 7908bf3005ed..4b7bd0d4a8a9 100644
--- a/drivers/net/ixgb/ixgb_ee.h
+++ b/drivers/net/ixgb/ixgb_ee.h
@@ -75,7 +75,7 @@
 
 /* EEPROM structure */
 struct ixgb_ee_map_type {
-        uint8_t mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];
+        u8 mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];
         __le16 compatibility;
         __le16 reserved1[4];
         __le32 pba_number;
@@ -88,19 +88,19 @@ struct ixgb_ee_map_type {
         __le16 oem_reserved[16];
         __le16 swdpins_reg;
         __le16 circuit_ctrl_reg;
-        uint8_t d3_power;
-        uint8_t d0_power;
+        u8 d3_power;
+        u8 d0_power;
         __le16 reserved2[28];
         __le16 checksum;
 };
 
 /* EEPROM Functions */
-uint16_t ixgb_read_eeprom(struct ixgb_hw *hw, uint16_t reg);
+u16 ixgb_read_eeprom(struct ixgb_hw *hw, u16 reg);
 
-boolean_t ixgb_validate_eeprom_checksum(struct ixgb_hw *hw);
+bool ixgb_validate_eeprom_checksum(struct ixgb_hw *hw);
 
 void ixgb_update_eeprom_checksum(struct ixgb_hw *hw);
 
-void ixgb_write_eeprom(struct ixgb_hw *hw, uint16_t reg, uint16_t data);
+void ixgb_write_eeprom(struct ixgb_hw *hw, u16 reg, u16 data);
 
 #endif                          /* IXGB_EE_H */
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 75f3a68ee354..8464d8a013b0 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -32,15 +32,6 @@
 
 #include <asm/uaccess.h>
 
-extern int ixgb_up(struct ixgb_adapter *adapter);
-extern void ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog);
-extern void ixgb_reset(struct ixgb_adapter *adapter);
-extern int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
-extern int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
-extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);
-extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);
-extern void ixgb_update_stats(struct ixgb_adapter *adapter);
-
 #define IXGB_ALL_RAR_ENTRIES 16
 
 struct ixgb_stats {
@@ -136,7 +127,7 @@ ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                 return -EINVAL;
         
         if(netif_running(adapter->netdev)) {
-                ixgb_down(adapter, TRUE);
+                ixgb_down(adapter, true);
                 ixgb_reset(adapter);
                 ixgb_up(adapter);
                 ixgb_set_speed_duplex(netdev);
@@ -185,7 +176,7 @@ ixgb_set_pauseparam(struct net_device *netdev,
                 hw->fc.type = ixgb_fc_none;
 
         if(netif_running(adapter->netdev)) {
-                ixgb_down(adapter, TRUE);
+                ixgb_down(adapter, true);
                 ixgb_up(adapter);
                 ixgb_set_speed_duplex(netdev);
         } else
@@ -194,7 +185,7 @@ ixgb_set_pauseparam(struct net_device *netdev,
         return 0;
 }
 
-static uint32_t
+static u32
 ixgb_get_rx_csum(struct net_device *netdev)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
@@ -203,14 +194,14 @@ ixgb_get_rx_csum(struct net_device *netdev)
 }
 
 static int
-ixgb_set_rx_csum(struct net_device *netdev, uint32_t data)
+ixgb_set_rx_csum(struct net_device *netdev, u32 data)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
         adapter->rx_csum = data;
 
         if(netif_running(netdev)) {
-                ixgb_down(adapter,TRUE);
+                ixgb_down(adapter, true);
                 ixgb_up(adapter);
                 ixgb_set_speed_duplex(netdev);
         } else
@@ -218,14 +209,14 @@ ixgb_set_rx_csum(struct net_device *netdev, uint32_t data)
         return 0;
 }
         
-static uint32_t
+static u32
 ixgb_get_tx_csum(struct net_device *netdev)
 {
         return (netdev->features & NETIF_F_HW_CSUM) != 0;
 }
 
 static int
-ixgb_set_tx_csum(struct net_device *netdev, uint32_t data)
+ixgb_set_tx_csum(struct net_device *netdev, u32 data)
 {
         if (data)
                 netdev->features |= NETIF_F_HW_CSUM;
@@ -236,7 +227,7 @@ ixgb_set_tx_csum(struct net_device *netdev, uint32_t data)
 }
 
 static int
-ixgb_set_tso(struct net_device *netdev, uint32_t data)
+ixgb_set_tso(struct net_device *netdev, u32 data)
 {
         if(data)
                 netdev->features |= NETIF_F_TSO;
@@ -245,7 +236,7 @@ ixgb_set_tso(struct net_device *netdev, uint32_t data)
         return 0;
 } 
 
-static uint32_t
+static u32
 ixgb_get_msglevel(struct net_device *netdev)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
@@ -253,7 +244,7 @@ ixgb_get_msglevel(struct net_device *netdev)
 }
 
 static void
-ixgb_set_msglevel(struct net_device *netdev, uint32_t data)
+ixgb_set_msglevel(struct net_device *netdev, u32 data)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         adapter->msg_enable = data;
@@ -263,7 +254,7 @@ ixgb_set_msglevel(struct net_device *netdev, uint32_t data)
 static int 
 ixgb_get_regs_len(struct net_device *netdev)
 {
-#define IXGB_REG_DUMP_LEN  136*sizeof(uint32_t)
+#define IXGB_REG_DUMP_LEN  136*sizeof(u32)
         return IXGB_REG_DUMP_LEN;
 }
 
@@ -273,9 +264,9 @@ ixgb_get_regs(struct net_device *netdev,
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         struct ixgb_hw *hw = &adapter->hw;
-        uint32_t *reg = p;
-        uint32_t *reg_start = reg;
-        uint8_t i;
+        u32 *reg = p;
+        u32 *reg_start = reg;
+        u8 i;
 
         /* the 1 (one) below indicates an attempt at versioning, if the
          * interface in ethtool or the driver changes, this 1 should be
@@ -404,7 +395,7 @@ ixgb_get_regs(struct net_device *netdev,
         *reg++ = IXGB_GET_STAT(adapter, xofftxc);       /* 134 */
         *reg++ = IXGB_GET_STAT(adapter, rjc);   /* 135 */
 
-        regs->len = (reg - reg_start) * sizeof(uint32_t);
+        regs->len = (reg - reg_start) * sizeof(u32);
 }
 
 static int
@@ -416,7 +407,7 @@ ixgb_get_eeprom_len(struct net_device *netdev)
 
 static int
 ixgb_get_eeprom(struct net_device *netdev,
-                  struct ethtool_eeprom *eeprom, uint8_t *bytes)
+                  struct ethtool_eeprom *eeprom, u8 *bytes)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         struct ixgb_hw *hw = &adapter->hw;
@@ -454,7 +445,7 @@ ixgb_get_eeprom(struct net_device *netdev,
                 eeprom_buff[i] = ixgb_get_eeprom_word(hw, (first_word + i));
         }
 
-        memcpy(bytes, (uint8_t *)eeprom_buff + (eeprom->offset & 1),
+        memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
                         eeprom->len);
         kfree(eeprom_buff);
 
@@ -464,14 +455,14 @@ geeprom_error:
 
 static int
 ixgb_set_eeprom(struct net_device *netdev,
-                  struct ethtool_eeprom *eeprom, uint8_t *bytes)
+                  struct ethtool_eeprom *eeprom, u8 *bytes)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         struct ixgb_hw *hw = &adapter->hw;
-        uint16_t *eeprom_buff;
+        u16 *eeprom_buff;
         void *ptr;
         int max_len, first_word, last_word;
-        uint16_t i;
+        u16 i;
 
         if(eeprom->len == 0)
                 return -EINVAL;
@@ -570,14 +561,14 @@ ixgb_set_ringparam(struct net_device *netdev,
                 return -EINVAL;
 
         if(netif_running(adapter->netdev))
-                ixgb_down(adapter,TRUE);
+                ixgb_down(adapter, true);
 
-        rxdr->count = max(ring->rx_pending,(uint32_t)MIN_RXD);
-        rxdr->count = min(rxdr->count,(uint32_t)MAX_RXD);
+        rxdr->count = max(ring->rx_pending,(u32)MIN_RXD);
+        rxdr->count = min(rxdr->count,(u32)MAX_RXD);
         rxdr->count = ALIGN(rxdr->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
 
-        txdr->count = max(ring->tx_pending,(uint32_t)MIN_TXD);
-        txdr->count = min(txdr->count,(uint32_t)MAX_TXD);
+        txdr->count = max(ring->tx_pending,(u32)MIN_TXD);
+        txdr->count = min(txdr->count,(u32)MAX_TXD);
         txdr->count = ALIGN(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
 
         if(netif_running(adapter->netdev)) {
@@ -633,7 +624,7 @@ ixgb_led_blink_callback(unsigned long data)
 }
 
 static int
-ixgb_phys_id(struct net_device *netdev, uint32_t data)
+ixgb_phys_id(struct net_device *netdev, u32 data)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
@@ -669,7 +660,7 @@ ixgb_get_sset_count(struct net_device *netdev, int sset)
 
 static void 
 ixgb_get_ethtool_stats(struct net_device *netdev, 
-                struct ethtool_stats *stats, uint64_t *data)
+                struct ethtool_stats *stats, u64 *data)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         int i;
@@ -678,12 +669,12 @@ ixgb_get_ethtool_stats(struct net_device *netdev,
         for(i = 0; i < IXGB_STATS_LEN; i++) {
                 char *p = (char *)adapter+ixgb_gstrings_stats[i].stat_offset;   
                 data[i] = (ixgb_gstrings_stats[i].sizeof_stat == 
-                        sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
+                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
         }
 }
 
 static void 
-ixgb_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
+ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 {
         int i;
 
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 80a8b9888225..04d2003e24e1 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -35,13 +35,13 @@
 
 /*  Local function prototypes */
 
-static uint32_t ixgb_hash_mc_addr(struct ixgb_hw *hw, uint8_t * mc_addr);
+static u32 ixgb_hash_mc_addr(struct ixgb_hw *hw, u8 * mc_addr);
 
-static void ixgb_mta_set(struct ixgb_hw *hw, uint32_t hash_value);
+static void ixgb_mta_set(struct ixgb_hw *hw, u32 hash_value);
 
 static void ixgb_get_bus_info(struct ixgb_hw *hw);
 
-static boolean_t ixgb_link_reset(struct ixgb_hw *hw);
+static bool ixgb_link_reset(struct ixgb_hw *hw);
 
 static void ixgb_optics_reset(struct ixgb_hw *hw);
 
@@ -55,18 +55,18 @@ static void ixgb_clear_vfta(struct ixgb_hw *hw);
 
 static void ixgb_init_rx_addrs(struct ixgb_hw *hw);
 
-static uint16_t ixgb_read_phy_reg(struct ixgb_hw *hw,
-                                  uint32_t reg_address,
-                                  uint32_t phy_address,
-                                  uint32_t device_type);
+static u16 ixgb_read_phy_reg(struct ixgb_hw *hw,
+                                  u32 reg_address,
+                                  u32 phy_address,
+                                  u32 device_type);
 
-static boolean_t ixgb_setup_fc(struct ixgb_hw *hw);
+static bool ixgb_setup_fc(struct ixgb_hw *hw);
 
-static boolean_t mac_addr_valid(uint8_t *mac_addr);
+static bool mac_addr_valid(u8 *mac_addr);
 
-static uint32_t ixgb_mac_reset(struct ixgb_hw *hw)
+static u32 ixgb_mac_reset(struct ixgb_hw *hw)
 {
-        uint32_t ctrl_reg;
+        u32 ctrl_reg;
 
         ctrl_reg =  IXGB_CTRL0_RST |
                                 IXGB_CTRL0_SDP3_DIR |   /* All pins are Output=1 */
@@ -114,11 +114,11 @@ static uint32_t ixgb_mac_reset(struct ixgb_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-boolean_t
+bool
 ixgb_adapter_stop(struct ixgb_hw *hw)
 {
-        uint32_t ctrl_reg;
-        uint32_t icr_reg;
+        u32 ctrl_reg;
+        u32 icr_reg;
 
         DEBUGFUNC("ixgb_adapter_stop");
 
@@ -127,13 +127,13 @@ ixgb_adapter_stop(struct ixgb_hw *hw)
          */
         if(hw->adapter_stopped) {
                 DEBUGOUT("Exiting because the adapter is already stopped!!!\n");
-                return FALSE;
+                return false;
         }
 
         /* Set the Adapter Stopped flag so other driver functions stop
          * touching the Hardware.
          */
-        hw->adapter_stopped = TRUE;
+        hw->adapter_stopped = true;
 
         /* Clear interrupt mask to stop board from generating interrupts */
         DEBUGOUT("Masking off all interrupts\n");
@@ -179,8 +179,8 @@ ixgb_adapter_stop(struct ixgb_hw *hw)
 static ixgb_xpak_vendor
 ixgb_identify_xpak_vendor(struct ixgb_hw *hw)
 {
-        uint32_t i;
-        uint16_t vendor_name[5];
+        u32 i;
+        u16 vendor_name[5];
         ixgb_xpak_vendor xpak_vendor;
 
         DEBUGFUNC("ixgb_identify_xpak_vendor");
@@ -286,15 +286,15 @@ ixgb_identify_phy(struct ixgb_hw *hw)
  * Leaves the transmit and receive units disabled and uninitialized.
  *
  * Returns:
- *      TRUE if successful,
- *      FALSE if unrecoverable problems were encountered.
+ *      true if successful,
+ *      false if unrecoverable problems were encountered.
  *****************************************************************************/
-boolean_t
+bool
 ixgb_init_hw(struct ixgb_hw *hw)
 {
-        uint32_t i;
-        uint32_t ctrl_reg;
-        boolean_t status;
+        u32 i;
+        u32 ctrl_reg;
+        bool status;
 
         DEBUGFUNC("ixgb_init_hw");
 
@@ -318,9 +318,8 @@ ixgb_init_hw(struct ixgb_hw *hw)
         /* Delay a few ms just to allow the reset to complete */
         msleep(IXGB_DELAY_AFTER_EE_RESET);
 
-        if (ixgb_get_eeprom_data(hw) == FALSE) {
-                return(FALSE);
-        }
+        if (!ixgb_get_eeprom_data(hw))
+                return false;
 
         /* Use the device id to determine the type of phy/transceiver. */
         hw->device_id = ixgb_get_ee_device_id(hw);
@@ -337,11 +336,11 @@ ixgb_init_hw(struct ixgb_hw *hw)
          */
         if (!mac_addr_valid(hw->curr_mac_addr)) {
                 DEBUGOUT("MAC address invalid after ixgb_init_rx_addrs\n");
-                return(FALSE);
+                return(false);
         }
 
         /* tell the routines in this file they can access hardware again */
-        hw->adapter_stopped = FALSE;
+        hw->adapter_stopped = false;
 
         /* Fill in the bus_info structure */
         ixgb_get_bus_info(hw);
@@ -378,7 +377,7 @@ ixgb_init_hw(struct ixgb_hw *hw)
 static void
 ixgb_init_rx_addrs(struct ixgb_hw *hw)
 {
-        uint32_t i;
+        u32 i;
 
         DEBUGFUNC("ixgb_init_rx_addrs");
 
@@ -438,13 +437,13 @@ ixgb_init_rx_addrs(struct ixgb_hw *hw)
  *****************************************************************************/
 void
 ixgb_mc_addr_list_update(struct ixgb_hw *hw,
-                          uint8_t *mc_addr_list,
-                          uint32_t mc_addr_count,
-                          uint32_t pad)
+                          u8 *mc_addr_list,
+                          u32 mc_addr_count,
+                          u32 pad)
 {
-        uint32_t hash_value;
-        uint32_t i;
-        uint32_t rar_used_count = 1;            /* RAR[0] is used for our MAC address */
+        u32 hash_value;
+        u32 i;
+        u32 rar_used_count = 1;         /* RAR[0] is used for our MAC address */
 
         DEBUGFUNC("ixgb_mc_addr_list_update");
 
@@ -516,11 +515,11 @@ ixgb_mc_addr_list_update(struct ixgb_hw *hw,
  * Returns:
  *      The hash value
  *****************************************************************************/
-static uint32_t
+static u32
 ixgb_hash_mc_addr(struct ixgb_hw *hw,
-                   uint8_t *mc_addr)
+                   u8 *mc_addr)
 {
-        uint32_t hash_value = 0;
+        u32 hash_value = 0;
 
         DEBUGFUNC("ixgb_hash_mc_addr");
 
@@ -534,18 +533,18 @@ ixgb_hash_mc_addr(struct ixgb_hw *hw,
         case 0:
                 /* [47:36] i.e. 0x563 for above example address */
                 hash_value =
-                    ((mc_addr[4] >> 4) | (((uint16_t) mc_addr[5]) << 4));
+                    ((mc_addr[4] >> 4) | (((u16) mc_addr[5]) << 4));
                 break;
         case 1:         /* [46:35] i.e. 0xAC6 for above example address */
                 hash_value =
-                    ((mc_addr[4] >> 3) | (((uint16_t) mc_addr[5]) << 5));
+                    ((mc_addr[4] >> 3) | (((u16) mc_addr[5]) << 5));
                 break;
         case 2:         /* [45:34] i.e. 0x5D8 for above example address */
                 hash_value =
-                    ((mc_addr[4] >> 2) | (((uint16_t) mc_addr[5]) << 6));
+                    ((mc_addr[4] >> 2) | (((u16) mc_addr[5]) << 6));
                 break;
         case 3:         /* [43:32] i.e. 0x634 for above example address */
-                hash_value = ((mc_addr[4]) | (((uint16_t) mc_addr[5]) << 8));
+                hash_value = ((mc_addr[4]) | (((u16) mc_addr[5]) << 8));
                 break;
         default:
                 /* Invalid mc_filter_type, what should we do? */
@@ -566,10 +565,10 @@ ixgb_hash_mc_addr(struct ixgb_hw *hw,
  *****************************************************************************/
 static void
 ixgb_mta_set(struct ixgb_hw *hw,
-                  uint32_t hash_value)
+                  u32 hash_value)
 {
-        uint32_t hash_bit, hash_reg;
-        uint32_t mta_reg;
+        u32 hash_bit, hash_reg;
+        u32 mta_reg;
 
         /* The MTA is a register array of 128 32-bit registers.
          * It is treated like an array of 4096 bits.  We want to set
@@ -600,23 +599,23 @@ ixgb_mta_set(struct ixgb_hw *hw,
  *****************************************************************************/
 void
 ixgb_rar_set(struct ixgb_hw *hw,
-                  uint8_t *addr,
-                  uint32_t index)
+                  u8 *addr,
+                  u32 index)
 {
-        uint32_t rar_low, rar_high;
+        u32 rar_low, rar_high;
 
         DEBUGFUNC("ixgb_rar_set");
 
         /* HW expects these in little endian so we reverse the byte order
          * from network order (big endian) to little endian
          */
-        rar_low = ((uint32_t) addr[0] |
-                   ((uint32_t)addr[1] << 8) |
-                   ((uint32_t)addr[2] << 16) |
-                   ((uint32_t)addr[3] << 24));
+        rar_low = ((u32) addr[0] |
+                   ((u32)addr[1] << 8) |
+                   ((u32)addr[2] << 16) |
+                   ((u32)addr[3] << 24));
 
-        rar_high = ((uint32_t) addr[4] |
-                        ((uint32_t)addr[5] << 8) |
+        rar_high = ((u32) addr[4] |
+                        ((u32)addr[5] << 8) |
                         IXGB_RAH_AV);
 
         IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
@@ -633,8 +632,8 @@ ixgb_rar_set(struct ixgb_hw *hw,
  *****************************************************************************/
 void
 ixgb_write_vfta(struct ixgb_hw *hw,
-                 uint32_t offset,
-                 uint32_t value)
+                 u32 offset,
+                 u32 value)
 {
         IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value);
         return;
@@ -648,7 +647,7 @@ ixgb_write_vfta(struct ixgb_hw *hw,
 static void
 ixgb_clear_vfta(struct ixgb_hw *hw)
 {
-        uint32_t offset;
+        u32 offset;
 
         for(offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++)
                 IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
@@ -661,12 +660,12 @@ ixgb_clear_vfta(struct ixgb_hw *hw)
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
 
-static boolean_t
+static bool
 ixgb_setup_fc(struct ixgb_hw *hw)
 {
-        uint32_t ctrl_reg;
-        uint32_t pap_reg = 0;   /* by default, assume no pause time */
-        boolean_t status = TRUE;
+        u32 ctrl_reg;
+        u32 pap_reg = 0;   /* by default, assume no pause time */
+        bool status = true;
 
         DEBUGFUNC("ixgb_setup_fc");
 
@@ -763,15 +762,15 @@ ixgb_setup_fc(struct ixgb_hw *hw)
  * This requires that first an address cycle command is sent, followed by a
  * read command.
  *****************************************************************************/
-static uint16_t
+static u16
 ixgb_read_phy_reg(struct ixgb_hw *hw,
-                uint32_t reg_address,
-                uint32_t phy_address,
-                uint32_t device_type)
+                u32 reg_address,
+                u32 phy_address,
+                u32 device_type)
 {
-        uint32_t i;
-        uint32_t data;
-        uint32_t command = 0;
+        u32 i;
+        u32 data;
+        u32 command = 0;
 
         ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
         ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
@@ -836,7 +835,7 @@ ixgb_read_phy_reg(struct ixgb_hw *hw,
          */
         data = IXGB_READ_REG(hw, MSRWD);
         data >>= IXGB_MSRWD_READ_DATA_SHIFT;
-        return((uint16_t) data);
+        return((u16) data);
 }
 
 /******************************************************************************
@@ -858,20 +857,20 @@ ixgb_read_phy_reg(struct ixgb_hw *hw,
  *****************************************************************************/
 static void
 ixgb_write_phy_reg(struct ixgb_hw *hw,
-                        uint32_t reg_address,
-                        uint32_t phy_address,
-                        uint32_t device_type,
-                        uint16_t data)
+                        u32 reg_address,
+                        u32 phy_address,
+                        u32 device_type,
+                        u16 data)
 {
-        uint32_t i;
-        uint32_t command = 0;
+        u32 i;
+        u32 command = 0;
 
         ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
         ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
         ASSERT(device_type <= IXGB_MAX_PHY_DEV_TYPE);
 
         /* Put the data in the MDIO Read/Write Data register */
-        IXGB_WRITE_REG(hw, MSRWD, (uint32_t)data);
+        IXGB_WRITE_REG(hw, MSRWD, (u32)data);
 
         /* Setup and write the address cycle command */
         command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
@@ -940,8 +939,8 @@ ixgb_write_phy_reg(struct ixgb_hw *hw,
 void
 ixgb_check_for_link(struct ixgb_hw *hw)
 {
-        uint32_t status_reg;
-        uint32_t xpcss_reg;
+        u32 status_reg;
+        u32 xpcss_reg;
 
         DEBUGFUNC("ixgb_check_for_link");
 
@@ -950,7 +949,7 @@ ixgb_check_for_link(struct ixgb_hw *hw)
 
         if ((xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
             (status_reg & IXGB_STATUS_LU)) {
-                hw->link_up = TRUE;
+                hw->link_up = true;
         } else if (!(xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
                    (status_reg & IXGB_STATUS_LU)) {
                 DEBUGOUT("XPCSS Not Aligned while Status:LU is set.\n");
@@ -974,10 +973,10 @@ ixgb_check_for_link(struct ixgb_hw *hw)
  *
  * Called by any function that needs to check the link status of the adapter.
  *****************************************************************************/
-boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)
+bool ixgb_check_for_bad_link(struct ixgb_hw *hw)
 {
-        uint32_t newLFC, newRFC;
-        boolean_t bad_link_returncode = FALSE;
+        u32 newLFC, newRFC;
+        bool bad_link_returncode = false;
 
         if (hw->phy_type == ixgb_phy_type_txn17401) {
                 newLFC = IXGB_READ_REG(hw, LFC);
@@ -986,7 +985,7 @@ boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)
                     || (hw->lastRFC + 250 < newRFC)) {
                         DEBUGOUT
                             ("BAD LINK! too many LFC/RFC since last check\n");
-                        bad_link_returncode = TRUE;
+                        bad_link_returncode = true;
                 }
                 hw->lastLFC = newLFC;
                 hw->lastRFC = newRFC;
@@ -1003,7 +1002,7 @@ boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)
 static void
 ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
 {
-        volatile uint32_t temp_reg;
+        volatile u32 temp_reg;
 
         DEBUGFUNC("ixgb_clear_hw_cntrs");
 
@@ -1084,7 +1083,7 @@ ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
 void
 ixgb_led_on(struct ixgb_hw *hw)
 {
-        uint32_t ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
+        u32 ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
 
         /* To turn on the LED, clear software-definable pin 0 (SDP0). */
         ctrl0_reg &= ~IXGB_CTRL0_SDP0;
@@ -1100,7 +1099,7 @@ ixgb_led_on(struct ixgb_hw *hw)
 void
 ixgb_led_off(struct ixgb_hw *hw)
 {
-        uint32_t ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
+        u32 ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
 
         /* To turn off the LED, set software-definable pin 0 (SDP0). */
         ctrl0_reg |= IXGB_CTRL0_SDP0;
@@ -1116,7 +1115,7 @@ ixgb_led_off(struct ixgb_hw *hw)
 static void
 ixgb_get_bus_info(struct ixgb_hw *hw)
 {
-        uint32_t status_reg;
+        u32 status_reg;
 
         status_reg = IXGB_READ_REG(hw, STATUS);
 
@@ -1155,21 +1154,21 @@ ixgb_get_bus_info(struct ixgb_hw *hw)
  * mac_addr - pointer to MAC address.
  *
  *****************************************************************************/
-static boolean_t
-mac_addr_valid(uint8_t *mac_addr)
+static bool
+mac_addr_valid(u8 *mac_addr)
 {
-        boolean_t is_valid = TRUE;
+        bool is_valid = true;
         DEBUGFUNC("mac_addr_valid");
 
         /* Make sure it is not a multicast address */
         if (IS_MULTICAST(mac_addr)) {
                 DEBUGOUT("MAC address is multicast\n");
-                is_valid = FALSE;
+                is_valid = false;
         }
         /* Not a broadcast address */
         else if (IS_BROADCAST(mac_addr)) {
                 DEBUGOUT("MAC address is broadcast\n");
-                is_valid = FALSE;
+                is_valid = false;
         }
         /* Reject the zero address */
         else if (mac_addr[0] == 0 &&
@@ -1179,7 +1178,7 @@ mac_addr_valid(uint8_t *mac_addr)
                          mac_addr[4] == 0 &&
                          mac_addr[5] == 0) {
                 DEBUGOUT("MAC address is all zeros\n");
-                is_valid = FALSE;
+                is_valid = false;
         }
         return (is_valid);
 }
@@ -1190,12 +1189,12 @@ mac_addr_valid(uint8_t *mac_addr)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static boolean_t
+static bool
 ixgb_link_reset(struct ixgb_hw *hw)
 {
-        boolean_t link_status = FALSE;
-        uint8_t wait_retries = MAX_RESET_ITERATIONS;
-        uint8_t lrst_retries = MAX_RESET_ITERATIONS;
+        bool link_status = false;
+        u8 wait_retries = MAX_RESET_ITERATIONS;
+        u8 lrst_retries = MAX_RESET_ITERATIONS;
 
         do {
                 /* Reset the link */
@@ -1208,7 +1207,7 @@ ixgb_link_reset(struct ixgb_hw *hw)
                         link_status =
                             ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU)
                              && (IXGB_READ_REG(hw, XPCSS) &
-                                 IXGB_XPCSS_ALIGN_STATUS)) ? TRUE : FALSE;
+                                 IXGB_XPCSS_ALIGN_STATUS)) ? true : false;
                 } while (!link_status && --wait_retries);
 
         } while (!link_status && --lrst_retries);
@@ -1225,7 +1224,7 @@ static void
 ixgb_optics_reset(struct ixgb_hw *hw)
 {
         if (hw->phy_type == ixgb_phy_type_txn17401) {
-                uint16_t mdio_reg;
+                u16 mdio_reg;
 
                 ixgb_write_phy_reg(hw,
                                         MDIO_PMA_PMD_CR1,
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
index 4f176ff2b786..39cfa47bea69 100644
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ixgb/ixgb_hw.h
@@ -538,8 +538,8 @@ struct ixgb_rx_desc {
         __le64 buff_addr;
         __le16 length;
         __le16 reserved;
-        uint8_t status;
-        uint8_t errors;
+        u8 status;
+        u8 errors;
         __le16 special;
 };
 
@@ -570,8 +570,8 @@ struct ixgb_rx_desc {
 struct ixgb_tx_desc {
         __le64 buff_addr;
         __le32 cmd_type_len;
-        uint8_t status;
-        uint8_t popts;
+        u8 status;
+        u8 popts;
         __le16 vlan;
 };
 
@@ -595,15 +595,15 @@ struct ixgb_tx_desc {
 #define IXGB_TX_DESC_SPECIAL_PRI_SHIFT  IXGB_RX_DESC_SPECIAL_PRI_SHIFT  /* Priority is in upper 3 of 16 */
 
 struct ixgb_context_desc {
-        uint8_t ipcss;
-        uint8_t ipcso;
+        u8 ipcss;
+        u8 ipcso;
         __le16 ipcse;
-        uint8_t tucss;
-        uint8_t tucso;
+        u8 tucss;
+        u8 tucso;
         __le16 tucse;
         __le32 cmd_type_len;
-        uint8_t status;
-        uint8_t hdr_len;
+        u8 status;
+        u8 hdr_len;
         __le16 mss;
 };
 
@@ -637,33 +637,33 @@ struct ixgb_context_desc {
 
 /* This structure takes a 64k flash and maps it for identification commands */
 struct ixgb_flash_buffer {
-        uint8_t manufacturer_id;
-        uint8_t device_id;
-        uint8_t filler1[0x2AA8];
-        uint8_t cmd2;
-        uint8_t filler2[0x2AAA];
-        uint8_t cmd1;
-        uint8_t filler3[0xAAAA];
+        u8 manufacturer_id;
+        u8 device_id;
+        u8 filler1[0x2AA8];
+        u8 cmd2;
+        u8 filler2[0x2AAA];
+        u8 cmd1;
+        u8 filler3[0xAAAA];
 };
 
 /*
  * This is a little-endian specific check.
  */
 #define IS_MULTICAST(Address) \
-    (boolean_t)(((uint8_t *)(Address))[0] & ((uint8_t)0x01))
+    (bool)(((u8 *)(Address))[0] & ((u8)0x01))
 
 /*
  * Check whether an address is broadcast.
  */
 #define IS_BROADCAST(Address)               \
-    ((((uint8_t *)(Address))[0] == ((uint8_t)0xff)) && (((uint8_t *)(Address))[1] == ((uint8_t)0xff)))
+    ((((u8 *)(Address))[0] == ((u8)0xff)) && (((u8 *)(Address))[1] == ((u8)0xff)))
 
 /* Flow control parameters */
 struct ixgb_fc {
-        uint32_t high_water;    /* Flow Control High-water          */
-        uint32_t low_water;     /* Flow Control Low-water           */
-        uint16_t pause_time;    /* Flow Control Pause timer         */
-        boolean_t send_xon;     /* Flow control send XON            */
+        u32 high_water; /* Flow Control High-water          */
+        u32 low_water;  /* Flow Control Low-water           */
+        u16 pause_time; /* Flow Control Pause timer         */
+        bool send_xon;          /* Flow control send XON            */
         ixgb_fc_type type;      /* Type of flow control             */
 };
 
@@ -685,139 +685,139 @@ struct ixgb_bus {
 };
 
 struct ixgb_hw {
-        uint8_t __iomem *hw_addr;/* Base Address of the hardware     */
+        u8 __iomem *hw_addr;/* Base Address of the hardware     */
         void *back;             /* Pointer to OS-dependent struct   */
         struct ixgb_fc fc;      /* Flow control parameters          */
         struct ixgb_bus bus;    /* Bus parameters                   */
-        uint32_t phy_id;        /* Phy Identifier                   */
-        uint32_t phy_addr;      /* XGMII address of Phy             */
+        u32 phy_id;     /* Phy Identifier                   */
+        u32 phy_addr;   /* XGMII address of Phy             */
         ixgb_mac_type mac_type; /* Identifier for MAC controller    */
         ixgb_phy_type phy_type; /* Transceiver/phy identifier       */
-        uint32_t max_frame_size;        /* Maximum frame size supported     */
-        uint32_t mc_filter_type;        /* Multicast filter hash type       */
-        uint32_t num_mc_addrs;  /* Number of current Multicast addrs */
-        uint8_t curr_mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];      /* Individual address currently programmed in MAC */
-        uint32_t num_tx_desc;   /* Number of Transmit descriptors   */
-        uint32_t num_rx_desc;   /* Number of Receive descriptors    */
-        uint32_t rx_buffer_size;        /* Size of Receive buffer           */
-        boolean_t link_up;      /* TRUE if link is valid            */
-        boolean_t adapter_stopped;      /* State of adapter                 */
-        uint16_t device_id;     /* device id from PCI configuration space */
-        uint16_t vendor_id;     /* vendor id from PCI configuration space */
-        uint8_t revision_id;    /* revision id from PCI configuration space */
-        uint16_t subsystem_vendor_id;   /* subsystem vendor id from PCI configuration space */
-        uint16_t subsystem_id;  /* subsystem id from PCI configuration space */
-        uint32_t bar0;          /* Base Address registers           */
-        uint32_t bar1;
-        uint32_t bar2;
-        uint32_t bar3;
-        uint16_t pci_cmd_word;  /* PCI command register id from PCI configuration space */
+        u32 max_frame_size;     /* Maximum frame size supported     */
+        u32 mc_filter_type;     /* Multicast filter hash type       */
+        u32 num_mc_addrs;       /* Number of current Multicast addrs */
+        u8 curr_mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];   /* Individual address currently programmed in MAC */
+        u32 num_tx_desc;        /* Number of Transmit descriptors   */
+        u32 num_rx_desc;        /* Number of Receive descriptors    */
+        u32 rx_buffer_size;     /* Size of Receive buffer           */
+        bool link_up;           /* true if link is valid            */
+        bool adapter_stopped;   /* State of adapter                 */
+        u16 device_id;  /* device id from PCI configuration space */
+        u16 vendor_id;  /* vendor id from PCI configuration space */
+        u8 revision_id; /* revision id from PCI configuration space */
+        u16 subsystem_vendor_id;        /* subsystem vendor id from PCI configuration space */
+        u16 subsystem_id;       /* subsystem id from PCI configuration space */
+        u32 bar0;               /* Base Address registers           */
+        u32 bar1;
+        u32 bar2;
+        u32 bar3;
+        u16 pci_cmd_word;       /* PCI command register id from PCI configuration space */
         __le16 eeprom[IXGB_EEPROM_SIZE];        /* EEPROM contents read at init time  */
         unsigned long io_base;  /* Our I/O mapped location */
-        uint32_t lastLFC;
-        uint32_t lastRFC;
+        u32 lastLFC;
+        u32 lastRFC;
 };
 
 /* Statistics reported by the hardware */
 struct ixgb_hw_stats {
-        uint64_t tprl;
-        uint64_t tprh;
-        uint64_t gprcl;
-        uint64_t gprch;
-        uint64_t bprcl;
-        uint64_t bprch;
-        uint64_t mprcl;
-        uint64_t mprch;
-        uint64_t uprcl;
-        uint64_t uprch;
-        uint64_t vprcl;
-        uint64_t vprch;
-        uint64_t jprcl;
-        uint64_t jprch;
-        uint64_t gorcl;
-        uint64_t gorch;
-        uint64_t torl;
-        uint64_t torh;
-        uint64_t rnbc;
-        uint64_t ruc;
-        uint64_t roc;
-        uint64_t rlec;
-        uint64_t crcerrs;
-        uint64_t icbc;
-        uint64_t ecbc;
-        uint64_t mpc;
-        uint64_t tptl;
-        uint64_t tpth;
-        uint64_t gptcl;
-        uint64_t gptch;
-        uint64_t bptcl;
-        uint64_t bptch;
-        uint64_t mptcl;
-        uint64_t mptch;
-        uint64_t uptcl;
-        uint64_t uptch;
-        uint64_t vptcl;
-        uint64_t vptch;
-        uint64_t jptcl;
-        uint64_t jptch;
-        uint64_t gotcl;
-        uint64_t gotch;
-        uint64_t totl;
-        uint64_t toth;
-        uint64_t dc;
-        uint64_t plt64c;
-        uint64_t tsctc;
-        uint64_t tsctfc;
-        uint64_t ibic;
-        uint64_t rfc;
-        uint64_t lfc;
-        uint64_t pfrc;
-        uint64_t pftc;
-        uint64_t mcfrc;
-        uint64_t mcftc;
-        uint64_t xonrxc;
-        uint64_t xontxc;
-        uint64_t xoffrxc;
-        uint64_t xofftxc;
-        uint64_t rjc;
+        u64 tprl;
+        u64 tprh;
+        u64 gprcl;
+        u64 gprch;
+        u64 bprcl;
+        u64 bprch;
+        u64 mprcl;
+        u64 mprch;
+        u64 uprcl;
+        u64 uprch;
+        u64 vprcl;
+        u64 vprch;
+        u64 jprcl;
+        u64 jprch;
+        u64 gorcl;
+        u64 gorch;
+        u64 torl;
+        u64 torh;
+        u64 rnbc;
+        u64 ruc;
+        u64 roc;
+        u64 rlec;
+        u64 crcerrs;
+        u64 icbc;
+        u64 ecbc;
+        u64 mpc;
+        u64 tptl;
+        u64 tpth;
+        u64 gptcl;
+        u64 gptch;
+        u64 bptcl;
+        u64 bptch;
+        u64 mptcl;
+        u64 mptch;
+        u64 uptcl;
+        u64 uptch;
+        u64 vptcl;
+        u64 vptch;
+        u64 jptcl;
+        u64 jptch;
+        u64 gotcl;
+        u64 gotch;
+        u64 totl;
+        u64 toth;
+        u64 dc;
+        u64 plt64c;
+        u64 tsctc;
+        u64 tsctfc;
+        u64 ibic;
+        u64 rfc;
+        u64 lfc;
+        u64 pfrc;
+        u64 pftc;
+        u64 mcfrc;
+        u64 mcftc;
+        u64 xonrxc;
+        u64 xontxc;
+        u64 xoffrxc;
+        u64 xofftxc;
+        u64 rjc;
 };
 
 /* Function Prototypes */
-extern boolean_t ixgb_adapter_stop(struct ixgb_hw *hw);
-extern boolean_t ixgb_init_hw(struct ixgb_hw *hw);
-extern boolean_t ixgb_adapter_start(struct ixgb_hw *hw);
+extern bool ixgb_adapter_stop(struct ixgb_hw *hw);
+extern bool ixgb_init_hw(struct ixgb_hw *hw);
+extern bool ixgb_adapter_start(struct ixgb_hw *hw);
 extern void ixgb_check_for_link(struct ixgb_hw *hw);
-extern boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw);
+extern bool ixgb_check_for_bad_link(struct ixgb_hw *hw);
 
 extern void ixgb_rar_set(struct ixgb_hw *hw,
-                                uint8_t *addr,
-                                uint32_t index);
+                                u8 *addr,
+                                u32 index);
 
 
 /* Filters (multicast, vlan, receive) */
 extern void ixgb_mc_addr_list_update(struct ixgb_hw *hw,
-                                   uint8_t *mc_addr_list,
-                                   uint32_t mc_addr_count,
-                                   uint32_t pad);
+                                   u8 *mc_addr_list,
+                                   u32 mc_addr_count,
+                                   u32 pad);
 
 /* Vfta functions */
 extern void ixgb_write_vfta(struct ixgb_hw *hw,
-                                 uint32_t offset,
-                                 uint32_t value);
+                                 u32 offset,
+                                 u32 value);
 
 /* Access functions to eeprom data */
-void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, uint8_t *mac_addr);
-uint32_t ixgb_get_ee_pba_number(struct ixgb_hw *hw);
-uint16_t ixgb_get_ee_device_id(struct ixgb_hw *hw);
-boolean_t ixgb_get_eeprom_data(struct ixgb_hw *hw);
-__le16 ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index);
+void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, u8 *mac_addr);
+u32 ixgb_get_ee_pba_number(struct ixgb_hw *hw);
+u16 ixgb_get_ee_device_id(struct ixgb_hw *hw);
+bool ixgb_get_eeprom_data(struct ixgb_hw *hw);
+__le16 ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index);
 
 /* Everything else */
 void ixgb_led_on(struct ixgb_hw *hw);
 void ixgb_led_off(struct ixgb_hw *hw);
 void ixgb_write_pci_cfg(struct ixgb_hw *hw,
-                         uint32_t reg,
-                         uint16_t * value);
+                         u32 reg,
+                         u16 * value);
 
 
 #endif /* _IXGB_HW_H_ */
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 6738b4d097fe..cb8daddafa29 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -67,7 +67,7 @@ MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl);
 /* Local Function Prototypes */
 
 int ixgb_up(struct ixgb_adapter *adapter);
-void ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog);
+void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);
 void ixgb_reset(struct ixgb_adapter *adapter);
 int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
 int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
@@ -94,22 +94,22 @@ static struct net_device_stats *ixgb_get_stats(struct net_device *netdev);
 static int ixgb_change_mtu(struct net_device *netdev, int new_mtu);
 static int ixgb_set_mac(struct net_device *netdev, void *p);
 static irqreturn_t ixgb_intr(int irq, void *data);
-static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
+static bool ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
 
 #ifdef CONFIG_IXGB_NAPI
 static int ixgb_clean(struct napi_struct *napi, int budget);
-static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter,
-                                   int *work_done, int work_to_do);
+static bool ixgb_clean_rx_irq(struct ixgb_adapter *adapter,
+                              int *work_done, int work_to_do);
 #else
-static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter);
+static bool ixgb_clean_rx_irq(struct ixgb_adapter *adapter);
 #endif
 static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter);
 static void ixgb_tx_timeout(struct net_device *dev);
 static void ixgb_tx_timeout_task(struct work_struct *work);
 static void ixgb_vlan_rx_register(struct net_device *netdev,
                                   struct vlan_group *grp);
-static void ixgb_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
-static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
+static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
 static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -197,7 +197,6 @@ module_exit(ixgb_exit_module);
 static void
 ixgb_irq_disable(struct ixgb_adapter *adapter)
 {
-        atomic_inc(&adapter->irq_sem);
         IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
         IXGB_WRITE_FLUSH(&adapter->hw);
         synchronize_irq(adapter->pdev->irq);
@@ -211,14 +210,12 @@ ixgb_irq_disable(struct ixgb_adapter *adapter)
 static void
 ixgb_irq_enable(struct ixgb_adapter *adapter)
 {
-        if(atomic_dec_and_test(&adapter->irq_sem)) {
-                u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |
-                          IXGB_INT_TXDW | IXGB_INT_LSC;
-                if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)
-                        val |= IXGB_INT_GPI0;
-                IXGB_WRITE_REG(&adapter->hw, IMS, val);
-                IXGB_WRITE_FLUSH(&adapter->hw);
-        }
+        u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |
+                  IXGB_INT_TXDW | IXGB_INT_LSC;
+        if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)
+                val |= IXGB_INT_GPI0;
+        IXGB_WRITE_REG(&adapter->hw, IMS, val);
+        IXGB_WRITE_FLUSH(&adapter->hw);
 }
 
 int
@@ -274,7 +271,7 @@ ixgb_up(struct ixgb_adapter *adapter)
 
                 if(hw->max_frame_size >
                    IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) {
-                        uint32_t ctrl0 = IXGB_READ_REG(hw, CTRL0);
+                        u32 ctrl0 = IXGB_READ_REG(hw, CTRL0);
 
                         if(!(ctrl0 & IXGB_CTRL0_JFE)) {
                                 ctrl0 |= IXGB_CTRL0_JFE;
@@ -283,26 +280,30 @@ ixgb_up(struct ixgb_adapter *adapter)
                 }
         }
 
-        mod_timer(&adapter->watchdog_timer, jiffies);
+        clear_bit(__IXGB_DOWN, &adapter->flags);
 
 #ifdef CONFIG_IXGB_NAPI
         napi_enable(&adapter->napi);
 #endif
         ixgb_irq_enable(adapter);
 
+        mod_timer(&adapter->watchdog_timer, jiffies);
+
         return 0;
 }
 
 void
-ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
+ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog)
 {
         struct net_device *netdev = adapter->netdev;
 
+        /* prevent the interrupt handler from restarting watchdog */
+        set_bit(__IXGB_DOWN, &adapter->flags);
+
 #ifdef CONFIG_IXGB_NAPI
         napi_disable(&adapter->napi);
-        atomic_set(&adapter->irq_sem, 0);
 #endif
-
+        /* waiting for NAPI to complete can re-enable interrupts */
         ixgb_irq_disable(adapter);
         free_irq(adapter->pdev->irq, netdev);
 
@@ -589,9 +590,9 @@ ixgb_sw_init(struct ixgb_adapter *adapter)
         /* enable flow control to be programmed */
         hw->fc.send_xon = 1;
 
-        atomic_set(&adapter->irq_sem, 1);
         spin_lock_init(&adapter->tx_lock);
 
+        set_bit(__IXGB_DOWN, &adapter->flags);
         return 0;
 }
 
@@ -656,7 +657,7 @@ ixgb_close(struct net_device *netdev)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
-        ixgb_down(adapter, TRUE);
+        ixgb_down(adapter, true);
 
         ixgb_free_tx_resources(adapter);
         ixgb_free_rx_resources(adapter);
@@ -717,9 +718,9 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
 static void
 ixgb_configure_tx(struct ixgb_adapter *adapter)
 {
-        uint64_t tdba = adapter->tx_ring.dma;
-        uint32_t tdlen = adapter->tx_ring.count * sizeof(struct ixgb_tx_desc);
-        uint32_t tctl;
+        u64 tdba = adapter->tx_ring.dma;
+        u32 tdlen = adapter->tx_ring.count * sizeof(struct ixgb_tx_desc);
+        u32 tctl;
         struct ixgb_hw *hw = &adapter->hw;
 
         /* Setup the Base and Length of the Tx Descriptor Ring 
@@ -805,7 +806,7 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
 static void
 ixgb_setup_rctl(struct ixgb_adapter *adapter)
 {
-        uint32_t rctl;
+        u32 rctl;
 
         rctl = IXGB_READ_REG(&adapter->hw, RCTL);
 
@@ -840,12 +841,12 @@ ixgb_setup_rctl(struct ixgb_adapter *adapter)
 static void
 ixgb_configure_rx(struct ixgb_adapter *adapter)
 {
-        uint64_t rdba = adapter->rx_ring.dma;
-        uint32_t rdlen = adapter->rx_ring.count * sizeof(struct ixgb_rx_desc);
+        u64 rdba = adapter->rx_ring.dma;
+        u32 rdlen = adapter->rx_ring.count * sizeof(struct ixgb_rx_desc);
         struct ixgb_hw *hw = &adapter->hw;
-        uint32_t rctl;
-        uint32_t rxcsum;
-        uint32_t rxdctl;
+        u32 rctl;
+        u32 rxcsum;
+        u32 rxdctl;
 
         /* make sure receives are disabled while setting up the descriptors */
 
@@ -881,7 +882,7 @@ ixgb_configure_rx(struct ixgb_adapter *adapter)
         IXGB_WRITE_REG(hw, RXDCTL, rxdctl);
 
         /* Enable Receive Checksum Offload for TCP and UDP */
-        if(adapter->rx_csum == TRUE) {
+        if (adapter->rx_csum) {
                 rxcsum = IXGB_READ_REG(hw, RXCSUM);
                 rxcsum |= IXGB_RXCSUM_TUOFL;
                 IXGB_WRITE_REG(hw, RXCSUM, rxcsum);
@@ -1078,7 +1079,7 @@ ixgb_set_multi(struct net_device *netdev)
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         struct ixgb_hw *hw = &adapter->hw;
         struct dev_mc_list *mc_ptr;
-        uint32_t rctl;
+        u32 rctl;
         int i;
 
         /* Check for Promiscuous and All Multicast modes */
@@ -1098,7 +1099,7 @@ ixgb_set_multi(struct net_device *netdev)
                 rctl |= IXGB_RCTL_MPE;
                 IXGB_WRITE_REG(hw, RCTL, rctl);
         } else {
-                uint8_t mta[IXGB_MAX_NUM_MULTICAST_ADDRESSES *
+                u8 mta[IXGB_MAX_NUM_MULTICAST_ADDRESSES *
                             IXGB_ETH_LENGTH_OF_ADDRESS];
 
                 IXGB_WRITE_REG(hw, RCTL, rctl);
@@ -1164,7 +1165,7 @@ ixgb_watchdog(unsigned long data)
         }
 
         /* Force detection of hung controller every watchdog period */
-        adapter->detect_tx_hung = TRUE;
+        adapter->detect_tx_hung = true;
 
         /* generate an interrupt to force clean up of any stragglers */
         IXGB_WRITE_REG(&adapter->hw, ICS, IXGB_INT_TXDW);
@@ -1182,8 +1183,8 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
 {
         struct ixgb_context_desc *context_desc;
         unsigned int i;
-        uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
-        uint16_t ipcse, tucse, mss;
+        u8 ipcss, ipcso, tucss, tucso, hdr_len;
+        u16 ipcse, tucse, mss;
         int err;
 
         if (likely(skb_is_gso(skb))) {
@@ -1243,12 +1244,12 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
         return 0;
 }
 
-static boolean_t
+static bool
 ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
 {
         struct ixgb_context_desc *context_desc;
         unsigned int i;
-        uint8_t css, cso;
+        u8 css, cso;
 
         if(likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 struct ixgb_buffer *buffer_info;
@@ -1264,7 +1265,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
                 context_desc->tucso = cso;
                 context_desc->tucse = 0;
                 /* zero out any previously existing data in one instruction */
-                *(uint32_t *)&(context_desc->ipcss) = 0;
+                *(u32 *)&(context_desc->ipcss) = 0;
                 context_desc->status = 0;
                 context_desc->hdr_len = 0;
                 context_desc->mss = 0;
@@ -1275,10 +1276,10 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
                 if(++i == adapter->tx_ring.count) i = 0;
                 adapter->tx_ring.next_to_use = i;
 
-                return TRUE;
+                return true;
         }
 
-        return FALSE;
+        return false;
 }
 
 #define IXGB_MAX_TXD_PWR        14
@@ -1371,9 +1372,9 @@ ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags)
         struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
         struct ixgb_tx_desc *tx_desc = NULL;
         struct ixgb_buffer *buffer_info;
-        uint32_t cmd_type_len = adapter->tx_cmd_type;
-        uint8_t status = 0;
-        uint8_t popts = 0;
+        u32 cmd_type_len = adapter->tx_cmd_type;
+        u8 status = 0;
+        u8 popts = 0;
         unsigned int i;
 
         if(tx_flags & IXGB_TX_FLAGS_TSO) {
@@ -1464,14 +1465,18 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         int vlan_id = 0;
         int tso;
 
+        if (test_bit(__IXGB_DOWN, &adapter->flags)) {
+                dev_kfree_skb(skb);
+                return NETDEV_TX_OK;
+        }
+
         if(skb->len <= 0) {
                 dev_kfree_skb_any(skb);
                 return 0;
         }
 
 #ifdef NETIF_F_LLTX
-        local_irq_save(flags);
-        if (!spin_trylock(&adapter->tx_lock)) {
+        if (!spin_trylock_irqsave(&adapter->tx_lock, flags)) {
                 /* Collision - tell upper layer to requeue */
                 local_irq_restore(flags);
                 return NETDEV_TX_LOCKED;
@@ -1548,7 +1553,7 @@ ixgb_tx_timeout_task(struct work_struct *work)
                 container_of(work, struct ixgb_adapter, tx_timeout_task);
 
         adapter->tx_timeout_count++;
-        ixgb_down(adapter, TRUE);
+        ixgb_down(adapter, true);
         ixgb_up(adapter);
 }
 
@@ -1595,7 +1600,7 @@ ixgb_change_mtu(struct net_device *netdev, int new_mtu)
         netdev->mtu = new_mtu;
 
         if ((old_max_frame != max_frame) && netif_running(netdev)) {
-                ixgb_down(adapter, TRUE);
+                ixgb_down(adapter, true);
                 ixgb_up(adapter);
         }
 
@@ -1745,7 +1750,7 @@ ixgb_intr(int irq, void *data)
         struct net_device *netdev = data;
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         struct ixgb_hw *hw = &adapter->hw;
-        uint32_t icr = IXGB_READ_REG(hw, ICR);
+        u32 icr = IXGB_READ_REG(hw, ICR);
 #ifndef CONFIG_IXGB_NAPI
         unsigned int i;
 #endif
@@ -1753,9 +1758,9 @@ ixgb_intr(int irq, void *data)
         if(unlikely(!icr))
                 return IRQ_NONE;  /* Not our interrupt */
 
-        if(unlikely(icr & (IXGB_INT_RXSEQ | IXGB_INT_LSC))) {
-                mod_timer(&adapter->watchdog_timer, jiffies);
-        }
+        if (unlikely(icr & (IXGB_INT_RXSEQ | IXGB_INT_LSC)))
+                if (!test_bit(__IXGB_DOWN, &adapter->flags))
+                        mod_timer(&adapter->watchdog_timer, jiffies);
 
 #ifdef CONFIG_IXGB_NAPI
         if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
@@ -1764,7 +1769,6 @@ ixgb_intr(int irq, void *data)
                   of the posted write is intentionally left out.
                 */
 
-                atomic_inc(&adapter->irq_sem);
                 IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
                 __netif_rx_schedule(netdev, &adapter->napi);
         }
@@ -1812,7 +1816,7 @@ ixgb_clean(struct napi_struct *napi, int budget)
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
 {
         struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
@@ -1820,7 +1824,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
         struct ixgb_tx_desc *tx_desc, *eop_desc;
         struct ixgb_buffer *buffer_info;
         unsigned int i, eop;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
 
         i = tx_ring->next_to_clean;
         eop = tx_ring->buffer_info[i].next_to_watch;
@@ -1828,7 +1832,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
 
         while(eop_desc->status & IXGB_TX_DESC_STATUS_DD) {
 
-                for(cleaned = FALSE; !cleaned; ) {
+                for (cleaned = false; !cleaned; ) {
                         tx_desc = IXGB_TX_DESC(*tx_ring, i);
                         buffer_info = &tx_ring->buffer_info[i];
 
@@ -1839,7 +1843,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
 
                         ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
 
-                        *(uint32_t *)&(tx_desc->status) = 0;
+                        *(u32 *)&(tx_desc->status) = 0;
 
                         cleaned = (i == eop);
                         if(++i == tx_ring->count) i = 0;
@@ -1862,7 +1866,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
         if(adapter->detect_tx_hung) {
                 /* detect a transmit hang in hardware, this serializes the
                  * check with the clearing of time_stamp and movement of i */
-                adapter->detect_tx_hung = FALSE;
+                adapter->detect_tx_hung = false;
                 if (tx_ring->buffer_info[eop].dma &&
                    time_after(jiffies, tx_ring->buffer_info[eop].time_stamp + HZ)
                    && !(IXGB_READ_REG(&adapter->hw, STATUS) &
@@ -1932,7 +1936,7 @@ ixgb_rx_checksum(struct ixgb_adapter *adapter,
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 #ifdef CONFIG_IXGB_NAPI
 ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
 #else
@@ -1944,9 +1948,9 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
         struct pci_dev *pdev = adapter->pdev;
         struct ixgb_rx_desc *rx_desc, *next_rxd;
         struct ixgb_buffer *buffer_info, *next_buffer, *next2_buffer;
-        uint32_t length;
+        u32 length;
         unsigned int i, j;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
 
         i = rx_ring->next_to_clean;
         rx_desc = IXGB_RX_DESC(*rx_ring, i);
@@ -1980,7 +1984,7 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
                 next_skb = next_buffer->skb;
                 prefetch(next_skb);
 
-                cleaned = TRUE;
+                cleaned = true;
 
                 pci_unmap_single(pdev,
                                  buffer_info->dma,
@@ -2162,7 +2166,7 @@ static void
 ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
-        uint32_t ctrl, rctl;
+        u32 ctrl, rctl;
 
         ixgb_irq_disable(adapter);
         adapter->vlgrp = grp;
@@ -2193,14 +2197,16 @@ ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                 IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
         }
 
-        ixgb_irq_enable(adapter);
+        /* don't enable interrupts unless we are UP */
+        if (adapter->netdev->flags & IFF_UP)
+                ixgb_irq_enable(adapter);
 }
 
 static void
-ixgb_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
+ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
-        uint32_t vfta, index;
+        u32 vfta, index;
 
         /* add VID to filter table */
 
@@ -2211,18 +2217,20 @@ ixgb_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
 }
 
 static void
-ixgb_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
+ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
-        uint32_t vfta, index;
+        u32 vfta, index;
 
         ixgb_irq_disable(adapter);
 
         vlan_group_set_device(adapter->vlgrp, vid, NULL);
 
-        ixgb_irq_enable(adapter);
+        /* don't enable interrupts unless we are UP */
+        if (adapter->netdev->flags & IFF_UP)
+                ixgb_irq_enable(adapter);
 
-        /* remove VID from filter table*/
+        /* remove VID from filter table */
 
         index = (vid >> 5) & 0x7F;
         vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
@@ -2236,7 +2244,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter)
         ixgb_vlan_rx_register(adapter->netdev, adapter->vlgrp);
 
         if(adapter->vlgrp) {
-                uint16_t vid;
+                u16 vid;
                 for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
                         if(!vlan_group_get_device(adapter->vlgrp, vid))
                                 continue;
@@ -2277,7 +2285,7 @@ static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
         if(netif_running(netdev))
-                ixgb_down(adapter, TRUE);
+                ixgb_down(adapter, true);
 
         pci_disable_device(pdev);
 
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index 9e04a6b3ae0d..4be1b273e1b8 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -39,13 +39,6 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 
-typedef enum {
-#undef FALSE
-        FALSE = 0,
-#undef TRUE
-        TRUE = 1
-} boolean_t;
-
 #undef ASSERT
 #define ASSERT(x)       if(!(x)) BUG()
 #define MSGOUT(S, A, B) printk(KERN_DEBUG S "\n", A, B)
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index d0bf206632ca..d98113472a89 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -36,6 +36,9 @@
 #include "ixgbe_type.h"
 #include "ixgbe_common.h"
 
+#ifdef CONFIG_DCA
+#include <linux/dca.h>
+#endif
 
 #define IXGBE_ERR(args...) printk(KERN_ERR "ixgbe: " args)
 
@@ -120,7 +123,6 @@ struct ixgbe_queue_stats {
 };
 
 struct ixgbe_ring {
-        struct ixgbe_adapter *adapter;  /* backlink */
         void *desc;                     /* descriptor ring memory */
         dma_addr_t dma;                 /* phys. address of descriptor ring */
         unsigned int size;              /* length in bytes */
@@ -128,6 +130,7 @@ struct ixgbe_ring {
         unsigned int next_to_use;
         unsigned int next_to_clean;
 
+        int queue_index; /* needed for multiqueue queue management */
         union {
                 struct ixgbe_tx_buffer *tx_buffer_info;
                 struct ixgbe_rx_buffer *rx_buffer_info;
@@ -136,8 +139,21 @@ struct ixgbe_ring {
         u16 head;
         u16 tail;
 
+        unsigned int total_bytes;
+        unsigned int total_packets;
 
+        u16 reg_idx; /* holds the special value that gets the hardware register
+                      * offset associated with this ring, which is different
+                      * for DCE and RSS modes */
+
+#ifdef CONFIG_DCA
+        /* cpu for tx queue */
+        int cpu;
+#endif
         struct ixgbe_queue_stats stats;
+        u8 v_idx; /* maps directly to the index for this ring in the hardware
+                   * vector array, can also be used for finding the bit in EICR
+                   * and friends that represents the vector for this ring */
 
         u32 eims_value;
         u16 itr_register;
@@ -146,6 +162,33 @@ struct ixgbe_ring {
         u16 work_limit;                /* max work per interrupt */
 };
 
+#define RING_F_VMDQ 1
+#define RING_F_RSS  2
+#define IXGBE_MAX_RSS_INDICES  16
+#define IXGBE_MAX_VMDQ_INDICES 16
+struct ixgbe_ring_feature {
+        int indices;
+        int mask;
+};
+
+#define MAX_RX_QUEUES 64
+#define MAX_TX_QUEUES 32
+
+/* MAX_MSIX_Q_VECTORS of these are allocated,
+ * but we only use one per queue-specific vector.
+ */
+struct ixgbe_q_vector {
+        struct ixgbe_adapter *adapter;
+        struct napi_struct napi;
+        DECLARE_BITMAP(rxr_idx, MAX_RX_QUEUES); /* Rx ring indices */
+        DECLARE_BITMAP(txr_idx, MAX_TX_QUEUES); /* Tx ring indices */
+        u8 rxr_count;     /* Rx ring count assigned to this vector */
+        u8 txr_count;     /* Tx ring count assigned to this vector */
+        u8 tx_eitr;
+        u8 rx_eitr;
+        u32 eitr;
+};
+
 /* Helper macros to switch between ints/sec and what the register uses.
  * And yes, it's the same math going both ways.
  */
@@ -166,6 +209,14 @@ struct ixgbe_ring {
 
 #define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
 
+#define OTHER_VECTOR 1
+#define NON_Q_VECTORS (OTHER_VECTOR)
+
+#define MAX_MSIX_Q_VECTORS 16
+#define MIN_MSIX_Q_VECTORS 2
+#define MAX_MSIX_COUNT (MAX_MSIX_Q_VECTORS + NON_Q_VECTORS)
+#define MIN_MSIX_COUNT (MIN_MSIX_Q_VECTORS + NON_Q_VECTORS)
+
 /* board specific private data structure */
 struct ixgbe_adapter {
         struct timer_list watchdog_timer;
@@ -173,10 +224,16 @@ struct ixgbe_adapter {
         u16 bd_number;
         u16 rx_buf_len;
         struct work_struct reset_task;
+        struct ixgbe_q_vector q_vector[MAX_MSIX_Q_VECTORS];
+        char name[MAX_MSIX_COUNT][IFNAMSIZ + 5];
+
+        /* Interrupt Throttle Rate */
+        u32 itr_setting;
+        u16 eitr_low;
+        u16 eitr_high;
 
         /* TX */
         struct ixgbe_ring *tx_ring;     /* One per active queue */
-        struct napi_struct napi;
         u64 restart_queue;
         u64 lsc_int;
         u64 hw_tso_ctxt;
@@ -192,22 +249,27 @@ struct ixgbe_adapter {
         u64 non_eop_descs;
         int num_tx_queues;
         int num_rx_queues;
+        int num_msix_vectors;
+        struct ixgbe_ring_feature ring_feature[3];
         struct msix_entry *msix_entries;
 
         u64 rx_hdr_split;
         u32 alloc_rx_page_failed;
         u32 alloc_rx_buff_failed;
 
+        /* Some features need tri-state capability,
+         * thus the additional *_CAPABLE flags.
+         */
         u32 flags;
-#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1)
+#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1 << 0)
 #define IXGBE_FLAG_MSI_ENABLED                  (u32)(1 << 1)
-#define IXGBE_FLAG_MSIX_ENABLED                 (u32)(1 << 2)
-#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 << 3)
-#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 << 4)
-
-        /* Interrupt Throttle Rate */
-        u32 rx_eitr;
-        u32 tx_eitr;
+#define IXGBE_FLAG_MSIX_ENABLED                 (u32)(1 << 2)
+#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 << 3)
+#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 << 4)
+#define IXGBE_FLAG_IMIR_ENABLED                 (u32)(1 << 5)
+#define IXGBE_FLAG_RSS_ENABLED                  (u32)(1 << 6)
+#define IXGBE_FLAG_VMDQ_ENABLED                 (u32)(1 << 7)
+#define IXGBE_FLAG_DCA_ENABLED                  (u32)(1 << 8)
 
         /* OS defined structs */
         struct net_device *netdev;
@@ -218,7 +280,10 @@ struct ixgbe_adapter {
         struct ixgbe_hw hw;
         u16 msg_enable;
         struct ixgbe_hw_stats stats;
-        char lsc_name[IFNAMSIZ + 5];
+
+        /* Interrupt Throttle Rate */
+        u32 rx_eitr;
+        u32 tx_eitr;
 
         unsigned long state;
         u64 tx_busy;
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index a119cbd8dbb8..4e463778bcfd 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -246,13 +246,26 @@ static int ixgbe_set_tx_csum(struct net_device *netdev, u32 data)
 
 static int ixgbe_set_tso(struct net_device *netdev, u32 data)
 {
-
         if (data) {
                 netdev->features |= NETIF_F_TSO;
                 netdev->features |= NETIF_F_TSO6;
         } else {
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+                struct ixgbe_adapter *adapter = netdev_priv(netdev);
+                int i;
+#endif
+                netif_stop_queue(netdev);
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+                for (i = 0; i < adapter->num_tx_queues; i++)
+                        netif_stop_subqueue(netdev, i);
+#endif
                 netdev->features &= ~NETIF_F_TSO;
                 netdev->features &= ~NETIF_F_TSO6;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+                for (i = 0; i < adapter->num_tx_queues; i++)
+                        netif_start_subqueue(netdev, i);
+#endif
+                netif_start_queue(netdev);
         }
         return 0;
 }
@@ -873,13 +886,13 @@ static int ixgbe_get_coalesce(struct net_device *netdev,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-        if (adapter->rx_eitr == 0)
-                ec->rx_coalesce_usecs = 0;
+        if (adapter->rx_eitr < IXGBE_MIN_ITR_USECS)
+                ec->rx_coalesce_usecs = adapter->rx_eitr;
         else
                 ec->rx_coalesce_usecs = 1000000 / adapter->rx_eitr;
 
-        if (adapter->tx_eitr == 0)
-                ec->tx_coalesce_usecs = 0;
+        if (adapter->tx_eitr < IXGBE_MIN_ITR_USECS)
+                ec->tx_coalesce_usecs = adapter->tx_eitr;
         else
                 ec->tx_coalesce_usecs = 1000000 / adapter->tx_eitr;
 
@@ -893,22 +906,26 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
         if ((ec->rx_coalesce_usecs > IXGBE_MAX_ITR_USECS) ||
-            ((ec->rx_coalesce_usecs > 0) &&
+            ((ec->rx_coalesce_usecs != 0) &&
+             (ec->rx_coalesce_usecs != 1) &&
+             (ec->rx_coalesce_usecs != 3) &&
              (ec->rx_coalesce_usecs < IXGBE_MIN_ITR_USECS)))
                 return -EINVAL;
         if ((ec->tx_coalesce_usecs > IXGBE_MAX_ITR_USECS) ||
-            ((ec->tx_coalesce_usecs > 0) &&
+            ((ec->tx_coalesce_usecs != 0) &&
+             (ec->tx_coalesce_usecs != 1) &&
+             (ec->tx_coalesce_usecs != 3) &&
              (ec->tx_coalesce_usecs < IXGBE_MIN_ITR_USECS)))
                 return -EINVAL;
 
         /* convert to rate of irq's per second */
-        if (ec->rx_coalesce_usecs == 0)
-                adapter->rx_eitr = 0;
+        if (ec->rx_coalesce_usecs < IXGBE_MIN_ITR_USECS)
+                adapter->rx_eitr = ec->rx_coalesce_usecs;
         else
                 adapter->rx_eitr = (1000000 / ec->rx_coalesce_usecs);
 
-        if (ec->tx_coalesce_usecs == 0)
-                adapter->tx_eitr = 0;
+        if (ec->tx_coalesce_usecs < IXGBE_MIN_ITR_USECS)
+                adapter->tx_eitr = ec->rx_coalesce_usecs;
         else
                 adapter->tx_eitr = (1000000 / ec->tx_coalesce_usecs);
 
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index c2095ce531c9..cb371a8c24a7 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
         "Intel(R) 10 Gigabit PCI Express Network Driver";
 
-#define DRV_VERSION "1.1.18"
+#define DRV_VERSION "1.3.18-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static const char ixgbe_copyright[] =
          "Copyright (c) 1999-2007 Intel Corporation.";
@@ -80,6 +80,16 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);
 
+#ifdef CONFIG_DCA
+static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,
+                            void *p);
+static struct notifier_block dca_notifier = {
+        .notifier_call = ixgbe_notify_dca,
+        .next          = NULL,
+        .priority      = 0
+};
+#endif
+
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
 MODULE_LICENSE("GPL");
@@ -256,26 +266,125 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_adapter *adapter,
                  * sees the new next_to_clean.
                  */
                 smp_mb();
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+                if (__netif_subqueue_stopped(netdev, tx_ring->queue_index) &&
+                    !test_bit(__IXGBE_DOWN, &adapter->state)) {
+                        netif_wake_subqueue(netdev, tx_ring->queue_index);
+                        adapter->restart_queue++;
+                }
+#else
                 if (netif_queue_stopped(netdev) &&
                     !test_bit(__IXGBE_DOWN, &adapter->state)) {
                         netif_wake_queue(netdev);
                         adapter->restart_queue++;
                 }
+#endif
         }
 
         if (adapter->detect_tx_hung)
                 if (ixgbe_check_tx_hang(adapter, tx_ring, eop, eop_desc))
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+                        netif_stop_subqueue(netdev, tx_ring->queue_index);
+#else
                         netif_stop_queue(netdev);
+#endif
 
         if (total_tx_packets >= tx_ring->work_limit)
                 IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, tx_ring->eims_value);
 
+        tx_ring->total_bytes += total_tx_bytes;
+        tx_ring->total_packets += total_tx_packets;
         adapter->net_stats.tx_bytes += total_tx_bytes;
         adapter->net_stats.tx_packets += total_tx_packets;
         cleaned = total_tx_packets ? true : false;
         return cleaned;
 }
 
+#ifdef CONFIG_DCA
+static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
+                                struct ixgbe_ring *rxr)
+{
+        u32 rxctrl;
+        int cpu = get_cpu();
+        int q = rxr - adapter->rx_ring;
+
+        if (rxr->cpu != cpu) {
+                rxctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_DCA_RXCTRL(q));
+                rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK;
+                rxctrl |= dca_get_tag(cpu);
+                rxctrl |= IXGBE_DCA_RXCTRL_DESC_DCA_EN;
+                rxctrl |= IXGBE_DCA_RXCTRL_HEAD_DCA_EN;
+                IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_RXCTRL(q), rxctrl);
+                rxr->cpu = cpu;
+        }
+        put_cpu();
+}
+
+static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,
+                                struct ixgbe_ring *txr)
+{
+        u32 txctrl;
+        int cpu = get_cpu();
+        int q = txr - adapter->tx_ring;
+
+        if (txr->cpu != cpu) {
+                txctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_DCA_TXCTRL(q));
+                txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK;
+                txctrl |= dca_get_tag(cpu);
+                txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
+                IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_TXCTRL(q), txctrl);
+                txr->cpu = cpu;
+        }
+        put_cpu();
+}
+
+static void ixgbe_setup_dca(struct ixgbe_adapter *adapter)
+{
+        int i;
+
+        if (!(adapter->flags & IXGBE_FLAG_DCA_ENABLED))
+                return;
+
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                adapter->tx_ring[i].cpu = -1;
+                ixgbe_update_tx_dca(adapter, &adapter->tx_ring[i]);
+        }
+        for (i = 0; i < adapter->num_rx_queues; i++) {
+                adapter->rx_ring[i].cpu = -1;
+                ixgbe_update_rx_dca(adapter, &adapter->rx_ring[i]);
+        }
+}
+
+static int __ixgbe_notify_dca(struct device *dev, void *data)
+{
+        struct net_device *netdev = dev_get_drvdata(dev);
+        struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        unsigned long event = *(unsigned long *)data;
+
+        switch (event) {
+        case DCA_PROVIDER_ADD:
+                adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
+                /* Always use CB2 mode, difference is masked
+                 * in the CB driver. */
+                IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 2);
+                if (dca_add_requester(dev) == 0) {
+                        ixgbe_setup_dca(adapter);
+                        break;
+                }
+                /* Fall Through since DCA is disabled. */
+        case DCA_PROVIDER_REMOVE:
+                if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
+                        dca_remove_requester(dev);
+                        adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
+                        IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 1);
+                }
+                break;
+        }
+
+        return 0;
+}
+
+#endif /* CONFIG_DCA */
 /**
  * ixgbe_receive_skb - Send a completed packet up the stack
  * @adapter: board private structure
@@ -556,10 +665,15 @@ next_desc:
         adapter->net_stats.rx_bytes += total_rx_bytes;
         adapter->net_stats.rx_packets += total_rx_packets;
 
+        rx_ring->total_packets += total_rx_packets;
+        rx_ring->total_bytes += total_rx_bytes;
+        adapter->net_stats.rx_bytes += total_rx_bytes;
+        adapter->net_stats.rx_packets += total_rx_packets;
+
         return cleaned;
 }
 
-#define IXGBE_MAX_INTR 10
+static int ixgbe_clean_rxonly(struct napi_struct *, int);
 /**
  * ixgbe_configure_msix - Configure MSI-X hardware
  * @adapter: board private structure
@@ -569,28 +683,195 @@ next_desc:
  **/
 static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)
 {
-        int i, vector = 0;
+        struct ixgbe_q_vector *q_vector;
+        int i, j, q_vectors, v_idx, r_idx;
+        u32 mask;
 
-        for (i = 0; i < adapter->num_tx_queues; i++) {
-                ixgbe_set_ivar(adapter, IXGBE_IVAR_TX_QUEUE(i),
-                               IXGBE_MSIX_VECTOR(vector));
-                writel(EITR_INTS_PER_SEC_TO_REG(adapter->tx_eitr),
-                       adapter->hw.hw_addr + adapter->tx_ring[i].itr_register);
-                vector++;
-        }
+        q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
 
-        for (i = 0; i < adapter->num_rx_queues; i++) {
-                ixgbe_set_ivar(adapter, IXGBE_IVAR_RX_QUEUE(i),
-                               IXGBE_MSIX_VECTOR(vector));
-                writel(EITR_INTS_PER_SEC_TO_REG(adapter->rx_eitr),
-                       adapter->hw.hw_addr + adapter->rx_ring[i].itr_register);
-                vector++;
+        /* Populate the IVAR table and set the ITR values to the
+         * corresponding register.
+         */
+        for (v_idx = 0; v_idx < q_vectors; v_idx++) {
+                q_vector = &adapter->q_vector[v_idx];
+                /* XXX for_each_bit(...) */
+                r_idx = find_first_bit(q_vector->rxr_idx,
+                                      adapter->num_rx_queues);
+
+                for (i = 0; i < q_vector->rxr_count; i++) {
+                        j = adapter->rx_ring[r_idx].reg_idx;
+                        ixgbe_set_ivar(adapter, IXGBE_IVAR_RX_QUEUE(j), v_idx);
+                        r_idx = find_next_bit(q_vector->rxr_idx,
+                                              adapter->num_rx_queues,
+                                              r_idx + 1);
+                }
+                r_idx = find_first_bit(q_vector->txr_idx,
+                                       adapter->num_tx_queues);
+
+                for (i = 0; i < q_vector->txr_count; i++) {
+                        j = adapter->tx_ring[r_idx].reg_idx;
+                        ixgbe_set_ivar(adapter, IXGBE_IVAR_TX_QUEUE(j), v_idx);
+                        r_idx = find_next_bit(q_vector->txr_idx,
+                                              adapter->num_tx_queues,
+                                              r_idx + 1);
+                }
+
+                /* if this is a tx only vector use half the irq (tx) rate */
+                if (q_vector->txr_count && !q_vector->rxr_count)
+                        q_vector->eitr = adapter->tx_eitr;
+                else
+                        /* rx only or mixed */
+                        q_vector->eitr = adapter->rx_eitr;
+
+                IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITR(v_idx),
+                                EITR_INTS_PER_SEC_TO_REG(q_vector->eitr));
         }
 
-        vector = adapter->num_tx_queues + adapter->num_rx_queues;
-        ixgbe_set_ivar(adapter, IXGBE_IVAR_OTHER_CAUSES_INDEX,
-                       IXGBE_MSIX_VECTOR(vector));
-        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITR(vector), 1950);
+        ixgbe_set_ivar(adapter, IXGBE_IVAR_OTHER_CAUSES_INDEX, v_idx);
+        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITR(v_idx), 1950);
+
+        /* set up to autoclear timer, lsc, and the vectors */
+        mask = IXGBE_EIMS_ENABLE_MASK;
+        mask &= ~IXGBE_EIMS_OTHER;
+        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIAC, mask);
+}
+
+enum latency_range {
+        lowest_latency = 0,
+        low_latency = 1,
+        bulk_latency = 2,
+        latency_invalid = 255
+};
+
+/**
+ * ixgbe_update_itr - update the dynamic ITR value based on statistics
+ * @adapter: pointer to adapter
+ * @eitr: eitr setting (ints per sec) to give last timeslice
+ * @itr_setting: current throttle rate in ints/second
+ * @packets: the number of packets during this measurement interval
+ * @bytes: the number of bytes during this measurement interval
+ *
+ *      Stores a new ITR value based on packets and byte
+ *      counts during the last interrupt.  The advantage of per interrupt
+ *      computation is faster updates and more accurate ITR for the current
+ *      traffic pattern.  Constants in this function were computed
+ *      based on theoretical maximum wire speed and thresholds were set based
+ *      on testing data as well as attempting to minimize response time
+ *      while increasing bulk throughput.
+ *      this functionality is controlled by the InterruptThrottleRate module
+ *      parameter (see ixgbe_param.c)
+ **/
+static u8 ixgbe_update_itr(struct ixgbe_adapter *adapter,
+                           u32 eitr, u8 itr_setting,
+                           int packets, int bytes)
+{
+        unsigned int retval = itr_setting;
+        u32 timepassed_us;
+        u64 bytes_perint;
+
+        if (packets == 0)
+                goto update_itr_done;
+
+
+        /* simple throttlerate management
+         *    0-20MB/s lowest (100000 ints/s)
+         *   20-100MB/s low   (20000 ints/s)
+         *  100-1249MB/s bulk (8000 ints/s)
+         */
+        /* what was last interrupt timeslice? */
+        timepassed_us = 1000000/eitr;
+        bytes_perint = bytes / timepassed_us; /* bytes/usec */
+
+        switch (itr_setting) {
+        case lowest_latency:
+                if (bytes_perint > adapter->eitr_low)
+                        retval = low_latency;
+                break;
+        case low_latency:
+                if (bytes_perint > adapter->eitr_high)
+                        retval = bulk_latency;
+                else if (bytes_perint <= adapter->eitr_low)
+                        retval = lowest_latency;
+                break;
+        case bulk_latency:
+                if (bytes_perint <= adapter->eitr_high)
+                        retval = low_latency;
+                break;
+        }
+
+update_itr_done:
+        return retval;
+}
+
+static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector)
+{
+        struct ixgbe_adapter *adapter = q_vector->adapter;
+        struct ixgbe_hw *hw = &adapter->hw;
+        u32 new_itr;
+        u8 current_itr, ret_itr;
+        int i, r_idx, v_idx = ((void *)q_vector - (void *)(adapter->q_vector)) /
+                              sizeof(struct ixgbe_q_vector);
+        struct ixgbe_ring *rx_ring, *tx_ring;
+
+        r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
+        for (i = 0; i < q_vector->txr_count; i++) {
+                tx_ring = &(adapter->tx_ring[r_idx]);
+                ret_itr = ixgbe_update_itr(adapter, q_vector->eitr,
+                                           q_vector->tx_eitr,
+                                           tx_ring->total_packets,
+                                           tx_ring->total_bytes);
+                /* if the result for this queue would decrease interrupt
+                 * rate for this vector then use that result */
+                q_vector->tx_eitr = ((q_vector->tx_eitr > ret_itr) ?
+                                    q_vector->tx_eitr - 1 : ret_itr);
+                r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
+                                      r_idx + 1);
+        }
+
+        r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+        for (i = 0; i < q_vector->rxr_count; i++) {
+                rx_ring = &(adapter->rx_ring[r_idx]);
+                ret_itr = ixgbe_update_itr(adapter, q_vector->eitr,
+                                           q_vector->rx_eitr,
+                                           rx_ring->total_packets,
+                                           rx_ring->total_bytes);
+                /* if the result for this queue would decrease interrupt
+                 * rate for this vector then use that result */
+                q_vector->rx_eitr = ((q_vector->rx_eitr > ret_itr) ?
+                                    q_vector->rx_eitr - 1 : ret_itr);
+                r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
+                                      r_idx + 1);
+        }
+
+        current_itr = max(q_vector->rx_eitr, q_vector->tx_eitr);
+
+        switch (current_itr) {
+        /* counts and packets in update_itr are dependent on these numbers */
+        case lowest_latency:
+                new_itr = 100000;
+                break;
+        case low_latency:
+                new_itr = 20000; /* aka hwitr = ~200 */
+                break;
+        case bulk_latency:
+        default:
+                new_itr = 8000;
+                break;
+        }
+
+        if (new_itr != q_vector->eitr) {
+                u32 itr_reg;
+                /* do an exponential smoothing */
+                new_itr = ((q_vector->eitr * 90)/100) + ((new_itr * 10)/100);
+                q_vector->eitr = new_itr;
+                itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr);
+                /* must write high and low 16 bits to reset counter */
+                DPRINTK(TX_ERR, DEBUG, "writing eitr(%d): %08X\n", v_idx,
+                        itr_reg);
+                IXGBE_WRITE_REG(hw, IXGBE_EITR(v_idx), itr_reg | (itr_reg)<<16);
+        }
+
+        return;
 }
 
 static irqreturn_t ixgbe_msix_lsc(int irq, void *data)
@@ -614,153 +895,302 @@ static irqreturn_t ixgbe_msix_lsc(int irq, void *data)
 
 static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
 {
-        struct ixgbe_ring *txr = data;
-        struct ixgbe_adapter *adapter = txr->adapter;
+        struct ixgbe_q_vector *q_vector = data;
+        struct ixgbe_adapter  *adapter = q_vector->adapter;
+        struct ixgbe_ring     *txr;
+        int i, r_idx;
 
-        ixgbe_clean_tx_irq(adapter, txr);
+        if (!q_vector->txr_count)
+                return IRQ_HANDLED;
+
+        r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
+        for (i = 0; i < q_vector->txr_count; i++) {
+                txr = &(adapter->tx_ring[r_idx]);
+#ifdef CONFIG_DCA
+                if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+                        ixgbe_update_tx_dca(adapter, txr);
+#endif
+                txr->total_bytes = 0;
+                txr->total_packets = 0;
+                ixgbe_clean_tx_irq(adapter, txr);
+                r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
+                                      r_idx + 1);
+        }
 
         return IRQ_HANDLED;
 }
 
+/**
+ * ixgbe_msix_clean_rx - single unshared vector rx clean (all queues)
+ * @irq: unused
+ * @data: pointer to our q_vector struct for this interrupt vector
+ **/
 static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
 {
-        struct ixgbe_ring *rxr = data;
-        struct ixgbe_adapter *adapter = rxr->adapter;
+        struct ixgbe_q_vector *q_vector = data;
+        struct ixgbe_adapter  *adapter = q_vector->adapter;
+        struct ixgbe_ring  *rxr;
+        int r_idx;
+
+        r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+        if (!q_vector->rxr_count)
+                return IRQ_HANDLED;
+
+        rxr = &(adapter->rx_ring[r_idx]);
+        /* disable interrupts on this vector only */
+        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rxr->v_idx);
+        rxr->total_bytes = 0;
+        rxr->total_packets = 0;
+        netif_rx_schedule(adapter->netdev, &q_vector->napi);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t ixgbe_msix_clean_many(int irq, void *data)
+{
+        ixgbe_msix_clean_rx(irq, data);
+        ixgbe_msix_clean_tx(irq, data);
 
-        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rxr->eims_value);
-        netif_rx_schedule(adapter->netdev, &adapter->napi);
         return IRQ_HANDLED;
 }
 
+/**
+ * ixgbe_clean_rxonly - msix (aka one shot) rx clean routine
+ * @napi: napi struct with our devices info in it
+ * @budget: amount of work driver is allowed to do this pass, in packets
+ *
+ **/
 static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
 {
-        struct ixgbe_adapter *adapter = container_of(napi,
-                                        struct ixgbe_adapter, napi);
-        struct net_device *netdev = adapter->netdev;
+        struct ixgbe_q_vector *q_vector =
+                               container_of(napi, struct ixgbe_q_vector, napi);
+        struct ixgbe_adapter *adapter = q_vector->adapter;
+        struct ixgbe_ring *rxr;
         int work_done = 0;
-        struct ixgbe_ring *rxr = adapter->rx_ring;
+        long r_idx;
 
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(netdev))
-                goto quit_polling;
+        r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+        rxr = &(adapter->rx_ring[r_idx]);
+#ifdef CONFIG_DCA
+        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+                ixgbe_update_rx_dca(adapter, rxr);
+#endif
 
         ixgbe_clean_rx_irq(adapter, rxr, &work_done, budget);
 
-        /* If no Tx and not enough Rx work done, exit the polling mode */
-        if ((work_done < budget) || !netif_running(netdev)) {
-quit_polling:
-                netif_rx_complete(netdev, napi);
+        /* If all Rx work done, exit the polling mode */
+        if (work_done < budget) {
+                netif_rx_complete(adapter->netdev, napi);
+                if (adapter->rx_eitr < IXGBE_MIN_ITR_USECS)
+                        ixgbe_set_itr_msix(q_vector);
                 if (!test_bit(__IXGBE_DOWN, &adapter->state))
-                        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS,
-                                        rxr->eims_value);
+                        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, rxr->v_idx);
         }
 
         return work_done;
 }
 
+static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,
+                                     int r_idx)
+{
+        a->q_vector[v_idx].adapter = a;
+        set_bit(r_idx, a->q_vector[v_idx].rxr_idx);
+        a->q_vector[v_idx].rxr_count++;
+        a->rx_ring[r_idx].v_idx = 1 << v_idx;
+}
+
+static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,
+                                     int r_idx)
+{
+        a->q_vector[v_idx].adapter = a;
+        set_bit(r_idx, a->q_vector[v_idx].txr_idx);
+        a->q_vector[v_idx].txr_count++;
+        a->tx_ring[r_idx].v_idx = 1 << v_idx;
+}
+
 /**
- * ixgbe_setup_msix - Initialize MSI-X interrupts
+ * ixgbe_map_rings_to_vectors - Maps descriptor rings to vectors
+ * @adapter: board private structure to initialize
+ * @vectors: allotted vector count for descriptor rings
  *
- * ixgbe_setup_msix allocates MSI-X vectors and requests
- * interrutps from the kernel.
+ * This function maps descriptor rings to the queue-specific vectors
+ * we were allotted through the MSI-X enabling code.  Ideally, we'd have
+ * one vector per ring/queue, but on a constrained vector budget, we
+ * group the rings as "efficiently" as possible.  You would add new
+ * mapping configurations in here.
  **/
-static int ixgbe_setup_msix(struct ixgbe_adapter *adapter)
-{
-        struct net_device *netdev = adapter->netdev;
-        int i, int_vector = 0, err = 0;
-        int max_msix_count;
+static int ixgbe_map_rings_to_vectors(struct ixgbe_adapter *adapter,
+                                      int vectors)
+{
+        int v_start = 0;
+        int rxr_idx = 0, txr_idx = 0;
+        int rxr_remaining = adapter->num_rx_queues;
+        int txr_remaining = adapter->num_tx_queues;
+        int i, j;
+        int rqpv, tqpv;
+        int err = 0;
+
+        /* No mapping required if MSI-X is disabled. */
+        if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
+                goto out;
 
-        /* +1 for the LSC interrupt */
-        max_msix_count = adapter->num_rx_queues + adapter->num_tx_queues + 1;
-        adapter->msix_entries = kcalloc(max_msix_count,
-                                        sizeof(struct msix_entry), GFP_KERNEL);
-        if (!adapter->msix_entries)
-                return -ENOMEM;
+        /*
+         * The ideal configuration...
+         * We have enough vectors to map one per queue.
+         */
+        if (vectors == adapter->num_rx_queues + adapter->num_tx_queues) {
+                for (; rxr_idx < rxr_remaining; v_start++, rxr_idx++)
+                        map_vector_to_rxq(adapter, v_start, rxr_idx);
 
-        for (i = 0; i < max_msix_count; i++)
-                adapter->msix_entries[i].entry = i;
+                for (; txr_idx < txr_remaining; v_start++, txr_idx++)
+                        map_vector_to_txq(adapter, v_start, txr_idx);
 
-        err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
-                              max_msix_count);
-        if (err)
                 goto out;
+        }
 
-        for (i = 0; i < adapter->num_tx_queues; i++) {
-                sprintf(adapter->tx_ring[i].name, "%s-tx%d", netdev->name, i);
-                err = request_irq(adapter->msix_entries[int_vector].vector,
-                                  &ixgbe_msix_clean_tx,
-                                  0,
-                                  adapter->tx_ring[i].name,
-                                  &(adapter->tx_ring[i]));
-                if (err) {
-                        DPRINTK(PROBE, ERR,
-                                "request_irq failed for MSIX interrupt "
-                                "Error: %d\n", err);
-                        goto release_irqs;
+        /*
+         * If we don't have enough vectors for a 1-to-1
+         * mapping, we'll have to group them so there are
+         * multiple queues per vector.
+         */
+        /* Re-adjusting *qpv takes care of the remainder. */
+        for (i = v_start; i < vectors; i++) {
+                rqpv = DIV_ROUND_UP(rxr_remaining, vectors - i);
+                for (j = 0; j < rqpv; j++) {
+                        map_vector_to_rxq(adapter, i, rxr_idx);
+                        rxr_idx++;
+                        rxr_remaining--;
+                }
+        }
+        for (i = v_start; i < vectors; i++) {
+                tqpv = DIV_ROUND_UP(txr_remaining, vectors - i);
+                for (j = 0; j < tqpv; j++) {
+                        map_vector_to_txq(adapter, i, txr_idx);
+                        txr_idx++;
+                        txr_remaining--;
                 }
-                adapter->tx_ring[i].eims_value =
-                    (1 << IXGBE_MSIX_VECTOR(int_vector));
-                adapter->tx_ring[i].itr_register = IXGBE_EITR(int_vector);
-                int_vector++;
         }
 
-        for (i = 0; i < adapter->num_rx_queues; i++) {
-                if (strlen(netdev->name) < (IFNAMSIZ - 5))
-                        sprintf(adapter->rx_ring[i].name,
-                                "%s-rx%d", netdev->name, i);
-                else
-                        memcpy(adapter->rx_ring[i].name,
-                               netdev->name, IFNAMSIZ);
-                err = request_irq(adapter->msix_entries[int_vector].vector,
-                                  &ixgbe_msix_clean_rx, 0,
-                                  adapter->rx_ring[i].name,
-                                  &(adapter->rx_ring[i]));
+out:
+        return err;
+}
+
+/**
+ * ixgbe_request_msix_irqs - Initialize MSI-X interrupts
+ * @adapter: board private structure
+ *
+ * ixgbe_request_msix_irqs allocates MSI-X vectors and requests
+ * interrupts from the kernel.
+ **/
+static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+        irqreturn_t (*handler)(int, void *);
+        int i, vector, q_vectors, err;
+
+        /* Decrement for Other and TCP Timer vectors */
+        q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+        /* Map the Tx/Rx rings to the vectors we were allotted. */
+        err = ixgbe_map_rings_to_vectors(adapter, q_vectors);
+        if (err)
+                goto out;
+
+#define SET_HANDLER(_v) ((!(_v)->rxr_count) ? &ixgbe_msix_clean_tx : \
+                         (!(_v)->txr_count) ? &ixgbe_msix_clean_rx : \
+                         &ixgbe_msix_clean_many)
+        for (vector = 0; vector < q_vectors; vector++) {
+                handler = SET_HANDLER(&adapter->q_vector[vector]);
+                sprintf(adapter->name[vector], "%s:v%d-%s",
+                        netdev->name, vector,
+                        (handler == &ixgbe_msix_clean_rx) ? "Rx" :
+                         ((handler == &ixgbe_msix_clean_tx) ? "Tx" : "TxRx"));
+                err = request_irq(adapter->msix_entries[vector].vector,
+                                  handler, 0, adapter->name[vector],
+                                  &(adapter->q_vector[vector]));
                 if (err) {
                         DPRINTK(PROBE, ERR,
                                 "request_irq failed for MSIX interrupt "
                                 "Error: %d\n", err);
-                        goto release_irqs;
+                        goto free_queue_irqs;
                 }
-
-                adapter->rx_ring[i].eims_value =
-                    (1 << IXGBE_MSIX_VECTOR(int_vector));
-                adapter->rx_ring[i].itr_register = IXGBE_EITR(int_vector);
-                int_vector++;
         }
 
-        sprintf(adapter->lsc_name, "%s-lsc", netdev->name);
-        err = request_irq(adapter->msix_entries[int_vector].vector,
-                          &ixgbe_msix_lsc, 0, adapter->lsc_name, netdev);
+        sprintf(adapter->name[vector], "%s:lsc", netdev->name);
+        err = request_irq(adapter->msix_entries[vector].vector,
+                          &ixgbe_msix_lsc, 0, adapter->name[vector], netdev);
         if (err) {
                 DPRINTK(PROBE, ERR,
                         "request_irq for msix_lsc failed: %d\n", err);
-                goto release_irqs;
+                goto free_queue_irqs;
         }
 
-        /* FIXME: implement netif_napi_remove() instead */
-        adapter->napi.poll = ixgbe_clean_rxonly;
-        adapter->flags |= IXGBE_FLAG_MSIX_ENABLED;
         return 0;
 
-release_irqs:
-        int_vector--;
-        for (; int_vector >= adapter->num_tx_queues; int_vector--)
-                free_irq(adapter->msix_entries[int_vector].vector,
-                         &(adapter->rx_ring[int_vector -
-                                            adapter->num_tx_queues]));
-
-        for (; int_vector >= 0; int_vector--)
-                free_irq(adapter->msix_entries[int_vector].vector,
-                         &(adapter->tx_ring[int_vector]));
-out:
+free_queue_irqs:
+        for (i = vector - 1; i >= 0; i--)
+                free_irq(adapter->msix_entries[--vector].vector,
+                         &(adapter->q_vector[i]));
+        adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
+        pci_disable_msix(adapter->pdev);
         kfree(adapter->msix_entries);
         adapter->msix_entries = NULL;
-        adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
+out:
         return err;
 }
 
+static void ixgbe_set_itr(struct ixgbe_adapter *adapter)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        struct ixgbe_q_vector *q_vector = adapter->q_vector;
+        u8 current_itr;
+        u32 new_itr = q_vector->eitr;
+        struct ixgbe_ring *rx_ring = &adapter->rx_ring[0];
+        struct ixgbe_ring *tx_ring = &adapter->tx_ring[0];
+
+        q_vector->tx_eitr = ixgbe_update_itr(adapter, new_itr,
+                                             q_vector->tx_eitr,
+                                             tx_ring->total_packets,
+                                             tx_ring->total_bytes);
+        q_vector->rx_eitr = ixgbe_update_itr(adapter, new_itr,
+                                             q_vector->rx_eitr,
+                                             rx_ring->total_packets,
+                                             rx_ring->total_bytes);
+
+        current_itr = max(q_vector->rx_eitr, q_vector->tx_eitr);
+
+        switch (current_itr) {
+        /* counts and packets in update_itr are dependent on these numbers */
+        case lowest_latency:
+                new_itr = 100000;
+                break;
+        case low_latency:
+                new_itr = 20000; /* aka hwitr = ~200 */
+                break;
+        case bulk_latency:
+                new_itr = 8000;
+                break;
+        default:
+                break;
+        }
+
+        if (new_itr != q_vector->eitr) {
+                u32 itr_reg;
+                /* do an exponential smoothing */
+                new_itr = ((q_vector->eitr * 90)/100) + ((new_itr * 10)/100);
+                q_vector->eitr = new_itr;
+                itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr);
+                /* must write high and low 16 bits to reset counter */
+                IXGBE_WRITE_REG(hw, IXGBE_EITR(0), itr_reg | (itr_reg)<<16);
+        }
+
+        return;
+}
+
+static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter);
+
 /**
- * ixgbe_intr - Interrupt Handler
+ * ixgbe_intr - legacy mode Interrupt Handler
  * @irq: interrupt number
  * @data: pointer to a network interface device structure
  * @pt_regs: CPU registers structure
@@ -772,8 +1202,10 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
         struct ixgbe_hw *hw = &adapter->hw;
         u32 eicr;
 
-        eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
 
+        /* for NAPI, using EIAM to auto-mask tx/rx interrupt bits on read
+         * therefore no explict interrupt disable is necessary */
+        eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
         if (!eicr)
                 return IRQ_NONE;        /* Not our interrupt */
 
@@ -782,16 +1214,33 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
                 if (!test_bit(__IXGBE_DOWN, &adapter->state))
                         mod_timer(&adapter->watchdog_timer, jiffies);
         }
-        if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
-                /* Disable interrupts and register for poll. The flush of the
-                 * posted write is intentionally left out. */
-                IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);
-                __netif_rx_schedule(netdev, &adapter->napi);
+
+
+        if (netif_rx_schedule_prep(netdev, &adapter->q_vector[0].napi)) {
+                adapter->tx_ring[0].total_packets = 0;
+                adapter->tx_ring[0].total_bytes = 0;
+                adapter->rx_ring[0].total_packets = 0;
+                adapter->rx_ring[0].total_bytes = 0;
+                /* would disable interrupts here but EIAM disabled it */
+                __netif_rx_schedule(netdev, &adapter->q_vector[0].napi);
         }
 
         return IRQ_HANDLED;
 }
 
+static inline void ixgbe_reset_q_vectors(struct ixgbe_adapter *adapter)
+{
+        int i, q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+        for (i = 0; i < q_vectors; i++) {
+                struct ixgbe_q_vector *q_vector = &adapter->q_vector[i];
+                bitmap_zero(q_vector->rxr_idx, MAX_RX_QUEUES);
+                bitmap_zero(q_vector->txr_idx, MAX_TX_QUEUES);
+                q_vector->rxr_count = 0;
+                q_vector->txr_count = 0;
+        }
+}
+
 /**
  * ixgbe_request_irq - initialize interrupts
  * @adapter: board private structure
@@ -799,40 +1248,24 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
  * Attempts to configure interrupts using the best available
  * capabilities of the hardware and kernel.
  **/
-static int ixgbe_request_irq(struct ixgbe_adapter *adapter, u32 *num_rx_queues)
+static int ixgbe_request_irq(struct ixgbe_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        int flags, err;
-        irq_handler_t handler = ixgbe_intr;
-
-        flags = IRQF_SHARED;
-
-        err = ixgbe_setup_msix(adapter);
-        if (!err)
-                goto request_done;
-
-        /*
-         * if we can't do MSI-X, fall through and try MSI
-         * No need to reallocate memory since we're decreasing the number of
-         * queues. We just won't use the other ones, also it is freed correctly
-         * on ixgbe_remove.
-         */
-        *num_rx_queues = 1;
+        int err;
 
-        /* do MSI */
-        err = pci_enable_msi(adapter->pdev);
-        if (!err) {
-                adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
-                flags &= ~IRQF_SHARED;
-                handler = &ixgbe_intr;
+        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+                err = ixgbe_request_msix_irqs(adapter);
+        } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
+                err = request_irq(adapter->pdev->irq, &ixgbe_intr, 0,
+                                  netdev->name, netdev);
+        } else {
+                err = request_irq(adapter->pdev->irq, &ixgbe_intr, IRQF_SHARED,
+                                  netdev->name, netdev);
         }
 
-        err = request_irq(adapter->pdev->irq, handler, flags,
-                          netdev->name, netdev);
         if (err)
                 DPRINTK(PROBE, ERR, "request_irq failed, Error %d\n", err);
 
-request_done:
         return err;
 }
 
@@ -841,28 +1274,22 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
 
         if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-                int i;
+                int i, q_vectors;
 
-                for (i = 0; i < adapter->num_tx_queues; i++)
-                        free_irq(adapter->msix_entries[i].vector,
-                                 &(adapter->tx_ring[i]));
-                for (i = 0; i < adapter->num_rx_queues; i++)
-                        free_irq(adapter->msix_entries[i +
-                                                adapter->num_tx_queues].vector,
-                                &(adapter->rx_ring[i]));
-                i = adapter->num_rx_queues + adapter->num_tx_queues;
+                q_vectors = adapter->num_msix_vectors;
+
+                i = q_vectors - 1;
                 free_irq(adapter->msix_entries[i].vector, netdev);
-                pci_disable_msix(adapter->pdev);
-                kfree(adapter->msix_entries);
-                adapter->msix_entries = NULL;
-                adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
-                return;
-        }
 
-        free_irq(adapter->pdev->irq, netdev);
-        if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
-                pci_disable_msi(adapter->pdev);
-                adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
+                i--;
+                for (; i >= 0; i--) {
+                        free_irq(adapter->msix_entries[i].vector,
+                                 &(adapter->q_vector[i]));
+                }
+
+                ixgbe_reset_q_vectors(adapter);
+        } else {
+                free_irq(adapter->pdev->irq, netdev);
         }
 }
 
@@ -874,7 +1301,13 @@ static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
 {
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);
         IXGBE_WRITE_FLUSH(&adapter->hw);
-        synchronize_irq(adapter->pdev->irq);
+        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+                int i;
+                for (i = 0; i < adapter->num_msix_vectors; i++)
+                        synchronize_irq(adapter->msix_entries[i].vector);
+        } else {
+                synchronize_irq(adapter->pdev->irq);
+        }
 }
 
 /**
@@ -883,12 +1316,9 @@ static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
  **/
 static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)
 {
-        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
-                IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIAC,
-                                (IXGBE_EIMS_ENABLE_MASK &
-                                 ~(IXGBE_EIMS_OTHER | IXGBE_EIMS_LSC)));
-        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS,
-                        IXGBE_EIMS_ENABLE_MASK);
+        u32 mask;
+        mask = IXGBE_EIMS_ENABLE_MASK;
+        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);
         IXGBE_WRITE_FLUSH(&adapter->hw);
 }
 
@@ -898,20 +1328,18 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)
  **/
 static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)
 {
-        int i;
         struct ixgbe_hw *hw = &adapter->hw;
 
-        if (adapter->rx_eitr)
-                IXGBE_WRITE_REG(hw, IXGBE_EITR(0),
-                                EITR_INTS_PER_SEC_TO_REG(adapter->rx_eitr));
-
-        /* for re-triggering the interrupt in non-NAPI mode */
-        adapter->rx_ring[0].eims_value = (1 << IXGBE_MSIX_VECTOR(0));
-        adapter->tx_ring[0].eims_value = (1 << IXGBE_MSIX_VECTOR(0));
+        IXGBE_WRITE_REG(hw, IXGBE_EITR(0),
+                        EITR_INTS_PER_SEC_TO_REG(adapter->rx_eitr));
 
         ixgbe_set_ivar(adapter, IXGBE_IVAR_RX_QUEUE(0), 0);
-        for (i = 0; i < adapter->num_tx_queues; i++)
-                ixgbe_set_ivar(adapter, IXGBE_IVAR_TX_QUEUE(i), i);
+        ixgbe_set_ivar(adapter, IXGBE_IVAR_TX_QUEUE(0), 0);
+
+        map_vector_to_rxq(adapter, 0, 0);
+        map_vector_to_txq(adapter, 0, 0);
+
+        DPRINTK(HW, INFO, "Legacy interrupt IVAR setup done\n");
 }
 
 /**
@@ -924,23 +1352,29 @@ static void ixgbe_configure_tx(struct ixgbe_adapter *adapter)
 {
         u64 tdba;
         struct ixgbe_hw *hw = &adapter->hw;
-        u32 i, tdlen;
+        u32 i, j, tdlen, txctrl;
 
         /* Setup the HW Tx Head and Tail descriptor pointers */
         for (i = 0; i < adapter->num_tx_queues; i++) {
+                j = adapter->tx_ring[i].reg_idx;
                 tdba = adapter->tx_ring[i].dma;
                 tdlen = adapter->tx_ring[i].count *
-                    sizeof(union ixgbe_adv_tx_desc);
-                IXGBE_WRITE_REG(hw, IXGBE_TDBAL(i), (tdba & DMA_32BIT_MASK));
-                IXGBE_WRITE_REG(hw, IXGBE_TDBAH(i), (tdba >> 32));
-                IXGBE_WRITE_REG(hw, IXGBE_TDLEN(i), tdlen);
-                IXGBE_WRITE_REG(hw, IXGBE_TDH(i), 0);
-                IXGBE_WRITE_REG(hw, IXGBE_TDT(i), 0);
-                adapter->tx_ring[i].head = IXGBE_TDH(i);
-                adapter->tx_ring[i].tail = IXGBE_TDT(i);
+                        sizeof(union ixgbe_adv_tx_desc);
+                IXGBE_WRITE_REG(hw, IXGBE_TDBAL(j),
+                                (tdba & DMA_32BIT_MASK));
+                IXGBE_WRITE_REG(hw, IXGBE_TDBAH(j), (tdba >> 32));
+                IXGBE_WRITE_REG(hw, IXGBE_TDLEN(j), tdlen);
+                IXGBE_WRITE_REG(hw, IXGBE_TDH(j), 0);
+                IXGBE_WRITE_REG(hw, IXGBE_TDT(j), 0);
+                adapter->tx_ring[i].head = IXGBE_TDH(j);
+                adapter->tx_ring[i].tail = IXGBE_TDT(j);
+                /* Disable Tx Head Writeback RO bit, since this hoses
+                 * bookkeeping if things aren't delivered in order.
+                 */
+                txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));
+                txctrl &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
+                IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(i), txctrl);
         }
-
-        IXGBE_WRITE_REG(hw, IXGBE_TIPG, IXGBE_TIPG_FIBER_DEFAULT);
 }
 
 #define PAGE_USE_COUNT(S) (((S) >> PAGE_SHIFT) + \
@@ -959,13 +1393,12 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
         struct ixgbe_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
         int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        int i, j;
         u32 rdlen, rxctrl, rxcsum;
         u32 random[10];
-        u32 reta, mrqc;
-        int i;
         u32 fctrl, hlreg0;
-        u32 srrctl;
         u32 pages;
+        u32 reta = 0, mrqc, srrctl;
 
         /* Decide whether to use packet split mode or not */
         if (netdev->mtu > ETH_DATA_LEN)
@@ -985,6 +1418,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
 
         fctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_FCTRL);
         fctrl |= IXGBE_FCTRL_BAM;
+        fctrl |= IXGBE_FCTRL_DPF; /* discard pause frames when FC enabled */
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCTRL, fctrl);
 
         hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
@@ -1036,37 +1470,23 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
                 adapter->rx_ring[i].tail = IXGBE_RDT(i);
         }
 
-        if (adapter->num_rx_queues > 1) {
-                /* Random 40bytes used as random key in RSS hash function */
-                get_random_bytes(&random[0], 40);
-
-                switch (adapter->num_rx_queues) {
-                case 8:
-                case 4:
-                        /* Bits [3:0] in each byte refers the Rx queue no */
-                        reta = 0x00010203;
-                        break;
-                case 2:
-                        reta = 0x00010001;
-                        break;
-                default:
-                        reta = 0x00000000;
-                        break;
-                }
-
+        if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
                 /* Fill out redirection table */
-                for (i = 0; i < 32; i++) {
-                        IXGBE_WRITE_REG_ARRAY(hw, IXGBE_RETA(0), i, reta);
-                        if (adapter->num_rx_queues > 4) {
-                                i++;
-                                IXGBE_WRITE_REG_ARRAY(hw, IXGBE_RETA(0), i,
-                                                      0x04050607);
-                        }
+                for (i = 0, j = 0; i < 128; i++, j++) {
+                        if (j == adapter->ring_feature[RING_F_RSS].indices)
+                                j = 0;
+                        /* reta = 4-byte sliding window of
+                         * 0x00..(indices-1)(indices-1)00..etc. */
+                        reta = (reta << 8) | (j * 0x11);
+                        if ((i & 3) == 3)
+                                IXGBE_WRITE_REG(hw, IXGBE_RETA(i >> 2), reta);
                 }
 
                 /* Fill out hash function seeds */
+                /* XXX use a random constant here to glue certain flows */
+                get_random_bytes(&random[0], 40);
                 for (i = 0; i < 10; i++)
-                        IXGBE_WRITE_REG_ARRAY(hw, IXGBE_RSSRK(0), i, random[i]);
+                        IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), random[i]);
 
                 mrqc = IXGBE_MRQC_RSSEN
                     /* Perform hash on these packet types */
@@ -1080,26 +1500,23 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
                     | IXGBE_MRQC_RSS_FIELD_IPV6_UDP
                     | IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;
                 IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);
+        }
+
+        rxcsum = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
 
-                /* Multiqueue and packet checksumming are mutually exclusive. */
-                rxcsum = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
+        if (adapter->flags & IXGBE_FLAG_RSS_ENABLED ||
+            adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED) {
+                /* Disable indicating checksum in descriptor, enables
+                 * RSS hash */
                 rxcsum |= IXGBE_RXCSUM_PCSD;
-                IXGBE_WRITE_REG(hw, IXGBE_RXCSUM, rxcsum);
-        } else {
-                /* Enable Receive Checksum Offload for TCP and UDP */
-                rxcsum = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
-                if (adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED) {
-                        /* Enable IPv4 payload checksum for UDP fragments
-                         * Must be used in conjunction with packet-split. */
-                        rxcsum |= IXGBE_RXCSUM_IPPCSE;
-                } else {
-                        /* don't need to clear IPPCSE as it defaults to 0 */
-                }
-                IXGBE_WRITE_REG(hw, IXGBE_RXCSUM, rxcsum);
         }
-        /* Enable Receives */
-        IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl);
-        rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
+        if (!(rxcsum & IXGBE_RXCSUM_PCSD)) {
+                /* Enable IPv4 payload checksum for UDP fragments
+                 * if PCSD is not set */
+                rxcsum |= IXGBE_RXCSUM_IPPCSE;
+        }
+
+        IXGBE_WRITE_REG(hw, IXGBE_RXCSUM, rxcsum);
 }
 
 static void ixgbe_vlan_rx_register(struct net_device *netdev,
@@ -1219,6 +1636,42 @@ static void ixgbe_set_multi(struct net_device *netdev)
 
 }
 
+static void ixgbe_napi_enable_all(struct ixgbe_adapter *adapter)
+{
+        int q_idx;
+        struct ixgbe_q_vector *q_vector;
+        int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+        /* legacy and MSI only use one vector */
+        if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
+                q_vectors = 1;
+
+        for (q_idx = 0; q_idx < q_vectors; q_idx++) {
+                q_vector = &adapter->q_vector[q_idx];
+                if (!q_vector->rxr_count)
+                        continue;
+                napi_enable(&q_vector->napi);
+        }
+}
+
+static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter)
+{
+        int q_idx;
+        struct ixgbe_q_vector *q_vector;
+        int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+        /* legacy and MSI only use one vector */
+        if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
+                q_vectors = 1;
+
+        for (q_idx = 0; q_idx < q_vectors; q_idx++) {
+                q_vector = &adapter->q_vector[q_idx];
+                if (!q_vector->rxr_count)
+                        continue;
+                napi_disable(&q_vector->napi);
+        }
+}
+
 static void ixgbe_configure(struct ixgbe_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
@@ -1238,30 +1691,35 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter)
 static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        int i;
-        u32 gpie = 0;
         struct ixgbe_hw *hw = &adapter->hw;
-        u32 txdctl, rxdctl, mhadd;
+        int i, j = 0;
         int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        u32 txdctl, rxdctl, mhadd;
+        u32 gpie;
 
         ixgbe_get_hw_control(adapter);
 
-        if (adapter->flags & (IXGBE_FLAG_MSIX_ENABLED |
-                              IXGBE_FLAG_MSI_ENABLED)) {
+        if ((adapter->flags & IXGBE_FLAG_MSIX_ENABLED) ||
+            (adapter->flags & IXGBE_FLAG_MSI_ENABLED)) {
                 if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
                         gpie = (IXGBE_GPIE_MSIX_MODE | IXGBE_GPIE_EIAME |
                                 IXGBE_GPIE_PBA_SUPPORT | IXGBE_GPIE_OCD);
                 } else {
                         /* MSI only */
-                        gpie = (IXGBE_GPIE_EIAME |
-                                IXGBE_GPIE_PBA_SUPPORT);
+                        gpie = 0;
                 }
-                IXGBE_WRITE_REG(&adapter->hw, IXGBE_GPIE, gpie);
-                gpie = IXGBE_READ_REG(&adapter->hw, IXGBE_GPIE);
+                /* XXX: to interrupt immediately for EICS writes, enable this */
+                /* gpie |= IXGBE_GPIE_EIMEN; */
+                IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
         }
 
-        mhadd = IXGBE_READ_REG(hw, IXGBE_MHADD);
+        if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
+                /* legacy interrupts, use EIAM to auto-mask when reading EICR,
+                 * specifically only auto mask tx and rx interrupts */
+                IXGBE_WRITE_REG(hw, IXGBE_EIAM, IXGBE_EICS_RTX_QUEUE);
+        }
 
+        mhadd = IXGBE_READ_REG(hw, IXGBE_MHADD);
         if (max_frame != (mhadd >> IXGBE_MHADD_MFS_SHIFT)) {
                 mhadd &= ~IXGBE_MHADD_MFS_MASK;
                 mhadd |= max_frame << IXGBE_MHADD_MFS_SHIFT;
@@ -1270,15 +1728,21 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
         }
 
         for (i = 0; i < adapter->num_tx_queues; i++) {
-                txdctl = IXGBE_READ_REG(&adapter->hw, IXGBE_TXDCTL(i));
+                j = adapter->tx_ring[i].reg_idx;
+                txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(j));
                 txdctl |= IXGBE_TXDCTL_ENABLE;
-                IXGBE_WRITE_REG(&adapter->hw, IXGBE_TXDCTL(i), txdctl);
+                IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(j), txdctl);
         }
 
         for (i = 0; i < adapter->num_rx_queues; i++) {
-                rxdctl = IXGBE_READ_REG(&adapter->hw, IXGBE_RXDCTL(i));
+                j = adapter->rx_ring[i].reg_idx;
+                rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));
+                /* enable PTHRESH=32 descriptors (half the internal cache)
+                 * and HTHRESH=0 descriptors (to minimize latency on fetch),
+                 * this also removes a pesky rx_no_buffer_count increment */
+                rxdctl |= 0x0020;
                 rxdctl |= IXGBE_RXDCTL_ENABLE;
-                IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXDCTL(i), rxdctl);
+                IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(j), rxdctl);
         }
         /* enable all receives */
         rxdctl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
@@ -1291,7 +1755,11 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
                 ixgbe_configure_msi_and_legacy(adapter);
 
         clear_bit(__IXGBE_DOWN, &adapter->state);
-        napi_enable(&adapter->napi);
+        ixgbe_napi_enable_all(adapter);
+
+        /* clear any pending interrupts, may auto mask */
+        IXGBE_READ_REG(hw, IXGBE_EICR);
+
         ixgbe_irq_enable(adapter);
 
         /* bring the link up in the watchdog, this could race with our first
@@ -1333,7 +1801,7 @@ static int ixgbe_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
-        u32 err, num_rx_queues = adapter->num_rx_queues;
+        u32 err;
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
@@ -1349,7 +1817,7 @@ static int ixgbe_resume(struct pci_dev *pdev)
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
         if (netif_running(netdev)) {
-                err = ixgbe_request_irq(adapter, &num_rx_queues);
+                err = ixgbe_request_irq(adapter);
                 if (err)
                         return err;
         }
@@ -1449,27 +1917,27 @@ static void ixgbe_clean_tx_ring(struct ixgbe_adapter *adapter,
 }
 
 /**
- * ixgbe_clean_all_tx_rings - Free Tx Buffers for all queues
+ * ixgbe_clean_all_rx_rings - Free Rx Buffers for all queues
  * @adapter: board private structure
  **/
-static void ixgbe_clean_all_tx_rings(struct ixgbe_adapter *adapter)
+static void ixgbe_clean_all_rx_rings(struct ixgbe_adapter *adapter)
 {
         int i;
 
-        for (i = 0; i < adapter->num_tx_queues; i++)
-                ixgbe_clean_tx_ring(adapter, &adapter->tx_ring[i]);
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                ixgbe_clean_rx_ring(adapter, &adapter->rx_ring[i]);
 }
 
 /**
- * ixgbe_clean_all_rx_rings - Free Rx Buffers for all queues
+ * ixgbe_clean_all_tx_rings - Free Tx Buffers for all queues
  * @adapter: board private structure
  **/
-static void ixgbe_clean_all_rx_rings(struct ixgbe_adapter *adapter)
+static void ixgbe_clean_all_tx_rings(struct ixgbe_adapter *adapter)
 {
         int i;
 
-        for (i = 0; i < adapter->num_rx_queues; i++)
-                ixgbe_clean_rx_ring(adapter, &adapter->rx_ring[i]);
+        for (i = 0; i < adapter->num_tx_queues; i++)
+                ixgbe_clean_tx_ring(adapter, &adapter->tx_ring[i]);
 }
 
 void ixgbe_down(struct ixgbe_adapter *adapter)
@@ -1493,10 +1961,9 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
         IXGBE_WRITE_FLUSH(&adapter->hw);
         msleep(10);
 
-        napi_disable(&adapter->napi);
-
         ixgbe_irq_disable(adapter);
 
+        ixgbe_napi_disable_all(adapter);
         del_timer_sync(&adapter->watchdog_timer);
 
         netif_carrier_off(netdev);
@@ -1547,27 +2014,37 @@ static void ixgbe_shutdown(struct pci_dev *pdev)
 }
 
 /**
- * ixgbe_clean - NAPI Rx polling callback
- * @adapter: board private structure
+ * ixgbe_poll - NAPI Rx polling callback
+ * @napi: structure for representing this polling device
+ * @budget: how many packets driver is allowed to clean
+ *
+ * This function is used for legacy and MSI, NAPI mode
  **/
-static int ixgbe_clean(struct napi_struct *napi, int budget)
+static int ixgbe_poll(struct napi_struct *napi, int budget)
 {
-        struct ixgbe_adapter *adapter = container_of(napi,
-                                        struct ixgbe_adapter, napi);
-        struct net_device *netdev = adapter->netdev;
+        struct ixgbe_q_vector *q_vector = container_of(napi,
+                                          struct ixgbe_q_vector, napi);
+        struct ixgbe_adapter *adapter = q_vector->adapter;
         int tx_cleaned = 0, work_done = 0;
 
-        /* In non-MSIX case, there is no multi-Tx/Rx queue */
+#ifdef CONFIG_DCA
+        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
+                ixgbe_update_tx_dca(adapter, adapter->tx_ring);
+                ixgbe_update_rx_dca(adapter, adapter->rx_ring);
+        }
+#endif
+
         tx_cleaned = ixgbe_clean_tx_irq(adapter, adapter->tx_ring);
-        ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done,
-                           budget);
+        ixgbe_clean_rx_irq(adapter, adapter->rx_ring, &work_done, budget);
 
         if (tx_cleaned)
                 work_done = budget;
 
         /* If budget not fully consumed, exit the polling mode */
         if (work_done < budget) {
-                netif_rx_complete(netdev, napi);
+                netif_rx_complete(adapter->netdev, napi);
+                if (adapter->rx_eitr < IXGBE_MIN_ITR_USECS)
+                        ixgbe_set_itr(adapter);
                 if (!test_bit(__IXGBE_DOWN, &adapter->state))
                         ixgbe_irq_enable(adapter);
         }
@@ -1597,6 +2074,136 @@ static void ixgbe_reset_task(struct work_struct *work)
         ixgbe_reinit_locked(adapter);
 }
 
+static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
+                                       int vectors)
+{
+        int err, vector_threshold;
+
+        /* We'll want at least 3 (vector_threshold):
+         * 1) TxQ[0] Cleanup
+         * 2) RxQ[0] Cleanup
+         * 3) Other (Link Status Change, etc.)
+         * 4) TCP Timer (optional)
+         */
+        vector_threshold = MIN_MSIX_COUNT;
+
+        /* The more we get, the more we will assign to Tx/Rx Cleanup
+         * for the separate queues...where Rx Cleanup >= Tx Cleanup.
+         * Right now, we simply care about how many we'll get; we'll
+         * set them up later while requesting irq's.
+         */
+        while (vectors >= vector_threshold) {
+                err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
+                                      vectors);
+                if (!err) /* Success in acquiring all requested vectors. */
+                        break;
+                else if (err < 0)
+                        vectors = 0; /* Nasty failure, quit now */
+                else /* err == number of vectors we should try again with */
+                        vectors = err;
+        }
+
+        if (vectors < vector_threshold) {
+                /* Can't allocate enough MSI-X interrupts?  Oh well.
+                 * This just means we'll go with either a single MSI
+                 * vector or fall back to legacy interrupts.
+                 */
+                DPRINTK(HW, DEBUG, "Unable to allocate MSI-X interrupts\n");
+                adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
+                kfree(adapter->msix_entries);
+                adapter->msix_entries = NULL;
+                adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
+                adapter->num_tx_queues = 1;
+                adapter->num_rx_queues = 1;
+        } else {
+                adapter->flags |= IXGBE_FLAG_MSIX_ENABLED; /* Woot! */
+                adapter->num_msix_vectors = vectors;
+        }
+}
+
+static void __devinit ixgbe_set_num_queues(struct ixgbe_adapter *adapter)
+{
+        int nrq, ntq;
+        int feature_mask = 0, rss_i, rss_m;
+
+        /* Number of supported queues */
+        switch (adapter->hw.mac.type) {
+        case ixgbe_mac_82598EB:
+                rss_i = adapter->ring_feature[RING_F_RSS].indices;
+                rss_m = 0;
+                feature_mask |= IXGBE_FLAG_RSS_ENABLED;
+
+                switch (adapter->flags & feature_mask) {
+                case (IXGBE_FLAG_RSS_ENABLED):
+                        rss_m = 0xF;
+                        nrq = rss_i;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+                        ntq = rss_i;
+#else
+                        ntq = 1;
+#endif
+                        break;
+                case 0:
+                default:
+                        rss_i = 0;
+                        rss_m = 0;
+                        nrq = 1;
+                        ntq = 1;
+                        break;
+                }
+
+                adapter->ring_feature[RING_F_RSS].indices = rss_i;
+                adapter->ring_feature[RING_F_RSS].mask = rss_m;
+                break;
+        default:
+                nrq = 1;
+                ntq = 1;
+                break;
+        }
+
+        adapter->num_rx_queues = nrq;
+        adapter->num_tx_queues = ntq;
+}
+
+/**
+ * ixgbe_cache_ring_register - Descriptor ring to register mapping
+ * @adapter: board private structure to initialize
+ *
+ * Once we know the feature-set enabled for the device, we'll cache
+ * the register offset the descriptor ring is assigned to.
+ **/
+static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
+{
+        /* TODO: Remove all uses of the indices in the cases where multiple
+         *       features are OR'd together, if the feature set makes sense.
+         */
+        int feature_mask = 0, rss_i;
+        int i, txr_idx, rxr_idx;
+
+        /* Number of supported queues */
+        switch (adapter->hw.mac.type) {
+        case ixgbe_mac_82598EB:
+                rss_i = adapter->ring_feature[RING_F_RSS].indices;
+                txr_idx = 0;
+                rxr_idx = 0;
+                feature_mask |= IXGBE_FLAG_RSS_ENABLED;
+                switch (adapter->flags & feature_mask) {
+                case (IXGBE_FLAG_RSS_ENABLED):
+                        for (i = 0; i < adapter->num_rx_queues; i++)
+                                adapter->rx_ring[i].reg_idx = i;
+                        for (i = 0; i < adapter->num_tx_queues; i++)
+                                adapter->tx_ring[i].reg_idx = i;
+                        break;
+                case 0:
+                default:
+                        break;
+                }
+                break;
+        default:
+                break;
+        }
+}
+
 /**
  * ixgbe_alloc_queues - Allocate memory for all rings
  * @adapter: board private structure to initialize
@@ -1612,25 +2219,167 @@ static int __devinit ixgbe_alloc_queues(struct ixgbe_adapter *adapter)
         adapter->tx_ring = kcalloc(adapter->num_tx_queues,
                                    sizeof(struct ixgbe_ring), GFP_KERNEL);
         if (!adapter->tx_ring)
-                return -ENOMEM;
-
-        for (i = 0; i < adapter->num_tx_queues; i++)
-                adapter->tx_ring[i].count = IXGBE_DEFAULT_TXD;
+                goto err_tx_ring_allocation;
 
         adapter->rx_ring = kcalloc(adapter->num_rx_queues,
                                    sizeof(struct ixgbe_ring), GFP_KERNEL);
-        if (!adapter->rx_ring) {
-                kfree(adapter->tx_ring);
-                return -ENOMEM;
-        }
+        if (!adapter->rx_ring)
+                goto err_rx_ring_allocation;
 
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                adapter->tx_ring[i].count = IXGBE_DEFAULT_TXD;
+                adapter->tx_ring[i].queue_index = i;
+        }
         for (i = 0; i < adapter->num_rx_queues; i++) {
-                adapter->rx_ring[i].adapter = adapter;
-                adapter->rx_ring[i].itr_register = IXGBE_EITR(i);
                 adapter->rx_ring[i].count = IXGBE_DEFAULT_RXD;
+                adapter->rx_ring[i].queue_index = i;
+        }
+
+        ixgbe_cache_ring_register(adapter);
+
+        return 0;
+
+err_rx_ring_allocation:
+        kfree(adapter->tx_ring);
+err_tx_ring_allocation:
+        return -ENOMEM;
+}
+
+/**
+ * ixgbe_set_interrupt_capability - set MSI-X or MSI if supported
+ * @adapter: board private structure to initialize
+ *
+ * Attempt to configure the interrupts using the best available
+ * capabilities of the hardware and the kernel.
+ **/
+static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter
+                                                    *adapter)
+{
+        int err = 0;
+        int vector, v_budget;
+
+        /*
+         * It's easy to be greedy for MSI-X vectors, but it really
+         * doesn't do us much good if we have a lot more vectors
+         * than CPU's.  So let's be conservative and only ask for
+         * (roughly) twice the number of vectors as there are CPU's.
+         */
+        v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues,
+                       (int)(num_online_cpus() * 2)) + NON_Q_VECTORS;
+
+        /*
+         * At the same time, hardware can only support a maximum of
+         * MAX_MSIX_COUNT vectors.  With features such as RSS and VMDq,
+         * we can easily reach upwards of 64 Rx descriptor queues and
+         * 32 Tx queues.  Thus, we cap it off in those rare cases where
+         * the cpu count also exceeds our vector limit.
+         */
+        v_budget = min(v_budget, MAX_MSIX_COUNT);
+
+        /* A failure in MSI-X entry allocation isn't fatal, but it does
+         * mean we disable MSI-X capabilities of the adapter. */
+        adapter->msix_entries = kcalloc(v_budget,
+                                        sizeof(struct msix_entry), GFP_KERNEL);
+        if (!adapter->msix_entries) {
+                adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
+                ixgbe_set_num_queues(adapter);
+                kfree(adapter->tx_ring);
+                kfree(adapter->rx_ring);
+                err = ixgbe_alloc_queues(adapter);
+                if (err) {
+                        DPRINTK(PROBE, ERR, "Unable to allocate memory "
+                                            "for queues\n");
+                        goto out;
+                }
+
+                goto try_msi;
+        }
+
+        for (vector = 0; vector < v_budget; vector++)
+                adapter->msix_entries[vector].entry = vector;
+
+        ixgbe_acquire_msix_vectors(adapter, v_budget);
+
+        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
+                goto out;
+
+try_msi:
+        err = pci_enable_msi(adapter->pdev);
+        if (!err) {
+                adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
+        } else {
+                DPRINTK(HW, DEBUG, "Unable to allocate MSI interrupt, "
+                                   "falling back to legacy.  Error: %d\n", err);
+                /* reset err */
+                err = 0;
+        }
+
+out:
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        /* Notify the stack of the (possibly) reduced Tx Queue count. */
+        adapter->netdev->egress_subqueue_count = adapter->num_tx_queues;
+#endif
+
+        return err;
+}
+
+static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
+{
+        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+                adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
+                pci_disable_msix(adapter->pdev);
+                kfree(adapter->msix_entries);
+                adapter->msix_entries = NULL;
+        } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
+                adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
+                pci_disable_msi(adapter->pdev);
         }
+        return;
+}
+
+/**
+ * ixgbe_init_interrupt_scheme - Determine proper interrupt scheme
+ * @adapter: board private structure to initialize
+ *
+ * We determine which interrupt scheme to use based on...
+ * - Kernel support (MSI, MSI-X)
+ *   - which can be user-defined (via MODULE_PARAM)
+ * - Hardware queue count (num_*_queues)
+ *   - defined by miscellaneous hardware support/features (RSS, etc.)
+ **/
+static int __devinit ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)
+{
+        int err;
+
+        /* Number of supported queues */
+        ixgbe_set_num_queues(adapter);
+
+        err = ixgbe_alloc_queues(adapter);
+        if (err) {
+                DPRINTK(PROBE, ERR, "Unable to allocate memory for queues\n");
+                goto err_alloc_queues;
+        }
+
+        err = ixgbe_set_interrupt_capability(adapter);
+        if (err) {
+                DPRINTK(PROBE, ERR, "Unable to setup interrupt capabilities\n");
+                goto err_set_interrupt;
+        }
+
+        DPRINTK(DRV, INFO, "Multiqueue %s: Rx Queue count = %u, "
+                           "Tx Queue count = %u\n",
+                (adapter->num_rx_queues > 1) ? "Enabled" :
+                "Disabled", adapter->num_rx_queues, adapter->num_tx_queues);
+
+        set_bit(__IXGBE_DOWN, &adapter->state);
 
         return 0;
+
+err_set_interrupt:
+        kfree(adapter->tx_ring);
+        kfree(adapter->rx_ring);
+err_alloc_queues:
+        return err;
 }
 
 /**
@@ -1645,11 +2394,22 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
 {
         struct ixgbe_hw *hw = &adapter->hw;
         struct pci_dev *pdev = adapter->pdev;
+        unsigned int rss;
+
+        /* Set capability flags */
+        rss = min(IXGBE_MAX_RSS_INDICES, (int)num_online_cpus());
+        adapter->ring_feature[RING_F_RSS].indices = rss;
+        adapter->flags |= IXGBE_FLAG_RSS_ENABLED;
+
+        /* Enable Dynamic interrupt throttling by default */
+        adapter->rx_eitr = 1;
+        adapter->tx_eitr = 1;
 
         /* default flow control settings */
         hw->fc.original_type = ixgbe_fc_full;
         hw->fc.type = ixgbe_fc_full;
 
+        /* select 10G link by default */
         hw->mac.link_mode_select = IXGBE_AUTOC_LMS_10G_LINK_NO_AN;
         if (hw->mac.ops.reset(hw)) {
                 dev_err(&pdev->dev, "HW Init failed\n");
@@ -1667,16 +2427,9 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
                 return -EIO;
         }
 
-        /* Set the default values */
-        adapter->num_rx_queues = IXGBE_DEFAULT_RXQ;
-        adapter->num_tx_queues = 1;
+        /* enable rx csum by default */
         adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
 
-        if (ixgbe_alloc_queues(adapter)) {
-                dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
-                return -ENOMEM;
-        }
-
         set_bit(__IXGBE_DOWN, &adapter->state);
 
         return 0;
@@ -1716,7 +2469,6 @@ int ixgbe_setup_tx_resources(struct ixgbe_adapter *adapter,
                 return -ENOMEM;
         }
 
-        txdr->adapter = adapter;
         txdr->next_to_use = 0;
         txdr->next_to_clean = 0;
         txdr->work_limit = txdr->count;
@@ -1735,7 +2487,7 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
                              struct ixgbe_ring *rxdr)
 {
         struct pci_dev *pdev = adapter->pdev;
-        int size, desc_len;
+        int size;
 
         size = sizeof(struct ixgbe_rx_buffer) * rxdr->count;
         rxdr->rx_buffer_info = vmalloc(size);
@@ -1746,10 +2498,8 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
         }
         memset(rxdr->rx_buffer_info, 0, size);
 
-        desc_len = sizeof(union ixgbe_adv_rx_desc);
-
         /* Round up to nearest 4K */
-        rxdr->size = rxdr->count * desc_len;
+        rxdr->size = rxdr->count * sizeof(union ixgbe_adv_rx_desc);
         rxdr->size = ALIGN(rxdr->size, 4096);
 
         rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
@@ -1763,7 +2513,6 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
 
         rxdr->next_to_clean = 0;
         rxdr->next_to_use = 0;
-        rxdr->adapter = adapter;
 
         return 0;
 }
@@ -1841,8 +2590,7 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter)
 }
 
 /**
- * ixgbe_setup_all_tx_resources - wrapper to allocate Tx resources
- *                                (Descriptors) for all queues
+ * ixgbe_setup_all_tx_resources - allocate all queues Tx resources
  * @adapter: board private structure
  *
  * If this function returns with an error, then it's possible one or
@@ -1868,8 +2616,7 @@ static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)
 }
 
 /**
- * ixgbe_setup_all_rx_resources - wrapper to allocate Rx resources
- *                                (Descriptors) for all queues
+ * ixgbe_setup_all_rx_resources - allocate all queues Rx resources
  * @adapter: board private structure
  *
  * If this function returns with an error, then it's possible one or
@@ -1911,6 +2658,9 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
             (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
                 return -EINVAL;
 
+        DPRINTK(PROBE, INFO, "changing MTU from %d to %d\n",
+                netdev->mtu, new_mtu);
+        /* must set new MTU before calling down or up */
         netdev->mtu = new_mtu;
 
         if (netif_running(netdev))
@@ -1935,23 +2685,16 @@ static int ixgbe_open(struct net_device *netdev)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         int err;
-        u32 num_rx_queues = adapter->num_rx_queues;
 
         /* disallow open during test */
         if (test_bit(__IXGBE_TESTING, &adapter->state))
                 return -EBUSY;
 
-try_intr_reinit:
         /* allocate transmit descriptors */
         err = ixgbe_setup_all_tx_resources(adapter);
         if (err)
                 goto err_setup_tx;
 
-        if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
-                num_rx_queues = 1;
-                adapter->num_rx_queues = num_rx_queues;
-        }
-
         /* allocate receive descriptors */
         err = ixgbe_setup_all_rx_resources(adapter);
         if (err)
@@ -1959,31 +2702,10 @@ try_intr_reinit:
 
         ixgbe_configure(adapter);
 
-        err = ixgbe_request_irq(adapter, &num_rx_queues);
+        err = ixgbe_request_irq(adapter);
         if (err)
                 goto err_req_irq;
 
-        /* ixgbe_request might have reduced num_rx_queues */
-        if (num_rx_queues < adapter->num_rx_queues) {
-                /* We didn't get MSI-X, so we need to release everything,
-                 * set our Rx queue count to num_rx_queues, and redo the
-                 * whole init process.
-                 */
-                ixgbe_free_irq(adapter);
-                if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
-                        pci_disable_msi(adapter->pdev);
-                        adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
-                }
-                ixgbe_free_all_rx_resources(adapter);
-                ixgbe_free_all_tx_resources(adapter);
-                adapter->num_rx_queues = num_rx_queues;
-
-                /* Reset the hardware, and start over. */
-                ixgbe_reset(adapter);
-
-                goto try_intr_reinit;
-        }
-
         err = ixgbe_up_complete(adapter);
         if (err)
                 goto err_up;
@@ -2119,6 +2841,9 @@ static void ixgbe_watchdog(unsigned long data)
         struct net_device *netdev = adapter->netdev;
         bool link_up;
         u32 link_speed = 0;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        int i;
+#endif
 
         adapter->hw.mac.ops.check_link(&adapter->hw, &(link_speed), &link_up);
 
@@ -2140,6 +2865,10 @@ static void ixgbe_watchdog(unsigned long data)
 
                         netif_carrier_on(netdev);
                         netif_wake_queue(netdev);
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+                        for (i = 0; i < adapter->num_tx_queues; i++)
+                                netif_wake_subqueue(netdev, i);
+#endif
                 } else {
                         /* Force detection of hung controller */
                         adapter->detect_tx_hung = true;
@@ -2154,10 +2883,23 @@ static void ixgbe_watchdog(unsigned long data)
 
         ixgbe_update_stats(adapter);
 
-        /* Reset the timer */
-        if (!test_bit(__IXGBE_DOWN, &adapter->state))
+        if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
+                /* Cause software interrupt to ensure rx rings are cleaned */
+                if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+                        u32 eics =
+                         (1 << (adapter->num_msix_vectors - NON_Q_VECTORS)) - 1;
+                        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, eics);
+                } else {
+                        /* for legacy and MSI interrupts don't set any bits that
+                         * are enabled for EIAM, because this operation would
+                         * set *both* EIMS and EICS for any bit in EIAM */
+                        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS,
+                                     (IXGBE_EICS_TCP_TIMER | IXGBE_EICS_OTHER));
+                }
+                /* Reset the timer */
                 mod_timer(&adapter->watchdog_timer,
                           round_jiffies(jiffies + 2 * HZ));
+        }
 }
 
 static int ixgbe_tso(struct ixgbe_adapter *adapter,
@@ -2170,7 +2912,6 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,
         struct ixgbe_tx_buffer *tx_buffer_info;
         u32 vlan_macip_lens = 0, type_tucmd_mlhl = 0;
         u32 mss_l4len_idx = 0, l4len;
-        *hdr_len = 0;
 
         if (skb_is_gso(skb)) {
                 if (skb_header_cloned(skb)) {
@@ -2454,7 +3195,11 @@ static int __ixgbe_maybe_stop_tx(struct net_device *netdev,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        netif_stop_subqueue(netdev, tx_ring->queue_index);
+#else
         netif_stop_queue(netdev);
+#endif
         /* Herbert's original patch had:
          *  smp_mb__after_netif_stop_queue();
          * but since that doesn't exist yet, just open code it. */
@@ -2466,7 +3211,11 @@ static int __ixgbe_maybe_stop_tx(struct net_device *netdev,
                 return -EBUSY;
 
         /* A reprieve! - use start_queue because it doesn't call schedule */
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        netif_wake_subqueue(netdev, tx_ring->queue_index);
+#else
         netif_wake_queue(netdev);
+#endif
         ++adapter->restart_queue;
         return 0;
 }
@@ -2487,15 +3236,18 @@ static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         unsigned int len = skb->len;
         unsigned int first;
         unsigned int tx_flags = 0;
-        u8 hdr_len;
-        int tso;
+        u8 hdr_len = 0;
+        int r_idx = 0, tso;
         unsigned int mss = 0;
         int count = 0;
         unsigned int f;
         unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
         len -= skb->data_len;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        r_idx = (adapter->num_tx_queues - 1) & skb->queue_mapping;
+#endif
+        tx_ring = &adapter->tx_ring[r_idx];
 
-        tx_ring = adapter->tx_ring;
 
         if (skb->len <= 0) {
                 dev_kfree_skb(skb);
@@ -2604,6 +3356,31 @@ static void ixgbe_netpoll(struct net_device *netdev)
 #endif
 
 /**
+ * ixgbe_napi_add_all - prep napi structs for use
+ * @adapter: private struct
+ * helper function to napi_add each possible q_vector->napi
+ */
+static void ixgbe_napi_add_all(struct ixgbe_adapter *adapter)
+{
+        int i, q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+        int (*poll)(struct napi_struct *, int);
+
+        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+                poll = &ixgbe_clean_rxonly;
+        } else {
+                poll = &ixgbe_poll;
+                /* only one q_vector for legacy modes */
+                q_vectors = 1;
+        }
+
+        for (i = 0; i < q_vectors; i++) {
+                struct ixgbe_q_vector *q_vector = &adapter->q_vector[i];
+                netif_napi_add(adapter->netdev, &q_vector->napi,
+                               (*poll), 64);
+        }
+}
+
+/**
  * ixgbe_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in ixgbe_pci_tbl
@@ -2655,7 +3432,11 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), MAX_TX_QUEUES);
+#else
         netdev = alloc_etherdev(sizeof(struct ixgbe_adapter));
+#endif
         if (!netdev) {
                 err = -ENOMEM;
                 goto err_alloc_etherdev;
@@ -2696,7 +3477,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         ixgbe_set_ethtool_ops(netdev);
         netdev->tx_timeout = &ixgbe_tx_timeout;
         netdev->watchdog_timeo = 5 * HZ;
-        netif_napi_add(netdev, &adapter->napi, ixgbe_clean, 64);
         netdev->vlan_rx_register = ixgbe_vlan_rx_register;
         netdev->vlan_rx_add_vid = ixgbe_vlan_rx_add_vid;
         netdev->vlan_rx_kill_vid = ixgbe_vlan_rx_kill_vid;
@@ -2719,6 +3499,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         /* Setup hw api */
         memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
+        hw->mac.type  = ii->mac;
 
         err = ii->get_invariants(hw);
         if (err)
@@ -2741,6 +3522,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
 
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        netdev->features |= NETIF_F_MULTI_QUEUE;
+#endif
 
         /* make sure the EEPROM is good */
         if (ixgbe_validate_eeprom_checksum(hw, NULL) < 0) {
@@ -2770,9 +3554,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         hw->fc.low_water = IXGBE_DEFAULT_FCRTL;
         hw->fc.pause_time = IXGBE_DEFAULT_FCPAUSE;
 
-        /* Interrupt Throttle Rate */
-        adapter->rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS);
-        adapter->tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS);
+        err = ixgbe_init_interrupt_scheme(adapter);
+        if (err)
+                goto err_sw_init;
 
         /* print bus type/speed/width info */
         pci_read_config_word(pdev, IXGBE_PCI_LINK_STATUS, &link_status);
@@ -2808,12 +3592,27 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         netif_carrier_off(netdev);
         netif_stop_queue(netdev);
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        for (i = 0; i < adapter->num_tx_queues; i++)
+                netif_stop_subqueue(netdev, i);
+#endif
+
+        ixgbe_napi_add_all(adapter);
 
         strcpy(netdev->name, "eth%d");
         err = register_netdev(netdev);
         if (err)
                 goto err_register;
 
+#ifdef CONFIG_DCA
+        if (dca_add_requester(&pdev->dev) == 0) {
+                adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
+                /* always use CB2 mode, difference is masked
+                 * in the CB driver */
+                IXGBE_WRITE_REG(hw, IXGBE_DCA_CTRL, 2);
+                ixgbe_setup_dca(adapter);
+        }
+#endif
 
         dev_info(&pdev->dev, "Intel(R) 10 Gigabit Network Connection\n");
         cards_found++;
@@ -2823,6 +3622,7 @@ err_register:
         ixgbe_release_hw_control(adapter);
 err_hw_init:
 err_sw_init:
+        ixgbe_reset_interrupt_capability(adapter);
 err_eeprom:
         iounmap(hw->hw_addr);
 err_ioremap:
@@ -2854,16 +3654,27 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
 
         flush_scheduled_work();
 
+#ifdef CONFIG_DCA
+        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
+                adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
+                dca_remove_requester(&pdev->dev);
+                IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 1);
+        }
+
+#endif
         unregister_netdev(netdev);
 
-        ixgbe_release_hw_control(adapter);
+        ixgbe_reset_interrupt_capability(adapter);
 
-        kfree(adapter->tx_ring);
-        kfree(adapter->rx_ring);
+        ixgbe_release_hw_control(adapter);
 
         iounmap(adapter->hw.hw_addr);
         pci_release_regions(pdev);
 
+        DPRINTK(PROBE, INFO, "complete\n");
+        kfree(adapter->tx_ring);
+        kfree(adapter->rx_ring);
+
         free_netdev(netdev);
 
         pci_disable_device(pdev);
@@ -2975,6 +3786,10 @@ static int __init ixgbe_init_module(void)
 
         printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright);
 
+#ifdef CONFIG_DCA
+        dca_register_notify(&dca_notifier);
+
+#endif
         ret = pci_register_driver(&ixgbe_driver);
         return ret;
 }
@@ -2988,8 +3803,25 @@ module_init(ixgbe_init_module);
  **/
 static void __exit ixgbe_exit_module(void)
 {
+#ifdef CONFIG_DCA
+        dca_unregister_notify(&dca_notifier);
+#endif
         pci_unregister_driver(&ixgbe_driver);
 }
+
+#ifdef CONFIG_DCA
+static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
+                            void *p)
+{
+        int ret_val;
+
+        ret_val = driver_for_each_device(&ixgbe_driver.driver, NULL, &event,
+                                         __ixgbe_notify_dca);
+
+        return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
+}
+#endif /* CONFIG_DCA */
+
 module_exit(ixgbe_exit_module);
 
 /* ixgbe_main.c */
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
new file mode 100644
index 000000000000..1d24a73a0e1a
--- /dev/null
+++ b/drivers/net/korina.c
@@ -0,0 +1,1233 @@
+/*
+ *  Driver for the IDT RC32434 (Korina) on-chip ethernet controller.
+ *
+ *  Copyright 2004 IDT Inc. (rischelp@idt.com)
+ *  Copyright 2006 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright 2008 Florian Fainelli <florian@openwrt.org>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Writing to a DMA status register:
+ *
+ *  When writing to the status register, you should mask the bit you have
+ *  been testing the status register with. Both Tx and Rx DMA registers
+ *  should stick to this procedure.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/moduleparam.h>
+#include <linux/sched.h>
+#include <linux/ctype.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/in.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/errno.h>
+#include <linux/platform_device.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/crc32.h>
+
+#include <asm/bootinfo.h>
+#include <asm/system.h>
+#include <asm/bitops.h>
+#include <asm/pgtable.h>
+#include <asm/segment.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+
+#include <asm/mach-rc32434/rb.h>
+#include <asm/mach-rc32434/rc32434.h>
+#include <asm/mach-rc32434/eth.h>
+#include <asm/mach-rc32434/dma_v.h>
+
+#define DRV_NAME        "korina"
+#define DRV_VERSION     "0.10"
+#define DRV_RELDATE     "04Mar2008"
+
+#define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \
+                                   ((dev)->dev_addr[1]))
+#define STATION_ADDRESS_LOW(dev)  (((dev)->dev_addr[2] << 24) | \
+                                   ((dev)->dev_addr[3] << 16) | \
+                                   ((dev)->dev_addr[4] << 8)  | \
+                                   ((dev)->dev_addr[5]))
+
+#define MII_CLOCK 1250000       /* no more than 2.5MHz */
+
+/* the following must be powers of two */
+#define KORINA_NUM_RDS  64  /* number of receive descriptors */
+#define KORINA_NUM_TDS  64  /* number of transmit descriptors */
+
+#define KORINA_RBSIZE   536 /* size of one resource buffer = Ether MTU */
+#define KORINA_RDS_MASK (KORINA_NUM_RDS - 1)
+#define KORINA_TDS_MASK (KORINA_NUM_TDS - 1)
+#define RD_RING_SIZE    (KORINA_NUM_RDS * sizeof(struct dma_desc))
+#define TD_RING_SIZE    (KORINA_NUM_TDS * sizeof(struct dma_desc))
+
+#define TX_TIMEOUT      (6000 * HZ / 1000)
+
+enum chain_status { desc_filled, desc_empty };
+#define IS_DMA_FINISHED(X)   (((X) & (DMA_DESC_FINI)) != 0)
+#define IS_DMA_DONE(X)   (((X) & (DMA_DESC_DONE)) != 0)
+#define RCVPKT_LENGTH(X)     (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT)
+
+/* Information that need to be kept for each board. */
+struct korina_private {
+        struct eth_regs *eth_regs;
+        struct dma_reg *rx_dma_regs;
+        struct dma_reg *tx_dma_regs;
+        struct dma_desc *td_ring; /* transmit descriptor ring */
+        struct dma_desc *rd_ring; /* receive descriptor ring  */
+
+        struct sk_buff *tx_skb[KORINA_NUM_TDS];
+        struct sk_buff *rx_skb[KORINA_NUM_RDS];
+
+        int rx_next_done;
+        int rx_chain_head;
+        int rx_chain_tail;
+        enum chain_status rx_chain_status;
+
+        int tx_next_done;
+        int tx_chain_head;
+        int tx_chain_tail;
+        enum chain_status tx_chain_status;
+        int tx_count;
+        int tx_full;
+
+        int rx_irq;
+        int tx_irq;
+        int ovr_irq;
+        int und_irq;
+
+        spinlock_t lock;        /* NIC xmit lock */
+
+        int dma_halt_cnt;
+        int dma_run_cnt;
+        struct napi_struct napi;
+        struct mii_if_info mii_if;
+        struct net_device *dev;
+        int phy_addr;
+};
+
+extern unsigned int idt_cpu_freq;
+
+static inline void korina_start_dma(struct dma_reg *ch, u32 dma_addr)
+{
+        writel(0, &ch->dmandptr);
+        writel(dma_addr, &ch->dmadptr);
+}
+
+static inline void korina_abort_dma(struct net_device *dev,
+                                        struct dma_reg *ch)
+{
+       if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) {
+               writel(0x10, &ch->dmac);
+
+               while (!(readl(&ch->dmas) & DMA_STAT_HALT))
+                       dev->trans_start = jiffies;
+
+               writel(0, &ch->dmas);
+       }
+
+       writel(0, &ch->dmadptr);
+       writel(0, &ch->dmandptr);
+}
+
+static inline void korina_chain_dma(struct dma_reg *ch, u32 dma_addr)
+{
+        writel(dma_addr, &ch->dmandptr);
+}
+
+static void korina_abort_tx(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        korina_abort_dma(dev, lp->tx_dma_regs);
+}
+
+static void korina_abort_rx(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        korina_abort_dma(dev, lp->rx_dma_regs);
+}
+
+static void korina_start_rx(struct korina_private *lp,
+                                        struct dma_desc *rd)
+{
+        korina_start_dma(lp->rx_dma_regs, CPHYSADDR(rd));
+}
+
+static void korina_chain_rx(struct korina_private *lp,
+                                        struct dma_desc *rd)
+{
+        korina_chain_dma(lp->rx_dma_regs, CPHYSADDR(rd));
+}
+
+/* transmit packet */
+static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        unsigned long flags;
+        u32 length;
+        u32 chain_index;
+        struct dma_desc *td;
+
+        spin_lock_irqsave(&lp->lock, flags);
+
+        td = &lp->td_ring[lp->tx_chain_tail];
+
+        /* stop queue when full, drop pkts if queue already full */
+        if (lp->tx_count >= (KORINA_NUM_TDS - 2)) {
+                lp->tx_full = 1;
+
+                if (lp->tx_count == (KORINA_NUM_TDS - 2))
+                        netif_stop_queue(dev);
+                else {
+                        dev->stats.tx_dropped++;
+                        dev_kfree_skb_any(skb);
+                        spin_unlock_irqrestore(&lp->lock, flags);
+
+                        return NETDEV_TX_BUSY;
+                }
+        }
+
+        lp->tx_count++;
+
+        lp->tx_skb[lp->tx_chain_tail] = skb;
+
+        length = skb->len;
+        dma_cache_wback((u32)skb->data, skb->len);
+
+        /* Setup the transmit descriptor. */
+        dma_cache_inv((u32) td, sizeof(*td));
+        td->ca = CPHYSADDR(skb->data);
+        chain_index = (lp->tx_chain_tail - 1) &
+                        KORINA_TDS_MASK;
+
+        if (readl(&(lp->tx_dma_regs->dmandptr)) == 0) {
+                if (lp->tx_chain_status == desc_empty) {
+                        /* Update tail */
+                        td->control = DMA_COUNT(length) |
+                                        DMA_DESC_COF | DMA_DESC_IOF;
+                        /* Move tail */
+                        lp->tx_chain_tail = chain_index;
+                        /* Write to NDPTR */
+                        writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
+                                        &lp->tx_dma_regs->dmandptr);
+                        /* Move head to tail */
+                        lp->tx_chain_head = lp->tx_chain_tail;
+                } else {
+                        /* Update tail */
+                        td->control = DMA_COUNT(length) |
+                                        DMA_DESC_COF | DMA_DESC_IOF;
+                        /* Link to prev */
+                        lp->td_ring[chain_index].control &=
+                                        ~DMA_DESC_COF;
+                        /* Link to prev */
+                        lp->td_ring[chain_index].link =  CPHYSADDR(td);
+                        /* Move tail */
+                        lp->tx_chain_tail = chain_index;
+                        /* Write to NDPTR */
+                        writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
+                                        &(lp->tx_dma_regs->dmandptr));
+                        /* Move head to tail */
+                        lp->tx_chain_head = lp->tx_chain_tail;
+                        lp->tx_chain_status = desc_empty;
+                }
+        } else {
+                if (lp->tx_chain_status == desc_empty) {
+                        /* Update tail */
+                        td->control = DMA_COUNT(length) |
+                                        DMA_DESC_COF | DMA_DESC_IOF;
+                        /* Move tail */
+                        lp->tx_chain_tail = chain_index;
+                        lp->tx_chain_status = desc_filled;
+                        netif_stop_queue(dev);
+                } else {
+                        /* Update tail */
+                        td->control = DMA_COUNT(length) |
+                                        DMA_DESC_COF | DMA_DESC_IOF;
+                        lp->td_ring[chain_index].control &=
+                                        ~DMA_DESC_COF;
+                        lp->td_ring[chain_index].link =  CPHYSADDR(td);
+                        lp->tx_chain_tail = chain_index;
+                }
+        }
+        dma_cache_wback((u32) td, sizeof(*td));
+
+        dev->trans_start = jiffies;
+        spin_unlock_irqrestore(&lp->lock, flags);
+
+        return NETDEV_TX_OK;
+}
+
+static int mdio_read(struct net_device *dev, int mii_id, int reg)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        int ret;
+
+        mii_id = ((lp->rx_irq == 0x2c ? 1 : 0) << 8);
+
+        writel(0, &lp->eth_regs->miimcfg);
+        writel(0, &lp->eth_regs->miimcmd);
+        writel(mii_id | reg, &lp->eth_regs->miimaddr);
+        writel(ETH_MII_CMD_SCN, &lp->eth_regs->miimcmd);
+
+        ret = (int)(readl(&lp->eth_regs->miimrdd));
+        return ret;
+}
+
+static void mdio_write(struct net_device *dev, int mii_id, int reg, int val)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        mii_id = ((lp->rx_irq == 0x2c ? 1 : 0) << 8);
+
+        writel(0, &lp->eth_regs->miimcfg);
+        writel(1, &lp->eth_regs->miimcmd);
+        writel(mii_id | reg, &lp->eth_regs->miimaddr);
+        writel(ETH_MII_CMD_SCN, &lp->eth_regs->miimcmd);
+        writel(val, &lp->eth_regs->miimwtd);
+}
+
+/* Ethernet Rx DMA interrupt */
+static irqreturn_t korina_rx_dma_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct korina_private *lp = netdev_priv(dev);
+        u32 dmas, dmasm;
+        irqreturn_t retval;
+
+        dmas = readl(&lp->rx_dma_regs->dmas);
+        if (dmas & (DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR)) {
+                netif_rx_schedule_prep(dev, &lp->napi);
+
+                dmasm = readl(&lp->rx_dma_regs->dmasm);
+                writel(dmasm | (DMA_STAT_DONE |
+                                DMA_STAT_HALT | DMA_STAT_ERR),
+                                &lp->rx_dma_regs->dmasm);
+
+                if (dmas & DMA_STAT_ERR)
+                        printk(KERN_ERR DRV_NAME "%s: DMA error\n", dev->name);
+
+                retval = IRQ_HANDLED;
+        } else
+                retval = IRQ_NONE;
+
+        return retval;
+}
+
+static int korina_rx(struct net_device *dev, int limit)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        struct dma_desc *rd = &lp->rd_ring[lp->rx_next_done];
+        struct sk_buff *skb, *skb_new;
+        u8 *pkt_buf;
+        u32 devcs, pkt_len, dmas, rx_free_desc;
+        int count;
+
+        dma_cache_inv((u32)rd, sizeof(*rd));
+
+        for (count = 0; count < limit; count++) {
+
+                devcs = rd->devcs;
+
+                /* Update statistics counters */
+                if (devcs & ETH_RX_CRC)
+                        dev->stats.rx_crc_errors++;
+                if (devcs & ETH_RX_LOR)
+                        dev->stats.rx_length_errors++;
+                if (devcs & ETH_RX_LE)
+                        dev->stats.rx_length_errors++;
+                if (devcs & ETH_RX_OVR)
+                        dev->stats.rx_over_errors++;
+                if (devcs & ETH_RX_CV)
+                        dev->stats.rx_frame_errors++;
+                if (devcs & ETH_RX_CES)
+                        dev->stats.rx_length_errors++;
+                if (devcs & ETH_RX_MP)
+                        dev->stats.multicast++;
+
+                if ((devcs & ETH_RX_LD) != ETH_RX_LD) {
+                        /* check that this is a whole packet
+                         * WARNING: DMA_FD bit incorrectly set
+                         * in Rc32434 (errata ref #077) */
+                        dev->stats.rx_errors++;
+                        dev->stats.rx_dropped++;
+                }
+
+                while ((rx_free_desc = KORINA_RBSIZE - (u32)DMA_COUNT(rd->control)) != 0) {
+                        /* init the var. used for the later
+                         * operations within the while loop */
+                        skb_new = NULL;
+                        pkt_len = RCVPKT_LENGTH(devcs);
+                        skb = lp->rx_skb[lp->rx_next_done];
+
+                        if ((devcs & ETH_RX_ROK)) {
+                                /* must be the (first and) last
+                                 * descriptor then */
+                                pkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data;
+
+                                /* invalidate the cache */
+                                dma_cache_inv((unsigned long)pkt_buf, pkt_len - 4);
+
+                                /* Malloc up new buffer. */
+                                skb_new = netdev_alloc_skb(dev, KORINA_RBSIZE + 2);
+
+                                if (!skb_new)
+                                        break;
+                                /* Do not count the CRC */
+                                skb_put(skb, pkt_len - 4);
+                                skb->protocol = eth_type_trans(skb, dev);
+
+                                /* Pass the packet to upper layers */
+                                netif_receive_skb(skb);
+                                dev->last_rx = jiffies;
+                                dev->stats.rx_packets++;
+                                dev->stats.rx_bytes += pkt_len;
+
+                                /* Update the mcast stats */
+                                if (devcs & ETH_RX_MP)
+                                        dev->stats.multicast++;
+
+                                lp->rx_skb[lp->rx_next_done] = skb_new;
+                        }
+
+                        rd->devcs = 0;
+
+                        /* Restore descriptor's curr_addr */
+                        if (skb_new)
+                                rd->ca = CPHYSADDR(skb_new->data);
+                        else
+                                rd->ca = CPHYSADDR(skb->data);
+
+                        rd->control = DMA_COUNT(KORINA_RBSIZE) |
+                                DMA_DESC_COD | DMA_DESC_IOD;
+                        lp->rd_ring[(lp->rx_next_done - 1) &
+                                KORINA_RDS_MASK].control &=
+                                ~DMA_DESC_COD;
+
+                        lp->rx_next_done = (lp->rx_next_done + 1) & KORINA_RDS_MASK;
+                        dma_cache_wback((u32)rd, sizeof(*rd));
+                        rd = &lp->rd_ring[lp->rx_next_done];
+                        writel(~DMA_STAT_DONE, &lp->rx_dma_regs->dmas);
+                }
+        }
+
+        dmas = readl(&lp->rx_dma_regs->dmas);
+
+        if (dmas & DMA_STAT_HALT) {
+                writel(~(DMA_STAT_HALT | DMA_STAT_ERR),
+                                &lp->rx_dma_regs->dmas);
+
+                lp->dma_halt_cnt++;
+                rd->devcs = 0;
+                skb = lp->rx_skb[lp->rx_next_done];
+                rd->ca = CPHYSADDR(skb->data);
+                dma_cache_wback((u32)rd, sizeof(*rd));
+                korina_chain_rx(lp, rd);
+        }
+
+        return count;
+}
+
+static int korina_poll(struct napi_struct *napi, int budget)
+{
+        struct korina_private *lp =
+                container_of(napi, struct korina_private, napi);
+        struct net_device *dev = lp->dev;
+        int work_done;
+
+        work_done = korina_rx(dev, budget);
+        if (work_done < budget) {
+                netif_rx_complete(dev, napi);
+
+                writel(readl(&lp->rx_dma_regs->dmasm) &
+                        ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR),
+                        &lp->rx_dma_regs->dmasm);
+        }
+        return work_done;
+}
+
+/*
+ * Set or clear the multicast filter for this adaptor.
+ */
+static void korina_multicast_list(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        unsigned long flags;
+        struct dev_mc_list *dmi = dev->mc_list;
+        u32 recognise = ETH_ARC_AB;     /* always accept broadcasts */
+        int i;
+
+        /* Set promiscuous mode */
+        if (dev->flags & IFF_PROMISC)
+                recognise |= ETH_ARC_PRO;
+
+        else if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 4))
+                /* All multicast and broadcast */
+                recognise |= ETH_ARC_AM;
+
+        /* Build the hash table */
+        if (dev->mc_count > 4) {
+                u16 hash_table[4];
+                u32 crc;
+
+                for (i = 0; i < 4; i++)
+                        hash_table[i] = 0;
+
+                for (i = 0; i < dev->mc_count; i++) {
+                        char *addrs = dmi->dmi_addr;
+
+                        dmi = dmi->next;
+
+                        if (!(*addrs & 1))
+                                continue;
+
+                        crc = ether_crc_le(6, addrs);
+                        crc >>= 26;
+                        hash_table[crc >> 4] |= 1 << (15 - (crc & 0xf));
+                }
+                /* Accept filtered multicast */
+                recognise |= ETH_ARC_AFM;
+
+                /* Fill the MAC hash tables with their values */
+                writel((u32)(hash_table[1] << 16 | hash_table[0]),
+                                        &lp->eth_regs->ethhash0);
+                writel((u32)(hash_table[3] << 16 | hash_table[2]),
+                                        &lp->eth_regs->ethhash1);
+        }
+
+        spin_lock_irqsave(&lp->lock, flags);
+        writel(recognise, &lp->eth_regs->etharc);
+        spin_unlock_irqrestore(&lp->lock, flags);
+}
+
+static void korina_tx(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        struct dma_desc *td = &lp->td_ring[lp->tx_next_done];
+        u32 devcs;
+        u32 dmas;
+
+        spin_lock(&lp->lock);
+
+        /* Process all desc that are done */
+        while (IS_DMA_FINISHED(td->control)) {
+                if (lp->tx_full == 1) {
+                        netif_wake_queue(dev);
+                        lp->tx_full = 0;
+                }
+
+                devcs = lp->td_ring[lp->tx_next_done].devcs;
+                if ((devcs & (ETH_TX_FD | ETH_TX_LD)) !=
+                                (ETH_TX_FD | ETH_TX_LD)) {
+                        dev->stats.tx_errors++;
+                        dev->stats.tx_dropped++;
+
+                        /* Should never happen */
+                        printk(KERN_ERR DRV_NAME "%s: split tx ignored\n",
+                                                        dev->name);
+                } else if (devcs & ETH_TX_TOK) {
+                        dev->stats.tx_packets++;
+                        dev->stats.tx_bytes +=
+                                        lp->tx_skb[lp->tx_next_done]->len;
+                } else {
+                        dev->stats.tx_errors++;
+                        dev->stats.tx_dropped++;
+
+                        /* Underflow */
+                        if (devcs & ETH_TX_UND)
+                                dev->stats.tx_fifo_errors++;
+
+                        /* Oversized frame */
+                        if (devcs & ETH_TX_OF)
+                                dev->stats.tx_aborted_errors++;
+
+                        /* Excessive deferrals */
+                        if (devcs & ETH_TX_ED)
+                                dev->stats.tx_carrier_errors++;
+
+                        /* Collisions: medium busy */
+                        if (devcs & ETH_TX_EC)
+                                dev->stats.collisions++;
+
+                        /* Late collision */
+                        if (devcs & ETH_TX_LC)
+                                dev->stats.tx_window_errors++;
+                }
+
+                /* We must always free the original skb */
+                if (lp->tx_skb[lp->tx_next_done]) {
+                        dev_kfree_skb_any(lp->tx_skb[lp->tx_next_done]);
+                        lp->tx_skb[lp->tx_next_done] = NULL;
+                }
+
+                lp->td_ring[lp->tx_next_done].control = DMA_DESC_IOF;
+                lp->td_ring[lp->tx_next_done].devcs = ETH_TX_FD | ETH_TX_LD;
+                lp->td_ring[lp->tx_next_done].link = 0;
+                lp->td_ring[lp->tx_next_done].ca = 0;
+                lp->tx_count--;
+
+                /* Go on to next transmission */
+                lp->tx_next_done = (lp->tx_next_done + 1) & KORINA_TDS_MASK;
+                td = &lp->td_ring[lp->tx_next_done];
+
+        }
+
+        /* Clear the DMA status register */
+        dmas = readl(&lp->tx_dma_regs->dmas);
+        writel(~dmas, &lp->tx_dma_regs->dmas);
+
+        writel(readl(&lp->tx_dma_regs->dmasm) &
+                        ~(DMA_STAT_FINI | DMA_STAT_ERR),
+                        &lp->tx_dma_regs->dmasm);
+
+        spin_unlock(&lp->lock);
+}
+
+static irqreturn_t
+korina_tx_dma_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct korina_private *lp = netdev_priv(dev);
+        u32 dmas, dmasm;
+        irqreturn_t retval;
+
+        dmas = readl(&lp->tx_dma_regs->dmas);
+
+        if (dmas & (DMA_STAT_FINI | DMA_STAT_ERR)) {
+                korina_tx(dev);
+
+                dmasm = readl(&lp->tx_dma_regs->dmasm);
+                writel(dmasm | (DMA_STAT_FINI | DMA_STAT_ERR),
+                                &lp->tx_dma_regs->dmasm);
+
+                if (lp->tx_chain_status == desc_filled &&
+                        (readl(&(lp->tx_dma_regs->dmandptr)) == 0)) {
+                        writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
+                                &(lp->tx_dma_regs->dmandptr));
+                        lp->tx_chain_status = desc_empty;
+                        lp->tx_chain_head = lp->tx_chain_tail;
+                        dev->trans_start = jiffies;
+                }
+                if (dmas & DMA_STAT_ERR)
+                        printk(KERN_ERR DRV_NAME "%s: DMA error\n", dev->name);
+
+                retval = IRQ_HANDLED;
+        } else
+                retval = IRQ_NONE;
+
+        return retval;
+}
+
+
+static void korina_check_media(struct net_device *dev, unsigned int init_media)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        mii_check_media(&lp->mii_if, 0, init_media);
+
+        if (lp->mii_if.full_duplex)
+                writel(readl(&lp->eth_regs->ethmac2) | ETH_MAC2_FD,
+                                                &lp->eth_regs->ethmac2);
+        else
+                writel(readl(&lp->eth_regs->ethmac2) & ~ETH_MAC2_FD,
+                                                &lp->eth_regs->ethmac2);
+}
+
+static void korina_set_carrier(struct mii_if_info *mii)
+{
+        if (mii->force_media) {
+                /* autoneg is off: Link is always assumed to be up */
+                if (!netif_carrier_ok(mii->dev))
+                        netif_carrier_on(mii->dev);
+        } else  /* Let MMI library update carrier status */
+                korina_check_media(mii->dev, 0);
+}
+
+static int korina_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        struct mii_ioctl_data *data = if_mii(rq);
+        int rc;
+
+        if (!netif_running(dev))
+                return -EINVAL;
+        spin_lock_irq(&lp->lock);
+        rc = generic_mii_ioctl(&lp->mii_if, data, cmd, NULL);
+        spin_unlock_irq(&lp->lock);
+        korina_set_carrier(&lp->mii_if);
+
+        return rc;
+}
+
+/* ethtool helpers */
+static void netdev_get_drvinfo(struct net_device *dev,
+                        struct ethtool_drvinfo *info)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+        strcpy(info->bus_info, lp->dev->name);
+}
+
+static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        int rc;
+
+        spin_lock_irq(&lp->lock);
+        rc = mii_ethtool_gset(&lp->mii_if, cmd);
+        spin_unlock_irq(&lp->lock);
+
+        return rc;
+}
+
+static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        int rc;
+
+        spin_lock_irq(&lp->lock);
+        rc = mii_ethtool_sset(&lp->mii_if, cmd);
+        spin_unlock_irq(&lp->lock);
+        korina_set_carrier(&lp->mii_if);
+
+        return rc;
+}
+
+static u32 netdev_get_link(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        return mii_link_ok(&lp->mii_if);
+}
+
+static struct ethtool_ops netdev_ethtool_ops = {
+        .get_drvinfo            = netdev_get_drvinfo,
+        .get_settings           = netdev_get_settings,
+        .set_settings           = netdev_set_settings,
+        .get_link               = netdev_get_link,
+};
+
+static void korina_alloc_ring(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        int i;
+
+        /* Initialize the transmit descriptors */
+        for (i = 0; i < KORINA_NUM_TDS; i++) {
+                lp->td_ring[i].control = DMA_DESC_IOF;
+                lp->td_ring[i].devcs = ETH_TX_FD | ETH_TX_LD;
+                lp->td_ring[i].ca = 0;
+                lp->td_ring[i].link = 0;
+        }
+        lp->tx_next_done = lp->tx_chain_head = lp->tx_chain_tail =
+                        lp->tx_full = lp->tx_count = 0;
+        lp->tx_chain_status = desc_empty;
+
+        /* Initialize the receive descriptors */
+        for (i = 0; i < KORINA_NUM_RDS; i++) {
+                struct sk_buff *skb = lp->rx_skb[i];
+
+                skb = dev_alloc_skb(KORINA_RBSIZE + 2);
+                if (!skb)
+                        break;
+                skb_reserve(skb, 2);
+                lp->rx_skb[i] = skb;
+                lp->rd_ring[i].control = DMA_DESC_IOD |
+                                DMA_COUNT(KORINA_RBSIZE);
+                lp->rd_ring[i].devcs = 0;
+                lp->rd_ring[i].ca = CPHYSADDR(skb->data);
+                lp->rd_ring[i].link = CPHYSADDR(&lp->rd_ring[i+1]);
+        }
+
+        /* loop back */
+        lp->rd_ring[i].link = CPHYSADDR(&lp->rd_ring[0]);
+        lp->rx_next_done  = 0;
+
+        lp->rd_ring[i].control |= DMA_DESC_COD;
+        lp->rx_chain_head = 0;
+        lp->rx_chain_tail = 0;
+        lp->rx_chain_status = desc_empty;
+}
+
+static void korina_free_ring(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        int i;
+
+        for (i = 0; i < KORINA_NUM_RDS; i++) {
+                lp->rd_ring[i].control = 0;
+                if (lp->rx_skb[i])
+                        dev_kfree_skb_any(lp->rx_skb[i]);
+                lp->rx_skb[i] = NULL;
+        }
+
+        for (i = 0; i < KORINA_NUM_TDS; i++) {
+                lp->td_ring[i].control = 0;
+                if (lp->tx_skb[i])
+                        dev_kfree_skb_any(lp->tx_skb[i]);
+                lp->tx_skb[i] = NULL;
+        }
+}
+
+/*
+ * Initialize the RC32434 ethernet controller.
+ */
+static int korina_init(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        /* Disable DMA */
+        korina_abort_tx(dev);
+        korina_abort_rx(dev);
+
+        /* reset ethernet logic */
+        writel(0, &lp->eth_regs->ethintfc);
+        while ((readl(&lp->eth_regs->ethintfc) & ETH_INT_FC_RIP))
+                dev->trans_start = jiffies;
+
+        /* Enable Ethernet Interface */
+        writel(ETH_INT_FC_EN, &lp->eth_regs->ethintfc);
+
+        /* Allocate rings */
+        korina_alloc_ring(dev);
+
+        writel(0, &lp->rx_dma_regs->dmas);
+        /* Start Rx DMA */
+        korina_start_rx(lp, &lp->rd_ring[0]);
+
+        writel(readl(&lp->tx_dma_regs->dmasm) &
+                        ~(DMA_STAT_FINI | DMA_STAT_ERR),
+                        &lp->tx_dma_regs->dmasm);
+        writel(readl(&lp->rx_dma_regs->dmasm) &
+                        ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR),
+                        &lp->rx_dma_regs->dmasm);
+
+        /* Accept only packets destined for this Ethernet device address */
+        writel(ETH_ARC_AB, &lp->eth_regs->etharc);
+
+        /* Set all Ether station address registers to their initial values */
+        writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal0);
+        writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah0);
+
+        writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal1);
+        writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah1);
+
+        writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal2);
+        writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah2);
+
+        writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal3);
+        writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah3);
+
+
+        /* Frame Length Checking, Pad Enable, CRC Enable, Full Duplex set */
+        writel(ETH_MAC2_PE | ETH_MAC2_CEN | ETH_MAC2_FD,
+                        &lp->eth_regs->ethmac2);
+
+        /* Back to back inter-packet-gap */
+        writel(0x15, &lp->eth_regs->ethipgt);
+        /* Non - Back to back inter-packet-gap */
+        writel(0x12, &lp->eth_regs->ethipgr);
+
+        /* Management Clock Prescaler Divisor
+         * Clock independent setting */
+        writel(((idt_cpu_freq) / MII_CLOCK + 1) & ~1,
+                       &lp->eth_regs->ethmcp);
+
+        /* don't transmit until fifo contains 48b */
+        writel(48, &lp->eth_regs->ethfifott);
+
+        writel(ETH_MAC1_RE, &lp->eth_regs->ethmac1);
+
+        napi_enable(&lp->napi);
+        netif_start_queue(dev);
+
+        return 0;
+}
+
+/*
+ * Restart the RC32434 ethernet controller.
+ * FIXME: check the return status where we call it
+ */
+static int korina_restart(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        int ret = 0;
+
+        /*
+         * Disable interrupts
+         */
+        disable_irq(lp->rx_irq);
+        disable_irq(lp->tx_irq);
+        disable_irq(lp->ovr_irq);
+        disable_irq(lp->und_irq);
+
+        writel(readl(&lp->tx_dma_regs->dmasm) |
+                                DMA_STAT_FINI | DMA_STAT_ERR,
+                                &lp->tx_dma_regs->dmasm);
+        writel(readl(&lp->rx_dma_regs->dmasm) |
+                                DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR,
+                                &lp->rx_dma_regs->dmasm);
+
+        korina_free_ring(dev);
+
+        ret = korina_init(dev);
+        if (ret < 0) {
+                printk(KERN_ERR DRV_NAME "%s: cannot restart device\n",
+                                                                dev->name);
+                return ret;
+        }
+        korina_multicast_list(dev);
+
+        enable_irq(lp->und_irq);
+        enable_irq(lp->ovr_irq);
+        enable_irq(lp->tx_irq);
+        enable_irq(lp->rx_irq);
+
+        return ret;
+}
+
+static void korina_clear_and_restart(struct net_device *dev, u32 value)
+{
+        struct korina_private *lp = netdev_priv(dev);
+
+        netif_stop_queue(dev);
+        writel(value, &lp->eth_regs->ethintfc);
+        korina_restart(dev);
+}
+
+/* Ethernet Tx Underflow interrupt */
+static irqreturn_t korina_und_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct korina_private *lp = netdev_priv(dev);
+        unsigned int und;
+
+        spin_lock(&lp->lock);
+
+        und = readl(&lp->eth_regs->ethintfc);
+
+        if (und & ETH_INT_FC_UND)
+                korina_clear_and_restart(dev, und & ~ETH_INT_FC_UND);
+
+        spin_unlock(&lp->lock);
+
+        return IRQ_HANDLED;
+}
+
+static void korina_tx_timeout(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        unsigned long flags;
+
+        spin_lock_irqsave(&lp->lock, flags);
+        korina_restart(dev);
+        spin_unlock_irqrestore(&lp->lock, flags);
+}
+
+/* Ethernet Rx Overflow interrupt */
+static irqreturn_t
+korina_ovr_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct korina_private *lp = netdev_priv(dev);
+        unsigned int ovr;
+
+        spin_lock(&lp->lock);
+        ovr = readl(&lp->eth_regs->ethintfc);
+
+        if (ovr & ETH_INT_FC_OVR)
+                korina_clear_and_restart(dev, ovr & ~ETH_INT_FC_OVR);
+
+        spin_unlock(&lp->lock);
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void korina_poll_controller(struct net_device *dev)
+{
+        disable_irq(dev->irq);
+        korina_tx_dma_interrupt(dev->irq, dev);
+        enable_irq(dev->irq);
+}
+#endif
+
+static int korina_open(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        int ret = 0;
+
+        /* Initialize */
+        ret = korina_init(dev);
+        if (ret < 0) {
+                printk(KERN_ERR DRV_NAME "%s: cannot open device\n", dev->name);
+                goto out;
+        }
+
+        /* Install the interrupt handler
+         * that handles the Done Finished
+         * Ovr and Und Events */
+        ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt,
+                IRQF_SHARED | IRQF_DISABLED, "Korina ethernet Rx", dev);
+        if (ret < 0) {
+                printk(KERN_ERR DRV_NAME "%s: unable to get Rx DMA IRQ %d\n",
+                    dev->name, lp->rx_irq);
+                goto err_release;
+        }
+        ret = request_irq(lp->tx_irq, &korina_tx_dma_interrupt,
+                IRQF_SHARED | IRQF_DISABLED, "Korina ethernet Tx", dev);
+        if (ret < 0) {
+                printk(KERN_ERR DRV_NAME "%s: unable to get Tx DMA IRQ %d\n",
+                    dev->name, lp->tx_irq);
+                goto err_free_rx_irq;
+        }
+
+        /* Install handler for overrun error. */
+        ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt,
+                        IRQF_SHARED | IRQF_DISABLED, "Ethernet Overflow", dev);
+        if (ret < 0) {
+                printk(KERN_ERR DRV_NAME"%s: unable to get OVR IRQ %d\n",
+                    dev->name, lp->ovr_irq);
+                goto err_free_tx_irq;
+        }
+
+        /* Install handler for underflow error. */
+        ret = request_irq(lp->und_irq, &korina_und_interrupt,
+                        IRQF_SHARED | IRQF_DISABLED, "Ethernet Underflow", dev);
+        if (ret < 0) {
+                printk(KERN_ERR DRV_NAME "%s: unable to get UND IRQ %d\n",
+                    dev->name, lp->und_irq);
+                goto err_free_ovr_irq;
+        }
+
+err_free_ovr_irq:
+        free_irq(lp->ovr_irq, dev);
+err_free_tx_irq:
+        free_irq(lp->tx_irq, dev);
+err_free_rx_irq:
+        free_irq(lp->rx_irq, dev);
+err_release:
+        korina_free_ring(dev);
+        goto out;
+out:
+        return ret;
+}
+
+static int korina_close(struct net_device *dev)
+{
+        struct korina_private *lp = netdev_priv(dev);
+        u32 tmp;
+
+        /* Disable interrupts */
+        disable_irq(lp->rx_irq);
+        disable_irq(lp->tx_irq);
+        disable_irq(lp->ovr_irq);
+        disable_irq(lp->und_irq);
+
+        korina_abort_tx(dev);
+        tmp = readl(&lp->tx_dma_regs->dmasm);
+        tmp = tmp | DMA_STAT_FINI | DMA_STAT_ERR;
+        writel(tmp, &lp->tx_dma_regs->dmasm);
+
+        korina_abort_rx(dev);
+        tmp = readl(&lp->rx_dma_regs->dmasm);
+        tmp = tmp | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR;
+        writel(tmp, &lp->rx_dma_regs->dmasm);
+
+        korina_free_ring(dev);
+
+        free_irq(lp->rx_irq, dev);
+        free_irq(lp->tx_irq, dev);
+        free_irq(lp->ovr_irq, dev);
+        free_irq(lp->und_irq, dev);
+
+        return 0;
+}
+
+static int korina_probe(struct platform_device *pdev)
+{
+        struct korina_device *bif = platform_get_drvdata(pdev);
+        struct korina_private *lp;
+        struct net_device *dev;
+        struct resource *r;
+        int retval, err;
+
+        dev = alloc_etherdev(sizeof(struct korina_private));
+        if (!dev) {
+                printk(KERN_ERR DRV_NAME ": alloc_etherdev failed\n");
+                return -ENOMEM;
+        }
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        platform_set_drvdata(pdev, dev);
+        lp = netdev_priv(dev);
+
+        bif->dev = dev;
+        memcpy(dev->dev_addr, bif->mac, 6);
+
+        lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx");
+        lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx");
+        lp->ovr_irq = platform_get_irq_byname(pdev, "korina_ovr");
+        lp->und_irq = platform_get_irq_byname(pdev, "korina_und");
+
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
+        dev->base_addr = r->start;
+        lp->eth_regs = ioremap_nocache(r->start, r->end - r->start);
+        if (!lp->eth_regs) {
+                printk(KERN_ERR DRV_NAME "cannot remap registers\n");
+                retval = -ENXIO;
+                goto probe_err_out;
+        }
+
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");
+        lp->rx_dma_regs = ioremap_nocache(r->start, r->end - r->start);
+        if (!lp->rx_dma_regs) {
+                printk(KERN_ERR DRV_NAME "cannot remap Rx DMA registers\n");
+                retval = -ENXIO;
+                goto probe_err_dma_rx;
+        }
+
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");
+        lp->tx_dma_regs = ioremap_nocache(r->start, r->end - r->start);
+        if (!lp->tx_dma_regs) {
+                printk(KERN_ERR DRV_NAME "cannot remap Tx DMA registers\n");
+                retval = -ENXIO;
+                goto probe_err_dma_tx;
+        }
+
+        lp->td_ring = kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL);
+        if (!lp->td_ring) {
+                printk(KERN_ERR DRV_NAME "cannot allocate descriptors\n");
+                retval = -ENOMEM;
+                goto probe_err_td_ring;
+        }
+
+        dma_cache_inv((unsigned long)(lp->td_ring),
+                        TD_RING_SIZE + RD_RING_SIZE);
+
+        /* now convert TD_RING pointer to KSEG1 */
+        lp->td_ring = (struct dma_desc *)KSEG1ADDR(lp->td_ring);
+        lp->rd_ring = &lp->td_ring[KORINA_NUM_TDS];
+
+        spin_lock_init(&lp->lock);
+        /* just use the rx dma irq */
+        dev->irq = lp->rx_irq;
+        lp->dev = dev;
+
+        dev->open = korina_open;
+        dev->stop = korina_close;
+        dev->hard_start_xmit = korina_send_packet;
+        dev->set_multicast_list = &korina_multicast_list;
+        dev->ethtool_ops = &netdev_ethtool_ops;
+        dev->tx_timeout = korina_tx_timeout;
+        dev->watchdog_timeo = TX_TIMEOUT;
+        dev->do_ioctl = &korina_ioctl;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = korina_poll_controller;
+#endif
+        netif_napi_add(dev, &lp->napi, korina_poll, 64);
+
+        lp->phy_addr = (((lp->rx_irq == 0x2c? 1:0) << 8) | 0x05);
+        lp->mii_if.dev = dev;
+        lp->mii_if.mdio_read = mdio_read;
+        lp->mii_if.mdio_write = mdio_write;
+        lp->mii_if.phy_id = lp->phy_addr;
+        lp->mii_if.phy_id_mask = 0x1f;
+        lp->mii_if.reg_num_mask = 0x1f;
+
+        err = register_netdev(dev);
+        if (err) {
+                printk(KERN_ERR DRV_NAME
+                        ": cannot register net device %d\n", err);
+                retval = -EINVAL;
+                goto probe_err_register;
+        }
+        return 0;
+
+probe_err_register:
+        kfree(lp->td_ring);
+probe_err_td_ring:
+        iounmap(lp->tx_dma_regs);
+probe_err_dma_tx:
+        iounmap(lp->rx_dma_regs);
+probe_err_dma_rx:
+        iounmap(lp->eth_regs);
+probe_err_out:
+        free_netdev(dev);
+        return retval;
+}
+
+static int korina_remove(struct platform_device *pdev)
+{
+        struct korina_device *bif = platform_get_drvdata(pdev);
+        struct korina_private *lp = netdev_priv(bif->dev);
+
+        if (lp->eth_regs)
+                iounmap(lp->eth_regs);
+        if (lp->rx_dma_regs)
+                iounmap(lp->rx_dma_regs);
+        if (lp->tx_dma_regs)
+                iounmap(lp->tx_dma_regs);
+
+        platform_set_drvdata(pdev, NULL);
+        unregister_netdev(bif->dev);
+        free_netdev(bif->dev);
+
+        return 0;
+}
+
+static struct platform_driver korina_driver = {
+        .driver.name = "korina",
+        .probe = korina_probe,
+        .remove = korina_remove,
+};
+
+static int __init korina_init_module(void)
+{
+        return platform_driver_register(&korina_driver);
+}
+
+static void korina_cleanup_module(void)
+{
+        return platform_driver_unregister(&korina_driver);
+}
+
+module_init(korina_init_module);
+module_exit(korina_cleanup_module);
+
+MODULE_AUTHOR("Philip Rischel <rischelp@idt.com>");
+MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_DESCRIPTION("IDT RC32434 (Korina) Ethernet driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index f2a6e7132241..41b774baac4d 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -258,7 +258,7 @@ static __net_init int loopback_net_init(struct net *net)
         if (!dev)
                 goto out;
 
-        dev->nd_net = net;
+        dev_net_set(dev, net);
         err = register_netdev(dev);
         if (err)
                 goto out_free_netdev;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 489c7c3b90d9..d513bb8a4902 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -246,7 +246,7 @@ static int macb_mii_init(struct macb *bp)
         bp->mii_bus.read = &macb_mdio_read;
         bp->mii_bus.write = &macb_mdio_write;
         bp->mii_bus.reset = &macb_mdio_reset;
-        bp->mii_bus.id = bp->pdev->id;
+        snprintf(bp->mii_bus.id, MII_BUS_ID_SIZE, "%x", bp->pdev->id);
         bp->mii_bus.priv = bp;
         bp->mii_bus.dev = &bp->dev->dev;
         pdata = bp->pdev->dev.platform_data;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index f651a816b280..2056cfc624dc 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -402,7 +402,7 @@ static int macvlan_newlink(struct net_device *dev,
         if (!tb[IFLA_LINK])
                 return -EINVAL;
 
-        lowerdev = __dev_get_by_index(dev->nd_net, nla_get_u32(tb[IFLA_LINK]));
+        lowerdev = __dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK]));
         if (lowerdev == NULL)
                 return -ENODEV;
 
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 771139e283af..601ffd69ebc8 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -3,7 +3,8 @@
  * Copyright (C) 2002 Matthew Dharm <mdharm@momenco.com>
  *
  * Based on the 64360 driver from:
- * Copyright (C) 2002 rabeeh@galileo.co.il
+ * Copyright (C) 2002 Rabeeh Khoury <rabeeh@galileo.co.il>
+ *                    Rabeeh Khoury <rabeeh@marvell.com>
  *
  * Copyright (C) 2003 PMC-Sierra, Inc.,
  *      written by Manish Lachwani
@@ -16,6 +17,9 @@
  * Copyright (C) 2004 Steven J. Hill <sjhill1@rockwellcollins.com>
  *                                   <sjhill@realitydiluted.com>
  *
+ * Copyright (C) 2007-2008 Marvell Semiconductor
+ *                         Lennert Buytenhek <buytenh@marvell.com>
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -63,20 +67,6 @@
 #define MV643XX_TX_FAST_REFILL
 #undef  MV643XX_COAL
 
-/*
- * Number of RX / TX descriptors on RX / TX rings.
- * Note that allocating RX descriptors is done by allocating the RX
- * ring AND a preallocated RX buffers (skb's) for each descriptor.
- * The TX descriptors only allocates the TX descriptors ring,
- * with no pre allocated TX buffers (skb's are allocated by higher layers.
- */
-
-/* Default TX ring size is 1000 descriptors */
-#define MV643XX_DEFAULT_TX_QUEUE_SIZE 1000
-
-/* Default RX ring size is 400 descriptors */
-#define MV643XX_DEFAULT_RX_QUEUE_SIZE 400
-
 #define MV643XX_TX_COAL 100
 #ifdef MV643XX_COAL
 #define MV643XX_RX_COAL 100
@@ -434,14 +424,6 @@ typedef enum _eth_func_ret_status {
         ETH_QUEUE_LAST_RESOURCE /* Ring resources about to exhaust.     */
 } ETH_FUNC_RET_STATUS;
 
-typedef enum _eth_target {
-        ETH_TARGET_DRAM,
-        ETH_TARGET_DEVICE,
-        ETH_TARGET_CBS,
-        ETH_TARGET_PCI0,
-        ETH_TARGET_PCI1
-} ETH_TARGET;
-
 /* These are for big-endian machines.  Little endian needs different
  * definitions.
  */
@@ -586,43 +568,44 @@ struct mv643xx_private {
 
 /* Static function declarations */
 static void eth_port_init(struct mv643xx_private *mp);
-static void eth_port_reset(unsigned int eth_port_num);
+static void eth_port_reset(struct mv643xx_private *mp);
 static void eth_port_start(struct net_device *dev);
 
-static void ethernet_phy_reset(unsigned int eth_port_num);
+static void ethernet_phy_reset(struct mv643xx_private *mp);
 
-static void eth_port_write_smi_reg(unsigned int eth_port_num,
+static void eth_port_write_smi_reg(struct mv643xx_private *mp,
                                    unsigned int phy_reg, unsigned int value);
 
-static void eth_port_read_smi_reg(unsigned int eth_port_num,
+static void eth_port_read_smi_reg(struct mv643xx_private *mp,
                                   unsigned int phy_reg, unsigned int *value);
 
-static void eth_clear_mib_counters(unsigned int eth_port_num);
+static void eth_clear_mib_counters(struct mv643xx_private *mp);
 
 static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
                                             struct pkt_info *p_pkt_info);
 static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
                                               struct pkt_info *p_pkt_info);
 
-static void eth_port_uc_addr_get(unsigned int port_num, unsigned char *p_addr);
-static void eth_port_uc_addr_set(unsigned int port_num, unsigned char *p_addr);
+static void eth_port_uc_addr_get(struct mv643xx_private *mp,
+                                 unsigned char *p_addr);
+static void eth_port_uc_addr_set(struct mv643xx_private *mp,
+                                 unsigned char *p_addr);
 static void eth_port_set_multicast_list(struct net_device *);
-static void mv643xx_eth_port_enable_tx(unsigned int port_num,
+static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
                                                 unsigned int queues);
-static void mv643xx_eth_port_enable_rx(unsigned int port_num,
+static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
                                                 unsigned int queues);
-static unsigned int mv643xx_eth_port_disable_tx(unsigned int port_num);
-static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num);
+static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp);
+static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp);
 static int mv643xx_eth_open(struct net_device *);
 static int mv643xx_eth_stop(struct net_device *);
-static int mv643xx_eth_change_mtu(struct net_device *, int);
-static void eth_port_init_mac_tables(unsigned int eth_port_num);
+static void eth_port_init_mac_tables(struct mv643xx_private *mp);
 #ifdef MV643XX_NAPI
 static int mv643xx_poll(struct napi_struct *napi, int budget);
 #endif
-static int ethernet_phy_get(unsigned int eth_port_num);
-static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
-static int ethernet_phy_detect(unsigned int eth_port_num);
+static int ethernet_phy_get(struct mv643xx_private *mp);
+static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr);
+static int ethernet_phy_detect(struct mv643xx_private *mp);
 static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location);
 static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val);
 static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@@ -636,12 +619,12 @@ static void __iomem *mv643xx_eth_base;
 /* used to protect SMI_REG, which is shared across ports */
 static DEFINE_SPINLOCK(mv643xx_eth_phy_lock);
 
-static inline u32 mv_read(int offset)
+static inline u32 rdl(struct mv643xx_private *mp, int offset)
 {
         return readl(mv643xx_eth_base + offset);
 }
 
-static inline void mv_write(int offset, u32 data)
+static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)
 {
         writel(data, mv643xx_eth_base + offset);
 }
@@ -659,18 +642,19 @@ static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
                 return -EINVAL;
 
         dev->mtu = new_mtu;
+        if (!netif_running(dev))
+                return 0;
+
         /*
-         * Stop then re-open the interface. This will allocate RX skb's with
-         * the new MTU.
-         * There is a possible danger that the open will not successed, due
-         * to memory is full, which might fail the open function.
+         * Stop and then re-open the interface. This will allocate RX
+         * skbs of the new MTU.
+         * There is a possible danger that the open will not succeed,
+         * due to memory being full, which might fail the open function.
          */
-        if (netif_running(dev)) {
-                mv643xx_eth_stop(dev);
-                if (mv643xx_eth_open(dev))
-                        printk(KERN_ERR
-                                "%s: Fatal error on opening device\n",
-                                dev->name);
+        mv643xx_eth_stop(dev);
+        if (mv643xx_eth_open(dev)) {
+                printk(KERN_ERR "%s: Fatal error on opening device\n",
+                        dev->name);
         }
 
         return 0;
@@ -748,10 +732,9 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
 static void mv643xx_eth_update_mac_address(struct net_device *dev)
 {
         struct mv643xx_private *mp = netdev_priv(dev);
-        unsigned int port_num = mp->port_num;
 
-        eth_port_init_mac_tables(port_num);
-        eth_port_uc_addr_set(port_num, dev->dev_addr);
+        eth_port_init_mac_tables(mp);
+        eth_port_uc_addr_set(mp, dev->dev_addr);
 }
 
 /*
@@ -767,12 +750,12 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
         struct mv643xx_private *mp = netdev_priv(dev);
         u32 config_reg;
 
-        config_reg = mv_read(PORT_CONFIG_REG(mp->port_num));
+        config_reg = rdl(mp, PORT_CONFIG_REG(mp->port_num));
         if (dev->flags & IFF_PROMISC)
                 config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
         else
                 config_reg &= ~(u32) UNICAST_PROMISCUOUS_MODE;
-        mv_write(PORT_CONFIG_REG(mp->port_num), config_reg);
+        wrl(mp, PORT_CONFIG_REG(mp->port_num), config_reg);
 
         eth_port_set_multicast_list(dev);
 }
@@ -826,14 +809,14 @@ static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
 {
         struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private,
                                                   tx_timeout_task);
-        struct net_device *dev = mp->mii.dev; /* yuck */
+        struct net_device *dev = mp->dev;
 
         if (!netif_running(dev))
                 return;
 
         netif_stop_queue(dev);
 
-        eth_port_reset(mp->port_num);
+        eth_port_reset(mp);
         eth_port_start(dev);
 
         if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
@@ -845,7 +828,7 @@ static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
  *
  * If force is non-zero, frees uncompleted descriptors as well
  */
-int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
+static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
 {
         struct mv643xx_private *mp = netdev_priv(dev);
         struct eth_tx_desc *desc;
@@ -1008,7 +991,7 @@ static void mv643xx_eth_update_pscr(struct net_device *dev,
         u32 o_pscr, n_pscr;
         unsigned int queues;
 
-        o_pscr = mv_read(PORT_SERIAL_CONTROL_REG(port_num));
+        o_pscr = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
         n_pscr = o_pscr;
 
         /* clear speed, duplex and rx buffer size fields */
@@ -1031,16 +1014,16 @@ static void mv643xx_eth_update_pscr(struct net_device *dev,
 
         if (n_pscr != o_pscr) {
                 if ((o_pscr & SERIAL_PORT_ENABLE) == 0)
-                        mv_write(PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
+                        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
                 else {
-                        queues = mv643xx_eth_port_disable_tx(port_num);
+                        queues = mv643xx_eth_port_disable_tx(mp);
 
                         o_pscr &= ~SERIAL_PORT_ENABLE;
-                        mv_write(PORT_SERIAL_CONTROL_REG(port_num), o_pscr);
-                        mv_write(PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
-                        mv_write(PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
+                        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), o_pscr);
+                        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
+                        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
                         if (queues)
-                                mv643xx_eth_port_enable_tx(port_num, queues);
+                                mv643xx_eth_port_enable_tx(mp, queues);
                 }
         }
 }
@@ -1064,13 +1047,13 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
         unsigned int port_num = mp->port_num;
 
         /* Read interrupt cause registers */
-        eth_int_cause = mv_read(INTERRUPT_CAUSE_REG(port_num)) &
+        eth_int_cause = rdl(mp, INTERRUPT_CAUSE_REG(port_num)) &
                                                 ETH_INT_UNMASK_ALL;
         if (eth_int_cause & ETH_INT_CAUSE_EXT) {
-                eth_int_cause_ext = mv_read(
+                eth_int_cause_ext = rdl(mp,
                         INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
                                                 ETH_INT_UNMASK_ALL_EXT;
-                mv_write(INTERRUPT_CAUSE_EXTEND_REG(port_num),
+                wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num),
                                                         ~eth_int_cause_ext);
         }
 
@@ -1081,8 +1064,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
                 if (mii_link_ok(&mp->mii)) {
                         mii_ethtool_gset(&mp->mii, &cmd);
                         mv643xx_eth_update_pscr(dev, &cmd);
-                        mv643xx_eth_port_enable_tx(port_num,
-                                                   ETH_TX_QUEUES_ENABLED);
+                        mv643xx_eth_port_enable_tx(mp, ETH_TX_QUEUES_ENABLED);
                         if (!netif_carrier_ok(dev)) {
                                 netif_carrier_on(dev);
                                 if (mp->tx_ring_size - mp->tx_desc_count >=
@@ -1098,10 +1080,10 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
 #ifdef MV643XX_NAPI
         if (eth_int_cause & ETH_INT_CAUSE_RX) {
                 /* schedule the NAPI poll routine to maintain port */
-                mv_write(INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
+                wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
 
                 /* wait for previous write to complete */
-                mv_read(INTERRUPT_MASK_REG(port_num));
+                rdl(mp, INTERRUPT_MASK_REG(port_num));
 
                 netif_rx_schedule(dev, &mp->napi);
         }
@@ -1136,7 +1118,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
  *      , and the required delay of the interrupt in usec.
  *
  * INPUT:
- *      unsigned int eth_port_num       Ethernet port number
+ *      struct mv643xx_private *mp      Ethernet port
  *      unsigned int t_clk              t_clk of the MV-643xx chip in HZ units
  *      unsigned int delay              Delay in usec
  *
@@ -1147,15 +1129,16 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
  *      The interrupt coalescing value set in the gigE port.
  *
  */
-static unsigned int eth_port_set_rx_coal(unsigned int eth_port_num,
+static unsigned int eth_port_set_rx_coal(struct mv643xx_private *mp,
                                         unsigned int t_clk, unsigned int delay)
 {
+        unsigned int port_num = mp->port_num;
         unsigned int coal = ((t_clk / 1000000) * delay) / 64;
 
         /* Set RX Coalescing mechanism */
-        mv_write(SDMA_CONFIG_REG(eth_port_num),
+        wrl(mp, SDMA_CONFIG_REG(port_num),
                 ((coal & 0x3fff) << 8) |
-                (mv_read(SDMA_CONFIG_REG(eth_port_num))
+                (rdl(mp, SDMA_CONFIG_REG(port_num))
                         & 0xffc000ff));
 
         return coal;
@@ -1174,7 +1157,7 @@ static unsigned int eth_port_set_rx_coal(unsigned int eth_port_num,
  *      MV-643xx chip and the required delay in the interrupt in uSec
  *
  * INPUT:
- *      unsigned int eth_port_num       Ethernet port number
+ *      struct mv643xx_private *mp      Ethernet port
  *      unsigned int t_clk              t_clk of the MV-643xx chip in HZ units
  *      unsigned int delay              Delay in uSeconds
  *
@@ -1185,13 +1168,14 @@ static unsigned int eth_port_set_rx_coal(unsigned int eth_port_num,
  *      The interrupt coalescing value set in the gigE port.
  *
  */
-static unsigned int eth_port_set_tx_coal(unsigned int eth_port_num,
+static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
                                         unsigned int t_clk, unsigned int delay)
 {
-        unsigned int coal;
-        coal = ((t_clk / 1000000) * delay) / 64;
+        unsigned int coal = ((t_clk / 1000000) * delay) / 64;
+
         /* Set TX Coalescing mechanism */
-        mv_write(TX_FIFO_URGENT_THRESHOLD_REG(eth_port_num), coal << 4);
+        wrl(mp, TX_FIFO_URGENT_THRESHOLD_REG(mp->port_num), coal << 4);
+
         return coal;
 }
 
@@ -1327,16 +1311,15 @@ static int mv643xx_eth_open(struct net_device *dev)
         int err;
 
         /* Clear any pending ethernet port interrupts */
-        mv_write(INTERRUPT_CAUSE_REG(port_num), 0);
-        mv_write(INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
+        wrl(mp, INTERRUPT_CAUSE_REG(port_num), 0);
+        wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
         /* wait for previous write to complete */
-        mv_read (INTERRUPT_CAUSE_EXTEND_REG(port_num));
+        rdl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num));
 
         err = request_irq(dev->irq, mv643xx_eth_int_handler,
                         IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
         if (err) {
-                printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
-                                                                port_num);
+                printk(KERN_ERR "%s: Can not assign IRQ\n", dev->name);
                 return -EAGAIN;
         }
 
@@ -1430,17 +1413,17 @@ static int mv643xx_eth_open(struct net_device *dev)
 
 #ifdef MV643XX_COAL
         mp->rx_int_coal =
-                eth_port_set_rx_coal(port_num, 133000000, MV643XX_RX_COAL);
+                eth_port_set_rx_coal(mp, 133000000, MV643XX_RX_COAL);
 #endif
 
         mp->tx_int_coal =
-                eth_port_set_tx_coal(port_num, 133000000, MV643XX_TX_COAL);
+                eth_port_set_tx_coal(mp, 133000000, MV643XX_TX_COAL);
 
         /* Unmask phy and link status changes interrupts */
-        mv_write(INTERRUPT_EXTEND_MASK_REG(port_num), ETH_INT_UNMASK_ALL_EXT);
+        wrl(mp, INTERRUPT_EXTEND_MASK_REG(port_num), ETH_INT_UNMASK_ALL_EXT);
 
         /* Unmask RX buffer and TX end interrupt */
-        mv_write(INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+        wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
 
         return 0;
 
@@ -1459,7 +1442,7 @@ static void mv643xx_eth_free_tx_rings(struct net_device *dev)
         struct mv643xx_private *mp = netdev_priv(dev);
 
         /* Stop Tx Queues */
-        mv643xx_eth_port_disable_tx(mp->port_num);
+        mv643xx_eth_port_disable_tx(mp);
 
         /* Free outstanding skb's on TX ring */
         mv643xx_eth_free_all_tx_descs(dev);
@@ -1477,11 +1460,10 @@ static void mv643xx_eth_free_tx_rings(struct net_device *dev)
 static void mv643xx_eth_free_rx_rings(struct net_device *dev)
 {
         struct mv643xx_private *mp = netdev_priv(dev);
-        unsigned int port_num = mp->port_num;
         int curr;
 
         /* Stop RX Queues */
-        mv643xx_eth_port_disable_rx(port_num);
+        mv643xx_eth_port_disable_rx(mp);
 
         /* Free preallocated skb's on RX rings */
         for (curr = 0; mp->rx_desc_count && curr < mp->rx_ring_size; curr++) {
@@ -1520,9 +1502,9 @@ static int mv643xx_eth_stop(struct net_device *dev)
         unsigned int port_num = mp->port_num;
 
         /* Mask all interrupts on ethernet port */
-        mv_write(INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
+        wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
         /* wait for previous write to complete */
-        mv_read(INTERRUPT_MASK_REG(port_num));
+        rdl(mp, INTERRUPT_MASK_REG(port_num));
 
 #ifdef MV643XX_NAPI
         napi_disable(&mp->napi);
@@ -1530,7 +1512,7 @@ static int mv643xx_eth_stop(struct net_device *dev)
         netif_carrier_off(dev);
         netif_stop_queue(dev);
 
-        eth_port_reset(mp->port_num);
+        eth_port_reset(mp);
 
         mv643xx_eth_free_tx_rings(dev);
         mv643xx_eth_free_rx_rings(dev);
@@ -1561,15 +1543,15 @@ static int mv643xx_poll(struct napi_struct *napi, int budget)
 #endif
 
         work_done = 0;
-        if ((mv_read(RX_CURRENT_QUEUE_DESC_PTR_0(port_num)))
+        if ((rdl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num)))
             != (u32) mp->rx_used_desc_q)
                 work_done = mv643xx_eth_receive_queue(dev, budget);
 
         if (work_done < budget) {
                 netif_rx_complete(dev, napi);
-                mv_write(INTERRUPT_CAUSE_REG(port_num), 0);
-                mv_write(INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-                mv_write(INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+                wrl(mp, INTERRUPT_CAUSE_REG(port_num), 0);
+                wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
+                wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
         }
 
         return work_done;
@@ -1723,7 +1705,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
 
         /* ensure all descriptors are written before poking hardware */
         wmb();
-        mv643xx_eth_port_enable_tx(mp->port_num, ETH_TX_QUEUES_ENABLED);
+        mv643xx_eth_port_enable_tx(mp, ETH_TX_QUEUES_ENABLED);
 
         mp->tx_desc_count += nr_frags + 1;
 }
@@ -1739,25 +1721,23 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned long flags;
 
         BUG_ON(netif_queue_stopped(dev));
-        BUG_ON(skb == NULL);
+
+        if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {
+                stats->tx_dropped++;
+                printk(KERN_DEBUG "%s: failed to linearize tiny "
+                                "unaligned fragment\n", dev->name);
+                return NETDEV_TX_BUSY;
+        }
+
+        spin_lock_irqsave(&mp->lock, flags);
 
         if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
                 printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
                 netif_stop_queue(dev);
-                return 1;
-        }
-
-        if (has_tiny_unaligned_frags(skb)) {
-                if (__skb_linearize(skb)) {
-                        stats->tx_dropped++;
-                        printk(KERN_DEBUG "%s: failed to linearize tiny "
-                                        "unaligned fragment\n", dev->name);
-                        return 1;
-                }
+                spin_unlock_irqrestore(&mp->lock, flags);
+                return NETDEV_TX_BUSY;
         }
 
-        spin_lock_irqsave(&mp->lock, flags);
-
         eth_tx_submit_descs_for_skb(mp, skb);
         stats->tx_bytes += skb->len;
         stats->tx_packets++;
@@ -1768,7 +1748,7 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         spin_unlock_irqrestore(&mp->lock, flags);
 
-        return 0;               /* success */
+        return NETDEV_TX_OK;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -1777,13 +1757,13 @@ static void mv643xx_netpoll(struct net_device *netdev)
         struct mv643xx_private *mp = netdev_priv(netdev);
         int port_num = mp->port_num;
 
-        mv_write(INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
+        wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
         /* wait for previous write to complete */
-        mv_read(INTERRUPT_MASK_REG(port_num));
+        rdl(mp, INTERRUPT_MASK_REG(port_num));
 
         mv643xx_eth_int_handler(netdev->irq, netdev);
 
-        mv_write(INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+        wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
 }
 #endif
 
@@ -1900,7 +1880,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         port_num = mp->port_num = pd->port_number;
 
         /* set default config values */
-        eth_port_uc_addr_get(port_num, dev->dev_addr);
+        eth_port_uc_addr_get(mp, dev->dev_addr);
         mp->rx_ring_size = PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
         mp->tx_ring_size = PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
 
@@ -1908,7 +1888,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
                 memcpy(dev->dev_addr, pd->mac_addr, 6);
 
         if (pd->phy_addr || pd->force_phy_addr)
-                ethernet_phy_set(port_num, pd->phy_addr);
+                ethernet_phy_set(mp, pd->phy_addr);
 
         if (pd->rx_queue_size)
                 mp->rx_ring_size = pd->rx_queue_size;
@@ -1933,19 +1913,18 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         mp->mii.dev = dev;
         mp->mii.mdio_read = mv643xx_mdio_read;
         mp->mii.mdio_write = mv643xx_mdio_write;
-        mp->mii.phy_id = ethernet_phy_get(port_num);
+        mp->mii.phy_id = ethernet_phy_get(mp);
         mp->mii.phy_id_mask = 0x3f;
         mp->mii.reg_num_mask = 0x1f;
 
-        err = ethernet_phy_detect(port_num);
+        err = ethernet_phy_detect(mp);
         if (err) {
-                pr_debug("MV643xx ethernet port %d: "
-                                        "No PHY detected at addr %d\n",
-                                        port_num, ethernet_phy_get(port_num));
+                pr_debug("%s: No PHY detected at addr %d\n",
+                                dev->name, ethernet_phy_get(mp));
                 goto out;
         }
 
-        ethernet_phy_reset(port_num);
+        ethernet_phy_reset(mp);
         mp->mii.supports_gmii = mii_check_gmii_support(&mp->mii);
         mv643xx_init_ethtool_cmd(dev, mp->mii.phy_id, speed, duplex, &cmd);
         mv643xx_eth_update_pscr(dev, &cmd);
@@ -2006,9 +1985,11 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
 
 static int mv643xx_eth_shared_probe(struct platform_device *pdev)
 {
+        static int mv643xx_version_printed = 0;
         struct resource *res;
 
-        printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
+        if (!mv643xx_version_printed++)
+                printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL)
@@ -2037,10 +2018,10 @@ static void mv643xx_eth_shutdown(struct platform_device *pdev)
         unsigned int port_num = mp->port_num;
 
         /* Mask all interrupts on ethernet port */
-        mv_write(INTERRUPT_MASK_REG(port_num), 0);
-        mv_read (INTERRUPT_MASK_REG(port_num));
+        wrl(mp, INTERRUPT_MASK_REG(port_num), 0);
+        rdl(mp, INTERRUPT_MASK_REG(port_num));
 
-        eth_port_reset(port_num);
+        eth_port_reset(mp);
 }
 
 static struct platform_driver mv643xx_eth_driver = {
@@ -2229,12 +2210,9 @@ MODULE_ALIAS("platform:mv643xx_eth");
  *              return_info     Tx/Rx user resource return information.
  */
 
-/* PHY routines */
-static int ethernet_phy_get(unsigned int eth_port_num);
-static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
-
 /* Ethernet Port routines */
-static void eth_port_set_filter_table_entry(int table, unsigned char entry);
+static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
+                                            int table, unsigned char entry);
 
 /*
  * eth_port_init - Initialize the Ethernet port driver
@@ -2264,9 +2242,9 @@ static void eth_port_init(struct mv643xx_private *mp)
 {
         mp->rx_resource_err = 0;
 
-        eth_port_reset(mp->port_num);
+        eth_port_reset(mp);
 
-        eth_port_init_mac_tables(mp->port_num);
+        eth_port_init_mac_tables(mp);
 }
 
 /*
@@ -2306,28 +2284,28 @@ static void eth_port_start(struct net_device *dev)
 
         /* Assignment of Tx CTRP of given queue */
         tx_curr_desc = mp->tx_curr_desc_q;
-        mv_write(TX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+        wrl(mp, TX_CURRENT_QUEUE_DESC_PTR_0(port_num),
                 (u32)((struct eth_tx_desc *)mp->tx_desc_dma + tx_curr_desc));
 
         /* Assignment of Rx CRDP of given queue */
         rx_curr_desc = mp->rx_curr_desc_q;
-        mv_write(RX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+        wrl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num),
                 (u32)((struct eth_rx_desc *)mp->rx_desc_dma + rx_curr_desc));
 
         /* Add the assigned Ethernet address to the port's address table */
-        eth_port_uc_addr_set(port_num, dev->dev_addr);
+        eth_port_uc_addr_set(mp, dev->dev_addr);
 
         /* Assign port configuration and command. */
-        mv_write(PORT_CONFIG_REG(port_num),
+        wrl(mp, PORT_CONFIG_REG(port_num),
                           PORT_CONFIG_DEFAULT_VALUE);
 
-        mv_write(PORT_CONFIG_EXTEND_REG(port_num),
+        wrl(mp, PORT_CONFIG_EXTEND_REG(port_num),
                           PORT_CONFIG_EXTEND_DEFAULT_VALUE);
 
-        pscr = mv_read(PORT_SERIAL_CONTROL_REG(port_num));
+        pscr = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
 
         pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
-        mv_write(PORT_SERIAL_CONTROL_REG(port_num), pscr);
+        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
 
         pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
                 DISABLE_AUTO_NEG_SPEED_GMII    |
@@ -2335,32 +2313,34 @@ static void eth_port_start(struct net_device *dev)
                 DO_NOT_FORCE_LINK_FAIL     |
                 SERIAL_PORT_CONTROL_RESERVED;
 
-        mv_write(PORT_SERIAL_CONTROL_REG(port_num), pscr);
+        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
 
         pscr |= SERIAL_PORT_ENABLE;
-        mv_write(PORT_SERIAL_CONTROL_REG(port_num), pscr);
+        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
 
         /* Assign port SDMA configuration */
-        mv_write(SDMA_CONFIG_REG(port_num),
+        wrl(mp, SDMA_CONFIG_REG(port_num),
                           PORT_SDMA_CONFIG_DEFAULT_VALUE);
 
         /* Enable port Rx. */
-        mv643xx_eth_port_enable_rx(port_num, ETH_RX_QUEUES_ENABLED);
+        mv643xx_eth_port_enable_rx(mp, ETH_RX_QUEUES_ENABLED);
 
         /* Disable port bandwidth limits by clearing MTU register */
-        mv_write(MAXIMUM_TRANSMIT_UNIT(port_num), 0);
+        wrl(mp, MAXIMUM_TRANSMIT_UNIT(port_num), 0);
 
         /* save phy settings across reset */
         mv643xx_get_settings(dev, &ethtool_cmd);
-        ethernet_phy_reset(mp->port_num);
+        ethernet_phy_reset(mp);
         mv643xx_set_settings(dev, &ethtool_cmd);
 }
 
 /*
  * eth_port_uc_addr_set - Write a MAC address into the port's hw registers
  */
-static void eth_port_uc_addr_set(unsigned int port_num, unsigned char *p_addr)
+static void eth_port_uc_addr_set(struct mv643xx_private *mp,
+                                 unsigned char *p_addr)
 {
+        unsigned int port_num = mp->port_num;
         unsigned int mac_h;
         unsigned int mac_l;
         int table;
@@ -2369,24 +2349,26 @@ static void eth_port_uc_addr_set(unsigned int port_num, unsigned char *p_addr)
         mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
                                                         (p_addr[3] << 0);
 
-        mv_write(MAC_ADDR_LOW(port_num), mac_l);
-        mv_write(MAC_ADDR_HIGH(port_num), mac_h);
+        wrl(mp, MAC_ADDR_LOW(port_num), mac_l);
+        wrl(mp, MAC_ADDR_HIGH(port_num), mac_h);
 
         /* Accept frames with this address */
         table = DA_FILTER_UNICAST_TABLE_BASE(port_num);
-        eth_port_set_filter_table_entry(table, p_addr[5] & 0x0f);
+        eth_port_set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
 }
 
 /*
  * eth_port_uc_addr_get - Read the MAC address from the port's hw registers
  */
-static void eth_port_uc_addr_get(unsigned int port_num, unsigned char *p_addr)
+static void eth_port_uc_addr_get(struct mv643xx_private *mp,
+                                 unsigned char *p_addr)
 {
+        unsigned int port_num = mp->port_num;
         unsigned int mac_h;
         unsigned int mac_l;
 
-        mac_h = mv_read(MAC_ADDR_HIGH(port_num));
-        mac_l = mv_read(MAC_ADDR_LOW(port_num));
+        mac_h = rdl(mp, MAC_ADDR_HIGH(port_num));
+        mac_l = rdl(mp, MAC_ADDR_LOW(port_num));
 
         p_addr[0] = (mac_h >> 24) & 0xff;
         p_addr[1] = (mac_h >> 16) & 0xff;
@@ -2405,7 +2387,8 @@ static void eth_port_uc_addr_get(unsigned int port_num, unsigned char *p_addr)
  *      3-1     Queue                   (ETH_Q0=0)
  *      7-4     Reserved = 0;
  */
-static void eth_port_set_filter_table_entry(int table, unsigned char entry)
+static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
+                                            int table, unsigned char entry)
 {
         unsigned int table_reg;
         unsigned int tbl_offset;
@@ -2415,9 +2398,9 @@ static void eth_port_set_filter_table_entry(int table, unsigned char entry)
         reg_offset = entry % 4;         /* Entry offset within the register */
 
         /* Set "accepts frame bit" at specified table entry */
-        table_reg = mv_read(table + tbl_offset);
+        table_reg = rdl(mp, table + tbl_offset);
         table_reg |= 0x01 << (8 * reg_offset);
-        mv_write(table + tbl_offset, table_reg);
+        wrl(mp, table + tbl_offset, table_reg);
 }
 
 /*
@@ -2434,8 +2417,9 @@ static void eth_port_set_filter_table_entry(int table, unsigned char entry)
  * In either case, eth_port_set_filter_table_entry() is then called
  * to set to set the actual table entry.
  */
-static void eth_port_mc_addr(unsigned int eth_port_num, unsigned char *p_addr)
+static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
 {
+        unsigned int port_num = mp->port_num;
         unsigned int mac_h;
         unsigned int mac_l;
         unsigned char crc_result = 0;
@@ -2446,9 +2430,8 @@ static void eth_port_mc_addr(unsigned int eth_port_num, unsigned char *p_addr)
 
         if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
             (p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
-                table = DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
-                                        (eth_port_num);
-                eth_port_set_filter_table_entry(table, p_addr[5]);
+                table = DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num);
+                eth_port_set_filter_table_entry(mp, table, p_addr[5]);
                 return;
         }
 
@@ -2520,8 +2503,8 @@ static void eth_port_mc_addr(unsigned int eth_port_num, unsigned char *p_addr)
         for (i = 0; i < 8; i++)
                 crc_result = crc_result | (crc[i] << i);
 
-        table = DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num);
-        eth_port_set_filter_table_entry(table, crc_result);
+        table = DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num);
+        eth_port_set_filter_table_entry(mp, table, crc_result);
 }
 
 /*
@@ -2550,7 +2533,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
                          * 3-1  Queue    ETH_Q0=0
                          * 7-4  Reserved = 0;
                          */
-                        mv_write(DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
+                        wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
 
                         /* Set all entries in DA filter other multicast
                          * table (Ex_dFOMT)
@@ -2560,7 +2543,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
                          * 3-1  Queue    ETH_Q0=0
                          * 7-4  Reserved = 0;
                          */
-                        mv_write(DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
+                        wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
                 }
                 return;
         }
@@ -2570,11 +2553,11 @@ static void eth_port_set_multicast_list(struct net_device *dev)
          */
         for (table_index = 0; table_index <= 0xFC; table_index += 4) {
                 /* Clear DA filter special multicast table (Ex_dFSMT) */
-                mv_write(DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
+                wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
                                 (eth_port_num) + table_index, 0);
 
                 /* Clear DA filter other multicast table (Ex_dFOMT) */
-                mv_write(DA_FILTER_OTHER_MULTICAST_TABLE_BASE
+                wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE
                                 (eth_port_num) + table_index, 0);
         }
 
@@ -2583,7 +2566,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
                         (i < 256) && (mc_list != NULL) && (i < dev->mc_count);
                         i++, mc_list = mc_list->next)
                 if (mc_list->dmi_addrlen == 6)
-                        eth_port_mc_addr(eth_port_num, mc_list->dmi_addr);
+                        eth_port_mc_addr(mp, mc_list->dmi_addr);
 }
 
 /*
@@ -2594,7 +2577,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
  *      Other Multicast) and set each entry to 0.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
  *      Multicast and Unicast packets are rejected.
@@ -2602,22 +2585,23 @@ static void eth_port_set_multicast_list(struct net_device *dev)
  * RETURN:
  *      None.
  */
-static void eth_port_init_mac_tables(unsigned int eth_port_num)
+static void eth_port_init_mac_tables(struct mv643xx_private *mp)
 {
+        unsigned int port_num = mp->port_num;
         int table_index;
 
         /* Clear DA filter unicast table (Ex_dFUT) */
         for (table_index = 0; table_index <= 0xC; table_index += 4)
-                mv_write(DA_FILTER_UNICAST_TABLE_BASE
-                                        (eth_port_num) + table_index, 0);
+                wrl(mp, DA_FILTER_UNICAST_TABLE_BASE(port_num) +
+                                        table_index, 0);
 
         for (table_index = 0; table_index <= 0xFC; table_index += 4) {
                 /* Clear DA filter special multicast table (Ex_dFSMT) */
-                mv_write(DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
-                                        (eth_port_num) + table_index, 0);
+                wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num) +
+                                        table_index, 0);
                 /* Clear DA filter other multicast table (Ex_dFOMT) */
-                mv_write(DA_FILTER_OTHER_MULTICAST_TABLE_BASE
-                                        (eth_port_num) + table_index, 0);
+                wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num) +
+                                        table_index, 0);
         }
 }
 
@@ -2629,7 +2613,7 @@ static void eth_port_init_mac_tables(unsigned int eth_port_num)
  *      A read from the MIB counter will reset the counter.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
  *      After reading all MIB counters, the counters resets.
@@ -2638,19 +2622,20 @@ static void eth_port_init_mac_tables(unsigned int eth_port_num)
  *      MIB counter value.
  *
  */
-static void eth_clear_mib_counters(unsigned int eth_port_num)
+static void eth_clear_mib_counters(struct mv643xx_private *mp)
 {
+        unsigned int port_num = mp->port_num;
         int i;
 
         /* Perform dummy reads from MIB counters */
         for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION;
                                                                         i += 4)
-                mv_read(MIB_COUNTERS_BASE(eth_port_num) + i);
+                rdl(mp, MIB_COUNTERS_BASE(port_num) + i);
 }
 
 static inline u32 read_mib(struct mv643xx_private *mp, int offset)
 {
-        return mv_read(MIB_COUNTERS_BASE(mp->port_num) + offset);
+        return rdl(mp, MIB_COUNTERS_BASE(mp->port_num) + offset);
 }
 
 static void eth_update_mib_counters(struct mv643xx_private *mp)
@@ -2686,7 +2671,7 @@ static void eth_update_mib_counters(struct mv643xx_private *mp)
  *      the specified port.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
  *      None
@@ -2696,22 +2681,22 @@ static void eth_update_mib_counters(struct mv643xx_private *mp)
  *      -ENODEV on failure
  *
  */
-static int ethernet_phy_detect(unsigned int port_num)
+static int ethernet_phy_detect(struct mv643xx_private *mp)
 {
         unsigned int phy_reg_data0;
         int auto_neg;
 
-        eth_port_read_smi_reg(port_num, 0, &phy_reg_data0);
+        eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
         auto_neg = phy_reg_data0 & 0x1000;
         phy_reg_data0 ^= 0x1000;        /* invert auto_neg */
-        eth_port_write_smi_reg(port_num, 0, phy_reg_data0);
+        eth_port_write_smi_reg(mp, 0, phy_reg_data0);
 
-        eth_port_read_smi_reg(port_num, 0, &phy_reg_data0);
+        eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
         if ((phy_reg_data0 & 0x1000) == auto_neg)
                 return -ENODEV;                         /* change didn't take */
 
         phy_reg_data0 ^= 0x1000;
-        eth_port_write_smi_reg(port_num, 0, phy_reg_data0);
+        eth_port_write_smi_reg(mp, 0, phy_reg_data0);
         return 0;
 }
 
@@ -2722,7 +2707,7 @@ static int ethernet_phy_detect(unsigned int port_num)
  *      This routine returns the given ethernet port PHY address.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
  *      None.
@@ -2731,13 +2716,13 @@ static int ethernet_phy_detect(unsigned int port_num)
  *      PHY address.
  *
  */
-static int ethernet_phy_get(unsigned int eth_port_num)
+static int ethernet_phy_get(struct mv643xx_private *mp)
 {
         unsigned int reg_data;
 
-        reg_data = mv_read(PHY_ADDR_REG);
+        reg_data = rdl(mp, PHY_ADDR_REG);
 
-        return ((reg_data >> (5 * eth_port_num)) & 0x1f);
+        return ((reg_data >> (5 * mp->port_num)) & 0x1f);
 }
 
 /*
@@ -2747,7 +2732,7 @@ static int ethernet_phy_get(unsigned int eth_port_num)
  *      This routine sets the given ethernet port PHY address.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *      int             phy_addr        PHY address.
  *
  * OUTPUT:
@@ -2757,15 +2742,15 @@ static int ethernet_phy_get(unsigned int eth_port_num)
  *      None.
  *
  */
-static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr)
+static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
 {
         u32 reg_data;
-        int addr_shift = 5 * eth_port_num;
+        int addr_shift = 5 * mp->port_num;
 
-        reg_data = mv_read(PHY_ADDR_REG);
+        reg_data = rdl(mp, PHY_ADDR_REG);
         reg_data &= ~(0x1f << addr_shift);
         reg_data |= (phy_addr & 0x1f) << addr_shift;
-        mv_write(PHY_ADDR_REG, reg_data);
+        wrl(mp, PHY_ADDR_REG, reg_data);
 }
 
 /*
@@ -2775,7 +2760,7 @@ static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr)
  *      This routine utilizes the SMI interface to reset the ethernet port PHY.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
  *      The PHY is reset.
@@ -2784,51 +2769,52 @@ static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr)
  *      None.
  *
  */
-static void ethernet_phy_reset(unsigned int eth_port_num)
+static void ethernet_phy_reset(struct mv643xx_private *mp)
 {
         unsigned int phy_reg_data;
 
         /* Reset the PHY */
-        eth_port_read_smi_reg(eth_port_num, 0, &phy_reg_data);
+        eth_port_read_smi_reg(mp, 0, &phy_reg_data);
         phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
-        eth_port_write_smi_reg(eth_port_num, 0, phy_reg_data);
+        eth_port_write_smi_reg(mp, 0, phy_reg_data);
 
         /* wait for PHY to come out of reset */
         do {
                 udelay(1);
-                eth_port_read_smi_reg(eth_port_num, 0, &phy_reg_data);
+                eth_port_read_smi_reg(mp, 0, &phy_reg_data);
         } while (phy_reg_data & 0x8000);
 }
 
-static void mv643xx_eth_port_enable_tx(unsigned int port_num,
+static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
                                         unsigned int queues)
 {
-        mv_write(TRANSMIT_QUEUE_COMMAND_REG(port_num), queues);
+        wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(mp->port_num), queues);
 }
 
-static void mv643xx_eth_port_enable_rx(unsigned int port_num,
+static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
                                         unsigned int queues)
 {
-        mv_write(RECEIVE_QUEUE_COMMAND_REG(port_num), queues);
+        wrl(mp, RECEIVE_QUEUE_COMMAND_REG(mp->port_num), queues);
 }
 
-static unsigned int mv643xx_eth_port_disable_tx(unsigned int port_num)
+static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
 {
+        unsigned int port_num = mp->port_num;
         u32 queues;
 
         /* Stop Tx port activity. Check port Tx activity. */
-        queues = mv_read(TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF;
+        queues = rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF;
         if (queues) {
                 /* Issue stop command for active queues only */
-                mv_write(TRANSMIT_QUEUE_COMMAND_REG(port_num), (queues << 8));
+                wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num), (queues << 8));
 
                 /* Wait for all Tx activity to terminate. */
                 /* Check port cause register that all Tx queues are stopped */
-                while (mv_read(TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF)
+                while (rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF)
                         udelay(PHY_WAIT_MICRO_SECONDS);
 
                 /* Wait for Tx FIFO to empty */
-                while (mv_read(PORT_STATUS_REG(port_num)) &
+                while (rdl(mp, PORT_STATUS_REG(port_num)) &
                                                         ETH_PORT_TX_FIFO_EMPTY)
                         udelay(PHY_WAIT_MICRO_SECONDS);
         }
@@ -2836,19 +2822,20 @@ static unsigned int mv643xx_eth_port_disable_tx(unsigned int port_num)
         return queues;
 }
 
-static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num)
+static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
 {
+        unsigned int port_num = mp->port_num;
         u32 queues;
 
         /* Stop Rx port activity. Check port Rx activity. */
-        queues = mv_read(RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF;
+        queues = rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF;
         if (queues) {
                 /* Issue stop command for active queues only */
-                mv_write(RECEIVE_QUEUE_COMMAND_REG(port_num), (queues << 8));
+                wrl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num), (queues << 8));
 
                 /* Wait for all Rx activity to terminate. */
                 /* Check port cause register that all Rx queues are stopped */
-                while (mv_read(RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF)
+                while (rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF)
                         udelay(PHY_WAIT_MICRO_SECONDS);
         }
 
@@ -2864,7 +2851,7 @@ static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num)
  *      idle state after this command is performed and the port is disabled.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
  *      Channel activity is halted.
@@ -2873,22 +2860,23 @@ static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num)
  *      None.
  *
  */
-static void eth_port_reset(unsigned int port_num)
+static void eth_port_reset(struct mv643xx_private *mp)
 {
+        unsigned int port_num = mp->port_num;
         unsigned int reg_data;
 
-        mv643xx_eth_port_disable_tx(port_num);
-        mv643xx_eth_port_disable_rx(port_num);
+        mv643xx_eth_port_disable_tx(mp);
+        mv643xx_eth_port_disable_rx(mp);
 
         /* Clear all MIB counters */
-        eth_clear_mib_counters(port_num);
+        eth_clear_mib_counters(mp);
 
         /* Reset the Enable bit in the Configuration Register */
-        reg_data = mv_read(PORT_SERIAL_CONTROL_REG(port_num));
+        reg_data = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
         reg_data &= ~(SERIAL_PORT_ENABLE                |
                         DO_NOT_FORCE_LINK_FAIL  |
                         FORCE_LINK_PASS);
-        mv_write(PORT_SERIAL_CONTROL_REG(port_num), reg_data);
+        wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), reg_data);
 }
 
 
@@ -2900,7 +2888,7 @@ static void eth_port_reset(unsigned int port_num)
  *      order to perform PHY register read.
  *
  * INPUT:
- *      unsigned int    port_num        Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *      unsigned int    phy_reg         PHY register address offset.
  *      unsigned int    *value          Register value buffer.
  *
@@ -2912,10 +2900,10 @@ static void eth_port_reset(unsigned int port_num)
  *      true otherwise.
  *
  */
-static void eth_port_read_smi_reg(unsigned int port_num,
+static void eth_port_read_smi_reg(struct mv643xx_private *mp,
                                 unsigned int phy_reg, unsigned int *value)
 {
-        int phy_addr = ethernet_phy_get(port_num);
+        int phy_addr = ethernet_phy_get(mp);
         unsigned long flags;
         int i;
 
@@ -2923,27 +2911,27 @@ static void eth_port_read_smi_reg(unsigned int port_num,
         spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
 
         /* wait for the SMI register to become available */
-        for (i = 0; mv_read(SMI_REG) & ETH_SMI_BUSY; i++) {
+        for (i = 0; rdl(mp, SMI_REG) & ETH_SMI_BUSY; i++) {
                 if (i == PHY_WAIT_ITERATIONS) {
-                        printk("mv643xx PHY busy timeout, port %d\n", port_num);
+                        printk("%s: PHY busy timeout\n", mp->dev->name);
                         goto out;
                 }
                 udelay(PHY_WAIT_MICRO_SECONDS);
         }
 
-        mv_write(SMI_REG,
+        wrl(mp, SMI_REG,
                 (phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ);
 
         /* now wait for the data to be valid */
-        for (i = 0; !(mv_read(SMI_REG) & ETH_SMI_READ_VALID); i++) {
+        for (i = 0; !(rdl(mp, SMI_REG) & ETH_SMI_READ_VALID); i++) {
                 if (i == PHY_WAIT_ITERATIONS) {
-                        printk("mv643xx PHY read timeout, port %d\n", port_num);
+                        printk("%s: PHY read timeout\n", mp->dev->name);
                         goto out;
                 }
                 udelay(PHY_WAIT_MICRO_SECONDS);
         }
 
-        *value = mv_read(SMI_REG) & 0xffff;
+        *value = rdl(mp, SMI_REG) & 0xffff;
 out:
         spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);
 }
@@ -2956,7 +2944,7 @@ out:
  *      order to perform writes to PHY registers.
  *
  * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
+ *      struct mv643xx_private *mp      Ethernet Port.
  *      unsigned int    phy_reg         PHY register address offset.
  *      unsigned int    value           Register value.
  *
@@ -2968,29 +2956,28 @@ out:
  *      true otherwise.
  *
  */
-static void eth_port_write_smi_reg(unsigned int eth_port_num,
+static void eth_port_write_smi_reg(struct mv643xx_private *mp,
                                    unsigned int phy_reg, unsigned int value)
 {
         int phy_addr;
         int i;
         unsigned long flags;
 
-        phy_addr = ethernet_phy_get(eth_port_num);
+        phy_addr = ethernet_phy_get(mp);
 
         /* the SMI register is a shared resource */
         spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
 
         /* wait for the SMI register to become available */
-        for (i = 0; mv_read(SMI_REG) & ETH_SMI_BUSY; i++) {
+        for (i = 0; rdl(mp, SMI_REG) & ETH_SMI_BUSY; i++) {
                 if (i == PHY_WAIT_ITERATIONS) {
-                        printk("mv643xx PHY busy timeout, port %d\n",
-                                                                eth_port_num);
+                        printk("%s: PHY busy timeout\n", mp->dev->name);
                         goto out;
                 }
                 udelay(PHY_WAIT_MICRO_SECONDS);
         }
 
-        mv_write(SMI_REG, (phy_addr << 16) | (phy_reg << 21) |
+        wrl(mp, SMI_REG, (phy_addr << 16) | (phy_reg << 21) |
                                 ETH_SMI_OPCODE_WRITE | (value & 0xffff));
 out:
         spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);
@@ -3001,17 +2988,17 @@ out:
  */
 static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
 {
-        int val;
         struct mv643xx_private *mp = netdev_priv(dev);
+        int val;
 
-        eth_port_read_smi_reg(mp->port_num, location, &val);
+        eth_port_read_smi_reg(mp, location, &val);
         return val;
 }
 
 static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
 {
         struct mv643xx_private *mp = netdev_priv(dev);
-        eth_port_write_smi_reg(mp->port_num, location, val);
+        eth_port_write_smi_reg(mp, location, val);
 }
 
 /*
@@ -3156,7 +3143,7 @@ struct mv643xx_stats {
         int stat_offset;
 };
 
-#define MV643XX_STAT(m) sizeof(((struct mv643xx_private *)0)->m), \
+#define MV643XX_STAT(m) FIELD_SIZEOF(struct mv643xx_private, m), \
                                         offsetof(struct mv643xx_private, m)
 
 static const struct mv643xx_stats mv643xx_gstrings_stats[] = {
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 385f69c14387..46119bb3770a 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -511,10 +511,10 @@ enum PhyCtrl_bits {
 /* Note that using only 32 bit fields simplifies conversion to big-endian
    architectures. */
 struct netdev_desc {
-        u32 next_desc;
-        s32 cmd_status;
-        u32 addr;
-        u32 software_use;
+        __le32 next_desc;
+        __le32 cmd_status;
+        __le32 addr;
+        __le32 software_use;
 };
 
 /* Bits in network_desc.status */
@@ -786,7 +786,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         struct netdev_private *np;
         int i, option, irq, chip_idx = ent->driver_data;
         static int find_cnt = -1;
-        unsigned long iostart, iosize;
+        resource_size_t iostart;
+        unsigned long iosize;
         void __iomem *ioaddr;
         const int pcibar = 1; /* PCI base address register */
         int prev_eedata;
@@ -946,10 +947,11 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
                 goto err_create_file;
 
         if (netif_msg_drv(np)) {
-                printk(KERN_INFO "natsemi %s: %s at %#08lx "
+                printk(KERN_INFO "natsemi %s: %s at %#08llx "
                        "(%s), %s, IRQ %d",
-                       dev->name, natsemi_pci_info[chip_idx].name, iostart,
-                       pci_name(np->pci_dev), print_mac(mac, dev->dev_addr), irq);
+                       dev->name, natsemi_pci_info[chip_idx].name,
+                       (unsigned long long)iostart, pci_name(np->pci_dev),
+                       print_mac(mac, dev->dev_addr), irq);
                 if (dev->if_port == PORT_TP)
                         printk(", port TP.\n");
                 else if (np->ignore_phy)
@@ -2018,7 +2020,7 @@ static void drain_rx(struct net_device *dev)
         /* Free all the skbuffs in the Rx queue. */
         for (i = 0; i < RX_RING_SIZE; i++) {
                 np->rx_ring[i].cmd_status = 0;
-                np->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */
+                np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
                 if (np->rx_skbuff[i]) {
                         pci_unmap_single(np->pci_dev,
                                 np->rx_dma[i], buflen,
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 7f20a03623a0..8cb29f5b1038 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -95,23 +95,6 @@
 
 #define ADDR_IN_WINDOW1(off)    \
         ((off > NETXEN_CRB_PCIX_HOST2) && (off < NETXEN_CRB_MAX)) ? 1 : 0
-/*
- * In netxen_nic_down(), we must wait for any pending callback requests into
- * netxen_watchdog_task() to complete; eg otherwise the watchdog_timer could be
- * reenabled right after it is deleted in netxen_nic_down(). FLUSH_SCHEDULED_WORK()
- * does this synchronization.
- *
- * Normally, schedule_work()/flush_scheduled_work() could have worked, but
- * netxen_nic_close() is invoked with kernel rtnl lock held. netif_carrier_off()
- * call in netxen_nic_close() triggers a schedule_work(&linkwatch_work), and a
- * subsequent call to flush_scheduled_work() in netxen_nic_down() would cause
- * linkwatch_event() to be executed which also attempts to acquire the rtnl
- * lock thus causing a deadlock.
- */
-
-#define SCHEDULE_WORK(tp)       queue_work(netxen_workq, tp)
-#define FLUSH_SCHEDULED_WORK()  flush_workqueue(netxen_workq)
-extern struct workqueue_struct *netxen_workq;
 
 /*
  * normalize a 64MB crb address to 32MB PCI window
@@ -1050,7 +1033,6 @@ void netxen_halt_pegs(struct netxen_adapter *adapter);
 int netxen_rom_se(struct netxen_adapter *adapter, int addr);
 
 /* Functions from netxen_nic_isr.c */
-int netxen_nic_link_ok(struct netxen_adapter *adapter);
 void netxen_initialize_adapter_sw(struct netxen_adapter *adapter);
 void netxen_initialize_adapter_hw(struct netxen_adapter *adapter);
 void *netxen_alloc(struct pci_dev *pdev, size_t sz, dma_addr_t * ptr,
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c
index c81313b717bd..f487615f4063 100644
--- a/drivers/net/netxen/netxen_nic_isr.c
+++ b/drivers/net/netxen/netxen_nic_isr.c
@@ -172,6 +172,7 @@ void netxen_nic_gbe_handle_phy_intr(struct netxen_adapter *adapter)
         netxen_nic_isr_other(adapter);
 }
 
+#if 0
 int netxen_nic_link_ok(struct netxen_adapter *adapter)
 {
         switch (adapter->ahw.board_type) {
@@ -189,6 +190,7 @@ int netxen_nic_link_ok(struct netxen_adapter *adapter)
 
         return 0;
 }
+#endif  /*  0  */
 
 void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter)
 {
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index a8fb439a4d03..7144c255ce54 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -86,7 +86,24 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(pci, netxen_pci_tbl);
 
-struct workqueue_struct *netxen_workq;
+/*
+ * In netxen_nic_down(), we must wait for any pending callback requests into
+ * netxen_watchdog_task() to complete; eg otherwise the watchdog_timer could be
+ * reenabled right after it is deleted in netxen_nic_down().
+ * FLUSH_SCHEDULED_WORK()  does this synchronization.
+ *
+ * Normally, schedule_work()/flush_scheduled_work() could have worked, but
+ * netxen_nic_close() is invoked with kernel rtnl lock held. netif_carrier_off()
+ * call in netxen_nic_close() triggers a schedule_work(&linkwatch_work), and a
+ * subsequent call to flush_scheduled_work() in netxen_nic_down() would cause
+ * linkwatch_event() to be executed which also attempts to acquire the rtnl
+ * lock thus causing a deadlock.
+ */
+
+static struct workqueue_struct *netxen_workq;
+#define SCHEDULE_WORK(tp)       queue_work(netxen_workq, tp)
+#define FLUSH_SCHEDULED_WORK()  flush_workqueue(netxen_workq)
+
 static void netxen_watchdog(unsigned long);
 
 static void netxen_nic_update_cmd_producer(struct netxen_adapter *adapter,
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 26aa8fe1fb2d..a316dcc8a06d 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -134,10 +134,10 @@ static int fifo = 0x8;	/* don't change */
 #define ni_disint()   { outb(0, dev->base_addr + NI52_INTDIS); }
 #define ni_enaint()   { outb(0, dev->base_addr + NI52_INTENA); }
 
-#define make32(ptr16) (p->memtop + (short) (ptr16))
-#define make24(ptr32) ((unsigned long)(ptr32)) - p->base
-#define make16(ptr32) ((unsigned short) ((unsigned long)(ptr32)\
-                                        - (unsigned long) p->memtop))
+#define make32(ptr16) ((void __iomem *)(p->memtop + (short) (ptr16)))
+#define make24(ptr32) ((char __iomem *)(ptr32)) - p->base
+#define make16(ptr32) ((unsigned short) ((char __iomem *)(ptr32)\
+                                        - p->memtop))
 
 /******************* how to calculate the buffers *****************************
 
@@ -179,34 +179,35 @@ static void    ni52_timeout(struct net_device *dev);
 
 /* helper-functions */
 static int     init586(struct net_device *dev);
-static int     check586(struct net_device *dev, char *where, unsigned size);
+static int     check586(struct net_device *dev, unsigned size);
 static void    alloc586(struct net_device *dev);
 static void    startrecv586(struct net_device *dev);
-static void   *alloc_rfa(struct net_device *dev, void *ptr);
+static void   __iomem *alloc_rfa(struct net_device *dev, void __iomem *ptr);
 static void    ni52_rcv_int(struct net_device *dev);
 static void    ni52_xmt_int(struct net_device *dev);
 static void    ni52_rnr_int(struct net_device *dev);
 
 struct priv {
         struct net_device_stats stats;
-        unsigned long base;
-        char *memtop;
+        char __iomem *base;
+        char __iomem *mapped;
+        char __iomem *memtop;
         spinlock_t spinlock;
         int reset;
-        struct rfd_struct *rfd_last, *rfd_top, *rfd_first;
-        struct scp_struct *scp;
-        struct iscp_struct *iscp;
-        struct scb_struct *scb;
-        struct tbd_struct *xmit_buffs[NUM_XMIT_BUFFS];
+        struct rfd_struct __iomem *rfd_last, *rfd_top, *rfd_first;
+        struct scp_struct __iomem *scp;
+        struct iscp_struct __iomem *iscp;
+        struct scb_struct __iomem *scb;
+        struct tbd_struct __iomem *xmit_buffs[NUM_XMIT_BUFFS];
 #if (NUM_XMIT_BUFFS == 1)
-        struct transmit_cmd_struct *xmit_cmds[2];
-        struct nop_cmd_struct *nop_cmds[2];
+        struct transmit_cmd_struct __iomem *xmit_cmds[2];
+        struct nop_cmd_struct __iomem *nop_cmds[2];
 #else
-        struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS];
-        struct nop_cmd_struct *nop_cmds[NUM_XMIT_BUFFS];
+        struct transmit_cmd_struct __iomem *xmit_cmds[NUM_XMIT_BUFFS];
+        struct nop_cmd_struct __iomem *nop_cmds[NUM_XMIT_BUFFS];
 #endif
         int nop_point, num_recv_buffs;
-        char *xmit_cbuffs[NUM_XMIT_BUFFS];
+        char __iomem *xmit_cbuffs[NUM_XMIT_BUFFS];
         int xmit_count, xmit_last;
 };
 
@@ -240,7 +241,8 @@ static void wait_for_scb_cmd_ruc(struct net_device *dev)
                 udelay(4);
                 if (i == 16383) {
                         printk(KERN_ERR "%s: scb_cmd (ruc) timed out: %04x,%04x .. disabling i82586!!\n",
-                                dev->name, p->scb->cmd_ruc, p->scb->rus);
+                                dev->name, readb(&p->scb->cmd_ruc),
+                                readb(&p->scb->rus));
                         if (!p->reset) {
                                 p->reset = 1;
                                 ni_reset586();
@@ -249,9 +251,9 @@ static void wait_for_scb_cmd_ruc(struct net_device *dev)
         }
 }
 
-static void wait_for_stat_compl(void *p)
+static void wait_for_stat_compl(void __iomem *p)
 {
-        struct nop_cmd_struct *addr = p;
+        struct nop_cmd_struct __iomem *addr = p;
         int i;
         for (i = 0; i < 32767; i++) {
                 if (readw(&((addr)->cmd_status)) & STAT_COMPL)
@@ -293,47 +295,58 @@ static int ni52_open(struct net_device *dev)
         return 0; /* most done by init */
 }
 
+static int check_iscp(struct net_device *dev, void __iomem *addr)
+{
+        struct iscp_struct __iomem *iscp = addr;
+        struct priv *p = dev->priv;
+        memset_io(iscp, 0, sizeof(struct iscp_struct));
+
+        writel(make24(iscp), &p->scp->iscp);
+        writeb(1, &iscp->busy);
+
+        ni_reset586();
+        ni_attn586();
+        mdelay(32);     /* wait a while... */
+        /* i82586 clears 'busy' after successful init */
+        if (readb(&iscp->busy))
+                return 0;
+        return 1;
+}
+
 /**********************************************
  * Check to see if there's an 82586 out there.
  */
-static int check586(struct net_device *dev, char *where, unsigned size)
+static int check586(struct net_device *dev, unsigned size)
 {
-        struct priv pb;
-        struct priv *p = /* (struct priv *) dev->priv*/ &pb;
-        char *iscp_addrs[2];
+        struct priv *p = dev->priv;
         int i;
 
-        p->base = (unsigned long) isa_bus_to_virt((unsigned long)where)
-                                                        + size - 0x01000000;
-        p->memtop = isa_bus_to_virt((unsigned long)where) + size;
-        p->scp = (struct scp_struct *)(p->base + SCP_DEFAULT_ADDRESS);
-        memset_io((char *)p->scp, 0, sizeof(struct scp_struct));
+        p->mapped = ioremap(dev->mem_start, size);
+        if (!p->mapped)
+                return 0;
+
+        p->base = p->mapped + size - 0x01000000;
+        p->memtop = p->mapped + size;
+        p->scp = (struct scp_struct __iomem *)(p->base + SCP_DEFAULT_ADDRESS);
+        p->scb  = (struct scb_struct __iomem *) p->mapped;
+        p->iscp = (struct iscp_struct __iomem *)p->scp - 1;
+        memset_io(p->scp, 0, sizeof(struct scp_struct));
         for (i = 0; i < sizeof(struct scp_struct); i++)
                 /* memory was writeable? */
-                if (readb((char *)p->scp + i))
-                        return 0;
+                if (readb((char __iomem *)p->scp + i))
+                        goto Enodev;
         writeb(SYSBUSVAL, &p->scp->sysbus);     /* 1 = 8Bit-Bus, 0 = 16 Bit */
         if (readb(&p->scp->sysbus) != SYSBUSVAL)
-                return 0;
-
-        iscp_addrs[0] = isa_bus_to_virt((unsigned long)where);
-        iscp_addrs[1] = (char *) p->scp - sizeof(struct iscp_struct);
+                goto Enodev;
 
-        for (i = 0; i < 2; i++) {
-                p->iscp = (struct iscp_struct *) iscp_addrs[i];
-                memset_io((char *)p->iscp, 0, sizeof(struct iscp_struct));
-
-                writel(make24(p->iscp), &p->scp->iscp);
-                writeb(1, &p->iscp->busy);
-
-                ni_reset586();
-                ni_attn586();
-                mdelay(32);     /* wait a while... */
-                /* i82586 clears 'busy' after successful init */
-                if (readb(&p->iscp->busy))
-                        return 0;
-        }
+        if (!check_iscp(dev, p->mapped))
+                goto Enodev;
+        if (!check_iscp(dev, p->iscp))
+                goto Enodev;
         return 1;
+Enodev:
+        iounmap(p->mapped);
+        return 0;
 }
 
 /******************************************************************
@@ -346,13 +359,6 @@ static void alloc586(struct net_device *dev)
         ni_reset586();
         mdelay(32);
 
-        spin_lock_init(&p->spinlock);
-
-        p->scp  = (struct scp_struct *) (p->base + SCP_DEFAULT_ADDRESS);
-        p->scb  = (struct scb_struct *) isa_bus_to_virt(dev->mem_start);
-        p->iscp = (struct iscp_struct *)
-                        ((char *)p->scp - sizeof(struct iscp_struct));
-
         memset_io(p->iscp, 0, sizeof(struct iscp_struct));
         memset_io(p->scp , 0, sizeof(struct scp_struct));
 
@@ -371,7 +377,7 @@ static void alloc586(struct net_device *dev)
 
         p->reset = 0;
 
-        memset_io((char *)p->scb, 0, sizeof(struct scb_struct));
+        memset_io(p->scb, 0, sizeof(struct scb_struct));
 }
 
 /* set: io,irq,memstart,memend or set it when calling insmod */
@@ -387,12 +393,15 @@ struct net_device * __init ni52_probe(int unit)
 {
         struct net_device *dev = alloc_etherdev(sizeof(struct priv));
         static int ports[] = {0x300, 0x280, 0x360 , 0x320 , 0x340, 0};
+        struct priv *p;
         int *port;
         int err = 0;
 
         if (!dev)
                 return ERR_PTR(-ENOMEM);
 
+        p = dev->priv;
+
         if (unit >= 0) {
                 sprintf(dev->name, "eth%d", unit);
                 netdev_boot_setup_check(dev);
@@ -427,6 +436,7 @@ got_it:
                 goto out1;
         return dev;
 out1:
+        iounmap(p->mapped);
         release_region(dev->base_addr, NI52_TOTAL_SIZE);
 out:
         free_netdev(dev);
@@ -436,12 +446,15 @@ out:
 static int __init ni52_probe1(struct net_device *dev, int ioaddr)
 {
         int i, size, retval;
+        struct priv *priv = dev->priv;
 
         dev->base_addr = ioaddr;
         dev->irq = irq;
         dev->mem_start = memstart;
         dev->mem_end = memend;
 
+        spin_lock_init(&priv->spinlock);
+
         if (!request_region(ioaddr, NI52_TOTAL_SIZE, DRV_NAME))
                 return -EBUSY;
 
@@ -474,7 +487,7 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr)
                 retval = -ENODEV;
                 goto out;
         }
-        if (!check586(dev, (char *)dev->mem_start, size)) {
+        if (!check586(dev, size)) {
                 printk(KERN_ERR "?memcheck, Can't find memory at 0x%lx with size %d!\n", dev->mem_start, size);
                 retval = -ENODEV;
                 goto out;
@@ -483,9 +496,9 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr)
         if (dev->mem_start != 0) {
                 /* no auto-mem-probe */
                 size = 0x4000; /* check for 16K mem */
-                if (!check586(dev, (char *) dev->mem_start, size)) {
+                if (!check586(dev, size)) {
                         size = 0x2000; /* check for 8K mem */
-                        if (!check586(dev, (char *)dev->mem_start, size)) {
+                        if (!check586(dev, size)) {
                                 printk(KERN_ERR "?memprobe, Can't find memory at 0x%lx!\n", dev->mem_start);
                                 retval = -ENODEV;
                                 goto out;
@@ -504,11 +517,11 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr)
                         }
                         dev->mem_start = memaddrs[i];
                         size = 0x2000; /* check for 8K mem */
-                        if (check586(dev, (char *)dev->mem_start, size))
+                        if (check586(dev, size))
                                 /* 8K-check */
                                 break;
                         size = 0x4000; /* check for 16K mem */
-                        if (check586(dev, (char *)dev->mem_start, size))
+                        if (check586(dev, size))
                                 /* 16K-check */
                                 break;
                 }
@@ -517,19 +530,13 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr)
         dev->mem_end = dev->mem_start + size;
 #endif
 
-        memset((char *)dev->priv, 0, sizeof(struct priv));
-
-        ((struct priv *)(dev->priv))->memtop =
-                                isa_bus_to_virt(dev->mem_start) + size;
-        ((struct priv *)(dev->priv))->base =  (unsigned long)
-                        isa_bus_to_virt(dev->mem_start) + size - 0x01000000;
         alloc586(dev);
 
         /* set number of receive-buffs according to memsize */
         if (size == 0x2000)
-                ((struct priv *) dev->priv)->num_recv_buffs = NUM_RECV_BUFFS_8;
+                priv->num_recv_buffs = NUM_RECV_BUFFS_8;
         else
-                ((struct priv *) dev->priv)->num_recv_buffs = NUM_RECV_BUFFS_16;
+                priv->num_recv_buffs = NUM_RECV_BUFFS_16;
 
         printk(KERN_DEBUG "Memaddr: 0x%lx, Memsize: %d, ",
                                 dev->mem_start, size);
@@ -546,6 +553,7 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr)
                 if (!dev->irq) {
                         printk("?autoirq, Failed to detect IRQ line!\n");
                         retval = -EAGAIN;
+                        iounmap(priv->mapped);
                         goto out;
                 }
                 printk("IRQ %d (autodetected).\n", dev->irq);
@@ -578,19 +586,19 @@ out:
 
 static int init586(struct net_device *dev)
 {
-        void *ptr;
+        void __iomem *ptr;
         int i, result = 0;
         struct priv *p = (struct priv *)dev->priv;
-        struct configure_cmd_struct *cfg_cmd;
-        struct iasetup_cmd_struct *ias_cmd;
-        struct tdr_cmd_struct *tdr_cmd;
-        struct mcsetup_cmd_struct *mc_cmd;
+        struct configure_cmd_struct __iomem *cfg_cmd;
+        struct iasetup_cmd_struct __iomem *ias_cmd;
+        struct tdr_cmd_struct __iomem *tdr_cmd;
+        struct mcsetup_cmd_struct __iomem *mc_cmd;
         struct dev_mc_list *dmi = dev->mc_list;
         int num_addrs = dev->mc_count;
 
-        ptr = (void *) ((char *)p->scb + sizeof(struct scb_struct));
+        ptr = p->scb + 1;
 
-        cfg_cmd = (struct configure_cmd_struct *)ptr; /* configure-command */
+        cfg_cmd = ptr; /* configure-command */
         writew(0, &cfg_cmd->cmd_status);
         writew(CMD_CONFIGURE | CMD_LAST, &cfg_cmd->cmd_cmd);
         writew(0xFFFF, &cfg_cmd->cmd_link);
@@ -609,7 +617,7 @@ static int init586(struct net_device *dev)
         writeb(0xf2, &cfg_cmd->time_high);
         writeb(0x00, &cfg_cmd->promisc);;
         if (dev->flags & IFF_ALLMULTI) {
-                int len = ((char *) p->iscp - (char *) ptr - 8) / 6;
+                int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6;
                 if (num_addrs > len) {
                         printk(KERN_ERR "%s: switching to promisc. mode\n",
                                 dev->name);
@@ -620,7 +628,7 @@ static int init586(struct net_device *dev)
                 writeb(0x01, &cfg_cmd->promisc);
         writeb(0x00, &cfg_cmd->carr_coll);
         writew(make16(cfg_cmd), &p->scb->cbl_offset);
-        writew(0, &p->scb->cmd_ruc);
+        writeb(0, &p->scb->cmd_ruc);
 
         writeb(CUC_START, &p->scb->cmd_cuc); /* cmd.-unit start */
         ni_attn586();
@@ -638,13 +646,13 @@ static int init586(struct net_device *dev)
          * individual address setup
          */
 
-        ias_cmd = (struct iasetup_cmd_struct *)ptr;
+        ias_cmd = ptr;
 
         writew(0, &ias_cmd->cmd_status);
         writew(CMD_IASETUP | CMD_LAST, &ias_cmd->cmd_cmd);
         writew(0xffff, &ias_cmd->cmd_link);
 
-        memcpy_toio((char *)&ias_cmd->iaddr, (char *)dev->dev_addr, ETH_ALEN);
+        memcpy_toio(&ias_cmd->iaddr, (char *)dev->dev_addr, ETH_ALEN);
 
         writew(make16(ias_cmd), &p->scb->cbl_offset);
 
@@ -663,7 +671,7 @@ static int init586(struct net_device *dev)
          * TDR, wire check .. e.g. no resistor e.t.c
          */
 
-        tdr_cmd = (struct tdr_cmd_struct *)ptr;
+        tdr_cmd = ptr;
 
         writew(0, &tdr_cmd->cmd_status);
         writew(CMD_TDR | CMD_LAST, &tdr_cmd->cmd_cmd);
@@ -707,14 +715,14 @@ static int init586(struct net_device *dev)
          * Multicast setup
          */
         if (num_addrs && !(dev->flags & IFF_PROMISC)) {
-                mc_cmd = (struct mcsetup_cmd_struct *) ptr;
+                mc_cmd = ptr;
                 writew(0, &mc_cmd->cmd_status);
                 writew(CMD_MCSETUP | CMD_LAST, &mc_cmd->cmd_cmd);
                 writew(0xffff, &mc_cmd->cmd_link);
                 writew(num_addrs * 6, &mc_cmd->mc_cnt);
 
                 for (i = 0; i < num_addrs; i++, dmi = dmi->next)
-                        memcpy_toio((char *) mc_cmd->mc_list[i],
+                        memcpy_toio(mc_cmd->mc_list[i],
                                                         dmi->dmi_addr, 6);
 
                 writew(make16(mc_cmd), &p->scb->cbl_offset);
@@ -733,43 +741,43 @@ static int init586(struct net_device *dev)
          */
 #if (NUM_XMIT_BUFFS == 1)
         for (i = 0; i < 2; i++) {
-                p->nop_cmds[i] = (struct nop_cmd_struct *)ptr;
+                p->nop_cmds[i] = ptr;
                 writew(CMD_NOP, &p->nop_cmds[i]->cmd_cmd);
                 writew(0, &p->nop_cmds[i]->cmd_status);
                 writew(make16(p->nop_cmds[i]), &p->nop_cmds[i]->cmd_link);
-                ptr = (char *) ptr + sizeof(struct nop_cmd_struct);
+                ptr = ptr + sizeof(struct nop_cmd_struct);
         }
 #else
         for (i = 0; i < NUM_XMIT_BUFFS; i++) {
-                p->nop_cmds[i] = (struct nop_cmd_struct *)ptr;
+                p->nop_cmds[i] = ptr;
                 writew(CMD_NOP, &p->nop_cmds[i]->cmd_cmd);
                 writew(0, &p->nop_cmds[i]->cmd_status);
                 writew(make16(p->nop_cmds[i]), &p->nop_cmds[i]->cmd_link);
-                ptr = (char *) ptr + sizeof(struct nop_cmd_struct);
+                ptr = ptr + sizeof(struct nop_cmd_struct);
         }
 #endif
 
-        ptr = alloc_rfa(dev, (void *)ptr); /* init receive-frame-area */
+        ptr = alloc_rfa(dev, ptr); /* init receive-frame-area */
 
         /*
          * alloc xmit-buffs / init xmit_cmds
          */
         for (i = 0; i < NUM_XMIT_BUFFS; i++) {
                 /* Transmit cmd/buff 0 */
-                p->xmit_cmds[i] = (struct transmit_cmd_struct *)ptr;
-                ptr = (char *) ptr + sizeof(struct transmit_cmd_struct);
-                p->xmit_cbuffs[i] = (char *)ptr; /* char-buffs */
-                ptr = (char *) ptr + XMIT_BUFF_SIZE;
-                p->xmit_buffs[i] = (struct tbd_struct *)ptr; /* TBD */
-                ptr = (char *) ptr + sizeof(struct tbd_struct);
-                if ((void *)ptr > (void *)p->iscp) {
+                p->xmit_cmds[i] = ptr;
+                ptr = ptr + sizeof(struct transmit_cmd_struct);
+                p->xmit_cbuffs[i] = ptr; /* char-buffs */
+                ptr = ptr + XMIT_BUFF_SIZE;
+                p->xmit_buffs[i] = ptr; /* TBD */
+                ptr = ptr + sizeof(struct tbd_struct);
+                if ((void __iomem *)ptr > (void __iomem *)p->iscp) {
                         printk(KERN_ERR "%s: not enough shared-mem for your configuration!\n",
                                 dev->name);
                         return 1;
                 }
-                memset_io((char *)(p->xmit_cmds[i]), 0,
+                memset_io(p->xmit_cmds[i], 0,
                                         sizeof(struct transmit_cmd_struct));
-                memset_io((char *)(p->xmit_buffs[i]), 0,
+                memset_io(p->xmit_buffs[i], 0,
                                         sizeof(struct tbd_struct));
                 writew(make16(p->nop_cmds[(i+1)%NUM_XMIT_BUFFS]),
                                         &p->xmit_cmds[i]->cmd_link);
@@ -816,14 +824,14 @@ static int init586(struct net_device *dev)
  * It sets up the Receive Frame Area (RFA).
  */
 
-static void *alloc_rfa(struct net_device *dev, void *ptr)
+static void __iomem *alloc_rfa(struct net_device *dev, void __iomem *ptr)
 {
-        struct rfd_struct *rfd = (struct rfd_struct *)ptr;
-        struct rbd_struct *rbd;
+        struct rfd_struct __iomem *rfd = ptr;
+        struct rbd_struct __iomem *rbd;
         int i;
         struct priv *p = (struct priv *) dev->priv;
 
-        memset_io((char *) rfd, 0,
+        memset_io(rfd, 0,
                 sizeof(struct rfd_struct) * (p->num_recv_buffs + rfdadd));
         p->rfd_first = rfd;
 
@@ -835,20 +843,19 @@ static void *alloc_rfa(struct net_device *dev, void *ptr)
         /* RU suspend */
         writeb(RFD_SUSP, &rfd[p->num_recv_buffs-1+rfdadd].last);
 
-        ptr = (void *) (rfd + (p->num_recv_buffs + rfdadd));
+        ptr = rfd + (p->num_recv_buffs + rfdadd);
 
-        rbd = (struct rbd_struct *) ptr;
-        ptr = (void *) (rbd + p->num_recv_buffs);
+        rbd = ptr;
+        ptr = rbd + p->num_recv_buffs;
 
          /* clr descriptors */
-        memset_io((char *)rbd, 0,
-                        sizeof(struct rbd_struct) * (p->num_recv_buffs));
+        memset_io(rbd, 0, sizeof(struct rbd_struct) * (p->num_recv_buffs));
 
         for (i = 0; i < p->num_recv_buffs; i++) {
                 writew(make16(rbd + (i+1) % p->num_recv_buffs), &rbd[i].next);
                 writew(RECV_BUFF_SIZE, &rbd[i].size);
                 writel(make24(ptr), &rbd[i].buffer);
-                ptr = (char *) ptr + RECV_BUFF_SIZE;
+                ptr = ptr + RECV_BUFF_SIZE;
         }
         p->rfd_top      = p->rfd_first;
         p->rfd_last = p->rfd_first + (p->num_recv_buffs - 1 + rfdadd);
@@ -892,7 +899,7 @@ static irqreturn_t ni52_interrupt(int irq, void *dev_id)
                         if (readb(&p->scb->rus) & RU_SUSPEND) {
                                 /* special case: RU_SUSPEND */
                                 wait_for_scb_cmd(dev);
-                                p->scb->cmd_ruc = RUC_RESUME;
+                                writeb(RUC_RESUME, &p->scb->cmd_ruc);
                                 ni_attn586();
                                 wait_for_scb_cmd_ruc(dev);
                         } else {
@@ -919,7 +926,7 @@ static irqreturn_t ni52_interrupt(int irq, void *dev_id)
 
                 /* Wait for ack. (ni52_xmt_int can be faster than ack!!) */
                 wait_for_scb_cmd(dev);
-                if (p->scb->cmd_cuc) {   /* timed out? */
+                if (readb(&p->scb->cmd_cuc)) {   /* timed out? */
                         printk(KERN_ERR "%s: Acknowledge timed out.\n",
                                 dev->name);
                         ni_disint();
@@ -942,14 +949,14 @@ static void ni52_rcv_int(struct net_device *dev)
         int status, cnt = 0;
         unsigned short totlen;
         struct sk_buff *skb;
-        struct rbd_struct *rbd;
+        struct rbd_struct __iomem *rbd;
         struct priv *p = (struct priv *)dev->priv;
 
         if (debuglevel > 0)
                 printk("R");
 
         for (; (status = readb(&p->rfd_top->stat_high)) & RFD_COMPL;) {
-                rbd = (struct rbd_struct *) make32(p->rfd_top->rbd_offset);
+                rbd = make32(readw(&p->rfd_top->rbd_offset));
                 if (status & RFD_OK) { /* frame received without error? */
                         totlen = readw(&rbd->status);
                         if (totlen & RBD_LAST) {
@@ -960,7 +967,7 @@ static void ni52_rcv_int(struct net_device *dev)
                                 if (skb != NULL) {
                                         skb_reserve(skb, 2);
                                         skb_put(skb, totlen);
-                                        skb_copy_to_linear_data(skb, (char *)p->base + (unsigned long) rbd->buffer, totlen);
+                                        memcpy_fromio(skb->data, p->base + readl(&rbd->buffer), totlen);
                                         skb->protocol = eth_type_trans(skb, dev);
                                         netif_rx(skb);
                                         dev->last_rx = jiffies;
@@ -979,7 +986,7 @@ static void ni52_rcv_int(struct net_device *dev)
                                                 break;
                                         }
                                         writew(0, &rbd->status);
-                                        rbd = (struct rbd_struct *) make32(readl(&rbd->next));
+                                        rbd = make32(readw(&rbd->next));
                                 }
                                 totlen += rstat & RBD_MASK;
                                 writew(0, &rbd->status);
@@ -997,7 +1004,7 @@ static void ni52_rcv_int(struct net_device *dev)
                 writew(0xffff, &p->rfd_top->rbd_offset);
                 writeb(0, &p->rfd_last->last);  /* delete RFD_SUSP      */
                 p->rfd_last = p->rfd_top;
-                p->rfd_top = (struct rfd_struct *) make32(p->rfd_top->next); /* step to next RFD */
+                p->rfd_top = make32(readw(&p->rfd_top->next)); /* step to next RFD */
                 writew(make16(p->rfd_top), &p->scb->rfa_offset);
 
                 if (debuglevel > 0)
@@ -1042,11 +1049,12 @@ static void ni52_rnr_int(struct net_device *dev)
         ni_attn586();
         wait_for_scb_cmd_ruc(dev);              /* wait for accept cmd. */
 
-        alloc_rfa(dev, (char *)p->rfd_first);
+        alloc_rfa(dev, p->rfd_first);
         /* maybe add a check here, before restarting the RU */
         startrecv586(dev); /* restart RU */
 
-        printk(KERN_ERR "%s: Receive-Unit restarted. Status: %04x\n", dev->name, p->scb->rus);
+        printk(KERN_ERR "%s: Receive-Unit restarted. Status: %04x\n",
+                dev->name, readb(&p->scb->rus));
 
 }
 
@@ -1178,12 +1186,11 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
 
         netif_stop_queue(dev);
 
-        skb_copy_from_linear_data(skb, (char *)p->xmit_cbuffs[p->xmit_count],
-                                                        skb->len);
+        memcpy_toio(p->xmit_cbuffs[p->xmit_count], skb->data, skb->len);
         len = skb->len;
         if (len < ETH_ZLEN) {
                 len = ETH_ZLEN;
-                memset((char *)p->xmit_cbuffs[p->xmit_count]+skb->len, 0,
+                memset_io(p->xmit_cbuffs[p->xmit_count]+skb->len, 0,
                                                         len - skb->len);
         }
 
@@ -1191,14 +1198,14 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
 #       ifdef NO_NOPCOMMANDS
 
 #ifdef DEBUG
-        if (p->scb->cus & CU_ACTIVE) {
+        if (readb(&p->scb->cus) & CU_ACTIVE) {
                 printk(KERN_ERR "%s: Hmmm .. CU is still running and we wanna send a new packet.\n", dev->name);
                 printk(KERN_ERR "%s: stat: %04x %04x\n",
                                 dev->name, readb(&p->scb->cus),
                                 readw(&p->xmit_cmds[0]->cmd_status));
         }
 #endif
-        writew(TBD_LAST | len, &p->xmit_buffs[0]->size);;
+        writew(TBD_LAST | len, &p->xmit_buffs[0]->size);
         for (i = 0; i < 16; i++) {
                 writew(0, &p->xmit_cmds[0]->cmd_status);
                 wait_for_scb_cmd(dev);
@@ -1330,7 +1337,9 @@ int __init init_module(void)
 
 void __exit cleanup_module(void)
 {
+        struct priv *p = dev_ni52->priv;
         unregister_netdev(dev_ni52);
+        iounmap(p->mapped);
         release_region(dev_ni52->base_addr, NI52_TOTAL_SIZE);
         free_netdev(dev_ni52);
 }
diff --git a/drivers/net/ni52.h b/drivers/net/ni52.h
index 1f28a4d1a319..0a03b2883327 100644
--- a/drivers/net/ni52.h
+++ b/drivers/net/ni52.h
@@ -39,8 +39,8 @@ struct scp_struct
         u16 zero_dum0;  /* has to be zero */
         u8 sysbus;      /* 0=16Bit,1=8Bit */
         u8 zero_dum1;   /* has to be zero for 586 */
-        u8 zero_dum2;
-        u8 zero_dum3;
+        u16 zero_dum2;
+        u16 zero_dum3;
         u32 iscp;               /* pointer to the iscp-block */
 };
 
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index d11ba61baa4f..7565c2d7f30e 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -113,6 +113,8 @@ do {	if ((np)->msg_enable & NETIF_MSG_##TYPE) \
 #define niu_unlock_parent(np, flags) \
         spin_unlock_irqrestore(&np->parent->lock, flags)
 
+static int serdes_init_10g_serdes(struct niu *np);
+
 static int __niu_wait_bits_clear_mac(struct niu *np, unsigned long reg,
                                      u64 bits, int limit, int delay)
 {
@@ -706,6 +708,251 @@ static int serdes_init_1g(struct niu *np)
         return 0;
 }
 
+static int serdes_init_1g_serdes(struct niu *np)
+{
+        struct niu_link_config *lp = &np->link_config;
+        unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i;
+        u64 ctrl_val, test_cfg_val, sig, mask, val;
+        int err;
+        u64 reset_val, val_rd;
+
+        val = ENET_SERDES_PLL_HRATE0 | ENET_SERDES_PLL_HRATE1 |
+                ENET_SERDES_PLL_HRATE2 | ENET_SERDES_PLL_HRATE3 |
+                ENET_SERDES_PLL_FBDIV0;
+        switch (np->port) {
+        case 0:
+                reset_val =  ENET_SERDES_RESET_0;
+                ctrl_reg = ENET_SERDES_0_CTRL_CFG;
+                test_cfg_reg = ENET_SERDES_0_TEST_CFG;
+                pll_cfg = ENET_SERDES_0_PLL_CFG;
+                break;
+        case 1:
+                reset_val =  ENET_SERDES_RESET_1;
+                ctrl_reg = ENET_SERDES_1_CTRL_CFG;
+                test_cfg_reg = ENET_SERDES_1_TEST_CFG;
+                pll_cfg = ENET_SERDES_1_PLL_CFG;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+        ctrl_val = (ENET_SERDES_CTRL_SDET_0 |
+                    ENET_SERDES_CTRL_SDET_1 |
+                    ENET_SERDES_CTRL_SDET_2 |
+                    ENET_SERDES_CTRL_SDET_3 |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_0_SHIFT) |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_1_SHIFT) |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_2_SHIFT) |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_3_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_0_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_1_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_2_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_3_SHIFT));
+        test_cfg_val = 0;
+
+        if (lp->loopback_mode == LOOPBACK_PHY) {
+                test_cfg_val |= ((ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_0_SHIFT) |
+                                 (ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_1_SHIFT) |
+                                 (ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_2_SHIFT) |
+                                 (ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_3_SHIFT));
+        }
+
+        nw64(ENET_SERDES_RESET, reset_val);
+        mdelay(20);
+        val_rd = nr64(ENET_SERDES_RESET);
+        val_rd &= ~reset_val;
+        nw64(pll_cfg, val);
+        nw64(ctrl_reg, ctrl_val);
+        nw64(test_cfg_reg, test_cfg_val);
+        nw64(ENET_SERDES_RESET, val_rd);
+        mdelay(2000);
+
+        /* Initialize all 4 lanes of the SERDES.  */
+        for (i = 0; i < 4; i++) {
+                u32 rxtx_ctrl, glue0;
+
+                err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl);
+                if (err)
+                        return err;
+                err = esr_read_glue0(np, i, &glue0);
+                if (err)
+                        return err;
+
+                rxtx_ctrl &= ~(ESR_RXTX_CTRL_VMUXLO);
+                rxtx_ctrl |= (ESR_RXTX_CTRL_ENSTRETCH |
+                              (2 << ESR_RXTX_CTRL_VMUXLO_SHIFT));
+
+                glue0 &= ~(ESR_GLUE_CTRL0_SRATE |
+                           ESR_GLUE_CTRL0_THCNT |
+                           ESR_GLUE_CTRL0_BLTIME);
+                glue0 |= (ESR_GLUE_CTRL0_RXLOSENAB |
+                          (0xf << ESR_GLUE_CTRL0_SRATE_SHIFT) |
+                          (0xff << ESR_GLUE_CTRL0_THCNT_SHIFT) |
+                          (BLTIME_300_CYCLES <<
+                           ESR_GLUE_CTRL0_BLTIME_SHIFT));
+
+                err = esr_write_rxtx_ctrl(np, i, rxtx_ctrl);
+                if (err)
+                        return err;
+                err = esr_write_glue0(np, i, glue0);
+                if (err)
+                        return err;
+        }
+
+
+        sig = nr64(ESR_INT_SIGNALS);
+        switch (np->port) {
+        case 0:
+                val = (ESR_INT_SRDY0_P0 | ESR_INT_DET0_P0);
+                mask = val;
+                break;
+
+        case 1:
+                val = (ESR_INT_SRDY0_P1 | ESR_INT_DET0_P1);
+                mask = val;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        if ((sig & mask) != val) {
+                dev_err(np->device, PFX "Port %u signal bits [%08x] are not "
+                        "[%08x]\n", np->port, (int) (sig & mask), (int) val);
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int link_status_1g_serdes(struct niu *np, int *link_up_p)
+{
+        struct niu_link_config *lp = &np->link_config;
+        int link_up;
+        u64 val;
+        u16 current_speed;
+        unsigned long flags;
+        u8 current_duplex;
+
+        link_up = 0;
+        current_speed = SPEED_INVALID;
+        current_duplex = DUPLEX_INVALID;
+
+        spin_lock_irqsave(&np->lock, flags);
+
+        val = nr64_pcs(PCS_MII_STAT);
+
+        if (val & PCS_MII_STAT_LINK_STATUS) {
+                link_up = 1;
+                current_speed = SPEED_1000;
+                current_duplex = DUPLEX_FULL;
+        }
+
+        lp->active_speed = current_speed;
+        lp->active_duplex = current_duplex;
+        spin_unlock_irqrestore(&np->lock, flags);
+
+        *link_up_p = link_up;
+        return 0;
+}
+
+
+static int link_status_10g_serdes(struct niu *np, int *link_up_p)
+{
+        unsigned long flags;
+        struct niu_link_config *lp = &np->link_config;
+        int link_up = 0;
+        int link_ok = 1;
+        u64 val, val2;
+        u16 current_speed;
+        u8 current_duplex;
+
+        if (!(np->flags & NIU_FLAGS_10G))
+                return link_status_1g_serdes(np, link_up_p);
+
+        current_speed = SPEED_INVALID;
+        current_duplex = DUPLEX_INVALID;
+        spin_lock_irqsave(&np->lock, flags);
+
+        val = nr64_xpcs(XPCS_STATUS(0));
+        val2 = nr64_mac(XMAC_INTER2);
+        if (val2 & 0x01000000)
+                link_ok = 0;
+
+        if ((val & 0x1000ULL) && link_ok) {
+                link_up = 1;
+                current_speed = SPEED_10000;
+                current_duplex = DUPLEX_FULL;
+        }
+        lp->active_speed = current_speed;
+        lp->active_duplex = current_duplex;
+        spin_unlock_irqrestore(&np->lock, flags);
+        *link_up_p = link_up;
+        return 0;
+}
+
+
+static int link_status_1g_rgmii(struct niu *np, int *link_up_p)
+{
+        struct niu_link_config *lp = &np->link_config;
+        u16 current_speed, bmsr;
+        unsigned long flags;
+        u8 current_duplex;
+        int err, link_up;
+
+        link_up = 0;
+        current_speed = SPEED_INVALID;
+        current_duplex = DUPLEX_INVALID;
+
+        spin_lock_irqsave(&np->lock, flags);
+
+        err = -EINVAL;
+
+        err = mii_read(np, np->phy_addr, MII_BMSR);
+        if (err < 0)
+                goto out;
+
+        bmsr = err;
+        if (bmsr & BMSR_LSTATUS) {
+                u16 adv, lpa, common, estat;
+
+                err = mii_read(np, np->phy_addr, MII_ADVERTISE);
+                if (err < 0)
+                        goto out;
+                adv = err;
+
+                err = mii_read(np, np->phy_addr, MII_LPA);
+                if (err < 0)
+                        goto out;
+                lpa = err;
+
+                common = adv & lpa;
+
+                err = mii_read(np, np->phy_addr, MII_ESTATUS);
+                if (err < 0)
+                        goto out;
+                estat = err;
+                link_up = 1;
+                current_speed = SPEED_1000;
+                current_duplex = DUPLEX_FULL;
+
+        }
+        lp->active_speed = current_speed;
+        lp->active_duplex = current_duplex;
+        err = 0;
+
+out:
+        spin_unlock_irqrestore(&np->lock, flags);
+
+        *link_up_p = link_up;
+        return err;
+}
+
+
 static int bcm8704_reset(struct niu *np)
 {
         int err, limit;
@@ -1022,6 +1269,69 @@ static int mii_reset(struct niu *np)
         return 0;
 }
 
+
+
+static int xcvr_init_1g_rgmii(struct niu *np)
+{
+        int err;
+        u64 val;
+        u16 bmcr, bmsr, estat;
+
+        val = nr64(MIF_CONFIG);
+        val &= ~MIF_CONFIG_INDIRECT_MODE;
+        nw64(MIF_CONFIG, val);
+
+        err = mii_reset(np);
+        if (err)
+                return err;
+
+        err = mii_read(np, np->phy_addr, MII_BMSR);
+        if (err < 0)
+                return err;
+        bmsr = err;
+
+        estat = 0;
+        if (bmsr & BMSR_ESTATEN) {
+                err = mii_read(np, np->phy_addr, MII_ESTATUS);
+                if (err < 0)
+                        return err;
+                estat = err;
+        }
+
+        bmcr = 0;
+        err = mii_write(np, np->phy_addr, MII_BMCR, bmcr);
+        if (err)
+                return err;
+
+        if (bmsr & BMSR_ESTATEN) {
+                u16 ctrl1000 = 0;
+
+                if (estat & ESTATUS_1000_TFULL)
+                        ctrl1000 |= ADVERTISE_1000FULL;
+                err = mii_write(np, np->phy_addr, MII_CTRL1000, ctrl1000);
+                if (err)
+                        return err;
+        }
+
+        bmcr = (BMCR_SPEED1000 | BMCR_FULLDPLX);
+
+        err = mii_write(np, np->phy_addr, MII_BMCR, bmcr);
+        if (err)
+                return err;
+
+        err = mii_read(np, np->phy_addr, MII_BMCR);
+        if (err < 0)
+                return err;
+        bmcr = mii_read(np, np->phy_addr, MII_BMCR);
+
+        err = mii_read(np, np->phy_addr, MII_BMSR);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+
 static int mii_init_common(struct niu *np)
 {
         struct niu_link_config *lp = &np->link_config;
@@ -1429,6 +1739,16 @@ static void niu_timer(unsigned long __opaque)
         add_timer(&np->timer);
 }
 
+static const struct niu_phy_ops phy_ops_10g_serdes = {
+        .serdes_init            = serdes_init_10g_serdes,
+        .link_status            = link_status_10g_serdes,
+};
+
+static const struct niu_phy_ops phy_ops_1g_rgmii = {
+        .xcvr_init              = xcvr_init_1g_rgmii,
+        .link_status            = link_status_1g_rgmii,
+};
+
 static const struct niu_phy_ops phy_ops_10g_fiber_niu = {
         .serdes_init            = serdes_init_niu,
         .xcvr_init              = xcvr_init_10g,
@@ -1487,6 +1807,152 @@ static const struct niu_phy_template phy_template_1g_copper = {
         .phy_addr_base  = 0,
 };
 
+static const struct niu_phy_template phy_template_1g_rgmii = {
+        .ops            = &phy_ops_1g_rgmii,
+        .phy_addr_base  = 0,
+};
+
+static const struct niu_phy_template phy_template_10g_serdes = {
+        .ops            = &phy_ops_10g_serdes,
+        .phy_addr_base  = 0,
+};
+
+static int niu_atca_port_num[4] = {
+        0, 0,  11, 10
+};
+
+static int serdes_init_10g_serdes(struct niu *np)
+{
+        struct niu_link_config *lp = &np->link_config;
+        unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i;
+        u64 ctrl_val, test_cfg_val, sig, mask, val;
+        int err;
+        u64 reset_val;
+
+        switch (np->port) {
+        case 0:
+                reset_val =  ENET_SERDES_RESET_0;
+                ctrl_reg = ENET_SERDES_0_CTRL_CFG;
+                test_cfg_reg = ENET_SERDES_0_TEST_CFG;
+                pll_cfg = ENET_SERDES_0_PLL_CFG;
+                break;
+        case 1:
+                reset_val =  ENET_SERDES_RESET_1;
+                ctrl_reg = ENET_SERDES_1_CTRL_CFG;
+                test_cfg_reg = ENET_SERDES_1_TEST_CFG;
+                pll_cfg = ENET_SERDES_1_PLL_CFG;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+        ctrl_val = (ENET_SERDES_CTRL_SDET_0 |
+                    ENET_SERDES_CTRL_SDET_1 |
+                    ENET_SERDES_CTRL_SDET_2 |
+                    ENET_SERDES_CTRL_SDET_3 |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_0_SHIFT) |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_1_SHIFT) |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_2_SHIFT) |
+                    (0x5 << ENET_SERDES_CTRL_EMPH_3_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_0_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_1_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_2_SHIFT) |
+                    (0x1 << ENET_SERDES_CTRL_LADJ_3_SHIFT));
+        test_cfg_val = 0;
+
+        if (lp->loopback_mode == LOOPBACK_PHY) {
+                test_cfg_val |= ((ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_0_SHIFT) |
+                                 (ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_1_SHIFT) |
+                                 (ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_2_SHIFT) |
+                                 (ENET_TEST_MD_PAD_LOOPBACK <<
+                                  ENET_SERDES_TEST_MD_3_SHIFT));
+        }
+
+        esr_reset(np);
+        nw64(pll_cfg, ENET_SERDES_PLL_FBDIV2);
+        nw64(ctrl_reg, ctrl_val);
+        nw64(test_cfg_reg, test_cfg_val);
+
+        /* Initialize all 4 lanes of the SERDES.  */
+        for (i = 0; i < 4; i++) {
+                u32 rxtx_ctrl, glue0;
+
+                err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl);
+                if (err)
+                        return err;
+                err = esr_read_glue0(np, i, &glue0);
+                if (err)
+                        return err;
+
+                rxtx_ctrl &= ~(ESR_RXTX_CTRL_VMUXLO);
+                rxtx_ctrl |= (ESR_RXTX_CTRL_ENSTRETCH |
+                              (2 << ESR_RXTX_CTRL_VMUXLO_SHIFT));
+
+                glue0 &= ~(ESR_GLUE_CTRL0_SRATE |
+                           ESR_GLUE_CTRL0_THCNT |
+                           ESR_GLUE_CTRL0_BLTIME);
+                glue0 |= (ESR_GLUE_CTRL0_RXLOSENAB |
+                          (0xf << ESR_GLUE_CTRL0_SRATE_SHIFT) |
+                          (0xff << ESR_GLUE_CTRL0_THCNT_SHIFT) |
+                          (BLTIME_300_CYCLES <<
+                           ESR_GLUE_CTRL0_BLTIME_SHIFT));
+
+                err = esr_write_rxtx_ctrl(np, i, rxtx_ctrl);
+                if (err)
+                        return err;
+                err = esr_write_glue0(np, i, glue0);
+                if (err)
+                        return err;
+        }
+
+
+        sig = nr64(ESR_INT_SIGNALS);
+        switch (np->port) {
+        case 0:
+                mask = ESR_INT_SIGNALS_P0_BITS;
+                val = (ESR_INT_SRDY0_P0 |
+                       ESR_INT_DET0_P0 |
+                       ESR_INT_XSRDY_P0 |
+                       ESR_INT_XDP_P0_CH3 |
+                       ESR_INT_XDP_P0_CH2 |
+                       ESR_INT_XDP_P0_CH1 |
+                       ESR_INT_XDP_P0_CH0);
+                break;
+
+        case 1:
+                mask = ESR_INT_SIGNALS_P1_BITS;
+                val = (ESR_INT_SRDY0_P1 |
+                       ESR_INT_DET0_P1 |
+                       ESR_INT_XSRDY_P1 |
+                       ESR_INT_XDP_P1_CH3 |
+                       ESR_INT_XDP_P1_CH2 |
+                       ESR_INT_XDP_P1_CH1 |
+                       ESR_INT_XDP_P1_CH0);
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        if ((sig & mask) != val) {
+                int err;
+                err = serdes_init_1g_serdes(np);
+                if (!err) {
+                        np->flags &= ~NIU_FLAGS_10G;
+                        np->mac_xcvr = MAC_XCVR_PCS;
+                }  else {
+                        dev_err(np->device, PFX "Port %u 10G/1G SERDES Link Failed \n",
+                         np->port);
+                        return -ENODEV;
+                }
+        }
+
+        return 0;
+}
+
 static int niu_determine_phy_disposition(struct niu *np)
 {
         struct niu_parent *parent = np->parent;
@@ -1498,7 +1964,10 @@ static int niu_determine_phy_disposition(struct niu *np)
                 tp = &phy_template_niu;
                 phy_addr_off += np->port;
         } else {
-                switch (np->flags & (NIU_FLAGS_10G | NIU_FLAGS_FIBER)) {
+                switch (np->flags &
+                        (NIU_FLAGS_10G |
+                         NIU_FLAGS_FIBER |
+                         NIU_FLAGS_XCVR_SERDES)) {
                 case 0:
                         /* 1G copper */
                         tp = &phy_template_1g_copper;
@@ -1529,6 +1998,25 @@ static int niu_determine_phy_disposition(struct niu *np)
                         phy_addr_off += np->port;
                         break;
 
+                case NIU_FLAGS_10G | NIU_FLAGS_XCVR_SERDES:
+                case NIU_FLAGS_XCVR_SERDES | NIU_FLAGS_FIBER:
+                case NIU_FLAGS_XCVR_SERDES:
+                        switch(np->port) {
+                        case 0:
+                        case 1:
+                                tp = &phy_template_10g_serdes;
+                                break;
+                        case 2:
+                        case 3:
+                                tp = &phy_template_1g_rgmii;
+                                break;
+                        default:
+                                return -EINVAL;
+                                break;
+                        }
+                        phy_addr_off = niu_atca_port_num[np->port];
+                        break;
+
                 default:
                         return -EINVAL;
                 }
@@ -4139,6 +4627,12 @@ static void niu_init_xif_xmac(struct niu *np)
         struct niu_link_config *lp = &np->link_config;
         u64 val;
 
+        if (np->flags & NIU_FLAGS_XCVR_SERDES) {
+                val = nr64(MIF_CONFIG);
+                val |= MIF_CONFIG_ATCA_GE;
+                nw64(MIF_CONFIG, val);
+        }
+
         val = nr64_mac(XMAC_CONFIG);
         val &= ~XMAC_CONFIG_SEL_POR_CLK_SRC;
 
@@ -4155,7 +4649,8 @@ static void niu_init_xif_xmac(struct niu *np)
                 val &= ~XMAC_CONFIG_LFS_DISABLE;
         } else {
                 val |= XMAC_CONFIG_LFS_DISABLE;
-                if (!(np->flags & NIU_FLAGS_FIBER))
+                if (!(np->flags & NIU_FLAGS_FIBER) &&
+                    !(np->flags & NIU_FLAGS_XCVR_SERDES))
                         val |= XMAC_CONFIG_1G_PCS_BYPASS;
                 else
                         val &= ~XMAC_CONFIG_1G_PCS_BYPASS;
@@ -4224,16 +4719,26 @@ static void niu_init_xif(struct niu *np)
 
 static void niu_pcs_mii_reset(struct niu *np)
 {
+        int limit = 1000;
         u64 val = nr64_pcs(PCS_MII_CTL);
         val |= PCS_MII_CTL_RST;
         nw64_pcs(PCS_MII_CTL, val);
+        while ((--limit >= 0) && (val & PCS_MII_CTL_RST)) {
+                udelay(100);
+                val = nr64_pcs(PCS_MII_CTL);
+        }
 }
 
 static void niu_xpcs_reset(struct niu *np)
 {
+        int limit = 1000;
         u64 val = nr64_xpcs(XPCS_CONTROL1);
         val |= XPCS_CONTROL1_RESET;
         nw64_xpcs(XPCS_CONTROL1, val);
+        while ((--limit >= 0) && (val & XPCS_CONTROL1_RESET)) {
+                udelay(100);
+                val = nr64_xpcs(XPCS_CONTROL1);
+        }
 }
 
 static int niu_init_pcs(struct niu *np)
@@ -4241,7 +4746,9 @@ static int niu_init_pcs(struct niu *np)
         struct niu_link_config *lp = &np->link_config;
         u64 val;
 
-        switch (np->flags & (NIU_FLAGS_10G | NIU_FLAGS_FIBER)) {
+        switch (np->flags & (NIU_FLAGS_10G |
+                             NIU_FLAGS_FIBER |
+                             NIU_FLAGS_XCVR_SERDES)) {
         case NIU_FLAGS_FIBER:
                 /* 1G fiber */
                 nw64_pcs(PCS_CONF, PCS_CONF_MASK | PCS_CONF_ENABLE);
@@ -4251,6 +4758,8 @@ static int niu_init_pcs(struct niu *np)
 
         case NIU_FLAGS_10G:
         case NIU_FLAGS_10G | NIU_FLAGS_FIBER:
+        case NIU_FLAGS_10G | NIU_FLAGS_XCVR_SERDES:
+                /* 10G SERDES */
                 if (!(np->flags & NIU_FLAGS_XMAC))
                         return -EINVAL;
 
@@ -4273,8 +4782,18 @@ static int niu_init_pcs(struct niu *np)
                 (void) nr64_xpcs(XPCS_SYMERR_CNT23);
                 break;
 
+
+        case NIU_FLAGS_XCVR_SERDES:
+                /* 1G SERDES */
+                niu_pcs_mii_reset(np);
+                nw64_pcs(PCS_CONF, PCS_CONF_MASK | PCS_CONF_ENABLE);
+                nw64_pcs(PCS_DPATH_MODE, 0);
+                break;
+
         case 0:
                 /* 1G copper */
+        case NIU_FLAGS_XCVR_SERDES | NIU_FLAGS_FIBER:
+                /* 1G RGMII FIBER */
                 nw64_pcs(PCS_DPATH_MODE, PCS_DPATH_MODE_MII);
                 niu_pcs_mii_reset(np);
                 break;
@@ -6268,7 +6787,19 @@ static void __devinit niu_pci_vpd_validate(struct niu *np)
                 return;
         }
 
-        if (niu_phy_type_prop_decode(np, np->vpd.phy_type)) {
+        if (!strcmp(np->vpd.model, "SUNW,CP3220") ||
+            !strcmp(np->vpd.model, "SUNW,CP3260")) {
+                np->flags |= NIU_FLAGS_10G;
+                np->flags &= ~NIU_FLAGS_FIBER;
+                np->flags |= NIU_FLAGS_XCVR_SERDES;
+                np->mac_xcvr = MAC_XCVR_PCS;
+                if (np->port > 1) {
+                        np->flags |= NIU_FLAGS_FIBER;
+                        np->flags &= ~NIU_FLAGS_10G;
+                }
+                if (np->flags & NIU_FLAGS_10G)
+                         np->mac_xcvr = MAC_XCVR_XPCS;
+        } else if (niu_phy_type_prop_decode(np, np->vpd.phy_type)) {
                 dev_err(np->device, PFX "Illegal phy string [%s].\n",
                         np->vpd.phy_type);
                 dev_err(np->device, PFX "Falling back to SPROM.\n");
@@ -6731,80 +7262,93 @@ static int __devinit walk_phys(struct niu *np, struct niu_parent *parent)
         u32 val;
         int err;
 
-        err = fill_phy_probe_info(np, parent, info);
-        if (err)
-                return err;
 
-        num_10g = count_10g_ports(info, &lowest_10g);
-        num_1g = count_1g_ports(info, &lowest_1g);
-
-        switch ((num_10g << 4) | num_1g) {
-        case 0x24:
-                if (lowest_1g == 10)
-                        parent->plat_type = PLAT_TYPE_VF_P0;
-                else if (lowest_1g == 26)
-                        parent->plat_type = PLAT_TYPE_VF_P1;
-                else
-                        goto unknown_vg_1g_port;
-
-                /* fallthru */
-        case 0x22:
-                val = (phy_encode(PORT_TYPE_10G, 0) |
-                       phy_encode(PORT_TYPE_10G, 1) |
+        if (!strcmp(np->vpd.model, "SUNW,CP3220") ||
+            !strcmp(np->vpd.model, "SUNW,CP3260")) {
+                num_10g = 0;
+                num_1g = 2;
+                parent->plat_type = PLAT_TYPE_ATCA_CP3220;
+                parent->num_ports = 4;
+                val = (phy_encode(PORT_TYPE_1G, 0) |
+                       phy_encode(PORT_TYPE_1G, 1) |
                        phy_encode(PORT_TYPE_1G, 2) |
                        phy_encode(PORT_TYPE_1G, 3));
-                break;
-
-        case 0x20:
-                val = (phy_encode(PORT_TYPE_10G, 0) |
-                       phy_encode(PORT_TYPE_10G, 1));
-                break;
+        } else {
+                err = fill_phy_probe_info(np, parent, info);
+                if (err)
+                        return err;
 
-        case 0x10:
-                val = phy_encode(PORT_TYPE_10G, np->port);
-                break;
+                num_10g = count_10g_ports(info, &lowest_10g);
+                num_1g = count_1g_ports(info, &lowest_1g);
 
-        case 0x14:
-                if (lowest_1g == 10)
-                        parent->plat_type = PLAT_TYPE_VF_P0;
-                else if (lowest_1g == 26)
-                        parent->plat_type = PLAT_TYPE_VF_P1;
-                else
-                        goto unknown_vg_1g_port;
+                switch ((num_10g << 4) | num_1g) {
+                case 0x24:
+                        if (lowest_1g == 10)
+                                parent->plat_type = PLAT_TYPE_VF_P0;
+                        else if (lowest_1g == 26)
+                                parent->plat_type = PLAT_TYPE_VF_P1;
+                        else
+                                goto unknown_vg_1g_port;
 
-                /* fallthru */
-        case 0x13:
-                if ((lowest_10g & 0x7) == 0)
+                        /* fallthru */
+                case 0x22:
                         val = (phy_encode(PORT_TYPE_10G, 0) |
-                               phy_encode(PORT_TYPE_1G, 1) |
-                               phy_encode(PORT_TYPE_1G, 2) |
-                               phy_encode(PORT_TYPE_1G, 3));
-                else
-                        val = (phy_encode(PORT_TYPE_1G, 0) |
                                phy_encode(PORT_TYPE_10G, 1) |
                                phy_encode(PORT_TYPE_1G, 2) |
                                phy_encode(PORT_TYPE_1G, 3));
-                break;
+                        break;
 
-        case 0x04:
-                if (lowest_1g == 10)
-                        parent->plat_type = PLAT_TYPE_VF_P0;
-                else if (lowest_1g == 26)
-                        parent->plat_type = PLAT_TYPE_VF_P1;
-                else
-                        goto unknown_vg_1g_port;
+                case 0x20:
+                        val = (phy_encode(PORT_TYPE_10G, 0) |
+                               phy_encode(PORT_TYPE_10G, 1));
+                        break;
 
-                val = (phy_encode(PORT_TYPE_1G, 0) |
-                       phy_encode(PORT_TYPE_1G, 1) |
-                       phy_encode(PORT_TYPE_1G, 2) |
-                       phy_encode(PORT_TYPE_1G, 3));
-                break;
+                case 0x10:
+                        val = phy_encode(PORT_TYPE_10G, np->port);
+                        break;
 
-        default:
-                printk(KERN_ERR PFX "Unsupported port config "
-                       "10G[%d] 1G[%d]\n",
-                       num_10g, num_1g);
-                return -EINVAL;
+                case 0x14:
+                        if (lowest_1g == 10)
+                                parent->plat_type = PLAT_TYPE_VF_P0;
+                        else if (lowest_1g == 26)
+                                parent->plat_type = PLAT_TYPE_VF_P1;
+                        else
+                                goto unknown_vg_1g_port;
+
+                        /* fallthru */
+                case 0x13:
+                        if ((lowest_10g & 0x7) == 0)
+                                val = (phy_encode(PORT_TYPE_10G, 0) |
+                                       phy_encode(PORT_TYPE_1G, 1) |
+                                       phy_encode(PORT_TYPE_1G, 2) |
+                                       phy_encode(PORT_TYPE_1G, 3));
+                        else
+                                val = (phy_encode(PORT_TYPE_1G, 0) |
+                                       phy_encode(PORT_TYPE_10G, 1) |
+                                       phy_encode(PORT_TYPE_1G, 2) |
+                                       phy_encode(PORT_TYPE_1G, 3));
+                        break;
+
+                case 0x04:
+                        if (lowest_1g == 10)
+                                parent->plat_type = PLAT_TYPE_VF_P0;
+                        else if (lowest_1g == 26)
+                                parent->plat_type = PLAT_TYPE_VF_P1;
+                        else
+                                goto unknown_vg_1g_port;
+
+                        val = (phy_encode(PORT_TYPE_1G, 0) |
+                               phy_encode(PORT_TYPE_1G, 1) |
+                               phy_encode(PORT_TYPE_1G, 2) |
+                               phy_encode(PORT_TYPE_1G, 3));
+                        break;
+
+                default:
+                        printk(KERN_ERR PFX "Unsupported port config "
+                               "10G[%d] 1G[%d]\n",
+                               num_10g, num_1g);
+                        return -EINVAL;
+                }
         }
 
         parent->port_phy = val;
@@ -7599,14 +8143,25 @@ static void __devinit niu_device_announce(struct niu *np)
         pr_info("%s: NIU Ethernet %s\n",
                 dev->name, print_mac(mac, dev->dev_addr));
 
-        pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n",
-                dev->name,
-                (np->flags & NIU_FLAGS_XMAC ? "XMAC" : "BMAC"),
-                (np->flags & NIU_FLAGS_10G ? "10G" : "1G"),
-                (np->flags & NIU_FLAGS_FIBER ? "FIBER" : "COPPER"),
-                (np->mac_xcvr == MAC_XCVR_MII ? "MII" :
-                 (np->mac_xcvr == MAC_XCVR_PCS ? "PCS" : "XPCS")),
-                np->vpd.phy_type);
+        if (np->parent->plat_type == PLAT_TYPE_ATCA_CP3220) {
+                pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n",
+                                dev->name,
+                                (np->flags & NIU_FLAGS_XMAC ? "XMAC" : "BMAC"),
+                                (np->flags & NIU_FLAGS_10G ? "10G" : "1G"),
+                                (np->flags & NIU_FLAGS_FIBER ? "RGMII FIBER" : "SERDES"),
+                                (np->mac_xcvr == MAC_XCVR_MII ? "MII" :
+                                 (np->mac_xcvr == MAC_XCVR_PCS ? "PCS" : "XPCS")),
+                                np->vpd.phy_type);
+        } else {
+                pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n",
+                                dev->name,
+                                (np->flags & NIU_FLAGS_XMAC ? "XMAC" : "BMAC"),
+                                (np->flags & NIU_FLAGS_10G ? "10G" : "1G"),
+                                (np->flags & NIU_FLAGS_FIBER ? "FIBER" : "COPPER"),
+                                (np->mac_xcvr == MAC_XCVR_MII ? "MII" :
+                                 (np->mac_xcvr == MAC_XCVR_PCS ? "PCS" : "XPCS")),
+                                np->vpd.phy_type);
+        }
 }
 
 static int __devinit niu_pci_init_one(struct pci_dev *pdev,
diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index 59dc05fcd371..336aed08b275 100644
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -3061,6 +3061,7 @@ struct niu_parent {
 #define PLAT_TYPE_NIU           0x02
 #define PLAT_TYPE_VF_P0         0x03
 #define PLAT_TYPE_VF_P1         0x04
+#define PLAT_TYPE_ATCA_CP3220   0x08
 
         u8                      num_ports;
 
@@ -3198,10 +3199,11 @@ struct niu {
         struct niu_parent               *parent;
 
         u32                             flags;
+#define NIU_FLAGS_VPD_VALID             0x00800000 /* VPD has valid version */
 #define NIU_FLAGS_MSIX                  0x00400000 /* MSI-X in use */
 #define NIU_FLAGS_MCAST                 0x00200000 /* multicast filter enabled */
 #define NIU_FLAGS_PROMISC               0x00100000 /* PROMISC enabled */
-#define NIU_FLAGS_VPD_VALID             0x00080000 /* VPD has valid version */
+#define NIU_FLAGS_XCVR_SERDES           0x00080000 /* 0=PHY 1=SERDES */
 #define NIU_FLAGS_10G                   0x00040000 /* 0=1G 1=10G */
 #define NIU_FLAGS_FIBER                 0x00020000 /* 0=COPPER 1=FIBER */
 #define NIU_FLAGS_XMAC                  0x00010000 /* 0=BMAC 1=XMAC */
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 2e39e0285d8f..bcd7f9814ed8 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1012,7 +1012,7 @@ static int pasemi_mac_phy_init(struct net_device *dev)
                 goto err;
 
         phy_id = *prop;
-        snprintf(mac->phy_id, BUS_ID_SIZE, PHY_ID_FMT, (int)r.start, phy_id);
+        snprintf(mac->phy_id, BUS_ID_SIZE, "%x:%02x", (int)r.start, phy_id);
 
         of_node_put(phy_dn);
 
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 5b80358af658..60c5cfe96918 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -99,6 +99,41 @@ static int bcm54xx_config_intr(struct phy_device *phydev)
         return err;
 }
 
+static int bcm5481_config_aneg(struct phy_device *phydev)
+{
+        int ret;
+
+        /* Aneg firsly. */
+        ret = genphy_config_aneg(phydev);
+
+        /* Then we can set up the delay. */
+        if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
+                u16 reg;
+
+                /*
+                 * There is no BCM5481 specification available, so down
+                 * here is everything we know about "register 0x18". This
+                 * at least helps BCM5481 to successfuly receive packets
+                 * on MPC8360E-RDK board. Peter Barada <peterb@logicpd.com>
+                 * says: "This sets delay between the RXD and RXC signals
+                 * instead of using trace lengths to achieve timing".
+                 */
+
+                /* Set RDX clk delay. */
+                reg = 0x7 | (0x7 << 12);
+                phy_write(phydev, 0x18, reg);
+
+                reg = phy_read(phydev, 0x18);
+                /* Set RDX-RXC skew. */
+                reg |= (1 << 8);
+                /* Write bits 14:0. */
+                reg |= (1 << 15);
+                phy_write(phydev, 0x18, reg);
+        }
+
+        return ret;
+}
+
 static struct phy_driver bcm5411_driver = {
         .phy_id         = 0x00206070,
         .phy_id_mask    = 0xfffffff0,
@@ -141,8 +176,36 @@ static struct phy_driver bcm5461_driver = {
         .driver         = { .owner = THIS_MODULE },
 };
 
+static struct phy_driver bcm5464_driver = {
+        .phy_id         = 0x002060b0,
+        .phy_id_mask    = 0xfffffff0,
+        .name           = "Broadcom BCM5464",
+        .features       = PHY_GBIT_FEATURES,
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+        .config_init    = bcm54xx_config_init,
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .ack_interrupt  = bcm54xx_ack_interrupt,
+        .config_intr    = bcm54xx_config_intr,
+        .driver         = { .owner = THIS_MODULE },
+};
+
+static struct phy_driver bcm5481_driver = {
+        .phy_id         = 0x0143bca0,
+        .phy_id_mask    = 0xfffffff0,
+        .name           = "Broadcom BCM5481",
+        .features       = PHY_GBIT_FEATURES,
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+        .config_init    = bcm54xx_config_init,
+        .config_aneg    = bcm5481_config_aneg,
+        .read_status    = genphy_read_status,
+        .ack_interrupt  = bcm54xx_ack_interrupt,
+        .config_intr    = bcm54xx_config_intr,
+        .driver         = { .owner = THIS_MODULE },
+};
+
 static struct phy_driver bcm5482_driver = {
-    .phy_id             = 0x0143bcb0,
+        .phy_id         = 0x0143bcb0,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5482",
         .features       = PHY_GBIT_FEATURES,
@@ -168,12 +231,22 @@ static int __init broadcom_init(void)
         ret = phy_driver_register(&bcm5461_driver);
         if (ret)
                 goto out_5461;
+        ret = phy_driver_register(&bcm5464_driver);
+        if (ret)
+                goto out_5464;
+        ret = phy_driver_register(&bcm5481_driver);
+        if (ret)
+                goto out_5481;
         ret = phy_driver_register(&bcm5482_driver);
         if (ret)
                 goto out_5482;
         return ret;
 
 out_5482:
+        phy_driver_unregister(&bcm5481_driver);
+out_5481:
+        phy_driver_unregister(&bcm5464_driver);
+out_5464:
         phy_driver_unregister(&bcm5461_driver);
 out_5461:
         phy_driver_unregister(&bcm5421_driver);
@@ -186,6 +259,8 @@ out_5411:
 static void __exit broadcom_exit(void)
 {
         phy_driver_unregister(&bcm5482_driver);
+        phy_driver_unregister(&bcm5481_driver);
+        phy_driver_unregister(&bcm5464_driver);
         phy_driver_unregister(&bcm5461_driver);
         phy_driver_unregister(&bcm5421_driver);
         phy_driver_unregister(&bcm5411_driver);
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index ca9b040f9ad9..4e07956a483b 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -213,7 +213,7 @@ static int __init fixed_mdio_bus_init(void)
                 goto err_pdev;
         }
 
-        fmb->mii_bus.id = 0;
+        snprintf(fmb->mii_bus.id, MII_BUS_ID_SIZE, "0");
         fmb->mii_bus.name = "Fixed MDIO Bus";
         fmb->mii_bus.dev = &pdev->dev;
         fmb->mii_bus.read = &fixed_mdio_read;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index f4c4fd85425f..8b1121b02f98 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -86,35 +86,55 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
 EXPORT_SYMBOL(phy_device_create);
 
 /**
- * get_phy_device - reads the specified PHY device and returns its @phy_device struct
+ * get_phy_id - reads the specified addr for its ID.
  * @bus: the target MII bus
  * @addr: PHY address on the MII bus
+ * @phy_id: where to store the ID retrieved.
  *
  * Description: Reads the ID registers of the PHY at @addr on the
- *   @bus, then allocates and returns the phy_device to represent it.
+ *   @bus, stores it in @phy_id and returns zero on success.
  */
-struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
+int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
 {
         int phy_reg;
-        u32 phy_id;
-        struct phy_device *dev = NULL;
 
         /* Grab the bits from PHYIR1, and put them
          * in the upper half */
         phy_reg = bus->read(bus, addr, MII_PHYSID1);
 
         if (phy_reg < 0)
-                return ERR_PTR(phy_reg);
+                return -EIO;
 
-        phy_id = (phy_reg & 0xffff) << 16;
+        *phy_id = (phy_reg & 0xffff) << 16;
 
         /* Grab the bits from PHYIR2, and put them in the lower half */
         phy_reg = bus->read(bus, addr, MII_PHYSID2);
 
         if (phy_reg < 0)
-                return ERR_PTR(phy_reg);
+                return -EIO;
+
+        *phy_id |= (phy_reg & 0xffff);
+
+        return 0;
+}
+
+/**
+ * get_phy_device - reads the specified PHY device and returns its @phy_device struct
+ * @bus: the target MII bus
+ * @addr: PHY address on the MII bus
+ *
+ * Description: Reads the ID registers of the PHY at @addr on the
+ *   @bus, then allocates and returns the phy_device to represent it.
+ */
+struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
+{
+        struct phy_device *dev = NULL;
+        u32 phy_id;
+        int r;
 
-        phy_id |= (phy_reg & 0xffff);
+        r = get_phy_id(bus, addr, &phy_id);
+        if (r)
+                return ERR_PTR(r);
 
         /* If the phy_id is all Fs, there is no device there */
         if (0xffffffff == phy_id)
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index ac0ac98b19cd..4fad4ddb3504 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -301,7 +301,7 @@ static int pppoe_device_event(struct notifier_block *this,
 {
         struct net_device *dev = (struct net_device *) ptr;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         /* Only look at sockets that are using this specific device. */
@@ -392,7 +392,7 @@ static int pppoe_rcv(struct sk_buff *skb,
         if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
                 goto out;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto drop;
 
         if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
@@ -424,7 +424,7 @@ static int pppoe_disc_rcv(struct sk_buff *skb,
         struct pppoe_hdr *ph;
         struct pppox_sock *po;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto abort;
 
         if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index c16de5129a71..0d32123085e9 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -87,7 +87,7 @@ static inline int wpa2_capable(void)
 
 static inline int precise_ie(void)
 {
-        return 0; /* FIXME */
+        return (0 <= ps3_compare_firmware_version(2, 2, 0));
 }
 /*
  * post_eurus_cmd helpers
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index a6aeb9d60443..b7f7b2227d56 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2472,8 +2472,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
 
         if (seg_cnt == 1) {
                 /* Terminate the last segment. */
-                oal_entry->len =
-                    cpu_to_le32(le32_to_cpu(oal_entry->len) | OAL_LAST_ENTRY);
+                oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
         } else {
                 oal = tx_cb->oal;
                 for (completed_segs=0; completed_segs<frag_cnt; completed_segs++,seg++) {
@@ -2530,8 +2529,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
                                           frag->size);
                 }
                 /* Terminate the last segment. */
-                oal_entry->len =
-                    cpu_to_le32(le32_to_cpu(oal_entry->len) | OAL_LAST_ENTRY);
+                oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
         }
 
         return NETDEV_TX_OK;
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index c082cf0b1ac6..dcbe01b0ca0d 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -50,6 +50,8 @@
  *                 Possible values '1' for enable , '0' for disable.
  *                 Default is '2' - which means disable in promisc mode
  *                 and enable in non-promiscuous mode.
+ * multiq: This parameter used to enable/disable MULTIQUEUE support.
+ *      Possible values '1' for enable and '0' for disable. Default is '0'
  ************************************************************************/
 
 #include <linux/module.h>
@@ -386,6 +388,26 @@ static void s2io_vlan_rx_register(struct net_device *dev,
 /* A flag indicating whether 'RX_PA_CFG_STRIP_VLAN_TAG' bit is set or not */
 static int vlan_strip_flag;
 
+/* Unregister the vlan */
+static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
+{
+        int i;
+        struct s2io_nic *nic = dev->priv;
+        unsigned long flags[MAX_TX_FIFOS];
+        struct mac_info *mac_control = &nic->mac_control;
+        struct config_param *config = &nic->config;
+
+        for (i = 0; i < config->tx_fifo_num; i++)
+                spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags[i]);
+
+        if (nic->vlgrp)
+                vlan_group_set_device(nic->vlgrp, vid, NULL);
+
+        for (i = config->tx_fifo_num - 1; i >= 0; i--)
+                spin_unlock_irqrestore(&mac_control->fifos[i].tx_lock,
+                        flags[i]);
+}
+
 /*
  * Constants to be programmed into the Xena's registers, to configure
  * the XAUI.
@@ -456,10 +478,9 @@ MODULE_VERSION(DRV_VERSION);
 
 
 /* Module Loadable parameters. */
-S2IO_PARM_INT(tx_fifo_num, 1);
+S2IO_PARM_INT(tx_fifo_num, FIFO_DEFAULT_NUM);
 S2IO_PARM_INT(rx_ring_num, 1);
-
-
+S2IO_PARM_INT(multiq, 0);
 S2IO_PARM_INT(rx_ring_mode, 1);
 S2IO_PARM_INT(use_continuous_tx_intrs, 1);
 S2IO_PARM_INT(rmac_pause_time, 0x100);
@@ -469,6 +490,8 @@ S2IO_PARM_INT(shared_splits, 0);
 S2IO_PARM_INT(tmac_util_period, 5);
 S2IO_PARM_INT(rmac_util_period, 5);
 S2IO_PARM_INT(l3l4hdr_size, 128);
+/* 0 is no steering, 1 is Priority steering, 2 is Default steering */
+S2IO_PARM_INT(tx_steering_type, TX_DEFAULT_STEERING);
 /* Frequency of Rx desc syncs expressed as power of 2 */
 S2IO_PARM_INT(rxsync_frequency, 3);
 /* Interrupt type. Values can be 0(INTA), 2(MSI_X) */
@@ -533,6 +556,101 @@ static struct pci_driver s2io_driver = {
 /* A simplifier macro used both by init and free shared_mem Fns(). */
 #define TXD_MEM_PAGE_CNT(len, per_each) ((len+per_each - 1) / per_each)
 
+/* netqueue manipulation helper functions */
+static inline void s2io_stop_all_tx_queue(struct s2io_nic *sp)
+{
+        int i;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (sp->config.multiq) {
+                for (i = 0; i < sp->config.tx_fifo_num; i++)
+                        netif_stop_subqueue(sp->dev, i);
+        } else
+#endif
+        {
+                for (i = 0; i < sp->config.tx_fifo_num; i++)
+                        sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_STOP;
+                netif_stop_queue(sp->dev);
+        }
+}
+
+static inline void s2io_stop_tx_queue(struct s2io_nic *sp, int fifo_no)
+{
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (sp->config.multiq)
+                netif_stop_subqueue(sp->dev, fifo_no);
+        else
+#endif
+        {
+                sp->mac_control.fifos[fifo_no].queue_state =
+                        FIFO_QUEUE_STOP;
+                netif_stop_queue(sp->dev);
+        }
+}
+
+static inline void s2io_start_all_tx_queue(struct s2io_nic *sp)
+{
+        int i;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (sp->config.multiq) {
+                for (i = 0; i < sp->config.tx_fifo_num; i++)
+                        netif_start_subqueue(sp->dev, i);
+        } else
+#endif
+        {
+                for (i = 0; i < sp->config.tx_fifo_num; i++)
+                        sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_START;
+                netif_start_queue(sp->dev);
+        }
+}
+
+static inline void s2io_start_tx_queue(struct s2io_nic *sp, int fifo_no)
+{
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (sp->config.multiq)
+                netif_start_subqueue(sp->dev, fifo_no);
+        else
+#endif
+        {
+                sp->mac_control.fifos[fifo_no].queue_state =
+                        FIFO_QUEUE_START;
+                netif_start_queue(sp->dev);
+        }
+}
+
+static inline void s2io_wake_all_tx_queue(struct s2io_nic *sp)
+{
+        int i;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (sp->config.multiq) {
+                for (i = 0; i < sp->config.tx_fifo_num; i++)
+                        netif_wake_subqueue(sp->dev, i);
+        } else
+#endif
+        {
+                for (i = 0; i < sp->config.tx_fifo_num; i++)
+                        sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_START;
+                netif_wake_queue(sp->dev);
+        }
+}
+
+static inline void s2io_wake_tx_queue(
+        struct fifo_info *fifo, int cnt, u8 multiq)
+{
+
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (multiq) {
+                if (cnt && __netif_subqueue_stopped(fifo->dev, fifo->fifo_no))
+                        netif_wake_subqueue(fifo->dev, fifo->fifo_no);
+        } else
+#endif
+        if (cnt && (fifo->queue_state == FIFO_QUEUE_STOP)) {
+                if (netif_queue_stopped(fifo->dev)) {
+                        fifo->queue_state = FIFO_QUEUE_START;
+                        netif_wake_queue(fifo->dev);
+                }
+        }
+}
+
 /**
  * init_shared_mem - Allocation and Initialization of Memory
  * @nic: Device private variable.
@@ -614,6 +732,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                 mac_control->fifos[i].fifo_no = i;
                 mac_control->fifos[i].nic = nic;
                 mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 2;
+                mac_control->fifos[i].dev = dev;
 
                 for (j = 0; j < page_num; j++) {
                         int k = 0;
@@ -2948,7 +3067,7 @@ static void rx_intr_handler(struct ring_info *ring_data)
                         struct lro *lro = &nic->lro0_n[i];
                         if (lro->in_use) {
                                 update_L3L4_header(nic, lro);
-                                queue_rx_frame(lro->parent);
+                                queue_rx_frame(lro->parent, lro->vlan_tag);
                                 clear_lro_session(lro);
                         }
                 }
@@ -2972,10 +3091,10 @@ static void rx_intr_handler(struct ring_info *ring_data)
 static void tx_intr_handler(struct fifo_info *fifo_data)
 {
         struct s2io_nic *nic = fifo_data->nic;
-        struct net_device *dev = (struct net_device *) nic->dev;
         struct tx_curr_get_info get_info, put_info;
-        struct sk_buff *skb;
+        struct sk_buff *skb = NULL;
         struct TxD *txdlp;
+        int pkt_cnt = 0;
         unsigned long flags = 0;
         u8 err_mask;
 
@@ -3036,6 +3155,7 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
                         DBG_PRINT(ERR_DBG, "in Tx Free Intr\n");
                         return;
                 }
+                pkt_cnt++;
 
                 /* Updating the statistics block */
                 nic->stats.tx_bytes += skb->len;
@@ -3051,8 +3171,7 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
                     get_info.offset;
         }
 
-        if (netif_queue_stopped(dev))
-                netif_wake_queue(dev);
+        s2io_wake_tx_queue(fifo_data, pkt_cnt, nic->config.multiq);
 
         spin_unlock_irqrestore(&fifo_data->tx_lock, flags);
 }
@@ -3933,8 +4052,7 @@ static int s2io_open(struct net_device *dev)
                 err = -ENODEV;
                 goto hw_init_failed;
         }
-
-        netif_start_queue(dev);
+        s2io_start_all_tx_queue(sp);
         return 0;
 
 hw_init_failed:
@@ -3979,8 +4097,7 @@ static int s2io_close(struct net_device *dev)
         if (!is_s2io_card_up(sp))
                 return 0;
 
-        netif_stop_queue(dev);
-
+        s2io_stop_all_tx_queue(sp);
         /* delete all populated mac entries */
         for (offset = 1; offset < config->max_mc_addr; offset++) {
                 tmp64 = do_s2io_read_unicast_mc(sp, offset);
@@ -4016,11 +4133,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         struct TxFIFO_element __iomem *tx_fifo;
         unsigned long flags = 0;
         u16 vlan_tag = 0;
-        int vlan_priority = 0;
         struct fifo_info *fifo = NULL;
         struct mac_info *mac_control;
         struct config_param *config;
+        int do_spin_lock = 1;
         int offload_type;
+        int enable_per_list_interrupt = 0;
         struct swStat *stats = &sp->mac_control.stats_info->sw_stat;
 
         mac_control = &sp->mac_control;
@@ -4042,15 +4160,67 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         queue = 0;
-        /* Get Fifo number to Transmit based on vlan priority */
-        if (sp->vlgrp && vlan_tx_tag_present(skb)) {
+        if (sp->vlgrp && vlan_tx_tag_present(skb))
                 vlan_tag = vlan_tx_tag_get(skb);
-                vlan_priority = vlan_tag >> 13;
-                queue = config->fifo_mapping[vlan_priority];
+        if (sp->config.tx_steering_type == TX_DEFAULT_STEERING) {
+                if (skb->protocol == htons(ETH_P_IP)) {
+                        struct iphdr *ip;
+                        struct tcphdr *th;
+                        ip = ip_hdr(skb);
+
+                        if ((ip->frag_off & htons(IP_OFFSET|IP_MF)) == 0) {
+                                th = (struct tcphdr *)(((unsigned char *)ip) +
+                                                ip->ihl*4);
+
+                                if (ip->protocol == IPPROTO_TCP) {
+                                        queue_len = sp->total_tcp_fifos;
+                                        queue = (ntohs(th->source) +
+                                                        ntohs(th->dest)) &
+                                            sp->fifo_selector[queue_len - 1];
+                                        if (queue >= queue_len)
+                                                queue = queue_len - 1;
+                                } else if (ip->protocol == IPPROTO_UDP) {
+                                        queue_len = sp->total_udp_fifos;
+                                        queue = (ntohs(th->source) +
+                                                        ntohs(th->dest)) &
+                                            sp->fifo_selector[queue_len - 1];
+                                        if (queue >= queue_len)
+                                                queue = queue_len - 1;
+                                        queue += sp->udp_fifo_idx;
+                                        if (skb->len > 1024)
+                                                enable_per_list_interrupt = 1;
+                                        do_spin_lock = 0;
+                                }
+                        }
+                }
+        } else if (sp->config.tx_steering_type == TX_PRIORITY_STEERING)
+                /* get fifo number based on skb->priority value */
+                queue = config->fifo_mapping
+                                        [skb->priority & (MAX_TX_FIFOS - 1)];
+        fifo = &mac_control->fifos[queue];
+
+        if (do_spin_lock)
+                spin_lock_irqsave(&fifo->tx_lock, flags);
+        else {
+                if (unlikely(!spin_trylock_irqsave(&fifo->tx_lock, flags)))
+                        return NETDEV_TX_LOCKED;
+        }
+
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (sp->config.multiq) {
+                if (__netif_subqueue_stopped(dev, fifo->fifo_no)) {
+                        spin_unlock_irqrestore(&fifo->tx_lock, flags);
+                        return NETDEV_TX_BUSY;
+                }
+        } else
+#endif
+        if (unlikely(fifo->queue_state == FIFO_QUEUE_STOP)) {
+                if (netif_queue_stopped(dev)) {
+                        spin_unlock_irqrestore(&fifo->tx_lock, flags);
+                        return NETDEV_TX_BUSY;
+                }
         }
 
-        fifo = &mac_control->fifos[queue];
-        spin_lock_irqsave(&fifo->tx_lock, flags);
         put_off = (u16) fifo->tx_curr_put_info.offset;
         get_off = (u16) fifo->tx_curr_get_info.offset;
         txdp = (struct TxD *) fifo->list_info[put_off].list_virt_addr;
@@ -4060,7 +4230,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         if (txdp->Host_Control ||
                    ((put_off+1) == queue_len ? 0 : (put_off+1)) == get_off) {
                 DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");
-                netif_stop_queue(dev);
+                s2io_stop_tx_queue(sp, fifo->fifo_no);
                 dev_kfree_skb(skb);
                 spin_unlock_irqrestore(&fifo->tx_lock, flags);
                 return 0;
@@ -4079,8 +4249,10 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         txdp->Control_1 |= TXD_GATHER_CODE_FIRST;
         txdp->Control_1 |= TXD_LIST_OWN_XENA;
         txdp->Control_2 |= TXD_INT_NUMBER(fifo->fifo_no);
-
-        if (sp->vlgrp && vlan_tx_tag_present(skb)) {
+        if (enable_per_list_interrupt)
+                if (put_off & (queue_len >> 5))
+                        txdp->Control_2 |= TXD_INT_TYPE_PER_LIST;
+        if (vlan_tag) {
                 txdp->Control_2 |= TXD_VLAN_ENABLE;
                 txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag);
         }
@@ -4095,11 +4267,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                 txdp->Control_1 |= TXD_UFO_MSS(ufo_size);
                 txdp->Control_1 |= TXD_BUFFER0_SIZE(8);
 #ifdef __BIG_ENDIAN
+                /* both variants do cpu_to_be64(be32_to_cpu(...)) */
                 fifo->ufo_in_band_v[put_off] =
-                                (u64)skb_shinfo(skb)->ip6_frag_id;
+                                (__force u64)skb_shinfo(skb)->ip6_frag_id;
 #else
                 fifo->ufo_in_band_v[put_off] =
-                                (u64)skb_shinfo(skb)->ip6_frag_id << 32;
+                                (__force u64)skb_shinfo(skb)->ip6_frag_id << 32;
 #endif
                 txdp->Host_Control = (unsigned long)fifo->ufo_in_band_v;
                 txdp->Buffer_Pointer = pci_map_single(sp->pdev,
@@ -4166,7 +4339,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                 DBG_PRINT(TX_DBG,
                           "No free TxDs for xmit, Put: 0x%x Get:0x%x\n",
                           put_off, get_off);
-                netif_stop_queue(dev);
+                s2io_stop_tx_queue(sp, fifo->fifo_no);
         }
         mac_control->stats_info->sw_stat.mem_allocated += skb->truesize;
         dev->trans_start = jiffies;
@@ -4178,7 +4351,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         return 0;
 pci_map_failed:
         stats->pci_map_fail_cnt++;
-        netif_stop_queue(dev);
+        s2io_stop_tx_queue(sp, fifo->fifo_no);
         stats->mem_freed += skb->truesize;
         dev_kfree_skb(skb);
         spin_unlock_irqrestore(&fifo->tx_lock, flags);
@@ -4590,7 +4763,7 @@ static void s2io_handle_errors(void * dev_id)
         return;
 
 reset:
-        netif_stop_queue(dev);
+        s2io_stop_all_tx_queue(sp);
         schedule_work(&sp->rst_timer_task);
         sw_stat->soft_reset_cnt++;
         return;
@@ -6577,16 +6750,15 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
 
         dev->mtu = new_mtu;
         if (netif_running(dev)) {
+                s2io_stop_all_tx_queue(sp);
                 s2io_card_down(sp);
-                netif_stop_queue(dev);
                 ret = s2io_card_up(sp);
                 if (ret) {
                         DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
                                   __FUNCTION__);
                         return ret;
                 }
-                if (netif_queue_stopped(dev))
-                        netif_wake_queue(dev);
+                s2io_wake_all_tx_queue(sp);
         } else { /* Device is down */
                 struct XENA_dev_config __iomem *bar0 = sp->bar0;
                 u64 val64 = new_mtu;
@@ -6694,7 +6866,7 @@ static void s2io_set_link(struct work_struct *work)
                         } else {
                                 DBG_PRINT(ERR_DBG, "%s: Error: ", dev->name);
                                 DBG_PRINT(ERR_DBG, "device is not Quiescent\n");
-                                netif_stop_queue(dev);
+                                s2io_stop_all_tx_queue(nic);
                         }
                 }
                 val64 = readq(&bar0->adapter_control);
@@ -6921,11 +7093,11 @@ static int s2io_add_isr(struct s2io_nic * sp)
                                 if(!(sp->msix_info[i].addr &&
                                         sp->msix_info[i].data)) {
                                         DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
-                                                "Data:0x%lx\n",sp->desc[i],
+                                                "Data:0x%llx\n",sp->desc[i],
                                                 (unsigned long long)
                                                 sp->msix_info[i].addr,
-                                                (unsigned long)
-                                                ntohl(sp->msix_info[i].data));
+                                                (unsigned long long)
+                                                sp->msix_info[i].data);
                                 } else {
                                         msix_tx_cnt++;
                                 }
@@ -6939,11 +7111,11 @@ static int s2io_add_isr(struct s2io_nic * sp)
                                 if(!(sp->msix_info[i].addr &&
                                         sp->msix_info[i].data)) {
                                         DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
-                                                "Data:0x%lx\n",sp->desc[i],
+                                                "Data:0x%llx\n",sp->desc[i],
                                                 (unsigned long long)
                                                 sp->msix_info[i].addr,
-                                                (unsigned long)
-                                                ntohl(sp->msix_info[i].data));
+                                                (unsigned long long)
+                                                sp->msix_info[i].data);
                                 } else {
                                         msix_rx_cnt++;
                                 }
@@ -7184,7 +7356,7 @@ static void s2io_restart_nic(struct work_struct *work)
                 DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
                           dev->name);
         }
-        netif_wake_queue(dev);
+        s2io_wake_all_tx_queue(sp);
         DBG_PRINT(ERR_DBG, "%s: was reset by Tx watchdog timer\n",
                   dev->name);
 out_unlock:
@@ -7374,7 +7546,8 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                                         {
                                                 lro_append_pkt(sp, lro,
                                                         skb, tcp_len);
-                                                queue_rx_frame(lro->parent);
+                                                queue_rx_frame(lro->parent,
+                                                        lro->vlan_tag);
                                                 clear_lro_session(lro);
                                                 sp->mac_control.stats_info->
                                                     sw_stat.flush_max_pkts++;
@@ -7385,7 +7558,8 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                                                         lro->frags_len;
                                                 sp->mac_control.stats_info->
                                                      sw_stat.sending_both++;
-                                                queue_rx_frame(lro->parent);
+                                                queue_rx_frame(lro->parent,
+                                                        lro->vlan_tag);
                                                 clear_lro_session(lro);
                                                 goto send_up;
                                         case 0: /* sessions exceeded */
@@ -7411,31 +7585,12 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                          */
                         skb->ip_summed = CHECKSUM_NONE;
                 }
-        } else {
+        } else
                 skb->ip_summed = CHECKSUM_NONE;
-        }
+
         sp->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
-        if (!sp->lro) {
-                skb->protocol = eth_type_trans(skb, dev);
-                if ((sp->vlgrp && RXD_GET_VLAN_TAG(rxdp->Control_2) &&
-                        vlan_strip_flag)) {
-                        /* Queueing the vlan frame to the upper layer */
-                        if (napi)
-                                vlan_hwaccel_receive_skb(skb, sp->vlgrp,
-                                        RXD_GET_VLAN_TAG(rxdp->Control_2));
-                        else
-                                vlan_hwaccel_rx(skb, sp->vlgrp,
-                                        RXD_GET_VLAN_TAG(rxdp->Control_2));
-                } else {
-                        if (napi)
-                                netif_receive_skb(skb);
-                        else
-                                netif_rx(skb);
-                }
-        } else {
 send_up:
-                queue_rx_frame(skb);
-        }
+        queue_rx_frame(skb, RXD_GET_VLAN_TAG(rxdp->Control_2));
         dev->last_rx = jiffies;
 aggregate:
         atomic_dec(&sp->rx_bufs_left[ring_no]);
@@ -7463,6 +7618,7 @@ static void s2io_link(struct s2io_nic * sp, int link)
                 init_tti(sp, link);
                 if (link == LINK_DOWN) {
                         DBG_PRINT(ERR_DBG, "%s: Link down\n", dev->name);
+                        s2io_stop_all_tx_queue(sp);
                         netif_carrier_off(dev);
                         if(sp->mac_control.stats_info->sw_stat.link_up_cnt)
                         sp->mac_control.stats_info->sw_stat.link_up_time =
@@ -7475,6 +7631,7 @@ static void s2io_link(struct s2io_nic * sp, int link)
                                 jiffies - sp->start_time;
                         sp->mac_control.stats_info->sw_stat.link_up_cnt++;
                         netif_carrier_on(dev);
+                        s2io_wake_all_tx_queue(sp);
                 }
         }
         sp->last_link_state = link;
@@ -7511,20 +7668,48 @@ static void s2io_init_pci(struct s2io_nic * sp)
         pci_read_config_word(sp->pdev, PCI_COMMAND, &pci_cmd);
 }
 
-static int s2io_verify_parm(struct pci_dev *pdev, u8 *dev_intr_type)
+static int s2io_verify_parm(struct pci_dev *pdev, u8 *dev_intr_type,
+        u8 *dev_multiq)
 {
         if ((tx_fifo_num > MAX_TX_FIFOS) ||
-                (tx_fifo_num < FIFO_DEFAULT_NUM)) {
+                (tx_fifo_num < 1)) {
                 DBG_PRINT(ERR_DBG, "s2io: Requested number of tx fifos "
                         "(%d) not supported\n", tx_fifo_num);
-                tx_fifo_num =
-                        ((tx_fifo_num > MAX_TX_FIFOS)? MAX_TX_FIFOS :
-                        ((tx_fifo_num < FIFO_DEFAULT_NUM) ? FIFO_DEFAULT_NUM :
-                        tx_fifo_num));
+
+                if (tx_fifo_num < 1)
+                        tx_fifo_num = 1;
+                else
+                        tx_fifo_num = MAX_TX_FIFOS;
+
                 DBG_PRINT(ERR_DBG, "s2io: Default to %d ", tx_fifo_num);
                 DBG_PRINT(ERR_DBG, "tx fifos\n");
         }
 
+#ifndef CONFIG_NETDEVICES_MULTIQUEUE
+        if (multiq) {
+                DBG_PRINT(ERR_DBG, "s2io: Multiqueue support not enabled\n");
+                multiq = 0;
+        }
+#endif
+        if (multiq)
+                *dev_multiq = multiq;
+
+        if (tx_steering_type && (1 == tx_fifo_num)) {
+                if (tx_steering_type != TX_DEFAULT_STEERING)
+                        DBG_PRINT(ERR_DBG,
+                                "s2io: Tx steering is not supported with "
+                                "one fifo. Disabling Tx steering.\n");
+                tx_steering_type = NO_STEERING;
+        }
+
+        if ((tx_steering_type < NO_STEERING) ||
+                (tx_steering_type > TX_DEFAULT_STEERING)) {
+                DBG_PRINT(ERR_DBG, "s2io: Requested transmit steering not "
+                         "supported\n");
+                DBG_PRINT(ERR_DBG, "s2io: Disabling transmit steering\n");
+                tx_steering_type = NO_STEERING;
+        }
+
         if ( rx_ring_num > 8) {
                 DBG_PRINT(ERR_DBG, "s2io: Requested number of Rx rings not "
                          "supported\n");
@@ -7616,9 +7801,11 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         struct config_param *config;
         int mode;
         u8 dev_intr_type = intr_type;
+        u8 dev_multiq = 0;
         DECLARE_MAC_BUF(mac);
 
-        if ((ret = s2io_verify_parm(pdev, &dev_intr_type)))
+        ret = s2io_verify_parm(pdev, &dev_intr_type, &dev_multiq);
+        if (ret)
                 return ret;
 
         if ((ret = pci_enable_device(pdev))) {
@@ -7649,7 +7836,11 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 pci_disable_device(pdev);
                 return -ENODEV;
         }
-
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (dev_multiq)
+                dev = alloc_etherdev_mq(sizeof(struct s2io_nic), tx_fifo_num);
+        else
+#endif
         dev = alloc_etherdev(sizeof(struct s2io_nic));
         if (dev == NULL) {
                 DBG_PRINT(ERR_DBG, "Device allocation failed\n");
@@ -7698,17 +7889,45 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         config = &sp->config;
 
         config->napi = napi;
+        config->tx_steering_type = tx_steering_type;
 
         /* Tx side parameters. */
-        config->tx_fifo_num = tx_fifo_num;
-        for (i = 0; i < MAX_TX_FIFOS; i++) {
+        if (config->tx_steering_type == TX_PRIORITY_STEERING)
+                config->tx_fifo_num = MAX_TX_FIFOS;
+        else
+                config->tx_fifo_num = tx_fifo_num;
+
+        /* Initialize the fifos used for tx steering */
+        if (config->tx_fifo_num < 5) {
+                        if (config->tx_fifo_num  == 1)
+                                sp->total_tcp_fifos = 1;
+                        else
+                                sp->total_tcp_fifos = config->tx_fifo_num - 1;
+                        sp->udp_fifo_idx = config->tx_fifo_num - 1;
+                        sp->total_udp_fifos = 1;
+                        sp->other_fifo_idx = sp->total_tcp_fifos - 1;
+        } else {
+                sp->total_tcp_fifos = (tx_fifo_num - FIFO_UDP_MAX_NUM -
+                                                FIFO_OTHER_MAX_NUM);
+                sp->udp_fifo_idx = sp->total_tcp_fifos;
+                sp->total_udp_fifos = FIFO_UDP_MAX_NUM;
+                sp->other_fifo_idx = sp->udp_fifo_idx + FIFO_UDP_MAX_NUM;
+        }
+
+        config->multiq = dev_multiq;
+        for (i = 0; i < config->tx_fifo_num; i++) {
                 config->tx_cfg[i].fifo_len = tx_fifo_len[i];
                 config->tx_cfg[i].fifo_priority = i;
         }
 
         /* mapping the QoS priority to the configured fifos */
         for (i = 0; i < MAX_TX_FIFOS; i++)
-                config->fifo_mapping[i] = fifo_map[config->tx_fifo_num][i];
+                config->fifo_mapping[i] = fifo_map[config->tx_fifo_num - 1][i];
+
+        /* map the hashing selector table to the configured fifos */
+        for (i = 0; i < config->tx_fifo_num; i++)
+                sp->fifo_selector[i] = fifo_selector[i];
+
 
         config->tx_intr_type = TXD_INT_TYPE_UTILZ;
         for (i = 0; i < config->tx_fifo_num; i++) {
@@ -7793,6 +8012,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
         dev->vlan_rx_register = s2io_vlan_rx_register;
+        dev->vlan_rx_kill_vid = (void *)s2io_vlan_rx_kill_vid;
 
         /*
          * will use eth_mac_addr() for  dev->set_mac_address
@@ -7813,7 +8033,10 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 dev->features |= NETIF_F_UFO;
                 dev->features |= NETIF_F_HW_CSUM;
         }
-
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        if (config->multiq)
+                dev->features |= NETIF_F_MULTI_QUEUE;
+#endif
         dev->tx_timeout = &s2io_tx_watchdog;
         dev->watchdog_timeo = WATCH_DOG_TIMEOUT;
         INIT_WORK(&sp->rst_timer_task, s2io_restart_nic);
@@ -7962,6 +8185,10 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         if (napi)
                 DBG_PRINT(ERR_DBG, "%s: NAPI enabled\n", dev->name);
+
+        DBG_PRINT(ERR_DBG, "%s: Using %d Tx fifo(s)\n", dev->name,
+                sp->config.tx_fifo_num);
+
         switch(sp->config.intr_type) {
                 case INTA:
                     DBG_PRINT(ERR_DBG, "%s: Interrupt type INTA\n", dev->name);
@@ -7970,6 +8197,29 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                     DBG_PRINT(ERR_DBG, "%s: Interrupt type MSI-X\n", dev->name);
                     break;
         }
+        if (sp->config.multiq) {
+        for (i = 0; i < sp->config.tx_fifo_num; i++)
+                mac_control->fifos[i].multiq = config->multiq;
+                DBG_PRINT(ERR_DBG, "%s: Multiqueue support enabled\n",
+                        dev->name);
+        } else
+                DBG_PRINT(ERR_DBG, "%s: Multiqueue support disabled\n",
+                        dev->name);
+
+        switch (sp->config.tx_steering_type) {
+        case NO_STEERING:
+                DBG_PRINT(ERR_DBG, "%s: No steering enabled for"
+                        " transmit\n", dev->name);
+                        break;
+        case TX_PRIORITY_STEERING:
+                DBG_PRINT(ERR_DBG, "%s: Priority steering enabled for"
+                        " transmit\n", dev->name);
+                break;
+        case TX_DEFAULT_STEERING:
+                DBG_PRINT(ERR_DBG, "%s: Default steering enabled for"
+                        " transmit\n", dev->name);
+        }
+
         if (sp->lro)
                 DBG_PRINT(ERR_DBG, "%s: Large receive offload enabled\n",
                           dev->name);
@@ -8064,7 +8314,8 @@ module_init(s2io_starter);
 module_exit(s2io_closer);
 
 static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,
-                struct tcphdr **tcp, struct RxD_t *rxdp)
+                struct tcphdr **tcp, struct RxD_t *rxdp,
+                struct s2io_nic *sp)
 {
         int ip_off;
         u8 l2_type = (u8)((rxdp->Control_1 >> 37) & 0x7), ip_len;
@@ -8075,19 +8326,20 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,
                 return -1;
         }
 
-        /* TODO:
-         * By default the VLAN field in the MAC is stripped by the card, if this
-         * feature is turned off in rx_pa_cfg register, then the ip_off field
-         * has to be shifted by a further 2 bytes
-         */
-        switch (l2_type) {
-                case 0: /* DIX type */
-                case 4: /* DIX type with VLAN */
-                        ip_off = HEADER_ETHERNET_II_802_3_SIZE;
-                        break;
+        /* Checking for DIX type or DIX type with VLAN */
+        if ((l2_type == 0)
+                || (l2_type == 4)) {
+                ip_off = HEADER_ETHERNET_II_802_3_SIZE;
+                /*
+                 * If vlan stripping is disabled and the frame is VLAN tagged,
+                 * shift the offset by the VLAN header size bytes.
+                 */
+                if ((!vlan_strip_flag) &&
+                        (rxdp->Control_1 & RXD_FRAME_VLAN_TAG))
+                        ip_off += HEADER_VLAN_SIZE;
+        } else {
                 /* LLC, SNAP etc are considered non-mergeable */
-                default:
-                        return -1;
+                return -1;
         }
 
         *ip = (struct iphdr *)((u8 *)buffer + ip_off);
@@ -8114,7 +8366,7 @@ static inline int get_l4_pyld_length(struct iphdr *ip, struct tcphdr *tcp)
 }
 
 static void initiate_new_session(struct lro *lro, u8 *l2h,
-                     struct iphdr *ip, struct tcphdr *tcp, u32 tcp_pyld_len)
+        struct iphdr *ip, struct tcphdr *tcp, u32 tcp_pyld_len, u16 vlan_tag)
 {
         DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
         lro->l2h = l2h;
@@ -8125,6 +8377,7 @@ static void initiate_new_session(struct lro *lro, u8 *l2h,
         lro->sg_num = 1;
         lro->total_len = ntohs(ip->tot_len);
         lro->frags_len = 0;
+        lro->vlan_tag = vlan_tag;
         /*
          * check if we saw TCP timestamp. Other consistency checks have
          * already been done.
@@ -8256,15 +8509,16 @@ s2io_club_tcp_session(u8 *buffer, u8 **tcp, u32 *tcp_len, struct lro **lro,
         struct iphdr *ip;
         struct tcphdr *tcph;
         int ret = 0, i;
+        u16 vlan_tag = 0;
 
         if (!(ret = check_L2_lro_capable(buffer, &ip, (struct tcphdr **)tcp,
-                                         rxdp))) {
+                                         rxdp, sp))) {
                 DBG_PRINT(INFO_DBG,"IP Saddr: %x Daddr: %x\n",
                           ip->saddr, ip->daddr);
-        } else {
+        } else
                 return ret;
-        }
 
+        vlan_tag = RXD_GET_VLAN_TAG(rxdp->Control_2);
         tcph = (struct tcphdr *)*tcp;
         *tcp_len = get_l4_pyld_length(ip, tcph);
         for (i=0; i<MAX_LRO_SESSIONS; i++) {
@@ -8324,7 +8578,8 @@ s2io_club_tcp_session(u8 *buffer, u8 **tcp, u32 *tcp_len, struct lro **lro,
 
         switch (ret) {
                 case 3:
-                        initiate_new_session(*lro, buffer, ip, tcph, *tcp_len);
+                        initiate_new_session(*lro, buffer, ip, tcph, *tcp_len,
+                                                                vlan_tag);
                         break;
                 case 2:
                         update_L3L4_header(sp, *lro);
@@ -8352,15 +8607,25 @@ static void clear_lro_session(struct lro *lro)
         memset(lro, 0, lro_struct_size);
 }
 
-static void queue_rx_frame(struct sk_buff *skb)
+static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag)
 {
         struct net_device *dev = skb->dev;
+        struct s2io_nic *sp = dev->priv;
 
         skb->protocol = eth_type_trans(skb, dev);
-        if (napi)
-                netif_receive_skb(skb);
-        else
-                netif_rx(skb);
+        if (sp->vlgrp && vlan_tag
+                && (vlan_strip_flag)) {
+                /* Queueing the vlan frame to the upper layer */
+                if (sp->config.napi)
+                        vlan_hwaccel_receive_skb(skb, sp->vlgrp, vlan_tag);
+                else
+                        vlan_hwaccel_rx(skb, sp->vlgrp, vlan_tag);
+        } else {
+                if (sp->config.napi)
+                        netif_receive_skb(skb);
+                else
+                        netif_rx(skb);
+        }
 }
 
 static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 64b88eb48287..e68fdf7e4260 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -360,7 +360,10 @@ struct stat_block {
 #define MAX_TX_FIFOS 8
 #define MAX_RX_RINGS 8
 
-#define FIFO_DEFAULT_NUM        1
+#define FIFO_DEFAULT_NUM        5
+#define FIFO_UDP_MAX_NUM                        2 /* 0 - even, 1 -odd ports */
+#define FIFO_OTHER_MAX_NUM                      1
+
 
 #define MAX_RX_DESC_1  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 127 )
 #define MAX_RX_DESC_2  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 85 )
@@ -379,6 +382,8 @@ static int fifo_map[][MAX_TX_FIFOS] = {
         {0, 1, 2, 3, 4, 5, 6, 7},
 };
 
+static u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7};
+
 /* Maintains Per FIFO related information. */
 struct tx_fifo_config {
 #define MAX_AVAILABLE_TXDS      8192
@@ -431,6 +436,12 @@ struct config_param {
 /* Tx Side */
         u32 tx_fifo_num;        /*Number of Tx FIFOs */
 
+        /* 0-No steering, 1-Priority steering, 2-Default fifo map */
+#define NO_STEERING                             0
+#define TX_PRIORITY_STEERING                    0x1
+#define TX_DEFAULT_STEERING                     0x2
+        u8 tx_steering_type;
+
         u8 fifo_mapping[MAX_TX_FIFOS];
         struct tx_fifo_config tx_cfg[MAX_TX_FIFOS];     /*Per-Tx FIFO config */
         u32 max_txds;           /*Max no. of Tx buffer descriptor per TxDL */
@@ -464,6 +475,7 @@ struct config_param {
         int max_mc_addr;        /* xena=64 herc=256 */
         int max_mac_addr;       /* xena=16 herc=64 */
         int mc_start_offset;    /* xena=16 herc=64 */
+        u8 multiq;
 };
 
 /* Structure representing MAC Addrs */
@@ -534,6 +546,7 @@ struct RxD_t {
 #define RXD_OWN_XENA            s2BIT(7)
 #define RXD_T_CODE              (s2BIT(12)|s2BIT(13)|s2BIT(14)|s2BIT(15))
 #define RXD_FRAME_PROTO         vBIT(0xFFFF,24,8)
+#define RXD_FRAME_VLAN_TAG      s2BIT(24)
 #define RXD_FRAME_PROTO_IPV4    s2BIT(27)
 #define RXD_FRAME_PROTO_IPV6    s2BIT(28)
 #define RXD_FRAME_IP_FRAG       s2BIT(29)
@@ -720,6 +733,15 @@ struct fifo_info {
          * the buffers
          */
         struct tx_curr_get_info tx_curr_get_info;
+#define FIFO_QUEUE_START 0
+#define FIFO_QUEUE_STOP 1
+        int queue_state;
+
+        /* copy of sp->dev pointer */
+        struct net_device *dev;
+
+        /* copy of multiq status */
+        u8 multiq;
 
         /* Per fifo lock */
         spinlock_t tx_lock;
@@ -808,10 +830,11 @@ struct lro {
         int             sg_num;
         int             in_use;
         __be16          window;
+        u16             vlan_tag;
         u32             cur_tsval;
         __be32          cur_tsecr;
         u8              saw_ts;
-};
+} ____cacheline_aligned;
 
 /* These flags represent the devices temporary state */
 enum s2io_device_state_t
@@ -885,6 +908,27 @@ struct s2io_nic {
          */
         int rx_csum;
 
+        /* Below variables are used for fifo selection to transmit a packet */
+        u16 fifo_selector[MAX_TX_FIFOS];
+
+        /* Total fifos for tcp packets */
+        u8 total_tcp_fifos;
+
+        /*
+        * Beginning index of udp for udp packets
+        * Value will be equal to
+        * (tx_fifo_num - FIFO_UDP_MAX_NUM - FIFO_OTHER_MAX_NUM)
+        */
+        u8 udp_fifo_idx;
+
+        u8 total_udp_fifos;
+
+        /*
+         * Beginning index of fifo for all other packets
+         * Value will be equal to (tx_fifo_num - FIFO_OTHER_MAX_NUM)
+        */
+        u8 other_fifo_idx;
+
         /*  after blink, the adapter must be restored with original
          *  values.
          */
@@ -1087,7 +1131,7 @@ static int
 s2io_club_tcp_session(u8 *buffer, u8 **tcp, u32 *tcp_len, struct lro **lro,
                       struct RxD_t *rxdp, struct s2io_nic *sp);
 static void clear_lro_session(struct lro *lro);
-static void queue_rx_frame(struct sk_buff *skb);
+static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag);
 static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro);
 static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
                            struct sk_buff *skb, u32 tcp_len);
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 487f9d2ac5b4..5986cec17f19 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -88,31 +88,31 @@ static int sb1000_close(struct net_device *dev);
 
 
 /* SB1000 hardware routines to be used during open/configuration phases */
-static inline int card_wait_for_busy_clear(const int ioaddr[],
+static int card_wait_for_busy_clear(const int ioaddr[],
         const char* name);
-static inline int card_wait_for_ready(const int ioaddr[], const char* name,
+static int card_wait_for_ready(const int ioaddr[], const char* name,
         unsigned char in[]);
 static int card_send_command(const int ioaddr[], const char* name,
         const unsigned char out[], unsigned char in[]);
 
 /* SB1000 hardware routines to be used during frame rx interrupt */
-static inline int sb1000_wait_for_ready(const int ioaddr[], const char* name);
-static inline int sb1000_wait_for_ready_clear(const int ioaddr[],
+static int sb1000_wait_for_ready(const int ioaddr[], const char* name);
+static int sb1000_wait_for_ready_clear(const int ioaddr[],
         const char* name);
-static inline void sb1000_send_command(const int ioaddr[], const char* name,
+static void sb1000_send_command(const int ioaddr[], const char* name,
         const unsigned char out[]);
-static inline void sb1000_read_status(const int ioaddr[], unsigned char in[]);
-static inline void sb1000_issue_read_command(const int ioaddr[],
+static void sb1000_read_status(const int ioaddr[], unsigned char in[]);
+static void sb1000_issue_read_command(const int ioaddr[],
         const char* name);
 
 /* SB1000 commands for open/configuration */
-static inline int sb1000_reset(const int ioaddr[], const char* name);
-static inline int sb1000_check_CRC(const int ioaddr[], const char* name);
+static int sb1000_reset(const int ioaddr[], const char* name);
+static int sb1000_check_CRC(const int ioaddr[], const char* name);
 static inline int sb1000_start_get_set_command(const int ioaddr[],
         const char* name);
-static inline int sb1000_end_get_set_command(const int ioaddr[],
+static int sb1000_end_get_set_command(const int ioaddr[],
         const char* name);
-static inline int sb1000_activate(const int ioaddr[], const char* name);
+static int sb1000_activate(const int ioaddr[], const char* name);
 static int sb1000_get_firmware_version(const int ioaddr[],
         const char* name, unsigned char version[], int do_end);
 static int sb1000_get_frequency(const int ioaddr[], const char* name,
@@ -125,8 +125,8 @@ static int sb1000_set_PIDs(const int ioaddr[], const char* name,
         const short PID[]);
 
 /* SB1000 commands for frame rx interrupt */
-static inline int sb1000_rx(struct net_device *dev);
-static inline void sb1000_error_dpc(struct net_device *dev);
+static int sb1000_rx(struct net_device *dev);
+static void sb1000_error_dpc(struct net_device *dev);
 
 static const struct pnp_device_id sb1000_pnp_ids[] = {
         { "GIC1000", 0 },
@@ -250,7 +250,7 @@ static struct pnp_driver sb1000_driver = {
 static const int TimeOutJiffies = (875 * HZ) / 100;
 
 /* Card Wait For Busy Clear (cannot be used during an interrupt) */
-static inline int
+static int
 card_wait_for_busy_clear(const int ioaddr[], const char* name)
 {
         unsigned char a;
@@ -274,7 +274,7 @@ card_wait_for_busy_clear(const int ioaddr[], const char* name)
 }
 
 /* Card Wait For Ready (cannot be used during an interrupt) */
-static inline int
+static int
 card_wait_for_ready(const int ioaddr[], const char* name, unsigned char in[])
 {
         unsigned char a;
@@ -354,7 +354,7 @@ card_send_command(const int ioaddr[], const char* name,
 static const int Sb1000TimeOutJiffies = 7 * HZ;
 
 /* Card Wait For Ready (to be used during frame rx) */
-static inline int
+static int
 sb1000_wait_for_ready(const int ioaddr[], const char* name)
 {
         unsigned long timeout;
@@ -380,7 +380,7 @@ sb1000_wait_for_ready(const int ioaddr[], const char* name)
 }
 
 /* Card Wait For Ready Clear (to be used during frame rx) */
-static inline int
+static int
 sb1000_wait_for_ready_clear(const int ioaddr[], const char* name)
 {
         unsigned long timeout;
@@ -405,7 +405,7 @@ sb1000_wait_for_ready_clear(const int ioaddr[], const char* name)
 }
 
 /* Card Send Command (to be used during frame rx) */
-static inline void
+static void
 sb1000_send_command(const int ioaddr[], const char* name,
         const unsigned char out[])
 {
@@ -422,7 +422,7 @@ sb1000_send_command(const int ioaddr[], const char* name,
 }
 
 /* Card Read Status (to be used during frame rx) */
-static inline void
+static void
 sb1000_read_status(const int ioaddr[], unsigned char in[])
 {
         in[1] = inb(ioaddr[0] + 1);
@@ -434,10 +434,10 @@ sb1000_read_status(const int ioaddr[], unsigned char in[])
 }
 
 /* Issue Read Command (to be used during frame rx) */
-static inline void
+static void
 sb1000_issue_read_command(const int ioaddr[], const char* name)
 {
-        const unsigned char Command0[6] = {0x20, 0x00, 0x00, 0x01, 0x00, 0x00};
+        static const unsigned char Command0[6] = {0x20, 0x00, 0x00, 0x01, 0x00, 0x00};
 
         sb1000_wait_for_ready_clear(ioaddr, name);
         outb(0xa0, ioaddr[0] + 6);
@@ -450,12 +450,13 @@ sb1000_issue_read_command(const int ioaddr[], const char* name)
  * SB1000 commands for open/configuration
  */
 /* reset SB1000 card */
-static inline int
+static int
 sb1000_reset(const int ioaddr[], const char* name)
 {
+        static const unsigned char Command0[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         int port, status;
-        const unsigned char Command0[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};
 
         port = ioaddr[1] + 6;
         outb(0x4, port);
@@ -479,12 +480,13 @@ sb1000_reset(const int ioaddr[], const char* name)
 }
 
 /* check SB1000 firmware CRC */
-static inline int
+static int
 sb1000_check_CRC(const int ioaddr[], const char* name)
 {
+        static const unsigned char Command0[6] = {0x80, 0x1f, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         int crc, status;
-        const unsigned char Command0[6] = {0x80, 0x1f, 0x00, 0x00, 0x00, 0x00};
 
         /* check CRC */
         if ((status = card_send_command(ioaddr, name, Command0, st)))
@@ -498,32 +500,35 @@ sb1000_check_CRC(const int ioaddr[], const char* name)
 static inline int
 sb1000_start_get_set_command(const int ioaddr[], const char* name)
 {
+        static const unsigned char Command0[6] = {0x80, 0x1b, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
-        const unsigned char Command0[6] = {0x80, 0x1b, 0x00, 0x00, 0x00, 0x00};
 
         return card_send_command(ioaddr, name, Command0, st);
 }
 
-static inline int
+static int
 sb1000_end_get_set_command(const int ioaddr[], const char* name)
 {
+        static const unsigned char Command0[6] = {0x80, 0x1b, 0x02, 0x00, 0x00, 0x00};
+        static const unsigned char Command1[6] = {0x20, 0x00, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         int status;
-        const unsigned char Command0[6] = {0x80, 0x1b, 0x02, 0x00, 0x00, 0x00};
-        const unsigned char Command1[6] = {0x20, 0x00, 0x00, 0x00, 0x00, 0x00};
 
         if ((status = card_send_command(ioaddr, name, Command0, st)))
                 return status;
         return card_send_command(ioaddr, name, Command1, st);
 }
 
-static inline int
+static int
 sb1000_activate(const int ioaddr[], const char* name)
 {
+        static const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00};
+        static const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         int status;
-        const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00};
-        const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};
 
         ssleep(1);
         if ((status = card_send_command(ioaddr, name, Command0, st)))
@@ -544,9 +549,10 @@ static int
 sb1000_get_firmware_version(const int ioaddr[], const char* name,
         unsigned char version[], int do_end)
 {
+        static const unsigned char Command0[6] = {0x80, 0x23, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         int status;
-        const unsigned char Command0[6] = {0x80, 0x23, 0x00, 0x00, 0x00, 0x00};
 
         if ((status = sb1000_start_get_set_command(ioaddr, name)))
                 return status;
@@ -566,9 +572,10 @@ sb1000_get_firmware_version(const int ioaddr[], const char* name,
 static int
 sb1000_get_frequency(const int ioaddr[], const char* name, int* frequency)
 {
+        static const unsigned char Command0[6] = {0x80, 0x44, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         int status;
-        const unsigned char Command0[6] = {0x80, 0x44, 0x00, 0x00, 0x00, 0x00};
 
         udelay(1000);
         if ((status = sb1000_start_get_set_command(ioaddr, name)))
@@ -613,12 +620,13 @@ sb1000_set_frequency(const int ioaddr[], const char* name, int frequency)
 static int
 sb1000_get_PIDs(const int ioaddr[], const char* name, short PID[])
 {
+        static const unsigned char Command0[6] = {0x80, 0x40, 0x00, 0x00, 0x00, 0x00};
+        static const unsigned char Command1[6] = {0x80, 0x41, 0x00, 0x00, 0x00, 0x00};
+        static const unsigned char Command2[6] = {0x80, 0x42, 0x00, 0x00, 0x00, 0x00};
+        static const unsigned char Command3[6] = {0x80, 0x43, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         int status;
-        const unsigned char Command0[6] = {0x80, 0x40, 0x00, 0x00, 0x00, 0x00};
-        const unsigned char Command1[6] = {0x80, 0x41, 0x00, 0x00, 0x00, 0x00};
-        const unsigned char Command2[6] = {0x80, 0x42, 0x00, 0x00, 0x00, 0x00};
-        const unsigned char Command3[6] = {0x80, 0x43, 0x00, 0x00, 0x00, 0x00};
 
         udelay(1000);
         if ((status = sb1000_start_get_set_command(ioaddr, name)))
@@ -647,6 +655,8 @@ sb1000_get_PIDs(const int ioaddr[], const char* name, short PID[])
 static int
 sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[])
 {
+        static const unsigned char Command4[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
+
         unsigned char st[7];
         short p;
         int status;
@@ -654,7 +664,6 @@ sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[])
         unsigned char Command1[6] = {0x80, 0x32, 0x00, 0x00, 0x00, 0x00};
         unsigned char Command2[6] = {0x80, 0x33, 0x00, 0x00, 0x00, 0x00};
         unsigned char Command3[6] = {0x80, 0x34, 0x00, 0x00, 0x00, 0x00};
-        const unsigned char Command4[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
 
         udelay(1000);
         if ((status = sb1000_start_get_set_command(ioaddr, name)))
@@ -694,7 +703,7 @@ sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[])
 }
 
 
-static inline void
+static void
 sb1000_print_status_buffer(const char* name, unsigned char st[],
         unsigned char buffer[], int size)
 {
@@ -725,7 +734,7 @@ sb1000_print_status_buffer(const char* name, unsigned char st[],
 /* receive a single frame and assemble datagram
  * (this is the heart of the interrupt routine)
  */
-static inline int
+static int
 sb1000_rx(struct net_device *dev)
 {
 
@@ -888,14 +897,15 @@ dropped_frame:
         return -1;
 }
 
-static inline void
+static void
 sb1000_error_dpc(struct net_device *dev)
 {
+        static const unsigned char Command0[6] = {0x80, 0x26, 0x00, 0x00, 0x00, 0x00};
+
         char *name;
         unsigned char st[5];
         int ioaddr[2];
         struct sb1000_private *lp = netdev_priv(dev);
-        const unsigned char Command0[6] = {0x80, 0x26, 0x00, 0x00, 0x00, 0x00};
         const int ErrorDpcCounterInitialize = 200;
 
         ioaddr[0] = dev->base_addr;
@@ -1077,14 +1087,15 @@ sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 /* SB1000 interrupt handler. */
 static irqreturn_t sb1000_interrupt(int irq, void *dev_id)
 {
+        static const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};
+        static const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
+
         char *name;
         unsigned char st;
         int ioaddr[2];
         struct net_device *dev = dev_id;
         struct sb1000_private *lp = netdev_priv(dev);
 
-        const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};
-        const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
         const int MaxRxErrorCount = 6;
 
         ioaddr[0] = dev->base_addr;
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 7b53d658e337..888b7dec9866 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2374,7 +2374,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)
                dev->name, base, print_mac(mac, eaddr));
 
         sc->mii_bus.name = sbmac_mdio_string;
-        sc->mii_bus.id = idx;
+        snprintf(sc->mii_bus.id, MII_BUS_ID_SIZE, "%x", idx);
         sc->mii_bus.priv = sc;
         sc->mii_bus.read = sbmac_mii_read;
         sc->mii_bus.write = sbmac_mii_write;
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 15fcee55284e..f64a860029b7 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -311,7 +311,6 @@ struct sc92031_priv {
 
         /* for dev->get_stats */
         long                    rx_value;
-        struct net_device_stats stats;
 };
 
 /* I don't know which registers can be safely read; however, I can guess
@@ -421,7 +420,7 @@ static void _sc92031_tx_clear(struct net_device *dev)
 
         while (priv->tx_head - priv->tx_tail > 0) {
                 priv->tx_tail++;
-                priv->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
         }
         priv->tx_head = priv->tx_tail = 0;
 }
@@ -676,27 +675,27 @@ static void _sc92031_tx_tasklet(struct net_device *dev)
                 priv->tx_tail++;
 
                 if (tx_status & TxStatOK) {
-                        priv->stats.tx_bytes += tx_status & 0x1fff;
-                        priv->stats.tx_packets++;
+                        dev->stats.tx_bytes += tx_status & 0x1fff;
+                        dev->stats.tx_packets++;
                         /* Note: TxCarrierLost is always asserted at 100mbps. */
-                        priv->stats.collisions += (tx_status >> 22) & 0xf;
+                        dev->stats.collisions += (tx_status >> 22) & 0xf;
                 }
 
                 if (tx_status & (TxOutOfWindow | TxAborted)) {
-                        priv->stats.tx_errors++;
+                        dev->stats.tx_errors++;
 
                         if (tx_status & TxAborted)
-                                priv->stats.tx_aborted_errors++;
+                                dev->stats.tx_aborted_errors++;
 
                         if (tx_status & TxCarrierLost)
-                                priv->stats.tx_carrier_errors++;
+                                dev->stats.tx_carrier_errors++;
 
                         if (tx_status & TxOutOfWindow)
-                                priv->stats.tx_window_errors++;
+                                dev->stats.tx_window_errors++;
                 }
 
                 if (tx_status & TxUnderrun)
-                        priv->stats.tx_fifo_errors++;
+                        dev->stats.tx_fifo_errors++;
         }
 
         if (priv->tx_tail != old_tx_tail)
@@ -704,27 +703,29 @@ static void _sc92031_tx_tasklet(struct net_device *dev)
                         netif_wake_queue(dev);
 }
 
-static void _sc92031_rx_tasklet_error(u32 rx_status,
-                struct sc92031_priv *priv, unsigned rx_size)
+static void _sc92031_rx_tasklet_error(struct net_device *dev,
+                                      u32 rx_status, unsigned rx_size)
 {
         if(rx_size > (MAX_ETH_FRAME_SIZE + 4) || rx_size < 16) {
-                priv->stats.rx_errors++;
-                priv->stats.rx_length_errors++;
+                dev->stats.rx_errors++;
+                dev->stats.rx_length_errors++;
         }
 
         if (!(rx_status & RxStatesOK)) {
-                priv->stats.rx_errors++;
+                dev->stats.rx_errors++;
 
                 if (rx_status & (RxHugeFrame | RxSmallFrame))
-                        priv->stats.rx_length_errors++;
+                        dev->stats.rx_length_errors++;
 
                 if (rx_status & RxBadAlign)
-                        priv->stats.rx_frame_errors++;
+                        dev->stats.rx_frame_errors++;
 
                 if (!(rx_status & RxCRCOK))
-                        priv->stats.rx_crc_errors++;
-        } else
+                        dev->stats.rx_crc_errors++;
+        } else {
+                struct sc92031_priv *priv = netdev_priv(dev);
                 priv->rx_loss++;
+        }
 }
 
 static void _sc92031_rx_tasklet(struct net_device *dev)
@@ -783,7 +784,7 @@ static void _sc92031_rx_tasklet(struct net_device *dev)
                                 || rx_size > (MAX_ETH_FRAME_SIZE + 4)
                                 || rx_size < 16
                                 || !(rx_status & RxStatesOK))) {
-                        _sc92031_rx_tasklet_error(rx_status, priv, rx_size);
+                        _sc92031_rx_tasklet_error(dev, rx_status, rx_size);
                         break;
                 }
 
@@ -795,7 +796,7 @@ static void _sc92031_rx_tasklet(struct net_device *dev)
 
                 rx_len -= rx_size_align + 4;
 
-                skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(dev, pkt_size + NET_IP_ALIGN);
                 if (unlikely(!skb)) {
                         if (printk_ratelimit())
                                 printk(KERN_ERR "%s: Couldn't allocate a skb_buff for a packet of size %u\n",
@@ -818,11 +819,11 @@ static void _sc92031_rx_tasklet(struct net_device *dev)
                 dev->last_rx = jiffies;
                 netif_rx(skb);
 
-                priv->stats.rx_bytes += pkt_size;
-                priv->stats.rx_packets++;
+                dev->stats.rx_bytes += pkt_size;
+                dev->stats.rx_packets++;
 
                 if (rx_status & Rx_Multicast)
-                        priv->stats.multicast++;
+                        dev->stats.multicast++;
 
         next:
                 rx_ring_offset = (rx_ring_offset + rx_size_align) % RX_BUF_LEN;
@@ -835,13 +836,11 @@ static void _sc92031_rx_tasklet(struct net_device *dev)
 
 static void _sc92031_link_tasklet(struct net_device *dev)
 {
-        struct sc92031_priv *priv = netdev_priv(dev);
-
         if (_sc92031_check_media(dev))
                 netif_wake_queue(dev);
         else {
                 netif_stop_queue(dev);
-                priv->stats.tx_carrier_errors++;
+                dev->stats.tx_carrier_errors++;
         }
 }
 
@@ -866,11 +865,11 @@ static void sc92031_tasklet(unsigned long data)
                 _sc92031_rx_tasklet(dev);
 
         if (intr_status & RxOverflow)
-                priv->stats.rx_errors++;
+                dev->stats.rx_errors++;
 
         if (intr_status & TimeOut) {
-                priv->stats.rx_errors++;
-                priv->stats.rx_length_errors++;
+                dev->stats.rx_errors++;
+                dev->stats.rx_length_errors++;
         }
 
         if (intr_status & (LinkFail | LinkOK))
@@ -936,38 +935,36 @@ static struct net_device_stats *sc92031_get_stats(struct net_device *dev)
 
                 if (temp == 0xffff) {
                         priv->rx_value += temp;
-                        priv->stats.rx_fifo_errors = priv->rx_value;
-                } else {
-                        priv->stats.rx_fifo_errors = temp + priv->rx_value;
-                }
+                        dev->stats.rx_fifo_errors = priv->rx_value;
+                } else
+                        dev->stats.rx_fifo_errors = temp + priv->rx_value;
 
                 spin_unlock_bh(&priv->lock);
         }
 
-        return &priv->stats;
+        return &dev->stats;
 }
 
 static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        int err = 0;
         struct sc92031_priv *priv = netdev_priv(dev);
         void __iomem *port_base = priv->port_base;
-
         unsigned len;
         unsigned entry;
         u32 tx_status;
 
+        if (skb_padto(skb, ETH_ZLEN))
+                return NETDEV_TX_OK;
+
         if (unlikely(skb->len > TX_BUF_SIZE)) {
-                err = -EMSGSIZE;
-                priv->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 goto out;
         }
 
         spin_lock(&priv->lock);
 
         if (unlikely(!netif_carrier_ok(dev))) {
-                err = -ENOLINK;
-                priv->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 goto out_unlock;
         }
 
@@ -978,11 +975,6 @@ static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
         skb_copy_and_csum_dev(skb, priv->tx_bufs + entry * TX_BUF_SIZE);
 
         len = skb->len;
-        if (unlikely(len < ETH_ZLEN)) {
-                memset(priv->tx_bufs + entry * TX_BUF_SIZE + len,
-                                0, ETH_ZLEN - len);
-                len = ETH_ZLEN;
-        }
 
         wmb();
 
@@ -1009,7 +1001,7 @@ out_unlock:
 out:
         dev_kfree_skb(skb);
 
-        return err;
+        return NETDEV_TX_OK;
 }
 
 static int sc92031_open(struct net_device *dev)
diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile
deleted file mode 100644
index afd900d5d730..000000000000
--- a/drivers/net/sk98lin/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Makefile for the SysKonnect SK-98xx device driver.
-#
-
-
-#
-# Standalone driver params
-# SKPARAM += -DSK_KERNEL_24
-# SKPARAM += -DSK_KERNEL_24_26
-# SKPARAM += -DSK_KERNEL_26
-# SKPARAM += -DSK_KERNEL_22_24
-
-obj-$(CONFIG_SK98LIN) += sk98lin.o
-sk98lin-objs    :=      \
-                skge.o          \
-                skethtool.o     \
-                skdim.o         \
-                skaddr.o        \
-                skgehwt.o       \
-                skgeinit.o      \
-                skgepnmi.o      \
-                skgesirq.o      \
-                ski2c.o         \
-                sklm80.o        \
-                skqueue.o       \
-                skrlmt.o        \
-                sktimer.o       \
-                skvpd.o         \
-                skxmac2.o
-
-# DBGDEF =  \
-# -DDEBUG
-
-ifdef DEBUG
-DBGDEF +=  \
--DSK_DEBUG_CHKMOD=0x00000000L \
--DSK_DEBUG_CHKCAT=0x00000000L
-endif
-
-
-# **** possible debug modules for SK_DEBUG_CHKMOD *****************
-# SK_DBGMOD_MERR        0x00000001L     /* general module error indication */
-# SK_DBGMOD_HWM         0x00000002L     /* Hardware init module */
-# SK_DBGMOD_RLMT        0x00000004L     /* RLMT module */
-# SK_DBGMOD_VPD         0x00000008L     /* VPD module */
-# SK_DBGMOD_I2C         0x00000010L     /* I2C module */
-# SK_DBGMOD_PNMI        0x00000020L     /* PNMI module */
-# SK_DBGMOD_CSUM        0x00000040L     /* CSUM module */
-# SK_DBGMOD_ADDR        0x00000080L     /* ADDR module */
-# SK_DBGMOD_DRV         0x00010000L     /* DRV module */
-
-# **** possible debug categories for SK_DEBUG_CHKCAT **************
-# *** common modules ***
-# SK_DBGCAT_INIT        0x00000001L     module/driver initialization
-# SK_DBGCAT_CTRL        0x00000002L     controlling: add/rmv MCA/MAC and other controls (IOCTL)
-# SK_DBGCAT_ERR         0x00000004L     error handling paths
-# SK_DBGCAT_TX          0x00000008L     transmit path
-# SK_DBGCAT_RX          0x00000010L     receive path
-# SK_DBGCAT_IRQ         0x00000020L     general IRQ handling
-# SK_DBGCAT_QUEUE       0x00000040L     any queue management
-# SK_DBGCAT_DUMP        0x00000080L     large data output e.g. hex dump
-# SK_DBGCAT_FATAL       0x00000100L     large data output e.g. hex dump
-
-# *** driver (file skge.c) ***
-# SK_DBGCAT_DRV_ENTRY           0x00010000      entry points
-# SK_DBGCAT_DRV_???             0x00020000      not used
-# SK_DBGCAT_DRV_MCA             0x00040000      multicast
-# SK_DBGCAT_DRV_TX_PROGRESS     0x00080000      tx path
-# SK_DBGCAT_DRV_RX_PROGRESS     0x00100000      rx path
-# SK_DBGCAT_DRV_PROGRESS        0x00200000      general runtime
-# SK_DBGCAT_DRV_???             0x00400000      not used
-# SK_DBGCAT_DRV_PROM            0x00800000      promiscuous mode
-# SK_DBGCAT_DRV_TX_FRAME        0x01000000      display tx frames
-# SK_DBGCAT_DRV_ERROR           0x02000000      error conditions
-# SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources
-# SK_DBGCAT_DRV_EVENT           0x08000000      driver events
-
-EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
-
-clean:
-        rm -f core *.o *.a *.s
-
-
-
-
-
-
diff --git a/drivers/net/sk98lin/h/lm80.h b/drivers/net/sk98lin/h/lm80.h
deleted file mode 100644
index 4e2dbbf78000..000000000000
--- a/drivers/net/sk98lin/h/lm80.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/******************************************************************************
- *
- * Name:        lm80.h  
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.6 $
- * Date:        $Date: 2003/05/13 17:26:52 $
- * Purpose:     Contains all defines for the LM80 Chip
- *              (National Semiconductor).
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef __INC_LM80_H
-#define __INC_LM80_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-/* defines ********************************************************************/
-
-/*
- * LM80 register definition
- *
- * All registers are 8 bit wide
- */
-#define LM80_CFG                        0x00    /* Configuration Register */
-#define LM80_ISRC_1                     0x01    /* Interrupt Status Register 1 */
-#define LM80_ISRC_2                     0x02    /* Interrupt Status Register 2 */
-#define LM80_IMSK_1                     0x03    /* Interrupt Mask Register 1 */
-#define LM80_IMSK_2                     0x04    /* Interrupt Mask Register 2 */
-#define LM80_FAN_CTRL           0x05    /* Fan Devisor/RST#/OS# Register */
-#define LM80_TEMP_CTRL          0x06    /* OS# Config, Temp Res. Reg */
-        /* 0x07 - 0x1f reserved */
-        /* current values */
-#define LM80_VT0_IN                     0x20    /* current Voltage 0 value */
-#define LM80_VT1_IN                     0x21    /* current Voltage 1 value */
-#define LM80_VT2_IN                     0x22    /* current Voltage 2 value */
-#define LM80_VT3_IN                     0x23    /* current Voltage 3 value */
-#define LM80_VT4_IN                     0x24    /* current Voltage 4 value */
-#define LM80_VT5_IN                     0x25    /* current Voltage 5 value */
-#define LM80_VT6_IN                     0x26    /* current Voltage 6 value */
-#define LM80_TEMP_IN            0x27    /* current Temperature value */
-#define LM80_FAN1_IN            0x28    /* current Fan 1 count */
-#define LM80_FAN2_IN            0x29    /* current Fan 2 count */
-        /* limit values */
-#define LM80_VT0_HIGH_LIM       0x2a    /* high limit val for Voltage 0 */
-#define LM80_VT0_LOW_LIM        0x2b    /* low limit val for Voltage 0 */
-#define LM80_VT1_HIGH_LIM       0x2c    /* high limit val for Voltage 1 */
-#define LM80_VT1_LOW_LIM        0x2d    /* low limit val for Voltage 1 */
-#define LM80_VT2_HIGH_LIM       0x2e    /* high limit val for Voltage 2 */
-#define LM80_VT2_LOW_LIM        0x2f    /* low limit val for Voltage 2 */
-#define LM80_VT3_HIGH_LIM       0x30    /* high limit val for Voltage 3 */
-#define LM80_VT3_LOW_LIM        0x31    /* low limit val for Voltage 3 */
-#define LM80_VT4_HIGH_LIM       0x32    /* high limit val for Voltage 4 */
-#define LM80_VT4_LOW_LIM        0x33    /* low limit val for Voltage 4 */
-#define LM80_VT5_HIGH_LIM       0x34    /* high limit val for Voltage 5 */
-#define LM80_VT5_LOW_LIM        0x35    /* low limit val for Voltage 5 */
-#define LM80_VT6_HIGH_LIM       0x36    /* high limit val for Voltage 6 */
-#define LM80_VT6_LOW_LIM        0x37    /* low limit val for Voltage 6 */
-#define LM80_THOT_LIM_UP        0x38    /* hot temperature limit (high) */
-#define LM80_THOT_LIM_LO        0x39    /* hot temperature limit (low) */
-#define LM80_TOS_LIM_UP         0x3a    /* OS temperature limit (high) */
-#define LM80_TOS_LIM_LO         0x3b    /* OS temperature limit (low) */
-#define LM80_FAN1_COUNT_LIM     0x3c    /* Fan 1 count limit (high) */
-#define LM80_FAN2_COUNT_LIM     0x3d    /* Fan 2 count limit (low) */
-        /* 0x3e - 0x3f reserved */
-
-/*
- * LM80 bit definitions
- */
-
-/*      LM80_CFG                Configuration Register */
-#define LM80_CFG_START          (1<<0)  /* start monitoring operation */
-#define LM80_CFG_INT_ENA        (1<<1)  /* enables the INT# Interrupt output */
-#define LM80_CFG_INT_POL        (1<<2)  /* INT# pol: 0 act low, 1 act high */
-#define LM80_CFG_INT_CLR        (1<<3)  /* disables INT#/RST_OUT#/OS# outputs */
-#define LM80_CFG_RESET          (1<<4)  /* signals a reset */
-#define LM80_CFG_CHASS_CLR      (1<<5)  /* clears Chassis Intrusion (CI) pin */
-#define LM80_CFG_GPO            (1<<6)  /* drives the GPO# pin */
-#define LM80_CFG_INIT           (1<<7)  /* restore power on defaults */
-
-/*      LM80_ISRC_1             Interrupt Status Register 1 */
-/*      LM80_IMSK_1             Interrupt Mask Register 1 */
-#define LM80_IS_VT0                     (1<<0)  /* limit exceeded for Voltage 0 */
-#define LM80_IS_VT1                     (1<<1)  /* limit exceeded for Voltage 1 */
-#define LM80_IS_VT2                     (1<<2)  /* limit exceeded for Voltage 2 */
-#define LM80_IS_VT3                     (1<<3)  /* limit exceeded for Voltage 3 */
-#define LM80_IS_VT4                     (1<<4)  /* limit exceeded for Voltage 4 */
-#define LM80_IS_VT5                     (1<<5)  /* limit exceeded for Voltage 5 */
-#define LM80_IS_VT6                     (1<<6)  /* limit exceeded for Voltage 6 */
-#define LM80_IS_INT_IN          (1<<7)  /* state of INT_IN# */
-
-/*      LM80_ISRC_2             Interrupt Status Register 2 */
-/*      LM80_IMSK_2             Interrupt Mask Register 2 */
-#define LM80_IS_TEMP            (1<<0)  /* HOT temperature limit exceeded */
-#define LM80_IS_BTI                     (1<<1)  /* state of BTI# pin */
-#define LM80_IS_FAN1            (1<<2)  /* count limit exceeded for Fan 1 */
-#define LM80_IS_FAN2            (1<<3)  /* count limit exceeded for Fan 2 */
-#define LM80_IS_CI                      (1<<4)  /* Chassis Intrusion occured */
-#define LM80_IS_OS                      (1<<5)  /* OS temperature limit exceeded */
-        /* bit 6 and 7 are reserved in LM80_ISRC_2 */
-#define LM80_IS_HT_IRQ_MD       (1<<6)  /* Hot temperature interrupt mode */
-#define LM80_IS_OT_IRQ_MD       (1<<7)  /* OS temperature interrupt mode */
-
-/*      LM80_FAN_CTRL           Fan Devisor/RST#/OS# Register */
-#define LM80_FAN1_MD_SEL        (1<<0)  /* Fan 1 mode select */
-#define LM80_FAN2_MD_SEL        (1<<1)  /* Fan 2 mode select */
-#define LM80_FAN1_PRM_CTL       (3<<2)  /* Fan 1 speed control */
-#define LM80_FAN2_PRM_CTL       (3<<4)  /* Fan 2 speed control */
-#define LM80_FAN_OS_ENA         (1<<6)  /* enable OS mode on RST_OUT#/OS# pins*/
-#define LM80_FAN_RST_ENA        (1<<7)  /* sets RST_OUT#/OS# pins in RST mode */
-
-/*      LM80_TEMP_CTRL          OS# Config, Temp Res. Reg */
-#define LM80_TEMP_OS_STAT       (1<<0)  /* mirrors the state of RST_OUT#/OS# */
-#define LM80_TEMP_OS_POL        (1<<1)  /* select OS# polarity */
-#define LM80_TEMP_OS_MODE       (1<<2)  /* selects Interrupt mode */
-#define LM80_TEMP_RES           (1<<3)  /* selects 9 or 11 bit temp resulution*/
-#define LM80_TEMP_LSB           (0xf<<4)/* 4 LSBs of 11 bit temp data */
-#define LM80_TEMP_LSB_9         (1<<7)  /* LSB of 9 bit temperature data */
-
-        /* 0x07 - 0x1f reserved */
-/*      LM80_VT0_IN             current Voltage 0 value */
-/*      LM80_VT1_IN             current Voltage 1 value */
-/*      LM80_VT2_IN             current Voltage 2 value */
-/*      LM80_VT3_IN             current Voltage 3 value */
-/*      LM80_VT4_IN             current Voltage 4 value */
-/*      LM80_VT5_IN             current Voltage 5 value */
-/*      LM80_VT6_IN             current Voltage 6 value */
-/*      LM80_TEMP_IN            current temperature value */
-/*      LM80_FAN1_IN            current Fan 1 count */
-/*      LM80_FAN2_IN            current Fan 2 count */
-/*      LM80_VT0_HIGH_LIM       high limit val for Voltage 0 */
-/*      LM80_VT0_LOW_LIM        low limit val for Voltage 0 */
-/*      LM80_VT1_HIGH_LIM       high limit val for Voltage 1 */
-/*      LM80_VT1_LOW_LIM        low limit val for Voltage 1 */
-/*      LM80_VT2_HIGH_LIM       high limit val for Voltage 2 */
-/*      LM80_VT2_LOW_LIM        low limit val for Voltage 2 */
-/*      LM80_VT3_HIGH_LIM       high limit val for Voltage 3 */
-/*      LM80_VT3_LOW_LIM        low limit val for Voltage 3 */
-/*      LM80_VT4_HIGH_LIM       high limit val for Voltage 4 */
-/*      LM80_VT4_LOW_LIM        low limit val for Voltage 4 */
-/*      LM80_VT5_HIGH_LIM       high limit val for Voltage 5 */
-/*      LM80_VT5_LOW_LIM        low limit val for Voltage 5 */
-/*      LM80_VT6_HIGH_LIM       high limit val for Voltage 6 */
-/*      LM80_VT6_LOW_LIM        low limit val for Voltage 6 */
-/*      LM80_THOT_LIM_UP        hot temperature limit (high) */
-/*      LM80_THOT_LIM_LO        hot temperature limit (low) */
-/*      LM80_TOS_LIM_UP         OS temperature limit (high) */
-/*      LM80_TOS_LIM_LO         OS temperature limit (low) */
-/*      LM80_FAN1_COUNT_LIM     Fan 1 count limit (high) */
-/*      LM80_FAN2_COUNT_LIM     Fan 2 count limit (low) */
-        /* 0x3e - 0x3f reserved */
-
-#define LM80_ADDR               0x28    /* LM80 default addr */
-
-/* typedefs *******************************************************************/
-
-
-/* function prototypes ********************************************************/
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* __INC_LM80_H */
diff --git a/drivers/net/sk98lin/h/skaddr.h b/drivers/net/sk98lin/h/skaddr.h
deleted file mode 100644
index 423ad063d09b..000000000000
--- a/drivers/net/sk98lin/h/skaddr.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/******************************************************************************
- *
- * Name:        skaddr.h
- * Project:     Gigabit Ethernet Adapters, ADDR-Modul
- * Version:     $Revision: 1.29 $
- * Date:        $Date: 2003/05/13 16:57:24 $
- * Purpose:     Header file for Address Management (MC, UC, Prom).
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * This module is intended to manage multicast addresses and promiscuous mode
- * on GEnesis adapters.
- *
- * Include File Hierarchy:
- *
- *      "skdrv1st.h"
- *      ...
- *      "sktypes.h"
- *      "skqueue.h"
- *      "skaddr.h"
- *      ...
- *      "skdrv2nd.h"
- *
- ******************************************************************************/
-
-#ifndef __INC_SKADDR_H
-#define __INC_SKADDR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* cplusplus */
-
-/* defines ********************************************************************/
-
-#define SK_MAC_ADDR_LEN                         6       /* Length of MAC address. */
-#define SK_MAX_ADDRS                            14      /* #Addrs for exact match. */
-
-/* ----- Common return values ----- */
-
-#define SK_ADDR_SUCCESS                         0       /* Function returned successfully. */
-#define SK_ADDR_ILLEGAL_PORT                    100     /* Port number too high. */
-#define SK_ADDR_TOO_EARLY                       101     /* Function called too early. */
-
-/* ----- Clear/Add flag bits ----- */
-
-#define SK_ADDR_PERMANENT                       1       /* RLMT Address */
-
-/* ----- Additional Clear flag bits ----- */
-
-#define SK_MC_SW_ONLY                           2       /* Do not update HW when clearing. */
-
-/* ----- Override flag bits ----- */
-
-#define SK_ADDR_LOGICAL_ADDRESS         0
-#define SK_ADDR_VIRTUAL_ADDRESS         (SK_ADDR_LOGICAL_ADDRESS)       /* old */
-#define SK_ADDR_PHYSICAL_ADDRESS        1
-#define SK_ADDR_CLEAR_LOGICAL           2
-#define SK_ADDR_SET_LOGICAL                     4
-
-/* ----- Override return values ----- */
-
-#define SK_ADDR_OVERRIDE_SUCCESS        (SK_ADDR_SUCCESS)
-#define SK_ADDR_DUPLICATE_ADDRESS       1
-#define SK_ADDR_MULTICAST_ADDRESS       2
-
-/* ----- Partitioning of excact match table ----- */
-
-#define SK_ADDR_EXACT_MATCHES           16      /* #Exact match entries. */
-
-#define SK_ADDR_FIRST_MATCH_RLMT        1
-#define SK_ADDR_LAST_MATCH_RLMT         2
-#define SK_ADDR_FIRST_MATCH_DRV         3
-#define SK_ADDR_LAST_MATCH_DRV          (SK_ADDR_EXACT_MATCHES - 1)
-
-/* ----- SkAddrMcAdd/SkAddrMcUpdate return values ----- */
-
-#define SK_MC_FILTERING_EXACT           0       /* Exact filtering. */
-#define SK_MC_FILTERING_INEXACT         1       /* Inexact filtering. */
-
-/* ----- Additional SkAddrMcAdd return values ----- */
-
-#define SK_MC_ILLEGAL_ADDRESS           2       /* Illegal address. */
-#define SK_MC_ILLEGAL_PORT                      3       /* Illegal port (not the active one). */
-#define SK_MC_RLMT_OVERFLOW                     4       /* Too many RLMT mc addresses. */
-
-/* Promiscuous mode bits ----- */
-
-#define SK_PROM_MODE_NONE                       0       /* Normal receive. */
-#define SK_PROM_MODE_LLC                        1       /* Receive all LLC frames. */
-#define SK_PROM_MODE_ALL_MC                     2       /* Receive all multicast frames. */
-/* #define SK_PROM_MODE_NON_LLC         4 */    /* Receive all non-LLC frames. */
-
-/* Macros */
-
-#ifdef OLD_STUFF
-#ifndef SK_ADDR_EQUAL
-/*
- * "&" instead of "&&" allows better optimization on IA-64.
- * The replacement is safe here, as all bytes exist.
- */
-#ifndef SK_ADDR_DWORD_COMPARE
-#define SK_ADDR_EQUAL(A1,A2)    ( \
-        (((SK_U8 *)(A1))[5] == ((SK_U8 *)(A2))[5]) & \
-        (((SK_U8 *)(A1))[4] == ((SK_U8 *)(A2))[4]) & \
-        (((SK_U8 *)(A1))[3] == ((SK_U8 *)(A2))[3]) & \
-        (((SK_U8 *)(A1))[2] == ((SK_U8 *)(A2))[2]) & \
-        (((SK_U8 *)(A1))[1] == ((SK_U8 *)(A2))[1]) & \
-        (((SK_U8 *)(A1))[0] == ((SK_U8 *)(A2))[0]))
-#else   /* SK_ADDR_DWORD_COMPARE */
-#define SK_ADDR_EQUAL(A1,A2)    ( \
-        (*(SK_U32 *)&(((SK_U8 *)(A1))[2]) == *(SK_U32 *)&(((SK_U8 *)(A2))[2])) & \
-        (*(SK_U32 *)&(((SK_U8 *)(A1))[0]) == *(SK_U32 *)&(((SK_U8 *)(A2))[0])))
-#endif  /* SK_ADDR_DWORD_COMPARE */
-#endif  /* SK_ADDR_EQUAL */
-#endif /* 0 */
-
-#ifndef SK_ADDR_EQUAL
-#ifndef SK_ADDR_DWORD_COMPARE
-#define SK_ADDR_EQUAL(A1,A2)    ( \
-        (((SK_U8 SK_FAR *)(A1))[5] == ((SK_U8 SK_FAR *)(A2))[5]) & \
-        (((SK_U8 SK_FAR *)(A1))[4] == ((SK_U8 SK_FAR *)(A2))[4]) & \
-        (((SK_U8 SK_FAR *)(A1))[3] == ((SK_U8 SK_FAR *)(A2))[3]) & \
-        (((SK_U8 SK_FAR *)(A1))[2] == ((SK_U8 SK_FAR *)(A2))[2]) & \
-        (((SK_U8 SK_FAR *)(A1))[1] == ((SK_U8 SK_FAR *)(A2))[1]) & \
-        (((SK_U8 SK_FAR *)(A1))[0] == ((SK_U8 SK_FAR *)(A2))[0]))
-#else   /* SK_ADDR_DWORD_COMPARE */
-#define SK_ADDR_EQUAL(A1,A2)    ( \
-        (*(SK_U16 SK_FAR *)&(((SK_U8 SK_FAR *)(A1))[4]) == \
-        *(SK_U16 SK_FAR *)&(((SK_U8 SK_FAR *)(A2))[4])) && \
-        (*(SK_U32 SK_FAR *)&(((SK_U8 SK_FAR *)(A1))[0]) == \
-        *(SK_U32 SK_FAR *)&(((SK_U8 SK_FAR *)(A2))[0])))
-#endif  /* SK_ADDR_DWORD_COMPARE */
-#endif  /* SK_ADDR_EQUAL */
-
-/* typedefs *******************************************************************/
-
-typedef struct s_MacAddr {
-        SK_U8   a[SK_MAC_ADDR_LEN];
-} SK_MAC_ADDR;
-
-
-/* SK_FILTER is used to ensure alignment of the filter. */
-typedef union s_InexactFilter {
-        SK_U8   Bytes[8];
-        SK_U64  Val;    /* Dummy entry for alignment only. */
-} SK_FILTER64;
-
-
-typedef struct s_AddrNet SK_ADDR_NET;
-
-
-typedef struct s_AddrPort {
-
-/* ----- Public part (read-only) ----- */
-
-        SK_MAC_ADDR     CurrentMacAddress;      /* Current physical MAC Address. */
-        SK_MAC_ADDR     PermanentMacAddress;    /* Permanent physical MAC Address. */
-        int             PromMode;               /* Promiscuous Mode. */
-
-/* ----- Private part ----- */
-
-        SK_MAC_ADDR     PreviousMacAddress;     /* Prev. phys. MAC Address. */
-        SK_BOOL         CurrentMacAddressSet;   /* CurrentMacAddress is set. */
-        SK_U8           Align01;
-
-        SK_U32          FirstExactMatchRlmt;
-        SK_U32          NextExactMatchRlmt;
-        SK_U32          FirstExactMatchDrv;
-        SK_U32          NextExactMatchDrv;
-        SK_MAC_ADDR     Exact[SK_ADDR_EXACT_MATCHES];
-        SK_FILTER64     InexactFilter;                  /* For 64-bit hash register. */
-        SK_FILTER64     InexactRlmtFilter;              /* For 64-bit hash register. */
-        SK_FILTER64     InexactDrvFilter;               /* For 64-bit hash register. */
-} SK_ADDR_PORT;
-
-
-struct s_AddrNet {
-/* ----- Public part (read-only) ----- */
-
-        SK_MAC_ADDR             CurrentMacAddress;      /* Logical MAC Address. */
-        SK_MAC_ADDR             PermanentMacAddress;    /* Logical MAC Address. */
-
-/* ----- Private part ----- */
-
-        SK_U32                  ActivePort;             /* View of module ADDR. */
-        SK_BOOL                 CurrentMacAddressSet;   /* CurrentMacAddress is set. */
-        SK_U8                   Align01;
-        SK_U16                  Align02;
-};
-
-
-typedef struct s_Addr {
-
-/* ----- Public part (read-only) ----- */
-
-        SK_ADDR_NET             Net[SK_MAX_NETS];
-        SK_ADDR_PORT    Port[SK_MAX_MACS];
-
-/* ----- Private part ----- */
-} SK_ADDR;
-
-/* function prototypes ********************************************************/
-
-#ifndef SK_KR_PROTO
-
-/* Functions provided by SkAddr */
-
-/* ANSI/C++ compliant function prototypes */
-
-extern  int     SkAddrInit(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int     Level);
-
-extern  int     SkAddrMcClear(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        SK_U32  PortNumber,
-        int     Flags);
-
-extern  int     SkAddrMcAdd(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        SK_U32          PortNumber,
-        SK_MAC_ADDR     *pMc,
-        int             Flags);
-
-extern  int     SkAddrMcUpdate(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        SK_U32  PortNumber);
-
-extern  int     SkAddrOverride(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        SK_U32          PortNumber,
-        SK_MAC_ADDR     SK_FAR *pNewAddr,
-        int             Flags);
-
-extern  int     SkAddrPromiscuousChange(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        SK_U32  PortNumber,
-        int     NewPromMode);
-
-#ifndef SK_SLIM
-extern  int     SkAddrSwap(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        SK_U32  FromPortNumber,
-        SK_U32  ToPortNumber);
-#endif
-
-#else   /* defined(SK_KR_PROTO)) */
-
-/* Non-ANSI/C++ compliant function prototypes */
-
-#error KR-style prototypes are not yet provided.
-
-#endif  /* defined(SK_KR_PROTO)) */
-
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* __INC_SKADDR_H */
diff --git a/drivers/net/sk98lin/h/skcsum.h b/drivers/net/sk98lin/h/skcsum.h
deleted file mode 100644
index 6e256bd9a28c..000000000000
--- a/drivers/net/sk98lin/h/skcsum.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/******************************************************************************
- *
- * Name:        skcsum.h
- * Project:     GEnesis - SysKonnect SK-NET Gigabit Ethernet (SK-98xx)
- * Version:     $Revision: 1.10 $
- * Date:        $Date: 2003/08/20 13:59:57 $
- * Purpose:     Store/verify Internet checksum in send/receive packets.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2001 SysKonnect GmbH.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * Public header file for the "GEnesis" common module "CSUM".
- *
- * "GEnesis" is an abbreviation of "Gigabit Ethernet Network System in Silicon"
- * and is the code name of this SysKonnect project.
- *
- * Compilation Options:
- *
- *      SK_USE_CSUM - Define if CSUM is to be used. Otherwise, CSUM will be an
- *      empty module.
- *
- *      SKCS_OVERWRITE_PROTO - Define to overwrite the default protocol id
- *      definitions. In this case, all SKCS_PROTO_xxx definitions must be made
- *      external.
- *
- *      SKCS_OVERWRITE_STATUS - Define to overwrite the default return status
- *      definitions. In this case, all SKCS_STATUS_xxx definitions must be made
- *      external.
- *
- * Include File Hierarchy:
- *
- *      "h/skcsum.h"
- *       "h/sktypes.h"
- *       "h/skqueue.h"
- *
- ******************************************************************************/
-
-#ifndef __INC_SKCSUM_H
-#define __INC_SKCSUM_H
-
-#include "h/sktypes.h"
-#include "h/skqueue.h"
-
-/* defines ********************************************************************/
-
-/*
- * Define the default bit flags for 'SKCS_PACKET_INFO.ProtocolFlags'  if no user
- * overwrite.
- */
-#ifndef SKCS_OVERWRITE_PROTO    /* User overwrite? */
-#define SKCS_PROTO_IP   0x1     /* IP (Internet Protocol version 4) */
-#define SKCS_PROTO_TCP  0x2     /* TCP (Transmission Control Protocol) */
-#define SKCS_PROTO_UDP  0x4     /* UDP (User Datagram Protocol) */
-
-/* Indices for protocol statistics. */
-#define SKCS_PROTO_STATS_IP     0
-#define SKCS_PROTO_STATS_UDP    1
-#define SKCS_PROTO_STATS_TCP    2
-#define SKCS_NUM_PROTOCOLS      3       /* Number of supported protocols. */
-#endif  /* !SKCS_OVERWRITE_PROTO */
-
-/*
- * Define the default SKCS_STATUS type and values if no user overwrite.
- *
- *      SKCS_STATUS_UNKNOWN_IP_VERSION - Not an IP v4 frame.
- *      SKCS_STATUS_IP_CSUM_ERROR - IP checksum error.
- *      SKCS_STATUS_IP_CSUM_ERROR_TCP - IP checksum error in TCP frame.
- *      SKCS_STATUS_IP_CSUM_ERROR_UDP - IP checksum error in UDP frame
- *      SKCS_STATUS_IP_FRAGMENT - IP fragment (IP checksum ok).
- *      SKCS_STATUS_IP_CSUM_OK - IP checksum ok (not a TCP or UDP frame).
- *      SKCS_STATUS_TCP_CSUM_ERROR - TCP checksum error (IP checksum ok).
- *      SKCS_STATUS_UDP_CSUM_ERROR - UDP checksum error (IP checksum ok).
- *      SKCS_STATUS_TCP_CSUM_OK - IP and TCP checksum ok.
- *      SKCS_STATUS_UDP_CSUM_OK - IP and UDP checksum ok.
- *      SKCS_STATUS_IP_CSUM_OK_NO_UDP - IP checksum OK and no UDP checksum. 
- */
-#ifndef SKCS_OVERWRITE_STATUS   /* User overwrite? */
-#define SKCS_STATUS     int     /* Define status type. */
-
-#define SKCS_STATUS_UNKNOWN_IP_VERSION  1
-#define SKCS_STATUS_IP_CSUM_ERROR               2
-#define SKCS_STATUS_IP_FRAGMENT                 3
-#define SKCS_STATUS_IP_CSUM_OK                  4
-#define SKCS_STATUS_TCP_CSUM_ERROR              5
-#define SKCS_STATUS_UDP_CSUM_ERROR              6
-#define SKCS_STATUS_TCP_CSUM_OK                 7
-#define SKCS_STATUS_UDP_CSUM_OK                 8
-/* needed for Microsoft */
-#define SKCS_STATUS_IP_CSUM_ERROR_UDP   9
-#define SKCS_STATUS_IP_CSUM_ERROR_TCP   10
-/* UDP checksum may be omitted */
-#define SKCS_STATUS_IP_CSUM_OK_NO_UDP   11
-#endif  /* !SKCS_OVERWRITE_STATUS */
-
-/* Clear protocol statistics event. */
-#define SK_CSUM_EVENT_CLEAR_PROTO_STATS 1
-
-/*
- * Add two values in one's complement.
- *
- * Note: One of the two input values may be "longer" than 16-bit, but then the
- * resulting sum may be 17 bits long. In this case, add zero to the result using
- * SKCS_OC_ADD() again.
- *
- *      Result = Value1 + Value2
- */
-#define SKCS_OC_ADD(Result, Value1, Value2) {                           \
-        unsigned long Sum;                                              \
-                                                                        \
-        Sum = (unsigned long) (Value1) + (unsigned long) (Value2);      \
-        /* Add-in any carry. */                                         \
-        (Result) = (Sum & 0xffff) + (Sum >> 16);                        \
-}
-
-/*
- * Subtract two values in one's complement.
- *
- *      Result = Value1 - Value2
- */
-#define SKCS_OC_SUB(Result, Value1, Value2)     \
-        SKCS_OC_ADD((Result), (Value1), ~(Value2) & 0xffff)
-
-/* typedefs *******************************************************************/
-
-/*
- * SKCS_PROTO_STATS - The CSUM protocol statistics structure.
- *
- * There is one instance of this structure for each protocol supported.
- */
-typedef struct s_CsProtocolStatistics {
-        SK_U64 RxOkCts;         /* Receive checksum ok. */
-        SK_U64 RxUnableCts;     /* Unable to verify receive checksum. */
-        SK_U64 RxErrCts;        /* Receive checksum error. */
-        SK_U64 TxOkCts;         /* Transmit checksum ok. */
-        SK_U64 TxUnableCts;     /* Unable to calculate checksum in hw. */
-} SKCS_PROTO_STATS;
-
-/*
- * s_Csum - The CSUM module context structure.
- */
-typedef struct s_Csum {
-        /* Enabled receive SK_PROTO_XXX bit flags. */
-        unsigned ReceiveFlags[SK_MAX_NETS];
-#ifdef TX_CSUM
-        unsigned TransmitFlags[SK_MAX_NETS];
-#endif /* TX_CSUM */
-
-        /* The protocol statistics structure; one per supported protocol. */
-        SKCS_PROTO_STATS ProtoStats[SK_MAX_NETS][SKCS_NUM_PROTOCOLS];
-} SK_CSUM;
-
-/*
- * SKCS_PACKET_INFO - The packet information structure.
- */
-typedef struct s_CsPacketInfo {
-        /* Bit field specifiying the desired/found protocols. */
-        unsigned ProtocolFlags;
-
-        /* Length of complete IP header, including any option fields. */
-        unsigned IpHeaderLength;
-
-        /* IP header checksum. */
-        unsigned IpHeaderChecksum;
-
-        /* TCP/UDP pseudo header checksum. */
-        unsigned PseudoHeaderChecksum;
-} SKCS_PACKET_INFO;
-
-/* function prototypes ********************************************************/
-
-#ifndef SK_CS_CALCULATE_CHECKSUM
-extern unsigned SkCsCalculateChecksum(
-        void            *pData,
-        unsigned        Length);
-#endif /* SK_CS_CALCULATE_CHECKSUM */
-
-extern int SkCsEvent(
-        SK_AC           *pAc,
-        SK_IOC          Ioc,
-        SK_U32          Event,
-        SK_EVPARA       Param);
-
-extern SKCS_STATUS SkCsGetReceiveInfo(
-        SK_AC           *pAc,
-        void            *pIpHeader,
-        unsigned        Checksum1,
-        unsigned        Checksum2,
-        int                     NetNumber);
-
-extern void SkCsSetReceiveFlags(
-        SK_AC           *pAc,
-        unsigned        ReceiveFlags,
-        unsigned        *pChecksum1Offset,
-        unsigned        *pChecksum2Offset,
-        int                     NetNumber);
-
-#endif  /* __INC_SKCSUM_H */
diff --git a/drivers/net/sk98lin/h/skdebug.h b/drivers/net/sk98lin/h/skdebug.h
deleted file mode 100644
index 3cba171d74b2..000000000000
--- a/drivers/net/sk98lin/h/skdebug.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- *
- * Name:        skdebug.h
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.14 $
- * Date:        $Date: 2003/05/13 17:26:00 $
- * Purpose:     SK specific DEBUG support
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef __INC_SKDEBUG_H
-#define __INC_SKDEBUG_H
-
-#ifdef  DEBUG
-#ifndef SK_DBG_MSG
-#define SK_DBG_MSG(pAC,comp,cat,arg) \
-                if ( ((comp) & SK_DBG_CHKMOD(pAC)) &&   \
-                      ((cat) & SK_DBG_CHKCAT(pAC)) ) {  \
-                        SK_DBG_PRINTF arg ;             \
-                }
-#endif
-#else
-#define SK_DBG_MSG(pAC,comp,lev,arg)
-#endif
-
-/* PLS NOTE:
- * =========
- * Due to any restrictions of kernel printf routines do not use other
- * format identifiers as: %x %d %c %s .
- * Never use any combined format identifiers such as: %lx %ld in your
- * printf - argument (arg) because some OS specific kernel printfs may
- * only support some basic identifiers.
- */
-
-/* Debug modules */
-
-#define SK_DBGMOD_MERR  0x00000001L     /* general module error indication */
-#define SK_DBGMOD_HWM   0x00000002L     /* Hardware init module */
-#define SK_DBGMOD_RLMT  0x00000004L     /* RLMT module */
-#define SK_DBGMOD_VPD   0x00000008L     /* VPD module */
-#define SK_DBGMOD_I2C   0x00000010L     /* I2C module */
-#define SK_DBGMOD_PNMI  0x00000020L     /* PNMI module */
-#define SK_DBGMOD_CSUM  0x00000040L     /* CSUM module */
-#define SK_DBGMOD_ADDR  0x00000080L     /* ADDR module */
-#define SK_DBGMOD_PECP  0x00000100L     /* PECP module */
-#define SK_DBGMOD_POWM  0x00000200L     /* Power Management module */
-
-/* Debug events */
-
-#define SK_DBGCAT_INIT  0x00000001L     /* module/driver initialization */
-#define SK_DBGCAT_CTRL  0x00000002L     /* controlling devices */
-#define SK_DBGCAT_ERR   0x00000004L     /* error handling paths */
-#define SK_DBGCAT_TX    0x00000008L     /* transmit path */
-#define SK_DBGCAT_RX    0x00000010L     /* receive path */
-#define SK_DBGCAT_IRQ   0x00000020L     /* general IRQ handling */
-#define SK_DBGCAT_QUEUE 0x00000040L     /* any queue management */
-#define SK_DBGCAT_DUMP  0x00000080L     /* large data output e.g. hex dump */
-#define SK_DBGCAT_FATAL 0x00000100L     /* fatal error */
-
-#endif  /* __INC_SKDEBUG_H */
diff --git a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h
deleted file mode 100644
index 91b8d4f45904..000000000000
--- a/drivers/net/sk98lin/h/skdrv1st.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/******************************************************************************
- *
- * Name:        skdrv1st.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.4 $
- * Date:        $Date: 2003/11/12 14:28:14 $
- * Purpose:     First header file for driver and all other modules
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * This is the first include file of the driver, which includes all
- * neccessary system header files and some of the GEnesis header files.
- * It also defines some basic items.
- *
- * Include File Hierarchy:
- *
- *      see skge.c
- *
- ******************************************************************************/
-
-#ifndef __INC_SKDRV1ST_H
-#define __INC_SKDRV1ST_H
-
-typedef struct s_AC     SK_AC;
-
-/* Set card versions */
-#define SK_FAR
-
-/* override some default functions with optimized linux functions */
-
-#define SK_PNMI_STORE_U16(p,v)          memcpy((char*)(p),(char*)&(v),2)
-#define SK_PNMI_STORE_U32(p,v)          memcpy((char*)(p),(char*)&(v),4)
-#define SK_PNMI_STORE_U64(p,v)          memcpy((char*)(p),(char*)&(v),8)
-#define SK_PNMI_READ_U16(p,v)           memcpy((char*)&(v),(char*)(p),2)
-#define SK_PNMI_READ_U32(p,v)           memcpy((char*)&(v),(char*)(p),4)
-#define SK_PNMI_READ_U64(p,v)           memcpy((char*)&(v),(char*)(p),8)
-
-#define SK_ADDR_EQUAL(a1,a2)            (!memcmp(a1,a2,6))
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/bitops.h>
-#include <asm/byteorder.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-
-#include <linux/init.h>
-#include <asm/uaccess.h>
-#include <net/checksum.h>
-
-#define SK_CS_CALCULATE_CHECKSUM
-#ifndef CONFIG_X86_64
-#define SkCsCalculateChecksum(p,l)      ((~ip_compute_csum(p, l)) & 0xffff)
-#else
-#define SkCsCalculateChecksum(p,l)      ((~ip_fast_csum(p, l)) & 0xffff)
-#endif
-
-#include        "h/sktypes.h"
-#include        "h/skerror.h"
-#include        "h/skdebug.h"
-#include        "h/lm80.h"
-#include        "h/xmac_ii.h"
-
-#ifdef __LITTLE_ENDIAN
-#define SK_LITTLE_ENDIAN
-#else
-#define SK_BIG_ENDIAN
-#endif
-
-#define SK_NET_DEVICE   net_device
-
-
-/* we use gethrtime(), return unit: nanoseconds */
-#define SK_TICKS_PER_SEC        100
-
-#define SK_MEM_MAPPED_IO
-
-// #define SK_RLMT_SLOW_LOOKAHEAD
-
-#define SK_MAX_MACS             2
-#define SK_MAX_NETS             2
-
-#define SK_IOC                  char __iomem *
-
-typedef struct s_DrvRlmtMbuf SK_MBUF;
-
-#define SK_CONST64      INT64_C
-#define SK_CONSTU64     UINT64_C
-
-#define SK_MEMCPY(dest,src,size)        memcpy(dest,src,size)
-#define SK_MEMCMP(s1,s2,size)           memcmp(s1,s2,size)
-#define SK_MEMSET(dest,val,size)        memset(dest,val,size)
-#define SK_STRLEN(pStr)                 strlen((char*)(pStr))
-#define SK_STRNCPY(pDest,pSrc,size)     strncpy((char*)(pDest),(char*)(pSrc),size)
-#define SK_STRCMP(pStr1,pStr2)          strcmp((char*)(pStr1),(char*)(pStr2))
-
-/* macros to access the adapter */
-#define SK_OUT8(b,a,v)          writeb((v), ((b)+(a)))  
-#define SK_OUT16(b,a,v)         writew((v), ((b)+(a)))  
-#define SK_OUT32(b,a,v)         writel((v), ((b)+(a)))  
-#define SK_IN8(b,a,pv)          (*(pv) = readb((b)+(a)))
-#define SK_IN16(b,a,pv)         (*(pv) = readw((b)+(a)))
-#define SK_IN32(b,a,pv)         (*(pv) = readl((b)+(a)))
-
-#define int8_t          char
-#define int16_t         short
-#define int32_t         long
-#define int64_t         long long
-#define uint8_t         u_char
-#define uint16_t        u_short
-#define uint32_t        u_long
-#define uint64_t        unsigned long long
-#define t_scalar_t      int
-#define t_uscalar_t     unsigned int
-#define uintptr_t       unsigned long
-
-#define __CONCAT__(A,B) A##B
-
-#define INT32_C(a)              __CONCAT__(a,L)
-#define INT64_C(a)              __CONCAT__(a,LL)
-#define UINT32_C(a)             __CONCAT__(a,UL)
-#define UINT64_C(a)             __CONCAT__(a,ULL)
-
-#ifdef DEBUG
-#define SK_DBG_PRINTF           printk
-#ifndef SK_DEBUG_CHKMOD
-#define SK_DEBUG_CHKMOD         0
-#endif
-#ifndef SK_DEBUG_CHKCAT
-#define SK_DEBUG_CHKCAT         0
-#endif
-/* those come from the makefile */
-#define SK_DBG_CHKMOD(pAC)      (SK_DEBUG_CHKMOD)
-#define SK_DBG_CHKCAT(pAC)      (SK_DEBUG_CHKCAT)
-
-extern void SkDbgPrintf(const char *format,...);
-
-#define SK_DBGMOD_DRV                   0x00010000
-
-/**** possible driver debug categories ********************************/
-#define SK_DBGCAT_DRV_ENTRY             0x00010000
-#define SK_DBGCAT_DRV_SAP               0x00020000
-#define SK_DBGCAT_DRV_MCA               0x00040000
-#define SK_DBGCAT_DRV_TX_PROGRESS       0x00080000
-#define SK_DBGCAT_DRV_RX_PROGRESS       0x00100000
-#define SK_DBGCAT_DRV_PROGRESS          0x00200000
-#define SK_DBGCAT_DRV_MSG               0x00400000
-#define SK_DBGCAT_DRV_PROM              0x00800000
-#define SK_DBGCAT_DRV_TX_FRAME          0x01000000
-#define SK_DBGCAT_DRV_ERROR             0x02000000
-#define SK_DBGCAT_DRV_INT_SRC           0x04000000
-#define SK_DBGCAT_DRV_EVENT             0x08000000
-
-#endif
-
-#define SK_ERR_LOG              SkErrorLog
-
-extern void SkErrorLog(SK_AC*, int, int, char*);
-
-#endif
-
diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h
deleted file mode 100644
index 3fa67171e832..000000000000
--- a/drivers/net/sk98lin/h/skdrv2nd.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/******************************************************************************
- *
- * Name:        skdrv2nd.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.10 $
- * Date:        $Date: 2003/12/11 16:04:45 $
- * Purpose:     Second header file for driver and all other modules
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * This is the second include file of the driver, which includes all other
- * neccessary files and defines all structures and constants used by the
- * driver and the common modules.
- *
- * Include File Hierarchy:
- *
- *      see skge.c
- *
- ******************************************************************************/
-
-#ifndef __INC_SKDRV2ND_H
-#define __INC_SKDRV2ND_H
-
-#include "h/skqueue.h"
-#include "h/skgehwt.h"
-#include "h/sktimer.h"
-#include "h/ski2c.h"
-#include "h/skgepnmi.h"
-#include "h/skvpd.h"
-#include "h/skgehw.h"
-#include "h/skgeinit.h"
-#include "h/skaddr.h"
-#include "h/skgesirq.h"
-#include "h/skcsum.h"
-#include "h/skrlmt.h"
-#include "h/skgedrv.h"
-
-
-extern SK_MBUF          *SkDrvAllocRlmtMbuf(SK_AC*, SK_IOC, unsigned);
-extern void             SkDrvFreeRlmtMbuf(SK_AC*, SK_IOC, SK_MBUF*);
-extern SK_U64           SkOsGetTime(SK_AC*);
-extern int              SkPciReadCfgDWord(SK_AC*, int, SK_U32*);
-extern int              SkPciReadCfgWord(SK_AC*, int, SK_U16*);
-extern int              SkPciReadCfgByte(SK_AC*, int, SK_U8*);
-extern int              SkPciWriteCfgWord(SK_AC*, int, SK_U16);
-extern int              SkPciWriteCfgByte(SK_AC*, int, SK_U8);
-extern int              SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA);
-
-#ifdef SK_DIAG_SUPPORT
-extern int              SkDrvEnterDiagMode(SK_AC *pAc);
-extern int              SkDrvLeaveDiagMode(SK_AC *pAc);
-#endif
-
-struct s_DrvRlmtMbuf {
-        SK_MBUF         *pNext;         /* Pointer to next RLMT Mbuf. */
-        SK_U8           *pData;         /* Data buffer (virtually contig.). */
-        unsigned        Size;           /* Data buffer size. */
-        unsigned        Length;         /* Length of packet (<= Size). */
-        SK_U32          PortIdx;        /* Receiving/transmitting port. */
-#ifdef SK_RLMT_MBUF_PRIVATE
-        SK_RLMT_MBUF    Rlmt;           /* Private part for RLMT. */
-#endif  /* SK_RLMT_MBUF_PRIVATE */
-        struct sk_buff  *pOs;           /* Pointer to message block */
-};
-
-
-/*
- * Time macros
- */
-#if SK_TICKS_PER_SEC == 100
-#define SK_PNMI_HUNDREDS_SEC(t) (t)
-#else
-#define SK_PNMI_HUNDREDS_SEC(t) ((((unsigned long)t) * 100) / \
-                                                                                (SK_TICKS_PER_SEC))
-#endif
-
-/*
- * New SkOsGetTime
- */
-#define SkOsGetTimeCurrent(pAC, pUsec) {\
-        struct timeval t;\
-        do_gettimeofday(&t);\
-        *pUsec = ((((t.tv_sec) * 1000000L)+t.tv_usec)/10000);\
-}
-
-
-/*
- * ioctl definitions
- */
-#define         SK_IOCTL_BASE           (SIOCDEVPRIVATE)
-#define         SK_IOCTL_GETMIB         (SK_IOCTL_BASE + 0)
-#define         SK_IOCTL_SETMIB         (SK_IOCTL_BASE + 1)
-#define         SK_IOCTL_PRESETMIB      (SK_IOCTL_BASE + 2)
-#define         SK_IOCTL_GEN            (SK_IOCTL_BASE + 3)
-#define         SK_IOCTL_DIAG           (SK_IOCTL_BASE + 4)
-
-typedef struct s_IOCTL  SK_GE_IOCTL;
-
-struct s_IOCTL {
-        char __user *   pData;
-        unsigned int    Len;
-};
-
-
-/*
- * define sizes of descriptor rings in bytes
- */
-
-#define         TX_RING_SIZE    (8*1024)
-#define         RX_RING_SIZE    (24*1024)
-
-/*
- * Buffer size for ethernet packets
- */
-#define ETH_BUF_SIZE    1540
-#define ETH_MAX_MTU     1514
-#define ETH_MIN_MTU     60
-#define ETH_MULTICAST_BIT       0x01
-#define SK_JUMBO_MTU    9000
-
-/*
- * transmit priority selects the queue: LOW=asynchron, HIGH=synchron
- */
-#define TX_PRIO_LOW     0
-#define TX_PRIO_HIGH    1
-
-/*
- * alignment of rx/tx descriptors
- */
-#define DESCR_ALIGN     64
-
-/*
- * definitions for pnmi. TODO
- */
-#define SK_DRIVER_RESET(pAC, IoC)       0
-#define SK_DRIVER_SENDEVENT(pAC, IoC)   0
-#define SK_DRIVER_SELFTEST(pAC, IoC)    0
-/* For get mtu you must add an own function */
-#define SK_DRIVER_GET_MTU(pAc,IoC,i)    0
-#define SK_DRIVER_SET_MTU(pAc,IoC,i,v)  0
-#define SK_DRIVER_PRESET_MTU(pAc,IoC,i,v)       0
-
-/*
-** Interim definition of SK_DRV_TIMER placed in this file until 
-** common modules have been finalized
-*/
-#define SK_DRV_TIMER                    11 
-#define SK_DRV_MODERATION_TIMER         1
-#define SK_DRV_MODERATION_TIMER_LENGTH  1000000  /* 1 second */
-#define SK_DRV_RX_CLEANUP_TIMER         2
-#define SK_DRV_RX_CLEANUP_TIMER_LENGTH  1000000  /* 100 millisecs */
-
-/*
-** Definitions regarding transmitting frames 
-** any calculating any checksum.
-*/
-#define C_LEN_ETHERMAC_HEADER_DEST_ADDR 6
-#define C_LEN_ETHERMAC_HEADER_SRC_ADDR  6
-#define C_LEN_ETHERMAC_HEADER_LENTYPE   2
-#define C_LEN_ETHERMAC_HEADER           ( (C_LEN_ETHERMAC_HEADER_DEST_ADDR) + \
-                                          (C_LEN_ETHERMAC_HEADER_SRC_ADDR)  + \
-                                          (C_LEN_ETHERMAC_HEADER_LENTYPE) )
-
-#define C_LEN_ETHERMTU_MINSIZE          46
-#define C_LEN_ETHERMTU_MAXSIZE_STD      1500
-#define C_LEN_ETHERMTU_MAXSIZE_JUMBO    9000
-
-#define C_LEN_ETHERNET_MINSIZE          ( (C_LEN_ETHERMAC_HEADER) + \
-                                          (C_LEN_ETHERMTU_MINSIZE) )
-
-#define C_OFFSET_IPHEADER               C_LEN_ETHERMAC_HEADER
-#define C_OFFSET_IPHEADER_IPPROTO       9
-#define C_OFFSET_TCPHEADER_TCPCS        16
-#define C_OFFSET_UDPHEADER_UDPCS        6
-
-#define C_OFFSET_IPPROTO                ( (C_LEN_ETHERMAC_HEADER) + \
-                                          (C_OFFSET_IPHEADER_IPPROTO) )
-
-#define C_PROTO_ID_UDP                  17       /* refer to RFC 790 or Stevens'   */
-#define C_PROTO_ID_TCP                  6        /* TCP/IP illustrated for details */
-
-/* TX and RX descriptors *****************************************************/
-
-typedef struct s_RxD RXD; /* the receive descriptor */
-
-struct s_RxD {
-        volatile SK_U32 RBControl;      /* Receive Buffer Control */
-        SK_U32          VNextRxd;       /* Next receive descriptor,low dword */
-        SK_U32          VDataLow;       /* Receive buffer Addr, low dword */
-        SK_U32          VDataHigh;      /* Receive buffer Addr, high dword */
-        SK_U32          FrameStat;      /* Receive Frame Status word */
-        SK_U32          TimeStamp;      /* Time stamp from XMAC */
-        SK_U32          TcpSums;        /* TCP Sum 2 / TCP Sum 1 */
-        SK_U32          TcpSumStarts;   /* TCP Sum Start 2 / TCP Sum Start 1 */
-        RXD             *pNextRxd;      /* Pointer to next Rxd */
-        struct sk_buff  *pMBuf;         /* Pointer to Linux' socket buffer */
-};
-
-typedef struct s_TxD TXD; /* the transmit descriptor */
-
-struct s_TxD {
-        volatile SK_U32 TBControl;      /* Transmit Buffer Control */
-        SK_U32          VNextTxd;       /* Next transmit descriptor,low dword */
-        SK_U32          VDataLow;       /* Transmit Buffer Addr, low dword */
-        SK_U32          VDataHigh;      /* Transmit Buffer Addr, high dword */
-        SK_U32          FrameStat;      /* Transmit Frame Status Word */
-        SK_U32          TcpSumOfs;      /* Reserved / TCP Sum Offset */
-        SK_U16          TcpSumSt;       /* TCP Sum Start */
-        SK_U16          TcpSumWr;       /* TCP Sum Write */
-        SK_U32          TcpReserved;    /* not used */
-        TXD             *pNextTxd;      /* Pointer to next Txd */
-        struct sk_buff  *pMBuf;         /* Pointer to Linux' socket buffer */
-};
-
-/* Used interrupt bits in the interrupts source register *********************/
-
-#define DRIVER_IRQS     ((IS_IRQ_SW)   | \
-                        (IS_R1_F)      |(IS_R2_F)  | \
-                        (IS_XS1_F)     |(IS_XA1_F) | \
-                        (IS_XS2_F)     |(IS_XA2_F))
-
-#define SPECIAL_IRQS    ((IS_HW_ERR)   |(IS_I2C_READY)  | \
-                        (IS_EXT_REG)   |(IS_TIMINT)     | \
-                        (IS_PA_TO_RX1) |(IS_PA_TO_RX2)  | \
-                        (IS_PA_TO_TX1) |(IS_PA_TO_TX2)  | \
-                        (IS_MAC1)      |(IS_LNK_SYNC_M1)| \
-                        (IS_MAC2)      |(IS_LNK_SYNC_M2)| \
-                        (IS_R1_C)      |(IS_R2_C)       | \
-                        (IS_XS1_C)     |(IS_XA1_C)      | \
-                        (IS_XS2_C)     |(IS_XA2_C))
-
-#define IRQ_MASK        ((IS_IRQ_SW)   | \
-                        (IS_R1_B)      |(IS_R1_F)     |(IS_R2_B) |(IS_R2_F) | \
-                        (IS_XS1_B)     |(IS_XS1_F)    |(IS_XA1_B)|(IS_XA1_F)| \
-                        (IS_XS2_B)     |(IS_XS2_F)    |(IS_XA2_B)|(IS_XA2_F)| \
-                        (IS_HW_ERR)    |(IS_I2C_READY)| \
-                        (IS_EXT_REG)   |(IS_TIMINT)   | \
-                        (IS_PA_TO_RX1) |(IS_PA_TO_RX2)| \
-                        (IS_PA_TO_TX1) |(IS_PA_TO_TX2)| \
-                        (IS_MAC1)      |(IS_MAC2)     | \
-                        (IS_R1_C)      |(IS_R2_C)     | \
-                        (IS_XS1_C)     |(IS_XA1_C)    | \
-                        (IS_XS2_C)     |(IS_XA2_C))
-
-#define IRQ_HWE_MASK    (IS_ERR_MSK) /* enable all HW irqs */
-
-typedef struct s_DevNet DEV_NET;
-
-struct s_DevNet {
-        int             PortNr;
-        int             NetNr;
-        SK_AC   *pAC;
-};  
-
-typedef struct s_TxPort         TX_PORT;
-
-struct s_TxPort {
-        /* the transmit descriptor rings */
-        caddr_t         pTxDescrRing;   /* descriptor area memory */
-        SK_U64          VTxDescrRing;   /* descr. area bus virt. addr. */
-        TXD             *pTxdRingHead;  /* Head of Tx rings */
-        TXD             *pTxdRingTail;  /* Tail of Tx rings */
-        TXD             *pTxdRingPrev;  /* descriptor sent previously */
-        int             TxdRingFree;    /* # of free entrys */
-        spinlock_t      TxDesRingLock;  /* serialize descriptor accesses */
-        SK_IOC          HwAddr;         /* bmu registers address */
-        int             PortIndex;      /* index number of port (0 or 1) */
-};
-
-typedef struct s_RxPort         RX_PORT;
-
-struct s_RxPort {
-        /* the receive descriptor rings */
-        caddr_t         pRxDescrRing;   /* descriptor area memory */
-        SK_U64          VRxDescrRing;   /* descr. area bus virt. addr. */
-        RXD             *pRxdRingHead;  /* Head of Rx rings */
-        RXD             *pRxdRingTail;  /* Tail of Rx rings */
-        RXD             *pRxdRingPrev;  /* descriptor given to BMU previously */
-        int             RxdRingFree;    /* # of free entrys */
-        int             RxCsum;         /* use receive checksum hardware */
-        spinlock_t      RxDesRingLock;  /* serialize descriptor accesses */
-        int             RxFillLimit;    /* limit for buffers in ring */
-        SK_IOC          HwAddr;         /* bmu registers address */
-        int             PortIndex;      /* index number of port (0 or 1) */
-};
-
-/* Definitions needed for interrupt moderation *******************************/
-
-#define IRQ_EOF_AS_TX     ((IS_XA1_F)     | (IS_XA2_F))
-#define IRQ_EOF_SY_TX     ((IS_XS1_F)     | (IS_XS2_F))
-#define IRQ_MASK_TX_ONLY  ((IRQ_EOF_AS_TX)| (IRQ_EOF_SY_TX))
-#define IRQ_MASK_RX_ONLY  ((IS_R1_F)      | (IS_R2_F))
-#define IRQ_MASK_SP_ONLY  (SPECIAL_IRQS)
-#define IRQ_MASK_TX_RX    ((IRQ_MASK_TX_ONLY)| (IRQ_MASK_RX_ONLY))
-#define IRQ_MASK_SP_RX    ((SPECIAL_IRQS)    | (IRQ_MASK_RX_ONLY))
-#define IRQ_MASK_SP_TX    ((SPECIAL_IRQS)    | (IRQ_MASK_TX_ONLY))
-#define IRQ_MASK_RX_TX_SP ((SPECIAL_IRQS)    | (IRQ_MASK_TX_RX))
-
-#define C_INT_MOD_NONE                 1
-#define C_INT_MOD_STATIC               2
-#define C_INT_MOD_DYNAMIC              4
-
-#define C_CLK_FREQ_GENESIS      53215000 /* shorter: 53.125 MHz  */
-#define C_CLK_FREQ_YUKON        78215000 /* shorter: 78.125 MHz  */
-
-#define C_INTS_PER_SEC_DEFAULT      2000 
-#define C_INT_MOD_ENABLE_PERCENTAGE   50 /* if higher 50% enable */
-#define C_INT_MOD_DISABLE_PERCENTAGE  50 /* if lower 50% disable */
-#define C_INT_MOD_IPS_LOWER_RANGE     30
-#define C_INT_MOD_IPS_UPPER_RANGE     40000
-
-
-typedef struct s_DynIrqModInfo  DIM_INFO;
-struct s_DynIrqModInfo {
-        unsigned long   PrevTimeVal;
-        unsigned int    PrevSysLoad;
-        unsigned int    PrevUsedTime;
-        unsigned int    PrevTotalTime;
-        int             PrevUsedDescrRatio;
-        int             NbrProcessedDescr;
-        SK_U64          PrevPort0RxIntrCts;
-        SK_U64          PrevPort1RxIntrCts;
-        SK_U64          PrevPort0TxIntrCts;
-        SK_U64          PrevPort1TxIntrCts;
-        SK_BOOL         ModJustEnabled;     /* Moderation just enabled yes/no */
-
-        int             MaxModIntsPerSec;            /* Moderation Threshold */
-        int             MaxModIntsPerSecUpperLimit;  /* Upper limit for DIM  */
-        int             MaxModIntsPerSecLowerLimit;  /* Lower limit for DIM  */
-
-        long            MaskIrqModeration;   /* ModIrqType (eg. 'TxRx')      */
-        SK_BOOL         DisplayStats;        /* Stats yes/no                 */
-        SK_BOOL         AutoSizing;          /* Resize DIM-timer on/off      */
-        int             IntModTypeSelect;    /* EnableIntMod (eg. 'dynamic') */
-
-        SK_TIMER        ModTimer; /* just some timer */
-};
-
-typedef struct s_PerStrm        PER_STRM;
-
-#define SK_ALLOC_IRQ    0x00000001
-
-#ifdef SK_DIAG_SUPPORT
-#define DIAG_ACTIVE             1
-#define DIAG_NOTACTIVE          0
-#endif
-
-/****************************************************************************
- * Per board structure / Adapter Context structure:
- *      Allocated within attach(9e) and freed within detach(9e).
- *      Contains all 'per device' necessary handles, flags, locks etc.:
- */
-struct s_AC  {
-        SK_GEINIT       GIni;           /* GE init struct */
-        SK_PNMI         Pnmi;           /* PNMI data struct */
-        SK_VPD          vpd;            /* vpd data struct */
-        SK_QUEUE        Event;          /* Event queue */
-        SK_HWT          Hwt;            /* Hardware Timer control struct */
-        SK_TIMCTRL      Tim;            /* Software Timer control struct */
-        SK_I2C          I2c;            /* I2C relevant data structure */
-        SK_ADDR         Addr;           /* for Address module */
-        SK_CSUM         Csum;           /* for checksum module */
-        SK_RLMT         Rlmt;           /* for rlmt module */
-        spinlock_t      SlowPathLock;   /* Normal IRQ lock */
-        struct timer_list BlinkTimer;   /* for LED blinking */
-        int             LedsOn;
-        SK_PNMI_STRUCT_DATA PnmiStruct; /* structure to get all Pnmi-Data */
-        int                     RlmtMode;       /* link check mode to set */
-        int                     RlmtNets;       /* Number of nets */
-        
-        SK_IOC          IoBase;         /* register set of adapter */
-        int             BoardLevel;     /* level of active hw init (0-2) */
-
-        SK_U32          AllocFlag;      /* flag allocation of resources */
-        struct pci_dev  *PciDev;        /* for access to pci config space */
-        struct SK_NET_DEVICE    *dev[2];        /* pointer to device struct */
-
-        int             RxBufSize;      /* length of receive buffers */
-        struct net_device_stats stats;  /* linux 'netstat -i' statistics */
-        int             Index;          /* internal board index number */
-
-        /* adapter RAM sizes for queues of active port */
-        int             RxQueueSize;    /* memory used for receive queue */
-        int             TxSQueueSize;   /* memory used for sync. tx queue */
-        int             TxAQueueSize;   /* memory used for async. tx queue */
-
-        int             PromiscCount;   /* promiscuous mode counter  */
-        int             AllMultiCount;  /* allmulticast mode counter */
-        int             MulticCount;    /* number of different MC    */
-                                        /*  addresses for this board */
-                                        /*  (may be more than HW can)*/
-
-        int             HWRevision;     /* Hardware revision */
-        int             ActivePort;     /* the active XMAC port */
-        int             MaxPorts;               /* number of activated ports */
-        int             TxDescrPerRing; /* # of descriptors per tx ring */
-        int             RxDescrPerRing; /* # of descriptors per rx ring */
-
-        caddr_t         pDescrMem;      /* Pointer to the descriptor area */
-        dma_addr_t      pDescrMemDMA;   /* PCI DMA address of area */
-
-        /* the port structures with descriptor rings */
-        TX_PORT         TxPort[SK_MAX_MACS][2];
-        RX_PORT         RxPort[SK_MAX_MACS];
-
-        SK_BOOL         CheckQueue;     /* check event queue soon */
-        SK_TIMER        DrvCleanupTimer;/* to check for pending descriptors */
-        DIM_INFO        DynIrqModInfo;  /* all data related to DIM */
-
-        /* Only for tests */
-        int             PortDown;
-        int             ChipsetType;    /*  Chipset family type 
-                                         *  0 == Genesis family support
-                                         *  1 == Yukon family support
-                                         */
-#ifdef SK_DIAG_SUPPORT
-        SK_U32          DiagModeActive;         /* is diag active?      */
-        SK_BOOL         DiagFlowCtrl;           /* for control purposes */
-        SK_PNMI_STRUCT_DATA PnmiBackup;         /* backup structure for all Pnmi-Data */
-        SK_BOOL         WasIfUp[SK_MAX_MACS];   /* for OpenClose while 
-                                                 * DIAG is busy with NIC 
-                                                 */
-#endif
-
-};
-
-
-#endif /* __INC_SKDRV2ND_H */
-
diff --git a/drivers/net/sk98lin/h/skerror.h b/drivers/net/sk98lin/h/skerror.h
deleted file mode 100644
index da062f766238..000000000000
--- a/drivers/net/sk98lin/h/skerror.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************
- *
- * Name:        skerror.h
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.7 $
- * Date:        $Date: 2003/05/13 17:25:13 $
- * Purpose:     SK specific Error log support
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef _INC_SKERROR_H_
-#define _INC_SKERROR_H_
-
-/*
- * Define Error Classes
- */
-#define SK_ERRCL_OTHER          (0)             /* Other error */
-#define SK_ERRCL_CONFIG         (1L<<0) /* Configuration error */
-#define SK_ERRCL_INIT           (1L<<1) /* Initialization error */
-#define SK_ERRCL_NORES          (1L<<2) /* Out of Resources error */
-#define SK_ERRCL_SW                     (1L<<3) /* Internal Software error */
-#define SK_ERRCL_HW                     (1L<<4) /* Hardware Failure */
-#define SK_ERRCL_COMM           (1L<<5) /* Communication error */
-
-
-/*
- * Define Error Code Bases
- */
-#define SK_ERRBASE_RLMT          100    /* Base Error number for RLMT */
-#define SK_ERRBASE_HWINIT        200    /* Base Error number for HWInit */
-#define SK_ERRBASE_VPD           300    /* Base Error number for VPD */
-#define SK_ERRBASE_PNMI          400    /* Base Error number for PNMI */
-#define SK_ERRBASE_CSUM          500    /* Base Error number for Checksum */
-#define SK_ERRBASE_SIRQ          600    /* Base Error number for Special IRQ */
-#define SK_ERRBASE_I2C           700    /* Base Error number for I2C module */
-#define SK_ERRBASE_QUEUE         800    /* Base Error number for Scheduler */
-#define SK_ERRBASE_ADDR          900    /* Base Error number for Address module */
-#define SK_ERRBASE_PECP         1000    /* Base Error number for PECP */
-#define SK_ERRBASE_DRV          1100    /* Base Error number for Driver */
-
-#endif  /* _INC_SKERROR_H_ */
diff --git a/drivers/net/sk98lin/h/skgedrv.h b/drivers/net/sk98lin/h/skgedrv.h
deleted file mode 100644
index 44fd4c3de818..000000000000
--- a/drivers/net/sk98lin/h/skgedrv.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgedrv.h
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.10 $
- * Date:        $Date: 2003/07/04 12:25:01 $
- * Purpose:     Interface with the driver
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef __INC_SKGEDRV_H_
-#define __INC_SKGEDRV_H_
-
-/* defines ********************************************************************/
-
-/*
- * Define the driver events.
- * Usually the events are defined by the destination module.
- * In case of the driver we put the definition of the events here.
- */
-#define SK_DRV_PORT_RESET                1      /* The port needs to be reset */
-#define SK_DRV_NET_UP                    2      /* The net is operational */
-#define SK_DRV_NET_DOWN                  3      /* The net is down */
-#define SK_DRV_SWITCH_SOFT               4      /* Ports switch with both links connected */
-#define SK_DRV_SWITCH_HARD               5      /* Port switch due to link failure */
-#define SK_DRV_RLMT_SEND                 6      /* Send a RLMT packet */
-#define SK_DRV_ADAP_FAIL                 7      /* The whole adapter fails */
-#define SK_DRV_PORT_FAIL                 8      /* One port fails */
-#define SK_DRV_SWITCH_INTERN     9      /* Port switch by the driver itself */
-#define SK_DRV_POWER_DOWN               10      /* Power down mode */
-#define SK_DRV_TIMER                    11      /* Timer for free use */
-#ifdef SK_NO_RLMT
-#define SK_DRV_LINK_UP                  12      /* Link Up event for driver */
-#define SK_DRV_LINK_DOWN                13      /* Link Down event for driver */
-#endif
-#define SK_DRV_DOWNSHIFT_DET    14      /* Downshift 4-Pair / 2-Pair (YUKON only) */
-#endif /* __INC_SKGEDRV_H_ */
diff --git a/drivers/net/sk98lin/h/skgehw.h b/drivers/net/sk98lin/h/skgehw.h
deleted file mode 100644
index f6282b7956db..000000000000
--- a/drivers/net/sk98lin/h/skgehw.h
+++ /dev/null
@@ -1,2126 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgehw.h
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.56 $
- * Date:        $Date: 2003/09/23 09:01:00 $
- * Purpose:     Defines and Macros for the Gigabit Ethernet Adapter Product Family
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef __INC_SKGEHW_H
-#define __INC_SKGEHW_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-/* defines ********************************************************************/
-
-#define BIT_31          (1UL << 31)
-#define BIT_30          (1L << 30)
-#define BIT_29          (1L << 29)
-#define BIT_28          (1L << 28)
-#define BIT_27          (1L << 27)
-#define BIT_26          (1L << 26)
-#define BIT_25          (1L << 25)
-#define BIT_24          (1L << 24)
-#define BIT_23          (1L << 23)
-#define BIT_22          (1L << 22)
-#define BIT_21          (1L << 21)
-#define BIT_20          (1L << 20)
-#define BIT_19          (1L << 19)
-#define BIT_18          (1L << 18)
-#define BIT_17          (1L << 17)
-#define BIT_16          (1L << 16)
-#define BIT_15          (1L << 15)
-#define BIT_14          (1L << 14)
-#define BIT_13          (1L << 13)
-#define BIT_12          (1L << 12)
-#define BIT_11          (1L << 11)
-#define BIT_10          (1L << 10)
-#define BIT_9           (1L << 9)
-#define BIT_8           (1L << 8)
-#define BIT_7           (1L << 7)
-#define BIT_6           (1L << 6)
-#define BIT_5           (1L << 5)
-#define BIT_4           (1L << 4)
-#define BIT_3           (1L << 3)
-#define BIT_2           (1L << 2)
-#define BIT_1           (1L << 1)
-#define BIT_0           1L
-
-#define BIT_15S         (1U << 15)
-#define BIT_14S         (1 << 14)
-#define BIT_13S         (1 << 13)
-#define BIT_12S         (1 << 12)
-#define BIT_11S         (1 << 11)
-#define BIT_10S         (1 << 10)
-#define BIT_9S          (1 << 9)
-#define BIT_8S          (1 << 8)
-#define BIT_7S          (1 << 7)
-#define BIT_6S          (1 << 6)
-#define BIT_5S          (1 << 5)
-#define BIT_4S          (1 << 4)
-#define BIT_3S          (1 << 3)
-#define BIT_2S          (1 << 2)
-#define BIT_1S          (1 << 1)
-#define BIT_0S          1
-
-#define SHIFT31(x)      ((x) << 31)
-#define SHIFT30(x)      ((x) << 30)
-#define SHIFT29(x)      ((x) << 29)
-#define SHIFT28(x)      ((x) << 28)
-#define SHIFT27(x)      ((x) << 27)
-#define SHIFT26(x)      ((x) << 26)
-#define SHIFT25(x)      ((x) << 25)
-#define SHIFT24(x)      ((x) << 24)
-#define SHIFT23(x)      ((x) << 23)
-#define SHIFT22(x)      ((x) << 22)
-#define SHIFT21(x)      ((x) << 21)
-#define SHIFT20(x)      ((x) << 20)
-#define SHIFT19(x)      ((x) << 19)
-#define SHIFT18(x)      ((x) << 18)
-#define SHIFT17(x)      ((x) << 17)
-#define SHIFT16(x)      ((x) << 16)
-#define SHIFT15(x)      ((x) << 15)
-#define SHIFT14(x)      ((x) << 14)
-#define SHIFT13(x)      ((x) << 13)
-#define SHIFT12(x)      ((x) << 12)
-#define SHIFT11(x)      ((x) << 11)
-#define SHIFT10(x)      ((x) << 10)
-#define SHIFT9(x)       ((x) << 9)
-#define SHIFT8(x)       ((x) << 8)
-#define SHIFT7(x)       ((x) << 7)
-#define SHIFT6(x)       ((x) << 6)
-#define SHIFT5(x)       ((x) << 5)
-#define SHIFT4(x)       ((x) << 4)
-#define SHIFT3(x)       ((x) << 3)
-#define SHIFT2(x)       ((x) << 2)
-#define SHIFT1(x)       ((x) << 1)
-#define SHIFT0(x)       ((x) << 0)
-
-/*
- * Configuration Space header
- * Since this module is used for different OS', those may be
- * duplicate on some of them (e.g. Linux). But to keep the
- * common source, we have to live with this...
- */
-#define PCI_VENDOR_ID   0x00    /* 16 bit       Vendor ID */
-#define PCI_DEVICE_ID   0x02    /* 16 bit       Device ID */
-#define PCI_COMMAND             0x04    /* 16 bit       Command */
-#define PCI_STATUS              0x06    /* 16 bit       Status */
-#define PCI_REV_ID              0x08    /*  8 bit       Revision ID */
-#define PCI_CLASS_CODE  0x09    /* 24 bit       Class Code */
-#define PCI_CACHE_LSZ   0x0c    /*  8 bit       Cache Line Size */
-#define PCI_LAT_TIM             0x0d    /*  8 bit       Latency Timer */
-#define PCI_HEADER_T    0x0e    /*  8 bit       Header Type */
-#define PCI_BIST                0x0f    /*  8 bit       Built-in selftest */
-#define PCI_BASE_1ST    0x10    /* 32 bit       1st Base address */
-#define PCI_BASE_2ND    0x14    /* 32 bit       2nd Base address */
-        /* Byte 0x18..0x2b:     reserved */
-#define PCI_SUB_VID             0x2c    /* 16 bit       Subsystem Vendor ID */
-#define PCI_SUB_ID              0x2e    /* 16 bit       Subsystem ID */
-#define PCI_BASE_ROM    0x30    /* 32 bit       Expansion ROM Base Address */
-#define PCI_CAP_PTR             0x34    /*  8 bit       Capabilities Ptr */
-        /* Byte 0x35..0x3b:     reserved */
-#define PCI_IRQ_LINE    0x3c    /*  8 bit       Interrupt Line */
-#define PCI_IRQ_PIN             0x3d    /*  8 bit       Interrupt Pin */
-#define PCI_MIN_GNT             0x3e    /*  8 bit       Min_Gnt */
-#define PCI_MAX_LAT             0x3f    /*  8 bit       Max_Lat */
-        /* Device Dependent Region */
-#define PCI_OUR_REG_1   0x40    /* 32 bit       Our Register 1 */
-#define PCI_OUR_REG_2   0x44    /* 32 bit       Our Register 2 */
-        /* Power Management Region */
-#define PCI_PM_CAP_ID   0x48    /*  8 bit       Power Management Cap. ID */
-#define PCI_PM_NITEM    0x49    /*  8 bit       Next Item Ptr */
-#define PCI_PM_CAP_REG  0x4a    /* 16 bit       Power Management Capabilities */
-#define PCI_PM_CTL_STS  0x4c    /* 16 bit       Power Manag. Control/Status */
-        /* Byte 0x4e:   reserved */
-#define PCI_PM_DAT_REG  0x4f    /*  8 bit       Power Manag. Data Register */
-        /* VPD Region */
-#define PCI_VPD_CAP_ID  0x50    /*  8 bit       VPD Cap. ID */
-#define PCI_VPD_NITEM   0x51    /*  8 bit       Next Item Ptr */
-#define PCI_VPD_ADR_REG 0x52    /* 16 bit       VPD Address Register */
-#define PCI_VPD_DAT_REG 0x54    /* 32 bit       VPD Data Register */
-        /* Byte 0x58..0x59:     reserved */
-#define PCI_SER_LD_CTRL 0x5a    /* 16 bit       SEEPROM Loader Ctrl (YUKON only) */
-        /* Byte 0x5c..0xff:     reserved */
-
-/*
- * I2C Address (PCI Config)
- *
- * Note: The temperature and voltage sensors are relocated on a different
- *       I2C bus.
- */
-#define I2C_ADDR_VPD    0xa0    /* I2C address for the VPD EEPROM */
-
-/*
- * Define Bits and Values of the registers
- */
-/*      PCI_COMMAND     16 bit  Command */
-                                                                /* Bit 15..11:  reserved */
-#define PCI_INT_DIS             BIT_10S         /* Interrupt INTx# disable (PCI 2.3) */
-#define PCI_FBTEN               BIT_9S          /* Fast Back-To-Back enable */
-#define PCI_SERREN              BIT_8S          /* SERR enable */
-#define PCI_ADSTEP              BIT_7S          /* Address Stepping */
-#define PCI_PERREN              BIT_6S          /* Parity Report Response enable */
-#define PCI_VGA_SNOOP   BIT_5S          /* VGA palette snoop */
-#define PCI_MWIEN               BIT_4S          /* Memory write an inv cycl ena */
-#define PCI_SCYCEN              BIT_3S          /* Special Cycle enable */
-#define PCI_BMEN                BIT_2S          /* Bus Master enable */
-#define PCI_MEMEN               BIT_1S          /* Memory Space Access enable */
-#define PCI_IOEN                BIT_0S          /* I/O Space Access enable */
-
-#define PCI_COMMAND_VAL (PCI_FBTEN | PCI_SERREN | PCI_PERREN | PCI_MWIEN |\
-                                                 PCI_BMEN | PCI_MEMEN | PCI_IOEN)
-
-/*      PCI_STATUS      16 bit  Status */
-#define PCI_PERR                BIT_15S         /* Parity Error */
-#define PCI_SERR                BIT_14S         /* Signaled SERR */
-#define PCI_RMABORT             BIT_13S         /* Received Master Abort */
-#define PCI_RTABORT             BIT_12S         /* Received Target Abort */
-                                                                /* Bit 11:      reserved */
-#define PCI_DEVSEL              (3<<9)          /* Bit 10.. 9:  DEVSEL Timing */
-#define PCI_DEV_FAST    (0<<9)          /*              fast */
-#define PCI_DEV_MEDIUM  (1<<9)          /*              medium */
-#define PCI_DEV_SLOW    (2<<9)          /*              slow */
-#define PCI_DATAPERR    BIT_8S          /* DATA Parity error detected */
-#define PCI_FB2BCAP             BIT_7S          /* Fast Back-to-Back Capability */
-#define PCI_UDF                 BIT_6S          /* User Defined Features */
-#define PCI_66MHZCAP    BIT_5S          /* 66 MHz PCI bus clock capable */
-#define PCI_NEWCAP              BIT_4S          /* New cap. list implemented */
-#define PCI_INT_STAT    BIT_3S          /* Interrupt INTx# Status (PCI 2.3) */
-                                                                /* Bit  2.. 0:  reserved */
-
-#define PCI_ERRBITS     (PCI_PERR | PCI_SERR | PCI_RMABORT | PCI_RTABORT |\
-                        PCI_DATAPERR)
-
-/*      PCI_CLASS_CODE  24 bit  Class Code */
-/*      Byte 2:         Base Class              (02) */
-/*      Byte 1:         SubClass                (00) */
-/*      Byte 0:         Programming Interface   (00) */
-
-/*      PCI_CACHE_LSZ   8 bit   Cache Line Size */
-/*      Possible values: 0,2,4,8,16,32,64,128   */
-
-/*      PCI_HEADER_T    8 bit   Header Type */
-#define PCI_HD_MF_DEV   BIT_7S  /* 0= single, 1= multi-func dev */
-#define PCI_HD_TYPE             0x7f    /* Bit 6..0:    Header Layout 0= normal */
-
-/*      PCI_BIST        8 bit   Built-in selftest */
-/*      Built-in Self test not supported (optional) */
-
-/*      PCI_BASE_1ST    32 bit  1st Base address */
-#define PCI_MEMSIZE             0x4000L         /* use 16 kB Memory Base */
-#define PCI_MEMBASE_MSK 0xffffc000L     /* Bit 31..14:  Memory Base Address */
-#define PCI_MEMSIZE_MSK 0x00003ff0L     /* Bit 13.. 4:  Memory Size Req. */
-#define PCI_PREFEN              BIT_3           /* Prefetchable */
-#define PCI_MEM_TYP             (3L<<2)         /* Bit  2.. 1:  Memory Type */
-#define PCI_MEM32BIT    (0L<<1)         /* Base addr anywhere in 32 Bit range */
-#define PCI_MEM1M               (1L<<1)         /* Base addr below 1 MegaByte */
-#define PCI_MEM64BIT    (2L<<1)         /* Base addr anywhere in 64 Bit range */
-#define PCI_MEMSPACE    BIT_0           /* Memory Space Indicator */
-
-/*      PCI_BASE_2ND    32 bit  2nd Base address */
-#define PCI_IOBASE              0xffffff00L     /* Bit 31.. 8:  I/O Base address */
-#define PCI_IOSIZE              0x000000fcL     /* Bit  7.. 2:  I/O Size Requirements */
-                                                                        /* Bit  1:      reserved */
-#define PCI_IOSPACE             BIT_0           /* I/O Space Indicator */
-
-/*      PCI_BASE_ROM    32 bit  Expansion ROM Base Address */
-#define PCI_ROMBASE_MSK 0xfffe0000L     /* Bit 31..17:  ROM Base address */
-#define PCI_ROMBASE_SIZ (0x1cL<<14)     /* Bit 16..14:  Treat as Base or Size */
-#define PCI_ROMSIZE             (0x38L<<11)     /* Bit 13..11:  ROM Size Requirements */
-                                                                        /* Bit 10.. 1:  reserved */
-#define PCI_ROMEN               BIT_0           /* Address Decode enable */
-
-/* Device Dependent Region */
-/*      PCI_OUR_REG_1           32 bit  Our Register 1 */
-                                                                        /* Bit 31..29:  reserved */
-#define PCI_PHY_COMA    BIT_28          /* Set PHY to Coma Mode (YUKON only) */
-#define PCI_TEST_CAL    BIT_27          /* Test PCI buffer calib. (YUKON only) */
-#define PCI_EN_CAL              BIT_26          /* Enable PCI buffer calib. (YUKON only) */
-#define PCI_VIO                 BIT_25          /* PCI I/O Voltage, 0 = 3.3V, 1 = 5V */
-#define PCI_DIS_BOOT    BIT_24          /* Disable BOOT via ROM */
-#define PCI_EN_IO               BIT_23          /* Mapping to I/O space */
-#define PCI_EN_FPROM    BIT_22          /* Enable FLASH mapping to memory */
-                                                                        /*              1 = Map Flash to memory */
-                                                                        /*              0 = Disable addr. dec */
-#define PCI_PAGESIZE    (3L<<20)        /* Bit 21..20:  FLASH Page Size */
-#define PCI_PAGE_16             (0L<<20)        /*              16 k pages      */
-#define PCI_PAGE_32K    (1L<<20)        /*              32 k pages      */
-#define PCI_PAGE_64K    (2L<<20)        /*              64 k pages      */
-#define PCI_PAGE_128K   (3L<<20)        /*              128 k pages     */
-                                                                        /* Bit 19:      reserved        */
-#define PCI_PAGEREG             (7L<<16)        /* Bit 18..16:  Page Register   */
-#define PCI_NOTAR               BIT_15          /* No turnaround cycle */
-#define PCI_FORCE_BE    BIT_14          /* Assert all BEs on MR */
-#define PCI_DIS_MRL             BIT_13          /* Disable Mem Read Line */
-#define PCI_DIS_MRM             BIT_12          /* Disable Mem Read Multiple */
-#define PCI_DIS_MWI             BIT_11          /* Disable Mem Write & Invalidate */
-#define PCI_DISC_CLS    BIT_10          /* Disc: cacheLsz bound */
-#define PCI_BURST_DIS   BIT_9           /* Burst Disable */
-#define PCI_DIS_PCI_CLK BIT_8           /* Disable PCI clock driving */
-#define PCI_SKEW_DAS    (0xfL<<4)       /* Bit  7.. 4:  Skew Ctrl, DAS Ext */
-#define PCI_SKEW_BASE   0xfL            /* Bit  3.. 0:  Skew Ctrl, Base */
-
-
-/*      PCI_OUR_REG_2           32 bit  Our Register 2 */
-#define PCI_VPD_WR_THR  (0xffL<<24)     /* Bit 31..24:  VPD Write Threshold */
-#define PCI_DEV_SEL             (0x7fL<<17)     /* Bit 23..17:  EEPROM Device Select */
-#define PCI_VPD_ROM_SZ  (7L<<14)        /* Bit 16..14:  VPD ROM Size    */
-                                                                        /* Bit 13..12:  reserved        */
-#define PCI_PATCH_DIR   (0xfL<<8)       /* Bit 11.. 8:  Ext Patches dir 3..0 */
-#define PCI_PATCH_DIR_3 BIT_11
-#define PCI_PATCH_DIR_2 BIT_10
-#define PCI_PATCH_DIR_1 BIT_9
-#define PCI_PATCH_DIR_0 BIT_8
-#define PCI_EXT_PATCHS  (0xfL<<4)       /* Bit  7.. 4:  Extended Patches 3..0 */
-#define PCI_EXT_PATCH_3 BIT_7
-#define PCI_EXT_PATCH_2 BIT_6
-#define PCI_EXT_PATCH_1 BIT_5
-#define PCI_EXT_PATCH_0 BIT_4
-#define PCI_EN_DUMMY_RD BIT_3           /* Enable Dummy Read */
-#define PCI_REV_DESC    BIT_2           /* Reverse Desc. Bytes */
-                                                                        /* Bit  1:      reserved */
-#define PCI_USEDATA64   BIT_0           /* Use 64Bit Data bus ext */
-
-
-/* Power Management Region */
-/*      PCI_PM_CAP_REG          16 bit  Power Management Capabilities */
-#define PCI_PME_SUP_MSK (0x1f<<11)      /* Bit 15..11:  PM Event Support Mask */
-#define PCI_PME_D3C_SUP BIT_15S         /* PME from D3cold Support (if Vaux) */
-#define PCI_PME_D3H_SUP BIT_14S         /* PME from D3hot Support */
-#define PCI_PME_D2_SUP  BIT_13S         /* PME from D2 Support */
-#define PCI_PME_D1_SUP  BIT_12S         /* PME from D1 Support */
-#define PCI_PME_D0_SUP  BIT_11S         /* PME from D0 Support */
-#define PCI_PM_D2_SUP   BIT_10S         /* D2 Support in 33 MHz mode */
-#define PCI_PM_D1_SUP   BIT_9S          /* D1 Support */
-                                                                        /* Bit  8.. 6:  reserved */
-#define PCI_PM_DSI              BIT_5S          /* Device Specific Initialization */
-#define PCI_PM_APS              BIT_4S          /* Auxialiary Power Source */
-#define PCI_PME_CLOCK   BIT_3S          /* PM Event Clock */
-#define PCI_PM_VER_MSK          7               /* Bit  2.. 0:  PM PCI Spec. version */
-
-/*      PCI_PM_CTL_STS          16 bit  Power Management Control/Status */
-#define PCI_PME_STATUS  BIT_15S         /* PME Status (YUKON only) */
-#define PCI_PM_DAT_SCL  (3<<13)         /* Bit 14..13:  Data Reg. scaling factor */
-#define PCI_PM_DAT_SEL  (0xf<<9)        /* Bit 12.. 9:  PM data selector field */
-#define PCI_PME_EN              BIT_8S          /* Enable PME# generation (YUKON only) */
-                                                                        /* Bit  7.. 2:  reserved */
-#define PCI_PM_STATE_MSK        3               /* Bit  1.. 0:  Power Management State */
-
-#define PCI_PM_STATE_D0         0               /* D0:  Operational (default) */
-#define PCI_PM_STATE_D1         1               /* D1:  (YUKON only) */
-#define PCI_PM_STATE_D2         2               /* D2:  (YUKON only) */
-#define PCI_PM_STATE_D3         3               /* D3:  HOT, Power Down and Reset */
-
-/* VPD Region */
-/*      PCI_VPD_ADR_REG         16 bit  VPD Address Register */
-#define PCI_VPD_FLAG    BIT_15S         /* starts VPD rd/wr cycle */
-#define PCI_VPD_ADR_MSK 0x7fffL         /* Bit 14.. 0:  VPD address mask */
-
-/*      Control Register File (Address Map) */
-
-/*
- *      Bank 0
- */
-#define B0_RAP                  0x0000  /*  8 bit       Register Address Port */
-        /* 0x0001 - 0x0003:     reserved */
-#define B0_CTST                 0x0004  /* 16 bit       Control/Status register */
-#define B0_LED                  0x0006  /*  8 Bit       LED register */
-#define B0_POWER_CTRL   0x0007  /*  8 Bit       Power Control reg (YUKON only) */
-#define B0_ISRC                 0x0008  /* 32 bit       Interrupt Source Register */
-#define B0_IMSK                 0x000c  /* 32 bit       Interrupt Mask Register */
-#define B0_HWE_ISRC             0x0010  /* 32 bit       HW Error Interrupt Src Reg */
-#define B0_HWE_IMSK             0x0014  /* 32 bit       HW Error Interrupt Mask Reg */
-#define B0_SP_ISRC              0x0018  /* 32 bit       Special Interrupt Source Reg */
-        /* 0x001c:              reserved */
-
-/* B0 XMAC 1 registers (GENESIS only) */
-#define B0_XM1_IMSK             0x0020  /* 16 bit r/w   XMAC 1 Interrupt Mask Register*/
-        /* 0x0022 - 0x0027:     reserved */
-#define B0_XM1_ISRC             0x0028  /* 16 bit ro    XMAC 1 Interrupt Status Reg */
-        /* 0x002a - 0x002f:     reserved */
-#define B0_XM1_PHY_ADDR 0x0030  /* 16 bit r/w   XMAC 1 PHY Address Register */
-        /* 0x0032 - 0x0033:     reserved */
-#define B0_XM1_PHY_DATA 0x0034  /* 16 bit r/w   XMAC 1 PHY Data Register */
-        /* 0x0036 - 0x003f:     reserved */
-
-/* B0 XMAC 2 registers (GENESIS only) */
-#define B0_XM2_IMSK             0x0040  /* 16 bit r/w   XMAC 2 Interrupt Mask Register*/
-        /* 0x0042 - 0x0047:     reserved */
-#define B0_XM2_ISRC             0x0048  /* 16 bit ro    XMAC 2 Interrupt Status Reg */
-        /* 0x004a - 0x004f:     reserved */
-#define B0_XM2_PHY_ADDR 0x0050  /* 16 bit r/w   XMAC 2 PHY Address Register */
-        /* 0x0052 - 0x0053:     reserved */
-#define B0_XM2_PHY_DATA 0x0054  /* 16 bit r/w   XMAC 2 PHY Data Register */
-        /* 0x0056 - 0x005f:     reserved */
-
-/* BMU Control Status Registers */
-#define B0_R1_CSR               0x0060  /* 32 bit       BMU Ctrl/Stat Rx Queue 1 */
-#define B0_R2_CSR               0x0064  /* 32 bit       BMU Ctrl/Stat Rx Queue 2 */
-#define B0_XS1_CSR              0x0068  /* 32 bit       BMU Ctrl/Stat Sync Tx Queue 1 */
-#define B0_XA1_CSR              0x006c  /* 32 bit       BMU Ctrl/Stat Async Tx Queue 1*/
-#define B0_XS2_CSR              0x0070  /* 32 bit       BMU Ctrl/Stat Sync Tx Queue 2 */
-#define B0_XA2_CSR              0x0074  /* 32 bit       BMU Ctrl/Stat Async Tx Queue 2*/
-        /* 0x0078 - 0x007f:     reserved */
-
-/*
- *      Bank 1
- *      - completely empty (this is the RAP Block window)
- *      Note: if RAP = 1 this page is reserved
- */
-
-/*
- *      Bank 2
- */
-/* NA reg = 48 bit Network Address Register, 3x16 or 8x8 bit readable */
-#define B2_MAC_1                0x0100  /* NA reg        MAC Address 1 */
-        /* 0x0106 - 0x0107:     reserved */
-#define B2_MAC_2                0x0108  /* NA reg        MAC Address 2 */
-        /* 0x010e - 0x010f:     reserved */
-#define B2_MAC_3                0x0110  /* NA reg        MAC Address 3 */
-        /* 0x0116 - 0x0117:     reserved */
-#define B2_CONN_TYP             0x0118  /*  8 bit       Connector type */
-#define B2_PMD_TYP              0x0119  /*  8 bit       PMD type */
-#define B2_MAC_CFG              0x011a  /*  8 bit       MAC Configuration / Chip Revision */
-#define B2_CHIP_ID              0x011b  /*  8 bit       Chip Identification Number */
-        /* Eprom registers are currently of no use */
-#define B2_E_0                  0x011c  /*  8 bit       EPROM Byte 0 (ext. SRAM size */
-#define B2_E_1                  0x011d  /*  8 bit       EPROM Byte 1 (PHY type) */
-#define B2_E_2                  0x011e  /*  8 bit       EPROM Byte 2 */
-#define B2_E_3                  0x011f  /*  8 bit       EPROM Byte 3 */
-#define B2_FAR                  0x0120  /* 32 bit       Flash-Prom Addr Reg/Cnt */
-#define B2_FDP                  0x0124  /*  8 bit       Flash-Prom Data Port */
-        /* 0x0125 - 0x0127:     reserved */
-#define B2_LD_CTRL              0x0128  /*  8 bit       EPROM loader control register */
-#define B2_LD_TEST              0x0129  /*  8 bit       EPROM loader test register */
-        /* 0x012a - 0x012f:     reserved */
-#define B2_TI_INI               0x0130  /* 32 bit       Timer Init Value */
-#define B2_TI_VAL               0x0134  /* 32 bit       Timer Value */
-#define B2_TI_CTRL              0x0138  /*  8 bit       Timer Control */
-#define B2_TI_TEST              0x0139  /*  8 Bit       Timer Test */
-        /* 0x013a - 0x013f:     reserved */
-#define B2_IRQM_INI             0x0140  /* 32 bit       IRQ Moderation Timer Init Reg.*/
-#define B2_IRQM_VAL             0x0144  /* 32 bit       IRQ Moderation Timer Value */
-#define B2_IRQM_CTRL    0x0148  /*  8 bit       IRQ Moderation Timer Control */
-#define B2_IRQM_TEST    0x0149  /*  8 bit       IRQ Moderation Timer Test */
-#define B2_IRQM_MSK     0x014c  /* 32 bit       IRQ Moderation Mask */
-#define B2_IRQM_HWE_MSK 0x0150  /* 32 bit       IRQ Moderation HW Error Mask */
-        /* 0x0154 - 0x0157:     reserved */
-#define B2_TST_CTRL1    0x0158  /*  8 bit       Test Control Register 1 */
-#define B2_TST_CTRL2    0x0159  /*  8 bit       Test Control Register 2 */
-        /* 0x015a - 0x015b:     reserved */
-#define B2_GP_IO                0x015c  /* 32 bit       General Purpose I/O Register */
-#define B2_I2C_CTRL             0x0160  /* 32 bit       I2C HW Control Register */
-#define B2_I2C_DATA             0x0164  /* 32 bit       I2C HW Data Register */
-#define B2_I2C_IRQ              0x0168  /* 32 bit       I2C HW IRQ Register */
-#define B2_I2C_SW               0x016c  /* 32 bit       I2C SW Port Register */
-
-/* Blink Source Counter (GENESIS only) */
-#define B2_BSC_INI              0x0170  /* 32 bit       Blink Source Counter Init Val */
-#define B2_BSC_VAL              0x0174  /* 32 bit       Blink Source Counter Value */
-#define B2_BSC_CTRL             0x0178  /*  8 bit       Blink Source Counter Control */
-#define B2_BSC_STAT             0x0179  /*  8 bit       Blink Source Counter Status */
-#define B2_BSC_TST              0x017a  /* 16 bit       Blink Source Counter Test Reg */
-        /* 0x017c - 0x017f:     reserved */
-
-/*
- *      Bank 3
- */
-/* RAM Random Registers */
-#define B3_RAM_ADDR             0x0180  /* 32 bit       RAM Address, to read or write */
-#define B3_RAM_DATA_LO  0x0184  /* 32 bit       RAM Data Word (low dWord) */
-#define B3_RAM_DATA_HI  0x0188  /* 32 bit       RAM Data Word (high dWord) */
-        /* 0x018c - 0x018f:     reserved */
-
-/* RAM Interface Registers */
-/*
- * The HW-Spec. calls this registers Timeout Value 0..11. But this names are
- * not usable in SW. Please notice these are NOT real timeouts, these are
- * the number of qWords transferred continuously.
- */
-#define B3_RI_WTO_R1    0x0190  /*  8 bit       WR Timeout Queue R1             (TO0) */
-#define B3_RI_WTO_XA1   0x0191  /*  8 bit       WR Timeout Queue XA1    (TO1) */
-#define B3_RI_WTO_XS1   0x0192  /*  8 bit       WR Timeout Queue XS1    (TO2) */
-#define B3_RI_RTO_R1    0x0193  /*  8 bit       RD Timeout Queue R1             (TO3) */
-#define B3_RI_RTO_XA1   0x0194  /*  8 bit       RD Timeout Queue XA1    (TO4) */
-#define B3_RI_RTO_XS1   0x0195  /*  8 bit       RD Timeout Queue XS1    (TO5) */
-#define B3_RI_WTO_R2    0x0196  /*  8 bit       WR Timeout Queue R2             (TO6) */
-#define B3_RI_WTO_XA2   0x0197  /*  8 bit       WR Timeout Queue XA2    (TO7) */
-#define B3_RI_WTO_XS2   0x0198  /*  8 bit       WR Timeout Queue XS2    (TO8) */
-#define B3_RI_RTO_R2    0x0199  /*  8 bit       RD Timeout Queue R2             (TO9) */
-#define B3_RI_RTO_XA2   0x019a  /*  8 bit       RD Timeout Queue XA2    (TO10)*/
-#define B3_RI_RTO_XS2   0x019b  /*  8 bit       RD Timeout Queue XS2    (TO11)*/
-#define B3_RI_TO_VAL    0x019c  /*  8 bit       Current Timeout Count Val */
-        /* 0x019d - 0x019f:     reserved */
-#define B3_RI_CTRL              0x01a0  /* 16 bit       RAM Interface Control Register */
-#define B3_RI_TEST              0x01a2  /*  8 bit       RAM Interface Test Register */
-        /* 0x01a3 - 0x01af:     reserved */
-
-/* MAC Arbiter Registers (GENESIS only) */
-/* these are the no. of qWord transferred continuously and NOT real timeouts */
-#define B3_MA_TOINI_RX1 0x01b0  /*  8 bit       Timeout Init Val Rx Path MAC 1 */
-#define B3_MA_TOINI_RX2 0x01b1  /*  8 bit       Timeout Init Val Rx Path MAC 2 */
-#define B3_MA_TOINI_TX1 0x01b2  /*  8 bit       Timeout Init Val Tx Path MAC 1 */
-#define B3_MA_TOINI_TX2 0x01b3  /*  8 bit       Timeout Init Val Tx Path MAC 2 */
-#define B3_MA_TOVAL_RX1 0x01b4  /*  8 bit       Timeout Value Rx Path MAC 1 */
-#define B3_MA_TOVAL_RX2 0x01b5  /*  8 bit       Timeout Value Rx Path MAC 1 */
-#define B3_MA_TOVAL_TX1 0x01b6  /*  8 bit       Timeout Value Tx Path MAC 2 */
-#define B3_MA_TOVAL_TX2 0x01b7  /*  8 bit       Timeout Value Tx Path MAC 2 */
-#define B3_MA_TO_CTRL   0x01b8  /* 16 bit       MAC Arbiter Timeout Ctrl Reg */
-#define B3_MA_TO_TEST   0x01ba  /* 16 bit       MAC Arbiter Timeout Test Reg */
-        /* 0x01bc - 0x01bf:     reserved */
-#define B3_MA_RCINI_RX1 0x01c0  /*  8 bit       Recovery Init Val Rx Path MAC 1 */
-#define B3_MA_RCINI_RX2 0x01c1  /*  8 bit       Recovery Init Val Rx Path MAC 2 */
-#define B3_MA_RCINI_TX1 0x01c2  /*  8 bit       Recovery Init Val Tx Path MAC 1 */
-#define B3_MA_RCINI_TX2 0x01c3  /*  8 bit       Recovery Init Val Tx Path MAC 2 */
-#define B3_MA_RCVAL_RX1 0x01c4  /*  8 bit       Recovery Value Rx Path MAC 1 */
-#define B3_MA_RCVAL_RX2 0x01c5  /*  8 bit       Recovery Value Rx Path MAC 1 */
-#define B3_MA_RCVAL_TX1 0x01c6  /*  8 bit       Recovery Value Tx Path MAC 2 */
-#define B3_MA_RCVAL_TX2 0x01c7  /*  8 bit       Recovery Value Tx Path MAC 2 */
-#define B3_MA_RC_CTRL   0x01c8  /* 16 bit       MAC Arbiter Recovery Ctrl Reg */
-#define B3_MA_RC_TEST   0x01ca  /* 16 bit       MAC Arbiter Recovery Test Reg */
-        /* 0x01cc - 0x01cf:     reserved */
-
-/* Packet Arbiter Registers (GENESIS only) */
-/* these are real timeouts */
-#define B3_PA_TOINI_RX1 0x01d0  /* 16 bit       Timeout Init Val Rx Path MAC 1 */
-        /* 0x01d2 - 0x01d3:     reserved */
-#define B3_PA_TOINI_RX2 0x01d4  /* 16 bit       Timeout Init Val Rx Path MAC 2 */
-        /* 0x01d6 - 0x01d7:     reserved */
-#define B3_PA_TOINI_TX1 0x01d8  /* 16 bit       Timeout Init Val Tx Path MAC 1 */
-        /* 0x01da - 0x01db:     reserved */
-#define B3_PA_TOINI_TX2 0x01dc  /* 16 bit       Timeout Init Val Tx Path MAC 2 */
-        /* 0x01de - 0x01df:     reserved */
-#define B3_PA_TOVAL_RX1 0x01e0  /* 16 bit       Timeout Val Rx Path MAC 1 */
-        /* 0x01e2 - 0x01e3:     reserved */
-#define B3_PA_TOVAL_RX2 0x01e4  /* 16 bit       Timeout Val Rx Path MAC 2 */
-        /* 0x01e6 - 0x01e7:     reserved */
-#define B3_PA_TOVAL_TX1 0x01e8  /* 16 bit       Timeout Val Tx Path MAC 1 */
-        /* 0x01ea - 0x01eb:     reserved */
-#define B3_PA_TOVAL_TX2 0x01ec  /* 16 bit       Timeout Val Tx Path MAC 2 */
-        /* 0x01ee - 0x01ef:     reserved */
-#define B3_PA_CTRL      0x01f0  /* 16 bit       Packet Arbiter Ctrl Register */
-#define B3_PA_TEST      0x01f2  /* 16 bit       Packet Arbiter Test Register */
-        /* 0x01f4 - 0x01ff:     reserved */
-
-/*
- *      Bank 4 - 5
- */
-/* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
-#define TXA_ITI_INI             0x0200  /* 32 bit       Tx Arb Interval Timer Init Val*/
-#define TXA_ITI_VAL             0x0204  /* 32 bit       Tx Arb Interval Timer Value */
-#define TXA_LIM_INI             0x0208  /* 32 bit       Tx Arb Limit Counter Init Val */
-#define TXA_LIM_VAL             0x020c  /* 32 bit       Tx Arb Limit Counter Value */
-#define TXA_CTRL                0x0210  /*  8 bit       Tx Arbiter Control Register */
-#define TXA_TEST                0x0211  /*  8 bit       Tx Arbiter Test Register */
-#define TXA_STAT                0x0212  /*  8 bit       Tx Arbiter Status Register */
-        /* 0x0213 - 0x027f:     reserved */
-        /* 0x0280 - 0x0292:     MAC 2 */
-        /* 0x0213 - 0x027f:     reserved */
-
-/*
- *      Bank 6
- */
-/* External registers (GENESIS only) */
-#define B6_EXT_REG              0x0300
-
-/*
- *      Bank 7
- */
-/* This is a copy of the Configuration register file (lower half) */
-#define B7_CFG_SPC              0x0380
-
-/*
- *      Bank 8 - 15
- */
-/* Receive and Transmit Queue Registers, use Q_ADDR() to access */
-#define B8_Q_REGS               0x0400
-
-/* Queue Register Offsets, use Q_ADDR() to access */
-#define Q_D             0x00    /* 8*32 bit     Current Descriptor */
-#define Q_DA_L  0x20    /* 32 bit       Current Descriptor Address Low dWord */
-#define Q_DA_H  0x24    /* 32 bit       Current Descriptor Address High dWord */
-#define Q_AC_L  0x28    /* 32 bit       Current Address Counter Low dWord */
-#define Q_AC_H  0x2c    /* 32 bit       Current Address Counter High dWord */
-#define Q_BC    0x30    /* 32 bit       Current Byte Counter */
-#define Q_CSR   0x34    /* 32 bit       BMU Control/Status Register */
-#define Q_F             0x38    /* 32 bit       Flag Register */
-#define Q_T1    0x3c    /* 32 bit       Test Register 1 */
-#define Q_T1_TR 0x3c    /*  8 bit       Test Register 1 Transfer SM */
-#define Q_T1_WR 0x3d    /*  8 bit       Test Register 1 Write Descriptor SM */
-#define Q_T1_RD 0x3e    /*  8 bit       Test Register 1 Read Descriptor SM */
-#define Q_T1_SV 0x3f    /*  8 bit       Test Register 1 Supervisor SM */
-#define Q_T2    0x40    /* 32 bit       Test Register 2 */
-#define Q_T3    0x44    /* 32 bit       Test Register 3 */
-        /* 0x48 - 0x7f: reserved */
-
-/*
- *      Bank 16 - 23
- */
-/* RAM Buffer Registers */
-#define B16_RAM_REGS    0x0800
-
-/* RAM Buffer Register Offsets, use RB_ADDR() to access */
-#define RB_START                0x00    /* 32 bit       RAM Buffer Start Address */
-#define RB_END                  0x04    /* 32 bit       RAM Buffer End Address */
-#define RB_WP                   0x08    /* 32 bit       RAM Buffer Write Pointer */
-#define RB_RP                   0x0c    /* 32 bit       RAM Buffer Read Pointer */
-#define RB_RX_UTPP              0x10    /* 32 bit       Rx Upper Threshold, Pause Pack */
-#define RB_RX_LTPP              0x14    /* 32 bit       Rx Lower Threshold, Pause Pack */
-#define RB_RX_UTHP              0x18    /* 32 bit       Rx Upper Threshold, High Prio */
-#define RB_RX_LTHP              0x1c    /* 32 bit       Rx Lower Threshold, High Prio */
-        /* 0x10 - 0x1f: reserved at Tx RAM Buffer Registers */
-#define RB_PC                   0x20    /* 32 bit       RAM Buffer Packet Counter */
-#define RB_LEV                  0x24    /* 32 bit       RAM Buffer Level Register */
-#define RB_CTRL                 0x28    /*  8 bit       RAM Buffer Control Register */
-#define RB_TST1                 0x29    /*  8 bit       RAM Buffer Test Register 1 */
-#define RB_TST2                 0x2A    /*  8 bit       RAM Buffer Test Register 2 */
-        /* 0x2c - 0x7f: reserved */
-
-/*
- *      Bank 24
- */
-/*
- * Receive MAC FIFO, Receive LED, and Link_Sync regs (GENESIS only)
- * use MR_ADDR() to access
- */
-#define RX_MFF_EA               0x0c00  /* 32 bit       Receive MAC FIFO End Address */
-#define RX_MFF_WP               0x0c04  /* 32 bit       Receive MAC FIFO Write Pointer */
-        /* 0x0c08 - 0x0c0b:     reserved */
-#define RX_MFF_RP               0x0c0c  /* 32 bit       Receive MAC FIFO Read Pointer */
-#define RX_MFF_PC               0x0c10  /* 32 bit       Receive MAC FIFO Packet Cnt */
-#define RX_MFF_LEV              0x0c14  /* 32 bit       Receive MAC FIFO Level */
-#define RX_MFF_CTRL1    0x0c18  /* 16 bit       Receive MAC FIFO Control Reg 1*/
-#define RX_MFF_STAT_TO  0x0c1a  /*  8 bit       Receive MAC Status Timeout */
-#define RX_MFF_TIST_TO  0x0c1b  /*  8 bit       Receive MAC Time Stamp Timeout */
-#define RX_MFF_CTRL2    0x0c1c  /*  8 bit       Receive MAC FIFO Control Reg 2*/
-#define RX_MFF_TST1             0x0c1d  /*  8 bit       Receive MAC FIFO Test Reg 1 */
-#define RX_MFF_TST2             0x0c1e  /*  8 bit       Receive MAC FIFO Test Reg 2 */
-        /* 0x0c1f:      reserved */
-#define RX_LED_INI              0x0c20  /* 32 bit       Receive LED Cnt Init Value */
-#define RX_LED_VAL              0x0c24  /* 32 bit       Receive LED Cnt Current Value */
-#define RX_LED_CTRL             0x0c28  /*  8 bit       Receive LED Cnt Control Reg */
-#define RX_LED_TST              0x0c29  /*  8 bit       Receive LED Cnt Test Register */
-        /* 0x0c2a - 0x0c2f:     reserved */
-#define LNK_SYNC_INI    0x0c30  /* 32 bit       Link Sync Cnt Init Value */
-#define LNK_SYNC_VAL    0x0c34  /* 32 bit       Link Sync Cnt Current Value */
-#define LNK_SYNC_CTRL   0x0c38  /*  8 bit       Link Sync Cnt Control Register */
-#define LNK_SYNC_TST    0x0c39  /*  8 bit       Link Sync Cnt Test Register */
-        /* 0x0c3a - 0x0c3b:     reserved */
-#define LNK_LED_REG             0x0c3c  /*  8 bit       Link LED Register */
-        /* 0x0c3d - 0x0c3f:     reserved */
-
-/* Receive GMAC FIFO (YUKON only), use MR_ADDR() to access */
-#define RX_GMF_EA               0x0c40  /* 32 bit       Rx GMAC FIFO End Address */
-#define RX_GMF_AF_THR   0x0c44  /* 32 bit       Rx GMAC FIFO Almost Full Thresh. */
-#define RX_GMF_CTRL_T   0x0c48  /* 32 bit       Rx GMAC FIFO Control/Test */
-#define RX_GMF_FL_MSK   0x0c4c  /* 32 bit       Rx GMAC FIFO Flush Mask */
-#define RX_GMF_FL_THR   0x0c50  /* 32 bit       Rx GMAC FIFO Flush Threshold */
-        /* 0x0c54 - 0x0c5f:     reserved */
-#define RX_GMF_WP               0x0c60  /* 32 bit       Rx GMAC FIFO Write Pointer */
-        /* 0x0c64 - 0x0c67:     reserved */
-#define RX_GMF_WLEV             0x0c68  /* 32 bit       Rx GMAC FIFO Write Level */
-        /* 0x0c6c - 0x0c6f:     reserved */
-#define RX_GMF_RP               0x0c70  /* 32 bit       Rx GMAC FIFO Read Pointer */
-        /* 0x0c74 - 0x0c77:     reserved */
-#define RX_GMF_RLEV             0x0c78  /* 32 bit       Rx GMAC FIFO Read Level */
-        /* 0x0c7c - 0x0c7f:     reserved */
-
-/*
- *      Bank 25
- */
-        /* 0x0c80 - 0x0cbf:     MAC 2 */
-        /* 0x0cc0 - 0x0cff:     reserved */
-
-/*
- *      Bank 26
- */
-/*
- * Transmit MAC FIFO and Transmit LED Registers (GENESIS only),
- * use MR_ADDR() to access
- */
-#define TX_MFF_EA               0x0d00  /* 32 bit       Transmit MAC FIFO End Address */
-#define TX_MFF_WP               0x0d04  /* 32 bit       Transmit MAC FIFO WR Pointer */
-#define TX_MFF_WSP              0x0d08  /* 32 bit       Transmit MAC FIFO WR Shadow Ptr */
-#define TX_MFF_RP               0x0d0c  /* 32 bit       Transmit MAC FIFO RD Pointer */
-#define TX_MFF_PC               0x0d10  /* 32 bit       Transmit MAC FIFO Packet Cnt */
-#define TX_MFF_LEV              0x0d14  /* 32 bit       Transmit MAC FIFO Level */
-#define TX_MFF_CTRL1    0x0d18  /* 16 bit       Transmit MAC FIFO Ctrl Reg 1 */
-#define TX_MFF_WAF              0x0d1a  /*  8 bit       Transmit MAC Wait after flush */
-        /* 0x0c1b:      reserved */
-#define TX_MFF_CTRL2    0x0d1c  /*  8 bit       Transmit MAC FIFO Ctrl Reg 2 */
-#define TX_MFF_TST1             0x0d1d  /*  8 bit       Transmit MAC FIFO Test Reg 1 */
-#define TX_MFF_TST2             0x0d1e  /*  8 bit       Transmit MAC FIFO Test Reg 2 */
-        /* 0x0d1f:      reserved */
-#define TX_LED_INI              0x0d20  /* 32 bit       Transmit LED Cnt Init Value */
-#define TX_LED_VAL              0x0d24  /* 32 bit       Transmit LED Cnt Current Val */
-#define TX_LED_CTRL             0x0d28  /*  8 bit       Transmit LED Cnt Control Reg */
-#define TX_LED_TST              0x0d29  /*  8 bit       Transmit LED Cnt Test Reg */
-        /* 0x0d2a - 0x0d3f:     reserved */
-
-/* Transmit GMAC FIFO (YUKON only), use MR_ADDR() to access */
-#define TX_GMF_EA               0x0d40  /* 32 bit       Tx GMAC FIFO End Address */
-#define TX_GMF_AE_THR   0x0d44  /* 32 bit       Tx GMAC FIFO Almost Empty Thresh.*/
-#define TX_GMF_CTRL_T   0x0d48  /* 32 bit       Tx GMAC FIFO Control/Test */
-        /* 0x0d4c - 0x0d5f:     reserved */
-#define TX_GMF_WP               0x0d60  /* 32 bit       Tx GMAC FIFO Write Pointer */
-#define TX_GMF_WSP              0x0d64  /* 32 bit       Tx GMAC FIFO Write Shadow Ptr. */
-#define TX_GMF_WLEV             0x0d68  /* 32 bit       Tx GMAC FIFO Write Level */
-        /* 0x0d6c - 0x0d6f:     reserved */
-#define TX_GMF_RP               0x0d70  /* 32 bit       Tx GMAC FIFO Read Pointer */
-#define TX_GMF_RSTP             0x0d74  /* 32 bit       Tx GMAC FIFO Restart Pointer */
-#define TX_GMF_RLEV             0x0d78  /* 32 bit       Tx GMAC FIFO Read Level */
-        /* 0x0d7c - 0x0d7f:     reserved */
-
-/*
- *      Bank 27
- */
-        /* 0x0d80 - 0x0dbf:     MAC 2 */
-        /* 0x0daa - 0x0dff:     reserved */
-
-/*
- *      Bank 28
- */
-/* Descriptor Poll Timer Registers */
-#define B28_DPT_INI             0x0e00  /* 24 bit       Descriptor Poll Timer Init Val */
-#define B28_DPT_VAL             0x0e04  /* 24 bit       Descriptor Poll Timer Curr Val */
-#define B28_DPT_CTRL    0x0e08  /*  8 bit       Descriptor Poll Timer Ctrl Reg */
-        /* 0x0e09:      reserved */
-#define B28_DPT_TST             0x0e0a  /*  8 bit       Descriptor Poll Timer Test Reg */
-        /* 0x0e0b:      reserved */
-
-/* Time Stamp Timer Registers (YUKON only) */
-        /* 0x0e10:      reserved */
-#define GMAC_TI_ST_VAL  0x0e14  /* 32 bit       Time Stamp Timer Curr Val */
-#define GMAC_TI_ST_CTRL 0x0e18  /*  8 bit       Time Stamp Timer Ctrl Reg */
-        /* 0x0e19:      reserved */
-#define GMAC_TI_ST_TST  0x0e1a  /*  8 bit       Time Stamp Timer Test Reg */
-        /* 0x0e1b - 0x0e7f:     reserved */
-
-/*
- *      Bank 29
- */
-        /* 0x0e80 - 0x0efc:     reserved */
-
-/*
- *      Bank 30
- */
-/* GMAC and GPHY Control Registers (YUKON only) */
-#define GMAC_CTRL               0x0f00  /* 32 bit       GMAC Control Reg */
-#define GPHY_CTRL               0x0f04  /* 32 bit       GPHY Control Reg */
-#define GMAC_IRQ_SRC    0x0f08  /*  8 bit       GMAC Interrupt Source Reg */
-        /* 0x0f09 - 0x0f0b:     reserved */
-#define GMAC_IRQ_MSK    0x0f0c  /*  8 bit       GMAC Interrupt Mask Reg */
-        /* 0x0f0d - 0x0f0f:     reserved */
-#define GMAC_LINK_CTRL  0x0f10  /* 16 bit       Link Control Reg */
-        /* 0x0f14 - 0x0f1f:     reserved */
-
-/* Wake-up Frame Pattern Match Control Registers (YUKON only) */
-
-#define WOL_REG_OFFS    0x20    /* HW-Bug: Address is + 0x20 against spec. */
-
-#define WOL_CTRL_STAT   0x0f20  /* 16 bit       WOL Control/Status Reg */
-#define WOL_MATCH_CTL   0x0f22  /*  8 bit       WOL Match Control Reg */
-#define WOL_MATCH_RES   0x0f23  /*  8 bit       WOL Match Result Reg */
-#define WOL_MAC_ADDR_LO 0x0f24  /* 32 bit       WOL MAC Address Low */
-#define WOL_MAC_ADDR_HI 0x0f28  /* 16 bit       WOL MAC Address High */
-#define WOL_PATT_RPTR   0x0f2c  /*  8 bit       WOL Pattern Read Ptr */
-
-/* use this macro to access above registers */
-#define WOL_REG(Reg)    ((Reg) + (pAC->GIni.GIWolOffs))
-
-
-/* WOL Pattern Length Registers (YUKON only) */
-
-#define WOL_PATT_LEN_LO 0x0f30          /* 32 bit       WOL Pattern Length 3..0 */
-#define WOL_PATT_LEN_HI 0x0f34          /* 24 bit       WOL Pattern Length 6..4 */
-
-/* WOL Pattern Counter Registers (YUKON only) */
-
-#define WOL_PATT_CNT_0  0x0f38          /* 32 bit       WOL Pattern Counter 3..0 */
-#define WOL_PATT_CNT_4  0x0f3c          /* 24 bit       WOL Pattern Counter 6..4 */
-        /* 0x0f40 - 0x0f7f:     reserved */
-
-/*
- *      Bank 31
- */
-/* 0x0f80 - 0x0fff:     reserved */
-
-/*
- *      Bank 32 - 33
- */
-#define WOL_PATT_RAM_1  0x1000  /*  WOL Pattern RAM Link 1 */
-
-/*
- *      Bank 0x22 - 0x3f
- */
-/* 0x1100 - 0x1fff:     reserved */
-
-/*
- *      Bank 0x40 - 0x4f
- */
-#define BASE_XMAC_1             0x2000  /* XMAC 1 registers */
-
-/*
- *      Bank 0x50 - 0x5f
- */
-
-#define BASE_GMAC_1             0x2800  /* GMAC 1 registers */
-
-/*
- *      Bank 0x60 - 0x6f
- */
-#define BASE_XMAC_2             0x3000  /* XMAC 2 registers */
-
-/*
- *      Bank 0x70 - 0x7f
- */
-#define BASE_GMAC_2             0x3800  /* GMAC 2 registers */
-
-/*
- *      Control Register Bit Definitions:
- */
-/*      B0_RAP          8 bit   Register Address Port */
-                                                                /* Bit 7:       reserved */
-#define RAP_RAP                 0x3f    /* Bit 6..0:    0 = block 0,..,6f = block 6f */
-
-/*      B0_CTST                 16 bit  Control/Status register */
-                                                                /* Bit 15..14:  reserved */
-#define CS_CLK_RUN_HOT  BIT_13S         /* CLK_RUN hot m. (YUKON-Lite only) */
-#define CS_CLK_RUN_RST  BIT_12S         /* CLK_RUN reset  (YUKON-Lite only) */
-#define CS_CLK_RUN_ENA  BIT_11S         /* CLK_RUN enable (YUKON-Lite only) */
-#define CS_VAUX_AVAIL   BIT_10S         /* VAUX available (YUKON only) */
-#define CS_BUS_CLOCK    BIT_9S          /* Bus Clock 0/1 = 33/66 MHz */
-#define CS_BUS_SLOT_SZ  BIT_8S          /* Slot Size 0/1 = 32/64 bit slot */
-#define CS_ST_SW_IRQ    BIT_7S          /* Set IRQ SW Request */
-#define CS_CL_SW_IRQ    BIT_6S          /* Clear IRQ SW Request */
-#define CS_STOP_DONE    BIT_5S          /* Stop Master is finished */
-#define CS_STOP_MAST    BIT_4S          /* Command Bit to stop the master */
-#define CS_MRST_CLR             BIT_3S          /* Clear Master reset   */
-#define CS_MRST_SET             BIT_2S          /* Set Master reset     */
-#define CS_RST_CLR              BIT_1S          /* Clear Software reset */
-#define CS_RST_SET              BIT_0S          /* Set   Software reset */
-
-/*      B0_LED                   8 Bit  LED register */
-                                                                /* Bit  7.. 2:  reserved */
-#define LED_STAT_ON             BIT_1S          /* Status LED on        */
-#define LED_STAT_OFF    BIT_0S          /* Status LED off       */
-
-/*      B0_POWER_CTRL    8 Bit  Power Control reg (YUKON only) */
-#define PC_VAUX_ENA             BIT_7           /* Switch VAUX Enable  */
-#define PC_VAUX_DIS             BIT_6       /* Switch VAUX Disable */
-#define PC_VCC_ENA              BIT_5       /* Switch VCC Enable  */
-#define PC_VCC_DIS              BIT_4       /* Switch VCC Disable */
-#define PC_VAUX_ON              BIT_3       /* Switch VAUX On  */
-#define PC_VAUX_OFF             BIT_2       /* Switch VAUX Off */
-#define PC_VCC_ON               BIT_1       /* Switch VCC On  */
-#define PC_VCC_OFF              BIT_0       /* Switch VCC Off */
-
-/*      B0_ISRC                 32 bit  Interrupt Source Register */
-/*      B0_IMSK                 32 bit  Interrupt Mask Register */
-/*      B0_SP_ISRC              32 bit  Special Interrupt Source Reg */
-/*      B2_IRQM_MSK     32 bit  IRQ Moderation Mask */
-#define IS_ALL_MSK              0xbfffffffUL    /* All Interrupt bits */
-#define IS_HW_ERR               BIT_31          /* Interrupt HW Error */
-                                                                /* Bit 30:      reserved */
-#define IS_PA_TO_RX1    BIT_29          /* Packet Arb Timeout Rx1 */
-#define IS_PA_TO_RX2    BIT_28          /* Packet Arb Timeout Rx2 */
-#define IS_PA_TO_TX1    BIT_27          /* Packet Arb Timeout Tx1 */
-#define IS_PA_TO_TX2    BIT_26          /* Packet Arb Timeout Tx2 */
-#define IS_I2C_READY    BIT_25          /* IRQ on end of I2C Tx */
-#define IS_IRQ_SW               BIT_24          /* SW forced IRQ        */
-#define IS_EXT_REG              BIT_23          /* IRQ from LM80 or PHY (GENESIS only) */
-                                                                        /* IRQ from PHY (YUKON only) */
-#define IS_TIMINT               BIT_22          /* IRQ from Timer       */
-#define IS_MAC1                 BIT_21          /* IRQ from MAC 1       */
-#define IS_LNK_SYNC_M1  BIT_20          /* Link Sync Cnt wrap MAC 1 */
-#define IS_MAC2                 BIT_19          /* IRQ from MAC 2       */
-#define IS_LNK_SYNC_M2  BIT_18          /* Link Sync Cnt wrap MAC 2 */
-/* Receive Queue 1 */
-#define IS_R1_B                 BIT_17          /* Q_R1 End of Buffer */
-#define IS_R1_F                 BIT_16          /* Q_R1 End of Frame */
-#define IS_R1_C                 BIT_15          /* Q_R1 Encoding Error */
-/* Receive Queue 2 */
-#define IS_R2_B                 BIT_14          /* Q_R2 End of Buffer */
-#define IS_R2_F                 BIT_13          /* Q_R2 End of Frame */
-#define IS_R2_C                 BIT_12          /* Q_R2 Encoding Error */
-/* Synchronous Transmit Queue 1 */
-#define IS_XS1_B                BIT_11          /* Q_XS1 End of Buffer */
-#define IS_XS1_F                BIT_10          /* Q_XS1 End of Frame */
-#define IS_XS1_C                BIT_9           /* Q_XS1 Encoding Error */
-/* Asynchronous Transmit Queue 1 */
-#define IS_XA1_B                BIT_8           /* Q_XA1 End of Buffer */
-#define IS_XA1_F                BIT_7           /* Q_XA1 End of Frame */
-#define IS_XA1_C                BIT_6           /* Q_XA1 Encoding Error */
-/* Synchronous Transmit Queue 2 */
-#define IS_XS2_B                BIT_5           /* Q_XS2 End of Buffer */
-#define IS_XS2_F                BIT_4           /* Q_XS2 End of Frame */
-#define IS_XS2_C                BIT_3           /* Q_XS2 Encoding Error */
-/* Asynchronous Transmit Queue 2 */
-#define IS_XA2_B                BIT_2           /* Q_XA2 End of Buffer */
-#define IS_XA2_F                BIT_1           /* Q_XA2 End of Frame */
-#define IS_XA2_C                BIT_0           /* Q_XA2 Encoding Error */
-
-
-/*      B0_HWE_ISRC             32 bit  HW Error Interrupt Src Reg */
-/*      B0_HWE_IMSK             32 bit  HW Error Interrupt Mask Reg */
-/*      B2_IRQM_HWE_MSK 32 bit  IRQ Moderation HW Error Mask */
-#define IS_ERR_MSK              0x00000fffL     /*              All Error bits */
-                                                                /* Bit 31..14:  reserved */
-#define IS_IRQ_TIST_OV  BIT_13  /* Time Stamp Timer Overflow (YUKON only) */
-#define IS_IRQ_SENSOR   BIT_12  /* IRQ from Sensor (YUKON only) */
-#define IS_IRQ_MST_ERR  BIT_11  /* IRQ master error detected */
-#define IS_IRQ_STAT             BIT_10  /* IRQ status exception */
-#define IS_NO_STAT_M1   BIT_9   /* No Rx Status from MAC 1 */
-#define IS_NO_STAT_M2   BIT_8   /* No Rx Status from MAC 2 */
-#define IS_NO_TIST_M1   BIT_7   /* No Time Stamp from MAC 1 */
-#define IS_NO_TIST_M2   BIT_6   /* No Time Stamp from MAC 2 */
-#define IS_RAM_RD_PAR   BIT_5   /* RAM Read  Parity Error */
-#define IS_RAM_WR_PAR   BIT_4   /* RAM Write Parity Error */
-#define IS_M1_PAR_ERR   BIT_3   /* MAC 1 Parity Error */
-#define IS_M2_PAR_ERR   BIT_2   /* MAC 2 Parity Error */
-#define IS_R1_PAR_ERR   BIT_1   /* Queue R1 Parity Error */
-#define IS_R2_PAR_ERR   BIT_0   /* Queue R2 Parity Error */
-
-/*      B2_CONN_TYP              8 bit  Connector type */
-/*      B2_PMD_TYP               8 bit  PMD type */
-/*      Values of connector and PMD type comply to SysKonnect internal std */
-
-/*      B2_MAC_CFG               8 bit  MAC Configuration / Chip Revision */
-#define CFG_CHIP_R_MSK  (0xf<<4)        /* Bit 7.. 4: Chip Revision */
-                                                                        /* Bit 3.. 2:   reserved */
-#define CFG_DIS_M2_CLK  BIT_1S          /* Disable Clock for 2nd MAC */
-#define CFG_SNG_MAC             BIT_0S          /* MAC Config: 0=2 MACs / 1=1 MAC*/
-
-/*      B2_CHIP_ID               8 bit  Chip Identification Number */
-#define CHIP_ID_GENESIS         0x0a    /* Chip ID for GENESIS */
-#define CHIP_ID_YUKON           0xb0    /* Chip ID for YUKON */
-#define CHIP_ID_YUKON_LITE      0xb1    /* Chip ID for YUKON-Lite (Rev. A1-A3) */
-#define CHIP_ID_YUKON_LP        0xb2    /* Chip ID for YUKON-LP */
-
-#define CHIP_REV_YU_LITE_A1     3               /* Chip Rev. for YUKON-Lite A1,A2 */
-#define CHIP_REV_YU_LITE_A3     7               /* Chip Rev. for YUKON-Lite A3 */
-
-/*      B2_FAR                  32 bit  Flash-Prom Addr Reg/Cnt */
-#define FAR_ADDR                0x1ffffL        /* Bit 16.. 0:  FPROM Address mask */
-
-/*      B2_LD_CTRL               8 bit  EPROM loader control register */
-/*      Bits are currently reserved */
-
-/*      B2_LD_TEST               8 bit  EPROM loader test register */
-                                                                /* Bit 7.. 4:   reserved */
-#define LD_T_ON                 BIT_3S  /* Loader Test mode on */
-#define LD_T_OFF                BIT_2S  /* Loader Test mode off */
-#define LD_T_STEP               BIT_1S  /* Decrement FPROM addr. Counter */
-#define LD_START                BIT_0S  /* Start loading FPROM */
-
-/*
- *      Timer Section
- */
-/*      B2_TI_CTRL               8 bit  Timer control */
-/*      B2_IRQM_CTRL     8 bit  IRQ Moderation Timer Control */
-                                                                /* Bit 7.. 3:   reserved */
-#define TIM_START               BIT_2S  /* Start Timer */
-#define TIM_STOP                BIT_1S  /* Stop  Timer */
-#define TIM_CLR_IRQ             BIT_0S  /* Clear Timer IRQ (!IRQM) */
-
-/*      B2_TI_TEST               8 Bit  Timer Test */
-/*      B2_IRQM_TEST     8 bit  IRQ Moderation Timer Test */
-/*      B28_DPT_TST              8 bit  Descriptor Poll Timer Test Reg */
-                                                                /* Bit 7.. 3:   reserved */
-#define TIM_T_ON                BIT_2S  /* Test mode on */
-#define TIM_T_OFF               BIT_1S  /* Test mode off */
-#define TIM_T_STEP              BIT_0S  /* Test step */
-
-/*      B28_DPT_INI     32 bit  Descriptor Poll Timer Init Val */
-/*      B28_DPT_VAL     32 bit  Descriptor Poll Timer Curr Val */
-                                                                /* Bit 31..24:  reserved */
-#define DPT_MSK         0x00ffffffL     /* Bit 23.. 0:  Desc Poll Timer Bits */
-
-/*      B28_DPT_CTRL     8 bit  Descriptor Poll Timer Ctrl Reg */
-                                                                /* Bit  7.. 2:  reserved */
-#define DPT_START               BIT_1S  /* Start Descriptor Poll Timer */
-#define DPT_STOP                BIT_0S  /* Stop  Descriptor Poll Timer */
-
-/*      B2_E_3                   8 bit  lower 4 bits used for HW self test result */
-#define B2_E3_RES_MASK  0x0f
-
-/*      B2_TST_CTRL1     8 bit  Test Control Register 1 */
-#define TST_FRC_DPERR_MR        BIT_7S  /* force DATAPERR on MST RD */
-#define TST_FRC_DPERR_MW        BIT_6S  /* force DATAPERR on MST WR */
-#define TST_FRC_DPERR_TR        BIT_5S  /* force DATAPERR on TRG RD */
-#define TST_FRC_DPERR_TW        BIT_4S  /* force DATAPERR on TRG WR */
-#define TST_FRC_APERR_M         BIT_3S  /* force ADDRPERR on MST */
-#define TST_FRC_APERR_T         BIT_2S  /* force ADDRPERR on TRG */
-#define TST_CFG_WRITE_ON        BIT_1S  /* Enable  Config Reg WR */
-#define TST_CFG_WRITE_OFF       BIT_0S  /* Disable Config Reg WR */
-
-/*      B2_TST_CTRL2     8 bit  Test Control Register 2 */
-                                                                        /* Bit 7.. 4:   reserved */
-                        /* force the following error on the next master read/write      */
-#define TST_FRC_DPERR_MR64      BIT_3S  /* DataPERR RD 64       */
-#define TST_FRC_DPERR_MW64      BIT_2S  /* DataPERR WR 64       */
-#define TST_FRC_APERR_1M64      BIT_1S  /* AddrPERR on 1. phase */
-#define TST_FRC_APERR_2M64      BIT_0S  /* AddrPERR on 2. phase */
-
-/*      B2_GP_IO                32 bit  General Purpose I/O Register */
-                                                        /* Bit 31..26:  reserved */
-#define GP_DIR_9        BIT_25  /* IO_9 direct, 0=In/1=Out */
-#define GP_DIR_8        BIT_24  /* IO_8 direct, 0=In/1=Out */
-#define GP_DIR_7        BIT_23  /* IO_7 direct, 0=In/1=Out */
-#define GP_DIR_6        BIT_22  /* IO_6 direct, 0=In/1=Out */
-#define GP_DIR_5        BIT_21  /* IO_5 direct, 0=In/1=Out */
-#define GP_DIR_4        BIT_20  /* IO_4 direct, 0=In/1=Out */
-#define GP_DIR_3        BIT_19  /* IO_3 direct, 0=In/1=Out */
-#define GP_DIR_2        BIT_18  /* IO_2 direct, 0=In/1=Out */
-#define GP_DIR_1        BIT_17  /* IO_1 direct, 0=In/1=Out */
-#define GP_DIR_0        BIT_16  /* IO_0 direct, 0=In/1=Out */
-                                                /* Bit 15..10:  reserved */
-#define GP_IO_9         BIT_9   /* IO_9 pin */
-#define GP_IO_8         BIT_8   /* IO_8 pin */
-#define GP_IO_7         BIT_7   /* IO_7 pin */
-#define GP_IO_6         BIT_6   /* IO_6 pin */
-#define GP_IO_5         BIT_5   /* IO_5 pin */
-#define GP_IO_4         BIT_4   /* IO_4 pin */
-#define GP_IO_3         BIT_3   /* IO_3 pin */
-#define GP_IO_2         BIT_2   /* IO_2 pin */
-#define GP_IO_1         BIT_1   /* IO_1 pin */
-#define GP_IO_0         BIT_0   /* IO_0 pin */
-
-/*      B2_I2C_CTRL             32 bit  I2C HW Control Register */
-#define I2C_FLAG                BIT_31          /* Start read/write if WR */
-#define I2C_ADDR                (0x7fffL<<16)   /* Bit 30..16:  Addr to be RD/WR */
-#define I2C_DEV_SEL             (0x7fL<<9)              /* Bit 15.. 9:  I2C Device Select */
-                                                                /* Bit  8.. 5:  reserved        */
-#define I2C_BURST_LEN   BIT_4           /* Burst Len, 1/4 bytes */
-#define I2C_DEV_SIZE    (7<<1)          /* Bit  3.. 1:  I2C Device Size */
-#define I2C_025K_DEV    (0<<1)          /*              0: 256 Bytes or smal. */
-#define I2C_05K_DEV             (1<<1)          /*              1: 512  Bytes   */
-#define I2C_1K_DEV              (2<<1)          /*              2: 1024 Bytes   */
-#define I2C_2K_DEV              (3<<1)          /*              3: 2048 Bytes   */
-#define I2C_4K_DEV              (4<<1)          /*              4: 4096 Bytes   */
-#define I2C_8K_DEV              (5<<1)          /*              5: 8192 Bytes   */
-#define I2C_16K_DEV             (6<<1)          /*              6: 16384 Bytes  */
-#define I2C_32K_DEV             (7<<1)          /*              7: 32768 Bytes  */
-#define I2C_STOP                BIT_0           /* Interrupt I2C transfer */
-
-/*      B2_I2C_IRQ              32 bit  I2C HW IRQ Register */
-                                                                /* Bit 31.. 1   reserved */
-#define I2C_CLR_IRQ             BIT_0   /* Clear I2C IRQ */
-
-/*      B2_I2C_SW               32 bit (8 bit access)   I2C HW SW Port Register */
-                                                                /* Bit  7.. 3:  reserved */
-#define I2C_DATA_DIR    BIT_2S          /* direction of I2C_DATA */
-#define I2C_DATA                BIT_1S          /* I2C Data Port        */
-#define I2C_CLK                 BIT_0S          /* I2C Clock Port       */
-
-/*
- * I2C Address
- */
-#define I2C_SENS_ADDR   LM80_ADDR       /* I2C Sensor Address, (Volt and Temp)*/
-
-
-/*      B2_BSC_CTRL              8 bit  Blink Source Counter Control */
-                                                        /* Bit  7.. 2:  reserved */
-#define BSC_START       BIT_1S          /* Start Blink Source Counter */
-#define BSC_STOP        BIT_0S          /* Stop  Blink Source Counter */
-
-/*      B2_BSC_STAT              8 bit  Blink Source Counter Status */
-                                                        /* Bit  7.. 1:  reserved */
-#define BSC_SRC         BIT_0S          /* Blink Source, 0=Off / 1=On */
-
-/*      B2_BSC_TST              16 bit  Blink Source Counter Test Reg */
-#define BSC_T_ON        BIT_2S          /* Test mode on */
-#define BSC_T_OFF       BIT_1S          /* Test mode off */
-#define BSC_T_STEP      BIT_0S          /* Test step */
-
-
-/*      B3_RAM_ADDR             32 bit  RAM Address, to read or write */
-                                        /* Bit 31..19:  reserved */
-#define RAM_ADR_RAN     0x0007ffffL     /* Bit 18.. 0:  RAM Address Range */
-
-/* RAM Interface Registers */
-/*      B3_RI_CTRL              16 bit  RAM Iface Control Register */
-                                                                /* Bit 15..10:  reserved */
-#define RI_CLR_RD_PERR  BIT_9S  /* Clear IRQ RAM Read Parity Err */
-#define RI_CLR_WR_PERR  BIT_8S  /* Clear IRQ RAM Write Parity Err*/
-                                                                /* Bit  7.. 2:  reserved */
-#define RI_RST_CLR              BIT_1S  /* Clear RAM Interface Reset */
-#define RI_RST_SET              BIT_0S  /* Set   RAM Interface Reset */
-
-/*      B3_RI_TEST               8 bit  RAM Iface Test Register */
-                                                                /* Bit 15.. 4:  reserved */
-#define RI_T_EV                 BIT_3S  /* Timeout Event occured */
-#define RI_T_ON                 BIT_2S  /* Timeout Timer Test On */
-#define RI_T_OFF                BIT_1S  /* Timeout Timer Test Off */
-#define RI_T_STEP               BIT_0S  /* Timeout Timer Step */
-
-/* MAC Arbiter Registers */
-/*      B3_MA_TO_CTRL   16 bit  MAC Arbiter Timeout Ctrl Reg */
-                                                                /* Bit 15.. 4:  reserved */
-#define MA_FOE_ON               BIT_3S  /* XMAC Fast Output Enable ON */
-#define MA_FOE_OFF              BIT_2S  /* XMAC Fast Output Enable OFF */
-#define MA_RST_CLR              BIT_1S  /* Clear MAC Arbiter Reset */
-#define MA_RST_SET              BIT_0S  /* Set   MAC Arbiter Reset */
-
-/*      B3_MA_RC_CTRL   16 bit  MAC Arbiter Recovery Ctrl Reg */
-                                                                /* Bit 15.. 8:  reserved */
-#define MA_ENA_REC_TX2  BIT_7S  /* Enable  Recovery Timer TX2 */
-#define MA_DIS_REC_TX2  BIT_6S  /* Disable Recovery Timer TX2 */
-#define MA_ENA_REC_TX1  BIT_5S  /* Enable  Recovery Timer TX1 */
-#define MA_DIS_REC_TX1  BIT_4S  /* Disable Recovery Timer TX1 */
-#define MA_ENA_REC_RX2  BIT_3S  /* Enable  Recovery Timer RX2 */
-#define MA_DIS_REC_RX2  BIT_2S  /* Disable Recovery Timer RX2 */
-#define MA_ENA_REC_RX1  BIT_1S  /* Enable  Recovery Timer RX1 */
-#define MA_DIS_REC_RX1  BIT_0S  /* Disable Recovery Timer RX1 */
-
-/* Packet Arbiter Registers */
-/*      B3_PA_CTRL              16 bit  Packet Arbiter Ctrl Register */
-                                                                /* Bit 15..14:  reserved */
-#define PA_CLR_TO_TX2   BIT_13S /* Clear IRQ Packet Timeout TX2 */
-#define PA_CLR_TO_TX1   BIT_12S /* Clear IRQ Packet Timeout TX1 */
-#define PA_CLR_TO_RX2   BIT_11S /* Clear IRQ Packet Timeout RX2 */
-#define PA_CLR_TO_RX1   BIT_10S /* Clear IRQ Packet Timeout RX1 */
-#define PA_ENA_TO_TX2   BIT_9S  /* Enable  Timeout Timer TX2 */
-#define PA_DIS_TO_TX2   BIT_8S  /* Disable Timeout Timer TX2 */
-#define PA_ENA_TO_TX1   BIT_7S  /* Enable  Timeout Timer TX1 */
-#define PA_DIS_TO_TX1   BIT_6S  /* Disable Timeout Timer TX1 */
-#define PA_ENA_TO_RX2   BIT_5S  /* Enable  Timeout Timer RX2 */
-#define PA_DIS_TO_RX2   BIT_4S  /* Disable Timeout Timer RX2 */
-#define PA_ENA_TO_RX1   BIT_3S  /* Enable  Timeout Timer RX1 */
-#define PA_DIS_TO_RX1   BIT_2S  /* Disable Timeout Timer RX1 */
-#define PA_RST_CLR              BIT_1S  /* Clear MAC Arbiter Reset */
-#define PA_RST_SET              BIT_0S  /* Set   MAC Arbiter Reset */
-
-#define PA_ENA_TO_ALL   (PA_ENA_TO_RX1 | PA_ENA_TO_RX2 |\
-                                                PA_ENA_TO_TX1 | PA_ENA_TO_TX2)
-
-/* Rx/Tx Path related Arbiter Test Registers */
-/*      B3_MA_TO_TEST   16 bit  MAC Arbiter Timeout Test Reg */
-/*      B3_MA_RC_TEST   16 bit  MAC Arbiter Recovery Test Reg */
-/*      B3_PA_TEST              16 bit  Packet Arbiter Test Register */
-/*                      Bit 15, 11, 7, and 3 are reserved in B3_PA_TEST */
-#define TX2_T_EV        BIT_15S         /* TX2 Timeout/Recv Event occured */
-#define TX2_T_ON        BIT_14S         /* TX2 Timeout/Recv Timer Test On */
-#define TX2_T_OFF       BIT_13S         /* TX2 Timeout/Recv Timer Tst Off */
-#define TX2_T_STEP      BIT_12S         /* TX2 Timeout/Recv Timer Step */
-#define TX1_T_EV        BIT_11S         /* TX1 Timeout/Recv Event occured */
-#define TX1_T_ON        BIT_10S         /* TX1 Timeout/Recv Timer Test On */
-#define TX1_T_OFF       BIT_9S          /* TX1 Timeout/Recv Timer Tst Off */
-#define TX1_T_STEP      BIT_8S          /* TX1 Timeout/Recv Timer Step */
-#define RX2_T_EV        BIT_7S          /* RX2 Timeout/Recv Event occured */
-#define RX2_T_ON        BIT_6S          /* RX2 Timeout/Recv Timer Test On */
-#define RX2_T_OFF       BIT_5S          /* RX2 Timeout/Recv Timer Tst Off */
-#define RX2_T_STEP      BIT_4S          /* RX2 Timeout/Recv Timer Step */
-#define RX1_T_EV        BIT_3S          /* RX1 Timeout/Recv Event occured */
-#define RX1_T_ON        BIT_2S          /* RX1 Timeout/Recv Timer Test On */
-#define RX1_T_OFF       BIT_1S          /* RX1 Timeout/Recv Timer Tst Off */
-#define RX1_T_STEP      BIT_0S          /* RX1 Timeout/Recv Timer Step */
-
-
-/* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
-/*      TXA_ITI_INI             32 bit  Tx Arb Interval Timer Init Val */
-/*      TXA_ITI_VAL             32 bit  Tx Arb Interval Timer Value */
-/*      TXA_LIM_INI             32 bit  Tx Arb Limit Counter Init Val */
-/*      TXA_LIM_VAL             32 bit  Tx Arb Limit Counter Value */
-                                                                /* Bit 31..24:  reserved */
-#define TXA_MAX_VAL     0x00ffffffUL/* Bit 23.. 0:      Max TXA Timer/Cnt Val */
-
-/*      TXA_CTRL                 8 bit  Tx Arbiter Control Register */
-#define TXA_ENA_FSYNC   BIT_7S  /* Enable  force of sync Tx queue */
-#define TXA_DIS_FSYNC   BIT_6S  /* Disable force of sync Tx queue */
-#define TXA_ENA_ALLOC   BIT_5S  /* Enable  alloc of free bandwidth */
-#define TXA_DIS_ALLOC   BIT_4S  /* Disable alloc of free bandwidth */
-#define TXA_START_RC    BIT_3S  /* Start sync Rate Control */
-#define TXA_STOP_RC             BIT_2S  /* Stop  sync Rate Control */
-#define TXA_ENA_ARB             BIT_1S  /* Enable  Tx Arbiter */
-#define TXA_DIS_ARB             BIT_0S  /* Disable Tx Arbiter */
-
-/*      TXA_TEST                 8 bit  Tx Arbiter Test Register */
-                                                                /* Bit 7.. 6:   reserved */
-#define TXA_INT_T_ON    BIT_5S  /* Tx Arb Interval Timer Test On */
-#define TXA_INT_T_OFF   BIT_4S  /* Tx Arb Interval Timer Test Off */
-#define TXA_INT_T_STEP  BIT_3S  /* Tx Arb Interval Timer Step */
-#define TXA_LIM_T_ON    BIT_2S  /* Tx Arb Limit Timer Test On */
-#define TXA_LIM_T_OFF   BIT_1S  /* Tx Arb Limit Timer Test Off */
-#define TXA_LIM_T_STEP  BIT_0S  /* Tx Arb Limit Timer Step */
-
-/*      TXA_STAT                 8 bit  Tx Arbiter Status Register */
-                                                                /* Bit 7.. 1:   reserved */
-#define TXA_PRIO_XS             BIT_0S  /* sync queue has prio to send */
-
-/*      Q_BC                    32 bit  Current Byte Counter */
-                                                                /* Bit 31..16:  reserved */
-#define BC_MAX                  0xffff  /* Bit 15.. 0:  Byte counter */
-
-/* BMU Control Status Registers */
-/*      B0_R1_CSR               32 bit  BMU Ctrl/Stat Rx Queue 1 */
-/*      B0_R2_CSR               32 bit  BMU Ctrl/Stat Rx Queue 2 */
-/*      B0_XA1_CSR              32 bit  BMU Ctrl/Stat Sync Tx Queue 1 */
-/*      B0_XS1_CSR              32 bit  BMU Ctrl/Stat Async Tx Queue 1 */
-/*      B0_XA2_CSR              32 bit  BMU Ctrl/Stat Sync Tx Queue 2 */
-/*      B0_XS2_CSR              32 bit  BMU Ctrl/Stat Async Tx Queue 2 */
-/*      Q_CSR                   32 bit  BMU Control/Status Register */
-                                                                /* Bit 31..25:  reserved */
-#define CSR_SV_IDLE             BIT_24          /* BMU SM Idle */
-                                                                /* Bit 23..22:  reserved */
-#define CSR_DESC_CLR    BIT_21          /* Clear Reset for Descr */
-#define CSR_DESC_SET    BIT_20          /* Set   Reset for Descr */
-#define CSR_FIFO_CLR    BIT_19          /* Clear Reset for FIFO */
-#define CSR_FIFO_SET    BIT_18          /* Set   Reset for FIFO */
-#define CSR_HPI_RUN             BIT_17          /* Release HPI SM */
-#define CSR_HPI_RST             BIT_16          /* Reset   HPI SM to Idle */
-#define CSR_SV_RUN              BIT_15          /* Release Supervisor SM */
-#define CSR_SV_RST              BIT_14          /* Reset   Supervisor SM */
-#define CSR_DREAD_RUN   BIT_13          /* Release Descr Read SM */
-#define CSR_DREAD_RST   BIT_12          /* Reset   Descr Read SM */
-#define CSR_DWRITE_RUN  BIT_11          /* Release Descr Write SM */
-#define CSR_DWRITE_RST  BIT_10          /* Reset   Descr Write SM */
-#define CSR_TRANS_RUN   BIT_9           /* Release Transfer SM */
-#define CSR_TRANS_RST   BIT_8           /* Reset   Transfer SM */
-#define CSR_ENA_POL             BIT_7           /* Enable  Descr Polling */
-#define CSR_DIS_POL             BIT_6           /* Disable Descr Polling */
-#define CSR_STOP                BIT_5           /* Stop  Rx/Tx Queue */
-#define CSR_START               BIT_4           /* Start Rx/Tx Queue */
-#define CSR_IRQ_CL_P    BIT_3           /* (Rx) Clear Parity IRQ */
-#define CSR_IRQ_CL_B    BIT_2           /* Clear EOB IRQ */
-#define CSR_IRQ_CL_F    BIT_1           /* Clear EOF IRQ */
-#define CSR_IRQ_CL_C    BIT_0           /* Clear ERR IRQ */
-
-#define CSR_SET_RESET   (CSR_DESC_SET | CSR_FIFO_SET | CSR_HPI_RST |\
-                                                CSR_SV_RST | CSR_DREAD_RST | CSR_DWRITE_RST |\
-                                                CSR_TRANS_RST)
-#define CSR_CLR_RESET   (CSR_DESC_CLR | CSR_FIFO_CLR | CSR_HPI_RUN |\
-                                                CSR_SV_RUN | CSR_DREAD_RUN | CSR_DWRITE_RUN |\
-                                                CSR_TRANS_RUN)
-
-/*      Q_F                             32 bit  Flag Register */
-                                                                        /* Bit 31..28:  reserved */
-#define F_ALM_FULL              BIT_27          /* Rx FIFO: almost full */
-#define F_EMPTY                 BIT_27          /* Tx FIFO: empty flag */
-#define F_FIFO_EOF              BIT_26          /* Tag (EOF Flag) bit in FIFO */
-#define F_WM_REACHED    BIT_25          /* Watermark reached */
-                                                                        /* reserved */
-#define F_FIFO_LEVEL    (0x1fL<<16)     /* Bit 23..16:  # of Qwords in FIFO */
-                                                                        /* Bit 15..11:  reserved */
-#define F_WATER_MARK    0x0007ffL       /* Bit 10.. 0:  Watermark */
-
-/*      Q_T1                    32 bit  Test Register 1 */
-/*              Holds four State Machine control Bytes */
-#define SM_CTRL_SV_MSK  (0xffL<<24)     /* Bit 31..24:  Control Supervisor SM */
-#define SM_CTRL_RD_MSK  (0xffL<<16)     /* Bit 23..16:  Control Read Desc SM */
-#define SM_CTRL_WR_MSK  (0xffL<<8)      /* Bit 15.. 8:  Control Write Desc SM */
-#define SM_CTRL_TR_MSK  0xffL           /* Bit  7.. 0:  Control Transfer SM */
-
-/*      Q_T1_TR                  8 bit  Test Register 1 Transfer SM */
-/*      Q_T1_WR                  8 bit  Test Register 1 Write Descriptor SM */
-/*      Q_T1_RD                  8 bit  Test Register 1 Read Descriptor SM */
-/*      Q_T1_SV                  8 bit  Test Register 1 Supervisor SM */
-
-/* The control status byte of each machine looks like ... */
-#define SM_STATE                0xf0    /* Bit 7.. 4:   State which shall be loaded */
-#define SM_LOAD                 BIT_3S  /* Load the SM with SM_STATE */
-#define SM_TEST_ON              BIT_2S  /* Switch on SM Test Mode */
-#define SM_TEST_OFF             BIT_1S  /* Go off the Test Mode */
-#define SM_STEP                 BIT_0S  /* Step the State Machine */
-/* The encoding of the states is not supported by the Diagnostics Tool */
-
-/*      Q_T2                    32 bit  Test Register 2 */
-                                                                /* Bit 31.. 8:  reserved */
-#define T2_AC_T_ON              BIT_7   /* Address Counter Test Mode on */
-#define T2_AC_T_OFF             BIT_6   /* Address Counter Test Mode off */
-#define T2_BC_T_ON              BIT_5   /* Byte Counter Test Mode on */
-#define T2_BC_T_OFF             BIT_4   /* Byte Counter Test Mode off */
-#define T2_STEP04               BIT_3   /* Inc AC/Dec BC by 4 */
-#define T2_STEP03               BIT_2   /* Inc AC/Dec BC by 3 */
-#define T2_STEP02               BIT_1   /* Inc AC/Dec BC by 2 */
-#define T2_STEP01               BIT_0   /* Inc AC/Dec BC by 1 */
-
-/*      Q_T3                    32 bit  Test Register 3 */
-                                                                /* Bit 31.. 7:  reserved */
-#define T3_MUX_MSK              (7<<4)  /* Bit  6.. 4:  Mux Position */
-                                                                /* Bit  3:      reserved */
-#define T3_VRAM_MSK             7               /* Bit  2.. 0:  Virtual RAM Buffer Address */
-
-/* RAM Buffer Register Offsets, use RB_ADDR(Queue, Offs) to access */
-/*      RB_START                32 bit  RAM Buffer Start Address */
-/*      RB_END                  32 bit  RAM Buffer End Address */
-/*      RB_WP                   32 bit  RAM Buffer Write Pointer */
-/*      RB_RP                   32 bit  RAM Buffer Read Pointer */
-/*      RB_RX_UTPP              32 bit  Rx Upper Threshold, Pause Pack */
-/*      RB_RX_LTPP              32 bit  Rx Lower Threshold, Pause Pack */
-/*      RB_RX_UTHP              32 bit  Rx Upper Threshold, High Prio */
-/*      RB_RX_LTHP              32 bit  Rx Lower Threshold, High Prio */
-/*      RB_PC                   32 bit  RAM Buffer Packet Counter */
-/*      RB_LEV                  32 bit  RAM Buffer Level Register */
-                                /* Bit 31..19:  reserved */
-#define RB_MSK  0x0007ffff      /* Bit 18.. 0:  RAM Buffer Pointer Bits */
-
-/*      RB_TST2                  8 bit  RAM Buffer Test Register 2 */
-                                                                /* Bit 7.. 4:   reserved */
-#define RB_PC_DEC               BIT_3S  /* Packet Counter Decrem */
-#define RB_PC_T_ON              BIT_2S  /* Packet Counter Test On */
-#define RB_PC_T_OFF             BIT_1S  /* Packet Counter Tst Off */
-#define RB_PC_INC               BIT_0S  /* Packet Counter Increm */
-
-/*      RB_TST1                  8 bit  RAM Buffer Test Register 1 */
-                                                        /* Bit 7:       reserved */
-#define RB_WP_T_ON              BIT_6S  /* Write Pointer Test On */
-#define RB_WP_T_OFF             BIT_5S  /* Write Pointer Test Off */
-#define RB_WP_INC               BIT_4S  /* Write Pointer Increm */
-                                                                /* Bit 3:       reserved */
-#define RB_RP_T_ON              BIT_2S  /* Read Pointer Test On */
-#define RB_RP_T_OFF             BIT_1S  /* Read Pointer Test Off */
-#define RB_RP_DEC               BIT_0S  /* Read Pointer Decrement */
-
-/*      RB_CTRL                  8 bit  RAM Buffer Control Register */
-                                                                /* Bit 7.. 6:   reserved */
-#define RB_ENA_STFWD    BIT_5S  /* Enable  Store & Forward */
-#define RB_DIS_STFWD    BIT_4S  /* Disable Store & Forward */
-#define RB_ENA_OP_MD    BIT_3S  /* Enable  Operation Mode */
-#define RB_DIS_OP_MD    BIT_2S  /* Disable Operation Mode */
-#define RB_RST_CLR              BIT_1S  /* Clear RAM Buf STM Reset */
-#define RB_RST_SET              BIT_0S  /* Set   RAM Buf STM Reset */
-
-
-/* Receive and Transmit MAC FIFO Registers (GENESIS only) */
-
-/*      RX_MFF_EA               32 bit  Receive MAC FIFO End Address */
-/*      RX_MFF_WP               32 bit  Receive MAC FIFO Write Pointer */
-/*      RX_MFF_RP               32 bit  Receive MAC FIFO Read Pointer */
-/*      RX_MFF_PC               32 bit  Receive MAC FIFO Packet Counter */
-/*      RX_MFF_LEV              32 bit  Receive MAC FIFO Level */
-/*      TX_MFF_EA               32 bit  Transmit MAC FIFO End Address */
-/*      TX_MFF_WP               32 bit  Transmit MAC FIFO Write Pointer */
-/*      TX_MFF_WSP              32 bit  Transmit MAC FIFO WR Shadow Pointer */
-/*      TX_MFF_RP               32 bit  Transmit MAC FIFO Read Pointer */
-/*      TX_MFF_PC               32 bit  Transmit MAC FIFO Packet Cnt */
-/*      TX_MFF_LEV              32 bit  Transmit MAC FIFO Level */
-                                                                /* Bit 31.. 6:  reserved */
-#define MFF_MSK                 0x007fL /* Bit  5.. 0:  MAC FIFO Address/Ptr Bits */
-
-/*      RX_MFF_CTRL1    16 bit  Receive MAC FIFO Control Reg 1 */
-                                                                /* Bit 15..14:  reserved */
-#define MFF_ENA_RDY_PAT BIT_13S         /* Enable  Ready Patch */
-#define MFF_DIS_RDY_PAT BIT_12S         /* Disable Ready Patch */
-#define MFF_ENA_TIM_PAT BIT_11S         /* Enable  Timing Patch */
-#define MFF_DIS_TIM_PAT BIT_10S         /* Disable Timing Patch */
-#define MFF_ENA_ALM_FUL BIT_9S          /* Enable  AlmostFull Sign */
-#define MFF_DIS_ALM_FUL BIT_8S          /* Disable AlmostFull Sign */
-#define MFF_ENA_PAUSE   BIT_7S          /* Enable  Pause Signaling */
-#define MFF_DIS_PAUSE   BIT_6S          /* Disable Pause Signaling */
-#define MFF_ENA_FLUSH   BIT_5S          /* Enable  Frame Flushing */
-#define MFF_DIS_FLUSH   BIT_4S          /* Disable Frame Flushing */
-#define MFF_ENA_TIST    BIT_3S          /* Enable  Time Stamp Gener */
-#define MFF_DIS_TIST    BIT_2S          /* Disable Time Stamp Gener */
-#define MFF_CLR_INTIST  BIT_1S          /* Clear IRQ No Time Stamp */
-#define MFF_CLR_INSTAT  BIT_0S          /* Clear IRQ No Status */
-
-#define MFF_RX_CTRL_DEF MFF_ENA_TIM_PAT
-
-/*      TX_MFF_CTRL1    16 bit  Transmit MAC FIFO Control Reg 1 */
-#define MFF_CLR_PERR    BIT_15S         /* Clear Parity Error IRQ */
-                                                                /* Bit 14:      reserved */
-#define MFF_ENA_PKT_REC BIT_13S         /* Enable  Packet Recovery */
-#define MFF_DIS_PKT_REC BIT_12S         /* Disable Packet Recovery */
-/*      MFF_ENA_TIM_PAT  (see RX_MFF_CTRL1) Bit 11:     Enable  Timing Patch */
-/*      MFF_DIS_TIM_PAT  (see RX_MFF_CTRL1) Bit 10:     Disable Timing Patch */
-/*      MFF_ENA_ALM_FUL  (see RX_MFF_CTRL1) Bit  9:     Enable  Almost Full Sign */
-/*      MFF_DIS_ALM_FUL  (see RX_MFF_CTRL1) Bit  8:     Disable Almost Full Sign */
-#define MFF_ENA_W4E             BIT_7S          /* Enable  Wait for Empty */
-#define MFF_DIS_W4E             BIT_6S          /* Disable Wait for Empty */
-/*      MFF_ENA_FLUSH    (see RX_MFF_CTRL1) Bit  5:     Enable  Frame Flushing */
-/*      MFF_DIS_FLUSH    (see RX_MFF_CTRL1) Bit  4:     Disable Frame Flushing */
-#define MFF_ENA_LOOPB   BIT_3S          /* Enable  Loopback */
-#define MFF_DIS_LOOPB   BIT_2S          /* Disable Loopback */
-#define MFF_CLR_MAC_RST BIT_1S          /* Clear XMAC Reset */
-#define MFF_SET_MAC_RST BIT_0S          /* Set   XMAC Reset */
-
-#define MFF_TX_CTRL_DEF (MFF_ENA_PKT_REC | MFF_ENA_TIM_PAT | MFF_ENA_FLUSH)
-
-/*      RX_MFF_TST2              8 bit  Receive MAC FIFO Test Register 2 */
-/*      TX_MFF_TST2              8 bit  Transmit MAC FIFO Test Register 2 */
-                                                                /* Bit 7:       reserved */
-#define MFF_WSP_T_ON    BIT_6S  /* Tx: Write Shadow Ptr TestOn */
-#define MFF_WSP_T_OFF   BIT_5S  /* Tx: Write Shadow Ptr TstOff */
-#define MFF_WSP_INC             BIT_4S  /* Tx: Write Shadow Ptr Increment */
-#define MFF_PC_DEC              BIT_3S  /* Packet Counter Decrement */
-#define MFF_PC_T_ON             BIT_2S  /* Packet Counter Test On */
-#define MFF_PC_T_OFF    BIT_1S  /* Packet Counter Test Off */
-#define MFF_PC_INC              BIT_0S  /* Packet Counter Increment */
-
-/*      RX_MFF_TST1              8 bit  Receive MAC FIFO Test Register 1 */
-/*      TX_MFF_TST1              8 bit  Transmit MAC FIFO Test Register 1 */
-                                        /* Bit 7:       reserved */
-#define MFF_WP_T_ON             BIT_6S  /* Write Pointer Test On */
-#define MFF_WP_T_OFF    BIT_5S  /* Write Pointer Test Off */
-#define MFF_WP_INC              BIT_4S  /* Write Pointer Increm */
-                                                        /* Bit 3:       reserved */
-#define MFF_RP_T_ON             BIT_2S  /* Read Pointer Test On */
-#define MFF_RP_T_OFF    BIT_1S  /* Read Pointer Test Off */
-#define MFF_RP_DEC              BIT_0S  /* Read Pointer Decrement */
-
-/*      RX_MFF_CTRL2     8 bit  Receive MAC FIFO Control Reg 2 */
-/*      TX_MFF_CTRL2     8 bit  Transmit MAC FIFO Control Reg 2 */
-                                                                /* Bit 7..4:    reserved */
-#define MFF_ENA_OP_MD   BIT_3S  /* Enable  Operation Mode */
-#define MFF_DIS_OP_MD   BIT_2S  /* Disable Operation Mode */
-#define MFF_RST_CLR             BIT_1S  /* Clear MAC FIFO Reset */
-#define MFF_RST_SET             BIT_0S  /* Set   MAC FIFO Reset */
-
-
-/*      Link LED Counter Registers (GENESIS only) */
-
-/*      RX_LED_CTRL              8 bit  Receive LED Cnt Control Reg */
-/*      TX_LED_CTRL              8 bit  Transmit LED Cnt Control Reg */
-/*      LNK_SYNC_CTRL    8 bit  Link Sync Cnt Control Register */
-                                                        /* Bit 7.. 3:   reserved */
-#define LED_START               BIT_2S  /* Start Timer */
-#define LED_STOP                BIT_1S  /* Stop Timer */
-#define LED_STATE               BIT_0S  /* Rx/Tx: LED State, 1=LED on */
-#define LED_CLR_IRQ             BIT_0S  /* Lnk:         Clear Link IRQ */
-
-/*      RX_LED_TST               8 bit  Receive LED Cnt Test Register */
-/*      TX_LED_TST               8 bit  Transmit LED Cnt Test Register */
-/*      LNK_SYNC_TST     8 bit  Link Sync Cnt Test Register */
-                                                        /* Bit 7.. 3:   reserved */
-#define LED_T_ON                BIT_2S  /* LED Counter Test mode On */
-#define LED_T_OFF               BIT_1S  /* LED Counter Test mode Off */
-#define LED_T_STEP              BIT_0S  /* LED Counter Step */
-
-/*      LNK_LED_REG              8 bit  Link LED Register */
-                                                                /* Bit 7.. 6:   reserved */
-#define LED_BLK_ON              BIT_5S  /* Link LED Blinking On */
-#define LED_BLK_OFF             BIT_4S  /* Link LED Blinking Off */
-#define LED_SYNC_ON             BIT_3S  /* Use Sync Wire to switch LED */
-#define LED_SYNC_OFF    BIT_2S  /* Disable Sync Wire Input */
-#define LED_ON                  BIT_1S  /* switch LED on */
-#define LED_OFF                 BIT_0S  /* switch LED off */
-
-/*      Receive and Transmit GMAC FIFO Registers (YUKON only) */
-
-/*      RX_GMF_EA               32 bit  Rx GMAC FIFO End Address */
-/*      RX_GMF_AF_THR   32 bit  Rx GMAC FIFO Almost Full Thresh. */
-/*      RX_GMF_WP               32 bit  Rx GMAC FIFO Write Pointer */
-/*      RX_GMF_WLEV             32 bit  Rx GMAC FIFO Write Level */
-/*      RX_GMF_RP               32 bit  Rx GMAC FIFO Read Pointer */
-/*      RX_GMF_RLEV             32 bit  Rx GMAC FIFO Read Level */
-/*      TX_GMF_EA               32 bit  Tx GMAC FIFO End Address */
-/*      TX_GMF_AE_THR   32 bit  Tx GMAC FIFO Almost Empty Thresh.*/
-/*      TX_GMF_WP               32 bit  Tx GMAC FIFO Write Pointer */
-/*      TX_GMF_WSP              32 bit  Tx GMAC FIFO Write Shadow Ptr. */
-/*      TX_GMF_WLEV             32 bit  Tx GMAC FIFO Write Level */
-/*      TX_GMF_RP               32 bit  Tx GMAC FIFO Read Pointer */
-/*      TX_GMF_RSTP             32 bit  Tx GMAC FIFO Restart Pointer */
-/*      TX_GMF_RLEV             32 bit  Tx GMAC FIFO Read Level */
-
-/*      RX_GMF_CTRL_T   32 bit  Rx GMAC FIFO Control/Test */
-                                                /* Bits 31..15: reserved */
-#define GMF_WP_TST_ON   BIT_14          /* Write Pointer Test On */
-#define GMF_WP_TST_OFF  BIT_13          /* Write Pointer Test Off */
-#define GMF_WP_STEP             BIT_12          /* Write Pointer Step/Increment */
-                                                /* Bit 11:      reserved */
-#define GMF_RP_TST_ON   BIT_10          /* Read Pointer Test On */
-#define GMF_RP_TST_OFF  BIT_9           /* Read Pointer Test Off */
-#define GMF_RP_STEP             BIT_8           /* Read Pointer Step/Increment */
-#define GMF_RX_F_FL_ON  BIT_7           /* Rx FIFO Flush Mode On */
-#define GMF_RX_F_FL_OFF BIT_6           /* Rx FIFO Flush Mode Off */
-#define GMF_CLI_RX_FO   BIT_5           /* Clear IRQ Rx FIFO Overrun */
-#define GMF_CLI_RX_FC   BIT_4           /* Clear IRQ Rx Frame Complete */
-#define GMF_OPER_ON             BIT_3           /* Operational Mode On */
-#define GMF_OPER_OFF    BIT_2           /* Operational Mode Off */
-#define GMF_RST_CLR             BIT_1           /* Clear GMAC FIFO Reset */
-#define GMF_RST_SET             BIT_0           /* Set   GMAC FIFO Reset */
-
-/*      TX_GMF_CTRL_T   32 bit  Tx GMAC FIFO Control/Test */
-                                                /* Bits 31..19: reserved */
-#define GMF_WSP_TST_ON  BIT_18          /* Write Shadow Pointer Test On */
-#define GMF_WSP_TST_OFF BIT_17          /* Write Shadow Pointer Test Off */
-#define GMF_WSP_STEP    BIT_16          /* Write Shadow Pointer Step/Increment */
-                                                /* Bits 15..7: same as for RX_GMF_CTRL_T */
-#define GMF_CLI_TX_FU   BIT_6           /* Clear IRQ Tx FIFO Underrun */
-#define GMF_CLI_TX_FC   BIT_5           /* Clear IRQ Tx Frame Complete */
-#define GMF_CLI_TX_PE   BIT_4           /* Clear IRQ Tx Parity Error */
-                                                /* Bits 3..0: same as for RX_GMF_CTRL_T */
-
-#define GMF_RX_CTRL_DEF         (GMF_OPER_ON | GMF_RX_F_FL_ON)
-#define GMF_TX_CTRL_DEF         GMF_OPER_ON
-
-#define RX_GMF_FL_THR_DEF       0x0a    /* Rx GMAC FIFO Flush Threshold default */
-
-/*      GMAC_TI_ST_CTRL  8 bit  Time Stamp Timer Ctrl Reg (YUKON only) */
-                                                                /* Bit 7.. 3:   reserved */
-#define GMT_ST_START    BIT_2S          /* Start Time Stamp Timer */
-#define GMT_ST_STOP             BIT_1S          /* Stop  Time Stamp Timer */
-#define GMT_ST_CLR_IRQ  BIT_0S          /* Clear Time Stamp Timer IRQ */
-
-/*      GMAC_CTRL               32 bit  GMAC Control Reg (YUKON only) */
-                                                /* Bits 31.. 8: reserved */
-#define GMC_H_BURST_ON  BIT_7           /* Half Duplex Burst Mode On */
-#define GMC_H_BURST_OFF BIT_6           /* Half Duplex Burst Mode Off */
-#define GMC_F_LOOPB_ON  BIT_5           /* FIFO Loopback On */
-#define GMC_F_LOOPB_OFF BIT_4           /* FIFO Loopback Off */
-#define GMC_PAUSE_ON    BIT_3           /* Pause On */
-#define GMC_PAUSE_OFF   BIT_2           /* Pause Off */
-#define GMC_RST_CLR             BIT_1           /* Clear GMAC Reset */
-#define GMC_RST_SET             BIT_0           /* Set   GMAC Reset */
-
-/*      GPHY_CTRL               32 bit  GPHY Control Reg (YUKON only) */
-                                                /* Bits 31..29: reserved */
-#define GPC_SEL_BDT             BIT_28  /* Select Bi-Dir. Transfer for MDC/MDIO */
-#define GPC_INT_POL_HI  BIT_27  /* IRQ Polarity is Active HIGH */
-#define GPC_75_OHM              BIT_26  /* Use 75 Ohm Termination instead of 50 */
-#define GPC_DIS_FC              BIT_25  /* Disable Automatic Fiber/Copper Detection */
-#define GPC_DIS_SLEEP   BIT_24  /* Disable Energy Detect */
-#define GPC_HWCFG_M_3   BIT_23  /* HWCFG_MODE[3] */
-#define GPC_HWCFG_M_2   BIT_22  /* HWCFG_MODE[2] */
-#define GPC_HWCFG_M_1   BIT_21  /* HWCFG_MODE[1] */
-#define GPC_HWCFG_M_0   BIT_20  /* HWCFG_MODE[0] */
-#define GPC_ANEG_0              BIT_19  /* ANEG[0] */
-#define GPC_ENA_XC              BIT_18  /* Enable MDI crossover */
-#define GPC_DIS_125             BIT_17  /* Disable 125 MHz clock */
-#define GPC_ANEG_3              BIT_16  /* ANEG[3] */
-#define GPC_ANEG_2              BIT_15  /* ANEG[2] */
-#define GPC_ANEG_1              BIT_14  /* ANEG[1] */
-#define GPC_ENA_PAUSE   BIT_13  /* Enable Pause (SYM_OR_REM) */
-#define GPC_PHYADDR_4   BIT_12  /* Bit 4 of Phy Addr */
-#define GPC_PHYADDR_3   BIT_11  /* Bit 3 of Phy Addr */
-#define GPC_PHYADDR_2   BIT_10  /* Bit 2 of Phy Addr */
-#define GPC_PHYADDR_1   BIT_9   /* Bit 1 of Phy Addr */
-#define GPC_PHYADDR_0   BIT_8   /* Bit 0 of Phy Addr */
-                                                /* Bits  7..2:  reserved */
-#define GPC_RST_CLR             BIT_1   /* Clear GPHY Reset */
-#define GPC_RST_SET             BIT_0   /* Set   GPHY Reset */
-
-#define GPC_HWCFG_GMII_COP      (GPC_HWCFG_M_3 | GPC_HWCFG_M_2 | \
-                                                         GPC_HWCFG_M_1 | GPC_HWCFG_M_0)
-
-#define GPC_HWCFG_GMII_FIB      (                                GPC_HWCFG_M_2 | \
-                                                         GPC_HWCFG_M_1 | GPC_HWCFG_M_0)
-
-#define GPC_ANEG_ADV_ALL_M      (GPC_ANEG_3 | GPC_ANEG_2 | \
-                                                         GPC_ANEG_1 | GPC_ANEG_0)
-
-/* forced speed and duplex mode (don't mix with other ANEG bits) */
-#define GPC_FRC10MBIT_HALF      0
-#define GPC_FRC10MBIT_FULL      GPC_ANEG_0
-#define GPC_FRC100MBIT_HALF     GPC_ANEG_1
-#define GPC_FRC100MBIT_FULL     (GPC_ANEG_0 | GPC_ANEG_1)
-
-/* auto-negotiation with limited advertised speeds */
-/* mix only with master/slave settings (for copper) */
-#define GPC_ADV_1000_HALF       GPC_ANEG_2
-#define GPC_ADV_1000_FULL       GPC_ANEG_3
-#define GPC_ADV_ALL                     (GPC_ANEG_2 | GPC_ANEG_3)
-
-/* master/slave settings */
-/* only for copper with 1000 Mbps */
-#define GPC_FORCE_MASTER        0
-#define GPC_FORCE_SLAVE         GPC_ANEG_0
-#define GPC_PREF_MASTER         GPC_ANEG_1
-#define GPC_PREF_SLAVE          (GPC_ANEG_1 | GPC_ANEG_0)
-
-/*      GMAC_IRQ_SRC     8 bit  GMAC Interrupt Source Reg (YUKON only) */
-/*      GMAC_IRQ_MSK     8 bit  GMAC Interrupt Mask   Reg (YUKON only) */
-#define GM_IS_TX_CO_OV  BIT_5           /* Transmit Counter Overflow IRQ */
-#define GM_IS_RX_CO_OV  BIT_4           /* Receive Counter Overflow IRQ */
-#define GM_IS_TX_FF_UR  BIT_3           /* Transmit FIFO Underrun */
-#define GM_IS_TX_COMPL  BIT_2           /* Frame Transmission Complete */
-#define GM_IS_RX_FF_OR  BIT_1           /* Receive FIFO Overrun */
-#define GM_IS_RX_COMPL  BIT_0           /* Frame Reception Complete */
-
-#define GMAC_DEF_MSK    (GM_IS_TX_CO_OV | GM_IS_RX_CO_OV | \
-                                                GM_IS_TX_FF_UR)
-
-/*      GMAC_LINK_CTRL  16 bit  GMAC Link Control Reg (YUKON only) */
-                                                /* Bits 15.. 2: reserved */
-#define GMLC_RST_CLR    BIT_1S          /* Clear GMAC Link Reset */
-#define GMLC_RST_SET    BIT_0S          /* Set   GMAC Link Reset */
-
-
-/*      WOL_CTRL_STAT   16 bit  WOL Control/Status Reg */
-#define WOL_CTL_LINK_CHG_OCC                    BIT_15S
-#define WOL_CTL_MAGIC_PKT_OCC                   BIT_14S
-#define WOL_CTL_PATTERN_OCC                             BIT_13S
-
-#define WOL_CTL_CLEAR_RESULT                    BIT_12S
-
-#define WOL_CTL_ENA_PME_ON_LINK_CHG             BIT_11S
-#define WOL_CTL_DIS_PME_ON_LINK_CHG             BIT_10S
-#define WOL_CTL_ENA_PME_ON_MAGIC_PKT    BIT_9S
-#define WOL_CTL_DIS_PME_ON_MAGIC_PKT    BIT_8S
-#define WOL_CTL_ENA_PME_ON_PATTERN              BIT_7S
-#define WOL_CTL_DIS_PME_ON_PATTERN              BIT_6S
-
-#define WOL_CTL_ENA_LINK_CHG_UNIT               BIT_5S
-#define WOL_CTL_DIS_LINK_CHG_UNIT               BIT_4S
-#define WOL_CTL_ENA_MAGIC_PKT_UNIT              BIT_3S
-#define WOL_CTL_DIS_MAGIC_PKT_UNIT              BIT_2S
-#define WOL_CTL_ENA_PATTERN_UNIT                BIT_1S
-#define WOL_CTL_DIS_PATTERN_UNIT                BIT_0S
-
-#define WOL_CTL_DEFAULT                         \
-        (WOL_CTL_DIS_PME_ON_LINK_CHG |  \
-        WOL_CTL_DIS_PME_ON_PATTERN |    \
-        WOL_CTL_DIS_PME_ON_MAGIC_PKT |  \
-        WOL_CTL_DIS_LINK_CHG_UNIT |             \
-        WOL_CTL_DIS_PATTERN_UNIT |              \
-        WOL_CTL_DIS_MAGIC_PKT_UNIT)
-
-/*      WOL_MATCH_CTL    8 bit  WOL Match Control Reg */
-#define WOL_CTL_PATT_ENA(x)                             (BIT_0 << (x))
-
-#define SK_NUM_WOL_PATTERN              7
-#define SK_PATTERN_PER_WORD             4
-#define SK_BITMASK_PATTERN              7
-#define SK_POW_PATTERN_LENGTH   128
-
-#define WOL_LENGTH_MSK          0x7f
-#define WOL_LENGTH_SHIFT        8
-
-
-/* Receive and Transmit Descriptors ******************************************/
-
-/* Transmit Descriptor struct */
-typedef struct s_HwTxd {
-        SK_U32 volatile TxCtrl; /* Transmit Buffer Control Field */
-        SK_U32  TxNext;                 /* Physical Address Pointer to the next TxD */
-        SK_U32  TxAdrLo;                /* Physical Tx Buffer Address lower dword */
-        SK_U32  TxAdrHi;                /* Physical Tx Buffer Address upper dword */
-        SK_U32  TxStat;                 /* Transmit Frame Status Word */
-#ifndef SK_USE_REV_DESC
-        SK_U16  TxTcpOffs;              /* TCP Checksum Calculation Start Value */
-        SK_U16  TxRes1;                 /* 16 bit reserved field */
-        SK_U16  TxTcpWp;                /* TCP Checksum Write Position */
-        SK_U16  TxTcpSp;                /* TCP Checksum Calculation Start Position */
-#else   /* SK_USE_REV_DESC */
-        SK_U16  TxRes1;                 /* 16 bit reserved field */
-        SK_U16  TxTcpOffs;              /* TCP Checksum Calculation Start Value */
-        SK_U16  TxTcpSp;                /* TCP Checksum Calculation Start Position */
-        SK_U16  TxTcpWp;                /* TCP Checksum Write Position */
-#endif  /* SK_USE_REV_DESC */
-        SK_U32  TxRes2;                 /* 32 bit reserved field */
-} SK_HWTXD;
-
-/* Receive Descriptor struct */
-typedef struct s_HwRxd {
-        SK_U32 volatile RxCtrl; /* Receive Buffer Control Field */
-        SK_U32  RxNext;                 /* Physical Address Pointer to the next RxD */
-        SK_U32  RxAdrLo;                /* Physical Rx Buffer Address lower dword */
-        SK_U32  RxAdrHi;                /* Physical Rx Buffer Address upper dword */
-        SK_U32  RxStat;                 /* Receive Frame Status Word */
-        SK_U32  RxTiSt;                 /* Receive Time Stamp (from XMAC on GENESIS) */
-#ifndef SK_USE_REV_DESC
-        SK_U16  RxTcpSum1;              /* TCP Checksum 1 */
-        SK_U16  RxTcpSum2;              /* TCP Checksum 2 */
-        SK_U16  RxTcpSp1;               /* TCP Checksum Calculation Start Position 1 */
-        SK_U16  RxTcpSp2;               /* TCP Checksum Calculation Start Position 2 */
-#else   /* SK_USE_REV_DESC */
-        SK_U16  RxTcpSum2;              /* TCP Checksum 2 */
-        SK_U16  RxTcpSum1;              /* TCP Checksum 1 */
-        SK_U16  RxTcpSp2;               /* TCP Checksum Calculation Start Position 2 */
-        SK_U16  RxTcpSp1;               /* TCP Checksum Calculation Start Position 1 */
-#endif  /* SK_USE_REV_DESC */
-} SK_HWRXD;
-
-/*
- * Drivers which use the reverse descriptor feature (PCI_OUR_REG_2)
- * should set the define SK_USE_REV_DESC.
- * Structures are 'normaly' not endianess dependent. But in
- * this case the SK_U16 fields are bound to bit positions inside the
- * descriptor. RxTcpSum1 e.g. must start at bit 0 within the 6.th DWord.
- * The bit positions inside a DWord are of course endianess dependent and
- * swaps if the DWord is swapped by the hardware.
- */
-
-
-/* Descriptor Bit Definition */
-/*      TxCtrl          Transmit Buffer Control Field */
-/*      RxCtrl          Receive  Buffer Control Field */
-#define BMU_OWN                 BIT_31  /* OWN bit: 0=host/1=BMU */
-#define BMU_STF                 BIT_30  /* Start of Frame */
-#define BMU_EOF                 BIT_29  /* End of Frame */
-#define BMU_IRQ_EOB             BIT_28  /* Req "End of Buffer" IRQ */
-#define BMU_IRQ_EOF             BIT_27  /* Req "End of Frame" IRQ */
-/* TxCtrl specific bits */
-#define BMU_STFWD               BIT_26  /* (Tx) Store & Forward Frame */
-#define BMU_NO_FCS              BIT_25  /* (Tx) Disable MAC FCS (CRC) generation */
-#define BMU_SW                  BIT_24  /* (Tx) 1 bit res. for SW use */
-/* RxCtrl specific bits */
-#define BMU_DEV_0               BIT_26  /* (Rx) Transfer data to Dev0 */
-#define BMU_STAT_VAL    BIT_25  /* (Rx) Rx Status Valid */
-#define BMU_TIST_VAL    BIT_24  /* (Rx) Rx TimeStamp Valid */
-                                                                /* Bit 23..16:  BMU Check Opcodes */
-#define BMU_CHECK               (0x55L<<16)     /* Default BMU check */
-#define BMU_TCP_CHECK   (0x56L<<16)     /* Descr with TCP ext */
-#define BMU_UDP_CHECK   (0x57L<<16)     /* Descr with UDP ext (YUKON only) */
-#define BMU_BBC                 0xffffL /* Bit 15.. 0:  Buffer Byte Counter */
-
-/*      TxStat          Transmit Frame Status Word */
-/*      RxStat          Receive Frame Status Word */
-/*
- *Note: TxStat is reserved for ASIC loopback mode only
- *
- *      The Bits of the Status words are defined in xmac_ii.h
- *      (see XMR_FS bits)
- */
-
-/* macros ********************************************************************/
-
-/* Receive and Transmit Queues */
-#define Q_R1    0x0000          /* Receive Queue 1 */
-#define Q_R2    0x0080          /* Receive Queue 2 */
-#define Q_XS1   0x0200          /* Synchronous Transmit Queue 1 */
-#define Q_XA1   0x0280          /* Asynchronous Transmit Queue 1 */
-#define Q_XS2   0x0300          /* Synchronous Transmit Queue 2 */
-#define Q_XA2   0x0380          /* Asynchronous Transmit Queue 2 */
-
-/*
- *      Macro Q_ADDR()
- *
- *      Use this macro to access the Receive and Transmit Queue Registers.
- *
- * para:
- *      Queue   Queue to access.
- *                              Values: Q_R1, Q_R2, Q_XS1, Q_XA1, Q_XS2, and Q_XA2
- *      Offs    Queue register offset.
- *                              Values: Q_D, Q_DA_L ... Q_T2, Q_T3
- *
- * usage        SK_IN32(pAC, Q_ADDR(Q_R2, Q_BC), pVal)
- */
-#define Q_ADDR(Queue, Offs)     (B8_Q_REGS + (Queue) + (Offs))
-
-/*
- *      Macro RB_ADDR()
- *
- *      Use this macro to access the RAM Buffer Registers.
- *
- * para:
- *      Queue   Queue to access.
- *                              Values: Q_R1, Q_R2, Q_XS1, Q_XA1, Q_XS2, and Q_XA2
- *      Offs    Queue register offset.
- *                              Values: RB_START, RB_END ... RB_LEV, RB_CTRL
- *
- * usage        SK_IN32(pAC, RB_ADDR(Q_R2, RB_RP), pVal)
- */
-#define RB_ADDR(Queue, Offs)    (B16_RAM_REGS + (Queue) + (Offs))
-
-
-/* MAC Related Registers */
-#define MAC_1           0       /* belongs to the port near the slot */
-#define MAC_2           1       /* belongs to the port far away from the slot */
-
-/*
- *      Macro MR_ADDR()
- *
- *      Use this macro to access a MAC Related Registers inside the ASIC.
- *
- * para:
- *      Mac             MAC to access.
- *                              Values: MAC_1, MAC_2
- *      Offs    MAC register offset.
- *                              Values: RX_MFF_EA, RX_MFF_WP ... LNK_LED_REG,
- *                                              TX_MFF_EA, TX_MFF_WP ... TX_LED_TST
- *
- * usage        SK_IN32(pAC, MR_ADDR(MAC_1, TX_MFF_EA), pVal)
- */
-#define MR_ADDR(Mac, Offs)      (((Mac) << 7) + (Offs))
-
-#ifdef  SK_LITTLE_ENDIAN
-#define XM_WORD_LO      0
-#define XM_WORD_HI      1
-#else   /* !SK_LITTLE_ENDIAN */
-#define XM_WORD_LO      1
-#define XM_WORD_HI      0
-#endif  /* !SK_LITTLE_ENDIAN */
-
-
-/*
- * macros to access the XMAC (GENESIS only)
- *
- * XM_IN16(),           to read a 16 bit register (e.g. XM_MMU_CMD)
- * XM_OUT16(),          to write a 16 bit register (e.g. XM_MMU_CMD)
- * XM_IN32(),           to read a 32 bit register (e.g. XM_TX_EV_CNT)
- * XM_OUT32(),          to write a 32 bit register (e.g. XM_TX_EV_CNT)
- * XM_INADDR(),         to read a network address register (e.g. XM_SRC_CHK)
- * XM_OUTADDR(),        to write a network address register (e.g. XM_SRC_CHK)
- * XM_INHASH(),         to read the XM_HSM_CHK register
- * XM_OUTHASH()         to write the XM_HSM_CHK register
- *
- * para:
- *      Mac             XMAC to access          values: MAC_1 or MAC_2
- *      IoC             I/O context needed for SK I/O macros
- *      Reg             XMAC Register to read or write
- *      (p)Val  Value or pointer to the value which should be read or written
- *
- * usage:       XM_OUT16(IoC, MAC_1, XM_MMU_CMD, Value);
- */
-
-#define XMA(Mac, Reg)                                                                   \
-        ((BASE_XMAC_1 + (Mac) * (BASE_XMAC_2 - BASE_XMAC_1)) | ((Reg) << 1))
-
-#define XM_IN16(IoC, Mac, Reg, pVal)                                    \
-        SK_IN16((IoC), XMA((Mac), (Reg)), (pVal))
-
-#define XM_OUT16(IoC, Mac, Reg, Val)                                    \
-        SK_OUT16((IoC), XMA((Mac), (Reg)), (Val))
-
-#define XM_IN32(IoC, Mac, Reg, pVal) {                                  \
-        SK_IN16((IoC), XMA((Mac), (Reg)),                                       \
-                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_LO]);         \
-        SK_IN16((IoC), XMA((Mac), (Reg+2)),                                     \
-                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_HI]);         \
-}
-
-#define XM_OUT32(IoC, Mac, Reg, Val) {                                                                          \
-        SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)((Val) & 0xffffL));                  \
-        SK_OUT16((IoC), XMA((Mac), (Reg+2)), (SK_U16)(((Val) >> 16) & 0xffffL));\
-}
-
-/* Remember: we are always writing to / reading from LITTLE ENDIAN memory */
-
-#define XM_INADDR(IoC, Mac, Reg, pVal) {                                \
-        SK_U16  Word;                                                                           \
-        SK_U8   *pByte;                                                                         \
-        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
-        SK_IN16((IoC), XMA((Mac), (Reg)), &Word);                       \
-        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), XMA((Mac), (Reg+2)), &Word);                     \
-        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), XMA((Mac), (Reg+4)), &Word);                     \
-        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-}
-
-#define XM_OUTADDR(IoC, Mac, Reg, pVal) {                               \
-        SK_U8   SK_FAR *pByte;                                                          \
-        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
-        SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)                     \
-                (((SK_U16)(pByte[0]) & 0x00ff) |                                \
-                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), XMA((Mac), (Reg+2)), (SK_U16)           \
-                (((SK_U16)(pByte[2]) & 0x00ff) |                                \
-                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), XMA((Mac), (Reg+4)), (SK_U16)           \
-                (((SK_U16)(pByte[4]) & 0x00ff) |                                \
-                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
-}
-
-#define XM_INHASH(IoC, Mac, Reg, pVal) {                                \
-        SK_U16  Word;                                                                           \
-        SK_U8   SK_FAR *pByte;                                                          \
-        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
-        SK_IN16((IoC), XMA((Mac), (Reg)), &Word);                       \
-        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), XMA((Mac), (Reg+2)), &Word);                     \
-        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), XMA((Mac), (Reg+4)), &Word);                     \
-        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), XMA((Mac), (Reg+6)), &Word);                     \
-        pByte[6] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[7] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-}
-
-#define XM_OUTHASH(IoC, Mac, Reg, pVal) {                               \
-        SK_U8   SK_FAR *pByte;                                                          \
-        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
-        SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)                     \
-                (((SK_U16)(pByte[0]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), XMA((Mac), (Reg+2)), (SK_U16)           \
-                (((SK_U16)(pByte[2]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), XMA((Mac), (Reg+4)), (SK_U16)           \
-                (((SK_U16)(pByte[4]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), XMA((Mac), (Reg+6)), (SK_U16)           \
-                (((SK_U16)(pByte[6]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[7]) << 8) & 0xff00)));                 \
-}
-
-/*
- * macros to access the GMAC (YUKON only)
- *
- * GM_IN16(),           to read  a 16 bit register (e.g. GM_GP_STAT)
- * GM_OUT16(),          to write a 16 bit register (e.g. GM_GP_CTRL)
- * GM_IN32(),           to read  a 32 bit register (e.g. GM_)
- * GM_OUT32(),          to write a 32 bit register (e.g. GM_)
- * GM_INADDR(),         to read  a network address register (e.g. GM_SRC_ADDR_1L)
- * GM_OUTADDR(),        to write a network address register (e.g. GM_SRC_ADDR_2L)
- * GM_INHASH(),         to read  the GM_MC_ADDR_H1 register
- * GM_OUTHASH()         to write the GM_MC_ADDR_H1 register
- *
- * para:
- *      Mac             GMAC to access          values: MAC_1 or MAC_2
- *      IoC             I/O context needed for SK I/O macros
- *      Reg             GMAC Register to read or write
- *      (p)Val  Value or pointer to the value which should be read or written
- *
- * usage:       GM_OUT16(IoC, MAC_1, GM_GP_CTRL, Value);
- */
-
-#define GMA(Mac, Reg)                                                                   \
-        ((BASE_GMAC_1 + (Mac) * (BASE_GMAC_2 - BASE_GMAC_1)) | (Reg))
-
-#define GM_IN16(IoC, Mac, Reg, pVal)                                    \
-        SK_IN16((IoC), GMA((Mac), (Reg)), (pVal))
-
-#define GM_OUT16(IoC, Mac, Reg, Val)                                    \
-        SK_OUT16((IoC), GMA((Mac), (Reg)), (Val))
-
-#define GM_IN32(IoC, Mac, Reg, pVal) {                                  \
-        SK_IN16((IoC), GMA((Mac), (Reg)),                                       \
-                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_LO]);         \
-        SK_IN16((IoC), GMA((Mac), (Reg+4)),                                     \
-                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_HI]);         \
-}
-
-#define GM_OUT32(IoC, Mac, Reg, Val) {                                                                          \
-        SK_OUT16((IoC), GMA((Mac), (Reg)), (SK_U16)((Val) & 0xffffL));                  \
-        SK_OUT16((IoC), GMA((Mac), (Reg+4)), (SK_U16)(((Val) >> 16) & 0xffffL));\
-}
-
-#define GM_INADDR(IoC, Mac, Reg, pVal) {                                \
-        SK_U16  Word;                                                                           \
-        SK_U8   *pByte;                                                                         \
-        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
-        SK_IN16((IoC), GMA((Mac), (Reg)), &Word);                       \
-        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), GMA((Mac), (Reg+4)), &Word);                     \
-        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), GMA((Mac), (Reg+8)), &Word);                     \
-        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-}
-
-#define GM_OUTADDR(IoC, Mac, Reg, pVal) {                               \
-        SK_U8   SK_FAR *pByte;                                                          \
-        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
-        SK_OUT16((IoC), GMA((Mac), (Reg)), (SK_U16)                     \
-                (((SK_U16)(pByte[0]) & 0x00ff) |                                \
-                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), GMA((Mac), (Reg+4)), (SK_U16)           \
-                (((SK_U16)(pByte[2]) & 0x00ff) |                                \
-                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), GMA((Mac), (Reg+8)), (SK_U16)           \
-                (((SK_U16)(pByte[4]) & 0x00ff) |                                \
-                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
-}
-
-#define GM_INHASH(IoC, Mac, Reg, pVal) {                                \
-        SK_U16  Word;                                                                           \
-        SK_U8   *pByte;                                                                         \
-        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
-        SK_IN16((IoC), GMA((Mac), (Reg)), &Word);                       \
-        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), GMA((Mac), (Reg+4)), &Word);                     \
-        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), GMA((Mac), (Reg+8)), &Word);                     \
-        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-        SK_IN16((IoC), GMA((Mac), (Reg+12)), &Word);            \
-        pByte[6] = (SK_U8)(Word  & 0x00ff);                                     \
-        pByte[7] = (SK_U8)((Word >> 8) & 0x00ff);                       \
-}
-
-#define GM_OUTHASH(IoC, Mac, Reg, pVal) {                               \
-        SK_U8   *pByte;                                                                         \
-        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
-        SK_OUT16((IoC), GMA((Mac), (Reg)), (SK_U16)                     \
-                (((SK_U16)(pByte[0]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), GMA((Mac), (Reg+4)), (SK_U16)           \
-                (((SK_U16)(pByte[2]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), GMA((Mac), (Reg+8)), (SK_U16)           \
-                (((SK_U16)(pByte[4]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
-        SK_OUT16((IoC), GMA((Mac), (Reg+12)), (SK_U16)          \
-                (((SK_U16)(pByte[6]) & 0x00ff)|                                 \
-                (((SK_U16)(pByte[7]) << 8) & 0xff00)));                 \
-}
-
-/*
- * Different MAC Types
- */
-#define SK_MAC_XMAC             0       /* Xaqti XMAC II */
-#define SK_MAC_GMAC             1       /* Marvell GMAC */
-
-/*
- * Different PHY Types
- */
-#define SK_PHY_XMAC                     0       /* integrated in XMAC II */
-#define SK_PHY_BCOM                     1       /* Broadcom BCM5400 */
-#define SK_PHY_LONE                     2       /* Level One LXT1000 */
-#define SK_PHY_NAT                      3       /* National DP83891 */
-#define SK_PHY_MARV_COPPER      4       /* Marvell 88E1011S */
-#define SK_PHY_MARV_FIBER       5       /* Marvell 88E1011S working on fiber */
-
-/*
- * PHY addresses (bits 12..8 of PHY address reg)
- */
-#define PHY_ADDR_XMAC   (0<<8)
-#define PHY_ADDR_BCOM   (1<<8)
-#define PHY_ADDR_LONE   (3<<8)
-#define PHY_ADDR_NAT    (0<<8)
-
-/* GPHY address (bits 15..11 of SMI control reg) */
-#define PHY_ADDR_MARV   0
-
-/*
- * macros to access the PHY
- *
- * PHY_READ()           read a 16 bit value from the PHY
- * PHY_WRITE()          write a 16 bit value to the PHY
- *
- * para:
- *      IoC             I/O context needed for SK I/O macros
- *      pPort   Pointer to port struct for PhyAddr
- *      Mac             XMAC to access          values: MAC_1 or MAC_2
- *      PhyReg  PHY Register to read or write
- *      (p)Val  Value or pointer to the value which should be read or
- *                      written.
- *
- * usage:       PHY_READ(IoC, pPort, MAC_1, PHY_CTRL, Value);
- * Warning: a PHY_READ on an uninitialized PHY (PHY still in reset) never
- *          comes back. This is checked in DEBUG mode.
- */
-#ifndef DEBUG
-#define PHY_READ(IoC, pPort, Mac, PhyReg, pVal) {                                               \
-        SK_U16 Mmu;                                                                                                             \
-                                                                                                                                                \
-        XM_OUT16((IoC), (Mac), XM_PHY_ADDR, (PhyReg) | (pPort)->PhyAddr);       \
-        XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                                     \
-        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
-                do {                                                                                                                    \
-                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
-                } while ((Mmu & XM_MMU_PHY_RDY) == 0);                                                  \
-                XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                             \
-        }                                                                                                                                       \
-}
-#else
-#define PHY_READ(IoC, pPort, Mac, PhyReg, pVal) {                                               \
-        SK_U16 Mmu;                                                                                                             \
-        int __i = 0;                                                                                                            \
-                                                                                                                                                \
-        XM_OUT16((IoC), (Mac), XM_PHY_ADDR, (PhyReg) | (pPort)->PhyAddr);       \
-        XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                                     \
-        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
-                do {                                                                                                                    \
-                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
-                        __i++;                                                                                                          \
-                        if (__i > 100000) {                                                                                     \
-                                SK_DBG_PRINTF("*****************************\n");               \
-                                SK_DBG_PRINTF("PHY_READ on uninitialized PHY\n");               \
-                                SK_DBG_PRINTF("*****************************\n");               \
-                                break;                                                                                                  \
-                        }                                                                                                                       \
-                } while ((Mmu & XM_MMU_PHY_RDY) == 0);                                                  \
-                XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                             \
-        }                                                                                                                                       \
-}
-#endif /* DEBUG */
-
-#define PHY_WRITE(IoC, pPort, Mac, PhyReg, Val) {                                               \
-        SK_U16 Mmu;                                                                                                                     \
-                                                                                                                                                \
-        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
-                do {                                                                                                                    \
-                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
-                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);                                                 \
-        }                                                                                                                                       \
-        XM_OUT16((IoC), (Mac), XM_PHY_ADDR, (PhyReg) | (pPort)->PhyAddr);       \
-        XM_OUT16((IoC), (Mac), XM_PHY_DATA, (Val));                                                     \
-        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
-                do {                                                                                                                    \
-                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
-                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);                                                 \
-        }                                                                                                                                       \
-}
-
-/*
- *      Macro PCI_C()
- *
- *      Use this macro to access PCI config register from the I/O space.
- *
- * para:
- *      Addr    PCI configuration register to access.
- *                      Values: PCI_VENDOR_ID ... PCI_VPD_ADR_REG,
- *
- * usage        SK_IN16(pAC, PCI_C(PCI_VENDOR_ID), pVal);
- */
-#define PCI_C(Addr)     (B7_CFG_SPC + (Addr))   /* PCI Config Space */
-
-/*
- *      Macro SK_HW_ADDR(Base, Addr)
- *
- *      Calculates the effective HW address
- *
- * para:
- *      Base    I/O or memory base address
- *      Addr    Address offset
- *
- * usage:       May be used in SK_INxx and SK_OUTxx macros
- *              #define SK_IN8(pAC, Addr, pVal) ...\
- *                      *pVal = (SK_U8)inp(SK_HW_ADDR(pAC->Hw.Iop, Addr)))
- */
-#ifdef SK_MEM_MAPPED_IO
-#define SK_HW_ADDR(Base, Addr)  ((Base) + (Addr))
-#else  /* SK_MEM_MAPPED_IO */
-#define SK_HW_ADDR(Base, Addr)  \
-                        ((Base) + (((Addr) & 0x7f) | (((Addr) >> 7 > 0) ? 0x80 : 0)))
-#endif /* SK_MEM_MAPPED_IO */
-
-#define SZ_LONG (sizeof(SK_U32))
-
-/*
- *      Macro SK_HWAC_LINK_LED()
- *
- *      Use this macro to set the link LED mode.
- * para:
- *      pAC             Pointer to adapter context struct
- *      IoC             I/O context needed for SK I/O macros
- *  Port        Port number
- *      Mode    Mode to set for this LED
- */
-#define SK_HWAC_LINK_LED(pAC, IoC, Port, Mode) \
-        SK_OUT8(IoC, MR_ADDR(Port, LNK_LED_REG), Mode);
-
-
-/* typedefs *******************************************************************/
-
-
-/* function prototypes ********************************************************/
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* __INC_SKGEHW_H */
diff --git a/drivers/net/sk98lin/h/skgehwt.h b/drivers/net/sk98lin/h/skgehwt.h
deleted file mode 100644
index e6b0016a695c..000000000000
--- a/drivers/net/sk98lin/h/skgehwt.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- *
- * Name:        skhwt.h
- * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:     $Revision: 1.7 $
- * Date:        $Date: 2003/09/16 12:55:08 $
- * Purpose:     Defines for the hardware timer functions
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * SKGEHWT.H    contains all defines and types for the timer functions
- */
-
-#ifndef _SKGEHWT_H_
-#define _SKGEHWT_H_
-
-/*
- * SK Hardware Timer
- * - needed wherever the HWT module is used
- * - use in Adapters context name pAC->Hwt
- */
-typedef struct s_Hwt {
-        SK_U32          TStart; /* HWT start */
-        SK_U32          TStop;  /* HWT stop */
-        int             TActive;        /* HWT: flag : active/inactive */
-} SK_HWT;
-
-extern void SkHwtInit(SK_AC *pAC, SK_IOC Ioc);
-extern void SkHwtStart(SK_AC *pAC, SK_IOC Ioc, SK_U32 Time);
-extern void SkHwtStop(SK_AC *pAC, SK_IOC Ioc);
-extern SK_U32 SkHwtRead(SK_AC *pAC, SK_IOC Ioc);
-extern void SkHwtIsr(SK_AC *pAC, SK_IOC Ioc);
-#endif  /* _SKGEHWT_H_ */
diff --git a/drivers/net/sk98lin/h/skgei2c.h b/drivers/net/sk98lin/h/skgei2c.h
deleted file mode 100644
index d9b6f6d8dfe2..000000000000
--- a/drivers/net/sk98lin/h/skgei2c.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgei2c.h
- * Project:     Gigabit Ethernet Adapters, TWSI-Module
- * Version:     $Revision: 1.25 $
- * Date:        $Date: 2003/10/20 09:06:05 $
- * Purpose:     Special defines for TWSI
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * SKGEI2C.H    contains all SK-98xx specific defines for the TWSI handling
- */
-
-#ifndef _INC_SKGEI2C_H_
-#define _INC_SKGEI2C_H_
-
-/*
- * Macros to access the B2_I2C_CTRL
- */
-#define SK_I2C_CTL(IoC, flag, dev, dev_size, reg, burst) \
-        SK_OUT32(IoC, B2_I2C_CTRL,\
-                (flag ? 0x80000000UL : 0x0L) | \
-                (((SK_U32)reg << 16) & I2C_ADDR) | \
-                (((SK_U32)dev << 9) & I2C_DEV_SEL) | \
-                (dev_size & I2C_DEV_SIZE) | \
-                ((burst << 4) & I2C_BURST_LEN))
-
-#define SK_I2C_STOP(IoC) {                              \
-        SK_U32  I2cCtrl;                                \
-        SK_IN32(IoC, B2_I2C_CTRL, &I2cCtrl);            \
-        SK_OUT32(IoC, B2_I2C_CTRL, I2cCtrl | I2C_STOP); \
-}
-
-#define SK_I2C_GET_CTL(IoC, pI2cCtrl)   SK_IN32(IoC, B2_I2C_CTRL, pI2cCtrl)
-
-/*
- * Macros to access the TWSI SW Registers
- */
-#define SK_I2C_SET_BIT(IoC, SetBits) {                  \
-        SK_U8   OrgBits;                                \
-        SK_IN8(IoC, B2_I2C_SW, &OrgBits);               \
-        SK_OUT8(IoC, B2_I2C_SW, OrgBits | (SK_U8)(SetBits));    \
-}
-
-#define SK_I2C_CLR_BIT(IoC, ClrBits) {                  \
-        SK_U8   OrgBits;                                \
-        SK_IN8(IoC, B2_I2C_SW, &OrgBits);               \
-        SK_OUT8(IoC, B2_I2C_SW, OrgBits & ~((SK_U8)(ClrBits))); \
-}
-
-#define SK_I2C_GET_SW(IoC, pI2cSw)      SK_IN8(IoC, B2_I2C_SW, pI2cSw)
-
-/*
- * define the possible sensor states
- */
-#define SK_SEN_IDLE             0       /* Idle: sensor not read */
-#define SK_SEN_VALUE    1       /* Value Read cycle */
-#define SK_SEN_VALEXT   2       /* Extended Value Read cycle */
-
-/*
- * Conversion factor to convert read Voltage sensor to milli Volt
- * Conversion factor to convert read Temperature sensor to 10th degree Celsius
- */
-#define SK_LM80_VT_LSB          22      /* 22mV LSB resolution */
-#define SK_LM80_TEMP_LSB        10      /* 1 degree LSB resolution */
-#define SK_LM80_TEMPEXT_LSB      5      /* 0.5 degree LSB resolution for ext. val. */
-
-/*
- * formula: counter = (22500*60)/(rpm * divisor * pulses/2)
- * assuming: 6500rpm, 4 pulses, divisor 1
- */
-#define SK_LM80_FAN_FAKTOR      ((22500L*60)/(1*2))
-
-/*
- * Define sensor management data
- * Maximum is reached on Genesis copper dual port and Yukon-64
- * Board specific maximum is in pAC->I2c.MaxSens
- */
-#define SK_MAX_SENSORS  8       /* maximal no. of installed sensors */
-#define SK_MIN_SENSORS  5       /* minimal no. of installed sensors */
-
-/*
- * To watch the state machine (SM) use the timer in two ways
- * instead of one as hitherto
- */
-#define SK_TIMER_WATCH_SM               0       /* Watch the SM to finish in a spec. time */
-#define SK_TIMER_NEW_GAUGING    1       /* Start a new gauging when timer expires */
-
-/*
- * Defines for the individual thresholds
- */
-
-/* Temperature sensor */
-#define SK_SEN_TEMP_HIGH_ERR    800     /* Temperature High Err  Threshold */
-#define SK_SEN_TEMP_HIGH_WARN   700     /* Temperature High Warn Threshold */
-#define SK_SEN_TEMP_LOW_WARN    100     /* Temperature Low  Warn Threshold */
-#define SK_SEN_TEMP_LOW_ERR               0     /* Temperature Low  Err  Threshold */
-
-/* VCC which should be 5 V */
-#define SK_SEN_PCI_5V_HIGH_ERR          5588    /* Voltage PCI High Err  Threshold */
-#define SK_SEN_PCI_5V_HIGH_WARN         5346    /* Voltage PCI High Warn Threshold */
-#define SK_SEN_PCI_5V_LOW_WARN          4664    /* Voltage PCI Low  Warn Threshold */
-#define SK_SEN_PCI_5V_LOW_ERR           4422    /* Voltage PCI Low  Err  Threshold */
-
-/*
- * VIO may be 5 V or 3.3 V. Initialization takes two parts:
- * 1. Initialize lowest lower limit and highest higher limit.
- * 2. After the first value is read correct the upper or the lower limit to
- *    the appropriate C constant.
- *
- * Warning limits are +-5% of the exepected voltage.
- * Error limits are +-10% of the expected voltage.
- */
-
-/* Bug fix AF: 16.Aug.2001: Correct the init base of LM80 sensor */
-
-#define SK_SEN_PCI_IO_5V_HIGH_ERR       5566    /* + 10% V PCI-IO High Err Threshold */
-#define SK_SEN_PCI_IO_5V_HIGH_WARN      5324    /* +  5% V PCI-IO High Warn Threshold */
-                                        /*              5000    mVolt */
-#define SK_SEN_PCI_IO_5V_LOW_WARN       4686    /* -  5% V PCI-IO Low Warn Threshold */
-#define SK_SEN_PCI_IO_5V_LOW_ERR        4444    /* - 10% V PCI-IO Low Err Threshold */
-
-#define SK_SEN_PCI_IO_RANGE_LIMITER     4000    /* 4000 mV range delimiter */
-
-/* correction values for the second pass */
-#define SK_SEN_PCI_IO_3V3_HIGH_ERR      3850    /* + 15% V PCI-IO High Err Threshold */
-#define SK_SEN_PCI_IO_3V3_HIGH_WARN     3674    /* + 10% V PCI-IO High Warn Threshold */
-                                        /*              3300    mVolt */
-#define SK_SEN_PCI_IO_3V3_LOW_WARN      2926    /* - 10% V PCI-IO Low Warn Threshold */
-#define SK_SEN_PCI_IO_3V3_LOW_ERR       2772    /* - 15% V PCI-IO Low Err  Threshold */
-
-/*
- * VDD voltage
- */
-#define SK_SEN_VDD_HIGH_ERR             3630    /* Voltage ASIC High Err  Threshold */
-#define SK_SEN_VDD_HIGH_WARN    3476    /* Voltage ASIC High Warn Threshold */
-#define SK_SEN_VDD_LOW_WARN             3146    /* Voltage ASIC Low  Warn Threshold */
-#define SK_SEN_VDD_LOW_ERR              2970    /* Voltage ASIC Low  Err  Threshold */
-
-/*
- * PHY PLL 3V3 voltage
- */
-#define SK_SEN_PLL_3V3_HIGH_ERR         3630    /* Voltage PMA High Err  Threshold */
-#define SK_SEN_PLL_3V3_HIGH_WARN        3476    /* Voltage PMA High Warn Threshold */
-#define SK_SEN_PLL_3V3_LOW_WARN         3146    /* Voltage PMA Low  Warn Threshold */
-#define SK_SEN_PLL_3V3_LOW_ERR          2970    /* Voltage PMA Low  Err  Threshold */
-
-/*
- * VAUX (YUKON only)
- */
-#define SK_SEN_VAUX_3V3_HIGH_ERR        3630    /* Voltage VAUX High Err Threshold */
-#define SK_SEN_VAUX_3V3_HIGH_WARN       3476    /* Voltage VAUX High Warn Threshold */
-#define SK_SEN_VAUX_3V3_LOW_WARN        3146    /* Voltage VAUX Low Warn Threshold */
-#define SK_SEN_VAUX_3V3_LOW_ERR         2970    /* Voltage VAUX Low Err Threshold */
-#define SK_SEN_VAUX_0V_WARN_ERR            0    /* if VAUX not present */
-#define SK_SEN_VAUX_RANGE_LIMITER       1000    /* 1000 mV range delimiter */
-
-/*
- * PHY 2V5 voltage
- */
-#define SK_SEN_PHY_2V5_HIGH_ERR         2750    /* Voltage PHY High Err Threshold */
-#define SK_SEN_PHY_2V5_HIGH_WARN        2640    /* Voltage PHY High Warn Threshold */
-#define SK_SEN_PHY_2V5_LOW_WARN         2376    /* Voltage PHY Low Warn Threshold */
-#define SK_SEN_PHY_2V5_LOW_ERR          2222    /* Voltage PHY Low Err Threshold */
-
-/*
- * ASIC Core 1V5 voltage (YUKON only)
- */
-#define SK_SEN_CORE_1V5_HIGH_ERR        1650    /* Voltage ASIC Core High Err Threshold */
-#define SK_SEN_CORE_1V5_HIGH_WARN       1575    /* Voltage ASIC Core High Warn Threshold */
-#define SK_SEN_CORE_1V5_LOW_WARN        1425    /* Voltage ASIC Core Low Warn Threshold */
-#define SK_SEN_CORE_1V5_LOW_ERR         1350    /* Voltage ASIC Core Low Err Threshold */
-
-/*
- * FAN 1 speed
- */
-/* assuming: 6500rpm +-15%, 4 pulses,
- * warning at:  80 %
- * error at:    70 %
- * no upper limit
- */
-#define SK_SEN_FAN_HIGH_ERR             20000   /* FAN Speed High Err Threshold */
-#define SK_SEN_FAN_HIGH_WARN    20000   /* FAN Speed High Warn Threshold */
-#define SK_SEN_FAN_LOW_WARN              5200   /* FAN Speed Low Warn Threshold */
-#define SK_SEN_FAN_LOW_ERR               4550   /* FAN Speed Low Err Threshold */
-
-/*
- * Some Voltages need dynamic thresholds
- */
-#define SK_SEN_DYN_INIT_NONE             0  /* No dynamic init of thresholds */
-#define SK_SEN_DYN_INIT_PCI_IO          10  /* Init PCI-IO with new thresholds */
-#define SK_SEN_DYN_INIT_VAUX            11  /* Init VAUX with new thresholds */
-
-extern  int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
-#endif  /* n_INC_SKGEI2C_H */
diff --git a/drivers/net/sk98lin/h/skgeinit.h b/drivers/net/sk98lin/h/skgeinit.h
deleted file mode 100644
index 143e635ec24d..000000000000
--- a/drivers/net/sk98lin/h/skgeinit.h
+++ /dev/null
@@ -1,797 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgeinit.h
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.83 $
- * Date:        $Date: 2003/09/16 14:07:37 $
- * Purpose:     Structures and prototypes for the GE Init Module
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef __INC_SKGEINIT_H_
-#define __INC_SKGEINIT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-/* defines ********************************************************************/
-
-#define SK_TEST_VAL             0x11335577UL
-
-/* modifying Link LED behaviour (used with SkGeLinkLED()) */
-#define SK_LNK_OFF              LED_OFF
-#define SK_LNK_ON               (LED_ON | LED_BLK_OFF | LED_SYNC_OFF)
-#define SK_LNK_BLINK    (LED_ON | LED_BLK_ON  | LED_SYNC_ON)
-#define SK_LNK_PERM             (LED_ON | LED_BLK_OFF | LED_SYNC_ON)
-#define SK_LNK_TST              (LED_ON | LED_BLK_ON  | LED_SYNC_OFF)
-
-/* parameter 'Mode' when calling SK_HWAC_LINK_LED() */
-#define SK_LED_OFF              LED_OFF
-#define SK_LED_ACTIVE   (LED_ON | LED_BLK_OFF | LED_SYNC_OFF)
-#define SK_LED_STANDBY  (LED_ON | LED_BLK_ON  | LED_SYNC_OFF)
-
-/* addressing LED Registers in SkGeXmitLED() */
-#define XMIT_LED_INI    0
-#define XMIT_LED_CNT    (RX_LED_VAL - RX_LED_INI)
-#define XMIT_LED_CTRL   (RX_LED_CTRL- RX_LED_INI)
-#define XMIT_LED_TST    (RX_LED_TST - RX_LED_INI)
-
-/* parameter 'Mode' when calling SkGeXmitLED() */
-#define SK_LED_DIS      0
-#define SK_LED_ENA      1
-#define SK_LED_TST      2
-
-/* Counter and Timer constants, for a host clock of 62.5 MHz */
-#define SK_XMIT_DUR             0x002faf08UL    /*  50 ms */
-#define SK_BLK_DUR              0x01dcd650UL    /* 500 ms */
-
-#define SK_DPOLL_DEF    0x00ee6b28UL    /* 250 ms at 62.5 MHz */
-
-#define SK_DPOLL_MAX    0x00ffffffUL    /* 268 ms at 62.5 MHz */
-                                                                                /* 215 ms at 78.12 MHz */
-
-#define SK_FACT_62              100                     /* is given in percent */
-#define SK_FACT_53               85         /* on GENESIS:      53.12 MHz */
-#define SK_FACT_78              125                     /* on YUKON:    78.12 MHz */
-
-/* Timeout values */
-#define SK_MAC_TO_53    72                      /* MAC arbiter timeout */
-#define SK_PKT_TO_53    0x2000          /* Packet arbiter timeout */
-#define SK_PKT_TO_MAX   0xffff          /* Maximum value */
-#define SK_RI_TO_53             36                      /* RAM interface timeout */
-
-#define SK_PHY_ACC_TO   600000          /* PHY access timeout */
-
-/* RAM Buffer High Pause Threshold values */
-#define SK_RB_ULPP              ( 8 * 1024)     /* Upper Level in kB/8 */
-#define SK_RB_LLPP_S    (10 * 1024)     /* Lower Level for small Queues */
-#define SK_RB_LLPP_B    (16 * 1024)     /* Lower Level for big Queues */
-
-#ifndef SK_BMU_RX_WM
-#define SK_BMU_RX_WM    0x600           /* BMU Rx Watermark */
-#endif
-#ifndef SK_BMU_TX_WM
-#define SK_BMU_TX_WM    0x600           /* BMU Tx Watermark */
-#endif
-
-/* XMAC II Rx High Watermark */
-#define SK_XM_RX_HI_WM  0x05aa          /* 1450 */
-
-/* XMAC II Tx Threshold */
-#define SK_XM_THR_REDL  0x01fb          /* .. for redundant link usage */
-#define SK_XM_THR_SL    0x01fb          /* .. for single link adapters */
-#define SK_XM_THR_MULL  0x01fb          /* .. for multiple link usage */
-#define SK_XM_THR_JUMBO 0x03fc          /* .. for jumbo frame usage */
-
-/* values for GIPortUsage */
-#define SK_RED_LINK             1               /* redundant link usage */
-#define SK_MUL_LINK             2               /* multiple link usage */
-#define SK_JUMBO_LINK   3               /* driver uses jumbo frames */
-
-/* Minimum RAM Buffer Rx Queue Size */
-#define SK_MIN_RXQ_SIZE 16              /* 16 kB */
-
-/* Minimum RAM Buffer Tx Queue Size */
-#define SK_MIN_TXQ_SIZE 16              /* 16 kB */
-
-/* Queue Size units */
-#define QZ_UNITS                0x7
-#define QZ_STEP                 8
-
-/* Percentage of queue size from whole memory */
-/* 80 % for receive */
-#define RAM_QUOTA_RX    80L
-/* 0% for sync transfer */
-#define RAM_QUOTA_SYNC  0L
-/* the rest (20%) is taken for async transfer */
-
-/* Get the rounded queue size in Bytes in 8k steps */
-#define ROUND_QUEUE_SIZE(SizeInBytes)                                   \
-        ((((unsigned long) (SizeInBytes) + (QZ_STEP*1024L)-1) / 1024) & \
-        ~(QZ_STEP-1))
-
-/* Get the rounded queue size in KBytes in 8k steps */
-#define ROUND_QUEUE_SIZE_KB(Kilobytes) \
-        ROUND_QUEUE_SIZE((Kilobytes) * 1024L)
-
-/* Types of RAM Buffer Queues */
-#define SK_RX_SRAM_Q    1       /* small receive queue */
-#define SK_RX_BRAM_Q    2       /* big receive queue */
-#define SK_TX_RAM_Q             3       /* small or big transmit queue */
-
-/* parameter 'Dir' when calling SkGeStopPort() */
-#define SK_STOP_TX      1       /* Stops the transmit path, resets the XMAC */
-#define SK_STOP_RX      2       /* Stops the receive path */
-#define SK_STOP_ALL     3       /* Stops Rx and Tx path, resets the XMAC */
-
-/* parameter 'RstMode' when calling SkGeStopPort() */
-#define SK_SOFT_RST     1       /* perform a software reset */
-#define SK_HARD_RST     2       /* perform a hardware reset */
-
-/* Init Levels */
-#define SK_INIT_DATA    0       /* Init level 0: init data structures */
-#define SK_INIT_IO              1       /* Init level 1: init with IOs */
-#define SK_INIT_RUN             2       /* Init level 2: init for run time */
-
-/* Link Mode Parameter */
-#define SK_LMODE_HALF           1       /* Half Duplex Mode */
-#define SK_LMODE_FULL           2       /* Full Duplex Mode */
-#define SK_LMODE_AUTOHALF       3       /* AutoHalf Duplex Mode */
-#define SK_LMODE_AUTOFULL       4       /* AutoFull Duplex Mode */
-#define SK_LMODE_AUTOBOTH       5       /* AutoBoth Duplex Mode */
-#define SK_LMODE_AUTOSENSE      6       /* configured mode auto sensing */
-#define SK_LMODE_INDETERMINATED 7       /* indeterminated */
-
-/* Auto-negotiation timeout in 100ms granularity */
-#define SK_AND_MAX_TO           6       /* Wait 600 msec before link comes up */
-
-/* Auto-negotiation error codes */
-#define SK_AND_OK                       0       /* no error */
-#define SK_AND_OTHER            1       /* other error than below */
-#define SK_AND_DUP_CAP          2       /* Duplex capabilities error */
-
-
-/* Link Speed Capabilities */
-#define SK_LSPEED_CAP_AUTO                      (1<<0)  /* Automatic resolution */
-#define SK_LSPEED_CAP_10MBPS            (1<<1)  /* 10 Mbps */
-#define SK_LSPEED_CAP_100MBPS           (1<<2)  /* 100 Mbps */
-#define SK_LSPEED_CAP_1000MBPS          (1<<3)  /* 1000 Mbps */
-#define SK_LSPEED_CAP_INDETERMINATED (1<<4) /* indeterminated */
-
-/* Link Speed Parameter */
-#define SK_LSPEED_AUTO                          1       /* Automatic resolution */
-#define SK_LSPEED_10MBPS                        2       /* 10 Mbps */
-#define SK_LSPEED_100MBPS                       3       /* 100 Mbps */
-#define SK_LSPEED_1000MBPS                      4       /* 1000 Mbps */
-#define SK_LSPEED_INDETERMINATED        5       /* indeterminated */
-
-/* Link Speed Current State */
-#define SK_LSPEED_STAT_UNKNOWN          1
-#define SK_LSPEED_STAT_10MBPS           2
-#define SK_LSPEED_STAT_100MBPS          3
-#define SK_LSPEED_STAT_1000MBPS         4
-#define SK_LSPEED_STAT_INDETERMINATED 5
-
-
-/* Link Capability Parameter */
-#define SK_LMODE_CAP_HALF               (1<<0)  /* Half Duplex Mode */
-#define SK_LMODE_CAP_FULL               (1<<1)  /* Full Duplex Mode */
-#define SK_LMODE_CAP_AUTOHALF   (1<<2)  /* AutoHalf Duplex Mode */
-#define SK_LMODE_CAP_AUTOFULL   (1<<3)  /* AutoFull Duplex Mode */
-#define SK_LMODE_CAP_INDETERMINATED (1<<4) /* indeterminated */
-
-/* Link Mode Current State */
-#define SK_LMODE_STAT_UNKNOWN   1       /* Unknown Duplex Mode */
-#define SK_LMODE_STAT_HALF              2       /* Half Duplex Mode */
-#define SK_LMODE_STAT_FULL              3       /* Full Duplex Mode */
-#define SK_LMODE_STAT_AUTOHALF  4       /* Half Duplex Mode obtained by Auto-Neg */
-#define SK_LMODE_STAT_AUTOFULL  5       /* Full Duplex Mode obtained by Auto-Neg */
-#define SK_LMODE_STAT_INDETERMINATED 6  /* indeterminated */
-
-/* Flow Control Mode Parameter (and capabilities) */
-#define SK_FLOW_MODE_NONE               1       /* No Flow-Control */
-#define SK_FLOW_MODE_LOC_SEND   2       /* Local station sends PAUSE */
-#define SK_FLOW_MODE_SYMMETRIC  3       /* Both stations may send PAUSE */
-#define SK_FLOW_MODE_SYM_OR_REM 4       /* Both stations may send PAUSE or
-                                         * just the remote station may send PAUSE
-                                         */
-#define SK_FLOW_MODE_INDETERMINATED 5   /* indeterminated */
-
-/* Flow Control Status Parameter */
-#define SK_FLOW_STAT_NONE               1       /* No Flow Control */
-#define SK_FLOW_STAT_REM_SEND   2       /* Remote Station sends PAUSE */
-#define SK_FLOW_STAT_LOC_SEND   3       /* Local station sends PAUSE */
-#define SK_FLOW_STAT_SYMMETRIC  4       /* Both station may send PAUSE */
-#define SK_FLOW_STAT_INDETERMINATED 5   /* indeterminated */
-
-/* Master/Slave Mode Capabilities */
-#define SK_MS_CAP_AUTO          (1<<0)  /* Automatic resolution */
-#define SK_MS_CAP_MASTER        (1<<1)  /* This station is master */
-#define SK_MS_CAP_SLAVE         (1<<2)  /* This station is slave */
-#define SK_MS_CAP_INDETERMINATED (1<<3) /* indeterminated */
-
-/* Set Master/Slave Mode Parameter (and capabilities) */
-#define SK_MS_MODE_AUTO         1       /* Automatic resolution */
-#define SK_MS_MODE_MASTER       2       /* This station is master */
-#define SK_MS_MODE_SLAVE        3       /* This station is slave */
-#define SK_MS_MODE_INDETERMINATED 4     /* indeterminated */
-
-/* Master/Slave Status Parameter */
-#define SK_MS_STAT_UNSET        1       /* The M/S status is not set */
-#define SK_MS_STAT_MASTER       2       /* This station is master */
-#define SK_MS_STAT_SLAVE        3       /* This station is slave */
-#define SK_MS_STAT_FAULT        4       /* M/S resolution failed */
-#define SK_MS_STAT_INDETERMINATED 5     /* indeterminated */
-
-/* parameter 'Mode' when calling SkXmSetRxCmd() */
-#define SK_STRIP_FCS_ON         (1<<0)  /* Enable  FCS stripping of Rx frames */
-#define SK_STRIP_FCS_OFF        (1<<1)  /* Disable FCS stripping of Rx frames */
-#define SK_STRIP_PAD_ON         (1<<2)  /* Enable  pad byte stripping of Rx fr */
-#define SK_STRIP_PAD_OFF        (1<<3)  /* Disable pad byte stripping of Rx fr */
-#define SK_LENERR_OK_ON         (1<<4)  /* Don't chk fr for in range len error */
-#define SK_LENERR_OK_OFF        (1<<5)  /* Check frames for in range len error */
-#define SK_BIG_PK_OK_ON         (1<<6)  /* Don't set Rx Error bit for big frames */
-#define SK_BIG_PK_OK_OFF        (1<<7)  /* Set Rx Error bit for big frames */
-#define SK_SELF_RX_ON           (1<<8)  /* Enable  Rx of own packets */
-#define SK_SELF_RX_OFF          (1<<9)  /* Disable Rx of own packets */
-
-/* parameter 'Para' when calling SkMacSetRxTxEn() */
-#define SK_MAC_LOOPB_ON         (1<<0)  /* Enable  MAC Loopback Mode */
-#define SK_MAC_LOOPB_OFF        (1<<1)  /* Disable MAC Loopback Mode */
-#define SK_PHY_LOOPB_ON         (1<<2)  /* Enable  PHY Loopback Mode */
-#define SK_PHY_LOOPB_OFF        (1<<3)  /* Disable PHY Loopback Mode */
-#define SK_PHY_FULLD_ON         (1<<4)  /* Enable  GMII Full Duplex */
-#define SK_PHY_FULLD_OFF        (1<<5)  /* Disable GMII Full Duplex */
-
-/* States of PState */
-#define SK_PRT_RESET    0       /* the port is reset */
-#define SK_PRT_STOP             1       /* the port is stopped (similar to SW reset) */
-#define SK_PRT_INIT             2       /* the port is initialized */
-#define SK_PRT_RUN              3       /* the port has an active link */
-
-/* PHY power down modes */
-#define PHY_PM_OPERATIONAL_MODE         0       /* PHY operational mode */
-#define PHY_PM_DEEP_SLEEP                       1       /* coma mode --> minimal power */
-#define PHY_PM_IEEE_POWER_DOWN          2       /* IEEE 22.2.4.1.5 compl. power down */
-#define PHY_PM_ENERGY_DETECT            3       /* energy detect */
-#define PHY_PM_ENERGY_DETECT_PLUS       4       /* energy detect plus */
-
-/* Default receive frame limit for Workaround of XMAC Errata */
-#define SK_DEF_RX_WA_LIM        SK_CONSTU64(100)
-
-/* values for GILedBlinkCtrl (LED Blink Control) */
-#define SK_ACT_LED_BLINK        (1<<0)  /* Active LED blinking */
-#define SK_DUP_LED_NORMAL       (1<<1)  /* Duplex LED normal */
-#define SK_LED_LINK100_ON       (1<<2)  /* Link 100M LED on */
-
-/* Link Partner Status */
-#define SK_LIPA_UNKNOWN 0       /* Link partner is in unknown state */
-#define SK_LIPA_MANUAL  1       /* Link partner is in detected manual state */
-#define SK_LIPA_AUTO    2       /* Link partner is in auto-negotiation state */
-
-/* Maximum Restarts before restart is ignored (3Com WA) */
-#define SK_MAX_LRESTART 3       /* Max. 3 times the link is restarted */
-
-/* Max. Auto-neg. timeouts before link detection in sense mode is reset */
-#define SK_MAX_ANEG_TO  10      /* Max. 10 times the sense mode is reset */
-
-/* structures *****************************************************************/
-
-/*
- * MAC specific functions
- */
-typedef struct s_GeMacFunc {
-        int  (*pFnMacUpdateStats)(SK_AC *pAC, SK_IOC IoC, unsigned int Port);
-        int  (*pFnMacStatistic)(SK_AC *pAC, SK_IOC IoC, unsigned int Port,
-                                                        SK_U16 StatAddr, SK_U32 SK_FAR *pVal);
-        int  (*pFnMacResetCounter)(SK_AC *pAC, SK_IOC IoC, unsigned int Port);
-        int  (*pFnMacOverflow)(SK_AC *pAC, SK_IOC IoC, unsigned int Port,
-                                                   SK_U16 IStatus, SK_U64 SK_FAR *pVal);
-} SK_GEMACFUNC;
-
-/*
- * Port Structure
- */
-typedef struct s_GePort {
-#ifndef SK_DIAG
-        SK_TIMER        PWaTimer;       /* Workaround Timer */
-        SK_TIMER        HalfDupChkTimer;
-#endif /* SK_DIAG */
-        SK_U32  PPrevShorts;    /* Previous Short Counter checking */
-        SK_U32  PPrevFcs;               /* Previous FCS Error Counter checking */
-        SK_U64  PPrevRx;                /* Previous RxOk Counter checking */
-        SK_U64  PRxLim;                 /* Previous RxOk Counter checking */
-        SK_U64  LastOctets;             /* For half duplex hang check */
-        int             PLinkResCt;             /* Link Restart Counter */
-        int             PAutoNegTimeOut;/* Auto-negotiation timeout current value */
-        int             PAutoNegTOCt;   /* Auto-negotiation Timeout Counter */
-        int             PRxQSize;               /* Port Rx Queue Size in kB */
-        int             PXSQSize;               /* Port Synchronous  Transmit Queue Size in kB */
-        int             PXAQSize;               /* Port Asynchronous Transmit Queue Size in kB */
-        SK_U32  PRxQRamStart;   /* Receive Queue RAM Buffer Start Address */
-        SK_U32  PRxQRamEnd;             /* Receive Queue RAM Buffer End Address */
-        SK_U32  PXsQRamStart;   /* Sync Tx Queue RAM Buffer Start Address */
-        SK_U32  PXsQRamEnd;             /* Sync Tx Queue RAM Buffer End Address */
-        SK_U32  PXaQRamStart;   /* Async Tx Queue RAM Buffer Start Address */
-        SK_U32  PXaQRamEnd;             /* Async Tx Queue RAM Buffer End Address */
-        SK_U32  PRxOverCnt;             /* Receive Overflow Counter */
-        int             PRxQOff;                /* Rx Queue Address Offset */
-        int             PXsQOff;                /* Synchronous Tx Queue Address Offset */
-        int             PXaQOff;                /* Asynchronous Tx Queue Address Offset */
-        int             PhyType;                /* PHY used on this port */
-        int             PState;                 /* Port status (reset, stop, init, run) */
-        SK_U16  PhyId1;                 /* PHY Id1 on this port */
-        SK_U16  PhyAddr;                /* MDIO/MDC PHY address */
-        SK_U16  PIsave;                 /* Saved Interrupt status word */
-        SK_U16  PSsave;                 /* Saved PHY status word */
-        SK_U16  PGmANegAdv;             /* Saved GPhy AutoNegAdvertisment register */
-        SK_BOOL PHWLinkUp;              /* The hardware Link is up (wiring) */
-        SK_BOOL PLinkBroken;    /* Is Link broken ? */
-        SK_BOOL PCheckPar;              /* Do we check for parity errors ? */
-        SK_BOOL HalfDupTimerActive;
-        SK_U8   PLinkCap;               /* Link Capabilities */
-        SK_U8   PLinkModeConf;  /* Link Mode configured */
-        SK_U8   PLinkMode;              /* Link Mode currently used */
-        SK_U8   PLinkModeStatus;/* Link Mode Status */
-        SK_U8   PLinkSpeedCap;  /* Link Speed Capabilities(10/100/1000 Mbps) */
-        SK_U8   PLinkSpeed;             /* configured Link Speed (10/100/1000 Mbps) */
-        SK_U8   PLinkSpeedUsed; /* current Link Speed (10/100/1000 Mbps) */
-        SK_U8   PFlowCtrlCap;   /* Flow Control Capabilities */
-        SK_U8   PFlowCtrlMode;  /* Flow Control Mode */
-        SK_U8   PFlowCtrlStatus;/* Flow Control Status */
-        SK_U8   PMSCap;                 /* Master/Slave Capabilities */
-        SK_U8   PMSMode;                /* Master/Slave Mode */
-        SK_U8   PMSStatus;              /* Master/Slave Status */
-        SK_BOOL PAutoNegFail;   /* Auto-negotiation fail flag */
-        SK_U8   PLipaAutoNeg;   /* Auto-negotiation possible with Link Partner */
-        SK_U8   PCableLen;              /* Cable Length */
-        SK_U8   PMdiPairLen[4]; /* MDI[0..3] Pair Length */
-        SK_U8   PMdiPairSts[4]; /* MDI[0..3] Pair Diagnostic Status */
-        SK_U8   PPhyPowerState; /* PHY current power state */
-        int             PMacColThres;   /* MAC Collision Threshold */
-        int             PMacJamLen;             /* MAC Jam length */
-        int             PMacJamIpgVal;  /* MAC Jam IPG */
-        int             PMacJamIpgData; /* MAC IPG Jam to Data */
-        int             PMacIpgData;    /* MAC Data IPG */
-        SK_BOOL PMacLimit4;             /* reset collision counter and backoff algorithm */
-} SK_GEPORT;
-
-/*
- * Gigabit Ethernet Initialization Struct
- * (has to be included in the adapter context)
- */
-typedef struct s_GeInit {
-        int                     GIChipId;               /* Chip Identification Number */
-        int                     GIChipRev;              /* Chip Revision Number */
-        SK_U8           GIPciHwRev;             /* PCI HW Revision Number */
-        SK_BOOL         GIGenesis;              /* Genesis adapter ? */
-        SK_BOOL         GIYukon;                /* YUKON-A1/Bx chip */
-        SK_BOOL         GIYukonLite;    /* YUKON-Lite chip */
-        SK_BOOL         GICopperType;   /* Copper Type adapter ? */
-        SK_BOOL         GIPciSlot64;    /* 64-bit PCI Slot */
-        SK_BOOL         GIPciClock66;   /* 66 MHz PCI Clock */
-        SK_BOOL         GIVauxAvail;    /* VAUX available (YUKON) */
-        SK_BOOL         GIYukon32Bit;   /* 32-Bit YUKON adapter */
-        SK_U16          GILedBlinkCtrl; /* LED Blink Control */
-        int                     GIMacsFound;    /* Number of MACs found on this adapter */
-        int                     GIMacType;              /* MAC Type used on this adapter */
-        int                     GIHstClkFact;   /* Host Clock Factor (62.5 / HstClk * 100) */
-        int                     GIPortUsage;    /* Driver Port Usage */
-        int                     GILevel;                /* Initialization Level completed */
-        int                     GIRamSize;              /* The RAM size of the adapter in kB */
-        int                     GIWolOffs;              /* WOL Register Offset (HW-Bug in Rev. A) */
-        SK_U32          GIRamOffs;              /* RAM Address Offset for addr calculation */
-        SK_U32          GIPollTimerVal; /* Descr. Poll Timer Init Val (HstClk ticks) */
-        SK_U32          GIValIrqMask;   /* Value for Interrupt Mask */
-        SK_U32          GITimeStampCnt; /* Time Stamp High Counter (YUKON only) */
-        SK_GEPORT       GP[SK_MAX_MACS];/* Port Dependent Information */
-        SK_GEMACFUNC GIFunc;            /* MAC depedent functions */
-} SK_GEINIT;
-
-/*
- * Error numbers and messages for skxmac2.c and skgeinit.c
- */
-#define SKERR_HWI_E001          (SK_ERRBASE_HWINIT)
-#define SKERR_HWI_E001MSG       "SkXmClrExactAddr() has got illegal parameters"
-#define SKERR_HWI_E002          (SKERR_HWI_E001+1)
-#define SKERR_HWI_E002MSG       "SkGeInit(): Level 1 call missing"
-#define SKERR_HWI_E003          (SKERR_HWI_E002+1)
-#define SKERR_HWI_E003MSG       "SkGeInit() called with illegal init Level"
-#define SKERR_HWI_E004          (SKERR_HWI_E003+1)
-#define SKERR_HWI_E004MSG       "SkGeInitPort(): Queue Size illegal configured"
-#define SKERR_HWI_E005          (SKERR_HWI_E004+1)
-#define SKERR_HWI_E005MSG       "SkGeInitPort(): cannot init running ports"
-#define SKERR_HWI_E006          (SKERR_HWI_E005+1)
-#define SKERR_HWI_E006MSG       "SkGeMacInit(): PState does not match HW state"
-#define SKERR_HWI_E007          (SKERR_HWI_E006+1)
-#define SKERR_HWI_E007MSG       "SkXmInitDupMd() called with invalid Dup Mode"
-#define SKERR_HWI_E008          (SKERR_HWI_E007+1)
-#define SKERR_HWI_E008MSG       "SkXmSetRxCmd() called with invalid Mode"
-#define SKERR_HWI_E009          (SKERR_HWI_E008+1)
-#define SKERR_HWI_E009MSG       "SkGeCfgSync() called although PXSQSize zero"
-#define SKERR_HWI_E010          (SKERR_HWI_E009+1)
-#define SKERR_HWI_E010MSG       "SkGeCfgSync() called with invalid parameters"
-#define SKERR_HWI_E011          (SKERR_HWI_E010+1)
-#define SKERR_HWI_E011MSG       "SkGeInitPort(): Receive Queue Size too small"
-#define SKERR_HWI_E012          (SKERR_HWI_E011+1)
-#define SKERR_HWI_E012MSG       "SkGeInitPort(): invalid Queue Size specified"
-#define SKERR_HWI_E013          (SKERR_HWI_E012+1)
-#define SKERR_HWI_E013MSG       "SkGeInitPort(): cfg changed for running queue"
-#define SKERR_HWI_E014          (SKERR_HWI_E013+1)
-#define SKERR_HWI_E014MSG       "SkGeInitPort(): unknown GIPortUsage specified"
-#define SKERR_HWI_E015          (SKERR_HWI_E014+1)
-#define SKERR_HWI_E015MSG       "Illegal Link mode parameter"
-#define SKERR_HWI_E016          (SKERR_HWI_E015+1)
-#define SKERR_HWI_E016MSG       "Illegal Flow control mode parameter"
-#define SKERR_HWI_E017          (SKERR_HWI_E016+1)
-#define SKERR_HWI_E017MSG       "Illegal value specified for GIPollTimerVal"
-#define SKERR_HWI_E018          (SKERR_HWI_E017+1)
-#define SKERR_HWI_E018MSG       "FATAL: SkGeStopPort() does not terminate (Tx)"
-#define SKERR_HWI_E019          (SKERR_HWI_E018+1)
-#define SKERR_HWI_E019MSG       "Illegal Speed parameter"
-#define SKERR_HWI_E020          (SKERR_HWI_E019+1)
-#define SKERR_HWI_E020MSG       "Illegal Master/Slave parameter"
-#define SKERR_HWI_E021          (SKERR_HWI_E020+1)
-#define SKERR_HWI_E021MSG       "MacUpdateStats(): cannot update statistic counter"
-#define SKERR_HWI_E022          (SKERR_HWI_E021+1)
-#define SKERR_HWI_E022MSG       "MacStatistic(): illegal statistic base address"
-#define SKERR_HWI_E023          (SKERR_HWI_E022+1)
-#define SKERR_HWI_E023MSG       "SkGeInitPort(): Transmit Queue Size too small"
-#define SKERR_HWI_E024          (SKERR_HWI_E023+1)
-#define SKERR_HWI_E024MSG       "FATAL: SkGeStopPort() does not terminate (Rx)"
-#define SKERR_HWI_E025          (SKERR_HWI_E024+1)
-#define SKERR_HWI_E025MSG       ""
-
-/* function prototypes ********************************************************/
-
-#ifndef SK_KR_PROTO
-
-/*
- * public functions in skgeinit.c
- */
-extern void     SkGePollTxD(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL PollTxD);
-
-extern void     SkGeYellowLED(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             State);
-
-extern int      SkGeCfgSync(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_U32  IntTime,
-        SK_U32  LimCount,
-        int             SyncMode);
-
-extern void     SkGeLoadLnkSyncCnt(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_U32  CntVal);
-
-extern void     SkGeStopPort(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Dir,
-        int             RstMode);
-
-extern int      SkGeInit(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Level);
-
-extern void     SkGeDeInit(
-        SK_AC   *pAC,
-        SK_IOC  IoC);
-
-extern int      SkGeInitPort(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkGeXmitLED(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Led,
-        int             Mode);
-
-extern int      SkGeInitAssignRamToQueues(
-        SK_AC   *pAC,
-        int             ActivePort,
-        SK_BOOL DualNet);
-
-/*
- * public functions in skxmac2.c
- */
-extern void SkMacRxTxDisable(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkMacSoftRst(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkMacHardRst(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkXmInitMac(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkGmInitMac(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void SkMacInitPhy(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL DoLoop);
-
-extern void SkMacIrqDisable(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkMacFlushTxFifo(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkMacIrq(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern int      SkMacAutoNegDone(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkMacAutoNegLipaPhy(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_U16  IStatus);
-
-extern int  SkMacRxTxEnable(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port);
-
-extern void     SkMacPromiscMode(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL Enable);
-
-extern void     SkMacHashing(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL Enable);
-
-extern void     SkXmPhyRead(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Addr,
-        SK_U16  SK_FAR *pVal);
-
-extern void     SkXmPhyWrite(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Addr,
-        SK_U16  Val);
-
-extern void     SkGmPhyRead(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Addr,
-        SK_U16  SK_FAR *pVal);
-
-extern void     SkGmPhyWrite(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Addr,
-        SK_U16  Val);
-
-extern void     SkXmClrExactAddr(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             StartNum,
-        int             StopNum);
-
-extern void     SkXmAutoNegLipaXmac(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_U16  IStatus);
-
-extern int SkXmUpdateStats(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port);
-
-extern int SkGmUpdateStats(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port);
-
-extern int SkXmMacStatistic(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port,
-        SK_U16  StatAddr,
-        SK_U32  SK_FAR *pVal);
-
-extern int SkGmMacStatistic(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port,
-        SK_U16  StatAddr,
-        SK_U32  SK_FAR *pVal);
-
-extern int SkXmResetCounter(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port);
-
-extern int SkGmResetCounter(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port);
-
-extern int SkXmOverflowStatus(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port,
-        SK_U16  IStatus,
-        SK_U64  SK_FAR *pStatus);
-
-extern int SkGmOverflowStatus(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        unsigned int Port,
-        SK_U16  MacStatus,
-        SK_U64  SK_FAR *pStatus);
-
-extern int SkGmCableDiagStatus(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL StartTest);
-
-#ifdef SK_DIAG
-extern void     SkGePhyRead(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Addr,
-        SK_U16  *pVal);
-
-extern void     SkGePhyWrite(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Addr,
-        SK_U16  Val);
-
-extern void     SkMacSetRxCmd(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        int             Mode);
-extern void     SkMacCrcGener(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL Enable);
-extern void     SkMacTimeStamp(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL Enable);
-extern void     SkXmSendCont(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Port,
-        SK_BOOL Enable);
-#endif /* SK_DIAG */
-
-#else   /* SK_KR_PROTO */
-
-/*
- * public functions in skgeinit.c
- */
-extern void     SkGePollTxD();
-extern void     SkGeYellowLED();
-extern int      SkGeCfgSync();
-extern void     SkGeLoadLnkSyncCnt();
-extern void     SkGeStopPort();
-extern int      SkGeInit();
-extern void     SkGeDeInit();
-extern int      SkGeInitPort();
-extern void     SkGeXmitLED();
-extern int      SkGeInitAssignRamToQueues();
-
-/*
- * public functions in skxmac2.c
- */
-extern void SkMacRxTxDisable();
-extern void     SkMacSoftRst();
-extern void     SkMacHardRst();
-extern void SkMacInitPhy();
-extern int  SkMacRxTxEnable();
-extern void SkMacPromiscMode();
-extern void SkMacHashing();
-extern void SkMacIrqDisable();
-extern void     SkMacFlushTxFifo();
-extern void     SkMacIrq();
-extern int      SkMacAutoNegDone();
-extern void     SkMacAutoNegLipaPhy();
-extern void     SkXmInitMac();
-extern void     SkXmPhyRead();
-extern void     SkXmPhyWrite();
-extern void     SkGmInitMac();
-extern void     SkGmPhyRead();
-extern void     SkGmPhyWrite();
-extern void     SkXmClrExactAddr();
-extern void     SkXmAutoNegLipaXmac();
-extern int      SkXmUpdateStats();
-extern int      SkGmUpdateStats();
-extern int      SkXmMacStatistic();
-extern int      SkGmMacStatistic();
-extern int      SkXmResetCounter();
-extern int      SkGmResetCounter();
-extern int      SkXmOverflowStatus();
-extern int      SkGmOverflowStatus();
-extern int      SkGmCableDiagStatus();
-
-#ifdef SK_DIAG
-extern void     SkGePhyRead();
-extern void     SkGePhyWrite();
-extern void     SkMacSetRxCmd();
-extern void     SkMacCrcGener();
-extern void     SkMacTimeStamp();
-extern void     SkXmSendCont();
-#endif /* SK_DIAG */
-
-#endif  /* SK_KR_PROTO */
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* __INC_SKGEINIT_H_ */
diff --git a/drivers/net/sk98lin/h/skgepnm2.h b/drivers/net/sk98lin/h/skgepnm2.h
deleted file mode 100644
index ddd304f1a48b..000000000000
--- a/drivers/net/sk98lin/h/skgepnm2.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*****************************************************************************
- *
- * Name:        skgepnm2.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.36 $
- * Date:        $Date: 2003/05/23 12:45:13 $
- * Purpose:     Defines for Private Network Management Interface
- *
- ****************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef _SKGEPNM2_H_
-#define _SKGEPNM2_H_
-
-/*
- * General definitions
- */
-#define SK_PNMI_CHIPSET_XMAC    1       /* XMAC11800FP */
-#define SK_PNMI_CHIPSET_YUKON   2       /* YUKON */
-
-#define SK_PNMI_BUS_PCI         1       /* PCI bus*/
-
-/*
- * Actions
- */
-#define SK_PNMI_ACT_IDLE                1
-#define SK_PNMI_ACT_RESET               2
-#define SK_PNMI_ACT_SELFTEST    3
-#define SK_PNMI_ACT_RESETCNT    4
-
-/*
- * VPD releated defines
- */
-
-#define SK_PNMI_VPD_RW          1
-#define SK_PNMI_VPD_RO          2
-
-#define SK_PNMI_VPD_OK                  0
-#define SK_PNMI_VPD_NOTFOUND    1
-#define SK_PNMI_VPD_CUT                 2
-#define SK_PNMI_VPD_TIMEOUT             3
-#define SK_PNMI_VPD_FULL                4
-#define SK_PNMI_VPD_NOWRITE             5
-#define SK_PNMI_VPD_FATAL               6
-
-#define SK_PNMI_VPD_IGNORE      0
-#define SK_PNMI_VPD_CREATE      1
-#define SK_PNMI_VPD_DELETE      2
-
-
-/*
- * RLMT related defines
- */
-#define SK_PNMI_DEF_RLMT_CHG_THRES      240     /* 4 changes per minute */
-
-
-/*
- * VCT internal status values
- */
-#define SK_PNMI_VCT_PENDING     32
-#define SK_PNMI_VCT_TEST_DONE   64
-#define SK_PNMI_VCT_LINK        128
-
-/*
- * Internal table definitions
- */
-#define SK_PNMI_GET             0
-#define SK_PNMI_PRESET  1
-#define SK_PNMI_SET             2
-
-#define SK_PNMI_RO              0
-#define SK_PNMI_RW              1
-#define SK_PNMI_WO              2
-
-typedef struct s_OidTabEntry {
-        SK_U32                  Id;
-        SK_U32                  InstanceNo;
-        unsigned int    StructSize;
-        unsigned int    Offset;
-        int                             Access;
-        int                             (* Func)(SK_AC *pAc, SK_IOC pIo, int action,
-                                                         SK_U32 Id, char* pBuf, unsigned int* pLen,
-                                                         SK_U32 Instance, unsigned int TableIndex,
-                                                         SK_U32 NetNumber);
-        SK_U16                  Param;
-} SK_PNMI_TAB_ENTRY;
-
-
-/*
- * Trap lengths
- */
-#define SK_PNMI_TRAP_SIMPLE_LEN                 17
-#define SK_PNMI_TRAP_SENSOR_LEN_BASE    46
-#define SK_PNMI_TRAP_RLMT_CHANGE_LEN    23
-#define SK_PNMI_TRAP_RLMT_PORT_LEN              23
-
-/*
- * Number of MAC types supported
- */
-#define SK_PNMI_MAC_TYPES       (SK_MAC_GMAC + 1)
-
-/*
- * MAC statistic data list (overall set for MAC types used)
- */
-enum SK_MACSTATS {
-        SK_PNMI_HTX                             = 0,
-        SK_PNMI_HTX_OCTET,
-        SK_PNMI_HTX_OCTETHIGH   = SK_PNMI_HTX_OCTET,
-        SK_PNMI_HTX_OCTETLOW,
-        SK_PNMI_HTX_BROADCAST,
-        SK_PNMI_HTX_MULTICAST,
-        SK_PNMI_HTX_UNICAST,
-        SK_PNMI_HTX_BURST,
-        SK_PNMI_HTX_PMACC,
-        SK_PNMI_HTX_MACC,
-        SK_PNMI_HTX_COL,
-        SK_PNMI_HTX_SINGLE_COL,
-        SK_PNMI_HTX_MULTI_COL,
-        SK_PNMI_HTX_EXCESS_COL,
-        SK_PNMI_HTX_LATE_COL,
-        SK_PNMI_HTX_DEFFERAL,
-        SK_PNMI_HTX_EXCESS_DEF,
-        SK_PNMI_HTX_UNDERRUN,
-        SK_PNMI_HTX_CARRIER,
-        SK_PNMI_HTX_UTILUNDER,
-        SK_PNMI_HTX_UTILOVER,
-        SK_PNMI_HTX_64,
-        SK_PNMI_HTX_127,
-        SK_PNMI_HTX_255,
-        SK_PNMI_HTX_511,
-        SK_PNMI_HTX_1023,
-        SK_PNMI_HTX_MAX,
-        SK_PNMI_HTX_LONGFRAMES,
-        SK_PNMI_HTX_SYNC,
-        SK_PNMI_HTX_SYNC_OCTET,
-        SK_PNMI_HTX_RESERVED,
-        
-        SK_PNMI_HRX,
-        SK_PNMI_HRX_OCTET,
-        SK_PNMI_HRX_OCTETHIGH   = SK_PNMI_HRX_OCTET,
-        SK_PNMI_HRX_OCTETLOW,
-        SK_PNMI_HRX_BADOCTET,
-        SK_PNMI_HRX_BADOCTETHIGH = SK_PNMI_HRX_BADOCTET,
-        SK_PNMI_HRX_BADOCTETLOW,
-        SK_PNMI_HRX_BROADCAST,
-        SK_PNMI_HRX_MULTICAST,
-        SK_PNMI_HRX_UNICAST,
-        SK_PNMI_HRX_PMACC,
-        SK_PNMI_HRX_MACC,
-        SK_PNMI_HRX_PMACC_ERR,
-        SK_PNMI_HRX_MACC_UNKWN,
-        SK_PNMI_HRX_BURST,
-        SK_PNMI_HRX_MISSED,
-        SK_PNMI_HRX_FRAMING,
-        SK_PNMI_HRX_UNDERSIZE,
-        SK_PNMI_HRX_OVERFLOW,
-        SK_PNMI_HRX_JABBER,
-        SK_PNMI_HRX_CARRIER,
-        SK_PNMI_HRX_IRLENGTH,
-        SK_PNMI_HRX_SYMBOL,
-        SK_PNMI_HRX_SHORTS,
-        SK_PNMI_HRX_RUNT,
-        SK_PNMI_HRX_TOO_LONG,
-        SK_PNMI_HRX_FCS,
-        SK_PNMI_HRX_CEXT,
-        SK_PNMI_HRX_UTILUNDER,
-        SK_PNMI_HRX_UTILOVER,
-        SK_PNMI_HRX_64,
-        SK_PNMI_HRX_127,
-        SK_PNMI_HRX_255,
-        SK_PNMI_HRX_511,
-        SK_PNMI_HRX_1023,
-        SK_PNMI_HRX_MAX,
-        SK_PNMI_HRX_LONGFRAMES,
-        
-        SK_PNMI_HRX_RESERVED,
-        
-        SK_PNMI_MAX_IDX         /* NOTE: Ensure SK_PNMI_CNT_NO is set to this value */
-};
-
-/*
- * MAC specific data
- */
-typedef struct s_PnmiStatAddr {
-        SK_U16          Reg;            /* MAC register containing the value */
-        SK_BOOL         GetOffset;      /* TRUE: Offset managed by PNMI (call GetStatVal())*/
-} SK_PNMI_STATADDR;
-
-
-/*
- * SK_PNMI_STRUCT_DATA copy offset evaluation macros
- */
-#define SK_PNMI_OFF(e)          ((SK_U32)(SK_UPTR)&(((SK_PNMI_STRUCT_DATA *)0)->e))
-#define SK_PNMI_MAI_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_STRUCT_DATA *)0)->e))
-#define SK_PNMI_VPD_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_VPD *)0)->e))
-#define SK_PNMI_SEN_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_SENSOR *)0)->e))
-#define SK_PNMI_CHK_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_CHECKSUM *)0)->e))
-#define SK_PNMI_STA_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_STAT *)0)->e))
-#define SK_PNMI_CNF_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_CONF *)0)->e))
-#define SK_PNMI_RLM_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_RLMT *)0)->e))
-#define SK_PNMI_MON_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_RLMT_MONITOR *)0)->e))
-#define SK_PNMI_TRP_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_TRAP *)0)->e))
-
-#define SK_PNMI_SET_STAT(b,s,o) {SK_U32 Val32; char *pVal; \
-                                        Val32 = (s); \
-                                        pVal = (char *)(b) + ((SK_U32)(SK_UPTR) \
-                                                &(((SK_PNMI_STRUCT_DATA *)0)-> \
-                                                ReturnStatus.ErrorStatus)); \
-                                        SK_PNMI_STORE_U32(pVal, Val32); \
-                                        Val32 = (o); \
-                                        pVal = (char *)(b) + ((SK_U32)(SK_UPTR) \
-                                                &(((SK_PNMI_STRUCT_DATA *)0)-> \
-                                                ReturnStatus.ErrorOffset)); \
-                                        SK_PNMI_STORE_U32(pVal, Val32);}
-
-/*
- * Time macros
- */
-#ifndef SK_PNMI_HUNDREDS_SEC
-#if SK_TICKS_PER_SEC == 100
-#define SK_PNMI_HUNDREDS_SEC(t) (t)
-#else
-#define SK_PNMI_HUNDREDS_SEC(t) (((t) * 100) / (SK_TICKS_PER_SEC))
-#endif /* !SK_TICKS_PER_SEC */
-#endif /* !SK_PNMI_HUNDREDS_SEC */
-
-/*
- * Macros to work around alignment problems
- */
-#ifndef SK_PNMI_STORE_U16
-#define SK_PNMI_STORE_U16(p,v)  {*(char *)(p) = *((char *)&(v)); \
-                                        *((char *)(p) + 1) = \
-                                                *(((char *)&(v)) + 1);}
-#endif
-
-#ifndef SK_PNMI_STORE_U32
-#define SK_PNMI_STORE_U32(p,v)  {*(char *)(p) = *((char *)&(v)); \
-                                        *((char *)(p) + 1) = \
-                                                *(((char *)&(v)) + 1); \
-                                        *((char *)(p) + 2) = \
-                                                *(((char *)&(v)) + 2); \
-                                        *((char *)(p) + 3) = \
-                                                *(((char *)&(v)) + 3);}
-#endif
-
-#ifndef SK_PNMI_STORE_U64
-#define SK_PNMI_STORE_U64(p,v)  {*(char *)(p) = *((char *)&(v)); \
-                                        *((char *)(p) + 1) = \
-                                                *(((char *)&(v)) + 1); \
-                                        *((char *)(p) + 2) = \
-                                                *(((char *)&(v)) + 2); \
-                                        *((char *)(p) + 3) = \
-                                                *(((char *)&(v)) + 3); \
-                                        *((char *)(p) + 4) = \
-                                                *(((char *)&(v)) + 4); \
-                                        *((char *)(p) + 5) = \
-                                                *(((char *)&(v)) + 5); \
-                                        *((char *)(p) + 6) = \
-                                                *(((char *)&(v)) + 6); \
-                                        *((char *)(p) + 7) = \
-                                                *(((char *)&(v)) + 7);}
-#endif
-
-#ifndef SK_PNMI_READ_U16
-#define SK_PNMI_READ_U16(p,v)   {*((char *)&(v)) = *(char *)(p); \
-                                        *(((char *)&(v)) + 1) = \
-                                                *((char *)(p) + 1);}
-#endif
-
-#ifndef SK_PNMI_READ_U32
-#define SK_PNMI_READ_U32(p,v)   {*((char *)&(v)) = *(char *)(p); \
-                                        *(((char *)&(v)) + 1) = \
-                                                *((char *)(p) + 1); \
-                                        *(((char *)&(v)) + 2) = \
-                                                *((char *)(p) + 2); \
-                                        *(((char *)&(v)) + 3) = \
-                                                *((char *)(p) + 3);}
-#endif
-
-#ifndef SK_PNMI_READ_U64
-#define SK_PNMI_READ_U64(p,v)   {*((char *)&(v)) = *(char *)(p); \
-                                        *(((char *)&(v)) + 1) = \
-                                                *((char *)(p) + 1); \
-                                        *(((char *)&(v)) + 2) = \
-                                                *((char *)(p) + 2); \
-                                        *(((char *)&(v)) + 3) = \
-                                                *((char *)(p) + 3); \
-                                        *(((char *)&(v)) + 4) = \
-                                                *((char *)(p) + 4); \
-                                        *(((char *)&(v)) + 5) = \
-                                                *((char *)(p) + 5); \
-                                        *(((char *)&(v)) + 6) = \
-                                                *((char *)(p) + 6); \
-                                        *(((char *)&(v)) + 7) = \
-                                                *((char *)(p) + 7);}
-#endif
-
-/*
- * Macros for Debug
- */
-#ifdef DEBUG
-
-#define SK_PNMI_CHECKFLAGS(vSt) {if (pAC->Pnmi.MacUpdatedFlag > 0 || \
-                                        pAC->Pnmi.RlmtUpdatedFlag > 0 || \
-                                        pAC->Pnmi.SirqUpdatedFlag > 0) { \
-                                                SK_DBG_MSG(pAC, \
-                                                SK_DBGMOD_PNMI, \
-                                                SK_DBGCAT_CTRL, \
-                                                ("PNMI: ERR: %s MacUFlag=%d, RlmtUFlag=%d, SirqUFlag=%d\n", \
-                                                vSt, \
-                                                pAC->Pnmi.MacUpdatedFlag, \
-                                                pAC->Pnmi.RlmtUpdatedFlag, \
-                                                pAC->Pnmi.SirqUpdatedFlag))}}
-
-#else   /* !DEBUG */
-
-#define SK_PNMI_CHECKFLAGS(vSt) /* Nothing */
-
-#endif  /* !DEBUG */
-
-#endif  /* _SKGEPNM2_H_ */
diff --git a/drivers/net/sk98lin/h/skgepnmi.h b/drivers/net/sk98lin/h/skgepnmi.h
deleted file mode 100644
index 1ed214ccb253..000000000000
--- a/drivers/net/sk98lin/h/skgepnmi.h
+++ /dev/null
@@ -1,962 +0,0 @@
-/*****************************************************************************
- *
- * Name:        skgepnmi.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.62 $
- * Date:        $Date: 2003/08/15 12:31:52 $
- * Purpose:     Defines for Private Network Management Interface
- *
- ****************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef _SKGEPNMI_H_
-#define _SKGEPNMI_H_
-
-/*
- * Include dependencies
- */
-#include "h/sktypes.h"
-#include "h/skerror.h"
-#include "h/sktimer.h"
-#include "h/ski2c.h"
-#include "h/skaddr.h"
-#include "h/skrlmt.h"
-#include "h/skvpd.h"
-
-/*
- * Management Database Version
- */
-#define SK_PNMI_MDB_VERSION             0x00030001      /* 3.1 */
-
-
-/*
- * Event definitions
- */
-#define SK_PNMI_EVT_SIRQ_OVERFLOW               1       /* Counter overflow */
-#define SK_PNMI_EVT_SEN_WAR_LOW                 2       /* Lower war thres exceeded */
-#define SK_PNMI_EVT_SEN_WAR_UPP                 3       /* Upper war thres exceeded */
-#define SK_PNMI_EVT_SEN_ERR_LOW                 4       /* Lower err thres exceeded */
-#define SK_PNMI_EVT_SEN_ERR_UPP                 5       /* Upper err thres exceeded */
-#define SK_PNMI_EVT_CHG_EST_TIMER               6       /* Timer event for RLMT Chg */
-#define SK_PNMI_EVT_UTILIZATION_TIMER   7       /* Timer event for Utiliza. */
-#define SK_PNMI_EVT_CLEAR_COUNTER               8       /* Clear statistic counters */
-#define SK_PNMI_EVT_XMAC_RESET                  9       /* XMAC will be reset */
-
-#define SK_PNMI_EVT_RLMT_PORT_UP                10      /* Port came logically up */
-#define SK_PNMI_EVT_RLMT_PORT_DOWN              11      /* Port went logically down */
-#define SK_PNMI_EVT_RLMT_SEGMENTATION   13      /* Two SP root bridges found */
-#define SK_PNMI_EVT_RLMT_ACTIVE_DOWN    14      /* Port went logically down */
-#define SK_PNMI_EVT_RLMT_ACTIVE_UP              15      /* Port came logically up */
-#define SK_PNMI_EVT_RLMT_SET_NETS               16      /* 1. Parameter is number of nets
-                                                                                                1 = single net; 2 = dual net */
-#define SK_PNMI_EVT_VCT_RESET           17      /* VCT port reset timer event started with SET. */
-
-
-/*
- * Return values
- */
-#define SK_PNMI_ERR_OK                          0
-#define SK_PNMI_ERR_GENERAL                     1
-#define SK_PNMI_ERR_TOO_SHORT           2
-#define SK_PNMI_ERR_BAD_VALUE           3
-#define SK_PNMI_ERR_READ_ONLY           4
-#define SK_PNMI_ERR_UNKNOWN_OID         5
-#define SK_PNMI_ERR_UNKNOWN_INST        6
-#define SK_PNMI_ERR_UNKNOWN_NET         7
-#define SK_PNMI_ERR_NOT_SUPPORTED       10
-
-
-/*
- * Return values of driver reset function SK_DRIVER_RESET() and
- * driver event function SK_DRIVER_EVENT()
- */
-#define SK_PNMI_ERR_OK                  0
-#define SK_PNMI_ERR_FAIL                1
-
-
-/*
- * Return values of driver test function SK_DRIVER_SELFTEST()
- */
-#define SK_PNMI_TST_UNKNOWN             (1 << 0)
-#define SK_PNMI_TST_TRANCEIVER          (1 << 1)
-#define SK_PNMI_TST_ASIC                (1 << 2)
-#define SK_PNMI_TST_SENSOR              (1 << 3)
-#define SK_PNMI_TST_POWERMGMT           (1 << 4)
-#define SK_PNMI_TST_PCI                 (1 << 5)
-#define SK_PNMI_TST_MAC                 (1 << 6)
-
-
-/*
- * RLMT specific definitions
- */
-#define SK_PNMI_RLMT_STATUS_STANDBY     1
-#define SK_PNMI_RLMT_STATUS_ACTIVE      2
-#define SK_PNMI_RLMT_STATUS_ERROR       3
-
-#define SK_PNMI_RLMT_LSTAT_PHY_DOWN     1
-#define SK_PNMI_RLMT_LSTAT_AUTONEG      2
-#define SK_PNMI_RLMT_LSTAT_LOG_DOWN     3
-#define SK_PNMI_RLMT_LSTAT_LOG_UP       4
-#define SK_PNMI_RLMT_LSTAT_INDETERMINATED 5
-
-#define SK_PNMI_RLMT_MODE_CHK_LINK      (SK_RLMT_CHECK_LINK)
-#define SK_PNMI_RLMT_MODE_CHK_RX        (SK_RLMT_CHECK_LOC_LINK)
-#define SK_PNMI_RLMT_MODE_CHK_SPT       (SK_RLMT_CHECK_SEG)
-/* #define SK_PNMI_RLMT_MODE_CHK_EX */
-
-/*
- * OID definition
- */
-#ifndef _NDIS_  /* Check, whether NDIS already included OIDs */
-
-#define OID_GEN_XMIT_OK                                 0x00020101
-#define OID_GEN_RCV_OK                                  0x00020102
-#define OID_GEN_XMIT_ERROR                              0x00020103
-#define OID_GEN_RCV_ERROR                               0x00020104
-#define OID_GEN_RCV_NO_BUFFER                   0x00020105
-
-/* #define OID_GEN_DIRECTED_BYTES_XMIT  0x00020201 */
-#define OID_GEN_DIRECTED_FRAMES_XMIT    0x00020202
-/* #define OID_GEN_MULTICAST_BYTES_XMIT 0x00020203 */
-#define OID_GEN_MULTICAST_FRAMES_XMIT   0x00020204
-/* #define OID_GEN_BROADCAST_BYTES_XMIT 0x00020205 */
-#define OID_GEN_BROADCAST_FRAMES_XMIT   0x00020206
-/* #define OID_GEN_DIRECTED_BYTES_RCV   0x00020207 */
-#define OID_GEN_DIRECTED_FRAMES_RCV             0x00020208
-/* #define OID_GEN_MULTICAST_BYTES_RCV  0x00020209 */
-#define OID_GEN_MULTICAST_FRAMES_RCV    0x0002020A
-/* #define OID_GEN_BROADCAST_BYTES_RCV  0x0002020B */
-#define OID_GEN_BROADCAST_FRAMES_RCV    0x0002020C
-#define OID_GEN_RCV_CRC_ERROR                   0x0002020D
-#define OID_GEN_TRANSMIT_QUEUE_LENGTH   0x0002020E
-
-#define OID_802_3_PERMANENT_ADDRESS             0x01010101
-#define OID_802_3_CURRENT_ADDRESS               0x01010102
-/* #define OID_802_3_MULTICAST_LIST             0x01010103 */
-/* #define OID_802_3_MAXIMUM_LIST_SIZE  0x01010104 */
-/* #define OID_802_3_MAC_OPTIONS                0x01010105 */
-                        
-#define OID_802_3_RCV_ERROR_ALIGNMENT   0x01020101
-#define OID_802_3_XMIT_ONE_COLLISION    0x01020102
-#define OID_802_3_XMIT_MORE_COLLISIONS  0x01020103
-#define OID_802_3_XMIT_DEFERRED                 0x01020201
-#define OID_802_3_XMIT_MAX_COLLISIONS   0x01020202
-#define OID_802_3_RCV_OVERRUN                   0x01020203
-#define OID_802_3_XMIT_UNDERRUN                 0x01020204
-#define OID_802_3_XMIT_TIMES_CRS_LOST   0x01020206
-#define OID_802_3_XMIT_LATE_COLLISIONS  0x01020207
-
-/*
- * PnP and PM OIDs
- */
-#ifdef SK_POWER_MGMT
-#define OID_PNP_CAPABILITIES                    0xFD010100
-#define OID_PNP_SET_POWER                               0xFD010101
-#define OID_PNP_QUERY_POWER                             0xFD010102
-#define OID_PNP_ADD_WAKE_UP_PATTERN             0xFD010103
-#define OID_PNP_REMOVE_WAKE_UP_PATTERN  0xFD010104
-#define OID_PNP_ENABLE_WAKE_UP                  0xFD010106
-#endif /* SK_POWER_MGMT */
-
-#endif /* _NDIS_ */
-
-#define OID_SKGE_MDB_VERSION                    0xFF010100
-#define OID_SKGE_SUPPORTED_LIST                 0xFF010101
-#define OID_SKGE_VPD_FREE_BYTES                 0xFF010102
-#define OID_SKGE_VPD_ENTRIES_LIST               0xFF010103
-#define OID_SKGE_VPD_ENTRIES_NUMBER             0xFF010104
-#define OID_SKGE_VPD_KEY                                0xFF010105
-#define OID_SKGE_VPD_VALUE                              0xFF010106
-#define OID_SKGE_VPD_ACCESS                             0xFF010107
-#define OID_SKGE_VPD_ACTION                             0xFF010108
-                        
-#define OID_SKGE_PORT_NUMBER                    0xFF010110
-#define OID_SKGE_DEVICE_TYPE                    0xFF010111
-#define OID_SKGE_DRIVER_DESCR                   0xFF010112
-#define OID_SKGE_DRIVER_VERSION                 0xFF010113
-#define OID_SKGE_HW_DESCR                               0xFF010114
-#define OID_SKGE_HW_VERSION                             0xFF010115
-#define OID_SKGE_CHIPSET                                0xFF010116
-#define OID_SKGE_ACTION                                 0xFF010117
-#define OID_SKGE_RESULT                                 0xFF010118
-#define OID_SKGE_BUS_TYPE                               0xFF010119
-#define OID_SKGE_BUS_SPEED                              0xFF01011A
-#define OID_SKGE_BUS_WIDTH                              0xFF01011B
-/* 0xFF01011C unused */
-#define OID_SKGE_DIAG_ACTION                    0xFF01011D
-#define OID_SKGE_DIAG_RESULT                    0xFF01011E
-#define OID_SKGE_MTU                                    0xFF01011F
-#define OID_SKGE_PHYS_CUR_ADDR                  0xFF010120
-#define OID_SKGE_PHYS_FAC_ADDR                  0xFF010121
-#define OID_SKGE_PMD                                    0xFF010122
-#define OID_SKGE_CONNECTOR                              0xFF010123
-#define OID_SKGE_LINK_CAP                               0xFF010124
-#define OID_SKGE_LINK_MODE                              0xFF010125
-#define OID_SKGE_LINK_MODE_STATUS               0xFF010126
-#define OID_SKGE_LINK_STATUS                    0xFF010127
-#define OID_SKGE_FLOWCTRL_CAP                   0xFF010128
-#define OID_SKGE_FLOWCTRL_MODE                  0xFF010129
-#define OID_SKGE_FLOWCTRL_STATUS                0xFF01012A
-#define OID_SKGE_PHY_OPERATION_CAP              0xFF01012B
-#define OID_SKGE_PHY_OPERATION_MODE             0xFF01012C
-#define OID_SKGE_PHY_OPERATION_STATUS   0xFF01012D
-#define OID_SKGE_MULTICAST_LIST                 0xFF01012E
-#define OID_SKGE_CURRENT_PACKET_FILTER  0xFF01012F
-
-#define OID_SKGE_TRAP                                   0xFF010130
-#define OID_SKGE_TRAP_NUMBER                    0xFF010131
-
-#define OID_SKGE_RLMT_MODE                              0xFF010140
-#define OID_SKGE_RLMT_PORT_NUMBER               0xFF010141
-#define OID_SKGE_RLMT_PORT_ACTIVE               0xFF010142
-#define OID_SKGE_RLMT_PORT_PREFERRED    0xFF010143
-#define OID_SKGE_INTERMEDIATE_SUPPORT   0xFF010160
-
-#define OID_SKGE_SPEED_CAP                              0xFF010170
-#define OID_SKGE_SPEED_MODE                             0xFF010171
-#define OID_SKGE_SPEED_STATUS                   0xFF010172
-
-#define OID_SKGE_BOARDLEVEL                             0xFF010180
-
-#define OID_SKGE_SENSOR_NUMBER                  0xFF020100                      
-#define OID_SKGE_SENSOR_INDEX                   0xFF020101
-#define OID_SKGE_SENSOR_DESCR                   0xFF020102
-#define OID_SKGE_SENSOR_TYPE                    0xFF020103
-#define OID_SKGE_SENSOR_VALUE                   0xFF020104
-#define OID_SKGE_SENSOR_WAR_THRES_LOW   0xFF020105
-#define OID_SKGE_SENSOR_WAR_THRES_UPP   0xFF020106
-#define OID_SKGE_SENSOR_ERR_THRES_LOW   0xFF020107
-#define OID_SKGE_SENSOR_ERR_THRES_UPP   0xFF020108
-#define OID_SKGE_SENSOR_STATUS                  0xFF020109
-#define OID_SKGE_SENSOR_WAR_CTS                 0xFF02010A
-#define OID_SKGE_SENSOR_ERR_CTS                 0xFF02010B
-#define OID_SKGE_SENSOR_WAR_TIME                0xFF02010C
-#define OID_SKGE_SENSOR_ERR_TIME                0xFF02010D
-
-#define OID_SKGE_CHKSM_NUMBER                   0xFF020110
-#define OID_SKGE_CHKSM_RX_OK_CTS                0xFF020111
-#define OID_SKGE_CHKSM_RX_UNABLE_CTS    0xFF020112
-#define OID_SKGE_CHKSM_RX_ERR_CTS               0xFF020113
-#define OID_SKGE_CHKSM_TX_OK_CTS                0xFF020114
-#define OID_SKGE_CHKSM_TX_UNABLE_CTS    0xFF020115
-
-#define OID_SKGE_STAT_TX                                0xFF020120
-#define OID_SKGE_STAT_TX_OCTETS                 0xFF020121
-#define OID_SKGE_STAT_TX_BROADCAST              0xFF020122
-#define OID_SKGE_STAT_TX_MULTICAST              0xFF020123
-#define OID_SKGE_STAT_TX_UNICAST                0xFF020124
-#define OID_SKGE_STAT_TX_LONGFRAMES             0xFF020125
-#define OID_SKGE_STAT_TX_BURST                  0xFF020126
-#define OID_SKGE_STAT_TX_PFLOWC                 0xFF020127
-#define OID_SKGE_STAT_TX_FLOWC                  0xFF020128
-#define OID_SKGE_STAT_TX_SINGLE_COL             0xFF020129
-#define OID_SKGE_STAT_TX_MULTI_COL              0xFF02012A
-#define OID_SKGE_STAT_TX_EXCESS_COL             0xFF02012B
-#define OID_SKGE_STAT_TX_LATE_COL               0xFF02012C
-#define OID_SKGE_STAT_TX_DEFFERAL               0xFF02012D
-#define OID_SKGE_STAT_TX_EXCESS_DEF             0xFF02012E
-#define OID_SKGE_STAT_TX_UNDERRUN               0xFF02012F
-#define OID_SKGE_STAT_TX_CARRIER                0xFF020130
-/* #define OID_SKGE_STAT_TX_UTIL                0xFF020131 */
-#define OID_SKGE_STAT_TX_64                             0xFF020132
-#define OID_SKGE_STAT_TX_127                    0xFF020133
-#define OID_SKGE_STAT_TX_255                    0xFF020134
-#define OID_SKGE_STAT_TX_511                    0xFF020135
-#define OID_SKGE_STAT_TX_1023                   0xFF020136
-#define OID_SKGE_STAT_TX_MAX                    0xFF020137
-#define OID_SKGE_STAT_TX_SYNC                   0xFF020138
-#define OID_SKGE_STAT_TX_SYNC_OCTETS    0xFF020139
-#define OID_SKGE_STAT_RX                                0xFF02013A
-#define OID_SKGE_STAT_RX_OCTETS                 0xFF02013B
-#define OID_SKGE_STAT_RX_BROADCAST              0xFF02013C
-#define OID_SKGE_STAT_RX_MULTICAST              0xFF02013D
-#define OID_SKGE_STAT_RX_UNICAST                0xFF02013E
-#define OID_SKGE_STAT_RX_PFLOWC                 0xFF02013F
-#define OID_SKGE_STAT_RX_FLOWC                  0xFF020140
-#define OID_SKGE_STAT_RX_PFLOWC_ERR             0xFF020141
-#define OID_SKGE_STAT_RX_FLOWC_UNKWN    0xFF020142
-#define OID_SKGE_STAT_RX_BURST                  0xFF020143
-#define OID_SKGE_STAT_RX_MISSED                 0xFF020144
-#define OID_SKGE_STAT_RX_FRAMING                0xFF020145
-#define OID_SKGE_STAT_RX_OVERFLOW               0xFF020146
-#define OID_SKGE_STAT_RX_JABBER                 0xFF020147
-#define OID_SKGE_STAT_RX_CARRIER                0xFF020148
-#define OID_SKGE_STAT_RX_IR_LENGTH              0xFF020149
-#define OID_SKGE_STAT_RX_SYMBOL                 0xFF02014A
-#define OID_SKGE_STAT_RX_SHORTS                 0xFF02014B
-#define OID_SKGE_STAT_RX_RUNT                   0xFF02014C
-#define OID_SKGE_STAT_RX_CEXT                   0xFF02014D
-#define OID_SKGE_STAT_RX_TOO_LONG               0xFF02014E
-#define OID_SKGE_STAT_RX_FCS                    0xFF02014F
-/* #define OID_SKGE_STAT_RX_UTIL                0xFF020150 */
-#define OID_SKGE_STAT_RX_64                             0xFF020151
-#define OID_SKGE_STAT_RX_127                    0xFF020152
-#define OID_SKGE_STAT_RX_255                    0xFF020153
-#define OID_SKGE_STAT_RX_511                    0xFF020154
-#define OID_SKGE_STAT_RX_1023                   0xFF020155
-#define OID_SKGE_STAT_RX_MAX                    0xFF020156
-#define OID_SKGE_STAT_RX_LONGFRAMES             0xFF020157
-
-#define OID_SKGE_RLMT_CHANGE_CTS                0xFF020160
-#define OID_SKGE_RLMT_CHANGE_TIME               0xFF020161
-#define OID_SKGE_RLMT_CHANGE_ESTIM              0xFF020162
-#define OID_SKGE_RLMT_CHANGE_THRES              0xFF020163
-
-#define OID_SKGE_RLMT_PORT_INDEX                0xFF020164
-#define OID_SKGE_RLMT_STATUS                    0xFF020165
-#define OID_SKGE_RLMT_TX_HELLO_CTS              0xFF020166
-#define OID_SKGE_RLMT_RX_HELLO_CTS              0xFF020167
-#define OID_SKGE_RLMT_TX_SP_REQ_CTS             0xFF020168
-#define OID_SKGE_RLMT_RX_SP_CTS                 0xFF020169
-
-#define OID_SKGE_RLMT_MONITOR_NUMBER    0xFF010150
-#define OID_SKGE_RLMT_MONITOR_INDEX             0xFF010151
-#define OID_SKGE_RLMT_MONITOR_ADDR              0xFF010152
-#define OID_SKGE_RLMT_MONITOR_ERRS              0xFF010153
-#define OID_SKGE_RLMT_MONITOR_TIMESTAMP 0xFF010154
-#define OID_SKGE_RLMT_MONITOR_ADMIN             0xFF010155
-
-#define OID_SKGE_TX_SW_QUEUE_LEN                0xFF020170
-#define OID_SKGE_TX_SW_QUEUE_MAX                0xFF020171
-#define OID_SKGE_TX_RETRY                               0xFF020172
-#define OID_SKGE_RX_INTR_CTS                    0xFF020173
-#define OID_SKGE_TX_INTR_CTS                    0xFF020174
-#define OID_SKGE_RX_NO_BUF_CTS                  0xFF020175
-#define OID_SKGE_TX_NO_BUF_CTS                  0xFF020176
-#define OID_SKGE_TX_USED_DESCR_NO               0xFF020177
-#define OID_SKGE_RX_DELIVERED_CTS               0xFF020178
-#define OID_SKGE_RX_OCTETS_DELIV_CTS    0xFF020179
-#define OID_SKGE_RX_HW_ERROR_CTS                0xFF02017A
-#define OID_SKGE_TX_HW_ERROR_CTS                0xFF02017B
-#define OID_SKGE_IN_ERRORS_CTS                  0xFF02017C
-#define OID_SKGE_OUT_ERROR_CTS                  0xFF02017D
-#define OID_SKGE_ERR_RECOVERY_CTS               0xFF02017E
-#define OID_SKGE_SYSUPTIME                              0xFF02017F
-
-#define OID_SKGE_ALL_DATA                               0xFF020190
-
-/* Defines for VCT. */
-#define OID_SKGE_VCT_GET                                0xFF020200
-#define OID_SKGE_VCT_SET                                0xFF020201
-#define OID_SKGE_VCT_STATUS                             0xFF020202
-
-#ifdef SK_DIAG_SUPPORT
-/* Defines for driver DIAG mode. */
-#define OID_SKGE_DIAG_MODE                              0xFF020204
-#endif /* SK_DIAG_SUPPORT */
-
-/* New OIDs */
-#define OID_SKGE_DRIVER_RELDATE                 0xFF020210
-#define OID_SKGE_DRIVER_FILENAME                0xFF020211
-#define OID_SKGE_CHIPID                                 0xFF020212
-#define OID_SKGE_RAMSIZE                                0xFF020213
-#define OID_SKGE_VAUXAVAIL                              0xFF020214
-#define OID_SKGE_PHY_TYPE                               0xFF020215
-#define OID_SKGE_PHY_LP_MODE                    0xFF020216
-
-/* VCT struct to store a backup copy of VCT data after a port reset. */
-typedef struct s_PnmiVct {
-        SK_U8                   VctStatus;
-        SK_U8                   PCableLen;
-        SK_U32                  PMdiPairLen[4];
-        SK_U8                   PMdiPairSts[4];
-} SK_PNMI_VCT;
-
-
-/* VCT status values (to be given to CPA via OID_SKGE_VCT_STATUS). */
-#define SK_PNMI_VCT_NONE                0
-#define SK_PNMI_VCT_OLD_VCT_DATA        1
-#define SK_PNMI_VCT_NEW_VCT_DATA        2
-#define SK_PNMI_VCT_OLD_DSP_DATA        4
-#define SK_PNMI_VCT_NEW_DSP_DATA        8
-#define SK_PNMI_VCT_RUNNING             16
-
-
-/* VCT cable test status. */
-#define SK_PNMI_VCT_NORMAL_CABLE                0
-#define SK_PNMI_VCT_SHORT_CABLE                 1
-#define SK_PNMI_VCT_OPEN_CABLE                  2
-#define SK_PNMI_VCT_TEST_FAIL                   3
-#define SK_PNMI_VCT_IMPEDANCE_MISMATCH          4
-
-#define OID_SKGE_TRAP_SEN_WAR_LOW               500
-#define OID_SKGE_TRAP_SEN_WAR_UPP               501
-#define OID_SKGE_TRAP_SEN_ERR_LOW               502
-#define OID_SKGE_TRAP_SEN_ERR_UPP               503
-#define OID_SKGE_TRAP_RLMT_CHANGE_THRES 520
-#define OID_SKGE_TRAP_RLMT_CHANGE_PORT  521
-#define OID_SKGE_TRAP_RLMT_PORT_DOWN    522
-#define OID_SKGE_TRAP_RLMT_PORT_UP              523
-#define OID_SKGE_TRAP_RLMT_SEGMENTATION 524
-
-#ifdef SK_DIAG_SUPPORT
-/* Defines for driver DIAG mode. */
-#define SK_DIAG_ATTACHED        2
-#define SK_DIAG_RUNNING         1
-#define SK_DIAG_IDLE            0
-#endif /* SK_DIAG_SUPPORT */
-
-/*
- * Generic PNMI IOCTL subcommand definitions.
- */
-#define SK_GET_SINGLE_VAR               1
-#define SK_SET_SINGLE_VAR               2
-#define SK_PRESET_SINGLE_VAR    3
-#define SK_GET_FULL_MIB                 4
-#define SK_SET_FULL_MIB                 5
-#define SK_PRESET_FULL_MIB              6
-
-
-/*
- * Define error numbers and messages for syslog
- */
-#define SK_PNMI_ERR001          (SK_ERRBASE_PNMI + 1)
-#define SK_PNMI_ERR001MSG       "SkPnmiGetStruct: Unknown OID"
-#define SK_PNMI_ERR002          (SK_ERRBASE_PNMI + 2)
-#define SK_PNMI_ERR002MSG       "SkPnmiGetStruct: Cannot read VPD keys"
-#define SK_PNMI_ERR003          (SK_ERRBASE_PNMI + 3)
-#define SK_PNMI_ERR003MSG       "OidStruct: Called with wrong OID"
-#define SK_PNMI_ERR004          (SK_ERRBASE_PNMI + 4)
-#define SK_PNMI_ERR004MSG       "OidStruct: Called with wrong action"
-#define SK_PNMI_ERR005          (SK_ERRBASE_PNMI + 5)
-#define SK_PNMI_ERR005MSG       "Perform: Cannot reset driver"
-#define SK_PNMI_ERR006          (SK_ERRBASE_PNMI + 6)
-#define SK_PNMI_ERR006MSG       "Perform: Unknown OID action command"
-#define SK_PNMI_ERR007          (SK_ERRBASE_PNMI + 7)
-#define SK_PNMI_ERR007MSG       "General: Driver description not initialized"
-#define SK_PNMI_ERR008          (SK_ERRBASE_PNMI + 8)
-#define SK_PNMI_ERR008MSG       "Addr: Tried to get unknown OID"
-#define SK_PNMI_ERR009          (SK_ERRBASE_PNMI + 9)
-#define SK_PNMI_ERR009MSG       "Addr: Unknown OID"
-#define SK_PNMI_ERR010          (SK_ERRBASE_PNMI + 10)
-#define SK_PNMI_ERR010MSG       "CsumStat: Unknown OID"
-#define SK_PNMI_ERR011          (SK_ERRBASE_PNMI + 11)
-#define SK_PNMI_ERR011MSG       "SensorStat: Sensor descr string too long"
-#define SK_PNMI_ERR012          (SK_ERRBASE_PNMI + 12)
-#define SK_PNMI_ERR012MSG       "SensorStat: Unknown OID"
-#define SK_PNMI_ERR013          (SK_ERRBASE_PNMI + 13)
-#define SK_PNMI_ERR013MSG       ""
-#define SK_PNMI_ERR014          (SK_ERRBASE_PNMI + 14)
-#define SK_PNMI_ERR014MSG       "Vpd: Cannot read VPD keys"
-#define SK_PNMI_ERR015          (SK_ERRBASE_PNMI + 15)
-#define SK_PNMI_ERR015MSG       "Vpd: Internal array for VPD keys to small"
-#define SK_PNMI_ERR016          (SK_ERRBASE_PNMI + 16)
-#define SK_PNMI_ERR016MSG       "Vpd: Key string too long"
-#define SK_PNMI_ERR017          (SK_ERRBASE_PNMI + 17)
-#define SK_PNMI_ERR017MSG       "Vpd: Invalid VPD status pointer"
-#define SK_PNMI_ERR018          (SK_ERRBASE_PNMI + 18)
-#define SK_PNMI_ERR018MSG       "Vpd: VPD data not valid"
-#define SK_PNMI_ERR019          (SK_ERRBASE_PNMI + 19)
-#define SK_PNMI_ERR019MSG       "Vpd: VPD entries list string too long"
-#define SK_PNMI_ERR021          (SK_ERRBASE_PNMI + 21)
-#define SK_PNMI_ERR021MSG       "Vpd: VPD data string too long"
-#define SK_PNMI_ERR022          (SK_ERRBASE_PNMI + 22)
-#define SK_PNMI_ERR022MSG       "Vpd: VPD data string too long should be errored before"
-#define SK_PNMI_ERR023          (SK_ERRBASE_PNMI + 23)
-#define SK_PNMI_ERR023MSG       "Vpd: Unknown OID in get action"
-#define SK_PNMI_ERR024          (SK_ERRBASE_PNMI + 24)
-#define SK_PNMI_ERR024MSG       "Vpd: Unknown OID in preset/set action"
-#define SK_PNMI_ERR025          (SK_ERRBASE_PNMI + 25)
-#define SK_PNMI_ERR025MSG       "Vpd: Cannot write VPD after modify entry"
-#define SK_PNMI_ERR026          (SK_ERRBASE_PNMI + 26)
-#define SK_PNMI_ERR026MSG       "Vpd: Cannot update VPD"
-#define SK_PNMI_ERR027          (SK_ERRBASE_PNMI + 27)
-#define SK_PNMI_ERR027MSG       "Vpd: Cannot delete VPD entry"
-#define SK_PNMI_ERR028          (SK_ERRBASE_PNMI + 28)
-#define SK_PNMI_ERR028MSG       "Vpd: Cannot update VPD after delete entry"
-#define SK_PNMI_ERR029          (SK_ERRBASE_PNMI + 29)
-#define SK_PNMI_ERR029MSG       "General: Driver description string too long"
-#define SK_PNMI_ERR030          (SK_ERRBASE_PNMI + 30)
-#define SK_PNMI_ERR030MSG       "General: Driver version not initialized"
-#define SK_PNMI_ERR031          (SK_ERRBASE_PNMI + 31)
-#define SK_PNMI_ERR031MSG       "General: Driver version string too long"
-#define SK_PNMI_ERR032          (SK_ERRBASE_PNMI + 32)
-#define SK_PNMI_ERR032MSG       "General: Cannot read VPD Name for HW descr"
-#define SK_PNMI_ERR033          (SK_ERRBASE_PNMI + 33)
-#define SK_PNMI_ERR033MSG       "General: HW description string too long"
-#define SK_PNMI_ERR034          (SK_ERRBASE_PNMI + 34)
-#define SK_PNMI_ERR034MSG       "General: Unknown OID"
-#define SK_PNMI_ERR035          (SK_ERRBASE_PNMI + 35)
-#define SK_PNMI_ERR035MSG       "Rlmt: Unknown OID"
-#define SK_PNMI_ERR036          (SK_ERRBASE_PNMI + 36)
-#define SK_PNMI_ERR036MSG       ""
-#define SK_PNMI_ERR037          (SK_ERRBASE_PNMI + 37)
-#define SK_PNMI_ERR037MSG       "Rlmt: SK_RLMT_MODE_CHANGE event return not 0"
-#define SK_PNMI_ERR038          (SK_ERRBASE_PNMI + 38)
-#define SK_PNMI_ERR038MSG       "Rlmt: SK_RLMT_PREFPORT_CHANGE event return not 0"
-#define SK_PNMI_ERR039          (SK_ERRBASE_PNMI + 39)
-#define SK_PNMI_ERR039MSG       "RlmtStat: Unknown OID"
-#define SK_PNMI_ERR040          (SK_ERRBASE_PNMI + 40)
-#define SK_PNMI_ERR040MSG       "PowerManagement: Unknown OID"
-#define SK_PNMI_ERR041          (SK_ERRBASE_PNMI + 41)
-#define SK_PNMI_ERR041MSG       "MacPrivateConf: Unknown OID"
-#define SK_PNMI_ERR042          (SK_ERRBASE_PNMI + 42)
-#define SK_PNMI_ERR042MSG       "MacPrivateConf: SK_HWEV_SET_ROLE returned not 0"
-#define SK_PNMI_ERR043          (SK_ERRBASE_PNMI + 43)
-#define SK_PNMI_ERR043MSG       "MacPrivateConf: SK_HWEV_SET_LMODE returned not 0"
-#define SK_PNMI_ERR044          (SK_ERRBASE_PNMI + 44)
-#define SK_PNMI_ERR044MSG       "MacPrivateConf: SK_HWEV_SET_FLOWMODE returned not 0"
-#define SK_PNMI_ERR045          (SK_ERRBASE_PNMI + 45)
-#define SK_PNMI_ERR045MSG       "MacPrivateConf: SK_HWEV_SET_SPEED returned not 0"
-#define SK_PNMI_ERR046          (SK_ERRBASE_PNMI + 46)
-#define SK_PNMI_ERR046MSG       "Monitor: Unknown OID"
-#define SK_PNMI_ERR047          (SK_ERRBASE_PNMI + 47)
-#define SK_PNMI_ERR047MSG       "SirqUpdate: Event function returns not 0"
-#define SK_PNMI_ERR048          (SK_ERRBASE_PNMI + 48)
-#define SK_PNMI_ERR048MSG       "RlmtUpdate: Event function returns not 0"
-#define SK_PNMI_ERR049          (SK_ERRBASE_PNMI + 49)
-#define SK_PNMI_ERR049MSG       "SkPnmiInit: Invalid size of 'CounterOffset' struct!!"
-#define SK_PNMI_ERR050          (SK_ERRBASE_PNMI + 50)
-#define SK_PNMI_ERR050MSG       "SkPnmiInit: Invalid size of 'StatAddr' table!!"
-#define SK_PNMI_ERR051          (SK_ERRBASE_PNMI + 51)
-#define SK_PNMI_ERR051MSG       "SkPnmiEvent: Port switch suspicious"
-#define SK_PNMI_ERR052          (SK_ERRBASE_PNMI + 52)
-#define SK_PNMI_ERR052MSG       ""
-#define SK_PNMI_ERR053          (SK_ERRBASE_PNMI + 53)
-#define SK_PNMI_ERR053MSG       "General: Driver release date not initialized"
-#define SK_PNMI_ERR054          (SK_ERRBASE_PNMI + 54)
-#define SK_PNMI_ERR054MSG       "General: Driver release date string too long"
-#define SK_PNMI_ERR055          (SK_ERRBASE_PNMI + 55)
-#define SK_PNMI_ERR055MSG       "General: Driver file name not initialized"
-#define SK_PNMI_ERR056          (SK_ERRBASE_PNMI + 56)
-#define SK_PNMI_ERR056MSG       "General: Driver file name string too long"
-
-/*
- * Management counter macros called by the driver
- */
-#define SK_PNMI_SET_DRIVER_DESCR(pAC,v) ((pAC)->Pnmi.pDriverDescription = \
-        (char *)(v))
-
-#define SK_PNMI_SET_DRIVER_VER(pAC,v)   ((pAC)->Pnmi.pDriverVersion = \
-        (char *)(v))
-
-#define SK_PNMI_SET_DRIVER_RELDATE(pAC,v)       ((pAC)->Pnmi.pDriverReleaseDate = \
-        (char *)(v))
-
-#define SK_PNMI_SET_DRIVER_FILENAME(pAC,v)      ((pAC)->Pnmi.pDriverFileName = \
-        (char *)(v))
-
-#define SK_PNMI_CNT_TX_QUEUE_LEN(pAC,v,p) \
-        { \
-                (pAC)->Pnmi.Port[p].TxSwQueueLen = (SK_U64)(v); \
-                if ((pAC)->Pnmi.Port[p].TxSwQueueLen > (pAC)->Pnmi.Port[p].TxSwQueueMax) { \
-                        (pAC)->Pnmi.Port[p].TxSwQueueMax = (pAC)->Pnmi.Port[p].TxSwQueueLen; \
-                } \
-        }
-#define SK_PNMI_CNT_TX_RETRY(pAC,p)     (((pAC)->Pnmi.Port[p].TxRetryCts)++)
-#define SK_PNMI_CNT_RX_INTR(pAC,p)      (((pAC)->Pnmi.Port[p].RxIntrCts)++)
-#define SK_PNMI_CNT_TX_INTR(pAC,p)      (((pAC)->Pnmi.Port[p].TxIntrCts)++)
-#define SK_PNMI_CNT_NO_RX_BUF(pAC,p)    (((pAC)->Pnmi.Port[p].RxNoBufCts)++)
-#define SK_PNMI_CNT_NO_TX_BUF(pAC,p)    (((pAC)->Pnmi.Port[p].TxNoBufCts)++)
-#define SK_PNMI_CNT_USED_TX_DESCR(pAC,v,p) \
-        ((pAC)->Pnmi.Port[p].TxUsedDescrNo=(SK_U64)(v));
-#define SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,v,p) \
-        { \
-                ((pAC)->Pnmi.Port[p].RxDeliveredCts)++; \
-                (pAC)->Pnmi.Port[p].RxOctetsDeliveredCts += (SK_U64)(v); \
-        }
-#define SK_PNMI_CNT_ERR_RECOVERY(pAC,p) (((pAC)->Pnmi.Port[p].ErrRecoveryCts)++);
-
-#define SK_PNMI_CNT_SYNC_OCTETS(pAC,p,v) \
-        { \
-                if ((p) < SK_MAX_MACS) { \
-                        ((pAC)->Pnmi.Port[p].StatSyncCts)++; \
-                        (pAC)->Pnmi.Port[p].StatSyncOctetsCts += (SK_U64)(v); \
-                } \
-        }
-
-#define SK_PNMI_CNT_RX_LONGFRAMES(pAC,p) \
-        { \
-                if ((p) < SK_MAX_MACS) { \
-                        ((pAC)->Pnmi.Port[p].StatRxLongFrameCts++); \
-                } \
-        }
-
-#define SK_PNMI_CNT_RX_FRAMETOOLONG(pAC,p) \
-        { \
-                if ((p) < SK_MAX_MACS) { \
-                        ((pAC)->Pnmi.Port[p].StatRxFrameTooLongCts++); \
-                } \
-        }
-
-#define SK_PNMI_CNT_RX_PMACC_ERR(pAC,p) \
-        { \
-                if ((p) < SK_MAX_MACS) { \
-                        ((pAC)->Pnmi.Port[p].StatRxPMaccErr++); \
-                } \
-        }
-
-/*
- * Conversion Macros
- */
-#define SK_PNMI_PORT_INST2LOG(i)        ((unsigned int)(i) - 1)
-#define SK_PNMI_PORT_LOG2INST(l)        ((unsigned int)(l) + 1)
-#define SK_PNMI_PORT_PHYS2LOG(p)        ((unsigned int)(p) + 1)
-#define SK_PNMI_PORT_LOG2PHYS(pAC,l)    ((unsigned int)(l) - 1)
-#define SK_PNMI_PORT_PHYS2INST(pAC,p)   \
-        (pAC->Pnmi.DualNetActiveFlag ? 2 : ((unsigned int)(p) + 2))
-#define SK_PNMI_PORT_INST2PHYS(pAC,i)   ((unsigned int)(i) - 2)
-
-/*
- * Structure definition for SkPnmiGetStruct and SkPnmiSetStruct
- */
-#define SK_PNMI_VPD_KEY_SIZE    5
-#define SK_PNMI_VPD_BUFSIZE             (VPD_SIZE)
-#define SK_PNMI_VPD_ENTRIES             (VPD_SIZE / 4)
-#define SK_PNMI_VPD_DATALEN             128 /*  Number of data bytes */
-
-#define SK_PNMI_MULTICAST_LISTLEN       64
-#define SK_PNMI_SENSOR_ENTRIES          (SK_MAX_SENSORS)
-#define SK_PNMI_CHECKSUM_ENTRIES        3
-#define SK_PNMI_MAC_ENTRIES                     (SK_MAX_MACS + 1)
-#define SK_PNMI_MONITOR_ENTRIES         20
-#define SK_PNMI_TRAP_ENTRIES            10
-#define SK_PNMI_TRAPLEN                         128
-#define SK_PNMI_STRINGLEN1                      80
-#define SK_PNMI_STRINGLEN2                      25
-#define SK_PNMI_TRAP_QUEUE_LEN          512
-
-typedef struct s_PnmiVpd {
-        char                    VpdKey[SK_PNMI_VPD_KEY_SIZE];
-        char                    VpdValue[SK_PNMI_VPD_DATALEN];
-        SK_U8                   VpdAccess;
-        SK_U8                   VpdAction;
-} SK_PNMI_VPD;
-
-typedef struct s_PnmiSensor {
-        SK_U8                   SensorIndex;
-        char                    SensorDescr[SK_PNMI_STRINGLEN2];
-        SK_U8                   SensorType;
-        SK_U32                  SensorValue;
-        SK_U32                  SensorWarningThresholdLow;
-        SK_U32                  SensorWarningThresholdHigh;
-        SK_U32                  SensorErrorThresholdLow;
-        SK_U32                  SensorErrorThresholdHigh;
-        SK_U8                   SensorStatus;
-        SK_U64                  SensorWarningCts;
-        SK_U64                  SensorErrorCts;
-        SK_U64                  SensorWarningTimestamp;
-        SK_U64                  SensorErrorTimestamp;
-} SK_PNMI_SENSOR;
-
-typedef struct s_PnmiChecksum {
-        SK_U64                  ChecksumRxOkCts;
-        SK_U64                  ChecksumRxUnableCts;
-        SK_U64                  ChecksumRxErrCts;
-        SK_U64                  ChecksumTxOkCts;
-        SK_U64                  ChecksumTxUnableCts;
-} SK_PNMI_CHECKSUM;
-
-typedef struct s_PnmiStat {
-        SK_U64                  StatTxOkCts;
-        SK_U64                  StatTxOctetsOkCts;
-        SK_U64                  StatTxBroadcastOkCts;
-        SK_U64                  StatTxMulticastOkCts;
-        SK_U64                  StatTxUnicastOkCts;
-        SK_U64                  StatTxLongFramesCts;
-        SK_U64                  StatTxBurstCts;
-        SK_U64                  StatTxPauseMacCtrlCts;
-        SK_U64                  StatTxMacCtrlCts;
-        SK_U64                  StatTxSingleCollisionCts;
-        SK_U64                  StatTxMultipleCollisionCts;
-        SK_U64                  StatTxExcessiveCollisionCts;
-        SK_U64                  StatTxLateCollisionCts;
-        SK_U64                  StatTxDeferralCts;
-        SK_U64                  StatTxExcessiveDeferralCts;
-        SK_U64                  StatTxFifoUnderrunCts;
-        SK_U64                  StatTxCarrierCts;
-        SK_U64                  Dummy1; /* StatTxUtilization */
-        SK_U64                  StatTx64Cts;
-        SK_U64                  StatTx127Cts;
-        SK_U64                  StatTx255Cts;
-        SK_U64                  StatTx511Cts;
-        SK_U64                  StatTx1023Cts;
-        SK_U64                  StatTxMaxCts;
-        SK_U64                  StatTxSyncCts;
-        SK_U64                  StatTxSyncOctetsCts;
-        SK_U64                  StatRxOkCts;
-        SK_U64                  StatRxOctetsOkCts;
-        SK_U64                  StatRxBroadcastOkCts;
-        SK_U64                  StatRxMulticastOkCts;
-        SK_U64                  StatRxUnicastOkCts;
-        SK_U64                  StatRxLongFramesCts;
-        SK_U64                  StatRxPauseMacCtrlCts;
-        SK_U64                  StatRxMacCtrlCts;
-        SK_U64                  StatRxPauseMacCtrlErrorCts;
-        SK_U64                  StatRxMacCtrlUnknownCts;
-        SK_U64                  StatRxBurstCts;
-        SK_U64                  StatRxMissedCts;
-        SK_U64                  StatRxFramingCts;
-        SK_U64                  StatRxFifoOverflowCts;
-        SK_U64                  StatRxJabberCts;
-        SK_U64                  StatRxCarrierCts;
-        SK_U64                  StatRxIRLengthCts;
-        SK_U64                  StatRxSymbolCts;
-        SK_U64                  StatRxShortsCts;
-        SK_U64                  StatRxRuntCts;
-        SK_U64                  StatRxCextCts;
-        SK_U64                  StatRxTooLongCts;
-        SK_U64                  StatRxFcsCts;
-        SK_U64                  Dummy2; /* StatRxUtilization */
-        SK_U64                  StatRx64Cts;
-        SK_U64                  StatRx127Cts;
-        SK_U64                  StatRx255Cts;
-        SK_U64                  StatRx511Cts;
-        SK_U64                  StatRx1023Cts;
-        SK_U64                  StatRxMaxCts;
-} SK_PNMI_STAT;
-
-typedef struct s_PnmiConf {
-        char                    ConfMacCurrentAddr[6];
-        char                    ConfMacFactoryAddr[6];
-        SK_U8                   ConfPMD;
-        SK_U8                   ConfConnector;
-        SK_U32                  ConfPhyType;
-        SK_U32                  ConfPhyMode;
-        SK_U8                   ConfLinkCapability;
-        SK_U8                   ConfLinkMode;
-        SK_U8                   ConfLinkModeStatus;
-        SK_U8                   ConfLinkStatus;
-        SK_U8                   ConfFlowCtrlCapability;
-        SK_U8                   ConfFlowCtrlMode;
-        SK_U8                   ConfFlowCtrlStatus;
-        SK_U8                   ConfPhyOperationCapability;
-        SK_U8                   ConfPhyOperationMode;
-        SK_U8                   ConfPhyOperationStatus;
-        SK_U8                   ConfSpeedCapability;
-        SK_U8                   ConfSpeedMode;
-        SK_U8                   ConfSpeedStatus;
-} SK_PNMI_CONF;
-
-typedef struct s_PnmiRlmt {
-        SK_U32                  RlmtIndex;
-        SK_U32                  RlmtStatus;
-        SK_U64                  RlmtTxHelloCts;
-        SK_U64                  RlmtRxHelloCts;
-        SK_U64                  RlmtTxSpHelloReqCts;
-        SK_U64                  RlmtRxSpHelloCts;
-} SK_PNMI_RLMT;
-
-typedef struct s_PnmiRlmtMonitor {
-        SK_U32                  RlmtMonitorIndex;
-        char                    RlmtMonitorAddr[6];
-        SK_U64                  RlmtMonitorErrorCts;
-        SK_U64                  RlmtMonitorTimestamp;
-        SK_U8                   RlmtMonitorAdmin;
-} SK_PNMI_RLMT_MONITOR;
-
-typedef struct s_PnmiRequestStatus {
-        SK_U32                  ErrorStatus;
-        SK_U32                  ErrorOffset;
-} SK_PNMI_REQUEST_STATUS;
-
-typedef struct s_PnmiStrucData {
-        SK_U32                  MgmtDBVersion;
-        SK_PNMI_REQUEST_STATUS  ReturnStatus;
-        SK_U32                  VpdFreeBytes;
-        char                    VpdEntriesList[SK_PNMI_VPD_ENTRIES * SK_PNMI_VPD_KEY_SIZE];
-        SK_U32                  VpdEntriesNumber;
-        SK_PNMI_VPD             Vpd[SK_PNMI_VPD_ENTRIES];
-        SK_U32                  PortNumber;
-        SK_U32                  DeviceType;
-        char                    DriverDescr[SK_PNMI_STRINGLEN1];
-        char                    DriverVersion[SK_PNMI_STRINGLEN2];
-        char                    DriverReleaseDate[SK_PNMI_STRINGLEN1];
-        char                    DriverFileName[SK_PNMI_STRINGLEN1];
-        char                    HwDescr[SK_PNMI_STRINGLEN1];
-        char                    HwVersion[SK_PNMI_STRINGLEN2];
-        SK_U16                  Chipset;
-        SK_U32                  ChipId;
-        SK_U8                   VauxAvail;
-        SK_U32                  RamSize;
-        SK_U32                  MtuSize;
-        SK_U32                  Action;
-        SK_U32                  TestResult;
-        SK_U8                   BusType;
-        SK_U8                   BusSpeed;
-        SK_U8                   BusWidth;
-        SK_U8                   SensorNumber;
-        SK_PNMI_SENSOR  Sensor[SK_PNMI_SENSOR_ENTRIES];
-        SK_U8                   ChecksumNumber;
-        SK_PNMI_CHECKSUM        Checksum[SK_PNMI_CHECKSUM_ENTRIES];
-        SK_PNMI_STAT    Stat[SK_PNMI_MAC_ENTRIES];
-        SK_PNMI_CONF    Conf[SK_PNMI_MAC_ENTRIES];
-        SK_U8                   RlmtMode;
-        SK_U32                  RlmtPortNumber;
-        SK_U8                   RlmtPortActive;
-        SK_U8                   RlmtPortPreferred;
-        SK_U64                  RlmtChangeCts;
-        SK_U64                  RlmtChangeTime;
-        SK_U64                  RlmtChangeEstimate;
-        SK_U64                  RlmtChangeThreshold;
-        SK_PNMI_RLMT    Rlmt[SK_MAX_MACS];
-        SK_U32                  RlmtMonitorNumber;
-        SK_PNMI_RLMT_MONITOR    RlmtMonitor[SK_PNMI_MONITOR_ENTRIES];
-        SK_U32                  TrapNumber;
-        SK_U8                   Trap[SK_PNMI_TRAP_QUEUE_LEN];
-        SK_U64                  TxSwQueueLen;
-        SK_U64                  TxSwQueueMax;
-        SK_U64                  TxRetryCts;
-        SK_U64                  RxIntrCts;
-        SK_U64                  TxIntrCts;
-        SK_U64                  RxNoBufCts;
-        SK_U64                  TxNoBufCts;
-        SK_U64                  TxUsedDescrNo;
-        SK_U64                  RxDeliveredCts;
-        SK_U64                  RxOctetsDeliveredCts;
-        SK_U64                  RxHwErrorsCts;
-        SK_U64                  TxHwErrorsCts;
-        SK_U64                  InErrorsCts;
-        SK_U64                  OutErrorsCts;
-        SK_U64                  ErrRecoveryCts;
-        SK_U64                  SysUpTime;
-} SK_PNMI_STRUCT_DATA;
-
-#define SK_PNMI_STRUCT_SIZE     (sizeof(SK_PNMI_STRUCT_DATA))
-#define SK_PNMI_MIN_STRUCT_SIZE ((unsigned int)(SK_UPTR)\
-                                 &(((SK_PNMI_STRUCT_DATA *)0)->VpdFreeBytes))
-                                                                                                                /*
-                                                                                                                 * ReturnStatus field
-                                                                                                                 * must be located
-                                                                                                                 * before VpdFreeBytes
-                                                                                                                 */
-
-/*
- * Various definitions
- */
-#define SK_PNMI_MAX_PROTOS              3
-
-#define SK_PNMI_CNT_NO                  66      /* Must have the value of the enum
-                                                                         * SK_PNMI_MAX_IDX. Define SK_PNMI_CHECK
-                                                                         * for check while init phase 1
-                                                                         */
-
-/*
- * Estimate data structure
- */
-typedef struct s_PnmiEstimate {
-        unsigned int    EstValueIndex;
-        SK_U64                  EstValue[7];
-        SK_U64                  Estimate;
-        SK_TIMER                EstTimer;
-} SK_PNMI_ESTIMATE;
-
-
-/*
- * VCT timer data structure
- */
-typedef struct s_VctTimer {
-        SK_TIMER                VctTimer;
-} SK_PNMI_VCT_TIMER;
-
-
-/*
- * PNMI specific adapter context structure
- */
-typedef struct s_PnmiPort {
-        SK_U64                  StatSyncCts;
-        SK_U64                  StatSyncOctetsCts;
-        SK_U64                  StatRxLongFrameCts;
-        SK_U64                  StatRxFrameTooLongCts;
-        SK_U64                  StatRxPMaccErr;
-        SK_U64                  TxSwQueueLen;
-        SK_U64                  TxSwQueueMax;
-        SK_U64                  TxRetryCts;
-        SK_U64                  RxIntrCts;
-        SK_U64                  TxIntrCts;
-        SK_U64                  RxNoBufCts;
-        SK_U64                  TxNoBufCts;
-        SK_U64                  TxUsedDescrNo;
-        SK_U64                  RxDeliveredCts;
-        SK_U64                  RxOctetsDeliveredCts;
-        SK_U64                  RxHwErrorsCts;
-        SK_U64                  TxHwErrorsCts;
-        SK_U64                  InErrorsCts;
-        SK_U64                  OutErrorsCts;
-        SK_U64                  ErrRecoveryCts;
-        SK_U64                  RxShortZeroMark;
-        SK_U64                  CounterOffset[SK_PNMI_CNT_NO];
-        SK_U32                  CounterHigh[SK_PNMI_CNT_NO];
-        SK_BOOL                 ActiveFlag;
-        SK_U8                   Align[3];
-} SK_PNMI_PORT;
-
-
-typedef struct s_PnmiData {
-        SK_PNMI_PORT    Port    [SK_MAX_MACS];
-        SK_PNMI_PORT    BufPort [SK_MAX_MACS]; /* 2002-09-13 pweber  */
-        SK_U64                  VirtualCounterOffset[SK_PNMI_CNT_NO];
-        SK_U32                  TestResult;
-        char                    HwVersion[10];
-        SK_U16                  Align01;
-
-        char                    *pDriverDescription;
-        char                    *pDriverVersion;
-        char                    *pDriverReleaseDate;
-        char                    *pDriverFileName;
-
-        int                             MacUpdatedFlag;
-        int                             RlmtUpdatedFlag;
-        int                             SirqUpdatedFlag;
-
-        SK_U64                  RlmtChangeCts;
-        SK_U64                  RlmtChangeTime;
-        SK_PNMI_ESTIMATE        RlmtChangeEstimate;
-        SK_U64                  RlmtChangeThreshold;
-
-        SK_U64                  StartUpTime;
-        SK_U32                  DeviceType;
-        char                    PciBusSpeed;
-        char                    PciBusWidth;
-        char                    Chipset;
-        char                    PMD;
-        char                    Connector;
-        SK_BOOL                 DualNetActiveFlag;
-        SK_U16                  Align02;
-
-        char                    TrapBuf[SK_PNMI_TRAP_QUEUE_LEN];
-        unsigned int    TrapBufFree;
-        unsigned int    TrapQueueBeg;
-        unsigned int    TrapQueueEnd;
-        unsigned int    TrapBufPad;
-        unsigned int    TrapUnique;
-        SK_U8           VctStatus[SK_MAX_MACS];
-        SK_PNMI_VCT     VctBackup[SK_MAX_MACS];
-        SK_PNMI_VCT_TIMER VctTimeout[SK_MAX_MACS];
-#ifdef SK_DIAG_SUPPORT
-        SK_U32                  DiagAttached;
-#endif /* SK_DIAG_SUPPORT */
-} SK_PNMI;
-
-
-/*
- * Function prototypes
- */
-extern int SkPnmiInit(SK_AC *pAC, SK_IOC IoC, int Level);
-extern int SkPnmiSetVar(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, void* pBuf,
-        unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
-extern int SkPnmiGetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
-        unsigned int *pLen, SK_U32 NetIndex);
-extern int SkPnmiPreSetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
-        unsigned int *pLen, SK_U32 NetIndex);
-extern int SkPnmiSetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
-        unsigned int *pLen, SK_U32 NetIndex);
-extern int SkPnmiEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event,
-        SK_EVPARA Param);
-extern int SkPnmiGenIoctl(SK_AC *pAC, SK_IOC IoC, void * pBuf,
-        unsigned int * pLen, SK_U32 NetIndex);
-
-#endif
diff --git a/drivers/net/sk98lin/h/skgesirq.h b/drivers/net/sk98lin/h/skgesirq.h
deleted file mode 100644
index 3eec6274e413..000000000000
--- a/drivers/net/sk98lin/h/skgesirq.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgesirq.h
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.30 $
- * Date:        $Date: 2003/07/04 12:34:13 $
- * Purpose:     SK specific Gigabit Ethernet special IRQ functions
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef _INC_SKGESIRQ_H_
-#define _INC_SKGESIRQ_H_
-
-/* Define return codes of SkGePortCheckUp and CheckShort */
-#define SK_HW_PS_NONE           0       /* No action needed */
-#define SK_HW_PS_RESTART        1       /* Restart needed */
-#define SK_HW_PS_LINK           2       /* Link Up actions needed */
-
-/*
- * Define the Event the special IRQ/INI module can handle
- */
-#define SK_HWEV_WATIM                   1       /* Timeout for WA Errata #2 XMAC */
-#define SK_HWEV_PORT_START              2       /* Port Start Event by RLMT */
-#define SK_HWEV_PORT_STOP               3       /* Port Stop Event by RLMT */
-#define SK_HWEV_CLEAR_STAT              4       /* Clear Statistics by PNMI */
-#define SK_HWEV_UPDATE_STAT             5       /* Update Statistics by PNMI */
-#define SK_HWEV_SET_LMODE               6       /* Set Link Mode by PNMI */
-#define SK_HWEV_SET_FLOWMODE    7       /* Set Flow Control Mode by PNMI */
-#define SK_HWEV_SET_ROLE                8       /* Set Master/Slave (Role) by PNMI */
-#define SK_HWEV_SET_SPEED               9       /* Set Link Speed by PNMI */
-#define SK_HWEV_HALFDUP_CHK             10      /* Half Duplex Hangup Workaround */
-
-#define SK_WA_ACT_TIME          (5000000UL)     /* 5 sec */
-#define SK_WA_INA_TIME          (100000UL)      /* 100 msec */
-
-#define SK_HALFDUP_CHK_TIME     (10000UL)       /* 10 msec */
-
-/*
- * Define the error numbers and messages
- */
-#define SKERR_SIRQ_E001         (SK_ERRBASE_SIRQ+0)
-#define SKERR_SIRQ_E001MSG      "Unknown event"
-#define SKERR_SIRQ_E002         (SKERR_SIRQ_E001+1)
-#define SKERR_SIRQ_E002MSG      "Packet timeout RX1"
-#define SKERR_SIRQ_E003         (SKERR_SIRQ_E002+1)
-#define SKERR_SIRQ_E003MSG      "Packet timeout RX2"
-#define SKERR_SIRQ_E004         (SKERR_SIRQ_E003+1)
-#define SKERR_SIRQ_E004MSG      "MAC 1 not correctly initialized"
-#define SKERR_SIRQ_E005         (SKERR_SIRQ_E004+1)
-#define SKERR_SIRQ_E005MSG      "MAC 2 not correctly initialized"
-#define SKERR_SIRQ_E006         (SKERR_SIRQ_E005+1)
-#define SKERR_SIRQ_E006MSG      "CHECK failure R1"
-#define SKERR_SIRQ_E007         (SKERR_SIRQ_E006+1)
-#define SKERR_SIRQ_E007MSG      "CHECK failure R2"
-#define SKERR_SIRQ_E008         (SKERR_SIRQ_E007+1)
-#define SKERR_SIRQ_E008MSG      "CHECK failure XS1"
-#define SKERR_SIRQ_E009         (SKERR_SIRQ_E008+1)
-#define SKERR_SIRQ_E009MSG      "CHECK failure XA1"
-#define SKERR_SIRQ_E010         (SKERR_SIRQ_E009+1)
-#define SKERR_SIRQ_E010MSG      "CHECK failure XS2"
-#define SKERR_SIRQ_E011         (SKERR_SIRQ_E010+1)
-#define SKERR_SIRQ_E011MSG      "CHECK failure XA2"
-#define SKERR_SIRQ_E012         (SKERR_SIRQ_E011+1)
-#define SKERR_SIRQ_E012MSG      "unexpected IRQ Master error"
-#define SKERR_SIRQ_E013         (SKERR_SIRQ_E012+1)
-#define SKERR_SIRQ_E013MSG      "unexpected IRQ Status error"
-#define SKERR_SIRQ_E014         (SKERR_SIRQ_E013+1)
-#define SKERR_SIRQ_E014MSG      "Parity error on RAM (read)"
-#define SKERR_SIRQ_E015         (SKERR_SIRQ_E014+1)
-#define SKERR_SIRQ_E015MSG      "Parity error on RAM (write)"
-#define SKERR_SIRQ_E016         (SKERR_SIRQ_E015+1)
-#define SKERR_SIRQ_E016MSG      "Parity error MAC 1"
-#define SKERR_SIRQ_E017         (SKERR_SIRQ_E016+1)
-#define SKERR_SIRQ_E017MSG      "Parity error MAC 2"
-#define SKERR_SIRQ_E018         (SKERR_SIRQ_E017+1)
-#define SKERR_SIRQ_E018MSG      "Parity error RX 1"
-#define SKERR_SIRQ_E019         (SKERR_SIRQ_E018+1)
-#define SKERR_SIRQ_E019MSG      "Parity error RX 2"
-#define SKERR_SIRQ_E020         (SKERR_SIRQ_E019+1)
-#define SKERR_SIRQ_E020MSG      "MAC transmit FIFO underrun"
-#define SKERR_SIRQ_E021         (SKERR_SIRQ_E020+1)
-#define SKERR_SIRQ_E021MSG      "Spurious TWSI interrupt"
-#define SKERR_SIRQ_E022         (SKERR_SIRQ_E021+1)
-#define SKERR_SIRQ_E022MSG      "Cable pair swap error"
-#define SKERR_SIRQ_E023         (SKERR_SIRQ_E022+1)
-#define SKERR_SIRQ_E023MSG      "Auto-negotiation error"
-#define SKERR_SIRQ_E024         (SKERR_SIRQ_E023+1)
-#define SKERR_SIRQ_E024MSG      "FIFO overflow error"
-#define SKERR_SIRQ_E025         (SKERR_SIRQ_E024+1)
-#define SKERR_SIRQ_E025MSG      "2 Pair Downshift detected"
-
-extern void SkGeSirqIsr(SK_AC *pAC, SK_IOC IoC, SK_U32 Istatus);
-extern int  SkGeSirqEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Para);
-extern void SkHWLinkDown(SK_AC *pAC, SK_IOC IoC, int Port);
-
-#endif  /* _INC_SKGESIRQ_H_ */
diff --git a/drivers/net/sk98lin/h/ski2c.h b/drivers/net/sk98lin/h/ski2c.h
deleted file mode 100644
index 6a63f4a15de6..000000000000
--- a/drivers/net/sk98lin/h/ski2c.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/******************************************************************************
- *
- * Name:        ski2c.h
- * Project:     Gigabit Ethernet Adapters, TWSI-Module
- * Version:     $Revision: 1.35 $
- * Date:        $Date: 2003/10/20 09:06:30 $
- * Purpose:     Defines to access Voltage and Temperature Sensor
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * SKI2C.H      contains all I2C specific defines
- */
-
-#ifndef _SKI2C_H_
-#define _SKI2C_H_
-
-typedef struct  s_Sensor SK_SENSOR;
-
-#include "h/skgei2c.h"
-
-/*
- * Define the I2C events.
- */
-#define SK_I2CEV_IRQ    1       /* IRQ happened Event */
-#define SK_I2CEV_TIM    2       /* Timeout event */
-#define SK_I2CEV_CLEAR  3       /* Clear MIB Values */
-
-/*
- * Define READ and WRITE Constants.
- */
-#define I2C_READ        0
-#define I2C_WRITE       1
-#define I2C_BURST       1
-#define I2C_SINGLE      0
-
-#define SKERR_I2C_E001          (SK_ERRBASE_I2C+0)
-#define SKERR_I2C_E001MSG       "Sensor index unknown"
-#define SKERR_I2C_E002          (SKERR_I2C_E001+1)
-#define SKERR_I2C_E002MSG       "TWSI: transfer does not complete"
-#define SKERR_I2C_E003          (SKERR_I2C_E002+1)
-#define SKERR_I2C_E003MSG       "LM80: NAK on device send"
-#define SKERR_I2C_E004          (SKERR_I2C_E003+1)
-#define SKERR_I2C_E004MSG       "LM80: NAK on register send"
-#define SKERR_I2C_E005          (SKERR_I2C_E004+1)
-#define SKERR_I2C_E005MSG       "LM80: NAK on device (2) send"
-#define SKERR_I2C_E006          (SKERR_I2C_E005+1)
-#define SKERR_I2C_E006MSG       "Unknown event"
-#define SKERR_I2C_E007          (SKERR_I2C_E006+1)
-#define SKERR_I2C_E007MSG       "LM80 read out of state"
-#define SKERR_I2C_E008          (SKERR_I2C_E007+1)
-#define SKERR_I2C_E008MSG       "Unexpected sensor read completed"
-#define SKERR_I2C_E009          (SKERR_I2C_E008+1)
-#define SKERR_I2C_E009MSG       "WARNING: temperature sensor out of range"
-#define SKERR_I2C_E010          (SKERR_I2C_E009+1)
-#define SKERR_I2C_E010MSG       "WARNING: voltage sensor out of range"
-#define SKERR_I2C_E011          (SKERR_I2C_E010+1)
-#define SKERR_I2C_E011MSG       "ERROR: temperature sensor out of range"
-#define SKERR_I2C_E012          (SKERR_I2C_E011+1)
-#define SKERR_I2C_E012MSG       "ERROR: voltage sensor out of range"
-#define SKERR_I2C_E013          (SKERR_I2C_E012+1)
-#define SKERR_I2C_E013MSG       "ERROR: couldn't init sensor"
-#define SKERR_I2C_E014          (SKERR_I2C_E013+1)
-#define SKERR_I2C_E014MSG       "WARNING: fan sensor out of range"
-#define SKERR_I2C_E015          (SKERR_I2C_E014+1)
-#define SKERR_I2C_E015MSG       "ERROR: fan sensor out of range"
-#define SKERR_I2C_E016          (SKERR_I2C_E015+1)
-#define SKERR_I2C_E016MSG       "TWSI: active transfer does not complete"
-
-/*
- * Define Timeout values
- */
-#define SK_I2C_TIM_LONG         2000000L        /* 2 seconds */
-#define SK_I2C_TIM_SHORT         100000L        /* 100 milliseconds */
-#define SK_I2C_TIM_WATCH        1000000L        /* 1 second */
-
-/*
- * Define trap and error log hold times
- */
-#ifndef SK_SEN_ERR_TR_HOLD
-#define SK_SEN_ERR_TR_HOLD              (4*SK_TICKS_PER_SEC)
-#endif
-#ifndef SK_SEN_ERR_LOG_HOLD
-#define SK_SEN_ERR_LOG_HOLD             (60*SK_TICKS_PER_SEC)
-#endif
-#ifndef SK_SEN_WARN_TR_HOLD
-#define SK_SEN_WARN_TR_HOLD             (15*SK_TICKS_PER_SEC)
-#endif
-#ifndef SK_SEN_WARN_LOG_HOLD
-#define SK_SEN_WARN_LOG_HOLD    (15*60*SK_TICKS_PER_SEC)
-#endif
-
-/*
- * Defines for SenType
- */
-#define SK_SEN_UNKNOWN  0
-#define SK_SEN_TEMP             1
-#define SK_SEN_VOLT             2
-#define SK_SEN_FAN              3
-
-/*
- * Define for the SenErrorFlag
- */
-#define SK_SEN_ERR_NOT_PRESENT  0       /* Error Flag: Sensor not present */
-#define SK_SEN_ERR_OK                   1       /* Error Flag: O.K. */
-#define SK_SEN_ERR_WARN                 2       /* Error Flag: Warning */
-#define SK_SEN_ERR_ERR                  3       /* Error Flag: Error */
-#define SK_SEN_ERR_FAULTY               4       /* Error Flag: Faulty */
-
-/*
- * Define the Sensor struct
- */
-struct  s_Sensor {
-        char    *SenDesc;                       /* Description */
-        int             SenType;                        /* Voltage or Temperature */
-        SK_I32  SenValue;                       /* Current value of the sensor */
-        SK_I32  SenThreErrHigh;         /* High error Threshhold of this sensor */
-        SK_I32  SenThreWarnHigh;        /* High warning Threshhold of this sensor */
-        SK_I32  SenThreErrLow;          /* Lower error Threshold of the sensor */
-        SK_I32  SenThreWarnLow;         /* Lower warning Threshold of the sensor */
-        int             SenErrFlag;                     /* Sensor indicated an error */
-        SK_BOOL SenInit;                        /* Is sensor initialized ? */
-        SK_U64  SenErrCts;                      /* Error trap counter */
-        SK_U64  SenWarnCts;                     /* Warning trap counter */
-        SK_U64  SenBegErrTS;            /* Begin error timestamp */
-        SK_U64  SenBegWarnTS;           /* Begin warning timestamp */
-        SK_U64  SenLastErrTrapTS;       /* Last error trap timestamp */
-        SK_U64  SenLastErrLogTS;        /* Last error log timestamp */
-        SK_U64  SenLastWarnTrapTS;      /* Last warning trap timestamp */
-        SK_U64  SenLastWarnLogTS;       /* Last warning log timestamp */
-        int             SenState;                       /* Sensor State (see HW specific include) */
-        int             (*SenRead)(SK_AC *pAC, SK_IOC IoC, struct s_Sensor *pSen);
-                                                                /* Sensors read function */
-        SK_U16  SenReg;                         /* Register Address for this sensor */
-        SK_U8   SenDev;                         /* Device Selection for this sensor */
-};
-
-typedef struct  s_I2c {
-        SK_SENSOR       SenTable[SK_MAX_SENSORS];       /* Sensor Table */
-        int                     CurrSens;       /* Which sensor is currently queried */
-        int                     MaxSens;        /* Max. number of sensors */
-        int                     TimerMode;      /* Use the timer also to watch the state machine */
-        int                     InitLevel;      /* Initialized Level */
-#ifndef SK_DIAG
-        int                     DummyReads;     /* Number of non-checked dummy reads */
-        SK_TIMER        SenTimer;       /* Sensors timer */
-#endif /* !SK_DIAG */
-} SK_I2C;
-
-extern int SkI2cInit(SK_AC *pAC, SK_IOC IoC, int Level);
-#ifdef SK_DIAG
-extern  SK_U32 SkI2cRead(SK_AC *pAC, SK_IOC IoC, int Dev, int Size, int Reg,
-                                                 int Burst);
-#else /* !SK_DIAG */
-extern int SkI2cEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Para);
-extern void SkI2cWaitIrq(SK_AC *pAC, SK_IOC IoC);
-extern void SkI2cIsr(SK_AC *pAC, SK_IOC IoC);
-#endif /* !SK_DIAG */
-#endif /* n_SKI2C_H */
-
diff --git a/drivers/net/sk98lin/h/skqueue.h b/drivers/net/sk98lin/h/skqueue.h
deleted file mode 100644
index 2ec40d4fdf60..000000000000
--- a/drivers/net/sk98lin/h/skqueue.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- *
- * Name:        skqueue.h
- * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:     $Revision: 1.16 $
- * Date:        $Date: 2003/09/16 12:50:32 $
- * Purpose:     Defines for the Event queue
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * SKQUEUE.H    contains all defines and types for the event queue
- */
-
-#ifndef _SKQUEUE_H_
-#define _SKQUEUE_H_
-
-
-/*
- * define the event classes to be served
- */
-#define SKGE_DRV        1       /* Driver Event Class */
-#define SKGE_RLMT       2       /* RLMT Event Class */
-#define SKGE_I2C        3       /* I2C Event Class */
-#define SKGE_PNMI       4       /* PNMI Event Class */
-#define SKGE_CSUM       5       /* Checksum Event Class */
-#define SKGE_HWAC       6       /* Hardware Access Event Class */
-
-#define SKGE_SWT        9       /* Software Timer Event Class */
-#define SKGE_LACP       10      /* LACP Aggregation Event Class */
-#define SKGE_RSF        11      /* RSF Aggregation Event Class */
-#define SKGE_MARKER     12      /* MARKER Aggregation Event Class */
-#define SKGE_FD         13      /* FD Distributor Event Class */
-
-/*
- * define event queue as circular buffer
- */
-#define SK_MAX_EVENT    64
-
-/*
- * Parameter union for the Para stuff
- */
-typedef union u_EvPara {
-        void    *pParaPtr;      /* Parameter Pointer */
-        SK_U64  Para64;         /* Parameter 64bit version */
-        SK_U32  Para32[2];      /* Parameter Array of 32bit parameters */
-} SK_EVPARA;
-
-/*
- * Event Queue
- *      skqueue.c
- * events are class/value pairs
- *      class   is addressee, e.g. RLMT, PNMI etc.
- *      value   is command, e.g. line state change, ring op change etc.
- */
-typedef struct s_EventElem {
-        SK_U32          Class;                  /* Event class */
-        SK_U32          Event;                  /* Event value */
-        SK_EVPARA       Para;                   /* Event parameter */
-} SK_EVENTELEM;
-
-typedef struct s_Queue {
-        SK_EVENTELEM    EvQueue[SK_MAX_EVENT];
-        SK_EVENTELEM    *EvPut;
-        SK_EVENTELEM    *EvGet;
-} SK_QUEUE;
-
-extern  void SkEventInit(SK_AC *pAC, SK_IOC Ioc, int Level);
-extern  void SkEventQueue(SK_AC *pAC, SK_U32 Class, SK_U32 Event,
-        SK_EVPARA Para);
-extern  int SkEventDispatcher(SK_AC *pAC, SK_IOC Ioc);
-
-
-/* Define Error Numbers and messages */
-#define SKERR_Q_E001    (SK_ERRBASE_QUEUE+0)
-#define SKERR_Q_E001MSG "Event queue overflow"
-#define SKERR_Q_E002    (SKERR_Q_E001+1)
-#define SKERR_Q_E002MSG "Undefined event class"
-#endif  /* _SKQUEUE_H_ */
-
diff --git a/drivers/net/sk98lin/h/skrlmt.h b/drivers/net/sk98lin/h/skrlmt.h
deleted file mode 100644
index ca75dfdcf2d6..000000000000
--- a/drivers/net/sk98lin/h/skrlmt.h
+++ /dev/null
@@ -1,438 +0,0 @@
-/******************************************************************************
- *
- * Name:        skrlmt.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.37 $
- * Date:        $Date: 2003/04/15 09:43:43 $
- * Purpose:     Header file for Redundant Link ManagemenT.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * This is the header file for Redundant Link ManagemenT.
- *
- * Include File Hierarchy:
- *
- *      "skdrv1st.h"
- *      ...
- *      "sktypes.h"
- *      "skqueue.h"
- *      "skaddr.h"
- *      "skrlmt.h"
- *      ...
- *      "skdrv2nd.h"
- *
- ******************************************************************************/
-
-#ifndef __INC_SKRLMT_H
-#define __INC_SKRLMT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* cplusplus */
-
-/* defines ********************************************************************/
-
-#define SK_RLMT_NET_DOWN_TEMP   1       /* NET_DOWN due to last port down. */
-#define SK_RLMT_NET_DOWN_FINAL  2       /* NET_DOWN due to RLMT_STOP. */
-
-/* ----- Default queue sizes - must be multiples of 8 KB ----- */
-
-/* Less than 8 KB free in RX queue => pause frames. */
-#define SK_RLMT_STANDBY_QRXSIZE 128     /* Size of rx standby queue in KB. */
-#define SK_RLMT_STANDBY_QXASIZE 32      /* Size of async standby queue in KB. */
-#define SK_RLMT_STANDBY_QXSSIZE 0       /* Size of sync standby queue in KB. */
-
-#define SK_RLMT_MAX_TX_BUF_SIZE 60      /* Maximum RLMT transmit size. */
-
-/* ----- PORT states ----- */
-
-#define SK_RLMT_PS_INIT                 0       /* Port state: Init. */
-#define SK_RLMT_PS_LINK_DOWN    1       /* Port state: Link down. */
-#define SK_RLMT_PS_DOWN                 2       /* Port state: Port down. */
-#define SK_RLMT_PS_GOING_UP             3       /* Port state: Going up. */
-#define SK_RLMT_PS_UP                   4       /* Port state: Up. */
-
-/* ----- RLMT states ----- */
-
-#define SK_RLMT_RS_INIT                 0       /* RLMT state: Init. */
-#define SK_RLMT_RS_NET_DOWN             1       /* RLMT state: Net down. */
-#define SK_RLMT_RS_NET_UP               2       /* RLMT state: Net up. */
-
-/* ----- PORT events ----- */
-
-#define SK_RLMT_LINK_UP                 1001    /* Link came up. */
-#define SK_RLMT_LINK_DOWN               1002    /* Link went down. */
-#define SK_RLMT_PORT_ADDR               1003    /* Port address changed. */
-
-/* ----- RLMT events ----- */
-
-#define SK_RLMT_START                   2001    /* Start RLMT. */
-#define SK_RLMT_STOP                    2002    /* Stop RLMT. */
-#define SK_RLMT_PACKET_RECEIVED 2003    /* Packet was received for RLMT. */
-#define SK_RLMT_STATS_CLEAR             2004    /* Clear statistics. */
-#define SK_RLMT_STATS_UPDATE    2005    /* Update statistics. */
-#define SK_RLMT_PREFPORT_CHANGE 2006    /* Change preferred port. */
-#define SK_RLMT_MODE_CHANGE             2007    /* New RlmtMode. */
-#define SK_RLMT_SET_NETS                2008    /* Number of Nets (1 or 2). */
-
-/* ----- RLMT mode bits ----- */
-
-/*
- * CAUTION:     These defines are private to RLMT.
- *                      Please use the RLMT mode defines below.
- */
-
-#define SK_RLMT_CHECK_LINK                1             /* Check Link. */
-#define SK_RLMT_CHECK_LOC_LINK    2             /* Check other link on same adapter. */
-#define SK_RLMT_CHECK_SEG                 4             /* Check segmentation. */
-
-#ifndef RLMT_CHECK_REMOTE
-#define SK_RLMT_CHECK_OTHERS    SK_RLMT_CHECK_LOC_LINK
-#else   /* RLMT_CHECK_REMOTE */
-#define SK_RLMT_CHECK_REM_LINK    8             /* Check link(s) on other adapter(s). */
-#define SK_RLMT_MAX_REMOTE_PORTS_CHECKED        3
-#define SK_RLMT_CHECK_OTHERS    \
-                (SK_RLMT_CHECK_LOC_LINK | SK_RLMT_CHECK_REM_LINK)
-#endif  /* RLMT_CHECK_REMOTE */
-
-#ifndef SK_RLMT_ENABLE_TRANSPARENT
-#define SK_RLMT_TRANSPARENT               0             /* RLMT transparent - inactive. */
-#else   /* SK_RLMT_ENABLE_TRANSPARENT */
-#define SK_RLMT_TRANSPARENT             128             /* RLMT transparent. */
-#endif  /* SK_RLMT_ENABLE_TRANSPARENT */
-
-/* ----- RLMT modes ----- */
-
-/* Check Link State. */
-#define SK_RLMT_MODE_CLS        (SK_RLMT_CHECK_LINK)
-
-/* Check Local Ports: check other links on the same adapter. */
-#define SK_RLMT_MODE_CLP        (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK)
-
-/* Check Local Ports and Segmentation Status. */
-#define SK_RLMT_MODE_CLPSS      \
-                (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK | SK_RLMT_CHECK_SEG)
-
-#ifdef RLMT_CHECK_REMOTE
-/* Check Local and Remote Ports: check links (local or remote). */
-        Name of define TBD!
-#define SK_RLMT_MODE_CRP        \
-                (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK | SK_RLMT_CHECK_REM_LINK)
-
-/* Check Local and Remote Ports and Segmentation Status. */
-        Name of define TBD!
-#define SK_RLMT_MODE_CRPSS      \
-                (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK | \
-                SK_RLMT_CHECK_REM_LINK | SK_RLMT_CHECK_SEG)
-#endif  /* RLMT_CHECK_REMOTE */
-
-/* ----- RLMT lookahead result bits ----- */
-
-#define SK_RLMT_RX_RLMT                 1       /* Give packet to RLMT. */
-#define SK_RLMT_RX_PROTOCOL             2       /* Give packet to protocol. */
-
-/* Macros */
-
-#if 0
-SK_AC           *pAC            /* adapter context */
-SK_U32          PortNum         /* receiving port */
-unsigned        PktLen          /* received packet's length */
-SK_BOOL         IsBc            /* Flag: packet is broadcast */
-unsigned        *pOffset        /* offs. of bytes to present to SK_RLMT_LOOKAHEAD */
-unsigned        *pNumBytes      /* #Bytes to present to SK_RLMT_LOOKAHEAD */
-#endif  /* 0 */
-
-#define SK_RLMT_PRE_LOOKAHEAD(pAC,PortNum,PktLen,IsBc,pOffset,pNumBytes) { \
-        SK_AC   *_pAC; \
-        SK_U32  _PortNum; \
-        _pAC = (pAC); \
-        _PortNum = (SK_U32)(PortNum); \
-        /* _pAC->Rlmt.Port[_PortNum].PacketsRx++; */ \
-        _pAC->Rlmt.Port[_PortNum].PacketsPerTimeSlot++; \
-    if (_pAC->Rlmt.RlmtOff) { \
-                *(pNumBytes) = 0; \
-    } \
-    else {\
-        if ((_pAC->Rlmt.Port[_PortNum].Net->RlmtMode & SK_RLMT_TRANSPARENT) != 0) { \
-                *(pNumBytes) = 0; \
-        } \
-        else if (IsBc) { \
-                if (_pAC->Rlmt.Port[_PortNum].Net->RlmtMode != SK_RLMT_MODE_CLS) { \
-                        *(pNumBytes) = 6; \
-                        *(pOffset) = 6; \
-                } \
-                else { \
-                        *(pNumBytes) = 0; \
-                } \
-        } \
-        else { \
-                if ((PktLen) > SK_RLMT_MAX_TX_BUF_SIZE) { \
-                        /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
-                        *(pNumBytes) = 0; \
-                } \
-                else { \
-                        *(pNumBytes) = 6; \
-                        *(pOffset) = 0; \
-                } \
-        } \
-    } \
-}
-
-#if 0
-SK_AC           *pAC            /* adapter context */
-SK_U32          PortNum         /* receiving port */
-SK_U8           *pLaPacket,     /* received packet's data (points to pOffset) */
-SK_BOOL         IsBc            /* Flag: packet is broadcast */
-SK_BOOL         IsMc            /* Flag: packet is multicast */
-unsigned        *pForRlmt       /* Result: bits SK_RLMT_RX_RLMT, SK_RLMT_RX_PROTOCOL */
-SK_RLMT_LOOKAHEAD() expects *pNumBytes from
-packet offset *pOffset (s.a.) at *pLaPacket.
-
-If you use SK_RLMT_LOOKAHEAD in a path where you already know if the packet is
-BC, MC, or UC, you should use constants for IsBc and IsMc, so that your compiler
-can trash unneeded parts of the if construction.
-#endif  /* 0 */
-
-#define SK_RLMT_LOOKAHEAD(pAC,PortNum,pLaPacket,IsBc,IsMc,pForRlmt) { \
-        SK_AC   *_pAC; \
-        SK_U32  _PortNum; \
-        SK_U8   *_pLaPacket; \
-        _pAC = (pAC); \
-        _PortNum = (SK_U32)(PortNum); \
-        _pLaPacket = (SK_U8 *)(pLaPacket); \
-        if (IsBc) {\
-                if (!SK_ADDR_EQUAL(_pLaPacket, _pAC->Addr.Net[_pAC->Rlmt.Port[ \
-                        _PortNum].Net->NetNumber].CurrentMacAddress.a)) { \
-                        _pAC->Rlmt.Port[_PortNum].BcTimeStamp = SkOsGetTime(_pAC); \
-                        _pAC->Rlmt.CheckSwitch = SK_TRUE; \
-                } \
-                /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
-                *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
-        } \
-        else if (IsMc) { \
-                if (SK_ADDR_EQUAL(_pLaPacket, BridgeMcAddr.a)) { \
-                        _pAC->Rlmt.Port[_PortNum].BpduPacketsPerTimeSlot++; \
-                        if (_pAC->Rlmt.Port[_PortNum].Net->RlmtMode & SK_RLMT_CHECK_SEG) { \
-                                *(pForRlmt) = SK_RLMT_RX_RLMT | SK_RLMT_RX_PROTOCOL; \
-                        } \
-                        else { \
-                                *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
-                        } \
-                } \
-                else if (SK_ADDR_EQUAL(_pLaPacket, SkRlmtMcAddr.a)) { \
-                        *(pForRlmt) = SK_RLMT_RX_RLMT; \
-                } \
-                else { \
-                        /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
-                        *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
-                } \
-        } \
-        else { \
-                if (SK_ADDR_EQUAL( \
-                        _pLaPacket, \
-                        _pAC->Addr.Port[_PortNum].CurrentMacAddress.a)) { \
-                        *(pForRlmt) = SK_RLMT_RX_RLMT; \
-                } \
-                else { \
-                        /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
-                        *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
-                } \
-        } \
-}
-
-#ifdef SK_RLMT_FAST_LOOKAHEAD
-Error: SK_RLMT_FAST_LOOKAHEAD no longer used. Use new macros for lookahead.
-#endif  /* SK_RLMT_FAST_LOOKAHEAD */
-#ifdef SK_RLMT_SLOW_LOOKAHEAD
-Error: SK_RLMT_SLOW_LOOKAHEAD no longer used. Use new macros for lookahead.
-#endif  /* SK_RLMT_SLOW_LOOKAHEAD */
-
-/* typedefs *******************************************************************/
-
-#ifdef SK_RLMT_MBUF_PRIVATE
-typedef struct s_RlmtMbuf {
-        some content
-} SK_RLMT_MBUF;
-#endif  /* SK_RLMT_MBUF_PRIVATE */
-
-
-#ifdef SK_LA_INFO
-typedef struct s_Rlmt_PacketInfo {
-        unsigned        PacketLength;                   /* Length of packet. */
-        unsigned        PacketType;                             /* Directed/Multicast/Broadcast. */
-} SK_RLMT_PINFO;
-#endif  /* SK_LA_INFO */
-
-
-typedef struct s_RootId {
-        SK_U8           Id[8];                                  /* Root Bridge Id. */
-} SK_RLMT_ROOT_ID;
-
-
-typedef struct s_port {
-        SK_MAC_ADDR     CheckAddr;
-        SK_BOOL         SuspectTx;
-} SK_PORT_CHECK;
-
-
-typedef struct s_RlmtNet SK_RLMT_NET;
-
-
-typedef struct s_RlmtPort {
-
-/* ----- Public part (read-only) ----- */
-
-        SK_U8                   PortState;                              /* Current state of this port. */
-
-        /* For PNMI */
-        SK_BOOL                 LinkDown;
-        SK_BOOL                 PortDown;
-        SK_U8                   Align01;
-
-        SK_U32                  PortNumber;                             /* Number of port on adapter. */
-        SK_RLMT_NET *   Net;                                    /* Net port belongs to. */
-
-        SK_U64                  TxHelloCts;
-        SK_U64                  RxHelloCts;
-        SK_U64                  TxSpHelloReqCts;
-        SK_U64                  RxSpHelloCts;
-
-/* ----- Private part ----- */
-
-/*      SK_U64                  PacketsRx; */                           /* Total packets received. */
-        SK_U32                  PacketsPerTimeSlot;             /* Packets rxed between TOs. */
-/*      SK_U32                  DataPacketsPerTimeSlot; */      /* Data packets ... */
-        SK_U32                  BpduPacketsPerTimeSlot; /* BPDU packets rxed in TS. */
-        SK_U64                  BcTimeStamp;                    /* Time of last BC receive. */
-        SK_U64                  GuTimeStamp;                    /* Time of entering GOING_UP. */
-
-        SK_TIMER                UpTimer;                                /* Timer struct Link/Port up. */
-        SK_TIMER                DownRxTimer;                    /* Timer struct down rx. */
-        SK_TIMER                DownTxTimer;                    /* Timer struct down tx. */
-
-        SK_U32                  CheckingState;                  /* Checking State. */
-
-        SK_ADDR_PORT *  AddrPort;
-
-        SK_U8                   Random[4];                              /* Random value. */
-        unsigned                PortsChecked;                   /* #ports checked. */
-        unsigned                PortsSuspect;                   /* #ports checked that are s. */
-        SK_PORT_CHECK   PortCheck[1];
-/*      SK_PORT_CHECK   PortCheck[SK_MAX_MACS - 1]; */
-
-        SK_BOOL                 PortStarted;                    /* Port is started. */
-        SK_BOOL                 PortNoRx;                               /* NoRx for >= 1 time slot. */
-        SK_BOOL                 RootIdSet;
-        SK_RLMT_ROOT_ID Root;                                   /* Root Bridge Id. */
-} SK_RLMT_PORT;
-
-
-struct s_RlmtNet {
-
-/* ----- Public part (read-only) ----- */
-
-        SK_U32                  NetNumber;                      /* Number of net. */
-
-        SK_RLMT_PORT *  Port[SK_MAX_MACS];      /* Ports that belong to this net. */
-        SK_U32                  NumPorts;                       /* Number of ports. */
-        SK_U32                  PrefPort;                       /* Preferred port. */
-
-        /* For PNMI */
-
-        SK_U32                  ChgBcPrio;                      /* Change Priority of last broadcast received */
-        SK_U32                  RlmtMode;                       /* Check ... */
-        SK_U32                  ActivePort;                     /* Active port. */
-        SK_U32                  Preference;             /* 0xFFFFFFFF: Automatic. */
-
-        SK_U8                   RlmtState;                      /* Current RLMT state. */
-
-/* ----- Private part ----- */
-        SK_BOOL                 RootIdSet;
-        SK_U16                  Align01;
-
-        int                             LinksUp;                        /* #Links up. */
-        int                             PortsUp;                        /* #Ports up. */
-        SK_U32                  TimeoutValue;           /* RLMT timeout value. */
-
-        SK_U32                  CheckingState;          /* Checking State. */
-        SK_RLMT_ROOT_ID Root;                           /* Root Bridge Id. */
-
-        SK_TIMER                LocTimer;                       /* Timer struct. */
-        SK_TIMER                SegTimer;                       /* Timer struct. */
-};
-
-
-typedef struct s_Rlmt {
-
-/* ----- Public part (read-only) ----- */
-
-        SK_U32                  NumNets;                        /* Number of nets. */
-        SK_U32                  NetsStarted;            /* Number of nets started. */
-        SK_RLMT_NET             Net[SK_MAX_NETS];       /* Array of available nets. */
-        SK_RLMT_PORT    Port[SK_MAX_MACS];      /* Array of available ports. */
-
-/* ----- Private part ----- */
-        SK_BOOL                 CheckSwitch;
-        SK_BOOL                 RlmtOff;            /* set to zero if the Mac addresses 
-                                           are equal or the second one 
-                                           is zero */
-        SK_U16                  Align01;
-
-} SK_RLMT;
-
-
-extern  SK_MAC_ADDR     BridgeMcAddr;
-extern  SK_MAC_ADDR     SkRlmtMcAddr;
-
-/* function prototypes ********************************************************/
-
-
-#ifndef SK_KR_PROTO
-
-/* Functions provided by SkRlmt */
-
-/* ANSI/C++ compliant function prototypes */
-
-extern  void    SkRlmtInit(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        int             Level);
-
-extern  int     SkRlmtEvent(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        SK_U32          Event,
-        SK_EVPARA       Para);
-
-#else   /* defined(SK_KR_PROTO) */
-
-/* Non-ANSI/C++ compliant function prototypes */
-
-#error KR-style function prototypes are not yet provided.
-
-#endif  /* defined(SK_KR_PROTO)) */
-
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* __INC_SKRLMT_H */
diff --git a/drivers/net/sk98lin/h/sktimer.h b/drivers/net/sk98lin/h/sktimer.h
deleted file mode 100644
index 04e6d7c1ec33..000000000000
--- a/drivers/net/sk98lin/h/sktimer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/******************************************************************************
- *
- * Name:        sktimer.h
- * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:     $Revision: 1.11 $
- * Date:        $Date: 2003/09/16 12:58:18 $
- * Purpose:     Defines for the timer functions
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * SKTIMER.H    contains all defines and types for the timer functions
- */
-
-#ifndef _SKTIMER_H_
-#define _SKTIMER_H_
-
-#include "h/skqueue.h"
-
-/*
- * SK timer
- * - needed wherever a timer is used. Put this in your data structure
- *   wherever you want.
- */
-typedef struct s_Timer SK_TIMER;
-
-struct s_Timer {
-        SK_TIMER        *TmNext;        /* linked list */
-        SK_U32          TmClass;        /* Timer Event class */
-        SK_U32          TmEvent;        /* Timer Event value */
-        SK_EVPARA       TmPara;         /* Timer Event parameter */
-        SK_U32          TmDelta;        /* delta time */
-        int                     TmActive;       /* flag: active/inactive */
-};
-
-/*
- * Timer control struct.
- * - use in Adapters context name pAC->Tim
- */
-typedef struct s_TimCtrl {
-        SK_TIMER        *StQueue;       /* Head of Timer queue */
-} SK_TIMCTRL;
-
-extern void SkTimerInit(SK_AC *pAC, SK_IOC Ioc, int Level);
-extern void SkTimerStop(SK_AC *pAC, SK_IOC Ioc, SK_TIMER *pTimer);
-extern void SkTimerStart(SK_AC *pAC, SK_IOC Ioc, SK_TIMER *pTimer,
-        SK_U32 Time, SK_U32 Class, SK_U32 Event, SK_EVPARA Para);
-extern void SkTimerDone(SK_AC *pAC, SK_IOC Ioc);
-#endif  /* _SKTIMER_H_ */
diff --git a/drivers/net/sk98lin/h/sktypes.h b/drivers/net/sk98lin/h/sktypes.h
deleted file mode 100644
index 40edc96e1055..000000000000
--- a/drivers/net/sk98lin/h/sktypes.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- *
- * Name:        sktypes.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.2 $
- * Date:        $Date: 2003/10/07 08:16:51 $
- * Purpose:     Define data types for Linux
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
- 
-/******************************************************************************
- *
- * Description:
- *
- * In this file, all data types that are needed by the common modules
- * are mapped to Linux data types.
- * 
- *
- * Include File Hierarchy:
- *
- *
- ******************************************************************************/
-
-#ifndef __INC_SKTYPES_H
-#define __INC_SKTYPES_H
-
-
-/* defines *******************************************************************/
-
-/*
- * Data types with a specific size. 'I' = signed, 'U' = unsigned.
- */
-#define SK_I8   s8
-#define SK_U8   u8
-#define SK_I16  s16
-#define SK_U16  u16
-#define SK_I32  s32
-#define SK_U32  u32
-#define SK_I64  s64
-#define SK_U64  u64
-
-#define SK_UPTR ulong           /* casting pointer <-> integral */
-
-/*
-* Boolean type.
-*/
-#define SK_BOOL         SK_U8
-#define SK_FALSE        0
-#define SK_TRUE         (!SK_FALSE)
-
-/* typedefs *******************************************************************/
-
-/* function prototypes ********************************************************/
-
-#endif  /* __INC_SKTYPES_H */
diff --git a/drivers/net/sk98lin/h/skversion.h b/drivers/net/sk98lin/h/skversion.h
deleted file mode 100644
index a1a7294828e5..000000000000
--- a/drivers/net/sk98lin/h/skversion.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- *
- * Name:        version.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.5 $
- * Date:        $Date: 2003/10/07 08:16:51 $
- * Purpose:     SK specific Error log support
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifdef  lint
-static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
-static const char SysKonnectBuildNumber[] =
-        "@(#)SK-BUILD: 6.23 PL: 01"; 
-#endif  /* !defined(lint) */
-
-#define BOOT_STRING     "sk98lin: Network Device Driver v6.23\n" \
-                        "(C)Copyright 1999-2004 Marvell(R)."
-
-#define VER_STRING      "6.23"
-#define DRIVER_FILE_NAME        "sk98lin"
-#define DRIVER_REL_DATE         "Feb-13-2004"
-
-
diff --git a/drivers/net/sk98lin/h/skvpd.h b/drivers/net/sk98lin/h/skvpd.h
deleted file mode 100644
index fdd9e48e8040..000000000000
--- a/drivers/net/sk98lin/h/skvpd.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/******************************************************************************
- *
- * Name:        skvpd.h
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.15 $
- * Date:        $Date: 2003/01/13 10:39:38 $
- * Purpose:     Defines and Macros for VPD handling
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2003 SysKonnect GmbH.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * skvpd.h      contains Diagnostic specific defines for VPD handling
- */
-
-#ifndef __INC_SKVPD_H_
-#define __INC_SKVPD_H_
-
-/*
- * Define Resource Type Identifiers and VPD keywords
- */
-#define RES_ID          0x82    /* Resource Type ID String (Product Name) */
-#define RES_VPD_R       0x90    /* start of VPD read only area */
-#define RES_VPD_W       0x91    /* start of VPD read/write area */
-#define RES_END         0x78    /* Resource Type End Tag */
-
-#ifndef VPD_NAME
-#define VPD_NAME        "Name"  /* Product Name, VPD name of RES_ID */
-#endif  /* VPD_NAME */
-#define VPD_PN          "PN"    /* Adapter Part Number */
-#define VPD_EC          "EC"    /* Adapter Engineering Level */
-#define VPD_MN          "MN"    /* Manufacture ID */
-#define VPD_SN          "SN"    /* Serial Number */
-#define VPD_CP          "CP"    /* Extended Capability */
-#define VPD_RV          "RV"    /* Checksum and Reserved */
-#define VPD_YA          "YA"    /* Asset Tag Identifier */
-#define VPD_VL          "VL"    /* First Error Log Message (SK specific) */
-#define VPD_VF          "VF"    /* Second Error Log Message (SK specific) */
-#define VPD_RW          "RW"    /* Remaining Read / Write Area */
-
-/* 'type' values for vpd_setup_para() */
-#define VPD_RO_KEY      1       /* RO keys are "PN", "EC", "MN", "SN", "RV" */
-#define VPD_RW_KEY      2       /* RW keys are "Yx", "Vx", and "RW" */
-
-/* 'op' values for vpd_setup_para() */
-#define ADD_KEY         1       /* add the key at the pos "RV" or "RW" */
-#define OWR_KEY         2       /* overwrite key if already exists */
-
-/*
- * Define READ and WRITE Constants.
- */
-
-#define VPD_DEV_ID_GENESIS      0x4300
-
-#define VPD_SIZE_YUKON          256
-#define VPD_SIZE_GENESIS        512
-#define VPD_SIZE                        512
-#define VPD_READ        0x0000
-#define VPD_WRITE       0x8000
-
-#define VPD_STOP(pAC,IoC)       VPD_OUT16(pAC,IoC,PCI_VPD_ADR_REG,VPD_WRITE)
-
-#define VPD_GET_RES_LEN(p)      ((unsigned int) \
-                                        (* (SK_U8 *)&(p)[1]) |\
-                                        ((* (SK_U8 *)&(p)[2]) << 8))
-#define VPD_GET_VPD_LEN(p)      ((unsigned int)(* (SK_U8 *)&(p)[2]))
-#define VPD_GET_VAL(p)          ((char *)&(p)[3])
-
-#define VPD_MAX_LEN     50
-
-/* VPD status */
-        /* bit 7..1 reserved */
-#define VPD_VALID       (1<<0)  /* VPD data buffer, vpd_free_ro, */
-                                                        /* and vpd_free_rw valid         */
-
-/*
- * VPD structs
- */
-typedef struct s_vpd_status {
-        unsigned short  Align01;                        /* Alignment */
-        unsigned short  vpd_status;                     /* VPD status, description see above */
-        int                             vpd_free_ro;            /* unused bytes in read only area */
-        int                             vpd_free_rw;            /* bytes available in read/write area */
-} SK_VPD_STATUS;
-
-typedef struct s_vpd {
-        SK_VPD_STATUS   v;                                      /* VPD status structure */
-        char                    vpd_buf[VPD_SIZE];      /* VPD buffer */
-        int                             rom_size;                       /* VPD ROM Size from PCI_OUR_REG_2 */
-        int                             vpd_size;                       /* saved VPD-size */
-} SK_VPD;
-
-typedef struct s_vpd_para {
-        unsigned int    p_len;  /* parameter length */
-        char                    *p_val; /* points to the value */
-} SK_VPD_PARA;
-
-/*
- * structure of Large Resource Type Identifiers
- */
-
-/* was removed because of alignment problems */
-
-/*
- * structure of VPD keywords
- */
-typedef struct s_vpd_key {
-        char                    p_key[2];       /* 2 bytes ID string */
-        unsigned char   p_len;          /* 1 byte length */
-        char                    p_val;          /* start of the value string */
-} SK_VPD_KEY;
-
-
-/*
- * System specific VPD macros
- */
-#ifndef SKDIAG
-#ifndef VPD_DO_IO
-#define VPD_OUT8(pAC,IoC,Addr,Val)      (void)SkPciWriteCfgByte(pAC,Addr,Val)
-#define VPD_OUT16(pAC,IoC,Addr,Val)     (void)SkPciWriteCfgWord(pAC,Addr,Val)
-#define VPD_IN8(pAC,IoC,Addr,pVal)      (void)SkPciReadCfgByte(pAC,Addr,pVal)
-#define VPD_IN16(pAC,IoC,Addr,pVal)     (void)SkPciReadCfgWord(pAC,Addr,pVal)
-#define VPD_IN32(pAC,IoC,Addr,pVal)     (void)SkPciReadCfgDWord(pAC,Addr,pVal)
-#else   /* VPD_DO_IO */
-#define VPD_OUT8(pAC,IoC,Addr,Val)      SK_OUT8(IoC,PCI_C(Addr),Val)
-#define VPD_OUT16(pAC,IoC,Addr,Val)     SK_OUT16(IoC,PCI_C(Addr),Val)
-#define VPD_IN8(pAC,IoC,Addr,pVal)      SK_IN8(IoC,PCI_C(Addr),pVal)
-#define VPD_IN16(pAC,IoC,Addr,pVal)     SK_IN16(IoC,PCI_C(Addr),pVal)
-#define VPD_IN32(pAC,IoC,Addr,pVal)     SK_IN32(IoC,PCI_C(Addr),pVal)
-#endif  /* VPD_DO_IO */
-#else   /* SKDIAG */
-#define VPD_OUT8(pAC,Ioc,Addr,Val) {                    \
-                if ((pAC)->DgT.DgUseCfgCycle)                   \
-                        SkPciWriteCfgByte(pAC,Addr,Val);        \
-                else                                                                    \
-                        SK_OUT8(pAC,PCI_C(Addr),Val);           \
-                }
-#define VPD_OUT16(pAC,Ioc,Addr,Val) {                   \
-                if ((pAC)->DgT.DgUseCfgCycle)                   \
-                        SkPciWriteCfgWord(pAC,Addr,Val);        \
-                else                                            \
-                        SK_OUT16(pAC,PCI_C(Addr),Val);          \
-                }
-#define VPD_IN8(pAC,Ioc,Addr,pVal) {                    \
-                if ((pAC)->DgT.DgUseCfgCycle)                   \
-                        SkPciReadCfgByte(pAC,Addr,pVal);        \
-                else                                            \
-                        SK_IN8(pAC,PCI_C(Addr),pVal);           \
-                }
-#define VPD_IN16(pAC,Ioc,Addr,pVal) {                   \
-                if ((pAC)->DgT.DgUseCfgCycle)                   \
-                        SkPciReadCfgWord(pAC,Addr,pVal);        \
-                else                                            \
-                        SK_IN16(pAC,PCI_C(Addr),pVal);          \
-                }
-#define VPD_IN32(pAC,Ioc,Addr,pVal) {                   \
-                if ((pAC)->DgT.DgUseCfgCycle)                   \
-                        SkPciReadCfgDWord(pAC,Addr,pVal);       \
-                else                                            \
-                        SK_IN32(pAC,PCI_C(Addr),pVal);          \
-                }
-#endif  /* nSKDIAG */
-
-/* function prototypes ********************************************************/
-
-#ifndef SK_KR_PROTO
-#ifdef SKDIAG
-extern SK_U32   VpdReadDWord(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        int                     addr);
-#endif  /* SKDIAG */
-
-extern SK_VPD_STATUS    *VpdStat(
-        SK_AC           *pAC,
-        SK_IOC          IoC);
-
-extern int      VpdKeys(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        char            *buf,
-        int                     *len,
-        int                     *elements);
-
-extern int      VpdRead(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        const char      *key,
-        char            *buf,
-        int                     *len);
-
-extern SK_BOOL  VpdMayWrite(
-        char            *key);
-
-extern int      VpdWrite(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        const char      *key,
-        const char      *buf);
-
-extern int      VpdDelete(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        char            *key);
-
-extern int      VpdUpdate(
-        SK_AC           *pAC,
-        SK_IOC          IoC);
-
-#ifdef  SKDIAG
-extern int      VpdReadBlock(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        char            *buf,
-        int                     addr,
-        int                     len);
-
-extern int      VpdWriteBlock(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        char            *buf,
-        int                     addr,
-        int                     len);
-#endif  /* SKDIAG */
-#else   /* SK_KR_PROTO */
-extern SK_U32   VpdReadDWord();
-extern SK_VPD_STATUS    *VpdStat();
-extern int      VpdKeys();
-extern int      VpdRead();
-extern SK_BOOL  VpdMayWrite();
-extern int      VpdWrite();
-extern int      VpdDelete();
-extern int      VpdUpdate();
-#endif  /* SK_KR_PROTO */
-
-#endif  /* __INC_SKVPD_H_ */
diff --git a/drivers/net/sk98lin/h/xmac_ii.h b/drivers/net/sk98lin/h/xmac_ii.h
deleted file mode 100644
index 7f8e6d0084c7..000000000000
--- a/drivers/net/sk98lin/h/xmac_ii.h
+++ /dev/null
@@ -1,1579 +0,0 @@
-/******************************************************************************
- *
- * Name:        xmac_ii.h
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.52 $
- * Date:        $Date: 2003/10/02 16:35:50 $
- * Purpose:     Defines and Macros for Gigabit Ethernet Controller
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#ifndef __INC_XMAC_H
-#define __INC_XMAC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-/* defines ********************************************************************/
-
-/*
- * XMAC II registers
- *
- * The XMAC registers are 16 or 32 bits wide.
- * The XMACs host processor interface is set to 16 bit mode,
- * therefore ALL registers will be addressed with 16 bit accesses.
- *
- * The following macros are provided to access the XMAC registers
- * XM_IN16(), XM_OUT16, XM_IN32(), XM_OUT32(), XM_INADR(), XM_OUTADR(),
- * XM_INHASH(), and XM_OUTHASH().
- * The macros are defined in SkGeHw.h.
- *
- * Note:        NA reg  = Network Address e.g DA, SA etc.
- *
- */
-#define XM_MMU_CMD              0x0000  /* 16 bit r/w   MMU Command Register */
-        /* 0x0004:              reserved */
-#define XM_POFF                 0x0008  /* 32 bit r/w   Packet Offset Register */
-#define XM_BURST                0x000c  /* 32 bit r/w   Burst Register for half duplex*/
-#define XM_1L_VLAN_TAG  0x0010  /* 16 bit r/w   One Level VLAN Tag ID */
-#define XM_2L_VLAN_TAG  0x0014  /* 16 bit r/w   Two Level VLAN Tag ID */
-        /* 0x0018 - 0x001e:     reserved */
-#define XM_TX_CMD               0x0020  /* 16 bit r/w   Transmit Command Register */
-#define XM_TX_RT_LIM    0x0024  /* 16 bit r/w   Transmit Retry Limit Register */
-#define XM_TX_STIME             0x0028  /* 16 bit r/w   Transmit Slottime Register */
-#define XM_TX_IPG               0x002c  /* 16 bit r/w   Transmit Inter Packet Gap */
-#define XM_RX_CMD               0x0030  /* 16 bit r/w   Receive Command Register */
-#define XM_PHY_ADDR             0x0034  /* 16 bit r/w   PHY Address Register */
-#define XM_PHY_DATA             0x0038  /* 16 bit r/w   PHY Data Register */
-        /* 0x003c:              reserved */
-#define XM_GP_PORT              0x0040  /* 32 bit r/w   General Purpose Port Register */
-#define XM_IMSK                 0x0044  /* 16 bit r/w   Interrupt Mask Register */
-#define XM_ISRC                 0x0048  /* 16 bit r/o   Interrupt Status Register */
-#define XM_HW_CFG               0x004c  /* 16 bit r/w   Hardware Config Register */
-        /* 0x0050 - 0x005e:     reserved */
-#define XM_TX_LO_WM             0x0060  /* 16 bit r/w   Tx FIFO Low Water Mark */
-#define XM_TX_HI_WM             0x0062  /* 16 bit r/w   Tx FIFO High Water Mark */
-#define XM_TX_THR               0x0064  /* 16 bit r/w   Tx Request Threshold */
-#define XM_HT_THR               0x0066  /* 16 bit r/w   Host Request Threshold */
-#define XM_PAUSE_DA             0x0068  /* NA reg r/w   Pause Destination Address */
-        /* 0x006e:              reserved */
-#define XM_CTL_PARA             0x0070  /* 32 bit r/w   Control Parameter Register */
-#define XM_MAC_OPCODE   0x0074  /* 16 bit r/w   Opcode for MAC control frames */
-#define XM_MAC_PTIME    0x0076  /* 16 bit r/w   Pause time for MAC ctrl frames*/
-#define XM_TX_STAT              0x0078  /* 32 bit r/o   Tx Status LIFO Register */
-
-        /* 0x0080 - 0x00fc:     16 NA reg r/w   Exact Match Address Registers */
-        /*                              use the XM_EXM() macro to address */
-#define XM_EXM_START    0x0080  /* r/w  Start Address of the EXM Regs */
-
-        /*
-         * XM_EXM(Reg)
-         *
-         * returns the XMAC address offset of specified Exact Match Addr Reg
-         *
-         * para:        Reg     EXM register to addr    (0 .. 15)
-         *
-         * usage:       XM_INADDR(IoC, MAC_1, XM_EXM(i), &val[i]);
-         */
-#define XM_EXM(Reg)     (XM_EXM_START + ((Reg) << 3))
-
-#define XM_SRC_CHK              0x0100  /* NA reg r/w   Source Check Address Register */
-#define XM_SA                   0x0108  /* NA reg r/w   Station Address Register */
-#define XM_HSM                  0x0110  /* 64 bit r/w   Hash Match Address Registers */
-#define XM_RX_LO_WM             0x0118  /* 16 bit r/w   Receive Low Water Mark */
-#define XM_RX_HI_WM             0x011a  /* 16 bit r/w   Receive High Water Mark */
-#define XM_RX_THR               0x011c  /* 32 bit r/w   Receive Request Threshold */
-#define XM_DEV_ID               0x0120  /* 32 bit r/o   Device ID Register */
-#define XM_MODE                 0x0124  /* 32 bit r/w   Mode Register */
-#define XM_LSA                  0x0128  /* NA reg r/o   Last Source Register */
-        /* 0x012e:              reserved */
-#define XM_TS_READ              0x0130  /* 32 bit r/o   Time Stamp Read Register */
-#define XM_TS_LOAD              0x0134  /* 32 bit r/o   Time Stamp Load Value */
-        /* 0x0138 - 0x01fe:     reserved */
-#define XM_STAT_CMD     0x0200  /* 16 bit r/w   Statistics Command Register */
-#define XM_RX_CNT_EV    0x0204  /* 32 bit r/o   Rx Counter Event Register */
-#define XM_TX_CNT_EV    0x0208  /* 32 bit r/o   Tx Counter Event Register */
-#define XM_RX_EV_MSK    0x020c  /* 32 bit r/w   Rx Counter Event Mask */
-#define XM_TX_EV_MSK    0x0210  /* 32 bit r/w   Tx Counter Event Mask */
-        /* 0x0204 - 0x027e:     reserved */
-#define XM_TXF_OK               0x0280  /* 32 bit r/o   Frames Transmitted OK Conuter */
-#define XM_TXO_OK_HI    0x0284  /* 32 bit r/o   Octets Transmitted OK High Cnt*/
-#define XM_TXO_OK_LO    0x0288  /* 32 bit r/o   Octets Transmitted OK Low Cnt */
-#define XM_TXF_BC_OK    0x028c  /* 32 bit r/o   Broadcast Frames Xmitted OK */
-#define XM_TXF_MC_OK    0x0290  /* 32 bit r/o   Multicast Frames Xmitted OK */
-#define XM_TXF_UC_OK    0x0294  /* 32 bit r/o   Unicast Frames Xmitted OK */
-#define XM_TXF_LONG             0x0298  /* 32 bit r/o   Tx Long Frame Counter */
-#define XM_TXE_BURST    0x029c  /* 32 bit r/o   Tx Burst Event Counter */
-#define XM_TXF_MPAUSE   0x02a0  /* 32 bit r/o   Tx Pause MAC Ctrl Frame Cnt */
-#define XM_TXF_MCTRL    0x02a4  /* 32 bit r/o   Tx MAC Ctrl Frame Counter */
-#define XM_TXF_SNG_COL  0x02a8  /* 32 bit r/o   Tx Single Collision Counter */
-#define XM_TXF_MUL_COL  0x02ac  /* 32 bit r/o   Tx Multiple Collision Counter */
-#define XM_TXF_ABO_COL  0x02b0  /* 32 bit r/o   Tx aborted due to Exces. Col. */
-#define XM_TXF_LAT_COL  0x02b4  /* 32 bit r/o   Tx Late Collision Counter */
-#define XM_TXF_DEF              0x02b8  /* 32 bit r/o   Tx Deferred Frame Counter */
-#define XM_TXF_EX_DEF   0x02bc  /* 32 bit r/o   Tx Excessive Deferall Counter */
-#define XM_TXE_FIFO_UR  0x02c0  /* 32 bit r/o   Tx FIFO Underrun Event Cnt */
-#define XM_TXE_CS_ERR   0x02c4  /* 32 bit r/o   Tx Carrier Sense Error Cnt */
-#define XM_TXP_UTIL             0x02c8  /* 32 bit r/o   Tx Utilization in % */
-        /* 0x02cc - 0x02ce:     reserved */
-#define XM_TXF_64B              0x02d0  /* 32 bit r/o   64 Byte Tx Frame Counter */
-#define XM_TXF_127B             0x02d4  /* 32 bit r/o   65-127 Byte Tx Frame Counter */
-#define XM_TXF_255B             0x02d8  /* 32 bit r/o   128-255 Byte Tx Frame Counter */
-#define XM_TXF_511B             0x02dc  /* 32 bit r/o   256-511 Byte Tx Frame Counter */
-#define XM_TXF_1023B    0x02e0  /* 32 bit r/o   512-1023 Byte Tx Frame Counter*/
-#define XM_TXF_MAX_SZ   0x02e4  /* 32 bit r/o   1024-MaxSize Byte Tx Frame Cnt*/
-        /* 0x02e8 - 0x02fe:     reserved */
-#define XM_RXF_OK               0x0300  /* 32 bit r/o   Frames Received OK */
-#define XM_RXO_OK_HI    0x0304  /* 32 bit r/o   Octets Received OK High Cnt */
-#define XM_RXO_OK_LO    0x0308  /* 32 bit r/o   Octets Received OK Low Counter*/
-#define XM_RXF_BC_OK    0x030c  /* 32 bit r/o   Broadcast Frames Received OK */
-#define XM_RXF_MC_OK    0x0310  /* 32 bit r/o   Multicast Frames Received OK */
-#define XM_RXF_UC_OK    0x0314  /* 32 bit r/o   Unicast Frames Received OK */
-#define XM_RXF_MPAUSE   0x0318  /* 32 bit r/o   Rx Pause MAC Ctrl Frame Cnt */
-#define XM_RXF_MCTRL    0x031c  /* 32 bit r/o   Rx MAC Ctrl Frame Counter */
-#define XM_RXF_INV_MP   0x0320  /* 32 bit r/o   Rx invalid Pause Frame Cnt */
-#define XM_RXF_INV_MOC  0x0324  /* 32 bit r/o   Rx Frames with inv. MAC Opcode*/
-#define XM_RXE_BURST    0x0328  /* 32 bit r/o   Rx Burst Event Counter */
-#define XM_RXE_FMISS    0x032c  /* 32 bit r/o   Rx Missed Frames Event Cnt */
-#define XM_RXF_FRA_ERR  0x0330  /* 32 bit r/o   Rx Framing Error Counter */
-#define XM_RXE_FIFO_OV  0x0334  /* 32 bit r/o   Rx FIFO overflow Event Cnt */
-#define XM_RXF_JAB_PKT  0x0338  /* 32 bit r/o   Rx Jabber Packet Frame Cnt */
-#define XM_RXE_CAR_ERR  0x033c  /* 32 bit r/o   Rx Carrier Event Error Cnt */
-#define XM_RXF_LEN_ERR  0x0340  /* 32 bit r/o   Rx in Range Length Error */
-#define XM_RXE_SYM_ERR  0x0344  /* 32 bit r/o   Rx Symbol Error Counter */
-#define XM_RXE_SHT_ERR  0x0348  /* 32 bit r/o   Rx Short Event Error Cnt */
-#define XM_RXE_RUNT             0x034c  /* 32 bit r/o   Rx Runt Event Counter */
-#define XM_RXF_LNG_ERR  0x0350  /* 32 bit r/o   Rx Frame too Long Error Cnt */
-#define XM_RXF_FCS_ERR  0x0354  /* 32 bit r/o   Rx Frame Check Seq. Error Cnt */
-        /* 0x0358 - 0x035a:     reserved */
-#define XM_RXF_CEX_ERR  0x035c  /* 32 bit r/o   Rx Carrier Ext Error Frame Cnt*/
-#define XM_RXP_UTIL             0x0360  /* 32 bit r/o   Rx Utilization in % */
-        /* 0x0364 - 0x0366:     reserved */
-#define XM_RXF_64B              0x0368  /* 32 bit r/o   64 Byte Rx Frame Counter */
-#define XM_RXF_127B             0x036c  /* 32 bit r/o   65-127 Byte Rx Frame Counter */
-#define XM_RXF_255B             0x0370  /* 32 bit r/o   128-255 Byte Rx Frame Counter */
-#define XM_RXF_511B             0x0374  /* 32 bit r/o   256-511 Byte Rx Frame Counter */
-#define XM_RXF_1023B    0x0378  /* 32 bit r/o   512-1023 Byte Rx Frame Counter*/
-#define XM_RXF_MAX_SZ   0x037c  /* 32 bit r/o   1024-MaxSize Byte Rx Frame Cnt*/
-        /* 0x02e8 - 0x02fe:     reserved */
-
-
-/*----------------------------------------------------------------------------*/
-/*
- * XMAC Bit Definitions
- *
- * If the bit access behaviour differs from the register access behaviour
- * (r/w, r/o) this is documented after the bit number.
- * The following bit access behaviours are used:
- *      (sc)    self clearing
- *      (ro)    read only
- */
-
-/*      XM_MMU_CMD      16 bit r/w      MMU Command Register */
-                                                                /* Bit 15..13:  reserved */
-#define XM_MMU_PHY_RDY  (1<<12) /* Bit 12:      PHY Read Ready */
-#define XM_MMU_PHY_BUSY (1<<11) /* Bit 11:      PHY Busy */
-#define XM_MMU_IGN_PF   (1<<10) /* Bit 10:      Ignore Pause Frame */
-#define XM_MMU_MAC_LB   (1<<9)  /* Bit  9:      Enable MAC Loopback */
-                                                                /* Bit  8:      reserved */
-#define XM_MMU_FRC_COL  (1<<7)  /* Bit  7:      Force Collision */
-#define XM_MMU_SIM_COL  (1<<6)  /* Bit  6:      Simulate Collision */
-#define XM_MMU_NO_PRE   (1<<5)  /* Bit  5:      No MDIO Preamble */
-#define XM_MMU_GMII_FD  (1<<4)  /* Bit  4:      GMII uses Full Duplex */
-#define XM_MMU_RAT_CTRL (1<<3)  /* Bit  3:      Enable Rate Control */
-#define XM_MMU_GMII_LOOP (1<<2) /* Bit  2:      PHY is in Loopback Mode */
-#define XM_MMU_ENA_RX   (1<<1)  /* Bit  1:      Enable Receiver */
-#define XM_MMU_ENA_TX   (1<<0)  /* Bit  0:      Enable Transmitter */
-
-
-/*      XM_TX_CMD       16 bit r/w      Transmit Command Register */
-                                                                /* Bit 15..7:   reserved */
-#define XM_TX_BK2BK             (1<<6)  /* Bit  6:      Ignor Carrier Sense (Tx Bk2Bk)*/
-#define XM_TX_ENC_BYP   (1<<5)  /* Bit  5:      Set Encoder in Bypass Mode */
-#define XM_TX_SAM_LINE  (1<<4)  /* Bit  4: (sc) Start utilization calculation */
-#define XM_TX_NO_GIG_MD (1<<3)  /* Bit  3:      Disable Carrier Extension */
-#define XM_TX_NO_PRE    (1<<2)  /* Bit  2:      Disable Preamble Generation */
-#define XM_TX_NO_CRC    (1<<1)  /* Bit  1:      Disable CRC Generation */
-#define XM_TX_AUTO_PAD  (1<<0)  /* Bit  0:      Enable Automatic Padding */
-
-
-/*      XM_TX_RT_LIM    16 bit r/w      Transmit Retry Limit Register */
-                                                                /* Bit 15..5:   reserved */
-#define XM_RT_LIM_MSK   0x1f    /* Bit  4..0:   Tx Retry Limit */
-
-
-/*      XM_TX_STIME     16 bit r/w      Transmit Slottime Register */
-                                                                /* Bit 15..7:   reserved */
-#define XM_STIME_MSK    0x7f    /* Bit  6..0:   Tx Slottime bits */
-
-
-/*      XM_TX_IPG       16 bit r/w      Transmit Inter Packet Gap */
-                                                                /* Bit 15..8:   reserved */
-#define XM_IPG_MSK              0xff    /* Bit  7..0:   IPG value bits */
-
-
-/*      XM_RX_CMD       16 bit r/w      Receive Command Register */
-                                                                /* Bit 15..9:   reserved */
-#define XM_RX_LENERR_OK (1<<8)  /* Bit  8       don't set Rx Err bit for */
-                                                                /*              inrange error packets */
-#define XM_RX_BIG_PK_OK (1<<7)  /* Bit  7       don't set Rx Err bit for */
-                                                                /*              jumbo packets */
-#define XM_RX_IPG_CAP   (1<<6)  /* Bit  6       repl. type field with IPG */
-#define XM_RX_TP_MD             (1<<5)  /* Bit  5:      Enable transparent Mode */
-#define XM_RX_STRIP_FCS (1<<4)  /* Bit  4:      Enable FCS Stripping */
-#define XM_RX_SELF_RX   (1<<3)  /* Bit  3:      Enable Rx of own packets */
-#define XM_RX_SAM_LINE  (1<<2)  /* Bit  2: (sc) Start utilization calculation */
-#define XM_RX_STRIP_PAD (1<<1)  /* Bit  1:      Strip pad bytes of Rx frames */
-#define XM_RX_DIS_CEXT  (1<<0)  /* Bit  0:      Disable carrier ext. check */
-
-
-/*      XM_PHY_ADDR     16 bit r/w      PHY Address Register */
-                                                                /* Bit 15..5:   reserved */
-#define XM_PHY_ADDR_SZ  0x1f    /* Bit  4..0:   PHY Address bits */
-
-
-/*      XM_GP_PORT      32 bit r/w      General Purpose Port Register */
-                                                                /* Bit 31..7:   reserved */
-#define XM_GP_ANIP              (1L<<6) /* Bit  6: (ro) Auto-Neg. in progress */
-#define XM_GP_FRC_INT   (1L<<5) /* Bit  5: (sc) Force Interrupt */
-                                                                /* Bit  4:      reserved */
-#define XM_GP_RES_MAC   (1L<<3) /* Bit  3: (sc) Reset MAC and FIFOs */
-#define XM_GP_RES_STAT  (1L<<2) /* Bit  2: (sc) Reset the statistics module */
-                                                                /* Bit  1:      reserved */
-#define XM_GP_INP_ASS   (1L<<0) /* Bit  0: (ro) GP Input Pin asserted */
-
-
-/*      XM_IMSK         16 bit r/w      Interrupt Mask Register */
-/*      XM_ISRC         16 bit r/o      Interrupt Status Register */
-                                                                /* Bit 15:      reserved */
-#define XM_IS_LNK_AE    (1<<14) /* Bit 14:      Link Asynchronous Event */
-#define XM_IS_TX_ABORT  (1<<13) /* Bit 13:      Transmit Abort, late Col. etc */
-#define XM_IS_FRC_INT   (1<<12) /* Bit 12:      Force INT bit set in GP */
-#define XM_IS_INP_ASS   (1<<11) /* Bit 11:      Input Asserted, GP bit 0 set */
-#define XM_IS_LIPA_RC   (1<<10) /* Bit 10:      Link Partner requests config */
-#define XM_IS_RX_PAGE   (1<<9)  /* Bit  9:      Page Received */
-#define XM_IS_TX_PAGE   (1<<8)  /* Bit  8:      Next Page Loaded for Transmit */
-#define XM_IS_AND               (1<<7)  /* Bit  7:      Auto-Negotiation Done */
-#define XM_IS_TSC_OV    (1<<6)  /* Bit  6:      Time Stamp Counter Overflow */
-#define XM_IS_RXC_OV    (1<<5)  /* Bit  5:      Rx Counter Event Overflow */
-#define XM_IS_TXC_OV    (1<<4)  /* Bit  4:      Tx Counter Event Overflow */
-#define XM_IS_RXF_OV    (1<<3)  /* Bit  3:      Receive FIFO Overflow */
-#define XM_IS_TXF_UR    (1<<2)  /* Bit  2:      Transmit FIFO Underrun */
-#define XM_IS_TX_COMP   (1<<1)  /* Bit  1:      Frame Tx Complete */
-#define XM_IS_RX_COMP   (1<<0)  /* Bit  0:      Frame Rx Complete */
-
-#define XM_DEF_MSK      (~(XM_IS_INP_ASS | XM_IS_LIPA_RC | XM_IS_RX_PAGE |\
-                        XM_IS_AND | XM_IS_RXC_OV | XM_IS_TXC_OV | XM_IS_TXF_UR))
-
-
-/*      XM_HW_CFG       16 bit r/w      Hardware Config Register */
-                                                                /* Bit 15.. 4:  reserved */
-#define XM_HW_GEN_EOP   (1<<3)  /* Bit  3:      generate End of Packet pulse */
-#define XM_HW_COM4SIG   (1<<2)  /* Bit  2:      use Comma Detect for Sig. Det.*/
-                                                                /* Bit  1:      reserved */
-#define XM_HW_GMII_MD   (1<<0)  /* Bit  0:      GMII Interface selected */
-
-
-/*      XM_TX_LO_WM     16 bit r/w      Tx FIFO Low Water Mark */
-/*      XM_TX_HI_WM     16 bit r/w      Tx FIFO High Water Mark */
-                                                                /* Bit 15..10   reserved */
-#define XM_TX_WM_MSK    0x01ff  /* Bit  9.. 0   Tx FIFO Watermark bits */
-
-/*      XM_TX_THR       16 bit r/w      Tx Request Threshold */
-/*      XM_HT_THR       16 bit r/w      Host Request Threshold */
-/*      XM_RX_THR       16 bit r/w      Rx Request Threshold */
-                                                                /* Bit 15..11   reserved */
-#define XM_THR_MSK              0x03ff  /* Bit 10.. 0   Rx/Tx Request Threshold bits */
-
-
-/*      XM_TX_STAT      32 bit r/o      Tx Status LIFO Register */
-#define XM_ST_VALID             (1UL<<31)       /* Bit 31:      Status Valid */
-#define XM_ST_BYTE_CNT  (0x3fffL<<17)   /* Bit 30..17:  Tx frame Length */
-#define XM_ST_RETRY_CNT (0x1fL<<12)     /* Bit 16..12:  Retry Count */
-#define XM_ST_EX_COL    (1L<<11)        /* Bit 11:      Excessive Collisions */
-#define XM_ST_EX_DEF    (1L<<10)        /* Bit 10:      Excessive Deferral */
-#define XM_ST_BURST             (1L<<9)         /* Bit  9:      p. xmitted in burst md*/
-#define XM_ST_DEFER             (1L<<8)         /* Bit  8:      packet was defered */
-#define XM_ST_BC                (1L<<7)         /* Bit  7:      Broadcast packet */
-#define XM_ST_MC                (1L<<6)         /* Bit  6:      Multicast packet */
-#define XM_ST_UC                (1L<<5)         /* Bit  5:      Unicast packet */
-#define XM_ST_TX_UR             (1L<<4)         /* Bit  4:      FIFO Underrun occured */
-#define XM_ST_CS_ERR    (1L<<3)         /* Bit  3:      Carrier Sense Error */
-#define XM_ST_LAT_COL   (1L<<2)         /* Bit  2:      Late Collision Error */
-#define XM_ST_MUL_COL   (1L<<1)         /* Bit  1:      Multiple Collisions */
-#define XM_ST_SGN_COL   (1L<<0)         /* Bit  0:      Single Collision */
-
-/*      XM_RX_LO_WM     16 bit r/w      Receive Low Water Mark */
-/*      XM_RX_HI_WM     16 bit r/w      Receive High Water Mark */
-                                                                        /* Bit 15..11:  reserved */
-#define XM_RX_WM_MSK    0x03ff          /* Bit 11.. 0:  Rx FIFO Watermark bits */
-
-
-/*      XM_DEV_ID       32 bit r/o      Device ID Register */
-#define XM_DEV_OUI      (0x00ffffffUL<<8)       /* Bit 31..8:   Device OUI */
-#define XM_DEV_REV      (0x07L << 5)            /* Bit  7..5:   Chip Rev Num */
-
-
-/*      XM_MODE         32 bit r/w      Mode Register */
-                                                                        /* Bit 31..27:  reserved */
-#define XM_MD_ENA_REJ   (1L<<26)        /* Bit 26:      Enable Frame Reject */
-#define XM_MD_SPOE_E    (1L<<25)        /* Bit 25:      Send Pause on Edge */
-                                                                        /*              extern generated */
-#define XM_MD_TX_REP    (1L<<24)        /* Bit 24:      Transmit Repeater Mode */
-#define XM_MD_SPOFF_I   (1L<<23)        /* Bit 23:      Send Pause on FIFO full */
-                                                                        /*              intern generated */
-#define XM_MD_LE_STW    (1L<<22)        /* Bit 22:      Rx Stat Word in Little Endian */
-#define XM_MD_TX_CONT   (1L<<21)        /* Bit 21:      Send Continuous */
-#define XM_MD_TX_PAUSE  (1L<<20)        /* Bit 20: (sc) Send Pause Frame */
-#define XM_MD_ATS               (1L<<19)        /* Bit 19:      Append Time Stamp */
-#define XM_MD_SPOL_I    (1L<<18)        /* Bit 18:      Send Pause on Low */
-                                                                        /*              intern generated */
-#define XM_MD_SPOH_I    (1L<<17)        /* Bit 17:      Send Pause on High */
-                                                                        /*              intern generated */
-#define XM_MD_CAP               (1L<<16)        /* Bit 16:      Check Address Pair */
-#define XM_MD_ENA_HASH  (1L<<15)        /* Bit 15:      Enable Hashing */
-#define XM_MD_CSA               (1L<<14)        /* Bit 14:      Check Station Address */
-#define XM_MD_CAA               (1L<<13)        /* Bit 13:      Check Address Array */
-#define XM_MD_RX_MCTRL  (1L<<12)        /* Bit 12:      Rx MAC Control Frame */
-#define XM_MD_RX_RUNT   (1L<<11)        /* Bit 11:      Rx Runt Frames */
-#define XM_MD_RX_IRLE   (1L<<10)        /* Bit 10:      Rx in Range Len Err Frame */
-#define XM_MD_RX_LONG   (1L<<9)         /* Bit  9:      Rx Long Frame */
-#define XM_MD_RX_CRCE   (1L<<8)         /* Bit  8:      Rx CRC Error Frame */
-#define XM_MD_RX_ERR    (1L<<7)         /* Bit  7:      Rx Error Frame */
-#define XM_MD_DIS_UC    (1L<<6)         /* Bit  6:      Disable Rx Unicast */
-#define XM_MD_DIS_MC    (1L<<5)         /* Bit  5:      Disable Rx Multicast */
-#define XM_MD_DIS_BC    (1L<<4)         /* Bit  4:      Disable Rx Broadcast */
-#define XM_MD_ENA_PROM  (1L<<3)         /* Bit  3:      Enable Promiscuous */
-#define XM_MD_ENA_BE    (1L<<2)         /* Bit  2:      Enable Big Endian */
-#define XM_MD_FTF               (1L<<1)         /* Bit  1: (sc) Flush Tx FIFO */
-#define XM_MD_FRF               (1L<<0)         /* Bit  0: (sc) Flush Rx FIFO */
-
-#define XM_PAUSE_MODE   (XM_MD_SPOE_E | XM_MD_SPOL_I | XM_MD_SPOH_I)
-#define XM_DEF_MODE             (XM_MD_RX_RUNT | XM_MD_RX_IRLE | XM_MD_RX_LONG |\
-                                XM_MD_RX_CRCE | XM_MD_RX_ERR | XM_MD_CSA | XM_MD_CAA)
-
-/*      XM_STAT_CMD     16 bit r/w      Statistics Command Register */
-                                                                /* Bit 16..6:   reserved */
-#define XM_SC_SNP_RXC   (1<<5)  /* Bit  5: (sc) Snap Rx Counters */
-#define XM_SC_SNP_TXC   (1<<4)  /* Bit  4: (sc) Snap Tx Counters */
-#define XM_SC_CP_RXC    (1<<3)  /* Bit  3:      Copy Rx Counters Continuously */
-#define XM_SC_CP_TXC    (1<<2)  /* Bit  2:      Copy Tx Counters Continuously */
-#define XM_SC_CLR_RXC   (1<<1)  /* Bit  1: (sc) Clear Rx Counters */
-#define XM_SC_CLR_TXC   (1<<0)  /* Bit  0: (sc) Clear Tx Counters */
-
-
-/*      XM_RX_CNT_EV    32 bit r/o      Rx Counter Event Register */
-/*      XM_RX_EV_MSK    32 bit r/w      Rx Counter Event Mask */
-#define XMR_MAX_SZ_OV   (1UL<<31)       /* Bit 31:      1024-MaxSize Rx Cnt Ov*/
-#define XMR_1023B_OV    (1L<<30)        /* Bit 30:      512-1023Byte Rx Cnt Ov*/
-#define XMR_511B_OV             (1L<<29)        /* Bit 29:      256-511 Byte Rx Cnt Ov*/
-#define XMR_255B_OV             (1L<<28)        /* Bit 28:      128-255 Byte Rx Cnt Ov*/
-#define XMR_127B_OV             (1L<<27)        /* Bit 27:      65-127 Byte Rx Cnt Ov */
-#define XMR_64B_OV              (1L<<26)        /* Bit 26:      64 Byte Rx Cnt Ov */
-#define XMR_UTIL_OV             (1L<<25)        /* Bit 25:      Rx Util Cnt Overflow */
-#define XMR_UTIL_UR             (1L<<24)        /* Bit 24:      Rx Util Cnt Underrun */
-#define XMR_CEX_ERR_OV  (1L<<23)        /* Bit 23:      CEXT Err Cnt Ov */
-                                                                        /* Bit 22:      reserved */
-#define XMR_FCS_ERR_OV  (1L<<21)        /* Bit 21:      Rx FCS Error Cnt Ov */
-#define XMR_LNG_ERR_OV  (1L<<20)        /* Bit 20:      Rx too Long Err Cnt Ov*/
-#define XMR_RUNT_OV             (1L<<19)        /* Bit 19:      Runt Event Cnt Ov */
-#define XMR_SHT_ERR_OV  (1L<<18)        /* Bit 18:      Rx Short Ev Err Cnt Ov*/
-#define XMR_SYM_ERR_OV  (1L<<17)        /* Bit 17:      Rx Sym Err Cnt Ov */
-                                                                        /* Bit 16:      reserved */
-#define XMR_CAR_ERR_OV  (1L<<15)        /* Bit 15:      Rx Carr Ev Err Cnt Ov */
-#define XMR_JAB_PKT_OV  (1L<<14)        /* Bit 14:      Rx Jabb Packet Cnt Ov */
-#define XMR_FIFO_OV             (1L<<13)        /* Bit 13:      Rx FIFO Ov Ev Cnt Ov */
-#define XMR_FRA_ERR_OV  (1L<<12)        /* Bit 12:      Rx Framing Err Cnt Ov */
-#define XMR_FMISS_OV    (1L<<11)        /* Bit 11:      Rx Missed Ev Cnt Ov */
-#define XMR_BURST               (1L<<10)        /* Bit 10:      Rx Burst Event Cnt Ov */
-#define XMR_INV_MOC             (1L<<9)         /* Bit  9:      Rx with inv. MAC OC Ov*/
-#define XMR_INV_MP              (1L<<8)         /* Bit  8:      Rx inv Pause Frame Ov */
-#define XMR_MCTRL_OV    (1L<<7)         /* Bit  7:      Rx MAC Ctrl-F Cnt Ov */
-#define XMR_MPAUSE_OV   (1L<<6)         /* Bit  6:      Rx Pause MAC Ctrl-F Ov*/
-#define XMR_UC_OK_OV    (1L<<5)         /* Bit  5:      Rx Unicast Frame CntOv*/
-#define XMR_MC_OK_OV    (1L<<4)         /* Bit  4:      Rx Multicast Cnt Ov */
-#define XMR_BC_OK_OV    (1L<<3)         /* Bit  3:      Rx Broadcast Cnt Ov */
-#define XMR_OK_LO_OV    (1L<<2)         /* Bit  2:      Octets Rx OK Low CntOv*/
-#define XMR_OK_HI_OV    (1L<<1)         /* Bit  1:      Octets Rx OK Hi Cnt Ov*/
-#define XMR_OK_OV               (1L<<0)         /* Bit  0:      Frames Received Ok Ov */
-
-#define XMR_DEF_MSK             (XMR_OK_LO_OV | XMR_OK_HI_OV)
-
-/*      XM_TX_CNT_EV    32 bit r/o      Tx Counter Event Register */
-/*      XM_TX_EV_MSK    32 bit r/w      Tx Counter Event Mask */
-                                                                        /* Bit 31..26:  reserved */
-#define XMT_MAX_SZ_OV   (1L<<25)        /* Bit 25:      1024-MaxSize Tx Cnt Ov*/
-#define XMT_1023B_OV    (1L<<24)        /* Bit 24:      512-1023Byte Tx Cnt Ov*/
-#define XMT_511B_OV             (1L<<23)        /* Bit 23:      256-511 Byte Tx Cnt Ov*/
-#define XMT_255B_OV             (1L<<22)        /* Bit 22:      128-255 Byte Tx Cnt Ov*/
-#define XMT_127B_OV             (1L<<21)        /* Bit 21:      65-127 Byte Tx Cnt Ov */
-#define XMT_64B_OV              (1L<<20)        /* Bit 20:      64 Byte Tx Cnt Ov */
-#define XMT_UTIL_OV             (1L<<19)        /* Bit 19:      Tx Util Cnt Overflow */
-#define XMT_UTIL_UR             (1L<<18)        /* Bit 18:      Tx Util Cnt Underrun */
-#define XMT_CS_ERR_OV   (1L<<17)        /* Bit 17:      Tx Carr Sen Err Cnt Ov*/
-#define XMT_FIFO_UR_OV  (1L<<16)        /* Bit 16:      Tx FIFO Ur Ev Cnt Ov */
-#define XMT_EX_DEF_OV   (1L<<15)        /* Bit 15:      Tx Ex Deferall Cnt Ov */
-#define XMT_DEF                 (1L<<14)        /* Bit 14:      Tx Deferred Cnt Ov */
-#define XMT_LAT_COL_OV  (1L<<13)        /* Bit 13:      Tx Late Col Cnt Ov */
-#define XMT_ABO_COL_OV  (1L<<12)        /* Bit 12:      Tx abo dueto Ex Col Ov*/
-#define XMT_MUL_COL_OV  (1L<<11)        /* Bit 11:      Tx Mult Col Cnt Ov */
-#define XMT_SNG_COL             (1L<<10)        /* Bit 10:      Tx Single Col Cnt Ov */
-#define XMT_MCTRL_OV    (1L<<9)         /* Bit  9:      Tx MAC Ctrl Counter Ov*/
-#define XMT_MPAUSE              (1L<<8)         /* Bit  8:      Tx Pause MAC Ctrl-F Ov*/
-#define XMT_BURST               (1L<<7)         /* Bit  7:      Tx Burst Event Cnt Ov */
-#define XMT_LONG                (1L<<6)         /* Bit  6:      Tx Long Frame Cnt Ov */
-#define XMT_UC_OK_OV    (1L<<5)         /* Bit  5:      Tx Unicast Cnt Ov */
-#define XMT_MC_OK_OV    (1L<<4)         /* Bit  4:      Tx Multicast Cnt Ov */
-#define XMT_BC_OK_OV    (1L<<3)         /* Bit  3:      Tx Broadcast Cnt Ov */
-#define XMT_OK_LO_OV    (1L<<2)         /* Bit  2:      Octets Tx OK Low CntOv*/
-#define XMT_OK_HI_OV    (1L<<1)         /* Bit  1:      Octets Tx OK Hi Cnt Ov*/
-#define XMT_OK_OV               (1L<<0)         /* Bit  0:      Frames Tx Ok Ov */
-
-#define XMT_DEF_MSK             (XMT_OK_LO_OV | XMT_OK_HI_OV)
-
-/*
- * Receive Frame Status Encoding
- */
-#define XMR_FS_LEN      (0x3fffUL<<18)  /* Bit 31..18:  Rx Frame Length */
-#define XMR_FS_2L_VLAN  (1L<<17)        /* Bit 17:      tagged wh 2Lev VLAN ID*/
-#define XMR_FS_1L_VLAN  (1L<<16)        /* Bit 16:      tagged wh 1Lev VLAN ID*/
-#define XMR_FS_BC               (1L<<15)        /* Bit 15:      Broadcast Frame */
-#define XMR_FS_MC               (1L<<14)        /* Bit 14:      Multicast Frame */
-#define XMR_FS_UC               (1L<<13)        /* Bit 13:      Unicast Frame */
-                                                                        /* Bit 12:      reserved */
-#define XMR_FS_BURST    (1L<<11)        /* Bit 11:      Burst Mode */
-#define XMR_FS_CEX_ERR  (1L<<10)        /* Bit 10:      Carrier Ext. Error */
-#define XMR_FS_802_3    (1L<<9)         /* Bit  9:      802.3 Frame */
-#define XMR_FS_COL_ERR  (1L<<8)         /* Bit  8:      Collision Error */
-#define XMR_FS_CAR_ERR  (1L<<7)         /* Bit  7:      Carrier Event Error */
-#define XMR_FS_LEN_ERR  (1L<<6)         /* Bit  6:      In-Range Length Error */
-#define XMR_FS_FRA_ERR  (1L<<5)         /* Bit  5:      Framing Error */
-#define XMR_FS_RUNT             (1L<<4)         /* Bit  4:      Runt Frame */
-#define XMR_FS_LNG_ERR  (1L<<3)         /* Bit  3:      Giant (Jumbo) Frame */
-#define XMR_FS_FCS_ERR  (1L<<2)         /* Bit  2:      Frame Check Sequ Err */
-#define XMR_FS_ERR              (1L<<1)         /* Bit  1:      Frame Error */
-#define XMR_FS_MCTRL    (1L<<0)         /* Bit  0:      MAC Control Packet */
-
-/*
- * XMR_FS_ERR will be set if
- *      XMR_FS_FCS_ERR, XMR_FS_LNG_ERR, XMR_FS_RUNT,
- *      XMR_FS_FRA_ERR, XMR_FS_LEN_ERR, or XMR_FS_CEX_ERR
- * is set. XMR_FS_LNG_ERR and XMR_FS_LEN_ERR will issue
- * XMR_FS_ERR unless the corresponding bit in the Receive Command
- * Register is set.
- */
-#define XMR_FS_ANY_ERR  XMR_FS_ERR
-
-/*----------------------------------------------------------------------------*/
-/*
- * XMAC-PHY Registers, indirect addressed over the XMAC
- */
-#define PHY_XMAC_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
-#define PHY_XMAC_STAT           0x01    /* 16 bit r/w   PHY Status Register */
-#define PHY_XMAC_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
-#define PHY_XMAC_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
-#define PHY_XMAC_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
-#define PHY_XMAC_AUNE_LP        0x05    /* 16 bit r/o   Link Partner Abi Reg */
-#define PHY_XMAC_AUNE_EXP       0x06    /* 16 bit r/o   Auto-Neg. Expansion Reg */
-#define PHY_XMAC_NEPG           0x07    /* 16 bit r/w   Next Page Register */
-#define PHY_XMAC_NEPG_LP        0x08    /* 16 bit r/o   Next Page Link Partner */
-        /* 0x09 - 0x0e:         reserved */
-#define PHY_XMAC_EXT_STAT       0x0f    /* 16 bit r/o   Ext Status Register */
-#define PHY_XMAC_RES_ABI        0x10    /* 16 bit r/o   PHY Resolved Ability */
-
-/*----------------------------------------------------------------------------*/
-/*
- * Broadcom-PHY Registers, indirect addressed over XMAC
- */
-#define PHY_BCOM_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
-#define PHY_BCOM_STAT           0x01    /* 16 bit r/o   PHY Status Register */
-#define PHY_BCOM_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
-#define PHY_BCOM_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
-#define PHY_BCOM_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
-#define PHY_BCOM_AUNE_LP        0x05    /* 16 bit r/o   Link Part Ability Reg */
-#define PHY_BCOM_AUNE_EXP       0x06    /* 16 bit r/o   Auto-Neg. Expansion Reg */
-#define PHY_BCOM_NEPG           0x07    /* 16 bit r/w   Next Page Register */
-#define PHY_BCOM_NEPG_LP        0x08    /* 16 bit r/o   Next Page Link Partner */
-        /* Broadcom-specific registers */
-#define PHY_BCOM_1000T_CTRL     0x09    /* 16 bit r/w   1000Base-T Ctrl Reg */
-#define PHY_BCOM_1000T_STAT     0x0a    /* 16 bit r/o   1000Base-T Status Reg */
-        /* 0x0b - 0x0e:         reserved */
-#define PHY_BCOM_EXT_STAT       0x0f    /* 16 bit r/o   Extended Status Reg */
-#define PHY_BCOM_P_EXT_CTRL     0x10    /* 16 bit r/w   PHY Extended Ctrl Reg */
-#define PHY_BCOM_P_EXT_STAT     0x11    /* 16 bit r/o   PHY Extended Stat Reg */
-#define PHY_BCOM_RE_CTR         0x12    /* 16 bit r/w   Receive Error Counter */
-#define PHY_BCOM_FC_CTR         0x13    /* 16 bit r/w   False Carrier Sense Cnt */
-#define PHY_BCOM_RNO_CTR        0x14    /* 16 bit r/w   Receiver NOT_OK Cnt */
-        /* 0x15 - 0x17:         reserved */
-#define PHY_BCOM_AUX_CTRL       0x18    /* 16 bit r/w   Auxiliary Control Reg */
-#define PHY_BCOM_AUX_STAT       0x19    /* 16 bit r/o   Auxiliary Stat Summary */
-#define PHY_BCOM_INT_STAT       0x1a    /* 16 bit r/o   Interrupt Status Reg */
-#define PHY_BCOM_INT_MASK       0x1b    /* 16 bit r/w   Interrupt Mask Reg */
-        /* 0x1c:                reserved */
-        /* 0x1d - 0x1f:         test registers */
-
-/*----------------------------------------------------------------------------*/
-/*
- * Marvel-PHY Registers, indirect addressed over GMAC
- */
-#define PHY_MARV_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
-#define PHY_MARV_STAT           0x01    /* 16 bit r/o   PHY Status Register */
-#define PHY_MARV_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
-#define PHY_MARV_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
-#define PHY_MARV_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
-#define PHY_MARV_AUNE_LP        0x05    /* 16 bit r/o   Link Part Ability Reg */
-#define PHY_MARV_AUNE_EXP       0x06    /* 16 bit r/o   Auto-Neg. Expansion Reg */
-#define PHY_MARV_NEPG           0x07    /* 16 bit r/w   Next Page Register */
-#define PHY_MARV_NEPG_LP        0x08    /* 16 bit r/o   Next Page Link Partner */
-        /* Marvel-specific registers */
-#define PHY_MARV_1000T_CTRL     0x09    /* 16 bit r/w   1000Base-T Ctrl Reg */
-#define PHY_MARV_1000T_STAT     0x0a    /* 16 bit r/o   1000Base-T Status Reg */
-        /* 0x0b - 0x0e:         reserved */
-#define PHY_MARV_EXT_STAT       0x0f    /* 16 bit r/o   Extended Status Reg */
-#define PHY_MARV_PHY_CTRL       0x10    /* 16 bit r/w   PHY Specific Ctrl Reg */
-#define PHY_MARV_PHY_STAT       0x11    /* 16 bit r/o   PHY Specific Stat Reg */
-#define PHY_MARV_INT_MASK       0x12    /* 16 bit r/w   Interrupt Mask Reg */
-#define PHY_MARV_INT_STAT       0x13    /* 16 bit r/o   Interrupt Status Reg */
-#define PHY_MARV_EXT_CTRL       0x14    /* 16 bit r/w   Ext. PHY Specific Ctrl */
-#define PHY_MARV_RXE_CNT        0x15    /* 16 bit r/w   Receive Error Counter */
-#define PHY_MARV_EXT_ADR        0x16    /* 16 bit r/w   Ext. Ad. for Cable Diag. */
-        /* 0x17:                reserved */
-#define PHY_MARV_LED_CTRL       0x18    /* 16 bit r/w   LED Control Reg */
-#define PHY_MARV_LED_OVER       0x19    /* 16 bit r/w   Manual LED Override Reg */
-#define PHY_MARV_EXT_CTRL_2     0x1a    /* 16 bit r/w   Ext. PHY Specific Ctrl 2 */
-#define PHY_MARV_EXT_P_STAT     0x1b    /* 16 bit r/w   Ext. PHY Spec. Stat Reg */
-#define PHY_MARV_CABLE_DIAG     0x1c    /* 16 bit r/o   Cable Diagnostic Reg */
-        /* 0x1d - 0x1f:         reserved */
-
-/*----------------------------------------------------------------------------*/
-/*
- * Level One-PHY Registers, indirect addressed over XMAC
- */
-#define PHY_LONE_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
-#define PHY_LONE_STAT           0x01    /* 16 bit r/o   PHY Status Register */
-#define PHY_LONE_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
-#define PHY_LONE_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
-#define PHY_LONE_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
-#define PHY_LONE_AUNE_LP        0x05    /* 16 bit r/o   Link Part Ability Reg */
-#define PHY_LONE_AUNE_EXP       0x06    /* 16 bit r/o   Auto-Neg. Expansion Reg */
-#define PHY_LONE_NEPG           0x07    /* 16 bit r/w   Next Page Register */
-#define PHY_LONE_NEPG_LP        0x08    /* 16 bit r/o   Next Page Link Partner */
-        /* Level One-specific registers */
-#define PHY_LONE_1000T_CTRL     0x09    /* 16 bit r/w   1000Base-T Control Reg*/
-#define PHY_LONE_1000T_STAT     0x0a    /* 16 bit r/o   1000Base-T Status Reg */
-        /* 0x0b -0x0e:          reserved */
-#define PHY_LONE_EXT_STAT       0x0f    /* 16 bit r/o   Extended Status Reg */
-#define PHY_LONE_PORT_CFG       0x10    /* 16 bit r/w   Port Configuration Reg*/
-#define PHY_LONE_Q_STAT         0x11    /* 16 bit r/o   Quick Status Reg */
-#define PHY_LONE_INT_ENAB       0x12    /* 16 bit r/w   Interrupt Enable Reg */
-#define PHY_LONE_INT_STAT       0x13    /* 16 bit r/o   Interrupt Status Reg */
-#define PHY_LONE_LED_CFG        0x14    /* 16 bit r/w   LED Configuration Reg */
-#define PHY_LONE_PORT_CTRL      0x15    /* 16 bit r/w   Port Control Reg */
-#define PHY_LONE_CIM            0x16    /* 16 bit r/o   CIM Reg */
-        /* 0x17 -0x1c:          reserved */
-
-/*----------------------------------------------------------------------------*/
-/*
- * National-PHY Registers, indirect addressed over XMAC
- */
-#define PHY_NAT_CTRL            0x00    /* 16 bit r/w   PHY Control Register */
-#define PHY_NAT_STAT            0x01    /* 16 bit r/w   PHY Status Register */
-#define PHY_NAT_ID0                     0x02    /* 16 bit r/o   PHY ID0 Register */
-#define PHY_NAT_ID1                     0x03    /* 16 bit r/o   PHY ID1 Register */
-#define PHY_NAT_AUNE_ADV        0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
-#define PHY_NAT_AUNE_LP         0x05    /* 16 bit r/o   Link Partner Ability Reg */
-#define PHY_NAT_AUNE_EXP        0x06    /* 16 bit r/o   Auto-Neg. Expansion Reg */
-#define PHY_NAT_NEPG            0x07    /* 16 bit r/w   Next Page Register */
-#define PHY_NAT_NEPG_LP         0x08    /* 16 bit r/o   Next Page Link Partner Reg */
-        /* National-specific registers */
-#define PHY_NAT_1000T_CTRL      0x09    /* 16 bit r/w   1000Base-T Control Reg */
-#define PHY_NAT_1000T_STAT      0x0a    /* 16 bit r/o   1000Base-T Status Reg */
-        /* 0x0b -0x0e:          reserved */
-#define PHY_NAT_EXT_STAT        0x0f    /* 16 bit r/o   Extended Status Register */
-#define PHY_NAT_EXT_CTRL1       0x10    /* 16 bit r/o   Extended Control Reg1 */
-#define PHY_NAT_Q_STAT1         0x11    /* 16 bit r/o   Quick Status Reg1 */
-#define PHY_NAT_10B_OP          0x12    /* 16 bit r/o   10Base-T Operations Reg */
-#define PHY_NAT_EXT_CTRL2       0x13    /* 16 bit r/o   Extended Control Reg1 */
-#define PHY_NAT_Q_STAT2         0x14    /* 16 bit r/o   Quick Status Reg2 */
-        /* 0x15 -0x18:          reserved */
-#define PHY_NAT_PHY_ADDR        0x19    /* 16 bit r/o   PHY Address Register */
-
-
-/*----------------------------------------------------------------------------*/
-
-/*
- * PHY bit definitions
- * Bits defined as PHY_X_..., PHY_B_..., PHY_L_... or PHY_N_... are
- * XMAC/Broadcom/LevelOne/National/Marvell-specific.
- * All other are general.
- */
-
-/*****  PHY_XMAC_CTRL   16 bit r/w      PHY Control Register *****/
-/*****  PHY_BCOM_CTRL   16 bit r/w      PHY Control Register *****/
-/*****  PHY_MARV_CTRL   16 bit r/w      PHY Status Register *****/
-/*****  PHY_LONE_CTRL   16 bit r/w      PHY Control Register *****/
-#define PHY_CT_RESET    (1<<15) /* Bit 15: (sc) clear all PHY related regs */
-#define PHY_CT_LOOP             (1<<14) /* Bit 14:      enable Loopback over PHY */
-#define PHY_CT_SPS_LSB  (1<<13) /* Bit 13: (BC,L1) Speed select, lower bit */
-#define PHY_CT_ANE              (1<<12) /* Bit 12:      Auto-Negotiation Enabled */
-#define PHY_CT_PDOWN    (1<<11) /* Bit 11: (BC,L1) Power Down Mode */
-#define PHY_CT_ISOL             (1<<10) /* Bit 10: (BC,L1) Isolate Mode */
-#define PHY_CT_RE_CFG   (1<<9)  /* Bit  9: (sc) Restart Auto-Negotiation */
-#define PHY_CT_DUP_MD   (1<<8)  /* Bit  8:      Duplex Mode */
-#define PHY_CT_COL_TST  (1<<7)  /* Bit  7: (BC,L1) Collision Test enabled */
-#define PHY_CT_SPS_MSB  (1<<6)  /* Bit  6: (BC,L1) Speed select, upper bit */
-                                                                /* Bit  5..0:   reserved */
-
-#define PHY_CT_SP1000   PHY_CT_SPS_MSB  /* enable speed of 1000 Mbps */
-#define PHY_CT_SP100    PHY_CT_SPS_LSB  /* enable speed of  100 Mbps */
-#define PHY_CT_SP10             (0)                             /* enable speed of   10 Mbps */
-
-
-/*****  PHY_XMAC_STAT   16 bit r/w      PHY Status Register *****/
-/*****  PHY_BCOM_STAT   16 bit r/w      PHY Status Register *****/
-/*****  PHY_MARV_STAT   16 bit r/w      PHY Status Register *****/
-/*****  PHY_LONE_STAT   16 bit r/w      PHY Status Register *****/
-                                                                /* Bit 15..9:   reserved */
-                                /*      (BC/L1) 100/10 Mbps cap bits ignored*/
-#define PHY_ST_EXT_ST   (1<<8)  /* Bit  8:      Extended Status Present */
-                                                                /* Bit  7:      reserved */
-#define PHY_ST_PRE_SUP  (1<<6)  /* Bit  6: (BC/L1) preamble suppression */
-#define PHY_ST_AN_OVER  (1<<5)  /* Bit  5:      Auto-Negotiation Over */
-#define PHY_ST_REM_FLT  (1<<4)  /* Bit  4:      Remote Fault Condition Occured */
-#define PHY_ST_AN_CAP   (1<<3)  /* Bit  3:      Auto-Negotiation Capability */
-#define PHY_ST_LSYNC    (1<<2)  /* Bit  2:      Link Synchronized */
-#define PHY_ST_JAB_DET  (1<<1)  /* Bit  1: (BC/L1) Jabber Detected */
-#define PHY_ST_EXT_REG  (1<<0)  /* Bit  0:      Extended Register available */
-
-
-/*****  PHY_XMAC_ID1            16 bit r/o      PHY ID1 Register */
-/*****  PHY_BCOM_ID1            16 bit r/o      PHY ID1 Register */
-/*****  PHY_MARV_ID1            16 bit r/o      PHY ID1 Register */
-/*****  PHY_LONE_ID1            16 bit r/o      PHY ID1 Register */
-#define PHY_I1_OUI_MSK  (0x3f<<10)      /* Bit 15..10:  Organization Unique ID */
-#define PHY_I1_MOD_NUM  (0x3f<<4)       /* Bit  9.. 4:  Model Number */
-#define PHY_I1_REV_MSK  0x0f            /* Bit  3.. 0:  Revision Number */
-
-/* different Broadcom PHY Ids */
-#define PHY_BCOM_ID1_A1         0x6041
-#define PHY_BCOM_ID1_B2         0x6043
-#define PHY_BCOM_ID1_C0         0x6044
-#define PHY_BCOM_ID1_C5         0x6047
-
-
-/*****  PHY_XMAC_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
-/*****  PHY_XMAC_AUNE_LP        16 bit r/o      Link Partner Ability Reg *****/
-#define PHY_AN_NXT_PG   (1<<15) /* Bit 15:      Request Next Page */
-#define PHY_X_AN_ACK    (1<<14) /* Bit 14: (ro) Acknowledge Received */
-#define PHY_X_AN_RFB    (3<<12) /* Bit 13..12:  Remote Fault Bits */
-                                                                /* Bit 11.. 9:  reserved */
-#define PHY_X_AN_PAUSE  (3<<7)  /* Bit  8.. 7:  Pause Bits */
-#define PHY_X_AN_HD             (1<<6)  /* Bit  6:      Half Duplex */
-#define PHY_X_AN_FD             (1<<5)  /* Bit  5:      Full Duplex */
-                                                                /* Bit  4.. 0:  reserved */
-
-/*****  PHY_BCOM_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
-/*****  PHY_BCOM_AUNE_LP        16 bit r/o      Link Partner Ability Reg *****/
-/*      PHY_AN_NXT_PG           (see XMAC) Bit 15:      Request Next Page */
-                                                                /* Bit 14:      reserved */
-#define PHY_B_AN_RF             (1<<13) /* Bit 13:      Remote Fault */
-                                                                /* Bit 12:      reserved */
-#define PHY_B_AN_ASP    (1<<11) /* Bit 11:      Asymmetric Pause */
-#define PHY_B_AN_PC             (1<<10) /* Bit 10:      Pause Capable */
-                                                                /* Bit  9..5:   100/10 BT cap bits ingnored */
-#define PHY_B_AN_SEL    0x1f    /* Bit 4..0:    Selector Field, 00001=Ethernet*/
-
-/*****  PHY_LONE_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
-/*****  PHY_LONE_AUNE_LP        16 bit r/o      Link Partner Ability Reg *****/
-/*      PHY_AN_NXT_PG           (see XMAC) Bit 15:      Request Next Page */
-                                                                /* Bit 14:      reserved */
-#define PHY_L_AN_RF             (1<<13) /* Bit 13:      Remote Fault */
-                                                                /* Bit 12:      reserved */
-#define PHY_L_AN_ASP    (1<<11) /* Bit 11:      Asymmetric Pause */
-#define PHY_L_AN_PC             (1<<10) /* Bit 10:      Pause Capable */
-                                                                /* Bit  9..5:   100/10 BT cap bits ingnored */
-#define PHY_L_AN_SEL    0x1f    /* Bit 4..0:    Selector Field, 00001=Ethernet*/
-
-/*****  PHY_NAT_AUNE_ADV        16 bit r/w      Auto-Negotiation Advertisement *****/
-/*****  PHY_NAT_AUNE_LP         16 bit r/o      Link Partner Ability Reg *****/
-/*      PHY_AN_NXT_PG           (see XMAC) Bit 15:      Request Next Page */
-                                                                /* Bit 14:      reserved */
-#define PHY_N_AN_RF             (1<<13) /* Bit 13:      Remote Fault */
-                                                                /* Bit 12:      reserved */
-#define PHY_N_AN_100F   (1<<11) /* Bit 11:      100Base-T2 FD Support */
-#define PHY_N_AN_100H   (1<<10) /* Bit 10:      100Base-T2 HD Support */
-                                                                /* Bit  9..5:   100/10 BT cap bits ingnored */
-#define PHY_N_AN_SEL    0x1f    /* Bit 4..0:    Selector Field, 00001=Ethernet*/
-
-/* field type definition for PHY_x_AN_SEL */
-#define PHY_SEL_TYPE    0x01    /* 00001 = Ethernet */
-
-/*****  PHY_XMAC_AUNE_EXP       16 bit r/o      Auto-Negotiation Expansion Reg *****/
-                                                                /* Bit 15..4:   reserved */
-#define PHY_ANE_LP_NP   (1<<3)  /* Bit  3:      Link Partner can Next Page */
-#define PHY_ANE_LOC_NP  (1<<2)  /* Bit  2:      Local PHY can Next Page */
-#define PHY_ANE_RX_PG   (1<<1)  /* Bit  1:      Page Received */
-                                                                /* Bit  0:      reserved */
-
-/*****  PHY_BCOM_AUNE_EXP       16 bit r/o      Auto-Negotiation Expansion Reg *****/
-/*****  PHY_LONE_AUNE_EXP       16 bit r/o      Auto-Negotiation Expansion Reg *****/
-/*****  PHY_MARV_AUNE_EXP       16 bit r/o      Auto-Negotiation Expansion Reg *****/
-                                                                /* Bit 15..5:   reserved */
-#define PHY_ANE_PAR_DF  (1<<4)  /* Bit  4:      Parallel Detection Fault */
-/*      PHY_ANE_LP_NP           (see XMAC) Bit  3:      Link Partner can Next Page */
-/*      PHY_ANE_LOC_NP          (see XMAC) Bit  2:      Local PHY can Next Page */
-/*      PHY_ANE_RX_PG           (see XMAC) Bit  1:      Page Received */
-#define PHY_ANE_LP_CAP  (1<<0)  /* Bit  0:      Link Partner Auto-Neg. Cap. */  
-
-/*****  PHY_XMAC_NEPG           16 bit r/w      Next Page Register *****/
-/*****  PHY_BCOM_NEPG           16 bit r/w      Next Page Register *****/
-/*****  PHY_LONE_NEPG           16 bit r/w      Next Page Register *****/
-/*****  PHY_XMAC_NEPG_LP        16 bit r/o      Next Page Link Partner *****/
-/*****  PHY_BCOM_NEPG_LP        16 bit r/o      Next Page Link Partner *****/
-/*****  PHY_LONE_NEPG_LP        16 bit r/o      Next Page Link Partner *****/
-#define PHY_NP_MORE             (1<<15) /* Bit 15:      More, Next Pages to follow */
-#define PHY_NP_ACK1             (1<<14) /* Bit 14: (ro) Ack1, for receiving a message */
-#define PHY_NP_MSG_VAL  (1<<13) /* Bit 13:      Message Page valid */
-#define PHY_NP_ACK2             (1<<12) /* Bit 12:      Ack2, comply with msg content */
-#define PHY_NP_TOG              (1<<11) /* Bit 11:      Toggle Bit, ensure sync */
-#define PHY_NP_MSG              0x07ff  /* Bit 10..0:   Message from/to Link Partner */
-
-/*
- * XMAC-Specific
- */
-/*****  PHY_XMAC_EXT_STAT       16 bit r/w      Extended Status Register *****/
-#define PHY_X_EX_FD             (1<<15) /* Bit 15:      Device Supports Full Duplex */
-#define PHY_X_EX_HD             (1<<14) /* Bit 14:      Device Supports Half Duplex */
-                                                                /* Bit 13..0:   reserved */
-
-/*****  PHY_XMAC_RES_ABI        16 bit r/o      PHY Resolved Ability *****/
-                                                                /* Bit 15..9:   reserved */
-#define PHY_X_RS_PAUSE  (3<<7)  /* Bit  8..7:   selected Pause Mode */
-#define PHY_X_RS_HD             (1<<6)  /* Bit  6:      Half Duplex Mode selected */
-#define PHY_X_RS_FD             (1<<5)  /* Bit  5:      Full Duplex Mode selected */
-#define PHY_X_RS_ABLMIS (1<<4)  /* Bit  4:      duplex or pause cap mismatch */
-#define PHY_X_RS_PAUMIS (1<<3)  /* Bit  3:      pause capability mismatch */
-                                                                /* Bit  2..0:   reserved */
-/*
- * Remote Fault Bits (PHY_X_AN_RFB) encoding
- */
-#define X_RFB_OK                (0<<12) /* Bit 13..12   No errors, Link OK */
-#define X_RFB_LF                (1<<12) /* Bit 13..12   Link Failure */
-#define X_RFB_OFF               (2<<12) /* Bit 13..12   Offline */
-#define X_RFB_AN_ERR    (3<<12) /* Bit 13..12   Auto-Negotiation Error */
-
-/*
- * Pause Bits (PHY_X_AN_PAUSE and PHY_X_RS_PAUSE) encoding
- */
-#define PHY_X_P_NO_PAUSE        (0<<7)  /* Bit  8..7:   no Pause Mode */
-#define PHY_X_P_SYM_MD          (1<<7)  /* Bit  8..7:   symmetric Pause Mode */
-#define PHY_X_P_ASYM_MD         (2<<7)  /* Bit  8..7:   asymmetric Pause Mode */
-#define PHY_X_P_BOTH_MD         (3<<7)  /* Bit  8..7:   both Pause Mode */
-
-
-/*
- * Broadcom-Specific
- */
-/*****  PHY_BCOM_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
-#define PHY_B_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
-#define PHY_B_1000C_MSE         (1<<12) /* Bit 12:      Master/Slave Enable */
-#define PHY_B_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration */
-#define PHY_B_1000C_RD          (1<<10) /* Bit 10:      Repeater/DTE */
-#define PHY_B_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
-#define PHY_B_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
-                                                                        /* Bit  7..0:   reserved */
-
-/*****  PHY_BCOM_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
-/*****  PHY_MARV_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
-#define PHY_B_1000S_MSF         (1<<15) /* Bit 15:      Master/Slave Fault */
-#define PHY_B_1000S_MSR         (1<<14) /* Bit 14:      Master/Slave Result */
-#define PHY_B_1000S_LRS         (1<<13) /* Bit 13:      Local Receiver Status */
-#define PHY_B_1000S_RRS         (1<<12) /* Bit 12:      Remote Receiver Status */
-#define PHY_B_1000S_LP_FD       (1<<11) /* Bit 11:      Link Partner can FD */
-#define PHY_B_1000S_LP_HD       (1<<10) /* Bit 10:      Link Partner can HD */
-                                                                        /* Bit  9..8:   reserved */
-#define PHY_B_1000S_IEC         0xff    /* Bit  7..0:   Idle Error Count */
-
-/*****  PHY_BCOM_EXT_STAT       16 bit r/o      Extended Status Register *****/
-#define PHY_B_ES_X_FD_CAP       (1<<15) /* Bit 15:      1000Base-X FD capable */
-#define PHY_B_ES_X_HD_CAP       (1<<14) /* Bit 14:      1000Base-X HD capable */
-#define PHY_B_ES_T_FD_CAP       (1<<13) /* Bit 13:      1000Base-T FD capable */
-#define PHY_B_ES_T_HD_CAP       (1<<12) /* Bit 12:      1000Base-T HD capable */
-                                                                        /* Bit 11..0:   reserved */
-
-/*****  PHY_BCOM_P_EXT_CTRL     16 bit r/w      PHY Extended Control Reg *****/
-#define PHY_B_PEC_MAC_PHY       (1<<15) /* Bit 15:      10BIT/GMI-Interface */
-#define PHY_B_PEC_DIS_CROSS     (1<<14) /* Bit 14:      Disable MDI Crossover */
-#define PHY_B_PEC_TX_DIS        (1<<13) /* Bit 13:      Tx output Disabled */
-#define PHY_B_PEC_INT_DIS       (1<<12) /* Bit 12:      Interrupts Disabled */
-#define PHY_B_PEC_F_INT         (1<<11) /* Bit 11:      Force Interrupt */
-#define PHY_B_PEC_BY_45         (1<<10) /* Bit 10:      Bypass 4B5B-Decoder */
-#define PHY_B_PEC_BY_SCR        (1<<9)  /* Bit  9:      Bypass Scrambler */
-#define PHY_B_PEC_BY_MLT3       (1<<8)  /* Bit  8:      Bypass MLT3 Encoder */
-#define PHY_B_PEC_BY_RXA        (1<<7)  /* Bit  7:      Bypass Rx Alignm. */
-#define PHY_B_PEC_RES_SCR       (1<<6)  /* Bit  6:      Reset Scrambler */
-#define PHY_B_PEC_EN_LTR        (1<<5)  /* Bit  5:      Ena LED Traffic Mode */
-#define PHY_B_PEC_LED_ON        (1<<4)  /* Bit  4:      Force LED's on */
-#define PHY_B_PEC_LED_OFF       (1<<3)  /* Bit  3:      Force LED's off */
-#define PHY_B_PEC_EX_IPG        (1<<2)  /* Bit  2:      Extend Tx IPG Mode */
-#define PHY_B_PEC_3_LED         (1<<1)  /* Bit  1:      Three Link LED mode */
-#define PHY_B_PEC_HIGH_LA       (1<<0)  /* Bit  0:      GMII FIFO Elasticy */
-
-/*****  PHY_BCOM_P_EXT_STAT     16 bit r/o      PHY Extended Status Reg *****/
-                                                                        /* Bit 15..14:  reserved */
-#define PHY_B_PES_CROSS_STAT    (1<<13) /* Bit 13:      MDI Crossover Status */
-#define PHY_B_PES_INT_STAT      (1<<12) /* Bit 12:      Interrupt Status */
-#define PHY_B_PES_RRS           (1<<11) /* Bit 11:      Remote Receiver Stat. */
-#define PHY_B_PES_LRS           (1<<10) /* Bit 10:      Local Receiver Stat. */
-#define PHY_B_PES_LOCKED        (1<<9)  /* Bit  9:      Locked */
-#define PHY_B_PES_LS            (1<<8)  /* Bit  8:      Link Status */
-#define PHY_B_PES_RF            (1<<7)  /* Bit  7:      Remote Fault */
-#define PHY_B_PES_CE_ER         (1<<6)  /* Bit  6:      Carrier Ext Error */
-#define PHY_B_PES_BAD_SSD       (1<<5)  /* Bit  5:      Bad SSD */
-#define PHY_B_PES_BAD_ESD       (1<<4)  /* Bit  4:      Bad ESD */
-#define PHY_B_PES_RX_ER         (1<<3)  /* Bit  3:      Receive Error */
-#define PHY_B_PES_TX_ER         (1<<2)  /* Bit  2:      Transmit Error */
-#define PHY_B_PES_LOCK_ER       (1<<1)  /* Bit  1:      Lock Error */
-#define PHY_B_PES_MLT3_ER       (1<<0)  /* Bit  0:      MLT3 code Error */
-
-/*****  PHY_BCOM_FC_CTR         16 bit r/w      False Carrier Counter *****/
-                                                                        /* Bit 15..8:   reserved */
-#define PHY_B_FC_CTR            0xff    /* Bit  7..0:   False Carrier Counter */
-
-/*****  PHY_BCOM_RNO_CTR        16 bit r/w      Receive NOT_OK Counter *****/
-#define PHY_B_RC_LOC_MSK        0xff00  /* Bit 15..8:   Local Rx NOT_OK cnt */
-#define PHY_B_RC_REM_MSK        0x00ff  /* Bit  7..0:   Remote Rx NOT_OK cnt */
-
-/*****  PHY_BCOM_AUX_CTRL       16 bit r/w      Auxiliary Control Reg *****/
-#define PHY_B_AC_L_SQE          (1<<15) /* Bit 15:      Low Squelch */
-#define PHY_B_AC_LONG_PACK      (1<<14) /* Bit 14:      Rx Long Packets */
-#define PHY_B_AC_ER_CTRL        (3<<12) /* Bit 13..12:  Edgerate Control */
-                                                                        /* Bit 11:      reserved */
-#define PHY_B_AC_TX_TST         (1<<10) /* Bit 10:      Tx test bit, always 1 */
-                                                                        /* Bit  9.. 8:  reserved */
-#define PHY_B_AC_DIS_PRF        (1<<7)  /* Bit  7:      dis part resp filter */
-                                                                        /* Bit  6:      reserved */
-#define PHY_B_AC_DIS_PM         (1<<5)  /* Bit  5:      dis power management */
-                                                                        /* Bit  4:      reserved */
-#define PHY_B_AC_DIAG           (1<<3)  /* Bit  3:      Diagnostic Mode */
-                                                                        /* Bit  2.. 0:  reserved */
-
-/*****  PHY_BCOM_AUX_STAT       16 bit r/o      Auxiliary Status Reg *****/
-#define PHY_B_AS_AN_C           (1<<15) /* Bit 15:      AutoNeg complete */
-#define PHY_B_AS_AN_CA          (1<<14) /* Bit 14:      AN Complete Ack */
-#define PHY_B_AS_ANACK_D        (1<<13) /* Bit 13:      AN Ack Detect */
-#define PHY_B_AS_ANAB_D         (1<<12) /* Bit 12:      AN Ability Detect */
-#define PHY_B_AS_NPW            (1<<11) /* Bit 11:      AN Next Page Wait */
-#define PHY_B_AS_AN_RES_MSK     (7<<8)  /* Bit 10..8:   AN HDC */
-#define PHY_B_AS_PDF            (1<<7)  /* Bit  7:      Parallel Detect. Fault */
-#define PHY_B_AS_RF                     (1<<6)  /* Bit  6:      Remote Fault */
-#define PHY_B_AS_ANP_R          (1<<5)  /* Bit  5:      AN Page Received */
-#define PHY_B_AS_LP_ANAB        (1<<4)  /* Bit  4:      LP AN Ability */
-#define PHY_B_AS_LP_NPAB        (1<<3)  /* Bit  3:      LP Next Page Ability */
-#define PHY_B_AS_LS                     (1<<2)  /* Bit  2:      Link Status */
-#define PHY_B_AS_PRR            (1<<1)  /* Bit  1:      Pause Resolution-Rx */
-#define PHY_B_AS_PRT            (1<<0)  /* Bit  0:      Pause Resolution-Tx */
-
-#define PHY_B_AS_PAUSE_MSK      (PHY_B_AS_PRR | PHY_B_AS_PRT)
-
-/*****  PHY_BCOM_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
-/*****  PHY_BCOM_INT_MASK       16 bit r/w      Interrupt Mask Reg *****/
-                                                                        /* Bit 15:      reserved */
-#define PHY_B_IS_PSE            (1<<14) /* Bit 14:      Pair Swap Error */
-#define PHY_B_IS_MDXI_SC        (1<<13) /* Bit 13:      MDIX Status Change */
-#define PHY_B_IS_HCT            (1<<12) /* Bit 12:      counter above 32k */
-#define PHY_B_IS_LCT            (1<<11) /* Bit 11:      counter above 128 */
-#define PHY_B_IS_AN_PR          (1<<10) /* Bit 10:      Page Received */
-#define PHY_B_IS_NO_HDCL        (1<<9)  /* Bit  9:      No HCD Link */
-#define PHY_B_IS_NO_HDC         (1<<8)  /* Bit  8:      No HCD */
-#define PHY_B_IS_NEG_USHDC      (1<<7)  /* Bit  7:      Negotiated Unsup. HCD */
-#define PHY_B_IS_SCR_S_ER       (1<<6)  /* Bit  6:      Scrambler Sync Error */
-#define PHY_B_IS_RRS_CHANGE     (1<<5)  /* Bit  5:      Remote Rx Stat Change */
-#define PHY_B_IS_LRS_CHANGE     (1<<4)  /* Bit  4:      Local Rx Stat Change */
-#define PHY_B_IS_DUP_CHANGE     (1<<3)  /* Bit  3:      Duplex Mode Change */
-#define PHY_B_IS_LSP_CHANGE     (1<<2)  /* Bit  2:      Link Speed Change */
-#define PHY_B_IS_LST_CHANGE     (1<<1)  /* Bit  1:      Link Status Changed */
-#define PHY_B_IS_CRC_ER         (1<<0)  /* Bit  0:      CRC Error */
-
-#define PHY_B_DEF_MSK   (~(PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE))
-
-/* Pause Bits (PHY_B_AN_ASP and PHY_B_AN_PC) encoding */
-#define PHY_B_P_NO_PAUSE        (0<<10) /* Bit 11..10:  no Pause Mode */
-#define PHY_B_P_SYM_MD          (1<<10) /* Bit 11..10:  symmetric Pause Mode */
-#define PHY_B_P_ASYM_MD         (2<<10) /* Bit 11..10:  asymmetric Pause Mode */
-#define PHY_B_P_BOTH_MD         (3<<10) /* Bit 11..10:  both Pause Mode */
-
-/*
- * Resolved Duplex mode and Capabilities (Aux Status Summary Reg)
- */
-#define PHY_B_RES_1000FD        (7<<8)  /* Bit 10..8:   1000Base-T Full Dup. */
-#define PHY_B_RES_1000HD        (6<<8)  /* Bit 10..8:   1000Base-T Half Dup. */
-/* others: 100/10: invalid for us */
-
-/*
- * Level One-Specific
- */
-/*****  PHY_LONE_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
-#define PHY_L_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
-#define PHY_L_1000C_MSE         (1<<12) /* Bit 12:      Master/Slave Enable */
-#define PHY_L_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration */
-#define PHY_L_1000C_RD          (1<<10) /* Bit 10:      Repeater/DTE */
-#define PHY_L_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
-#define PHY_L_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
-                                                                        /* Bit  7..0:   reserved */
-
-/*****  PHY_LONE_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
-#define PHY_L_1000S_MSF         (1<<15) /* Bit 15:      Master/Slave Fault */
-#define PHY_L_1000S_MSR         (1<<14) /* Bit 14:      Master/Slave Result */
-#define PHY_L_1000S_LRS         (1<<13) /* Bit 13:      Local Receiver Status */
-#define PHY_L_1000S_RRS         (1<<12) /* Bit 12:      Remote Receiver Status */
-#define PHY_L_1000S_LP_FD       (1<<11) /* Bit 11:      Link Partner can FD */
-#define PHY_L_1000S_LP_HD       (1<<10) /* Bit 10:      Link Partner can HD */
-                                                                        /* Bit  9..8:   reserved */
-#define PHY_B_1000S_IEC         0xff    /* Bit  7..0:   Idle Error Count */
-
-/*****  PHY_LONE_EXT_STAT       16 bit r/o      Extended Status Register *****/
-#define PHY_L_ES_X_FD_CAP       (1<<15) /* Bit 15:      1000Base-X FD capable */
-#define PHY_L_ES_X_HD_CAP       (1<<14) /* Bit 14:      1000Base-X HD capable */
-#define PHY_L_ES_T_FD_CAP       (1<<13) /* Bit 13:      1000Base-T FD capable */
-#define PHY_L_ES_T_HD_CAP       (1<<12) /* Bit 12:      1000Base-T HD capable */
-                                                                        /* Bit 11..0:   reserved */
-
-/*****  PHY_LONE_PORT_CFG       16 bit r/w      Port Configuration Reg *****/
-#define PHY_L_PC_REP_MODE       (1<<15) /* Bit 15:      Repeater Mode */
-                                                                        /* Bit 14:      reserved */
-#define PHY_L_PC_TX_DIS         (1<<13) /* Bit 13:      Tx output Disabled */
-#define PHY_L_PC_BY_SCR         (1<<12) /* Bit 12:      Bypass Scrambler */
-#define PHY_L_PC_BY_45          (1<<11) /* Bit 11:      Bypass 4B5B-Decoder */
-#define PHY_L_PC_JAB_DIS        (1<<10) /* Bit 10:      Jabber Disabled */
-#define PHY_L_PC_SQE            (1<<9)  /* Bit  9:      Enable Heartbeat */
-#define PHY_L_PC_TP_LOOP        (1<<8)  /* Bit  8:      TP Loopback */
-#define PHY_L_PC_SSS            (1<<7)  /* Bit  7:      Smart Speed Selection */
-#define PHY_L_PC_FIFO_SIZE      (1<<6)  /* Bit  6:      FIFO Size */
-#define PHY_L_PC_PRE_EN         (1<<5)  /* Bit  5:      Preamble Enable */
-#define PHY_L_PC_CIM            (1<<4)  /* Bit  4:      Carrier Integrity Mon */
-#define PHY_L_PC_10_SER         (1<<3)  /* Bit  3:      Use Serial Output */
-#define PHY_L_PC_ANISOL         (1<<2)  /* Bit  2:      Unisolate Port */
-#define PHY_L_PC_TEN_BIT        (1<<1)  /* Bit  1:      10bit iface mode on */
-#define PHY_L_PC_ALTCLOCK       (1<<0)  /* Bit  0: (ro) ALTCLOCK Mode on */
-
-/*****  PHY_LONE_Q_STAT         16 bit r/o      Quick Status Reg *****/
-#define PHY_L_QS_D_RATE         (3<<14) /* Bit 15..14:  Data Rate */
-#define PHY_L_QS_TX_STAT        (1<<13) /* Bit 13:      Transmitting */
-#define PHY_L_QS_RX_STAT        (1<<12) /* Bit 12:      Receiving */
-#define PHY_L_QS_COL_STAT       (1<<11) /* Bit 11:      Collision */
-#define PHY_L_QS_L_STAT         (1<<10) /* Bit 10:      Link is up */
-#define PHY_L_QS_DUP_MOD        (1<<9)  /* Bit  9:      Full/Half Duplex */
-#define PHY_L_QS_AN                     (1<<8)  /* Bit  8:      AutoNeg is On */
-#define PHY_L_QS_AN_C           (1<<7)  /* Bit  7:      AN is Complete */
-#define PHY_L_QS_LLE            (7<<4)  /* Bit  6:      Line Length Estim. */
-#define PHY_L_QS_PAUSE          (1<<3)  /* Bit  3:      LP advertised Pause */
-#define PHY_L_QS_AS_PAUSE       (1<<2)  /* Bit  2:      LP adv. asym. Pause */
-#define PHY_L_QS_ISOLATE        (1<<1)  /* Bit  1:      CIM Isolated */
-#define PHY_L_QS_EVENT          (1<<0)  /* Bit  0:      Event has occurred */
-
-/*****  PHY_LONE_INT_ENAB       16 bit r/w      Interrupt Enable Reg *****/
-/*****  PHY_LONE_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
-                                                                        /* Bit 15..14:  reserved */
-#define PHY_L_IS_AN_F           (1<<13) /* Bit 13:      Auto-Negotiation fault */
-                                                                        /* Bit 12:      not described */
-#define PHY_L_IS_CROSS          (1<<11) /* Bit 11:      Crossover used */
-#define PHY_L_IS_POL            (1<<10) /* Bit 10:      Polarity correct. used */
-#define PHY_L_IS_SS                     (1<<9)  /* Bit  9:      Smart Speed Downgrade */
-#define PHY_L_IS_CFULL          (1<<8)  /* Bit  8:      Counter Full */
-#define PHY_L_IS_AN_C           (1<<7)  /* Bit  7:      AutoNeg Complete */
-#define PHY_L_IS_SPEED          (1<<6)  /* Bit  6:      Speed Changed */
-#define PHY_L_IS_DUP            (1<<5)  /* Bit  5:      Duplex Changed */
-#define PHY_L_IS_LS                     (1<<4)  /* Bit  4:      Link Status Changed */
-#define PHY_L_IS_ISOL           (1<<3)  /* Bit  3:      Isolate Occured */
-#define PHY_L_IS_MDINT          (1<<2)  /* Bit  2: (ro) STAT: MII Int Pending */
-#define PHY_L_IS_INTEN          (1<<1)  /* Bit  1:      ENAB: Enable IRQs */
-#define PHY_L_IS_FORCE          (1<<0)  /* Bit  0:      ENAB: Force Interrupt */
-
-/* int. mask */
-#define PHY_L_DEF_MSK           (PHY_L_IS_LS | PHY_L_IS_ISOL | PHY_L_IS_INTEN)
-
-/*****  PHY_LONE_LED_CFG        16 bit r/w      LED Configuration Reg *****/
-#define PHY_L_LC_LEDC           (3<<14) /* Bit 15..14:  Col/Blink/On/Off */
-#define PHY_L_LC_LEDR           (3<<12) /* Bit 13..12:  Rx/Blink/On/Off */
-#define PHY_L_LC_LEDT           (3<<10) /* Bit 11..10:  Tx/Blink/On/Off */
-#define PHY_L_LC_LEDG           (3<<8)  /* Bit  9..8:   Giga/Blink/On/Off */
-#define PHY_L_LC_LEDS           (3<<6)  /* Bit  7..6:   10-100/Blink/On/Off */
-#define PHY_L_LC_LEDL           (3<<4)  /* Bit  5..4:   Link/Blink/On/Off */
-#define PHY_L_LC_LEDF           (3<<2)  /* Bit  3..2:   Duplex/Blink/On/Off */
-#define PHY_L_LC_PSTRECH        (1<<1)  /* Bit  1:      Strech LED Pulses */
-#define PHY_L_LC_FREQ           (1<<0)  /* Bit  0:      30/100 ms */
-
-/*****  PHY_LONE_PORT_CTRL      16 bit r/w      Port Control Reg *****/
-#define PHY_L_PC_TX_TCLK        (1<<15) /* Bit 15:      Enable TX_TCLK */
-                                                                        /* Bit 14:      reserved */
-#define PHY_L_PC_ALT_NP         (1<<13) /* Bit 14:      Alternate Next Page */
-#define PHY_L_PC_GMII_ALT       (1<<12) /* Bit 13:      Alternate GMII driver */
-                                                                        /* Bit 11:      reserved */
-#define PHY_L_PC_TEN_CRS        (1<<10) /* Bit 10:      Extend CRS*/
-                                                                        /* Bit  9..0:   not described */
-
-/*****  PHY_LONE_CIM            16 bit r/o      CIM Reg *****/
-#define PHY_L_CIM_ISOL          (255<<8)/* Bit 15..8:   Isolate Count */
-#define PHY_L_CIM_FALSE_CAR     (255<<0)/* Bit  7..0:   False Carrier Count */
-
-
-/*
- * Pause Bits (PHY_L_AN_ASP and PHY_L_AN_PC) encoding
- */
-#define PHY_L_P_NO_PAUSE        (0<<10) /* Bit 11..10:  no Pause Mode */
-#define PHY_L_P_SYM_MD          (1<<10) /* Bit 11..10:  symmetric Pause Mode */
-#define PHY_L_P_ASYM_MD         (2<<10) /* Bit 11..10:  asymmetric Pause Mode */
-#define PHY_L_P_BOTH_MD         (3<<10) /* Bit 11..10:  both Pause Mode */
-
-
-/*
- * National-Specific
- */
-/*****  PHY_NAT_1000T_CTRL      16 bit r/w      1000Base-T Control Reg *****/
-#define PHY_N_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
-#define PHY_N_1000C_MSE         (1<<12) /* Bit 12:      Master/Slave Enable */
-#define PHY_N_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration */
-#define PHY_N_1000C_RD          (1<<10) /* Bit 10:      Repeater/DTE */
-#define PHY_N_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
-#define PHY_N_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
-#define PHY_N_1000C_APC         (1<<7)  /* Bit  7:      Asymmetric Pause Cap. */
-                                                                        /* Bit  6..0:   reserved */
-
-/*****  PHY_NAT_1000T_STAT      16 bit r/o      1000Base-T Status Reg *****/
-#define PHY_N_1000S_MSF         (1<<15) /* Bit 15:      Master/Slave Fault */
-#define PHY_N_1000S_MSR         (1<<14) /* Bit 14:      Master/Slave Result */
-#define PHY_N_1000S_LRS         (1<<13) /* Bit 13:      Local Receiver Status */
-#define PHY_N_1000S_RRS         (1<<12) /* Bit 12:      Remote Receiver Status*/
-#define PHY_N_1000S_LP_FD       (1<<11) /* Bit 11:      Link Partner can FD */
-#define PHY_N_1000S_LP_HD       (1<<10) /* Bit 10:      Link Partner can HD */
-#define PHY_N_1000C_LP_APC      (1<<9)  /* Bit  9:      LP Asym. Pause Cap. */
-                                                                        /* Bit  8:      reserved */
-#define PHY_N_1000S_IEC         0xff    /* Bit  7..0:   Idle Error Count */
-
-/*****  PHY_NAT_EXT_STAT        16 bit r/o      Extended Status Register *****/
-#define PHY_N_ES_X_FD_CAP       (1<<15) /* Bit 15:      1000Base-X FD capable */
-#define PHY_N_ES_X_HD_CAP       (1<<14) /* Bit 14:      1000Base-X HD capable */
-#define PHY_N_ES_T_FD_CAP       (1<<13) /* Bit 13:      1000Base-T FD capable */
-#define PHY_N_ES_T_HD_CAP       (1<<12) /* Bit 12:      1000Base-T HD capable */
-                                                                        /* Bit 11..0:   reserved */
-
-/* todo: those are still missing */
-/*****  PHY_NAT_EXT_CTRL1       16 bit r/o      Extended Control Reg1 *****/
-/*****  PHY_NAT_Q_STAT1         16 bit r/o      Quick Status Reg1 *****/
-/*****  PHY_NAT_10B_OP          16 bit r/o      10Base-T Operations Reg *****/
-/*****  PHY_NAT_EXT_CTRL2       16 bit r/o      Extended Control Reg1 *****/
-/*****  PHY_NAT_Q_STAT2         16 bit r/o      Quick Status Reg2 *****/
-/*****  PHY_NAT_PHY_ADDR        16 bit r/o      PHY Address Register *****/
-
-/*
- * Marvell-Specific
- */
-/*****  PHY_MARV_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
-/*****  PHY_MARV_AUNE_LP        16 bit r/w      Link Part Ability Reg *****/
-#define PHY_M_AN_NXT_PG         BIT_15  /* Request Next Page */
-#define PHY_M_AN_ACK            BIT_14  /* (ro) Acknowledge Received */
-#define PHY_M_AN_RF                     BIT_13  /* Remote Fault */
-                                                                        /* Bit 12:      reserved */
-#define PHY_M_AN_ASP            BIT_11  /* Asymmetric Pause */
-#define PHY_M_AN_PC                     BIT_10  /* MAC Pause implemented */
-#define PHY_M_AN_100_FD         BIT_8   /* Advertise 100Base-TX Full Duplex */
-#define PHY_M_AN_100_HD         BIT_7   /* Advertise 100Base-TX Half Duplex */
-#define PHY_M_AN_10_FD          BIT_6   /* Advertise 10Base-TX Full Duplex */
-#define PHY_M_AN_10_HD          BIT_5   /* Advertise 10Base-TX Half Duplex */
-
-/* special defines for FIBER (88E1011S only) */
-#define PHY_M_AN_ASP_X          BIT_8   /* Asymmetric Pause */
-#define PHY_M_AN_PC_X           BIT_7   /* MAC Pause implemented */
-#define PHY_M_AN_1000X_AHD      BIT_6   /* Advertise 10000Base-X Half Duplex */
-#define PHY_M_AN_1000X_AFD      BIT_5   /* Advertise 10000Base-X Full Duplex */
-
-/* Pause Bits (PHY_M_AN_ASP_X and PHY_M_AN_PC_X) encoding */
-#define PHY_M_P_NO_PAUSE_X      (0<<7)  /* Bit  8.. 7:  no Pause Mode */
-#define PHY_M_P_SYM_MD_X        (1<<7)  /* Bit  8.. 7:  symmetric Pause Mode */
-#define PHY_M_P_ASYM_MD_X       (2<<7)  /* Bit  8.. 7:  asymmetric Pause Mode */
-#define PHY_M_P_BOTH_MD_X       (3<<7)  /* Bit  8.. 7:  both Pause Mode */
-
-/*****  PHY_MARV_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
-#define PHY_M_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
-#define PHY_M_1000C_MSE         (1<<12) /* Bit 12:      Manual Master/Slave Enable */
-#define PHY_M_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration (1=Master) */
-#define PHY_M_1000C_MPD         (1<<10) /* Bit 10:      Multi-Port Device */
-#define PHY_M_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
-#define PHY_M_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
-                                                                        /* Bit  7..0:   reserved */
-
-/*****  PHY_MARV_PHY_CTRL       16 bit r/w      PHY Specific Ctrl Reg *****/
-#define PHY_M_PC_TX_FFD_MSK     (3<<14) /* Bit 15..14:  Tx FIFO Depth Mask */
-#define PHY_M_PC_RX_FFD_MSK     (3<<12) /* Bit 13..12:  Rx FIFO Depth Mask */
-#define PHY_M_PC_ASS_CRS_TX     (1<<11) /* Bit 11:      Assert CRS on Transmit */
-#define PHY_M_PC_FL_GOOD        (1<<10) /* Bit 10:      Force Link Good */
-#define PHY_M_PC_EN_DET_MSK     (3<<8)  /* Bit  9.. 8:  Energy Detect Mask */
-#define PHY_M_PC_ENA_EXT_D      (1<<7)  /* Bit  7:      Enable Ext. Distance (10BT) */
-#define PHY_M_PC_MDIX_MSK       (3<<5)  /* Bit  6.. 5:  MDI/MDIX Config. Mask */
-#define PHY_M_PC_DIS_125CLK     (1<<4)  /* Bit  4:      Disable 125 CLK */
-#define PHY_M_PC_MAC_POW_UP     (1<<3)  /* Bit  3:      MAC Power up */
-#define PHY_M_PC_SQE_T_ENA      (1<<2)  /* Bit  2:      SQE Test Enabled */
-#define PHY_M_PC_POL_R_DIS      (1<<1)  /* Bit  1:      Polarity Reversal Disabled */
-#define PHY_M_PC_DIS_JABBER     (1<<0)  /* Bit  0:      Disable Jabber */
-
-#define PHY_M_PC_EN_DET                 SHIFT8(2)       /* Energy Detect (Mode 1) */
-#define PHY_M_PC_EN_DET_PLUS    SHIFT8(3)       /* Energy Detect Plus (Mode 2) */
-
-#define PHY_M_PC_MDI_XMODE(x)   SHIFT5(x)       
-#define PHY_M_PC_MAN_MDI        0       /* 00 = Manual MDI configuration */
-#define PHY_M_PC_MAN_MDIX       1               /* 01 = Manual MDIX configuration */
-#define PHY_M_PC_ENA_AUTO       3               /* 11 = Enable Automatic Crossover */
-
-/*****  PHY_MARV_PHY_STAT       16 bit r/o      PHY Specific Status Reg *****/
-#define PHY_M_PS_SPEED_MSK      (3<<14) /* Bit 15..14:  Speed Mask */
-#define PHY_M_PS_SPEED_1000     (1<<15) /*       10 = 1000 Mbps */
-#define PHY_M_PS_SPEED_100      (1<<14) /*       01 =  100 Mbps */
-#define PHY_M_PS_SPEED_10       0               /*       00 =   10 Mbps */
-#define PHY_M_PS_FULL_DUP       (1<<13) /* Bit 13:      Full Duplex */
-#define PHY_M_PS_PAGE_REC       (1<<12) /* Bit 12:      Page Received */
-#define PHY_M_PS_SPDUP_RES      (1<<11) /* Bit 11:      Speed & Duplex Resolved */
-#define PHY_M_PS_LINK_UP        (1<<10) /* Bit 10:      Link Up */
-#define PHY_M_PS_CABLE_MSK      (3<<7)  /* Bit  9.. 7:  Cable Length Mask */
-#define PHY_M_PS_MDI_X_STAT     (1<<6)  /* Bit  6:      MDI Crossover Stat (1=MDIX) */
-#define PHY_M_PS_DOWNS_STAT     (1<<5)  /* Bit  5:      Downshift Status (1=downsh.) */
-#define PHY_M_PS_ENDET_STAT     (1<<4)  /* Bit  4:      Energy Detect Status (1=act) */
-#define PHY_M_PS_TX_P_EN        (1<<3)  /* Bit  3:      Tx Pause Enabled */
-#define PHY_M_PS_RX_P_EN        (1<<2)  /* Bit  2:      Rx Pause Enabled */
-#define PHY_M_PS_POL_REV        (1<<1)  /* Bit  1:      Polarity Reversed */
-#define PHY_M_PC_JABBER         (1<<0)  /* Bit  0:      Jabber */
-
-#define PHY_M_PS_PAUSE_MSK      (PHY_M_PS_TX_P_EN | PHY_M_PS_RX_P_EN)
-
-/*****  PHY_MARV_INT_MASK       16 bit r/w      Interrupt Mask Reg *****/
-/*****  PHY_MARV_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
-#define PHY_M_IS_AN_ERROR       (1<<15) /* Bit 15:      Auto-Negotiation Error */
-#define PHY_M_IS_LSP_CHANGE     (1<<14) /* Bit 14:      Link Speed Changed */
-#define PHY_M_IS_DUP_CHANGE     (1<<13) /* Bit 13:      Duplex Mode Changed */
-#define PHY_M_IS_AN_PR          (1<<12) /* Bit 12:      Page Received */
-#define PHY_M_IS_AN_COMPL       (1<<11) /* Bit 11:      Auto-Negotiation Completed */
-#define PHY_M_IS_LST_CHANGE     (1<<10) /* Bit 10:      Link Status Changed */
-#define PHY_M_IS_SYMB_ERROR     (1<<9)  /* Bit  9:      Symbol Error */
-#define PHY_M_IS_FALSE_CARR     (1<<8)  /* Bit  8:      False Carrier */
-#define PHY_M_IS_FIFO_ERROR     (1<<7)  /* Bit  7:      FIFO Overflow/Underrun Error */
-#define PHY_M_IS_MDI_CHANGE     (1<<6)  /* Bit  6:      MDI Crossover Changed */
-#define PHY_M_IS_DOWNSH_DET     (1<<5)  /* Bit  5:      Downshift Detected */
-#define PHY_M_IS_END_CHANGE     (1<<4)  /* Bit  4:      Energy Detect Changed */
-                                                                        /* Bit  3..2:   reserved */
-#define PHY_M_IS_POL_CHANGE     (1<<1)  /* Bit  1:      Polarity Changed */
-#define PHY_M_IS_JABBER         (1<<0)  /* Bit  0:      Jabber */
-
-#define PHY_M_DEF_MSK           (PHY_M_IS_AN_ERROR | PHY_M_IS_AN_PR | \
-                                                        PHY_M_IS_LST_CHANGE | PHY_M_IS_FIFO_ERROR)
-
-/*****  PHY_MARV_EXT_CTRL       16 bit r/w      Ext. PHY Specific Ctrl *****/
-#define PHY_M_EC_M_DSC_MSK      (3<<10) /* Bit 11..10:  Master downshift counter */
-#define PHY_M_EC_S_DSC_MSK      (3<<8)  /* Bit  9.. 8:  Slave  downshift counter */
-#define PHY_M_EC_MAC_S_MSK      (7<<4)  /* Bit  6.. 4:  Def. MAC interface speed */
-#define PHY_M_EC_FIB_AN_ENA     (1<<3)  /* Bit  3:      Fiber Auto-Neg. Enable */
-
-#define PHY_M_EC_M_DSC(x)               SHIFT10(x)      /* 00=1x; 01=2x; 10=3x; 11=4x */
-#define PHY_M_EC_S_DSC(x)               SHIFT8(x)       /* 00=dis; 01=1x; 10=2x; 11=3x */
-#define PHY_M_EC_MAC_S(x)               SHIFT4(x)       /* 01X=0; 110=2.5; 111=25 (MHz) */
-
-#define MAC_TX_CLK_0_MHZ        2
-#define MAC_TX_CLK_2_5_MHZ      6
-#define MAC_TX_CLK_25_MHZ       7
-
-/*****  PHY_MARV_LED_CTRL       16 bit r/w      LED Control Reg *****/
-#define PHY_M_LEDC_DIS_LED      (1<<15) /* Bit 15:      Disable LED */
-#define PHY_M_LEDC_PULS_MSK     (7<<12) /* Bit 14..12:  Pulse Stretch Mask */
-#define PHY_M_LEDC_F_INT        (1<<11) /* Bit 11:      Force Interrupt */
-#define PHY_M_LEDC_BL_R_MSK     (7<<8)  /* Bit 10.. 8:  Blink Rate Mask */
-                                                                        /* Bit  7.. 5:  reserved */
-#define PHY_M_LEDC_LINK_MSK     (3<<3)  /* Bit  4.. 3:  Link Control Mask */
-#define PHY_M_LEDC_DP_CTRL      (1<<2)  /* Bit  2:      Duplex Control */
-#define PHY_M_LEDC_RX_CTRL      (1<<1)  /* Bit  1:      Rx activity / Link */
-#define PHY_M_LEDC_TX_CTRL      (1<<0)  /* Bit  0:      Tx activity / Link */
-
-#define PHY_M_LED_PULS_DUR(x)   SHIFT12(x)      /* Pulse Stretch Duration */
-
-#define PULS_NO_STR             0               /* no pulse stretching */
-#define PULS_21MS               1               /* 21 ms to 42 ms */
-#define PULS_42MS               2               /* 42 ms to 84 ms */
-#define PULS_84MS               3               /* 84 ms to 170 ms */
-#define PULS_170MS              4               /* 170 ms to 340 ms */
-#define PULS_340MS              5               /* 340 ms to 670 ms */
-#define PULS_670MS              6               /* 670 ms to 1.3 s */
-#define PULS_1300MS             7               /* 1.3 s to 2.7 s */
-
-#define PHY_M_LED_BLINK_RT(x)   SHIFT8(x)       /* Blink Rate */
-
-#define BLINK_42MS              0               /* 42 ms */
-#define BLINK_84MS              1               /* 84 ms */
-#define BLINK_170MS             2               /* 170 ms */
-#define BLINK_340MS             3               /* 340 ms */
-#define BLINK_670MS             4               /* 670 ms */
-                                                                /* values 5 - 7: reserved */
-
-/*****  PHY_MARV_LED_OVER       16 bit r/w      Manual LED Override Reg *****/
-#define PHY_M_LED_MO_DUP(x)             SHIFT10(x)      /* Bit 11..10:  Duplex */
-#define PHY_M_LED_MO_10(x)              SHIFT8(x)       /* Bit  9.. 8:  Link 10 */
-#define PHY_M_LED_MO_100(x)             SHIFT6(x)       /* Bit  7.. 6:  Link 100 */
-#define PHY_M_LED_MO_1000(x)    SHIFT4(x)       /* Bit  5.. 4:  Link 1000 */
-#define PHY_M_LED_MO_RX(x)              SHIFT2(x)       /* Bit  3.. 2:  Rx */
-#define PHY_M_LED_MO_TX(x)              SHIFT0(x)       /* Bit  1.. 0:  Tx */
-
-#define MO_LED_NORM                     0
-#define MO_LED_BLINK            1
-#define MO_LED_OFF                      2
-#define MO_LED_ON                       3
-
-/*****  PHY_MARV_EXT_CTRL_2     16 bit r/w      Ext. PHY Specific Ctrl 2 *****/
-                                                                        /* Bit 15.. 7:  reserved */
-#define PHY_M_EC2_FI_IMPED      (1<<6)  /* Bit  6:      Fiber Input  Impedance */
-#define PHY_M_EC2_FO_IMPED      (1<<5)  /* Bit  5:      Fiber Output Impedance */
-#define PHY_M_EC2_FO_M_CLK      (1<<4)  /* Bit  4:      Fiber Mode Clock Enable */
-#define PHY_M_EC2_FO_BOOST      (1<<3)  /* Bit  3:      Fiber Output Boost */
-#define PHY_M_EC2_FO_AM_MSK     7               /* Bit  2.. 0:  Fiber Output Amplitude */
-
-/*****  PHY_MARV_EXT_P_STAT 16 bit r/w  Ext. PHY Specific Status *****/
-#define PHY_M_FC_AUTO_SEL       (1<<15) /* Bit 15:      Fiber/Copper Auto Sel. dis. */
-#define PHY_M_FC_AN_REG_ACC (1<<14) /* Bit 14:  Fiber/Copper Autoneg. reg acc */
-#define PHY_M_FC_RESULUTION (1<<13)     /* Bit 13:      Fiber/Copper Resulution */
-#define PHY_M_SER_IF_AN_BP  (1<<12) /* Bit 12:  Ser IF autoneg. bypass enable */
-#define PHY_M_SER_IF_BP_ST      (1<<11) /* Bit 11:      Ser IF autoneg. bypass status */
-#define PHY_M_IRQ_POLARITY      (1<<10) /* Bit 10:      IRQ polarity */
-                                                                        /* Bit 9..4: reserved */
-#define PHY_M_UNDOC1            (1<< 7) /* undocumented bit !! */
-#define PHY_M_MODE_MASK         (0xf<<0)/* Bit 3..0: copy of HWCFG MODE[3:0] */
-
-
-/*****  PHY_MARV_CABLE_DIAG     16 bit r/o      Cable Diagnostic Reg *****/
-#define PHY_M_CABD_ENA_TEST     (1<<15) /* Bit 15:      Enable Test */
-#define PHY_M_CABD_STAT_MSK     (3<<13) /* Bit 14..13:  Status */
-                                                                        /* Bit 12.. 8:  reserved */
-#define PHY_M_CABD_DIST_MSK     0xff    /* Bit  7.. 0:  Distance */
-
-/* values for Cable Diagnostic Status (11=fail; 00=OK; 10=open; 01=short) */
-#define CABD_STAT_NORMAL        0
-#define CABD_STAT_SHORT         1
-#define CABD_STAT_OPEN          2
-#define CABD_STAT_FAIL          3
-
-
-/*
- * GMAC registers
- *
- * The GMAC registers are 16 or 32 bits wide.
- * The GMACs host processor interface is 16 bits wide,
- * therefore ALL registers will be addressed with 16 bit accesses.
- *
- * The following macros are provided to access the GMAC registers
- * GM_IN16(), GM_OUT16, GM_IN32(), GM_OUT32(), GM_INADR(), GM_OUTADR(),
- * GM_INHASH(), and GM_OUTHASH().
- * The macros are defined in SkGeHw.h.
- *
- * Note:        NA reg  = Network Address e.g DA, SA etc.
- *
- */
-
-/* Port Registers */
-#define GM_GP_STAT              0x0000          /* 16 bit r/o   General Purpose Status */
-#define GM_GP_CTRL              0x0004          /* 16 bit r/w   General Purpose Control */
-#define GM_TX_CTRL              0x0008          /* 16 bit r/w   Transmit Control Reg. */
-#define GM_RX_CTRL              0x000c          /* 16 bit r/w   Receive Control Reg. */
-#define GM_TX_FLOW_CTRL 0x0010          /* 16 bit r/w   Transmit Flow-Control */
-#define GM_TX_PARAM             0x0014          /* 16 bit r/w   Transmit Parameter Reg. */
-#define GM_SERIAL_MODE  0x0018          /* 16 bit r/w   Serial Mode Register */
-
-/* Source Address Registers */
-#define GM_SRC_ADDR_1L  0x001c          /* 16 bit r/w   Source Address 1 (low) */
-#define GM_SRC_ADDR_1M  0x0020          /* 16 bit r/w   Source Address 1 (middle) */
-#define GM_SRC_ADDR_1H  0x0024          /* 16 bit r/w   Source Address 1 (high) */
-#define GM_SRC_ADDR_2L  0x0028          /* 16 bit r/w   Source Address 2 (low) */
-#define GM_SRC_ADDR_2M  0x002c          /* 16 bit r/w   Source Address 2 (middle) */
-#define GM_SRC_ADDR_2H  0x0030          /* 16 bit r/w   Source Address 2 (high) */
-
-/* Multicast Address Hash Registers */
-#define GM_MC_ADDR_H1   0x0034          /* 16 bit r/w   Multicast Address Hash 1 */
-#define GM_MC_ADDR_H2   0x0038          /* 16 bit r/w   Multicast Address Hash 2 */
-#define GM_MC_ADDR_H3   0x003c          /* 16 bit r/w   Multicast Address Hash 3 */
-#define GM_MC_ADDR_H4   0x0040          /* 16 bit r/w   Multicast Address Hash 4 */
-
-/* Interrupt Source Registers */
-#define GM_TX_IRQ_SRC   0x0044          /* 16 bit r/o   Tx Overflow IRQ Source */
-#define GM_RX_IRQ_SRC   0x0048          /* 16 bit r/o   Rx Overflow IRQ Source */
-#define GM_TR_IRQ_SRC   0x004c          /* 16 bit r/o   Tx/Rx Over. IRQ Source */
-
-/* Interrupt Mask Registers */
-#define GM_TX_IRQ_MSK   0x0050          /* 16 bit r/w   Tx Overflow IRQ Mask */
-#define GM_RX_IRQ_MSK   0x0054          /* 16 bit r/w   Rx Overflow IRQ Mask */
-#define GM_TR_IRQ_MSK   0x0058          /* 16 bit r/w   Tx/Rx Over. IRQ Mask */
-
-/* Serial Management Interface (SMI) Registers */
-#define GM_SMI_CTRL             0x0080          /* 16 bit r/w   SMI Control Register */
-#define GM_SMI_DATA             0x0084          /* 16 bit r/w   SMI Data Register */
-#define GM_PHY_ADDR             0x0088          /* 16 bit r/w   GPHY Address Register */
-
-/* MIB Counters */
-#define GM_MIB_CNT_BASE 0x0100          /* Base Address of MIB Counters */
-#define GM_MIB_CNT_SIZE 44                      /* Number of MIB Counters */
-
-/*
- * MIB Counters base address definitions (low word) -
- * use offset 4 for access to high word (32 bit r/o)
- */
-#define GM_RXF_UC_OK \
-                        (GM_MIB_CNT_BASE + 0)   /* Unicast Frames Received OK */
-#define GM_RXF_BC_OK \
-                        (GM_MIB_CNT_BASE + 8)   /* Broadcast Frames Received OK */
-#define GM_RXF_MPAUSE \
-                        (GM_MIB_CNT_BASE + 16)  /* Pause MAC Ctrl Frames Received */
-#define GM_RXF_MC_OK \
-                        (GM_MIB_CNT_BASE + 24)  /* Multicast Frames Received OK */
-#define GM_RXF_FCS_ERR \
-                        (GM_MIB_CNT_BASE + 32)  /* Rx Frame Check Seq. Error */
-        /* GM_MIB_CNT_BASE + 40:        reserved */
-#define GM_RXO_OK_LO \
-                        (GM_MIB_CNT_BASE + 48)  /* Octets Received OK Low */
-#define GM_RXO_OK_HI \
-                        (GM_MIB_CNT_BASE + 56)  /* Octets Received OK High */
-#define GM_RXO_ERR_LO \
-                        (GM_MIB_CNT_BASE + 64)  /* Octets Received Invalid Low */
-#define GM_RXO_ERR_HI \
-                        (GM_MIB_CNT_BASE + 72)  /* Octets Received Invalid High */
-#define GM_RXF_SHT \
-                        (GM_MIB_CNT_BASE + 80)  /* Frames <64 Byte Received OK */
-#define GM_RXE_FRAG \
-                        (GM_MIB_CNT_BASE + 88)  /* Frames <64 Byte Received with FCS Err */
-#define GM_RXF_64B \
-                        (GM_MIB_CNT_BASE + 96)  /* 64 Byte Rx Frame */
-#define GM_RXF_127B \
-                        (GM_MIB_CNT_BASE + 104) /* 65-127 Byte Rx Frame */
-#define GM_RXF_255B \
-                        (GM_MIB_CNT_BASE + 112) /* 128-255 Byte Rx Frame */
-#define GM_RXF_511B \
-                        (GM_MIB_CNT_BASE + 120) /* 256-511 Byte Rx Frame */
-#define GM_RXF_1023B \
-                        (GM_MIB_CNT_BASE + 128) /* 512-1023 Byte Rx Frame */
-#define GM_RXF_1518B \
-                        (GM_MIB_CNT_BASE + 136) /* 1024-1518 Byte Rx Frame */
-#define GM_RXF_MAX_SZ \
-                        (GM_MIB_CNT_BASE + 144) /* 1519-MaxSize Byte Rx Frame */
-#define GM_RXF_LNG_ERR \
-                        (GM_MIB_CNT_BASE + 152) /* Rx Frame too Long Error */
-#define GM_RXF_JAB_PKT \
-                        (GM_MIB_CNT_BASE + 160) /* Rx Jabber Packet Frame */
-        /* GM_MIB_CNT_BASE + 168:       reserved */
-#define GM_RXE_FIFO_OV \
-                        (GM_MIB_CNT_BASE + 176) /* Rx FIFO overflow Event */
-        /* GM_MIB_CNT_BASE + 184:       reserved */
-#define GM_TXF_UC_OK \
-                        (GM_MIB_CNT_BASE + 192) /* Unicast Frames Xmitted OK */
-#define GM_TXF_BC_OK \
-                        (GM_MIB_CNT_BASE + 200) /* Broadcast Frames Xmitted OK */
-#define GM_TXF_MPAUSE \
-                        (GM_MIB_CNT_BASE + 208) /* Pause MAC Ctrl Frames Xmitted */
-#define GM_TXF_MC_OK \
-                        (GM_MIB_CNT_BASE + 216) /* Multicast Frames Xmitted OK */
-#define GM_TXO_OK_LO \
-                        (GM_MIB_CNT_BASE + 224) /* Octets Transmitted OK Low */
-#define GM_TXO_OK_HI \
-                        (GM_MIB_CNT_BASE + 232) /* Octets Transmitted OK High */
-#define GM_TXF_64B \
-                        (GM_MIB_CNT_BASE + 240) /* 64 Byte Tx Frame */
-#define GM_TXF_127B \
-                        (GM_MIB_CNT_BASE + 248) /* 65-127 Byte Tx Frame */
-#define GM_TXF_255B \
-                        (GM_MIB_CNT_BASE + 256) /* 128-255 Byte Tx Frame */
-#define GM_TXF_511B \
-                        (GM_MIB_CNT_BASE + 264) /* 256-511 Byte Tx Frame */
-#define GM_TXF_1023B \
-                        (GM_MIB_CNT_BASE + 272) /* 512-1023 Byte Tx Frame */
-#define GM_TXF_1518B \
-                        (GM_MIB_CNT_BASE + 280) /* 1024-1518 Byte Tx Frame */
-#define GM_TXF_MAX_SZ \
-                        (GM_MIB_CNT_BASE + 288) /* 1519-MaxSize Byte Tx Frame */
-        /* GM_MIB_CNT_BASE + 296:       reserved */
-#define GM_TXF_COL \
-                        (GM_MIB_CNT_BASE + 304) /* Tx Collision */
-#define GM_TXF_LAT_COL \
-                        (GM_MIB_CNT_BASE + 312) /* Tx Late Collision */
-#define GM_TXF_ABO_COL \
-                        (GM_MIB_CNT_BASE + 320) /* Tx aborted due to Exces. Col. */
-#define GM_TXF_MUL_COL \
-                        (GM_MIB_CNT_BASE + 328) /* Tx Multiple Collision */
-#define GM_TXF_SNG_COL \
-                        (GM_MIB_CNT_BASE + 336) /* Tx Single Collision */
-#define GM_TXE_FIFO_UR \
-                        (GM_MIB_CNT_BASE + 344) /* Tx FIFO Underrun Event */
-
-/*----------------------------------------------------------------------------*/
-/*
- * GMAC Bit Definitions
- *
- * If the bit access behaviour differs from the register access behaviour
- * (r/w, r/o) this is documented after the bit number.
- * The following bit access behaviours are used:
- *      (sc)    self clearing
- *      (r/o)   read only
- */
-
-/*      GM_GP_STAT      16 bit r/o      General Purpose Status Register */
-#define GM_GPSR_SPEED           (1<<15) /* Bit 15:      Port Speed (1 = 100 Mbps) */
-#define GM_GPSR_DUPLEX          (1<<14) /* Bit 14:      Duplex Mode (1 = Full) */
-#define GM_GPSR_FC_TX_DIS       (1<<13) /* Bit 13:      Tx Flow-Control Mode Disabled */
-#define GM_GPSR_LINK_UP         (1<<12) /* Bit 12:      Link Up Status */
-#define GM_GPSR_PAUSE           (1<<11) /* Bit 11:      Pause State */
-#define GM_GPSR_TX_ACTIVE       (1<<10) /* Bit 10:      Tx in Progress */
-#define GM_GPSR_EXC_COL         (1<<9)  /* Bit  9:      Excessive Collisions Occured */
-#define GM_GPSR_LAT_COL         (1<<8)  /* Bit  8:      Late Collisions Occured */
-                                                                /* Bit  7..6:   reserved */
-#define GM_GPSR_PHY_ST_CH       (1<<5)  /* Bit  5:      PHY Status Change */
-#define GM_GPSR_GIG_SPEED       (1<<4)  /* Bit  4:      Gigabit Speed (1 = 1000 Mbps) */
-#define GM_GPSR_PART_MODE       (1<<3)  /* Bit  3:      Partition mode */
-#define GM_GPSR_FC_RX_DIS       (1<<2)  /* Bit  2:      Rx Flow-Control Mode Disabled */
-#define GM_GPSR_PROM_EN         (1<<1)  /* Bit  1:      Promiscuous Mode Enabled */
-                                                                /* Bit  0:      reserved */
-        
-/*      GM_GP_CTRL      16 bit r/w      General Purpose Control Register */
-                                                                /* Bit 15:      reserved */
-#define GM_GPCR_PROM_ENA        (1<<14) /* Bit 14:      Enable Promiscuous Mode */
-#define GM_GPCR_FC_TX_DIS       (1<<13) /* Bit 13:      Disable Tx Flow-Control Mode */
-#define GM_GPCR_TX_ENA          (1<<12) /* Bit 12:      Enable Transmit */
-#define GM_GPCR_RX_ENA          (1<<11) /* Bit 11:      Enable Receive */
-#define GM_GPCR_BURST_ENA       (1<<10) /* Bit 10:      Enable Burst Mode */
-#define GM_GPCR_LOOP_ENA        (1<<9)  /* Bit  9:      Enable MAC Loopback Mode */
-#define GM_GPCR_PART_ENA        (1<<8)  /* Bit  8:      Enable Partition Mode */
-#define GM_GPCR_GIGS_ENA        (1<<7)  /* Bit  7:      Gigabit Speed (1000 Mbps) */
-#define GM_GPCR_FL_PASS         (1<<6)  /* Bit  6:      Force Link Pass */
-#define GM_GPCR_DUP_FULL        (1<<5)  /* Bit  5:      Full Duplex Mode */
-#define GM_GPCR_FC_RX_DIS       (1<<4)  /* Bit  4:      Disable Rx Flow-Control Mode */
-#define GM_GPCR_SPEED_100       (1<<3)  /* Bit  3:      Port Speed 100 Mbps */
-#define GM_GPCR_AU_DUP_DIS      (1<<2)  /* Bit  2:      Disable Auto-Update Duplex */
-#define GM_GPCR_AU_FCT_DIS      (1<<1)  /* Bit  1:      Disable Auto-Update Flow-C. */
-#define GM_GPCR_AU_SPD_DIS      (1<<0)  /* Bit  0:      Disable Auto-Update Speed */
-
-#define GM_GPCR_SPEED_1000      (GM_GPCR_GIGS_ENA | GM_GPCR_SPEED_100)
-#define GM_GPCR_AU_ALL_DIS      (GM_GPCR_AU_DUP_DIS | GM_GPCR_AU_FCT_DIS |\
-                                                         GM_GPCR_AU_SPD_DIS)
-        
-/*      GM_TX_CTRL                              16 bit r/w      Transmit Control Register */
-#define GM_TXCR_FORCE_JAM       (1<<15) /* Bit 15:      Force Jam / Flow-Control */
-#define GM_TXCR_CRC_DIS         (1<<14) /* Bit 14:      Disable insertion of CRC */
-#define GM_TXCR_PAD_DIS         (1<<13) /* Bit 13:      Disable padding of packets */
-#define GM_TXCR_COL_THR_MSK     (7<<10) /* Bit 12..10:  Collision Threshold */
-
-#define TX_COL_THR(x)           (SHIFT10(x) & GM_TXCR_COL_THR_MSK)
-
-#define TX_COL_DEF                      0x04
-        
-/*      GM_RX_CTRL                              16 bit r/w      Receive Control Register */
-#define GM_RXCR_UCF_ENA         (1<<15) /* Bit 15:      Enable Unicast filtering */
-#define GM_RXCR_MCF_ENA         (1<<14) /* Bit 14:      Enable Multicast filtering */
-#define GM_RXCR_CRC_DIS         (1<<13) /* Bit 13:      Remove 4-byte CRC */
-#define GM_RXCR_PASS_FC         (1<<12) /* Bit 12:      Pass FC packets to FIFO */
-        
-/*      GM_TX_PARAM                             16 bit r/w      Transmit Parameter Register */
-#define GM_TXPA_JAMLEN_MSK      (0x03<<14)      /* Bit 15..14:  Jam Length */
-#define GM_TXPA_JAMIPG_MSK      (0x1f<<9)       /* Bit 13..9:   Jam IPG */
-#define GM_TXPA_JAMDAT_MSK      (0x1f<<4)       /* Bit  8..4:   IPG Jam to Data */
-                                                                /* Bit  3..0:   reserved */
-
-#define TX_JAM_LEN_VAL(x)       (SHIFT14(x) & GM_TXPA_JAMLEN_MSK)
-#define TX_JAM_IPG_VAL(x)       (SHIFT9(x) & GM_TXPA_JAMIPG_MSK)
-#define TX_IPG_JAM_DATA(x)      (SHIFT4(x) & GM_TXPA_JAMDAT_MSK)
-
-#define TX_JAM_LEN_DEF          0x03
-#define TX_JAM_IPG_DEF          0x0b
-#define TX_IPG_JAM_DEF          0x1c
-
-/*      GM_SERIAL_MODE                  16 bit r/w      Serial Mode Register */
-#define GM_SMOD_DATABL_MSK      (0x1f<<11)      /* Bit 15..11:  Data Blinder (r/o) */
-#define GM_SMOD_LIMIT_4         (1<<10) /* Bit 10:      4 consecutive Tx trials */
-#define GM_SMOD_VLAN_ENA        (1<<9)  /* Bit  9:      Enable VLAN  (Max. Frame Len) */
-#define GM_SMOD_JUMBO_ENA       (1<<8)  /* Bit  8:      Enable Jumbo (Max. Frame Len) */
-                                                                /* Bit  7..5:   reserved */
-#define GM_SMOD_IPG_MSK         0x1f    /* Bit 4..0:    Inter-Packet Gap (IPG) */
-        
-#define DATA_BLIND_VAL(x)       (SHIFT11(x) & GM_SMOD_DATABL_MSK)
-#define DATA_BLIND_DEF          0x04
-
-#define IPG_DATA_VAL(x)         (x & GM_SMOD_IPG_MSK)
-#define IPG_DATA_DEF            0x1e
-
-/*      GM_SMI_CTRL                             16 bit r/w      SMI Control Register */
-#define GM_SMI_CT_PHY_A_MSK     (0x1f<<11)      /* Bit 15..11:  PHY Device Address */
-#define GM_SMI_CT_REG_A_MSK     (0x1f<<6)       /* Bit 10.. 6:  PHY Register Address */
-#define GM_SMI_CT_OP_RD         (1<<5)  /* Bit  5:      OpCode Read (0=Write)*/
-#define GM_SMI_CT_RD_VAL        (1<<4)  /* Bit  4:      Read Valid (Read completed) */
-#define GM_SMI_CT_BUSY          (1<<3)  /* Bit  3:      Busy (Operation in progress) */
-                                                                /* Bit   2..0:  reserved */
-        
-#define GM_SMI_CT_PHY_AD(x)     (SHIFT11(x) & GM_SMI_CT_PHY_A_MSK)
-#define GM_SMI_CT_REG_AD(x)     (SHIFT6(x) & GM_SMI_CT_REG_A_MSK)
-
-        /*      GM_PHY_ADDR                             16 bit r/w      GPHY Address Register */
-                                                                /* Bit  15..6:  reserved */
-#define GM_PAR_MIB_CLR          (1<<5)  /* Bit  5:      Set MIB Clear Counter Mode */
-#define GM_PAR_MIB_TST          (1<<4)  /* Bit  4:      MIB Load Counter (Test Mode) */
-                                                                /* Bit   3..0:  reserved */
-        
-/* Receive Frame Status Encoding */
-#define GMR_FS_LEN      (0xffffUL<<16)  /* Bit 31..16:  Rx Frame Length */
-                                                                /* Bit  15..14: reserved */
-#define GMR_FS_VLAN             (1L<<13)        /* Bit 13:      VLAN Packet */
-#define GMR_FS_JABBER   (1L<<12)        /* Bit 12:      Jabber Packet */
-#define GMR_FS_UN_SIZE  (1L<<11)        /* Bit 11:      Undersize Packet */
-#define GMR_FS_MC               (1L<<10)        /* Bit 10:      Multicast Packet */
-#define GMR_FS_BC               (1L<<9)         /* Bit  9:      Broadcast Packet */
-#define GMR_FS_RX_OK    (1L<<8)         /* Bit  8:      Receive OK (Good Packet) */
-#define GMR_FS_GOOD_FC  (1L<<7)         /* Bit  7:      Good Flow-Control Packet */
-#define GMR_FS_BAD_FC   (1L<<6)         /* Bit  6:      Bad  Flow-Control Packet */
-#define GMR_FS_MII_ERR  (1L<<5)         /* Bit  5:      MII Error */
-#define GMR_FS_LONG_ERR (1L<<4)         /* Bit  4:      Too Long Packet */
-#define GMR_FS_FRAGMENT (1L<<3)         /* Bit  3:      Fragment */
-                                                                /* Bit  2:      reserved */
-#define GMR_FS_CRC_ERR  (1L<<1)         /* Bit  1:      CRC Error */
-#define GMR_FS_RX_FF_OV (1L<<0)         /* Bit  0:      Rx FIFO Overflow */
-
-/*
- * GMR_FS_ANY_ERR (analogous to XMR_FS_ANY_ERR)
- */
-#define GMR_FS_ANY_ERR  (GMR_FS_CRC_ERR | \
-                        GMR_FS_LONG_ERR | \
-                        GMR_FS_MII_ERR | \
-                        GMR_FS_BAD_FC | \
-                        GMR_FS_GOOD_FC | \
-                        GMR_FS_JABBER)
-
-/* Rx GMAC FIFO Flush Mask (default) */
-#define RX_FF_FL_DEF_MSK        (GMR_FS_CRC_ERR | \
-                        GMR_FS_RX_FF_OV | \
-                        GMR_FS_MII_ERR | \
-                        GMR_FS_BAD_FC | \
-                        GMR_FS_GOOD_FC | \
-                        GMR_FS_UN_SIZE | \
-                        GMR_FS_JABBER)
-
-/* typedefs *******************************************************************/
-
-
-/* function prototypes ********************************************************/
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* __INC_XMAC_H */
diff --git a/drivers/net/sk98lin/skaddr.c b/drivers/net/sk98lin/skaddr.c
deleted file mode 100644
index 6e6c56aa6d6f..000000000000
--- a/drivers/net/sk98lin/skaddr.c
+++ /dev/null
@@ -1,1788 +0,0 @@
-/******************************************************************************
- *
- * Name:        skaddr.c
- * Project:     Gigabit Ethernet Adapters, ADDR-Module
- * Version:     $Revision: 1.52 $
- * Date:        $Date: 2003/06/02 13:46:15 $
- * Purpose:     Manage Addresses (Multicast and Unicast) and Promiscuous Mode.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * This module is intended to manage multicast addresses, address override,
- * and promiscuous mode on GEnesis and Yukon adapters.
- *
- * Address Layout:
- *      port address:           physical MAC address
- *      1st exact match:        logical MAC address (GEnesis only)
- *      2nd exact match:        RLMT multicast (GEnesis only)
- *      exact match 3-13:       OS-specific multicasts (GEnesis only)
- *
- * Include File Hierarchy:
- *
- *      "skdrv1st.h"
- *      "skdrv2nd.h"
- *
- ******************************************************************************/
-
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skaddr.c,v 1.52 2003/06/02 13:46:15 tschilli Exp $ (C) Marvell.";
-#endif /* DEBUG ||!LINT || !SK_SLIM */
-
-#define __SKADDR_C
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* cplusplus */
-
-#include "h/skdrv1st.h"
-#include "h/skdrv2nd.h"
-
-/* defines ********************************************************************/
-
-
-#define XMAC_POLY       0xEDB88320UL    /* CRC32-Poly - XMAC: Little Endian */
-#define GMAC_POLY       0x04C11DB7L     /* CRC16-Poly - GMAC: Little Endian */
-#define HASH_BITS       6                               /* #bits in hash */
-#define SK_MC_BIT       0x01
-
-/* Error numbers and messages. */
-
-#define SKERR_ADDR_E001         (SK_ERRBASE_ADDR + 0)
-#define SKERR_ADDR_E001MSG      "Bad Flags."
-#define SKERR_ADDR_E002         (SKERR_ADDR_E001 + 1)
-#define SKERR_ADDR_E002MSG      "New Error."
-
-/* typedefs *******************************************************************/
-
-/* None. */
-
-/* global variables ***********************************************************/
-
-/* 64-bit hash values with all bits set. */
-
-static const SK_U16     OnesHash[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
-
-/* local variables ************************************************************/
-
-#ifdef DEBUG
-static int      Next0[SK_MAX_MACS] = {0};
-#endif  /* DEBUG */
-
-static int SkAddrGmacMcAdd(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
-                           SK_MAC_ADDR *pMc, int Flags);
-static int SkAddrGmacMcClear(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
-                             int Flags);
-static int SkAddrGmacMcUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber);
-static int SkAddrGmacPromiscuousChange(SK_AC *pAC, SK_IOC IoC,
-                                       SK_U32 PortNumber, int NewPromMode);
-static int SkAddrXmacMcAdd(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
-                           SK_MAC_ADDR *pMc, int Flags);
-static int SkAddrXmacMcClear(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
-                             int Flags);
-static int SkAddrXmacMcUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber);
-static int SkAddrXmacPromiscuousChange(SK_AC *pAC, SK_IOC IoC,
-                                       SK_U32 PortNumber, int NewPromMode);
-
-/* functions ******************************************************************/
-
-/******************************************************************************
- *
- *      SkAddrInit - initialize data, set state to init
- *
- * Description:
- *
- *      SK_INIT_DATA
- *      ============
- *
- *      This routine clears the multicast tables and resets promiscuous mode.
- *      Some entries are reserved for the "logical MAC address", the
- *      SK-RLMT multicast address, and the BPDU multicast address.
- *
- *
- *      SK_INIT_IO
- *      ==========
- *
- *      All permanent MAC addresses are read from EPROM.
- *      If the current MAC addresses are not already set in software,
- *      they are set to the values of the permanent addresses.
- *      The current addresses are written to the corresponding MAC.
- *
- *
- *      SK_INIT_RUN
- *      ===========
- *
- *      Nothing.
- *
- * Context:
- *      init, pageable
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- */
-int     SkAddrInit(
-SK_AC   *pAC,   /* the adapter context */
-SK_IOC  IoC,    /* I/O context */
-int             Level)  /* initialization level */
-{
-        int                     j;
-        SK_U32          i;
-        SK_U8           *InAddr;
-        SK_U16          *OutAddr;
-        SK_ADDR_PORT    *pAPort;
-
-        switch (Level) {
-        case SK_INIT_DATA:
-                SK_MEMSET((char *) &pAC->Addr, (SK_U8) 0,
-            (SK_U16) sizeof(SK_ADDR));
-
-                for (i = 0; i < SK_MAX_MACS; i++) {
-                        pAPort = &pAC->Addr.Port[i];
-                        pAPort->PromMode = SK_PROM_MODE_NONE;
-                        
-                        pAPort->FirstExactMatchRlmt = SK_ADDR_FIRST_MATCH_RLMT;
-                        pAPort->FirstExactMatchDrv = SK_ADDR_FIRST_MATCH_DRV;
-                        pAPort->NextExactMatchRlmt = SK_ADDR_FIRST_MATCH_RLMT;
-                        pAPort->NextExactMatchDrv = SK_ADDR_FIRST_MATCH_DRV;
-                }
-#ifdef xDEBUG
-                for (i = 0; i < SK_MAX_MACS; i++) {
-                        if (pAC->Addr.Port[i].NextExactMatchRlmt <
-                                SK_ADDR_FIRST_MATCH_RLMT) {
-                                Next0[i] |= 4;
-                        }
-                }
-#endif  /* DEBUG */
-                /* pAC->Addr.InitDone = SK_INIT_DATA; */
-                break;
-
-    case SK_INIT_IO:
-#ifndef SK_NO_RLMT
-                for (i = 0; i < SK_MAX_NETS; i++) {
-                        pAC->Addr.Net[i].ActivePort = pAC->Rlmt.Net[i].ActivePort;
-                }
-#endif /* !SK_NO_RLMT */
-#ifdef xDEBUG
-                for (i = 0; i < SK_MAX_MACS; i++) {
-                        if (pAC->Addr.Port[i].NextExactMatchRlmt <
-                                SK_ADDR_FIRST_MATCH_RLMT) {
-                                Next0[i] |= 8;
-                        }
-                }
-#endif  /* DEBUG */
-                
-                /* Read permanent logical MAC address from Control Register File. */
-                for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
-                        InAddr = (SK_U8 *) &pAC->Addr.Net[0].PermanentMacAddress.a[j];
-                        SK_IN8(IoC, B2_MAC_1 + j, InAddr);
-                }
-
-                if (!pAC->Addr.Net[0].CurrentMacAddressSet) {
-                        /* Set the current logical MAC address to the permanent one. */
-                        pAC->Addr.Net[0].CurrentMacAddress =
-                                pAC->Addr.Net[0].PermanentMacAddress;
-                        pAC->Addr.Net[0].CurrentMacAddressSet = SK_TRUE;
-                }
-
-                /* Set the current logical MAC address. */
-                pAC->Addr.Port[pAC->Addr.Net[0].ActivePort].Exact[0] =
-                        pAC->Addr.Net[0].CurrentMacAddress;
-#if SK_MAX_NETS > 1
-                /* Set logical MAC address for net 2 to (log | 3). */
-                if (!pAC->Addr.Net[1].CurrentMacAddressSet) {
-                        pAC->Addr.Net[1].PermanentMacAddress =
-                                pAC->Addr.Net[0].PermanentMacAddress;
-                        pAC->Addr.Net[1].PermanentMacAddress.a[5] |= 3;
-                        /* Set the current logical MAC address to the permanent one. */
-                        pAC->Addr.Net[1].CurrentMacAddress =
-                                pAC->Addr.Net[1].PermanentMacAddress;
-                        pAC->Addr.Net[1].CurrentMacAddressSet = SK_TRUE;
-                }
-#endif  /* SK_MAX_NETS > 1 */
-
-#ifdef DEBUG
-                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
-                                ("Permanent MAC Address (Net%d): %02X %02X %02X %02X %02X %02X\n",
-                                        i,
-                                        pAC->Addr.Net[i].PermanentMacAddress.a[0],
-                                        pAC->Addr.Net[i].PermanentMacAddress.a[1],
-                                        pAC->Addr.Net[i].PermanentMacAddress.a[2],
-                                        pAC->Addr.Net[i].PermanentMacAddress.a[3],
-                                        pAC->Addr.Net[i].PermanentMacAddress.a[4],
-                                        pAC->Addr.Net[i].PermanentMacAddress.a[5]))
-                        
-                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
-                                ("Logical MAC Address (Net%d): %02X %02X %02X %02X %02X %02X\n",
-                                        i,
-                                        pAC->Addr.Net[i].CurrentMacAddress.a[0],
-                                        pAC->Addr.Net[i].CurrentMacAddress.a[1],
-                                        pAC->Addr.Net[i].CurrentMacAddress.a[2],
-                                        pAC->Addr.Net[i].CurrentMacAddress.a[3],
-                                        pAC->Addr.Net[i].CurrentMacAddress.a[4],
-                                        pAC->Addr.Net[i].CurrentMacAddress.a[5]))
-                }
-#endif  /* DEBUG */
-
-                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
-                        pAPort = &pAC->Addr.Port[i];
-
-                        /* Read permanent port addresses from Control Register File. */
-                        for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
-                                InAddr = (SK_U8 *) &pAPort->PermanentMacAddress.a[j];
-                                SK_IN8(IoC, B2_MAC_2 + 8 * i + j, InAddr);
-                        }
-
-                        if (!pAPort->CurrentMacAddressSet) {
-                                /*
-                                 * Set the current and previous physical MAC address
-                                 * of this port to its permanent MAC address.
-                                 */
-                                pAPort->CurrentMacAddress = pAPort->PermanentMacAddress;
-                                pAPort->PreviousMacAddress = pAPort->PermanentMacAddress;
-                                pAPort->CurrentMacAddressSet = SK_TRUE;
-                        }
-
-                        /* Set port's current physical MAC address. */
-                        OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
-#ifdef GENESIS
-                        if (pAC->GIni.GIGenesis) {
-                                XM_OUTADDR(IoC, i, XM_SA, OutAddr);
-                        }
-#endif /* GENESIS */
-#ifdef YUKON
-                        if (!pAC->GIni.GIGenesis) {
-                                GM_OUTADDR(IoC, i, GM_SRC_ADDR_1L, OutAddr);
-                        }
-#endif /* YUKON */
-#ifdef DEBUG
-                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
-                                ("SkAddrInit: Permanent Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
-                                        pAPort->PermanentMacAddress.a[0],
-                                        pAPort->PermanentMacAddress.a[1],
-                                        pAPort->PermanentMacAddress.a[2],
-                                        pAPort->PermanentMacAddress.a[3],
-                                        pAPort->PermanentMacAddress.a[4],
-                                        pAPort->PermanentMacAddress.a[5]))
-                        
-                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
-                                ("SkAddrInit: Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
-                                        pAPort->CurrentMacAddress.a[0],
-                                        pAPort->CurrentMacAddress.a[1],
-                                        pAPort->CurrentMacAddress.a[2],
-                                        pAPort->CurrentMacAddress.a[3],
-                                        pAPort->CurrentMacAddress.a[4],
-                                        pAPort->CurrentMacAddress.a[5]))
-#endif /* DEBUG */
-                }
-                /* pAC->Addr.InitDone = SK_INIT_IO; */
-                break;
-
-        case SK_INIT_RUN:
-#ifdef xDEBUG
-                for (i = 0; i < SK_MAX_MACS; i++) {
-                        if (pAC->Addr.Port[i].NextExactMatchRlmt <
-                                SK_ADDR_FIRST_MATCH_RLMT) {
-                                Next0[i] |= 16;
-                        }
-                }
-#endif  /* DEBUG */
-
-                /* pAC->Addr.InitDone = SK_INIT_RUN; */
-                break;
-
-        default:        /* error */
-                break;
-        }
-
-        return (SK_ADDR_SUCCESS);
-        
-}       /* SkAddrInit */
-
-#ifndef SK_SLIM
-
-/******************************************************************************
- *
- *      SkAddrMcClear - clear the multicast table
- *
- * Description:
- *      This routine clears the multicast table.
- *
- *      If not suppressed by Flag SK_MC_SW_ONLY, the hardware is updated
- *      immediately.
- *
- *      It calls either SkAddrXmacMcClear or SkAddrGmacMcClear, according
- *      to the adapter in use. The real work is done there.
- *
- * Context:
- *      runtime, pageable
- *      may be called starting with SK_INIT_DATA with flag SK_MC_SW_ONLY
- *      may be called after SK_INIT_IO without limitation
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- *      SK_ADDR_ILLEGAL_PORT
- */
-int     SkAddrMcClear(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* I/O context */
-SK_U32  PortNumber,     /* Index of affected port */
-int             Flags)          /* permanent/non-perm, sw-only */
-{
-        int ReturnCode;
-        
-        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-        
-        if (pAC->GIni.GIGenesis) {
-                ReturnCode = SkAddrXmacMcClear(pAC, IoC, PortNumber, Flags);
-        }
-        else {
-                ReturnCode = SkAddrGmacMcClear(pAC, IoC, PortNumber, Flags);
-        }
-
-        return (ReturnCode);
-
-}       /* SkAddrMcClear */
-
-#endif /* !SK_SLIM */
-
-#ifndef SK_SLIM
-
-/******************************************************************************
- *
- *      SkAddrXmacMcClear - clear the multicast table
- *
- * Description:
- *      This routine clears the multicast table
- *      (either entry 2 or entries 3-16 and InexactFilter) of the given port.
- *      If not suppressed by Flag SK_MC_SW_ONLY, the hardware is updated
- *      immediately.
- *
- * Context:
- *      runtime, pageable
- *      may be called starting with SK_INIT_DATA with flag SK_MC_SW_ONLY
- *      may be called after SK_INIT_IO without limitation
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- *      SK_ADDR_ILLEGAL_PORT
- */
-static int      SkAddrXmacMcClear(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* I/O context */
-SK_U32  PortNumber,     /* Index of affected port */
-int             Flags)          /* permanent/non-perm, sw-only */
-{
-        int i;
-
-        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
-
-                /* Clear RLMT multicast addresses. */
-                pAC->Addr.Port[PortNumber].NextExactMatchRlmt = SK_ADDR_FIRST_MATCH_RLMT;
-        }
-        else {  /* not permanent => DRV */
-
-                /* Clear InexactFilter */
-                for (i = 0; i < 8; i++) {
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0;
-                }
-
-                /* Clear DRV multicast addresses. */
-
-                pAC->Addr.Port[PortNumber].NextExactMatchDrv = SK_ADDR_FIRST_MATCH_DRV;
-        }
-
-        if (!(Flags & SK_MC_SW_ONLY)) {
-                (void) SkAddrXmacMcUpdate(pAC, IoC, PortNumber);
-        }
-
-        return (SK_ADDR_SUCCESS);
-        
-}       /* SkAddrXmacMcClear */
-
-#endif /* !SK_SLIM */
-
-#ifndef SK_SLIM
-
-/******************************************************************************
- *
- *      SkAddrGmacMcClear - clear the multicast table
- *
- * Description:
- *      This routine clears the multicast hashing table (InexactFilter)
- *      (either the RLMT or the driver bits) of the given port.
- *
- *      If not suppressed by Flag SK_MC_SW_ONLY, the hardware is updated
- *      immediately.
- *
- * Context:
- *      runtime, pageable
- *      may be called starting with SK_INIT_DATA with flag SK_MC_SW_ONLY
- *      may be called after SK_INIT_IO without limitation
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- *      SK_ADDR_ILLEGAL_PORT
- */
-static int      SkAddrGmacMcClear(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* I/O context */
-SK_U32  PortNumber,     /* Index of affected port */
-int             Flags)          /* permanent/non-perm, sw-only */
-{
-        int i;
-
-#ifdef DEBUG
-        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("GMAC InexactFilter (not cleared): %02X %02X %02X %02X %02X %02X %02X %02X\n",
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[1],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[2],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[3],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[4],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[5],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[6],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]))
-#endif  /* DEBUG */
-
-        /* Clear InexactFilter */
-        for (i = 0; i < 8; i++) {
-                pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0;
-        }
-        
-        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
-                
-                /* Copy DRV bits to InexactFilter. */
-                for (i = 0; i < 8; i++) {
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
-                                pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[i];
-                        
-                        /* Clear InexactRlmtFilter. */
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[i] = 0;
-
-                }               
-        }
-        else {  /* not permanent => DRV */
-                
-                /* Copy RLMT bits to InexactFilter. */
-                for (i = 0; i < 8; i++) {
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
-                                pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[i];
-                        
-                        /* Clear InexactDrvFilter. */
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[i] = 0;
-                }
-        }
-        
-#ifdef DEBUG
-        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("GMAC InexactFilter (cleared): %02X %02X %02X %02X %02X %02X %02X %02X\n",
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[1],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[2],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[3],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[4],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[5],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[6],
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]))
-#endif  /* DEBUG */
-        
-        if (!(Flags & SK_MC_SW_ONLY)) {
-                (void) SkAddrGmacMcUpdate(pAC, IoC, PortNumber);
-        }
-        
-        return (SK_ADDR_SUCCESS);
-
-}       /* SkAddrGmacMcClear */
-
-#ifndef SK_ADDR_CHEAT
-
-/******************************************************************************
- *
- *      SkXmacMcHash - hash multicast address
- *
- * Description:
- *      This routine computes the hash value for a multicast address.
- *      A CRC32 algorithm is used.
- *
- * Notes:
- *      The code was adapted from the XaQti data sheet.
- *
- * Context:
- *      runtime, pageable
- *
- * Returns:
- *      Hash value of multicast address.
- */
-static SK_U32 SkXmacMcHash(
-unsigned char *pMc)     /* Multicast address */
-{
-        SK_U32 Idx;
-        SK_U32 Bit;
-        SK_U32 Data;
-        SK_U32 Crc;
-
-        Crc = 0xFFFFFFFFUL;
-        for (Idx = 0; Idx < SK_MAC_ADDR_LEN; Idx++) {
-                Data = *pMc++;
-                for (Bit = 0; Bit < 8; Bit++, Data >>= 1) {
-                        Crc = (Crc >> 1) ^ (((Crc ^ Data) & 1) ? XMAC_POLY : 0);
-                }
-        }
-
-        return (Crc & ((1 << HASH_BITS) - 1));
-
-}       /* SkXmacMcHash */
-
-
-/******************************************************************************
- *
- *      SkGmacMcHash - hash multicast address
- *
- * Description:
- *      This routine computes the hash value for a multicast address.
- *      A CRC16 algorithm is used.
- *
- * Notes:
- *
- *
- * Context:
- *      runtime, pageable
- *
- * Returns:
- *      Hash value of multicast address.
- */
-static SK_U32 SkGmacMcHash(
-unsigned char *pMc)     /* Multicast address */
-{
-        SK_U32 Data;
-        SK_U32 TmpData;
-        SK_U32 Crc;
-        int Byte;
-        int Bit;
-
-        Crc = 0xFFFFFFFFUL;
-        for (Byte = 0; Byte < 6; Byte++) {
-                /* Get next byte. */
-                Data = (SK_U32) pMc[Byte];
-                
-                /* Change bit order in byte. */
-                TmpData = Data;
-                for (Bit = 0; Bit < 8; Bit++) {
-                        if (TmpData & 1L) {
-                                Data |=  1L << (7 - Bit);
-                        }
-                        else {
-                                Data &= ~(1L << (7 - Bit));
-                        }
-                        TmpData >>= 1;
-                }
-                
-                Crc ^= (Data << 24);
-                for (Bit = 0; Bit < 8; Bit++) {
-                        if (Crc & 0x80000000) {
-                                Crc = (Crc << 1) ^ GMAC_POLY;
-                        }
-                        else {
-                                Crc <<= 1;
-                        }
-                }
-        }
-        
-        return (Crc & ((1 << HASH_BITS) - 1));
-
-}       /* SkGmacMcHash */
-
-#endif  /* !SK_ADDR_CHEAT */
-
-/******************************************************************************
- *
- *      SkAddrMcAdd - add a multicast address to a port
- *
- * Description:
- *      This routine enables reception for a given address on the given port.
- *
- *      It calls either SkAddrXmacMcAdd or SkAddrGmacMcAdd, according to the
- *      adapter in use. The real work is done there.
- *
- * Notes:
- *      The return code is only valid for SK_PROM_MODE_NONE.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_DATA
- *
- * Returns:
- *      SK_MC_FILTERING_EXACT
- *      SK_MC_FILTERING_INEXACT
- *      SK_MC_ILLEGAL_ADDRESS
- *      SK_MC_ILLEGAL_PORT
- *      SK_MC_RLMT_OVERFLOW
- */
-int     SkAddrMcAdd(
-SK_AC           *pAC,           /* adapter context */
-SK_IOC          IoC,            /* I/O context */
-SK_U32          PortNumber,     /* Port Number */
-SK_MAC_ADDR     *pMc,           /* multicast address to be added */
-int                     Flags)          /* permanent/non-permanent */
-{
-        int ReturnCode;
-        
-        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-        
-        if (pAC->GIni.GIGenesis) {
-                ReturnCode = SkAddrXmacMcAdd(pAC, IoC, PortNumber, pMc, Flags);
-        }
-        else {
-                ReturnCode = SkAddrGmacMcAdd(pAC, IoC, PortNumber, pMc, Flags);
-        }
-
-        return (ReturnCode);
-
-}       /* SkAddrMcAdd */
-
-
-/******************************************************************************
- *
- *      SkAddrXmacMcAdd - add a multicast address to a port
- *
- * Description:
- *      This routine enables reception for a given address on the given port.
- *
- * Notes:
- *      The return code is only valid for SK_PROM_MODE_NONE.
- *
- *      The multicast bit is only checked if there are no free exact match
- *      entries.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_DATA
- *
- * Returns:
- *      SK_MC_FILTERING_EXACT
- *      SK_MC_FILTERING_INEXACT
- *      SK_MC_ILLEGAL_ADDRESS
- *      SK_MC_RLMT_OVERFLOW
- */
-static int      SkAddrXmacMcAdd(
-SK_AC           *pAC,           /* adapter context */
-SK_IOC          IoC,            /* I/O context */
-SK_U32          PortNumber,     /* Port Number */
-SK_MAC_ADDR     *pMc,           /* multicast address to be added */
-int             Flags)          /* permanent/non-permanent */
-{
-        int     i;
-        SK_U8   Inexact;
-#ifndef SK_ADDR_CHEAT
-        SK_U32 HashBit;
-#endif  /* !defined(SK_ADDR_CHEAT) */
-
-        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
-#ifdef xDEBUG
-                if (pAC->Addr.Port[PortNumber].NextExactMatchRlmt <
-                        SK_ADDR_FIRST_MATCH_RLMT) {
-                        Next0[PortNumber] |= 1;
-                        return (SK_MC_RLMT_OVERFLOW);
-                }
-#endif  /* DEBUG */
-                
-                if (pAC->Addr.Port[PortNumber].NextExactMatchRlmt >
-                        SK_ADDR_LAST_MATCH_RLMT) {
-                        return (SK_MC_RLMT_OVERFLOW);
-                }
-
-                /* Set a RLMT multicast address. */
-
-                pAC->Addr.Port[PortNumber].Exact[
-                        pAC->Addr.Port[PortNumber].NextExactMatchRlmt++] = *pMc;
-
-                return (SK_MC_FILTERING_EXACT);
-        }
-
-#ifdef xDEBUG
-        if (pAC->Addr.Port[PortNumber].NextExactMatchDrv <
-                SK_ADDR_FIRST_MATCH_DRV) {
-                        Next0[PortNumber] |= 2;
-                return (SK_MC_RLMT_OVERFLOW);
-        }
-#endif  /* DEBUG */
-        
-        if (pAC->Addr.Port[PortNumber].NextExactMatchDrv <= SK_ADDR_LAST_MATCH_DRV) {
-
-                /* Set exact match entry. */
-                pAC->Addr.Port[PortNumber].Exact[
-                        pAC->Addr.Port[PortNumber].NextExactMatchDrv++] = *pMc;
-
-                /* Clear InexactFilter */
-                for (i = 0; i < 8; i++) {
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0;
-                }
-        }
-        else {
-                if (!(pMc->a[0] & SK_MC_BIT)) {
-                        /* Hashing only possible with multicast addresses */
-                        return (SK_MC_ILLEGAL_ADDRESS);
-                }
-#ifndef SK_ADDR_CHEAT
-                /* Compute hash value of address. */
-                HashBit = 63 - SkXmacMcHash(&pMc->a[0]);
-
-                /* Add bit to InexactFilter. */
-                pAC->Addr.Port[PortNumber].InexactFilter.Bytes[HashBit / 8] |=
-                        1 << (HashBit % 8);
-#else   /* SK_ADDR_CHEAT */
-                /* Set all bits in InexactFilter. */
-                for (i = 0; i < 8; i++) {
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0xFF;
-                }
-#endif  /* SK_ADDR_CHEAT */
-        }
-
-        for (Inexact = 0, i = 0; i < 8; i++) {
-                Inexact |= pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i];
-        }
-
-        if (Inexact == 0 && pAC->Addr.Port[PortNumber].PromMode == 0) {
-                return (SK_MC_FILTERING_EXACT);
-        }
-        else {
-                return (SK_MC_FILTERING_INEXACT);
-        }
-
-}       /* SkAddrXmacMcAdd */
-
-
-/******************************************************************************
- *
- *      SkAddrGmacMcAdd - add a multicast address to a port
- *
- * Description:
- *      This routine enables reception for a given address on the given port.
- *
- * Notes:
- *      The return code is only valid for SK_PROM_MODE_NONE.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_DATA
- *
- * Returns:
- *      SK_MC_FILTERING_INEXACT
- *      SK_MC_ILLEGAL_ADDRESS
- */
-static int      SkAddrGmacMcAdd(
-SK_AC           *pAC,           /* adapter context */
-SK_IOC          IoC,            /* I/O context */
-SK_U32          PortNumber,     /* Port Number */
-SK_MAC_ADDR     *pMc,           /* multicast address to be added */
-int             Flags)          /* permanent/non-permanent */
-{
-        int     i;
-#ifndef SK_ADDR_CHEAT
-        SK_U32 HashBit;
-#endif  /* !defined(SK_ADDR_CHEAT) */
-                
-        if (!(pMc->a[0] & SK_MC_BIT)) {
-                /* Hashing only possible with multicast addresses */
-                return (SK_MC_ILLEGAL_ADDRESS);
-        }
-        
-#ifndef SK_ADDR_CHEAT
-        
-        /* Compute hash value of address. */
-        HashBit = SkGmacMcHash(&pMc->a[0]);
-        
-        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
-                
-                /* Add bit to InexactRlmtFilter. */
-                pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[HashBit / 8] |=
-                        1 << (HashBit % 8);
-                
-                /* Copy bit to InexactFilter. */
-                for (i = 0; i < 8; i++) {
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
-                                pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[i];
-                }
-#ifdef DEBUG
-                SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("GMAC InexactRlmtFilter: %02X %02X %02X %02X %02X %02X %02X %02X\n",
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[0],
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[1],
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[2],
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[3],
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[4],
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[5],
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[6],
-                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[7]))
-#endif  /* DEBUG */
-        }
-        else {  /* not permanent => DRV */
-                
-                /* Add bit to InexactDrvFilter. */
-                pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[HashBit / 8] |=
-                        1 << (HashBit % 8);
-                
-                /* Copy bit to InexactFilter. */
-                for (i = 0; i < 8; i++) {
-                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
-                                pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[i];
-                }
-#ifdef DEBUG
-                SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("GMAC InexactDrvFilter: %02X %02X %02X %02X %02X %02X %02X %02X\n",
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[0],
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[1],
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[2],
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[3],
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[4],
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[5],
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[6],
-                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[7]))
-#endif  /* DEBUG */
-        }
-        
-#else   /* SK_ADDR_CHEAT */
-        
-        /* Set all bits in InexactFilter. */
-        for (i = 0; i < 8; i++) {
-                pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0xFF;
-        }
-#endif  /* SK_ADDR_CHEAT */
-                
-        return (SK_MC_FILTERING_INEXACT);
-        
-}       /* SkAddrGmacMcAdd */
-
-#endif /* !SK_SLIM */
-
-/******************************************************************************
- *
- *      SkAddrMcUpdate - update the HW MC address table and set the MAC address
- *
- * Description:
- *      This routine enables reception of the addresses contained in a local
- *      table for a given port.
- *      It also programs the port's current physical MAC address.
- *
- *      It calls either SkAddrXmacMcUpdate or SkAddrGmacMcUpdate, according
- *      to the adapter in use. The real work is done there.
- *
- * Notes:
- *      The return code is only valid for SK_PROM_MODE_NONE.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_MC_FILTERING_EXACT
- *      SK_MC_FILTERING_INEXACT
- *      SK_ADDR_ILLEGAL_PORT
- */
-int     SkAddrMcUpdate(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* I/O context */
-SK_U32  PortNumber)     /* Port Number */
-{
-        int ReturnCode = 0;
-#if (!defined(SK_SLIM) || defined(DEBUG))
-        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-#endif /* !SK_SLIM || DEBUG */
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                ReturnCode = SkAddrXmacMcUpdate(pAC, IoC, PortNumber);
-        }
-#endif /* GENESIS */
-#ifdef YUKON
-        if (!pAC->GIni.GIGenesis) {
-                ReturnCode = SkAddrGmacMcUpdate(pAC, IoC, PortNumber);
-        }
-#endif /* YUKON */
-        return (ReturnCode);
-
-}       /* SkAddrMcUpdate */
-
-
-#ifdef GENESIS
-
-/******************************************************************************
- *
- *      SkAddrXmacMcUpdate - update the HW MC address table and set the MAC address
- *
- * Description:
- *      This routine enables reception of the addresses contained in a local
- *      table for a given port.
- *      It also programs the port's current physical MAC address.
- *
- * Notes:
- *      The return code is only valid for SK_PROM_MODE_NONE.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_MC_FILTERING_EXACT
- *      SK_MC_FILTERING_INEXACT
- *      SK_ADDR_ILLEGAL_PORT
- */
-static int      SkAddrXmacMcUpdate(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* I/O context */
-SK_U32  PortNumber)     /* Port Number */
-{
-        SK_U32          i;
-        SK_U8           Inexact;
-        SK_U16          *OutAddr;
-        SK_ADDR_PORT    *pAPort;
-
-        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("SkAddrXmacMcUpdate on Port %u.\n", PortNumber))
-        
-        pAPort = &pAC->Addr.Port[PortNumber];
-
-#ifdef DEBUG
-        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
-#endif /* DEBUG */
-
-        /* Start with 0 to also program the logical MAC address. */
-        for (i = 0; i < pAPort->NextExactMatchRlmt; i++) {
-                /* Set exact match address i on XMAC */
-                OutAddr = (SK_U16 *) &pAPort->Exact[i].a[0];
-                XM_OUTADDR(IoC, PortNumber, XM_EXM(i), OutAddr);
-        }
-
-        /* Clear other permanent exact match addresses on XMAC */
-        if (pAPort->NextExactMatchRlmt <= SK_ADDR_LAST_MATCH_RLMT) {
-                
-                SkXmClrExactAddr(pAC, IoC, PortNumber, pAPort->NextExactMatchRlmt,
-                        SK_ADDR_LAST_MATCH_RLMT);
-        }
-
-        for (i = pAPort->FirstExactMatchDrv; i < pAPort->NextExactMatchDrv; i++) {
-                OutAddr = (SK_U16 *) &pAPort->Exact[i].a[0];
-                XM_OUTADDR(IoC, PortNumber, XM_EXM(i), OutAddr);
-        }
-
-        /* Clear other non-permanent exact match addresses on XMAC */
-        if (pAPort->NextExactMatchDrv <= SK_ADDR_LAST_MATCH_DRV) {
-                
-                SkXmClrExactAddr(pAC, IoC, PortNumber, pAPort->NextExactMatchDrv,
-                        SK_ADDR_LAST_MATCH_DRV);
-        }
-
-        for (Inexact = 0, i = 0; i < 8; i++) {
-                Inexact |= pAPort->InexactFilter.Bytes[i];
-        }
-
-        if (pAPort->PromMode & SK_PROM_MODE_ALL_MC) {
-                
-                /* Set all bits in 64-bit hash register. */
-                XM_OUTHASH(IoC, PortNumber, XM_HSM, &OnesHash);
-                
-                /* Enable Hashing */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        else if (Inexact != 0) {
-                
-                /* Set 64-bit hash register to InexactFilter. */
-                XM_OUTHASH(IoC, PortNumber, XM_HSM, &pAPort->InexactFilter.Bytes[0]);
-                
-                /* Enable Hashing */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        else {
-                /* Disable Hashing */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_FALSE);
-        }
-
-        if (pAPort->PromMode != SK_PROM_MODE_NONE) {
-                (void) SkAddrXmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
-        }
-
-        /* Set port's current physical MAC address. */
-        OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
-        
-        XM_OUTADDR(IoC, PortNumber, XM_SA, OutAddr);
-
-#ifdef xDEBUG
-        for (i = 0; i < pAPort->NextExactMatchRlmt; i++) {
-                SK_U8           InAddr8[6];
-                SK_U16          *InAddr;
-
-                /* Get exact match address i from port PortNumber. */
-                InAddr = (SK_U16 *) &InAddr8[0];
-                
-                XM_INADDR(IoC, PortNumber, XM_EXM(i), InAddr);
-                
-                SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                        ("SkAddrXmacMcUpdate: MC address %d on Port %u: ",
-                         "%02x %02x %02x %02x %02x %02x -- %02x %02x %02x %02x %02x %02x\n",
-                                i,
-                                PortNumber,
-                                InAddr8[0],
-                                InAddr8[1],
-                                InAddr8[2],
-                                InAddr8[3],
-                                InAddr8[4],
-                                InAddr8[5],
-                                pAPort->Exact[i].a[0],
-                                pAPort->Exact[i].a[1],
-                                pAPort->Exact[i].a[2],
-                                pAPort->Exact[i].a[3],
-                                pAPort->Exact[i].a[4],
-                                pAPort->Exact[i].a[5]))
-        }
-#endif /* DEBUG */
-
-        /* Determine return value. */
-        if (Inexact == 0 && pAPort->PromMode == 0) {
-                return (SK_MC_FILTERING_EXACT);
-        }
-        else {
-                return (SK_MC_FILTERING_INEXACT);
-        }
-        
-}       /* SkAddrXmacMcUpdate */
-
-#endif  /* GENESIS */
-
-#ifdef YUKON
-
-/******************************************************************************
- *
- *      SkAddrGmacMcUpdate - update the HW MC address table and set the MAC address
- *
- * Description:
- *      This routine enables reception of the addresses contained in a local
- *      table for a given port.
- *      It also programs the port's current physical MAC address.
- *
- * Notes:
- *      The return code is only valid for SK_PROM_MODE_NONE.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_MC_FILTERING_EXACT
- *      SK_MC_FILTERING_INEXACT
- *      SK_ADDR_ILLEGAL_PORT
- */
-static int      SkAddrGmacMcUpdate(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* I/O context */
-SK_U32  PortNumber)     /* Port Number */
-{
-#ifndef SK_SLIM
-        SK_U32          i;
-        SK_U8           Inexact;
-#endif  /* not SK_SLIM */
-        SK_U16          *OutAddr;
-        SK_ADDR_PORT    *pAPort;
-
-        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("SkAddrGmacMcUpdate on Port %u.\n", PortNumber))
-        
-        pAPort = &pAC->Addr.Port[PortNumber];
-
-#ifdef DEBUG
-        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
-#endif /* DEBUG */
-        
-#ifndef SK_SLIM
-        for (Inexact = 0, i = 0; i < 8; i++) {
-                Inexact |= pAPort->InexactFilter.Bytes[i];
-        }
-        
-        /* Set 64-bit hash register to InexactFilter. */
-        GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1,
-                &pAPort->InexactFilter.Bytes[0]);
-        
-        if (pAPort->PromMode & SK_PROM_MODE_ALL_MC) {                           
-                
-                /* Set all bits in 64-bit hash register. */
-                GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
-                
-                /* Enable Hashing */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        else {  
-                /* Enable Hashing. */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        
-        if (pAPort->PromMode != SK_PROM_MODE_NONE) {
-                (void) SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
-        }
-#else /* SK_SLIM */
-
-        /* Set all bits in 64-bit hash register. */
-        GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
-
-        /* Enable Hashing */
-        SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        
-        (void) SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
-        
-#endif /* SK_SLIM */
-        
-        /* Set port's current physical MAC address. */
-        OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
-        GM_OUTADDR(IoC, PortNumber, GM_SRC_ADDR_1L, OutAddr);
-        
-        /* Set port's current logical MAC address. */
-        OutAddr = (SK_U16 *) &pAPort->Exact[0].a[0];
-        GM_OUTADDR(IoC, PortNumber, GM_SRC_ADDR_2L, OutAddr);
-        
-#ifdef DEBUG
-        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("SkAddrGmacMcUpdate: Permanent Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
-                        pAPort->Exact[0].a[0],
-                        pAPort->Exact[0].a[1],
-                        pAPort->Exact[0].a[2],
-                        pAPort->Exact[0].a[3],
-                        pAPort->Exact[0].a[4],
-                        pAPort->Exact[0].a[5]))
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                ("SkAddrGmacMcUpdate: Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
-                        pAPort->CurrentMacAddress.a[0],
-                        pAPort->CurrentMacAddress.a[1],
-                        pAPort->CurrentMacAddress.a[2],
-                        pAPort->CurrentMacAddress.a[3],
-                        pAPort->CurrentMacAddress.a[4],
-                        pAPort->CurrentMacAddress.a[5]))
-#endif /* DEBUG */
-        
-#ifndef SK_SLIM
-        /* Determine return value. */
-        if (Inexact == 0 && pAPort->PromMode == 0) {
-                return (SK_MC_FILTERING_EXACT);
-        }
-        else {
-                return (SK_MC_FILTERING_INEXACT);
-        }
-#else /* SK_SLIM */
-        return (SK_MC_FILTERING_INEXACT);
-#endif /* SK_SLIM */
-        
-}       /* SkAddrGmacMcUpdate */
-
-#endif /* YUKON */
-
-#ifndef SK_NO_MAO
-
-/******************************************************************************
- *
- *      SkAddrOverride - override a port's MAC address
- *
- * Description:
- *      This routine overrides the MAC address of one port.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_ADDR_SUCCESS if successful.
- *      SK_ADDR_DUPLICATE_ADDRESS if duplicate MAC address.
- *      SK_ADDR_MULTICAST_ADDRESS if multicast or broadcast address.
- *      SK_ADDR_TOO_EARLY if SK_INIT_IO was not executed before.
- */
-int     SkAddrOverride(
-SK_AC           *pAC,                           /* adapter context */
-SK_IOC          IoC,                            /* I/O context */
-SK_U32          PortNumber,                     /* Port Number */
-SK_MAC_ADDR     SK_FAR *pNewAddr,       /* new MAC address */
-int                     Flags)                          /* logical/physical MAC address */
-{
-#ifndef SK_NO_RLMT
-        SK_EVPARA       Para;
-#endif /* !SK_NO_RLMT */
-        SK_U32          NetNumber;
-        SK_U32          i;
-        SK_U16          SK_FAR *OutAddr;
-
-#ifndef SK_NO_RLMT
-        NetNumber = pAC->Rlmt.Port[PortNumber].Net->NetNumber;
-#else
-        NetNumber = 0;
-#endif /* SK_NO_RLMT */
-#if (!defined(SK_SLIM) || defined(DEBUG))
-        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-#endif /* !SK_SLIM || DEBUG */
-        if (pNewAddr != NULL && (pNewAddr->a[0] & SK_MC_BIT) != 0) {
-                return (SK_ADDR_MULTICAST_ADDRESS);
-        }
-
-        if (!pAC->Addr.Net[NetNumber].CurrentMacAddressSet) {
-                return (SK_ADDR_TOO_EARLY);
-        }
-
-        if (Flags & SK_ADDR_SET_LOGICAL) {      /* Activate logical MAC address. */
-                /* Parameter *pNewAddr is ignored. */
-                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
-                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
-                                return (SK_ADDR_TOO_EARLY);
-                        }
-                }
-#ifndef SK_NO_RLMT
-                /* Set PortNumber to number of net's active port. */
-                PortNumber = pAC->Rlmt.Net[NetNumber].
-                        Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
-#endif /* !SK_NO_RLMT */
-                pAC->Addr.Port[PortNumber].Exact[0] =
-                        pAC->Addr.Net[NetNumber].CurrentMacAddress;
-
-                /* Write address to first exact match entry of active port. */
-                (void) SkAddrMcUpdate(pAC, IoC, PortNumber);
-        }
-        else if (Flags & SK_ADDR_CLEAR_LOGICAL) {
-                /* Deactivate logical MAC address. */
-                /* Parameter *pNewAddr is ignored. */
-                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
-                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
-                                return (SK_ADDR_TOO_EARLY);
-                        }
-                }
-#ifndef SK_NO_RLMT
-                /* Set PortNumber to number of net's active port. */
-                PortNumber = pAC->Rlmt.Net[NetNumber].
-                        Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
-#endif /* !SK_NO_RLMT */
-                for (i = 0; i < SK_MAC_ADDR_LEN; i++ ) {
-                        pAC->Addr.Port[PortNumber].Exact[0].a[i] = 0;
-                }
-
-                /* Write address to first exact match entry of active port. */
-                (void) SkAddrMcUpdate(pAC, IoC, PortNumber);
-        }
-        else if (Flags & SK_ADDR_PHYSICAL_ADDRESS) {    /* Physical MAC address. */
-                if (SK_ADDR_EQUAL(pNewAddr->a,
-                        pAC->Addr.Net[NetNumber].CurrentMacAddress.a)) {
-                        return (SK_ADDR_DUPLICATE_ADDRESS);
-                }
-
-                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
-                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
-                                return (SK_ADDR_TOO_EARLY);
-                        }
-
-                        if (SK_ADDR_EQUAL(pNewAddr->a,
-                                pAC->Addr.Port[i].CurrentMacAddress.a)) {
-                                if (i == PortNumber) {
-                                        return (SK_ADDR_SUCCESS);
-                                }
-                                else {
-                                        return (SK_ADDR_DUPLICATE_ADDRESS);
-                                }
-                        }
-                }
-
-                pAC->Addr.Port[PortNumber].PreviousMacAddress =
-                        pAC->Addr.Port[PortNumber].CurrentMacAddress;
-                pAC->Addr.Port[PortNumber].CurrentMacAddress = *pNewAddr;
-
-                /* Change port's physical MAC address. */
-                OutAddr = (SK_U16 SK_FAR *) pNewAddr;
-#ifdef GENESIS
-                if (pAC->GIni.GIGenesis) {
-                        XM_OUTADDR(IoC, PortNumber, XM_SA, OutAddr);
-                }
-#endif /* GENESIS */
-#ifdef YUKON
-                if (!pAC->GIni.GIGenesis) {
-                        GM_OUTADDR(IoC, PortNumber, GM_SRC_ADDR_1L, OutAddr);
-                }
-#endif /* YUKON */
-
-#ifndef SK_NO_RLMT
-                /* Report address change to RLMT. */
-                Para.Para32[0] = PortNumber;
-                Para.Para32[0] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_PORT_ADDR, Para);
-#endif /* !SK_NO_RLMT */
-        }
-        else {  /* Logical MAC address. */
-                if (SK_ADDR_EQUAL(pNewAddr->a,
-                        pAC->Addr.Net[NetNumber].CurrentMacAddress.a)) {
-                        return (SK_ADDR_SUCCESS);
-                }
-                
-                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
-                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
-                                return (SK_ADDR_TOO_EARLY);
-                        }
-
-                        if (SK_ADDR_EQUAL(pNewAddr->a,
-                                pAC->Addr.Port[i].CurrentMacAddress.a)) {
-                                return (SK_ADDR_DUPLICATE_ADDRESS);
-                        }
-                }
-                
-                /*
-                 * In case that the physical and the logical MAC addresses are equal
-                 * we must also change the physical MAC address here.
-                 * In this case we have an adapter which initially was programmed with
-                 * two identical MAC addresses.
-                 */
-                if (SK_ADDR_EQUAL(pAC->Addr.Port[PortNumber].CurrentMacAddress.a,
-                                pAC->Addr.Port[PortNumber].Exact[0].a)) {
-                        
-                        pAC->Addr.Port[PortNumber].PreviousMacAddress =
-                                pAC->Addr.Port[PortNumber].CurrentMacAddress;
-                        pAC->Addr.Port[PortNumber].CurrentMacAddress = *pNewAddr;
-                        
-#ifndef SK_NO_RLMT
-                        /* Report address change to RLMT. */
-                        Para.Para32[0] = PortNumber;
-                        Para.Para32[0] = -1;
-                        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_PORT_ADDR, Para);
-#endif /* !SK_NO_RLMT */
-                }
-                
-#ifndef SK_NO_RLMT
-                /* Set PortNumber to number of net's active port. */
-                PortNumber = pAC->Rlmt.Net[NetNumber].
-                        Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
-#endif /* !SK_NO_RLMT */
-                pAC->Addr.Net[NetNumber].CurrentMacAddress = *pNewAddr;
-                pAC->Addr.Port[PortNumber].Exact[0] = *pNewAddr;
-#ifdef DEBUG
-                SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                        ("SkAddrOverride: Permanent MAC Address: %02X %02X %02X %02X %02X %02X\n",
-                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[0],
-                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[1],
-                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[2],
-                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[3],
-                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[4],
-                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[5]))
-                
-                SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-                        ("SkAddrOverride: New logical MAC Address: %02X %02X %02X %02X %02X %02X\n",
-                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[0],
-                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[1],
-                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[2],
-                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[3],
-                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[4],
-                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[5]))
-#endif /* DEBUG */
-
-        /* Write address to first exact match entry of active port. */
-                (void) SkAddrMcUpdate(pAC, IoC, PortNumber);
-        }
-
-        return (SK_ADDR_SUCCESS);
-        
-}       /* SkAddrOverride */
-
-
-#endif /* SK_NO_MAO */
-
-/******************************************************************************
- *
- *      SkAddrPromiscuousChange - set promiscuous mode for given port
- *
- * Description:
- *      This routine manages promiscuous mode:
- *      - none
- *      - all LLC frames
- *      - all MC frames
- *
- *      It calls either SkAddrXmacPromiscuousChange or
- *      SkAddrGmacPromiscuousChange, according to the adapter in use.
- *      The real work is done there.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- *      SK_ADDR_ILLEGAL_PORT
- */
-int     SkAddrPromiscuousChange(
-SK_AC   *pAC,                   /* adapter context */
-SK_IOC  IoC,                    /* I/O context */
-SK_U32  PortNumber,             /* port whose promiscuous mode changes */
-int             NewPromMode)    /* new promiscuous mode */
-{
-        int ReturnCode = 0;
-#if (!defined(SK_SLIM) || defined(DEBUG))
-        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-#endif /* !SK_SLIM || DEBUG */
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                ReturnCode =
-                        SkAddrXmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
-        }
-#endif /* GENESIS */
-#ifdef YUKON
-        if (!pAC->GIni.GIGenesis) {
-                ReturnCode =
-                        SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
-        }
-#endif /* YUKON */
-
-        return (ReturnCode);
-
-}       /* SkAddrPromiscuousChange */
-
-#ifdef GENESIS
-
-/******************************************************************************
- *
- *      SkAddrXmacPromiscuousChange - set promiscuous mode for given port
- *
- * Description:
- *      This routine manages promiscuous mode:
- *      - none
- *      - all LLC frames
- *      - all MC frames
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- *      SK_ADDR_ILLEGAL_PORT
- */
-static int      SkAddrXmacPromiscuousChange(
-SK_AC   *pAC,                   /* adapter context */
-SK_IOC  IoC,                    /* I/O context */
-SK_U32  PortNumber,             /* port whose promiscuous mode changes */
-int             NewPromMode)    /* new promiscuous mode */
-{
-        int                     i;
-        SK_BOOL         InexactModeBit;
-        SK_U8           Inexact;
-        SK_U8           HwInexact;
-        SK_FILTER64     HwInexactFilter;
-        SK_U16          LoMode;         /* Lower 16 bits of XMAC Mode Register. */
-        int                     CurPromMode = SK_PROM_MODE_NONE;
-
-        /* Read CurPromMode from Hardware. */
-        XM_IN16(IoC, PortNumber, XM_MODE, &LoMode);
-
-        if ((LoMode & XM_MD_ENA_PROM) != 0) {
-                /* Promiscuous mode! */
-                CurPromMode |= SK_PROM_MODE_LLC;
-        }
-        
-        for (Inexact = 0xFF, i = 0; i < 8; i++) {
-                Inexact &= pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i];
-        }
-        if (Inexact == 0xFF) {
-                CurPromMode |= (pAC->Addr.Port[PortNumber].PromMode & SK_PROM_MODE_ALL_MC);
-        }
-        else {
-                /* Get InexactModeBit (bit XM_MD_ENA_HASH in mode register) */
-                XM_IN16(IoC, PortNumber, XM_MODE, &LoMode);
-                
-                InexactModeBit = (LoMode & XM_MD_ENA_HASH) != 0;
-
-                /* Read 64-bit hash register from XMAC */
-                XM_INHASH(IoC, PortNumber, XM_HSM, &HwInexactFilter.Bytes[0]);
-
-                for (HwInexact = 0xFF, i = 0; i < 8; i++) {
-                        HwInexact &= HwInexactFilter.Bytes[i];
-                }
-
-                if (InexactModeBit && (HwInexact == 0xFF)) {
-                        CurPromMode |= SK_PROM_MODE_ALL_MC;
-                }
-        }
-
-        pAC->Addr.Port[PortNumber].PromMode = NewPromMode;
-
-        if (NewPromMode == CurPromMode) {
-                return (SK_ADDR_SUCCESS);
-        }
-
-        if ((NewPromMode & SK_PROM_MODE_ALL_MC) &&
-                !(CurPromMode & SK_PROM_MODE_ALL_MC)) { /* All MC. */
-                
-                /* Set all bits in 64-bit hash register. */
-                XM_OUTHASH(IoC, PortNumber, XM_HSM, &OnesHash);
-
-                /* Enable Hashing */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        else if ((CurPromMode & SK_PROM_MODE_ALL_MC) &&
-                !(NewPromMode & SK_PROM_MODE_ALL_MC)) { /* Norm MC. */
-                for (Inexact = 0, i = 0; i < 8; i++) {
-                        Inexact |= pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i];
-                }
-                if (Inexact == 0) {
-                        /* Disable Hashing */
-                        SkMacHashing(pAC, IoC, (int) PortNumber, SK_FALSE);
-                }
-                else {
-                        /* Set 64-bit hash register to InexactFilter. */
-                        XM_OUTHASH(IoC, PortNumber, XM_HSM,
-                                &pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0]);
-
-                        /* Enable Hashing */
-                        SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-                }
-        }
-
-        if ((NewPromMode & SK_PROM_MODE_LLC) &&
-                !(CurPromMode & SK_PROM_MODE_LLC)) {    /* Prom. LLC */
-                /* Set the MAC in Promiscuous Mode */
-                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        else if ((CurPromMode & SK_PROM_MODE_LLC) &&
-                !(NewPromMode & SK_PROM_MODE_LLC)) {    /* Norm. LLC. */
-                /* Clear Promiscuous Mode */
-                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_FALSE);
-        }
-        
-        return (SK_ADDR_SUCCESS);
-        
-}       /* SkAddrXmacPromiscuousChange */
-
-#endif /* GENESIS */
-
-#ifdef YUKON
-
-/******************************************************************************
- *
- *      SkAddrGmacPromiscuousChange - set promiscuous mode for given port
- *
- * Description:
- *      This routine manages promiscuous mode:
- *      - none
- *      - all LLC frames
- *      - all MC frames
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- *      SK_ADDR_ILLEGAL_PORT
- */
-static int      SkAddrGmacPromiscuousChange(
-SK_AC   *pAC,                   /* adapter context */
-SK_IOC  IoC,                    /* I/O context */
-SK_U32  PortNumber,             /* port whose promiscuous mode changes */
-int             NewPromMode)    /* new promiscuous mode */
-{
-        SK_U16          ReceiveControl; /* GMAC Receive Control Register */
-        int             CurPromMode = SK_PROM_MODE_NONE;
-
-        /* Read CurPromMode from Hardware. */
-        GM_IN16(IoC, PortNumber, GM_RX_CTRL, &ReceiveControl);
-
-        if ((ReceiveControl & (GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA)) == 0) {
-                /* Promiscuous mode! */
-                CurPromMode |= SK_PROM_MODE_LLC;
-        }
-
-        if ((ReceiveControl & GM_RXCR_MCF_ENA) == 0) {
-                /* All Multicast mode! */
-                CurPromMode |= (pAC->Addr.Port[PortNumber].PromMode & SK_PROM_MODE_ALL_MC);
-        }
-
-        pAC->Addr.Port[PortNumber].PromMode = NewPromMode;
-
-        if (NewPromMode == CurPromMode) {
-                return (SK_ADDR_SUCCESS);
-        }
-        
-        if ((NewPromMode & SK_PROM_MODE_ALL_MC) &&
-                !(CurPromMode & SK_PROM_MODE_ALL_MC)) { /* All MC */
-                
-                /* Set all bits in 64-bit hash register. */
-                GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
-                
-                /* Enable Hashing */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        
-        if ((CurPromMode & SK_PROM_MODE_ALL_MC) &&
-                !(NewPromMode & SK_PROM_MODE_ALL_MC)) { /* Norm. MC */
-
-                /* Set 64-bit hash register to InexactFilter. */
-                GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1,
-                        &pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0]);
-
-                /* Enable Hashing. */
-                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-
-        if ((NewPromMode & SK_PROM_MODE_LLC) &&
-                !(CurPromMode & SK_PROM_MODE_LLC)) {    /* Prom. LLC */
-                
-                /* Set the MAC to Promiscuous Mode. */
-                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_TRUE);
-        }
-        else if ((CurPromMode & SK_PROM_MODE_LLC) &&
-                !(NewPromMode & SK_PROM_MODE_LLC)) {    /* Norm. LLC */
-                
-                /* Clear Promiscuous Mode. */
-                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_FALSE);
-        }
-
-        return (SK_ADDR_SUCCESS);
-        
-}       /* SkAddrGmacPromiscuousChange */
-
-#endif /* YUKON */
-
-#ifndef SK_SLIM
-
-/******************************************************************************
- *
- *      SkAddrSwap - swap address info
- *
- * Description:
- *      This routine swaps address info of two ports.
- *
- * Context:
- *      runtime, pageable
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      SK_ADDR_SUCCESS
- *      SK_ADDR_ILLEGAL_PORT
- */
-int     SkAddrSwap(
-SK_AC   *pAC,                   /* adapter context */
-SK_IOC  IoC,                    /* I/O context */
-SK_U32  FromPortNumber,         /* Port1 Index */
-SK_U32  ToPortNumber)           /* Port2 Index */
-{
-        int                     i;
-        SK_U8           Byte;
-        SK_MAC_ADDR     MacAddr;
-        SK_U32          DWord;
-
-        if (FromPortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-
-        if (ToPortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-
-        if (pAC->Rlmt.Port[FromPortNumber].Net != pAC->Rlmt.Port[ToPortNumber].Net) {
-                return (SK_ADDR_ILLEGAL_PORT);
-        }
-
-        /*
-         * Swap:
-         * - Exact Match Entries (GEnesis and Yukon)
-         *   Yukon uses first entry for the logical MAC
-         *   address (stored in the second GMAC register).
-         * - FirstExactMatchRlmt (GEnesis only)
-         * - NextExactMatchRlmt (GEnesis only)
-         * - FirstExactMatchDrv (GEnesis only)
-         * - NextExactMatchDrv (GEnesis only)
-         * - 64-bit filter (InexactFilter)
-         * - Promiscuous Mode
-         * of ports.
-         */
-
-        for (i = 0; i < SK_ADDR_EXACT_MATCHES; i++) {
-                MacAddr = pAC->Addr.Port[FromPortNumber].Exact[i];
-                pAC->Addr.Port[FromPortNumber].Exact[i] =
-                        pAC->Addr.Port[ToPortNumber].Exact[i];
-                pAC->Addr.Port[ToPortNumber].Exact[i] = MacAddr;
-        }
-
-        for (i = 0; i < 8; i++) {
-                Byte = pAC->Addr.Port[FromPortNumber].InexactFilter.Bytes[i];
-                pAC->Addr.Port[FromPortNumber].InexactFilter.Bytes[i] =
-                        pAC->Addr.Port[ToPortNumber].InexactFilter.Bytes[i];
-                pAC->Addr.Port[ToPortNumber].InexactFilter.Bytes[i] = Byte;
-        }
-        
-        i = pAC->Addr.Port[FromPortNumber].PromMode;
-        pAC->Addr.Port[FromPortNumber].PromMode = pAC->Addr.Port[ToPortNumber].PromMode;
-        pAC->Addr.Port[ToPortNumber].PromMode = i;
-        
-        if (pAC->GIni.GIGenesis) {
-                DWord = pAC->Addr.Port[FromPortNumber].FirstExactMatchRlmt;
-                pAC->Addr.Port[FromPortNumber].FirstExactMatchRlmt =
-                        pAC->Addr.Port[ToPortNumber].FirstExactMatchRlmt;
-                pAC->Addr.Port[ToPortNumber].FirstExactMatchRlmt = DWord;
-                
-                DWord = pAC->Addr.Port[FromPortNumber].NextExactMatchRlmt;
-                pAC->Addr.Port[FromPortNumber].NextExactMatchRlmt =
-                        pAC->Addr.Port[ToPortNumber].NextExactMatchRlmt;
-                pAC->Addr.Port[ToPortNumber].NextExactMatchRlmt = DWord;
-                
-                DWord = pAC->Addr.Port[FromPortNumber].FirstExactMatchDrv;
-                pAC->Addr.Port[FromPortNumber].FirstExactMatchDrv =
-                        pAC->Addr.Port[ToPortNumber].FirstExactMatchDrv;
-                pAC->Addr.Port[ToPortNumber].FirstExactMatchDrv = DWord;
-                
-                DWord = pAC->Addr.Port[FromPortNumber].NextExactMatchDrv;
-                pAC->Addr.Port[FromPortNumber].NextExactMatchDrv =
-                        pAC->Addr.Port[ToPortNumber].NextExactMatchDrv;
-                pAC->Addr.Port[ToPortNumber].NextExactMatchDrv = DWord;
-        }
-        
-        /* CAUTION: Solution works if only ports of one adapter are in use. */
-        for (i = 0; (SK_U32) i < pAC->Rlmt.Net[pAC->Rlmt.Port[ToPortNumber].
-                Net->NetNumber].NumPorts; i++) {
-                if (pAC->Rlmt.Net[pAC->Rlmt.Port[ToPortNumber].Net->NetNumber].
-                        Port[i]->PortNumber == ToPortNumber) {
-                        pAC->Addr.Net[pAC->Rlmt.Port[ToPortNumber].Net->NetNumber].
-                                ActivePort = i;
-                        /* 20001207 RA: Was "ToPortNumber;". */
-                }
-        }
-        
-        (void) SkAddrMcUpdate(pAC, IoC, FromPortNumber);
-        (void) SkAddrMcUpdate(pAC, IoC, ToPortNumber);
-
-        return (SK_ADDR_SUCCESS);
-        
-}       /* SkAddrSwap */
-
-#endif /* !SK_SLIM */
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c
deleted file mode 100644
index 37ce03fb8de3..000000000000
--- a/drivers/net/sk98lin/skdim.c
+++ /dev/null
@@ -1,742 +0,0 @@
-/******************************************************************************
- *
- * Name:        skdim.c
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.5 $
- * Date:        $Date: 2003/11/28 12:55:40 $
- * Purpose:     All functions to maintain interrupt moderation
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * This module is intended to manage the dynamic interrupt moderation on both   
- * GEnesis and Yukon adapters.
- *
- * Include File Hierarchy:
- *
- *      "skdrv1st.h"
- *      "skdrv2nd.h"
- *
- ******************************************************************************/
-
-#ifndef lint
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skdim.c,v 1.5 2003/11/28 12:55:40 rroesler Exp $ (C) SysKonnect.";
-#endif
-
-#define __SKADDR_C
-
-#ifdef __cplusplus
-#error C++ is not yet supported.
-extern "C" {
-#endif
-
-/*******************************************************************************
-**
-** Includes
-**
-*******************************************************************************/
-
-#ifndef __INC_SKDRV1ST_H
-#include "h/skdrv1st.h"
-#endif
-
-#ifndef __INC_SKDRV2ND_H
-#include "h/skdrv2nd.h"
-#endif
-
-#include        <linux/kernel_stat.h>
-
-/*******************************************************************************
-**
-** Defines
-**
-*******************************************************************************/
-
-/*******************************************************************************
-**
-** Typedefs
-**
-*******************************************************************************/
-
-/*******************************************************************************
-**
-** Local function prototypes 
-**
-*******************************************************************************/
-
-static unsigned int GetCurrentSystemLoad(SK_AC *pAC);
-static SK_U64       GetIsrCalls(SK_AC *pAC);
-static SK_BOOL      IsIntModEnabled(SK_AC *pAC);
-static void         SetCurrIntCtr(SK_AC *pAC);
-static void         EnableIntMod(SK_AC *pAC); 
-static void         DisableIntMod(SK_AC *pAC);
-static void         ResizeDimTimerDuration(SK_AC *pAC);
-static void         DisplaySelectedModerationType(SK_AC *pAC);
-static void         DisplaySelectedModerationMask(SK_AC *pAC);
-static void         DisplayDescrRatio(SK_AC *pAC);
-
-/*******************************************************************************
-**
-** Global variables
-**
-*******************************************************************************/
-
-/*******************************************************************************
-**
-** Local variables
-**
-*******************************************************************************/
-
-/*******************************************************************************
-**
-** Global functions 
-**
-*******************************************************************************/
-
-/*******************************************************************************
-** Function     : SkDimModerate
-** Description  : Called in every ISR to check if moderation is to be applied
-**                or not for the current number of interrupts
-** Programmer   : Ralph Roesler
-** Last Modified: 22-mar-03
-** Returns      : void (!)
-** Notes        : -
-*******************************************************************************/
-
-void 
-SkDimModerate(SK_AC *pAC) {
-    unsigned int CurrSysLoad    = 0;  /* expressed in percent */
-    unsigned int LoadIncrease   = 0;  /* expressed in percent */
-    SK_U64       ThresholdInts  = 0;
-    SK_U64       IsrCallsPerSec = 0;
-
-#define M_DIMINFO pAC->DynIrqModInfo
-
-    if (!IsIntModEnabled(pAC)) {
-        if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
-            CurrSysLoad = GetCurrentSystemLoad(pAC);
-            if (CurrSysLoad > 75) {
-                    /* 
-                    ** More than 75% total system load! Enable the moderation 
-                    ** to shield the system against too many interrupts.
-                    */
-                    EnableIntMod(pAC);
-            } else if (CurrSysLoad > M_DIMINFO.PrevSysLoad) {
-                LoadIncrease = (CurrSysLoad - M_DIMINFO.PrevSysLoad);
-                if (LoadIncrease > ((M_DIMINFO.PrevSysLoad *
-                                         C_INT_MOD_ENABLE_PERCENTAGE) / 100)) {
-                    if (CurrSysLoad > 10) {
-                        /* 
-                        ** More than 50% increase with respect to the 
-                        ** previous load of the system. Most likely this 
-                        ** is due to our ISR-proc...
-                        */
-                        EnableIntMod(pAC);
-                    }
-                }
-            } else {
-                /*
-                ** Neither too much system load at all nor too much increase
-                ** with respect to the previous system load. Hence, we can leave
-                ** the ISR-handling like it is without enabling moderation.
-                */
-            }
-            M_DIMINFO.PrevSysLoad = CurrSysLoad;
-        }   
-    } else {
-        if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
-            ThresholdInts  = ((M_DIMINFO.MaxModIntsPerSec *
-                                   C_INT_MOD_DISABLE_PERCENTAGE) / 100);
-            IsrCallsPerSec = GetIsrCalls(pAC);
-            if (IsrCallsPerSec <= ThresholdInts) {
-                /* 
-                ** The number of interrupts within the last second is 
-                ** lower than the disable_percentage of the desried 
-                ** maxrate. Therefore we can disable the moderation.
-                */
-                DisableIntMod(pAC);
-                M_DIMINFO.MaxModIntsPerSec = 
-                   (M_DIMINFO.MaxModIntsPerSecUpperLimit +
-                    M_DIMINFO.MaxModIntsPerSecLowerLimit) / 2;
-            } else {
-                /*
-                ** The number of interrupts per sec is the same as expected.
-                ** Evalulate the descriptor-ratio. If it has changed, a resize 
-                ** in the moderation timer might be useful
-                */
-                if (M_DIMINFO.AutoSizing) {
-                    ResizeDimTimerDuration(pAC);
-                }
-            }
-        }
-    }
-
-    /*
-    ** Some information to the log...
-    */
-    if (M_DIMINFO.DisplayStats) {
-        DisplaySelectedModerationType(pAC);
-        DisplaySelectedModerationMask(pAC);
-        DisplayDescrRatio(pAC);
-    }
-
-    M_DIMINFO.NbrProcessedDescr = 0; 
-    SetCurrIntCtr(pAC);
-}
-
-/*******************************************************************************
-** Function     : SkDimStartModerationTimer
-** Description  : Starts the audit-timer for the dynamic interrupt moderation
-** Programmer   : Ralph Roesler
-** Last Modified: 22-mar-03
-** Returns      : void (!)
-** Notes        : -
-*******************************************************************************/
-
-void 
-SkDimStartModerationTimer(SK_AC *pAC) {
-    SK_EVPARA    EventParam;   /* Event struct for timer event */
- 
-    SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
-    EventParam.Para32[0] = SK_DRV_MODERATION_TIMER;
-    SkTimerStart(pAC, pAC->IoBase, &pAC->DynIrqModInfo.ModTimer,
-                 SK_DRV_MODERATION_TIMER_LENGTH,
-                 SKGE_DRV, SK_DRV_TIMER, EventParam);
-}
-
-/*******************************************************************************
-** Function     : SkDimEnableModerationIfNeeded
-** Description  : Either enables or disables moderation
-** Programmer   : Ralph Roesler
-** Last Modified: 22-mar-03
-** Returns      : void (!)
-** Notes        : This function is called when a particular adapter is opened
-**                There is no Disable function, because when all interrupts 
-**                might be disable, the moderation timer has no meaning at all
-******************************************************************************/
-
-void
-SkDimEnableModerationIfNeeded(SK_AC *pAC) {
-
-    if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_STATIC) {
-        EnableIntMod(pAC);   /* notification print in this function */
-    } else if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
-        SkDimStartModerationTimer(pAC);
-        if (M_DIMINFO.DisplayStats) {
-            printk("Dynamic moderation has been enabled\n");
-        }
-    } else {
-        if (M_DIMINFO.DisplayStats) {
-            printk("No moderation has been enabled\n");
-        }
-    }
-}
-
-/*******************************************************************************
-** Function     : SkDimDisplayModerationSettings
-** Description  : Displays the current settings regarding interrupt moderation
-** Programmer   : Ralph Roesler
-** Last Modified: 22-mar-03
-** Returns      : void (!)
-** Notes        : -
-*******************************************************************************/
-
-void 
-SkDimDisplayModerationSettings(SK_AC *pAC) {
-    DisplaySelectedModerationType(pAC);
-    DisplaySelectedModerationMask(pAC);
-}
-
-/*******************************************************************************
-**
-** Local functions 
-**
-*******************************************************************************/
-
-/*******************************************************************************
-** Function     : GetCurrentSystemLoad
-** Description  : Retrieves the current system load of the system. This load
-**                is evaluated for all processors within the system.
-** Programmer   : Ralph Roesler
-** Last Modified: 22-mar-03
-** Returns      : unsigned int: load expressed in percentage
-** Notes        : The possible range being returned is from 0 up to 100.
-**                Whereas 0 means 'no load at all' and 100 'system fully loaded'
-**                It is impossible to determine what actually causes the system
-**                to be in 100%, but maybe that is due to too much interrupts.
-*******************************************************************************/
-
-static unsigned int
-GetCurrentSystemLoad(SK_AC *pAC) {
-        unsigned long jif         = jiffies;
-        unsigned int  UserTime    = 0;
-        unsigned int  SystemTime  = 0;
-        unsigned int  NiceTime    = 0;
-        unsigned int  IdleTime    = 0;
-        unsigned int  TotalTime   = 0;
-        unsigned int  UsedTime    = 0;
-        unsigned int  SystemLoad  = 0;
-
-        /* unsigned int  NbrCpu      = 0; */
-
-        /*
-        ** The following lines have been commented out, because
-        ** from kernel 2.5.44 onwards, the kernel-owned structure
-        **
-        **      struct kernel_stat kstat
-        **
-        ** is not marked as an exported symbol in the file
-        **
-        **      kernel/ksyms.c 
-        **
-        ** As a consequence, using this driver as KLM is not possible
-        ** and any access of the structure kernel_stat via the 
-        ** dedicated macros kstat_cpu(i).cpustat.xxx is to be avoided.
-        **
-        ** The kstat-information might be added again in future 
-        ** versions of the 2.5.xx kernel, but for the time being, 
-        ** number of interrupts will serve as indication how much 
-        ** load we currently have... 
-        **
-        ** for (NbrCpu = 0; NbrCpu < num_online_cpus(); NbrCpu++) {
-        **      UserTime   = UserTime   + kstat_cpu(NbrCpu).cpustat.user;
-        **      NiceTime   = NiceTime   + kstat_cpu(NbrCpu).cpustat.nice;
-        **      SystemTime = SystemTime + kstat_cpu(NbrCpu).cpustat.system;
-        ** }
-        */
-        SK_U64 ThresholdInts  = 0;
-        SK_U64 IsrCallsPerSec = 0;
-
-        ThresholdInts  = ((M_DIMINFO.MaxModIntsPerSec *
-                           C_INT_MOD_ENABLE_PERCENTAGE) + 100);
-        IsrCallsPerSec = GetIsrCalls(pAC);
-        if (IsrCallsPerSec >= ThresholdInts) {
-            /*
-            ** We do not know how much the real CPU-load is!
-            ** Return 80% as a default in order to activate DIM
-            */
-            SystemLoad = 80;
-            return (SystemLoad);  
-        } 
-
-        UsedTime  = UserTime + NiceTime + SystemTime;
-
-        IdleTime  = jif * num_online_cpus() - UsedTime;
-        TotalTime = UsedTime + IdleTime;
-
-        SystemLoad = ( 100 * (UsedTime  - M_DIMINFO.PrevUsedTime) ) /
-                                                (TotalTime - M_DIMINFO.PrevTotalTime);
-
-        if (M_DIMINFO.DisplayStats) {
-                printk("Current system load is: %u\n", SystemLoad);
-        }
-
-        M_DIMINFO.PrevTotalTime = TotalTime;
-        M_DIMINFO.PrevUsedTime  = UsedTime;
-
-        return (SystemLoad);
-}
-
-/*******************************************************************************
-** Function     : GetIsrCalls
-** Description  : Depending on the selected moderation mask, this function will
-**                return the number of interrupts handled in the previous time-
-**                frame. This evaluated number is based on the current number 
-**                of interrupts stored in PNMI-context and the previous stored 
-**                interrupts.
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : int:   the number of interrupts being executed in the last
-**                       timeframe
-** Notes        : It makes only sense to call this function, when dynamic 
-**                interrupt moderation is applied
-*******************************************************************************/
-
-static SK_U64
-GetIsrCalls(SK_AC *pAC) {
-    SK_U64   RxPort0IntDiff = 0;
-    SK_U64   RxPort1IntDiff = 0;
-    SK_U64   TxPort0IntDiff = 0;
-    SK_U64   TxPort1IntDiff = 0;
-
-    if (pAC->DynIrqModInfo.MaskIrqModeration == IRQ_MASK_TX_ONLY) {
-        if (pAC->GIni.GIMacsFound == 2) {
-            TxPort1IntDiff = pAC->Pnmi.Port[1].TxIntrCts - 
-                             pAC->DynIrqModInfo.PrevPort1TxIntrCts;
-        }
-        TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
-                         pAC->DynIrqModInfo.PrevPort0TxIntrCts;
-    } else if (pAC->DynIrqModInfo.MaskIrqModeration == IRQ_MASK_RX_ONLY) {
-        if (pAC->GIni.GIMacsFound == 2) {
-            RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
-                             pAC->DynIrqModInfo.PrevPort1RxIntrCts;
-        }
-        RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
-                         pAC->DynIrqModInfo.PrevPort0RxIntrCts;
-    } else {
-        if (pAC->GIni.GIMacsFound == 2) {
-            RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
-                             pAC->DynIrqModInfo.PrevPort1RxIntrCts;
-            TxPort1IntDiff = pAC->Pnmi.Port[1].TxIntrCts - 
-                             pAC->DynIrqModInfo.PrevPort1TxIntrCts;
-        } 
-        RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
-                         pAC->DynIrqModInfo.PrevPort0RxIntrCts;
-        TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
-                         pAC->DynIrqModInfo.PrevPort0TxIntrCts;
-    }
-
-    return (RxPort0IntDiff + RxPort1IntDiff + TxPort0IntDiff + TxPort1IntDiff);
-}
-
-/*******************************************************************************
-** Function     : GetRxCalls
-** Description  : This function will return the number of times a receive inter-
-**                rupt was processed. This is needed to evaluate any resizing 
-**                factor.
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : SK_U64: the number of RX-ints being processed
-** Notes        : It makes only sense to call this function, when dynamic 
-**                interrupt moderation is applied
-*******************************************************************************/
-
-static SK_U64
-GetRxCalls(SK_AC *pAC) {
-    SK_U64   RxPort0IntDiff = 0;
-    SK_U64   RxPort1IntDiff = 0;
-
-    if (pAC->GIni.GIMacsFound == 2) {
-        RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
-                         pAC->DynIrqModInfo.PrevPort1RxIntrCts;
-    }
-    RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
-                     pAC->DynIrqModInfo.PrevPort0RxIntrCts;
-
-    return (RxPort0IntDiff + RxPort1IntDiff);
-}
-
-/*******************************************************************************
-** Function     : SetCurrIntCtr
-** Description  : Will store the current number orf occured interrupts in the 
-**                adapter context. This is needed to evaluated the number of 
-**                interrupts within a current timeframe.
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : void (!)
-** Notes        : -
-*******************************************************************************/
-
-static void
-SetCurrIntCtr(SK_AC *pAC) {
-    if (pAC->GIni.GIMacsFound == 2) {
-        pAC->DynIrqModInfo.PrevPort1RxIntrCts = pAC->Pnmi.Port[1].RxIntrCts;
-        pAC->DynIrqModInfo.PrevPort1TxIntrCts = pAC->Pnmi.Port[1].TxIntrCts;
-    } 
-    pAC->DynIrqModInfo.PrevPort0RxIntrCts = pAC->Pnmi.Port[0].RxIntrCts;
-    pAC->DynIrqModInfo.PrevPort0TxIntrCts = pAC->Pnmi.Port[0].TxIntrCts;
-}
-
-/*******************************************************************************
-** Function     : IsIntModEnabled()
-** Description  : Retrieves the current value of the interrupts moderation
-**                command register. Its content determines whether any 
-**                moderation is running or not.
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : SK_TRUE  : if mod timer running
-**                SK_FALSE : if no moderation is being performed
-** Notes        : -
-*******************************************************************************/
-
-static SK_BOOL
-IsIntModEnabled(SK_AC *pAC) {
-    unsigned long CtrCmd;
-
-    SK_IN32(pAC->IoBase, B2_IRQM_CTRL, &CtrCmd);
-    if ((CtrCmd & TIM_START) == TIM_START) {
-       return SK_TRUE;
-    } else {
-       return SK_FALSE;
-    }
-}
-
-/*******************************************************************************
-** Function     : EnableIntMod()
-** Description  : Enables the interrupt moderation using the values stored in
-**                in the pAC->DynIntMod data structure
-** Programmer   : Ralph Roesler
-** Last Modified: 22-mar-03
-** Returns      : -
-** Notes        : -
-*******************************************************************************/
-
-static void
-EnableIntMod(SK_AC *pAC) {
-    unsigned long ModBase;
-
-    if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
-       ModBase = C_CLK_FREQ_GENESIS / pAC->DynIrqModInfo.MaxModIntsPerSec;
-    } else {
-       ModBase = C_CLK_FREQ_YUKON / pAC->DynIrqModInfo.MaxModIntsPerSec;
-    }
-
-    SK_OUT32(pAC->IoBase, B2_IRQM_INI,  ModBase);
-    SK_OUT32(pAC->IoBase, B2_IRQM_MSK,  pAC->DynIrqModInfo.MaskIrqModeration);
-    SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_START);
-    if (M_DIMINFO.DisplayStats) {
-        printk("Enabled interrupt moderation (%i ints/sec)\n",
-               M_DIMINFO.MaxModIntsPerSec);
-    }
-}
-
-/*******************************************************************************
-** Function     : DisableIntMod()
-** Description  : Disables the interrupt moderation independent of what inter-
-**                rupts are running or not
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : -
-** Notes        : -
-*******************************************************************************/
-
-static void 
-DisableIntMod(SK_AC *pAC) {
-
-    SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_STOP);
-    if (M_DIMINFO.DisplayStats) {
-        printk("Disabled interrupt moderation\n");
-    }
-} 
-
-/*******************************************************************************
-** Function     : ResizeDimTimerDuration();
-** Description  : Checks the current used descriptor ratio and resizes the 
-**                duration timer (longer/smaller) if possible. 
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : -
-** Notes        : There are both maximum and minimum timer duration value. 
-**                This function assumes that interrupt moderation is already
-**                enabled!
-*******************************************************************************/
-
-static void 
-ResizeDimTimerDuration(SK_AC *pAC) {
-    SK_BOOL IncreaseTimerDuration;
-    int     TotalMaxNbrDescr;
-    int     UsedDescrRatio;
-    int     RatioDiffAbs;
-    int     RatioDiffRel;
-    int     NewMaxModIntsPerSec;
-    int     ModAdjValue;
-    long    ModBase;
-
-    /*
-    ** Check first if we are allowed to perform any modification
-    */
-    if (IsIntModEnabled(pAC)) { 
-        if (M_DIMINFO.IntModTypeSelect != C_INT_MOD_DYNAMIC) {
-            return; 
-        } else {
-            if (M_DIMINFO.ModJustEnabled) {
-                M_DIMINFO.ModJustEnabled = SK_FALSE;
-                return;
-            }
-        }
-    }
-
-    /*
-    ** If we got until here, we have to evaluate the amount of the
-    ** descriptor ratio change...
-    */
-    TotalMaxNbrDescr = pAC->RxDescrPerRing * GetRxCalls(pAC);
-    UsedDescrRatio   = (M_DIMINFO.NbrProcessedDescr * 100) / TotalMaxNbrDescr;
-
-    if (UsedDescrRatio > M_DIMINFO.PrevUsedDescrRatio) {
-        RatioDiffAbs = (UsedDescrRatio - M_DIMINFO.PrevUsedDescrRatio);
-        RatioDiffRel = (RatioDiffAbs * 100) / UsedDescrRatio;
-        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
-        IncreaseTimerDuration = SK_FALSE;  /* in other words: DECREASE */
-    } else if (UsedDescrRatio < M_DIMINFO.PrevUsedDescrRatio) {
-        RatioDiffAbs = (M_DIMINFO.PrevUsedDescrRatio - UsedDescrRatio);
-        RatioDiffRel = (RatioDiffAbs * 100) / M_DIMINFO.PrevUsedDescrRatio;
-        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
-        IncreaseTimerDuration = SK_TRUE;   /* in other words: INCREASE */
-    } else {
-        RatioDiffAbs = (M_DIMINFO.PrevUsedDescrRatio - UsedDescrRatio);
-        RatioDiffRel = (RatioDiffAbs * 100) / M_DIMINFO.PrevUsedDescrRatio;
-        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
-        IncreaseTimerDuration = SK_TRUE;   /* in other words: INCREASE */
-    }
-
-    /*
-    ** Now we can determine the change in percent
-    */
-    if ((RatioDiffRel >= 0) && (RatioDiffRel <= 5) ) {
-       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
-    } else if ((RatioDiffRel > 5) && (RatioDiffRel <= 10) ) {
-       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
-    } else if ((RatioDiffRel > 10) && (RatioDiffRel <= 15) ) {
-       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
-    } else {
-       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
-    }
-
-    if (IncreaseTimerDuration) {
-       NewMaxModIntsPerSec =  M_DIMINFO.MaxModIntsPerSec +
-                             (M_DIMINFO.MaxModIntsPerSec * ModAdjValue) / 100;
-    } else {
-       NewMaxModIntsPerSec =  M_DIMINFO.MaxModIntsPerSec -
-                             (M_DIMINFO.MaxModIntsPerSec * ModAdjValue) / 100;
-    }
-
-    /* 
-    ** Check if we exceed boundaries...
-    */
-    if ( (NewMaxModIntsPerSec > M_DIMINFO.MaxModIntsPerSecUpperLimit) ||
-         (NewMaxModIntsPerSec < M_DIMINFO.MaxModIntsPerSecLowerLimit)) {
-        if (M_DIMINFO.DisplayStats) {
-            printk("Cannot change ModTim from %i to %i ints/sec\n",
-                   M_DIMINFO.MaxModIntsPerSec, NewMaxModIntsPerSec);
-        }
-        return;
-    } else {
-        if (M_DIMINFO.DisplayStats) {
-            printk("Resized ModTim from %i to %i ints/sec\n",
-                   M_DIMINFO.MaxModIntsPerSec, NewMaxModIntsPerSec);
-        }
-    }
-
-    M_DIMINFO.MaxModIntsPerSec = NewMaxModIntsPerSec;
-
-    if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
-        ModBase = C_CLK_FREQ_GENESIS / pAC->DynIrqModInfo.MaxModIntsPerSec;
-    } else {
-        ModBase = C_CLK_FREQ_YUKON / pAC->DynIrqModInfo.MaxModIntsPerSec;
-    }
-
-    /* 
-    ** We do not need to touch any other registers
-    */
-    SK_OUT32(pAC->IoBase, B2_IRQM_INI, ModBase);
-} 
-
-/*******************************************************************************
-** Function     : DisplaySelectedModerationType()
-** Description  : Displays what type of moderation we have
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : void!
-** Notes        : -
-*******************************************************************************/
-
-static void
-DisplaySelectedModerationType(SK_AC *pAC) {
-
-    if (pAC->DynIrqModInfo.DisplayStats) {
-        if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_STATIC) {
-             printk("Static int moderation runs with %i INTS/sec\n",
-                    pAC->DynIrqModInfo.MaxModIntsPerSec);
-        } else if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
-             if (IsIntModEnabled(pAC)) {
-                printk("Dynamic int moderation runs with %i INTS/sec\n",
-                       pAC->DynIrqModInfo.MaxModIntsPerSec);
-             } else {
-                printk("Dynamic int moderation currently not applied\n");
-             }
-        } else {
-             printk("No interrupt moderation selected!\n");
-        }
-    }
-}
-
-/*******************************************************************************
-** Function     : DisplaySelectedModerationMask()
-** Description  : Displays what interrupts are moderated
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : void!
-** Notes        : -
-*******************************************************************************/
-
-static void
-DisplaySelectedModerationMask(SK_AC *pAC) {
-
-    if (pAC->DynIrqModInfo.DisplayStats) {
-        if (pAC->DynIrqModInfo.IntModTypeSelect != C_INT_MOD_NONE) {
-            switch (pAC->DynIrqModInfo.MaskIrqModeration) {
-                case IRQ_MASK_TX_ONLY: 
-                   printk("Only Tx-interrupts are moderated\n");
-                   break;
-                case IRQ_MASK_RX_ONLY: 
-                   printk("Only Rx-interrupts are moderated\n");
-                   break;
-                case IRQ_MASK_SP_ONLY: 
-                   printk("Only special-interrupts are moderated\n");
-                   break;
-                case IRQ_MASK_TX_RX: 
-                   printk("Tx- and Rx-interrupts are moderated\n");
-                   break;
-                case IRQ_MASK_SP_RX: 
-                   printk("Special- and Rx-interrupts are moderated\n");
-                   break;
-                case IRQ_MASK_SP_TX: 
-                   printk("Special- and Tx-interrupts are moderated\n");
-                   break;
-                case IRQ_MASK_RX_TX_SP:
-                   printk("All Rx-, Tx and special-interrupts are moderated\n");
-                   break;
-                default:
-                   printk("Don't know what is moderated\n");
-                   break;
-            }
-        } else {
-            printk("No specific interrupts masked for moderation\n");
-        }
-    } 
-}
-
-/*******************************************************************************
-** Function     : DisplayDescrRatio
-** Description  : Like the name states...
-** Programmer   : Ralph Roesler
-** Last Modified: 23-mar-03
-** Returns      : void!
-** Notes        : -
-*******************************************************************************/
-
-static void
-DisplayDescrRatio(SK_AC *pAC) {
-    int TotalMaxNbrDescr = 0;
-
-    if (pAC->DynIrqModInfo.DisplayStats) {
-        TotalMaxNbrDescr = pAC->RxDescrPerRing * GetRxCalls(pAC);
-        printk("Ratio descriptors: %i/%i\n",
-               M_DIMINFO.NbrProcessedDescr, TotalMaxNbrDescr);
-    }
-}
-
-/*******************************************************************************
-**
-** End of file
-**
-*******************************************************************************/
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
deleted file mode 100644
index 5a6da8950faa..000000000000
--- a/drivers/net/sk98lin/skethtool.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/******************************************************************************
- *
- * Name:        skethtool.c
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.7 $
- * Date:        $Date: 2004/09/29 13:32:07 $
- * Purpose:     All functions regarding ethtool handling
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2004 Marvell.
- *
- *      Driver for Marvell Yukon/2 chipset and SysKonnect Gigabit Ethernet 
- *      Server Adapters.
- *
- *      Author: Ralph Roesler (rroesler@syskonnect.de)
- *              Mirko Lindner (mlindner@syskonnect.de)
- *
- *      Address all question to: linux@syskonnect.de
- *
- *      The technical manual for the adapters is available from SysKonnect's
- *      web pages: www.syskonnect.com
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- *****************************************************************************/
-
-#include "h/skdrv1st.h"
-#include "h/skdrv2nd.h"
-#include "h/skversion.h"
-
-#include <linux/ethtool.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-
-/******************************************************************************
- *
- * Defines
- *
- *****************************************************************************/
-
-#define SUPP_COPPER_ALL (SUPPORTED_10baseT_Half  | SUPPORTED_10baseT_Full  | \
-                         SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \
-                         SUPPORTED_1000baseT_Half| SUPPORTED_1000baseT_Full| \
-                         SUPPORTED_TP)
-
-#define ADV_COPPER_ALL  (ADVERTISED_10baseT_Half  | ADVERTISED_10baseT_Full  | \
-                         ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | \
-                         ADVERTISED_1000baseT_Half| ADVERTISED_1000baseT_Full| \
-                         ADVERTISED_TP)
-
-#define SUPP_FIBRE_ALL  (SUPPORTED_1000baseT_Full | \
-                         SUPPORTED_FIBRE          | \
-                         SUPPORTED_Autoneg)
-
-#define ADV_FIBRE_ALL   (ADVERTISED_1000baseT_Full | \
-                         ADVERTISED_FIBRE          | \
-                         ADVERTISED_Autoneg)
-
-
-/******************************************************************************
- *
- * Local Functions
- *
- *****************************************************************************/
-
-/*****************************************************************************
- *
- *      getSettings - retrieves the current settings of the selected adapter
- *
- * Description:
- *      The current configuration of the selected adapter is returned.
- *      This configuration involves a)speed, b)duplex and c)autoneg plus
- *      a number of other variables.
- *
- * Returns:    always 0
- *
- */
-static int getSettings(struct net_device *dev, struct ethtool_cmd *ecmd)
-{
-        const DEV_NET *pNet = netdev_priv(dev);
-        int port = pNet->PortNr;
-        const SK_AC *pAC = pNet->pAC;
-        const SK_GEPORT *pPort = &pAC->GIni.GP[port];
-
-        static int DuplexAutoNegConfMap[9][3]= {
-                { -1                     , -1         , -1              },
-                { 0                      , -1         , -1              },
-                { SK_LMODE_HALF          , DUPLEX_HALF, AUTONEG_DISABLE },
-                { SK_LMODE_FULL          , DUPLEX_FULL, AUTONEG_DISABLE },
-                { SK_LMODE_AUTOHALF      , DUPLEX_HALF, AUTONEG_ENABLE  },
-                { SK_LMODE_AUTOFULL      , DUPLEX_FULL, AUTONEG_ENABLE  },
-                { SK_LMODE_AUTOBOTH      , DUPLEX_FULL, AUTONEG_ENABLE  },
-                { SK_LMODE_AUTOSENSE     , -1         , -1              },
-                { SK_LMODE_INDETERMINATED, -1         , -1              }
-        };
-        static int SpeedConfMap[6][2] = {
-                { 0                       , -1         },
-                { SK_LSPEED_AUTO          , -1         },
-                { SK_LSPEED_10MBPS        , SPEED_10   },
-                { SK_LSPEED_100MBPS       , SPEED_100  },
-                { SK_LSPEED_1000MBPS      , SPEED_1000 },
-                { SK_LSPEED_INDETERMINATED, -1         }
-        };
-        static int AdvSpeedMap[6][2] = {
-                { 0                       , -1         },
-                { SK_LSPEED_AUTO          , -1         },
-                { SK_LSPEED_10MBPS        , ADVERTISED_10baseT_Half   | ADVERTISED_10baseT_Full },
-                { SK_LSPEED_100MBPS       , ADVERTISED_100baseT_Half  | ADVERTISED_100baseT_Full },
-                { SK_LSPEED_1000MBPS      , ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full},
-                { SK_LSPEED_INDETERMINATED, -1         }
-        };
-
-        ecmd->phy_address = port;
-        ecmd->speed       = SpeedConfMap[pPort->PLinkSpeedUsed][1];
-        ecmd->duplex      = DuplexAutoNegConfMap[pPort->PLinkModeStatus][1];
-        ecmd->autoneg     = DuplexAutoNegConfMap[pPort->PLinkModeStatus][2];
-        ecmd->transceiver = XCVR_INTERNAL;
-
-        if (pAC->GIni.GICopperType) {
-                ecmd->port        = PORT_TP;
-                ecmd->supported   = (SUPP_COPPER_ALL|SUPPORTED_Autoneg);
-                if (pAC->GIni.GIGenesis) {
-                        ecmd->supported &= ~(SUPPORTED_10baseT_Half);
-                        ecmd->supported &= ~(SUPPORTED_10baseT_Full);
-                        ecmd->supported &= ~(SUPPORTED_100baseT_Half);
-                        ecmd->supported &= ~(SUPPORTED_100baseT_Full);
-                } else {
-                        if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
-                                ecmd->supported &= ~(SUPPORTED_1000baseT_Half);
-                        } 
-#ifdef CHIP_ID_YUKON_FE
-                        if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
-                                ecmd->supported &= ~(SUPPORTED_1000baseT_Half);
-                                ecmd->supported &= ~(SUPPORTED_1000baseT_Full);
-                        }
-#endif
-                }
-                if (pAC->GIni.GP[0].PLinkSpeed != SK_LSPEED_AUTO) {
-                        ecmd->advertising = AdvSpeedMap[pPort->PLinkSpeed][1];
-                        if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
-                                ecmd->advertising &= ~(SUPPORTED_1000baseT_Half);
-                        } 
-                } else {
-                        ecmd->advertising = ecmd->supported;
-                }
-
-                if (ecmd->autoneg == AUTONEG_ENABLE) 
-                        ecmd->advertising |= ADVERTISED_Autoneg;
-        } else {
-                ecmd->port        = PORT_FIBRE;
-                ecmd->supported   = SUPP_FIBRE_ALL;
-                ecmd->advertising = ADV_FIBRE_ALL;
-        }
-        return 0;
-}
-
-/*
- * MIB infrastructure uses instance value starting at 1
- * based on board and port.
- */
-static inline u32 pnmiInstance(const DEV_NET *pNet)
-{
-        return 1 + (pNet->pAC->RlmtNets == 2) + pNet->PortNr;
-}
-
-/*****************************************************************************
- *
- *      setSettings - configures the settings of a selected adapter
- *
- * Description:
- *      Possible settings that may be altered are a)speed, b)duplex or 
- *      c)autonegotiation.
- *
- * Returns:
- *      0:      everything fine, no error
- *      <0:     the return value is the error code of the failure 
- */
-static int setSettings(struct net_device *dev, struct ethtool_cmd *ecmd)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-        u32 instance;
-        char buf[4];
-        int len = 1;
-
-        if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100 
-            && ecmd->speed != SPEED_1000)
-                return -EINVAL;
-
-        if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
-                return -EINVAL;
-
-        if (ecmd->autoneg != AUTONEG_DISABLE && ecmd->autoneg != AUTONEG_ENABLE)
-                return -EINVAL;
-
-        if (ecmd->autoneg == AUTONEG_DISABLE)
-                *buf = (ecmd->duplex == DUPLEX_FULL) 
-                        ? SK_LMODE_FULL : SK_LMODE_HALF;
-        else
-                *buf = (ecmd->duplex == DUPLEX_FULL) 
-                        ? SK_LMODE_AUTOFULL : SK_LMODE_AUTOHALF;
-        
-        instance = pnmiInstance(pNet);
-        if (SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_LINK_MODE, 
-                           &buf, &len, instance, pNet->NetNr) != SK_PNMI_ERR_OK)
-                return -EINVAL;
-
-        switch(ecmd->speed) {
-        case SPEED_1000:
-                *buf = SK_LSPEED_1000MBPS;
-                break;
-        case SPEED_100:
-                *buf = SK_LSPEED_100MBPS;
-                break;
-        case SPEED_10:
-                *buf = SK_LSPEED_10MBPS;
-        }
-
-        if (SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_SPEED_MODE, 
-                         &buf, &len, instance, pNet->NetNr) != SK_PNMI_ERR_OK)
-                return -EINVAL;
-
-        return 0;
-}
-
-/*****************************************************************************
- *
- *      getDriverInfo - returns generic driver and adapter information
- *
- * Description:
- *      Generic driver information is returned via this function, such as
- *      the name of the driver, its version and and firmware version.
- *      In addition to this, the location of the selected adapter is 
- *      returned as a bus info string (e.g. '01:05.0').
- *      
- * Returns:     N/A
- *
- */
-static void getDriverInfo(struct net_device *dev, struct ethtool_drvinfo *info)
-{
-        const DEV_NET   *pNet = netdev_priv(dev);
-        const SK_AC *pAC = pNet->pAC;
-        char vers[32];
-
-        snprintf(vers, sizeof(vers)-1, VER_STRING "(v%d.%d)",
-                (pAC->GIni.GIPciHwRev >> 4) & 0xf, pAC->GIni.GIPciHwRev & 0xf);
-
-        strlcpy(info->driver, DRIVER_FILE_NAME, sizeof(info->driver));
-        strcpy(info->version, vers);
-        strcpy(info->fw_version, "N/A");
-        strlcpy(info->bus_info, pci_name(pAC->PciDev), ETHTOOL_BUSINFO_LEN);
-}
-
-/*
- * Ethtool statistics support.
- */
-static const char StringsStats[][ETH_GSTRING_LEN] = {
-        "rx_packets",   "tx_packets",
-        "rx_bytes",     "tx_bytes",
-        "rx_errors",    "tx_errors",    
-        "rx_dropped",   "tx_dropped",
-        "multicasts",   "collisions",   
-        "rx_length_errors",             "rx_buffer_overflow_errors",
-        "rx_crc_errors",                "rx_frame_errors",
-        "rx_too_short_errors",          "rx_too_long_errors",
-        "rx_carrier_extension_errors",  "rx_symbol_errors",
-        "rx_llc_mac_size_errors",       "rx_carrier_errors",    
-        "rx_jabber_errors",             "rx_missed_errors",
-        "tx_abort_collision_errors",    "tx_carrier_errors",
-        "tx_buffer_underrun_errors",    "tx_heartbeat_errors",
-        "tx_window_errors",
-};
-
-static int getStatsCount(struct net_device *dev)
-{
-        return ARRAY_SIZE(StringsStats);
-}
-
-static void getStrings(struct net_device *dev, u32 stringset, u8 *data)
-{
-        switch(stringset) {
-        case ETH_SS_STATS:
-                memcpy(data, *StringsStats, sizeof(StringsStats));
-                break;
-        }
-}
-
-static void getEthtoolStats(struct net_device *dev,
-                            struct ethtool_stats *stats, u64 *data)
-{
-        const DEV_NET   *pNet = netdev_priv(dev);
-        const SK_AC *pAC = pNet->pAC;
-        const SK_PNMI_STRUCT_DATA *pPnmiStruct = &pAC->PnmiStruct;
-
-        *data++ = pPnmiStruct->Stat[0].StatRxOkCts;
-        *data++ = pPnmiStruct->Stat[0].StatTxOkCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxOctetsOkCts;
-        *data++ = pPnmiStruct->Stat[0].StatTxOctetsOkCts;
-        *data++ = pPnmiStruct->InErrorsCts;
-        *data++ = pPnmiStruct->Stat[0].StatTxSingleCollisionCts;
-        *data++ = pPnmiStruct->RxNoBufCts;
-        *data++ = pPnmiStruct->TxNoBufCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxMulticastOkCts;
-        *data++ = pPnmiStruct->Stat[0].StatTxSingleCollisionCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxRuntCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxFifoOverflowCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxFcsCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxFramingCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxShortsCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxTooLongCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxCextCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxSymbolCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxIRLengthCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxCarrierCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxJabberCts;
-        *data++ = pPnmiStruct->Stat[0].StatRxMissedCts;
-        *data++ = pAC->stats.tx_aborted_errors;
-        *data++ = pPnmiStruct->Stat[0].StatTxCarrierCts;
-        *data++ = pPnmiStruct->Stat[0].StatTxFifoUnderrunCts;
-        *data++ = pPnmiStruct->Stat[0].StatTxCarrierCts;
-        *data++ = pAC->stats.tx_window_errors;
-}
-
-
-/*****************************************************************************
- *
- *      toggleLeds - Changes the LED state of an adapter
- *
- * Description:
- *      This function changes the current state of all LEDs of an adapter so
- *      that it can be located by a user. 
- *
- * Returns:     N/A
- *
- */
-static void toggleLeds(DEV_NET *pNet, int on)
-{
-        SK_AC *pAC = pNet->pAC;
-        int port = pNet->PortNr;
-        void __iomem *io = pAC->IoBase;
-
-        if (pAC->GIni.GIGenesis) {
-                SK_OUT8(io, MR_ADDR(port,LNK_LED_REG), 
-                        on ? SK_LNK_ON : SK_LNK_OFF);
-                SkGeYellowLED(pAC, io, 
-                              on ? (LED_ON >> 1) : (LED_OFF >> 1));
-                SkGeXmitLED(pAC, io, MR_ADDR(port,RX_LED_INI),
-                            on ? SK_LED_TST : SK_LED_DIS);
-
-                if (pAC->GIni.GP[port].PhyType == SK_PHY_BCOM)
-                        SkXmPhyWrite(pAC, io, port, PHY_BCOM_P_EXT_CTRL, 
-                                     on ? PHY_B_PEC_LED_ON : PHY_B_PEC_LED_OFF);
-                else if (pAC->GIni.GP[port].PhyType == SK_PHY_LONE)
-                        SkXmPhyWrite(pAC, io, port, PHY_LONE_LED_CFG,
-                                     on ? 0x0800 : PHY_L_LC_LEDT);
-                else
-                        SkGeXmitLED(pAC, io, MR_ADDR(port,TX_LED_INI),
-                                    on ? SK_LED_TST : SK_LED_DIS);
-        } else {
-                const u16 YukLedOn = (PHY_M_LED_MO_DUP(MO_LED_ON)  |
-                                      PHY_M_LED_MO_10(MO_LED_ON)   |
-                                      PHY_M_LED_MO_100(MO_LED_ON)  |
-                                      PHY_M_LED_MO_1000(MO_LED_ON) | 
-                                      PHY_M_LED_MO_RX(MO_LED_ON));
-                const u16  YukLedOff = (PHY_M_LED_MO_DUP(MO_LED_OFF)  |
-                                        PHY_M_LED_MO_10(MO_LED_OFF)   |
-                                        PHY_M_LED_MO_100(MO_LED_OFF)  |
-                                        PHY_M_LED_MO_1000(MO_LED_OFF) | 
-                                        PHY_M_LED_MO_RX(MO_LED_OFF));
-        
-
-                SkGmPhyWrite(pAC,io,port,PHY_MARV_LED_CTRL,0);
-                SkGmPhyWrite(pAC,io,port,PHY_MARV_LED_OVER, 
-                             on ? YukLedOn : YukLedOff);
-        }
-}
-
-/*****************************************************************************
- *
- *      skGeBlinkTimer - Changes the LED state of an adapter
- *
- * Description:
- *      This function changes the current state of all LEDs of an adapter so
- *      that it can be located by a user. If the requested time interval for
- *      this test has elapsed, this function cleans up everything that was 
- *      temporarily setup during the locate NIC test. This involves of course
- *      also closing or opening any adapter so that the initial board state 
- *      is recovered.
- *
- * Returns:     N/A
- *
- */
-void SkGeBlinkTimer(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *) data;
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-
-        toggleLeds(pNet, pAC->LedsOn);
-
-        pAC->LedsOn = !pAC->LedsOn;
-        mod_timer(&pAC->BlinkTimer, jiffies + HZ/4);
-}
-
-/*****************************************************************************
- *
- *      locateDevice - start the locate NIC feature of the elected adapter 
- *
- * Description:
- *      This function is used if the user want to locate a particular NIC.
- *      All LEDs are regularly switched on and off, so the NIC can easily
- *      be identified.
- *
- * Returns:     
- *      ==0:    everything fine, no error, locateNIC test was started
- *      !=0:    one locateNIC test runs already
- *
- */
-static int locateDevice(struct net_device *dev, u32 data)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-
-        if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
-                data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
-
-        /* start blinking */
-        pAC->LedsOn = 0;
-        mod_timer(&pAC->BlinkTimer, jiffies);
-        msleep_interruptible(data * 1000);
-        del_timer_sync(&pAC->BlinkTimer);
-        toggleLeds(pNet, 0);
-
-        return 0;
-}
-
-/*****************************************************************************
- *
- *      getPauseParams - retrieves the pause parameters
- *
- * Description:
- *      All current pause parameters of a selected adapter are placed 
- *      in the passed ethtool_pauseparam structure and are returned.
- *
- * Returns:     N/A
- *
- */
-static void getPauseParams(struct net_device *dev, struct ethtool_pauseparam *epause) 
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-        SK_GEPORT *pPort = &pAC->GIni.GP[pNet->PortNr];
-
-        epause->rx_pause = (pPort->PFlowCtrlMode == SK_FLOW_MODE_SYMMETRIC) ||
-                  (pPort->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM);
-
-        epause->tx_pause = epause->rx_pause || (pPort->PFlowCtrlMode == SK_FLOW_MODE_LOC_SEND);
-        epause->autoneg = epause->rx_pause || epause->tx_pause;
-}
-
-/*****************************************************************************
- *
- *      setPauseParams - configures the pause parameters of an adapter
- *
- * Description:
- *      This function sets the Rx or Tx pause parameters 
- *
- * Returns:
- *      ==0:    everything fine, no error
- *      !=0:    the return value is the error code of the failure 
- */
-static int setPauseParams(struct net_device *dev , struct ethtool_pauseparam *epause)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-        SK_GEPORT *pPort = &pAC->GIni.GP[pNet->PortNr];
-        u32     instance = pnmiInstance(pNet);
-        struct ethtool_pauseparam old;
-        u8      oldspeed = pPort->PLinkSpeedUsed;
-        char    buf[4];
-        int     len = 1;
-        int ret;
-
-        /*
-        ** we have to determine the current settings to see if 
-        ** the operator requested any modification of the flow 
-        ** control parameters...
-        */
-        getPauseParams(dev, &old);
-
-        /*
-        ** perform modifications regarding the changes 
-        ** requested by the operator
-        */
-        if (epause->autoneg != old.autoneg) 
-                *buf = epause->autoneg ? SK_FLOW_MODE_NONE : SK_FLOW_MODE_SYMMETRIC;
-        else {
-                if (epause->rx_pause && epause->tx_pause) 
-                        *buf = SK_FLOW_MODE_SYMMETRIC;
-                else if (epause->rx_pause && !epause->tx_pause)
-                        *buf =  SK_FLOW_MODE_SYM_OR_REM;
-                else if (!epause->rx_pause && epause->tx_pause)
-                        *buf =  SK_FLOW_MODE_LOC_SEND;
-                else
-                        *buf = SK_FLOW_MODE_NONE;
-        }
-
-        ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_FLOWCTRL_MODE,
-                         &buf, &len, instance, pNet->NetNr);
-
-        if (ret != SK_PNMI_ERR_OK) {
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_CTRL,
-                           ("ethtool (sk98lin): error changing rx/tx pause (%i)\n", ret));
-                goto err;
-        }
-
-        /*
-        ** It may be that autoneg has been disabled! Therefore
-        ** set the speed to the previously used value...
-        */
-        if (!epause->autoneg) {
-                len = 1;
-                ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_SPEED_MODE, 
-                                   &oldspeed, &len, instance, pNet->NetNr);
-                if (ret != SK_PNMI_ERR_OK) 
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_CTRL,
-                                   ("ethtool (sk98lin): error setting speed (%i)\n", ret));
-        }
- err:
-        return ret ? -EIO : 0;
-}
-
-/* Only Yukon supports checksum offload. */
-static int setScatterGather(struct net_device *dev, u32 data)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-
-        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
-                return -EOPNOTSUPP;
-        return ethtool_op_set_sg(dev, data);
-}
-
-static int setTxCsum(struct net_device *dev, u32 data)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-
-        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
-                return -EOPNOTSUPP;
-
-        return ethtool_op_set_tx_csum(dev, data);
-}
-
-static u32 getRxCsum(struct net_device *dev)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-
-        return pAC->RxPort[pNet->PortNr].RxCsum;
-}
-
-static int setRxCsum(struct net_device *dev, u32 data)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-
-        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
-                return -EOPNOTSUPP;
-
-        pAC->RxPort[pNet->PortNr].RxCsum = data != 0;
-        return 0;
-}
-
-static int getRegsLen(struct net_device *dev)
-{
-        return 0x4000;
-}
-
-/*
- * Returns copy of whole control register region
- * Note: skip RAM address register because accessing it will
- *       cause bus hangs!
- */
-static void getRegs(struct net_device *dev, struct ethtool_regs *regs,
-                          void *p)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        const void __iomem *io = pNet->pAC->IoBase;
-
-        regs->version = 1;
-        memset(p, 0, regs->len);
-        memcpy_fromio(p, io, B3_RAM_ADDR);
-
-        memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1,
-                      regs->len - B3_RI_WTO_R1);
-}
-
-const struct ethtool_ops SkGeEthtoolOps = {
-        .get_settings           = getSettings,
-        .set_settings           = setSettings,
-        .get_drvinfo            = getDriverInfo,
-        .get_strings            = getStrings,
-        .get_stats_count        = getStatsCount,
-        .get_ethtool_stats      = getEthtoolStats,
-        .phys_id                = locateDevice,
-        .get_pauseparam         = getPauseParams,
-        .set_pauseparam         = setPauseParams,
-        .get_link               = ethtool_op_get_link,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = setScatterGather,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .set_tx_csum            = setTxCsum,
-        .get_rx_csum            = getRxCsum,
-        .set_rx_csum            = setRxCsum,
-        .get_regs               = getRegs,
-        .get_regs_len           = getRegsLen,
-};
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
deleted file mode 100644
index 20890e44f99a..000000000000
--- a/drivers/net/sk98lin/skge.c
+++ /dev/null
@@ -1,5218 +0,0 @@
-/******************************************************************************
- *
- * Name:        skge.c
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.45 $
- * Date:        $Date: 2004/02/12 14:41:02 $
- * Purpose:     The main driver source module
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      Driver for Marvell Yukon chipset and SysKonnect Gigabit Ethernet 
- *      Server Adapters.
- *
- *      Created 10-Feb-1999, based on Linux' acenic.c, 3c59x.c and
- *      SysKonnects GEnesis Solaris driver
- *      Author: Christoph Goos (cgoos@syskonnect.de)
- *              Mirko Lindner (mlindner@syskonnect.de)
- *
- *      Address all question to: linux@syskonnect.de
- *
- *      The technical manual for the adapters is available from SysKonnect's
- *      web pages: www.syskonnect.com
- *      Goto "Support" and search Knowledge Base for "manual".
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Possible compiler options (#define xxx / -Dxxx):
- *
- *      debugging can be enable by changing SK_DEBUG_CHKMOD and
- *      SK_DEBUG_CHKCAT in makefile (described there).
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- *      This is the main module of the Linux GE driver.
- *      
- *      All source files except skge.c, skdrv1st.h, skdrv2nd.h and sktypes.h
- *      are part of SysKonnect's COMMON MODULES for the SK-98xx adapters.
- *      Those are used for drivers on multiple OS', so some thing may seem
- *      unnecessary complicated on Linux. Please do not try to 'clean up'
- *      them without VERY good reasons, because this will make it more
- *      difficult to keep the Linux driver in synchronisation with the
- *      other versions.
- *
- * Include file hierarchy:
- *
- *      <linux/module.h>
- *
- *      "h/skdrv1st.h"
- *              <linux/types.h>
- *              <linux/kernel.h>
- *              <linux/string.h>
- *              <linux/errno.h>
- *              <linux/ioport.h>
- *              <linux/slab.h>
- *              <linux/interrupt.h>
- *              <linux/pci.h>
- *              <linux/bitops.h>
- *              <asm/byteorder.h>
- *              <asm/io.h>
- *              <linux/netdevice.h>
- *              <linux/etherdevice.h>
- *              <linux/skbuff.h>
- *          those three depending on kernel version used:
- *              <linux/bios32.h>
- *              <linux/init.h>
- *              <asm/uaccess.h>
- *              <net/checksum.h>
- *
- *              "h/skerror.h"
- *              "h/skdebug.h"
- *              "h/sktypes.h"
- *              "h/lm80.h"
- *              "h/xmac_ii.h"
- *
- *      "h/skdrv2nd.h"
- *              "h/skqueue.h"
- *              "h/skgehwt.h"
- *              "h/sktimer.h"
- *              "h/ski2c.h"
- *              "h/skgepnmi.h"
- *              "h/skvpd.h"
- *              "h/skgehw.h"
- *              "h/skgeinit.h"
- *              "h/skaddr.h"
- *              "h/skgesirq.h"
- *              "h/skrlmt.h"
- *
- ******************************************************************************/
-
-#include        "h/skversion.h"
-
-#include        <linux/in.h>
-#include        <linux/module.h>
-#include        <linux/moduleparam.h>
-#include        <linux/init.h>
-#include        <linux/dma-mapping.h>
-#include        <linux/ip.h>
-#include        <linux/mii.h>
-#include        <linux/mm.h>
-
-#include        "h/skdrv1st.h"
-#include        "h/skdrv2nd.h"
-
-/*******************************************************************************
- *
- * Defines
- *
- ******************************************************************************/
-
-/* for debuging on x86 only */
-/* #define BREAKPOINT() asm(" int $3"); */
-
-/* use the transmit hw checksum driver functionality */
-#define USE_SK_TX_CHECKSUM
-
-/* use the receive hw checksum driver functionality */
-#define USE_SK_RX_CHECKSUM
-
-/* use the scatter-gather functionality with sendfile() */
-#define SK_ZEROCOPY
-
-/* use of a transmit complete interrupt */
-#define USE_TX_COMPLETE
-
-/*
- * threshold for copying small receive frames
- * set to 0 to avoid copying, set to 9001 to copy all frames
- */
-#define SK_COPY_THRESHOLD       50
-
-/* number of adapters that can be configured via command line params */
-#define SK_MAX_CARD_PARAM       16
-
-
-
-/*
- * use those defines for a compile-in version of the driver instead
- * of command line parameters
- */
-// #define LINK_SPEED_A {"Auto", }
-// #define LINK_SPEED_B {"Auto", }
-// #define AUTO_NEG_A   {"Sense", }
-// #define AUTO_NEG_B   {"Sense", }
-// #define DUP_CAP_A    {"Both", }
-// #define DUP_CAP_B    {"Both", }
-// #define FLOW_CTRL_A  {"SymOrRem", }
-// #define FLOW_CTRL_B  {"SymOrRem", }
-// #define ROLE_A       {"Auto", }
-// #define ROLE_B       {"Auto", }
-// #define PREF_PORT    {"A", }
-// #define CON_TYPE     {"Auto", }
-// #define RLMT_MODE    {"CheckLinkState", }
-
-#define DEV_KFREE_SKB(skb) dev_kfree_skb(skb)
-#define DEV_KFREE_SKB_IRQ(skb) dev_kfree_skb_irq(skb)
-#define DEV_KFREE_SKB_ANY(skb) dev_kfree_skb_any(skb)
-
-
-/* Set blink mode*/
-#define OEM_CONFIG_VALUE (      SK_ACT_LED_BLINK | \
-                                SK_DUP_LED_NORMAL | \
-                                SK_LED_LINK100_ON)
-
-
-/* Isr return value */
-#define SkIsrRetVar     irqreturn_t
-#define SkIsrRetNone    IRQ_NONE
-#define SkIsrRetHandled IRQ_HANDLED
-
-
-/*******************************************************************************
- *
- * Local Function Prototypes
- *
- ******************************************************************************/
-
-static void     FreeResources(struct SK_NET_DEVICE *dev);
-static int      SkGeBoardInit(struct SK_NET_DEVICE *dev, SK_AC *pAC);
-static SK_BOOL  BoardAllocMem(SK_AC *pAC);
-static void     BoardFreeMem(SK_AC *pAC);
-static void     BoardInitMem(SK_AC *pAC);
-static void     SetupRing(SK_AC*, void*, uintptr_t, RXD**, RXD**, RXD**, int*, SK_BOOL);
-static SkIsrRetVar      SkGeIsr(int irq, void *dev_id);
-static SkIsrRetVar      SkGeIsrOnePort(int irq, void *dev_id);
-static int      SkGeOpen(struct SK_NET_DEVICE *dev);
-static int      SkGeClose(struct SK_NET_DEVICE *dev);
-static int      SkGeXmit(struct sk_buff *skb, struct SK_NET_DEVICE *dev);
-static int      SkGeSetMacAddr(struct SK_NET_DEVICE *dev, void *p);
-static void     SkGeSetRxMode(struct SK_NET_DEVICE *dev);
-static struct   net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev);
-static int      SkGeIoctl(struct SK_NET_DEVICE *dev, struct ifreq *rq, int cmd);
-static void     GetConfiguration(SK_AC*);
-static int      XmitFrame(SK_AC*, TX_PORT*, struct sk_buff*);
-static void     FreeTxDescriptors(SK_AC*pAC, TX_PORT*);
-static void     FillRxRing(SK_AC*, RX_PORT*);
-static SK_BOOL  FillRxDescriptor(SK_AC*, RX_PORT*);
-static void     ReceiveIrq(SK_AC*, RX_PORT*, SK_BOOL);
-static void     ClearAndStartRx(SK_AC*, int);
-static void     ClearTxIrq(SK_AC*, int, int);
-static void     ClearRxRing(SK_AC*, RX_PORT*);
-static void     ClearTxRing(SK_AC*, TX_PORT*);
-static int      SkGeChangeMtu(struct SK_NET_DEVICE *dev, int new_mtu);
-static void     PortReInitBmu(SK_AC*, int);
-static int      SkGeIocMib(DEV_NET*, unsigned int, int);
-static int      SkGeInitPCI(SK_AC *pAC);
-static void     StartDrvCleanupTimer(SK_AC *pAC);
-static void     StopDrvCleanupTimer(SK_AC *pAC);
-static int      XmitFrameSG(SK_AC*, TX_PORT*, struct sk_buff*);
-
-#ifdef SK_DIAG_SUPPORT
-static SK_U32   ParseDeviceNbrFromSlotName(const char *SlotName);
-static int      SkDrvInitAdapter(SK_AC *pAC, int devNbr);
-static int      SkDrvDeInitAdapter(SK_AC *pAC, int devNbr);
-#endif
-
-/*******************************************************************************
- *
- * Extern Function Prototypes
- *
- ******************************************************************************/
-extern void SkDimEnableModerationIfNeeded(SK_AC *pAC);  
-extern void SkDimDisplayModerationSettings(SK_AC *pAC);
-extern void SkDimStartModerationTimer(SK_AC *pAC);
-extern void SkDimModerate(SK_AC *pAC);
-extern void SkGeBlinkTimer(unsigned long data);
-
-#ifdef DEBUG
-static void     DumpMsg(struct sk_buff*, char*);
-static void     DumpData(char*, int);
-static void     DumpLong(char*, int);
-#endif
-
-/* global variables *********************************************************/
-static SK_BOOL DoPrintInterfaceChange = SK_TRUE;
-extern const struct ethtool_ops SkGeEthtoolOps;
-
-/* local variables **********************************************************/
-static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
-static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
-
-/*****************************************************************************
- *
- *      SkPciWriteCfgDWord - write a 32 bit value to pci config space
- *
- * Description:
- *      This routine writes a 32 bit value to the pci configuration
- *      space.
- *
- * Returns:
- *      0 - indicate everything worked ok.
- *      != 0 - error indication
- */
-static inline int SkPciWriteCfgDWord(
-SK_AC *pAC,     /* Adapter Control structure pointer */
-int PciAddr,            /* PCI register address */
-SK_U32 Val)             /* pointer to store the read value */
-{
-        pci_write_config_dword(pAC->PciDev, PciAddr, Val);
-        return(0);
-} /* SkPciWriteCfgDWord */
-
-/*****************************************************************************
- *
- *      SkGeInitPCI - Init the PCI resources
- *
- * Description:
- *      This function initialize the PCI resources and IO
- *
- * Returns:
- *      0 - indicate everything worked ok.
- *      != 0 - error indication
- */
-static __devinit int SkGeInitPCI(SK_AC *pAC)
-{
-        struct SK_NET_DEVICE *dev = pAC->dev[0];
-        struct pci_dev *pdev = pAC->PciDev;
-        int retval;
-
-        dev->mem_start = pci_resource_start (pdev, 0);
-        pci_set_master(pdev);
-
-        retval = pci_request_regions(pdev, "sk98lin");
-        if (retval)
-                goto out;
-
-#ifdef SK_BIG_ENDIAN
-        /*
-         * On big endian machines, we use the adapter's aibility of
-         * reading the descriptors as big endian.
-         */
-        {
-                SK_U32          our2;
-                SkPciReadCfgDWord(pAC, PCI_OUR_REG_2, &our2);
-                our2 |= PCI_REV_DESC;
-                SkPciWriteCfgDWord(pAC, PCI_OUR_REG_2, our2);
-        }
-#endif
-
-        /*
-         * Remap the regs into kernel space.
-         */
-        pAC->IoBase = ioremap_nocache(dev->mem_start, 0x4000);
-        if (!pAC->IoBase) {
-                retval = -EIO;
-                goto out_release;
-        }
-
-        return 0;
-
- out_release:
-        pci_release_regions(pdev);
- out:
-        return retval;
-}
-
-
-/*****************************************************************************
- *
- *      FreeResources - release resources allocated for adapter
- *
- * Description:
- *      This function releases the IRQ, unmaps the IO and
- *      frees the desriptor ring.
- *
- * Returns: N/A
- *      
- */
-static void FreeResources(struct SK_NET_DEVICE *dev)
-{
-SK_U32 AllocFlag;
-DEV_NET         *pNet;
-SK_AC           *pAC;
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-        AllocFlag = pAC->AllocFlag;
-        if (pAC->PciDev) {
-                pci_release_regions(pAC->PciDev);
-        }
-        if (AllocFlag & SK_ALLOC_IRQ) {
-                free_irq(dev->irq, dev);
-        }
-        if (pAC->IoBase) {
-                iounmap(pAC->IoBase);
-        }
-        if (pAC->pDescrMem) {
-                BoardFreeMem(pAC);
-        }
-        
-} /* FreeResources */
-
-MODULE_AUTHOR("Mirko Lindner <mlindner@syskonnect.de>");
-MODULE_DESCRIPTION("SysKonnect SK-NET Gigabit Ethernet SK-98xx driver");
-MODULE_LICENSE("GPL");
-
-#ifdef LINK_SPEED_A
-static char *Speed_A[SK_MAX_CARD_PARAM] = LINK_SPEED;
-#else
-static char *Speed_A[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef LINK_SPEED_B
-static char *Speed_B[SK_MAX_CARD_PARAM] = LINK_SPEED;
-#else
-static char *Speed_B[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef AUTO_NEG_A
-static char *AutoNeg_A[SK_MAX_CARD_PARAM] = AUTO_NEG_A;
-#else
-static char *AutoNeg_A[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef DUP_CAP_A
-static char *DupCap_A[SK_MAX_CARD_PARAM] = DUP_CAP_A;
-#else
-static char *DupCap_A[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef FLOW_CTRL_A
-static char *FlowCtrl_A[SK_MAX_CARD_PARAM] = FLOW_CTRL_A;
-#else
-static char *FlowCtrl_A[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef ROLE_A
-static char *Role_A[SK_MAX_CARD_PARAM] = ROLE_A;
-#else
-static char *Role_A[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef AUTO_NEG_B
-static char *AutoNeg_B[SK_MAX_CARD_PARAM] = AUTO_NEG_B;
-#else
-static char *AutoNeg_B[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef DUP_CAP_B
-static char *DupCap_B[SK_MAX_CARD_PARAM] = DUP_CAP_B;
-#else
-static char *DupCap_B[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef FLOW_CTRL_B
-static char *FlowCtrl_B[SK_MAX_CARD_PARAM] = FLOW_CTRL_B;
-#else
-static char *FlowCtrl_B[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef ROLE_B
-static char *Role_B[SK_MAX_CARD_PARAM] = ROLE_B;
-#else
-static char *Role_B[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef CON_TYPE
-static char *ConType[SK_MAX_CARD_PARAM] = CON_TYPE;
-#else
-static char *ConType[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef PREF_PORT
-static char *PrefPort[SK_MAX_CARD_PARAM] = PREF_PORT;
-#else
-static char *PrefPort[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-#ifdef RLMT_MODE
-static char *RlmtMode[SK_MAX_CARD_PARAM] = RLMT_MODE;
-#else
-static char *RlmtMode[SK_MAX_CARD_PARAM] = {"", };
-#endif
-
-static int   IntsPerSec[SK_MAX_CARD_PARAM];
-static char *Moderation[SK_MAX_CARD_PARAM];
-static char *ModerationMask[SK_MAX_CARD_PARAM];
-static char *AutoSizing[SK_MAX_CARD_PARAM];
-static char *Stats[SK_MAX_CARD_PARAM];
-
-module_param_array(Speed_A, charp, NULL, 0);
-module_param_array(Speed_B, charp, NULL, 0);
-module_param_array(AutoNeg_A, charp, NULL, 0);
-module_param_array(AutoNeg_B, charp, NULL, 0);
-module_param_array(DupCap_A, charp, NULL, 0);
-module_param_array(DupCap_B, charp, NULL, 0);
-module_param_array(FlowCtrl_A, charp, NULL, 0);
-module_param_array(FlowCtrl_B, charp, NULL, 0);
-module_param_array(Role_A, charp, NULL, 0);
-module_param_array(Role_B, charp, NULL, 0);
-module_param_array(ConType, charp, NULL, 0);
-module_param_array(PrefPort, charp, NULL, 0);
-module_param_array(RlmtMode, charp, NULL, 0);
-/* used for interrupt moderation */
-module_param_array(IntsPerSec, int, NULL, 0);
-module_param_array(Moderation, charp, NULL, 0);
-module_param_array(Stats, charp, NULL, 0);
-module_param_array(ModerationMask, charp, NULL, 0);
-module_param_array(AutoSizing, charp, NULL, 0);
-
-/*****************************************************************************
- *
- *      SkGeBoardInit - do level 0 and 1 initialization
- *
- * Description:
- *      This function prepares the board hardware for running. The desriptor
- *      ring is set up, the IRQ is allocated and the configuration settings
- *      are examined.
- *
- * Returns:
- *      0, if everything is ok
- *      !=0, on error
- */
-static int __devinit SkGeBoardInit(struct SK_NET_DEVICE *dev, SK_AC *pAC)
-{
-short   i;
-unsigned long Flags;
-char    *DescrString = "sk98lin: Driver for Linux"; /* this is given to PNMI */
-char    *VerStr = VER_STRING;
-int     Ret;                    /* return code of request_irq */
-SK_BOOL DualNet;
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("IoBase: %08lX\n", (unsigned long)pAC->IoBase));
-        for (i=0; i<SK_MAX_MACS; i++) {
-                pAC->TxPort[i][0].HwAddr = pAC->IoBase + TxQueueAddr[i][0];
-                pAC->TxPort[i][0].PortIndex = i;
-                pAC->RxPort[i].HwAddr = pAC->IoBase + RxQueueAddr[i];
-                pAC->RxPort[i].PortIndex = i;
-        }
-
-        /* Initialize the mutexes */
-        for (i=0; i<SK_MAX_MACS; i++) {
-                spin_lock_init(&pAC->TxPort[i][0].TxDesRingLock);
-                spin_lock_init(&pAC->RxPort[i].RxDesRingLock);
-        }
-        spin_lock_init(&pAC->SlowPathLock);
-
-        /* setup phy_id blink timer */
-        pAC->BlinkTimer.function = SkGeBlinkTimer;
-        pAC->BlinkTimer.data = (unsigned long) dev;
-        init_timer(&pAC->BlinkTimer);
-
-        /* level 0 init common modules here */
-        
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        /* Does a RESET on board ...*/
-        if (SkGeInit(pAC, pAC->IoBase, SK_INIT_DATA) != 0) {
-                printk("HWInit (0) failed.\n");
-                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-                return -EIO;
-        }
-        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_DATA);
-        SkEventInit(pAC, pAC->IoBase, SK_INIT_DATA);
-        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_DATA);
-        SkAddrInit( pAC, pAC->IoBase, SK_INIT_DATA);
-        SkRlmtInit( pAC, pAC->IoBase, SK_INIT_DATA);
-        SkTimerInit(pAC, pAC->IoBase, SK_INIT_DATA);
-
-        pAC->BoardLevel = SK_INIT_DATA;
-        pAC->RxBufSize  = ETH_BUF_SIZE;
-
-        SK_PNMI_SET_DRIVER_DESCR(pAC, DescrString);
-        SK_PNMI_SET_DRIVER_VER(pAC, VerStr);
-
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-
-        /* level 1 init common modules here (HW init) */
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
-                printk("sk98lin: HWInit (1) failed.\n");
-                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-                return -EIO;
-        }
-        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_IO);
-        SkEventInit(pAC, pAC->IoBase, SK_INIT_IO);
-        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_IO);
-        SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
-        SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
-        SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
-
-        /* Set chipset type support */
-        pAC->ChipsetType = 0;
-        if ((pAC->GIni.GIChipId == CHIP_ID_YUKON) ||
-                (pAC->GIni.GIChipId == CHIP_ID_YUKON_LITE)) {
-                pAC->ChipsetType = 1;
-        }
-
-        GetConfiguration(pAC);
-        if (pAC->RlmtNets == 2) {
-                pAC->GIni.GIPortUsage = SK_MUL_LINK;
-        }
-
-        pAC->BoardLevel = SK_INIT_IO;
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-
-        if (pAC->GIni.GIMacsFound == 2) {
-                 Ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);
-        } else if (pAC->GIni.GIMacsFound == 1) {
-                Ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED,
-                        "sk98lin", dev);
-        } else {
-                printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
-                       pAC->GIni.GIMacsFound);
-                return -EIO;
-        }
-
-        if (Ret) {
-                printk(KERN_WARNING "sk98lin: Requested IRQ %d is busy.\n",
-                       dev->irq);
-                return Ret;
-        }
-        pAC->AllocFlag |= SK_ALLOC_IRQ;
-
-        /* Alloc memory for this board (Mem for RxD/TxD) : */
-        if(!BoardAllocMem(pAC)) {
-                printk("No memory for descriptor rings.\n");
-                return -ENOMEM;
-        }
-
-        BoardInitMem(pAC);
-        /* tschilling: New common function with minimum size check. */
-        DualNet = SK_FALSE;
-        if (pAC->RlmtNets == 2) {
-                DualNet = SK_TRUE;
-        }
-        
-        if (SkGeInitAssignRamToQueues(
-                pAC,
-                pAC->ActivePort,
-                DualNet)) {
-                BoardFreeMem(pAC);
-                printk("sk98lin: SkGeInitAssignRamToQueues failed.\n");
-                return -EIO;
-        }
-
-        return (0);
-} /* SkGeBoardInit */
-
-
-/*****************************************************************************
- *
- *      BoardAllocMem - allocate the memory for the descriptor rings
- *
- * Description:
- *      This function allocates the memory for all descriptor rings.
- *      Each ring is aligned for the desriptor alignment and no ring
- *      has a 4 GByte boundary in it (because the upper 32 bit must
- *      be constant for all descriptiors in one rings).
- *
- * Returns:
- *      SK_TRUE, if all memory could be allocated
- *      SK_FALSE, if not
- */
-static __devinit SK_BOOL BoardAllocMem(SK_AC    *pAC)
-{
-caddr_t         pDescrMem;      /* pointer to descriptor memory area */
-size_t          AllocLength;    /* length of complete descriptor area */
-int             i;              /* loop counter */
-unsigned long   BusAddr;
-
-        
-        /* rings plus one for alignment (do not cross 4 GB boundary) */
-        /* RX_RING_SIZE is assumed bigger than TX_RING_SIZE */
-#if (BITS_PER_LONG == 32)
-        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound + 8;
-#else
-        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound
-                + RX_RING_SIZE + 8;
-#endif
-
-        pDescrMem = pci_alloc_consistent(pAC->PciDev, AllocLength,
-                                         &pAC->pDescrMemDMA);
-
-        if (pDescrMem == NULL) {
-                return (SK_FALSE);
-        }
-        pAC->pDescrMem = pDescrMem;
-        BusAddr = (unsigned long) pAC->pDescrMemDMA;
-
-        /* Descriptors need 8 byte alignment, and this is ensured
-         * by pci_alloc_consistent.
-         */
-        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
-                        ("TX%d/A: pDescrMem: %lX,   PhysDescrMem: %lX\n",
-                        i, (unsigned long) pDescrMem,
-                        BusAddr));
-                pAC->TxPort[i][0].pTxDescrRing = pDescrMem;
-                pAC->TxPort[i][0].VTxDescrRing = BusAddr;
-                pDescrMem += TX_RING_SIZE;
-                BusAddr += TX_RING_SIZE;
-        
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
-                        ("RX%d: pDescrMem: %lX,   PhysDescrMem: %lX\n",
-                        i, (unsigned long) pDescrMem,
-                        (unsigned long)BusAddr));
-                pAC->RxPort[i].pRxDescrRing = pDescrMem;
-                pAC->RxPort[i].VRxDescrRing = BusAddr;
-                pDescrMem += RX_RING_SIZE;
-                BusAddr += RX_RING_SIZE;
-        } /* for */
-        
-        return (SK_TRUE);
-} /* BoardAllocMem */
-
-
-/****************************************************************************
- *
- *      BoardFreeMem - reverse of BoardAllocMem
- *
- * Description:
- *      Free all memory allocated in BoardAllocMem: adapter context,
- *      descriptor rings, locks.
- *
- * Returns:     N/A
- */
-static void BoardFreeMem(
-SK_AC           *pAC)
-{
-size_t          AllocLength;    /* length of complete descriptor area */
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("BoardFreeMem\n"));
-#if (BITS_PER_LONG == 32)
-        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound + 8;
-#else
-        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound
-                + RX_RING_SIZE + 8;
-#endif
-
-        pci_free_consistent(pAC->PciDev, AllocLength,
-                            pAC->pDescrMem, pAC->pDescrMemDMA);
-        pAC->pDescrMem = NULL;
-} /* BoardFreeMem */
-
-
-/*****************************************************************************
- *
- *      BoardInitMem - initiate the descriptor rings
- *
- * Description:
- *      This function sets the descriptor rings up in memory.
- *      The adapter is initialized with the descriptor start addresses.
- *
- * Returns:     N/A
- */
-static __devinit void BoardInitMem(SK_AC *pAC)
-{
-int     i;              /* loop counter */
-int     RxDescrSize;    /* the size of a rx descriptor rounded up to alignment*/
-int     TxDescrSize;    /* the size of a tx descriptor rounded up to alignment*/
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("BoardInitMem\n"));
-
-        RxDescrSize = (((sizeof(RXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
-        pAC->RxDescrPerRing = RX_RING_SIZE / RxDescrSize;
-        TxDescrSize = (((sizeof(TXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
-        pAC->TxDescrPerRing = TX_RING_SIZE / RxDescrSize;
-        
-        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                SetupRing(
-                        pAC,
-                        pAC->TxPort[i][0].pTxDescrRing,
-                        pAC->TxPort[i][0].VTxDescrRing,
-                        (RXD**)&pAC->TxPort[i][0].pTxdRingHead,
-                        (RXD**)&pAC->TxPort[i][0].pTxdRingTail,
-                        (RXD**)&pAC->TxPort[i][0].pTxdRingPrev,
-                        &pAC->TxPort[i][0].TxdRingFree,
-                        SK_TRUE);
-                SetupRing(
-                        pAC,
-                        pAC->RxPort[i].pRxDescrRing,
-                        pAC->RxPort[i].VRxDescrRing,
-                        &pAC->RxPort[i].pRxdRingHead,
-                        &pAC->RxPort[i].pRxdRingTail,
-                        &pAC->RxPort[i].pRxdRingPrev,
-                        &pAC->RxPort[i].RxdRingFree,
-                        SK_FALSE);
-        }
-} /* BoardInitMem */
-
-
-/*****************************************************************************
- *
- *      SetupRing - create one descriptor ring
- *
- * Description:
- *      This function creates one descriptor ring in the given memory area.
- *      The head, tail and number of free descriptors in the ring are set.
- *
- * Returns:
- *      none
- */
-static void SetupRing(
-SK_AC           *pAC,
-void            *pMemArea,      /* a pointer to the memory area for the ring */
-uintptr_t       VMemArea,       /* the virtual bus address of the memory area */
-RXD             **ppRingHead,   /* address where the head should be written */
-RXD             **ppRingTail,   /* address where the tail should be written */
-RXD             **ppRingPrev,   /* address where the tail should be written */
-int             *pRingFree,     /* address where the # of free descr. goes */
-SK_BOOL         IsTx)           /* flag: is this a tx ring */
-{
-int     i;              /* loop counter */
-int     DescrSize;      /* the size of a descriptor rounded up to alignment*/
-int     DescrNum;       /* number of descriptors per ring */
-RXD     *pDescr;        /* pointer to a descriptor (receive or transmit) */
-RXD     *pNextDescr;    /* pointer to the next descriptor */
-RXD     *pPrevDescr;    /* pointer to the previous descriptor */
-uintptr_t VNextDescr;   /* the virtual bus address of the next descriptor */
-
-        if (IsTx == SK_TRUE) {
-                DescrSize = (((sizeof(TXD) - 1) / DESCR_ALIGN) + 1) *
-                        DESCR_ALIGN;
-                DescrNum = TX_RING_SIZE / DescrSize;
-        } else {
-                DescrSize = (((sizeof(RXD) - 1) / DESCR_ALIGN) + 1) *
-                        DESCR_ALIGN;
-                DescrNum = RX_RING_SIZE / DescrSize;
-        }
-        
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
-                ("Descriptor size: %d   Descriptor Number: %d\n",
-                DescrSize,DescrNum));
-        
-        pDescr = (RXD*) pMemArea;
-        pPrevDescr = NULL;
-        pNextDescr = (RXD*) (((char*)pDescr) + DescrSize);
-        VNextDescr = VMemArea + DescrSize;
-        for(i=0; i<DescrNum; i++) {
-                /* set the pointers right */
-                pDescr->VNextRxd = VNextDescr & 0xffffffffULL;
-                pDescr->pNextRxd = pNextDescr;
-                if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN;
-
-                /* advance one step */
-                pPrevDescr = pDescr;
-                pDescr = pNextDescr;
-                pNextDescr = (RXD*) (((char*)pDescr) + DescrSize);
-                VNextDescr += DescrSize;
-        }
-        pPrevDescr->pNextRxd = (RXD*) pMemArea;
-        pPrevDescr->VNextRxd = VMemArea;
-        pDescr = (RXD*) pMemArea;
-        *ppRingHead = (RXD*) pMemArea;
-        *ppRingTail = *ppRingHead;
-        *ppRingPrev = pPrevDescr;
-        *pRingFree = DescrNum;
-} /* SetupRing */
-
-
-/*****************************************************************************
- *
- *      PortReInitBmu - re-initiate the descriptor rings for one port
- *
- * Description:
- *      This function reinitializes the descriptor rings of one port
- *      in memory. The port must be stopped before.
- *      The HW is initialized with the descriptor start addresses.
- *
- * Returns:
- *      none
- */
-static void PortReInitBmu(
-SK_AC   *pAC,           /* pointer to adapter context */
-int     PortIndex)      /* index of the port for which to re-init */
-{
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("PortReInitBmu "));
-
-        /* set address of first descriptor of ring in BMU */
-        SK_OUT32(pAC->IoBase, TxQueueAddr[PortIndex][TX_PRIO_LOW]+ Q_DA_L,
-                (uint32_t)(((caddr_t)
-                (pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxdRingHead) -
-                pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxDescrRing +
-                pAC->TxPort[PortIndex][TX_PRIO_LOW].VTxDescrRing) &
-                0xFFFFFFFF));
-        SK_OUT32(pAC->IoBase, TxQueueAddr[PortIndex][TX_PRIO_LOW]+ Q_DA_H,
-                (uint32_t)(((caddr_t)
-                (pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxdRingHead) -
-                pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxDescrRing +
-                pAC->TxPort[PortIndex][TX_PRIO_LOW].VTxDescrRing) >> 32));
-        SK_OUT32(pAC->IoBase, RxQueueAddr[PortIndex]+Q_DA_L,
-                (uint32_t)(((caddr_t)(pAC->RxPort[PortIndex].pRxdRingHead) -
-                pAC->RxPort[PortIndex].pRxDescrRing +
-                pAC->RxPort[PortIndex].VRxDescrRing) & 0xFFFFFFFF));
-        SK_OUT32(pAC->IoBase, RxQueueAddr[PortIndex]+Q_DA_H,
-                (uint32_t)(((caddr_t)(pAC->RxPort[PortIndex].pRxdRingHead) -
-                pAC->RxPort[PortIndex].pRxDescrRing +
-                pAC->RxPort[PortIndex].VRxDescrRing) >> 32));
-} /* PortReInitBmu */
-
-
-/****************************************************************************
- *
- *      SkGeIsr - handle adapter interrupts
- *
- * Description:
- *      The interrupt routine is called when the network adapter
- *      generates an interrupt. It may also be called if another device
- *      shares this interrupt vector with the driver.
- *
- * Returns: N/A
- *
- */
-static SkIsrRetVar SkGeIsr(int irq, void *dev_id)
-{
-struct SK_NET_DEVICE *dev = (struct SK_NET_DEVICE *)dev_id;
-DEV_NET         *pNet;
-SK_AC           *pAC;
-SK_U32          IntSrc;         /* interrupts source register contents */       
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-        
-        /*
-         * Check and process if its our interrupt
-         */
-        SK_IN32(pAC->IoBase, B0_SP_ISRC, &IntSrc);
-        if (IntSrc == 0) {
-                return SkIsrRetNone;
-        }
-
-        while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
-#if 0 /* software irq currently not used */
-                if (IntSrc & IS_IRQ_SW) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("Software IRQ\n"));
-                }
-#endif
-                if (IntSrc & IS_R1_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF RX1 IRQ\n"));
-                        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
-                        SK_PNMI_CNT_RX_INTR(pAC, 0);
-                }
-                if (IntSrc & IS_R2_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF RX2 IRQ\n"));
-                        ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
-                        SK_PNMI_CNT_RX_INTR(pAC, 1);
-                }
-#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-                if (IntSrc & IS_XA1_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF AS TX1 IRQ\n"));
-                        SK_PNMI_CNT_TX_INTR(pAC, 0);
-                        spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
-                        FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
-                        spin_unlock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
-                }
-                if (IntSrc & IS_XA2_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF AS TX2 IRQ\n"));
-                        SK_PNMI_CNT_TX_INTR(pAC, 1);
-                        spin_lock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
-                        FreeTxDescriptors(pAC, &pAC->TxPort[1][TX_PRIO_LOW]);
-                        spin_unlock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
-                }
-#if 0 /* only if sync. queues used */
-                if (IntSrc & IS_XS1_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF SY TX1 IRQ\n"));
-                        SK_PNMI_CNT_TX_INTR(pAC, 1);
-                        spin_lock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
-                        FreeTxDescriptors(pAC, 0, TX_PRIO_HIGH);
-                        spin_unlock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
-                        ClearTxIrq(pAC, 0, TX_PRIO_HIGH);
-                }
-                if (IntSrc & IS_XS2_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF SY TX2 IRQ\n"));
-                        SK_PNMI_CNT_TX_INTR(pAC, 1);
-                        spin_lock(&pAC->TxPort[1][TX_PRIO_HIGH].TxDesRingLock);
-                        FreeTxDescriptors(pAC, 1, TX_PRIO_HIGH);
-                        spin_unlock(&pAC->TxPort[1][TX_PRIO_HIGH].TxDesRingLock);
-                        ClearTxIrq(pAC, 1, TX_PRIO_HIGH);
-                }
-#endif
-#endif
-
-                /* do all IO at once */
-                if (IntSrc & IS_R1_F)
-                        ClearAndStartRx(pAC, 0);
-                if (IntSrc & IS_R2_F)
-                        ClearAndStartRx(pAC, 1);
-#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-                if (IntSrc & IS_XA1_F)
-                        ClearTxIrq(pAC, 0, TX_PRIO_LOW);
-                if (IntSrc & IS_XA2_F)
-                        ClearTxIrq(pAC, 1, TX_PRIO_LOW);
-#endif
-                SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
-        } /* while (IntSrc & IRQ_MASK != 0) */
-
-        IntSrc &= pAC->GIni.GIValIrqMask;
-        if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
-                        ("SPECIAL IRQ DP-Cards => %x\n", IntSrc));
-                pAC->CheckQueue = SK_FALSE;
-                spin_lock(&pAC->SlowPathLock);
-                if (IntSrc & SPECIAL_IRQS)
-                        SkGeSirqIsr(pAC, pAC->IoBase, IntSrc);
-
-                SkEventDispatcher(pAC, pAC->IoBase);
-                spin_unlock(&pAC->SlowPathLock);
-        }
-        /*
-         * do it all again is case we cleared an interrupt that
-         * came in after handling the ring (OUTs may be delayed
-         * in hardware buffers, but are through after IN)
-         *
-         * rroesler: has been commented out and shifted to
-         *           SkGeDrvEvent(), because it is timer
-         *           guarded now
-         *
-        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
-        ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
-         */
-
-        if (pAC->CheckQueue) {
-                pAC->CheckQueue = SK_FALSE;
-                spin_lock(&pAC->SlowPathLock);
-                SkEventDispatcher(pAC, pAC->IoBase);
-                spin_unlock(&pAC->SlowPathLock);
-        }
-
-        /* IRQ is processed - Enable IRQs again*/
-        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
-
-                return SkIsrRetHandled;
-} /* SkGeIsr */
-
-
-/****************************************************************************
- *
- *      SkGeIsrOnePort - handle adapter interrupts for single port adapter
- *
- * Description:
- *      The interrupt routine is called when the network adapter
- *      generates an interrupt. It may also be called if another device
- *      shares this interrupt vector with the driver.
- *      This is the same as above, but handles only one port.
- *
- * Returns: N/A
- *
- */
-static SkIsrRetVar SkGeIsrOnePort(int irq, void *dev_id)
-{
-struct SK_NET_DEVICE *dev = (struct SK_NET_DEVICE *)dev_id;
-DEV_NET         *pNet;
-SK_AC           *pAC;
-SK_U32          IntSrc;         /* interrupts source register contents */       
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-        
-        /*
-         * Check and process if its our interrupt
-         */
-        SK_IN32(pAC->IoBase, B0_SP_ISRC, &IntSrc);
-        if (IntSrc == 0) {
-                return SkIsrRetNone;
-        }
-        
-        while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
-#if 0 /* software irq currently not used */
-                if (IntSrc & IS_IRQ_SW) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("Software IRQ\n"));
-                }
-#endif
-                if (IntSrc & IS_R1_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF RX1 IRQ\n"));
-                        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
-                        SK_PNMI_CNT_RX_INTR(pAC, 0);
-                }
-#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-                if (IntSrc & IS_XA1_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF AS TX1 IRQ\n"));
-                        SK_PNMI_CNT_TX_INTR(pAC, 0);
-                        spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
-                        FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
-                        spin_unlock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
-                }
-#if 0 /* only if sync. queues used */
-                if (IntSrc & IS_XS1_F) {
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_INT_SRC,
-                                ("EOF SY TX1 IRQ\n"));
-                        SK_PNMI_CNT_TX_INTR(pAC, 0);
-                        spin_lock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
-                        FreeTxDescriptors(pAC, 0, TX_PRIO_HIGH);
-                        spin_unlock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
-                        ClearTxIrq(pAC, 0, TX_PRIO_HIGH);
-                }
-#endif
-#endif
-
-                /* do all IO at once */
-                if (IntSrc & IS_R1_F)
-                        ClearAndStartRx(pAC, 0);
-#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-                if (IntSrc & IS_XA1_F)
-                        ClearTxIrq(pAC, 0, TX_PRIO_LOW);
-#endif
-                SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
-        } /* while (IntSrc & IRQ_MASK != 0) */
-        
-        IntSrc &= pAC->GIni.GIValIrqMask;
-        if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
-                        ("SPECIAL IRQ SP-Cards => %x\n", IntSrc));
-                pAC->CheckQueue = SK_FALSE;
-                spin_lock(&pAC->SlowPathLock);
-                if (IntSrc & SPECIAL_IRQS)
-                        SkGeSirqIsr(pAC, pAC->IoBase, IntSrc);
-
-                SkEventDispatcher(pAC, pAC->IoBase);
-                spin_unlock(&pAC->SlowPathLock);
-        }
-        /*
-         * do it all again is case we cleared an interrupt that
-         * came in after handling the ring (OUTs may be delayed
-         * in hardware buffers, but are through after IN)
-         *
-         * rroesler: has been commented out and shifted to
-         *           SkGeDrvEvent(), because it is timer
-         *           guarded now
-         *
-        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
-         */
-
-        /* IRQ is processed - Enable IRQs again*/
-        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
-
-                return SkIsrRetHandled;
-} /* SkGeIsrOnePort */
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/****************************************************************************
- *
- *      SkGePollController - polling receive, for netconsole
- *
- * Description:
- *      Polling receive - used by netconsole and other diagnostic tools
- *      to allow network i/o with interrupts disabled.
- *
- * Returns: N/A
- */
-static void SkGePollController(struct net_device *dev)
-{
-        disable_irq(dev->irq);
-        SkGeIsr(dev->irq, dev);
-        enable_irq(dev->irq);
-}
-#endif
-
-/****************************************************************************
- *
- *      SkGeOpen - handle start of initialized adapter
- *
- * Description:
- *      This function starts the initialized adapter.
- *      The board level variable is set and the adapter is
- *      brought to full functionality.
- *      The device flags are set for operation.
- *      Do all necessary level 2 initialization, enable interrupts and
- *      give start command to RLMT.
- *
- * Returns:
- *      0 on success
- *      != 0 on error
- */
-static int SkGeOpen(
-struct SK_NET_DEVICE    *dev)
-{
-        DEV_NET                 *pNet;
-        SK_AC                   *pAC;
-        unsigned long   Flags;          /* for spin lock */
-        int                             i;
-        SK_EVPARA               EvPara;         /* an event parameter union */
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-        
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeOpen: pAC=0x%lX:\n", (unsigned long)pAC));
-
-#ifdef SK_DIAG_SUPPORT
-        if (pAC->DiagModeActive == DIAG_ACTIVE) {
-                if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
-                        return (-1);   /* still in use by diag; deny actions */
-                } 
-        }
-#endif
-
-        /* Set blink mode */
-        if ((pAC->PciDev->vendor == 0x1186) || (pAC->PciDev->vendor == 0x11ab ))
-                pAC->GIni.GILedBlinkCtrl = OEM_CONFIG_VALUE;
-
-        if (pAC->BoardLevel == SK_INIT_DATA) {
-                /* level 1 init common modules here */
-                if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
-                        printk("%s: HWInit (1) failed.\n", pAC->dev[pNet->PortNr]->name);
-                        return (-1);
-                }
-                SkI2cInit       (pAC, pAC->IoBase, SK_INIT_IO);
-                SkEventInit     (pAC, pAC->IoBase, SK_INIT_IO);
-                SkPnmiInit      (pAC, pAC->IoBase, SK_INIT_IO);
-                SkAddrInit      (pAC, pAC->IoBase, SK_INIT_IO);
-                SkRlmtInit      (pAC, pAC->IoBase, SK_INIT_IO);
-                SkTimerInit     (pAC, pAC->IoBase, SK_INIT_IO);
-                pAC->BoardLevel = SK_INIT_IO;
-        }
-
-        if (pAC->BoardLevel != SK_INIT_RUN) {
-                /* tschilling: Level 2 init modules here, check return value. */
-                if (SkGeInit(pAC, pAC->IoBase, SK_INIT_RUN) != 0) {
-                        printk("%s: HWInit (2) failed.\n", pAC->dev[pNet->PortNr]->name);
-                        return (-1);
-                }
-                SkI2cInit       (pAC, pAC->IoBase, SK_INIT_RUN);
-                SkEventInit     (pAC, pAC->IoBase, SK_INIT_RUN);
-                SkPnmiInit      (pAC, pAC->IoBase, SK_INIT_RUN);
-                SkAddrInit      (pAC, pAC->IoBase, SK_INIT_RUN);
-                SkRlmtInit      (pAC, pAC->IoBase, SK_INIT_RUN);
-                SkTimerInit     (pAC, pAC->IoBase, SK_INIT_RUN);
-                pAC->BoardLevel = SK_INIT_RUN;
-        }
-
-        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                /* Enable transmit descriptor polling. */
-                SkGePollTxD(pAC, pAC->IoBase, i, SK_TRUE);
-                FillRxRing(pAC, &pAC->RxPort[i]);
-        }
-        SkGeYellowLED(pAC, pAC->IoBase, 1);
-
-        StartDrvCleanupTimer(pAC);
-        SkDimEnableModerationIfNeeded(pAC);     
-        SkDimDisplayModerationSettings(pAC);
-
-        pAC->GIni.GIValIrqMask &= IRQ_MASK;
-
-        /* enable Interrupts */
-        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
-        SK_OUT32(pAC->IoBase, B0_HWE_IMSK, IRQ_HWE_MASK);
-
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-
-        if ((pAC->RlmtMode != 0) && (pAC->MaxPorts == 0)) {
-                EvPara.Para32[0] = pAC->RlmtNets;
-                EvPara.Para32[1] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_SET_NETS,
-                        EvPara);
-                EvPara.Para32[0] = pAC->RlmtMode;
-                EvPara.Para32[1] = 0;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_MODE_CHANGE,
-                        EvPara);
-        }
-
-        EvPara.Para32[0] = pNet->NetNr;
-        EvPara.Para32[1] = -1;
-        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
-        SkEventDispatcher(pAC, pAC->IoBase);
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-
-        pAC->MaxPorts++;
-
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeOpen suceeded\n"));
-
-        return (0);
-} /* SkGeOpen */
-
-
-/****************************************************************************
- *
- *      SkGeClose - Stop initialized adapter
- *
- * Description:
- *      Close initialized adapter.
- *
- * Returns:
- *      0 - on success
- *      error code - on error
- */
-static int SkGeClose(
-struct SK_NET_DEVICE    *dev)
-{
-        DEV_NET         *pNet;
-        DEV_NET         *newPtrNet;
-        SK_AC           *pAC;
-
-        unsigned long   Flags;          /* for spin lock */
-        int             i;
-        int             PortIdx;
-        SK_EVPARA       EvPara;
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeClose: pAC=0x%lX ", (unsigned long)pAC));
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-
-#ifdef SK_DIAG_SUPPORT
-        if (pAC->DiagModeActive == DIAG_ACTIVE) {
-                if (pAC->DiagFlowCtrl == SK_FALSE) {
-                        /* 
-                        ** notify that the interface which has been closed
-                        ** by operator interaction must not be started up 
-                        ** again when the DIAG has finished. 
-                        */
-                        newPtrNet = netdev_priv(pAC->dev[0]);
-                        if (newPtrNet == pNet) {
-                                pAC->WasIfUp[0] = SK_FALSE;
-                        } else {
-                                pAC->WasIfUp[1] = SK_FALSE;
-                        }
-                        return 0; /* return to system everything is fine... */
-                } else {
-                        pAC->DiagFlowCtrl = SK_FALSE;
-                }
-        }
-#endif
-
-        netif_stop_queue(dev);
-
-        if (pAC->RlmtNets == 1)
-                PortIdx = pAC->ActivePort;
-        else
-                PortIdx = pNet->NetNr;
-
-        StopDrvCleanupTimer(pAC);
-
-        /*
-         * Clear multicast table, promiscuous mode ....
-         */
-        SkAddrMcClear(pAC, pAC->IoBase, PortIdx, 0);
-        SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
-                SK_PROM_MODE_NONE);
-
-        if (pAC->MaxPorts == 1) {
-                spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-                /* disable interrupts */
-                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-                EvPara.Para32[0] = pNet->NetNr;
-                EvPara.Para32[1] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-                SkEventDispatcher(pAC, pAC->IoBase);
-                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-                /* stop the hardware */
-                SkGeDeInit(pAC, pAC->IoBase);
-                pAC->BoardLevel = SK_INIT_DATA;
-                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-        } else {
-
-                spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-                EvPara.Para32[0] = pNet->NetNr;
-                EvPara.Para32[1] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-                SkPnmiEvent(pAC, pAC->IoBase, SK_PNMI_EVT_XMAC_RESET, EvPara);
-                SkEventDispatcher(pAC, pAC->IoBase);
-                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-                
-                /* Stop port */
-                spin_lock_irqsave(&pAC->TxPort[pNet->PortNr]
-                        [TX_PRIO_LOW].TxDesRingLock, Flags);
-                SkGeStopPort(pAC, pAC->IoBase, pNet->PortNr,
-                        SK_STOP_ALL, SK_HARD_RST);
-                spin_unlock_irqrestore(&pAC->TxPort[pNet->PortNr]
-                        [TX_PRIO_LOW].TxDesRingLock, Flags);
-        }
-
-        if (pAC->RlmtNets == 1) {
-                /* clear all descriptor rings */
-                for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                        ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
-                        ClearRxRing(pAC, &pAC->RxPort[i]);
-                        ClearTxRing(pAC, &pAC->TxPort[i][TX_PRIO_LOW]);
-                }
-        } else {
-                /* clear port descriptor rings */
-                ReceiveIrq(pAC, &pAC->RxPort[pNet->PortNr], SK_TRUE);
-                ClearRxRing(pAC, &pAC->RxPort[pNet->PortNr]);
-                ClearTxRing(pAC, &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW]);
-        }
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeClose: done "));
-
-        SK_MEMSET(&(pAC->PnmiBackup), 0, sizeof(SK_PNMI_STRUCT_DATA));
-        SK_MEMCPY(&(pAC->PnmiBackup), &(pAC->PnmiStruct), 
-                        sizeof(SK_PNMI_STRUCT_DATA));
-
-        pAC->MaxPorts--;
-
-        return (0);
-} /* SkGeClose */
-
-
-/*****************************************************************************
- *
- *      SkGeXmit - Linux frame transmit function
- *
- * Description:
- *      The system calls this function to send frames onto the wire.
- *      It puts the frame in the tx descriptor ring. If the ring is
- *      full then, the 'tbusy' flag is set.
- *
- * Returns:
- *      0, if everything is ok
- *      !=0, on error
- * WARNING: returning 1 in 'tbusy' case caused system crashes (double
- *      allocated skb's) !!!
- */
-static int SkGeXmit(struct sk_buff *skb, struct SK_NET_DEVICE *dev)
-{
-DEV_NET         *pNet;
-SK_AC           *pAC;
-int                     Rc;     /* return code of XmitFrame */
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-
-        if ((!skb_shinfo(skb)->nr_frags) ||
-                (pAC->GIni.GIChipId == CHIP_ID_GENESIS)) {
-                /* Don't activate scatter-gather and hardware checksum */
-
-                if (pAC->RlmtNets == 2)
-                        Rc = XmitFrame(
-                                pAC,
-                                &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW],
-                                skb);
-                else
-                        Rc = XmitFrame(
-                                pAC,
-                                &pAC->TxPort[pAC->ActivePort][TX_PRIO_LOW],
-                                skb);
-        } else {
-                /* scatter-gather and hardware TCP checksumming anabled*/
-                if (pAC->RlmtNets == 2)
-                        Rc = XmitFrameSG(
-                                pAC,
-                                &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW],
-                                skb);
-                else
-                        Rc = XmitFrameSG(
-                                pAC,
-                                &pAC->TxPort[pAC->ActivePort][TX_PRIO_LOW],
-                                skb);
-        }
-
-        /* Transmitter out of resources? */
-        if (Rc <= 0) {
-                netif_stop_queue(dev);
-        }
-
-        /* If not taken, give buffer ownership back to the
-         * queueing layer.
-         */
-        if (Rc < 0)
-                return (1);
-
-        dev->trans_start = jiffies;
-        return (0);
-} /* SkGeXmit */
-
-
-/*****************************************************************************
- *
- *      XmitFrame - fill one socket buffer into the transmit ring
- *
- * Description:
- *      This function puts a message into the transmit descriptor ring
- *      if there is a descriptors left.
- *      Linux skb's consist of only one continuous buffer.
- *      The first step locks the ring. It is held locked
- *      all time to avoid problems with SWITCH_../PORT_RESET.
- *      Then the descriptoris allocated.
- *      The second part is linking the buffer to the descriptor.
- *      At the very last, the Control field of the descriptor
- *      is made valid for the BMU and a start TX command is given
- *      if necessary.
- *
- * Returns:
- *      > 0 - on succes: the number of bytes in the message
- *      = 0 - on resource shortage: this frame sent or dropped, now
- *              the ring is full ( -> set tbusy)
- *      < 0 - on failure: other problems ( -> return failure to upper layers)
- */
-static int XmitFrame(
-SK_AC           *pAC,           /* pointer to adapter context           */
-TX_PORT         *pTxPort,       /* pointer to struct of port to send to */
-struct sk_buff  *pMessage)      /* pointer to send-message              */
-{
-        TXD             *pTxd;          /* the rxd to fill */
-        TXD             *pOldTxd;
-        unsigned long    Flags;
-        SK_U64           PhysAddr;
-        int              BytesSend = pMessage->len;
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS, ("X"));
-
-        spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
-#ifndef USE_TX_COMPLETE
-        FreeTxDescriptors(pAC, pTxPort);
-#endif
-        if (pTxPort->TxdRingFree == 0) {
-                /* 
-                ** no enough free descriptors in ring at the moment.
-                ** Maybe free'ing some old one help?
-                */
-                FreeTxDescriptors(pAC, pTxPort);
-                if (pTxPort->TxdRingFree == 0) {
-                        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
-                        SK_PNMI_CNT_NO_TX_BUF(pAC, pTxPort->PortIndex);
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_TX_PROGRESS,
-                                ("XmitFrame failed\n"));
-                        /* 
-                        ** the desired message can not be sent
-                        ** Because tbusy seems to be set, the message 
-                        ** should not be freed here. It will be used 
-                        ** by the scheduler of the ethernet handler 
-                        */
-                        return (-1);
-                }
-        }
-
-        /*
-        ** If the passed socket buffer is of smaller MTU-size than 60,
-        ** copy everything into new buffer and fill all bytes between
-        ** the original packet end and the new packet end of 60 with 0x00.
-        ** This is to resolve faulty padding by the HW with 0xaa bytes.
-        */
-        if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
-                if (skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) {
-                        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
-                        return 0;
-                }
-                pMessage->len = C_LEN_ETHERNET_MINSIZE;
-        }
-
-        /* 
-        ** advance head counter behind descriptor needed for this frame, 
-        ** so that needed descriptor is reserved from that on. The next
-        ** action will be to add the passed buffer to the TX-descriptor
-        */
-        pTxd = pTxPort->pTxdRingHead;
-        pTxPort->pTxdRingHead = pTxd->pNextTxd;
-        pTxPort->TxdRingFree--;
-
-#ifdef SK_DUMP_TX
-        DumpMsg(pMessage, "XmitFrame");
-#endif
-
-        /* 
-        ** First step is to map the data to be sent via the adapter onto
-        ** the DMA memory. Kernel 2.2 uses virt_to_bus(), but kernels 2.4
-        ** and 2.6 need to use pci_map_page() for that mapping.
-        */
-        PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
-                                        virt_to_page(pMessage->data),
-                                        ((unsigned long) pMessage->data & ~PAGE_MASK),
-                                        pMessage->len,
-                                        PCI_DMA_TODEVICE);
-        pTxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
-        pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
-        pTxd->pMBuf     = pMessage;
-
-        if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
-                u16 hdrlen = skb_transport_offset(pMessage);
-                u16 offset = hdrlen + pMessage->csum_offset;
-
-                if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&
-                        (pAC->GIni.GIChipRev == 0) &&
-                        (pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
-                        pTxd->TBControl = BMU_TCP_CHECK;
-                } else {
-                        pTxd->TBControl = BMU_UDP_CHECK;
-                }
-
-                pTxd->TcpSumOfs = 0;
-                pTxd->TcpSumSt  = hdrlen;
-                pTxd->TcpSumWr  = offset;
-
-                pTxd->TBControl |= BMU_OWN | BMU_STF | 
-                                   BMU_SW  | BMU_EOF |
-#ifdef USE_TX_COMPLETE
-                                   BMU_IRQ_EOF |
-#endif
-                                   pMessage->len;
-        } else {
-                pTxd->TBControl = BMU_OWN | BMU_STF | BMU_CHECK | 
-                                  BMU_SW  | BMU_EOF |
-#ifdef USE_TX_COMPLETE
-                                   BMU_IRQ_EOF |
-#endif
-                        pMessage->len;
-        }
-
-        /* 
-        ** If previous descriptor already done, give TX start cmd 
-        */
-        pOldTxd = xchg(&pTxPort->pTxdRingPrev, pTxd);
-        if ((pOldTxd->TBControl & BMU_OWN) == 0) {
-                SK_OUT8(pTxPort->HwAddr, Q_CSR, CSR_START);
-        }       
-
-        /* 
-        ** after releasing the lock, the skb may immediately be free'd 
-        */
-        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
-        if (pTxPort->TxdRingFree != 0) {
-                return (BytesSend);
-        } else {
-                return (0);
-        }
-
-} /* XmitFrame */
-
-/*****************************************************************************
- *
- *      XmitFrameSG - fill one socket buffer into the transmit ring
- *                (use SG and TCP/UDP hardware checksumming)
- *
- * Description:
- *      This function puts a message into the transmit descriptor ring
- *      if there is a descriptors left.
- *
- * Returns:
- *      > 0 - on succes: the number of bytes in the message
- *      = 0 - on resource shortage: this frame sent or dropped, now
- *              the ring is full ( -> set tbusy)
- *      < 0 - on failure: other problems ( -> return failure to upper layers)
- */
-static int XmitFrameSG(
-SK_AC           *pAC,           /* pointer to adapter context           */
-TX_PORT         *pTxPort,       /* pointer to struct of port to send to */
-struct sk_buff  *pMessage)      /* pointer to send-message              */
-{
-
-        TXD             *pTxd;
-        TXD             *pTxdFst;
-        TXD             *pTxdLst;
-        int              CurrFrag;
-        int              BytesSend;
-        skb_frag_t      *sk_frag;
-        SK_U64           PhysAddr;
-        unsigned long    Flags;
-        SK_U32           Control;
-
-        spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
-#ifndef USE_TX_COMPLETE
-        FreeTxDescriptors(pAC, pTxPort);
-#endif
-        if ((skb_shinfo(pMessage)->nr_frags +1) > pTxPort->TxdRingFree) {
-                FreeTxDescriptors(pAC, pTxPort);
-                if ((skb_shinfo(pMessage)->nr_frags + 1) > pTxPort->TxdRingFree) {
-                        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
-                        SK_PNMI_CNT_NO_TX_BUF(pAC, pTxPort->PortIndex);
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_TX_PROGRESS,
-                                ("XmitFrameSG failed - Ring full\n"));
-                                /* this message can not be sent now */
-                        return(-1);
-                }
-        }
-
-        pTxd      = pTxPort->pTxdRingHead;
-        pTxdFst   = pTxd;
-        pTxdLst   = pTxd;
-        BytesSend = 0;
-
-        /* 
-        ** Map the first fragment (header) into the DMA-space
-        */
-        PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
-                        virt_to_page(pMessage->data),
-                        ((unsigned long) pMessage->data & ~PAGE_MASK),
-                        skb_headlen(pMessage),
-                        PCI_DMA_TODEVICE);
-
-        pTxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
-        pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
-
-        /* 
-        ** Does the HW need to evaluate checksum for TCP or UDP packets? 
-        */
-        if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
-                u16 hdrlen = skb_transport_offset(pMessage);
-                u16 offset = hdrlen + pMessage->csum_offset;
-
-                Control = BMU_STFWD;
-
-                /* 
-                ** We have to use the opcode for tcp here,  because the
-                ** opcode for udp is not working in the hardware yet 
-                ** (Revision 2.0)
-                */
-                if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&
-                        (pAC->GIni.GIChipRev == 0) &&
-                        (pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
-                        Control |= BMU_TCP_CHECK;
-                } else {
-                        Control |= BMU_UDP_CHECK;
-                }
-
-                pTxd->TcpSumOfs = 0;
-                pTxd->TcpSumSt  = hdrlen;
-                pTxd->TcpSumWr  = offset;
-        } else
-                Control = BMU_CHECK | BMU_SW;
-
-        pTxd->TBControl = BMU_STF | Control | skb_headlen(pMessage);
-
-        pTxd = pTxd->pNextTxd;
-        pTxPort->TxdRingFree--;
-        BytesSend += skb_headlen(pMessage);
-
-        /* 
-        ** Browse over all SG fragments and map each of them into the DMA space
-        */
-        for (CurrFrag = 0; CurrFrag < skb_shinfo(pMessage)->nr_frags; CurrFrag++) {
-                sk_frag = &skb_shinfo(pMessage)->frags[CurrFrag];
-                /* 
-                ** we already have the proper value in entry
-                */
-                PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
-                                                 sk_frag->page,
-                                                 sk_frag->page_offset,
-                                                 sk_frag->size,
-                                                 PCI_DMA_TODEVICE);
-
-                pTxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
-                pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
-                pTxd->pMBuf     = pMessage;
-                
-                pTxd->TBControl = Control | BMU_OWN | sk_frag->size;
-
-                /* 
-                ** Do we have the last fragment? 
-                */
-                if( (CurrFrag+1) == skb_shinfo(pMessage)->nr_frags )  {
-#ifdef USE_TX_COMPLETE
-                        pTxd->TBControl |= BMU_EOF | BMU_IRQ_EOF;
-#else
-                        pTxd->TBControl |= BMU_EOF;
-#endif
-                        pTxdFst->TBControl |= BMU_OWN | BMU_SW;
-                }
-                pTxdLst = pTxd;
-                pTxd    = pTxd->pNextTxd;
-                pTxPort->TxdRingFree--;
-                BytesSend += sk_frag->size;
-        }
-
-        /* 
-        ** If previous descriptor already done, give TX start cmd 
-        */
-        if ((pTxPort->pTxdRingPrev->TBControl & BMU_OWN) == 0) {
-                SK_OUT8(pTxPort->HwAddr, Q_CSR, CSR_START);
-        }
-
-        pTxPort->pTxdRingPrev = pTxdLst;
-        pTxPort->pTxdRingHead = pTxd;
-
-        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
-
-        if (pTxPort->TxdRingFree > 0) {
-                return (BytesSend);
-        } else {
-                return (0);
-        }
-}
-
-/*****************************************************************************
- *
- *      FreeTxDescriptors - release descriptors from the descriptor ring
- *
- * Description:
- *      This function releases descriptors from a transmit ring if they
- *      have been sent by the BMU.
- *      If a descriptors is sent, it can be freed and the message can
- *      be freed, too.
- *      The SOFTWARE controllable bit is used to prevent running around a
- *      completely free ring for ever. If this bit is no set in the
- *      frame (by XmitFrame), this frame has never been sent or is
- *      already freed.
- *      The Tx descriptor ring lock must be held while calling this function !!!
- *
- * Returns:
- *      none
- */
-static void FreeTxDescriptors(
-SK_AC   *pAC,           /* pointer to the adapter context */
-TX_PORT *pTxPort)       /* pointer to destination port structure */
-{
-TXD     *pTxd;          /* pointer to the checked descriptor */
-TXD     *pNewTail;      /* pointer to 'end' of the ring */
-SK_U32  Control;        /* TBControl field of descriptor */
-SK_U64  PhysAddr;       /* address of DMA mapping */
-
-        pNewTail = pTxPort->pTxdRingTail;
-        pTxd     = pNewTail;
-        /*
-        ** loop forever; exits if BMU_SW bit not set in start frame
-        ** or BMU_OWN bit set in any frame
-        */
-        while (1) {
-                Control = pTxd->TBControl;
-                if ((Control & BMU_SW) == 0) {
-                        /*
-                        ** software controllable bit is set in first
-                        ** fragment when given to BMU. Not set means that
-                        ** this fragment was never sent or is already
-                        ** freed ( -> ring completely free now).
-                        */
-                        pTxPort->pTxdRingTail = pTxd;
-                        netif_wake_queue(pAC->dev[pTxPort->PortIndex]);
-                        return;
-                }
-                if (Control & BMU_OWN) {
-                        pTxPort->pTxdRingTail = pTxd;
-                        if (pTxPort->TxdRingFree > 0) {
-                                netif_wake_queue(pAC->dev[pTxPort->PortIndex]);
-                        }
-                        return;
-                }
-                
-                /* 
-                ** release the DMA mapping, because until not unmapped
-                ** this buffer is considered being under control of the
-                ** adapter card!
-                */
-                PhysAddr = ((SK_U64) pTxd->VDataHigh) << (SK_U64) 32;
-                PhysAddr |= (SK_U64) pTxd->VDataLow;
-                pci_unmap_page(pAC->PciDev, PhysAddr,
-                                 pTxd->pMBuf->len,
-                                 PCI_DMA_TODEVICE);
-
-                if (Control & BMU_EOF)
-                        DEV_KFREE_SKB_ANY(pTxd->pMBuf); /* free message */
-
-                pTxPort->TxdRingFree++;
-                pTxd->TBControl &= ~BMU_SW;
-                pTxd = pTxd->pNextTxd; /* point behind fragment with EOF */
-        } /* while(forever) */
-} /* FreeTxDescriptors */
-
-/*****************************************************************************
- *
- *      FillRxRing - fill the receive ring with valid descriptors
- *
- * Description:
- *      This function fills the receive ring descriptors with data
- *      segments and makes them valid for the BMU.
- *      The active ring is filled completely, if possible.
- *      The non-active ring is filled only partial to save memory.
- *
- * Description of rx ring structure:
- *      head - points to the descriptor which will be used next by the BMU
- *      tail - points to the next descriptor to give to the BMU
- *      
- * Returns:     N/A
- */
-static void FillRxRing(
-SK_AC           *pAC,           /* pointer to the adapter context */
-RX_PORT         *pRxPort)       /* ptr to port struct for which the ring
-                                   should be filled */
-{
-unsigned long   Flags;
-
-        spin_lock_irqsave(&pRxPort->RxDesRingLock, Flags);
-        while (pRxPort->RxdRingFree > pRxPort->RxFillLimit) {
-                if(!FillRxDescriptor(pAC, pRxPort))
-                        break;
-        }
-        spin_unlock_irqrestore(&pRxPort->RxDesRingLock, Flags);
-} /* FillRxRing */
-
-
-/*****************************************************************************
- *
- *      FillRxDescriptor - fill one buffer into the receive ring
- *
- * Description:
- *      The function allocates a new receive buffer and
- *      puts it into the next descriptor.
- *
- * Returns:
- *      SK_TRUE - a buffer was added to the ring
- *      SK_FALSE - a buffer could not be added
- */
-static SK_BOOL FillRxDescriptor(
-SK_AC           *pAC,           /* pointer to the adapter context struct */
-RX_PORT         *pRxPort)       /* ptr to port struct of ring to fill */
-{
-struct sk_buff  *pMsgBlock;     /* pointer to a new message block */
-RXD             *pRxd;          /* the rxd to fill */
-SK_U16          Length;         /* data fragment length */
-SK_U64          PhysAddr;       /* physical address of a rx buffer */
-
-        pMsgBlock = alloc_skb(pAC->RxBufSize, GFP_ATOMIC);
-        if (pMsgBlock == NULL) {
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                        SK_DBGCAT_DRV_ENTRY,
-                        ("%s: Allocation of rx buffer failed !\n",
-                        pAC->dev[pRxPort->PortIndex]->name));
-                SK_PNMI_CNT_NO_RX_BUF(pAC, pRxPort->PortIndex);
-                return(SK_FALSE);
-        }
-        skb_reserve(pMsgBlock, 2); /* to align IP frames */
-        /* skb allocated ok, so add buffer */
-        pRxd = pRxPort->pRxdRingTail;
-        pRxPort->pRxdRingTail = pRxd->pNextRxd;
-        pRxPort->RxdRingFree--;
-        Length = pAC->RxBufSize;
-        PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
-                virt_to_page(pMsgBlock->data),
-                ((unsigned long) pMsgBlock->data &
-                ~PAGE_MASK),
-                pAC->RxBufSize - 2,
-                PCI_DMA_FROMDEVICE);
-
-        pRxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
-        pRxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
-        pRxd->pMBuf     = pMsgBlock;
-        pRxd->RBControl = BMU_OWN       | 
-                          BMU_STF       | 
-                          BMU_IRQ_EOF   | 
-                          BMU_TCP_CHECK | 
-                          Length;
-        return (SK_TRUE);
-
-} /* FillRxDescriptor */
-
-
-/*****************************************************************************
- *
- *      ReQueueRxBuffer - fill one buffer back into the receive ring
- *
- * Description:
- *      Fill a given buffer back into the rx ring. The buffer
- *      has been previously allocated and aligned, and its phys.
- *      address calculated, so this is no more necessary.
- *
- * Returns: N/A
- */
-static void ReQueueRxBuffer(
-SK_AC           *pAC,           /* pointer to the adapter context struct */
-RX_PORT         *pRxPort,       /* ptr to port struct of ring to fill */
-struct sk_buff  *pMsg,          /* pointer to the buffer */
-SK_U32          PhysHigh,       /* phys address high dword */
-SK_U32          PhysLow)        /* phys address low dword */
-{
-RXD             *pRxd;          /* the rxd to fill */
-SK_U16          Length;         /* data fragment length */
-
-        pRxd = pRxPort->pRxdRingTail;
-        pRxPort->pRxdRingTail = pRxd->pNextRxd;
-        pRxPort->RxdRingFree--;
-        Length = pAC->RxBufSize;
-
-        pRxd->VDataLow  = PhysLow;
-        pRxd->VDataHigh = PhysHigh;
-        pRxd->pMBuf     = pMsg;
-        pRxd->RBControl = BMU_OWN       | 
-                          BMU_STF       |
-                          BMU_IRQ_EOF   | 
-                          BMU_TCP_CHECK | 
-                          Length;
-        return;
-} /* ReQueueRxBuffer */
-
-/*****************************************************************************
- *
- *      ReceiveIrq - handle a receive IRQ
- *
- * Description:
- *      This function is called when a receive IRQ is set.
- *      It walks the receive descriptor ring and sends up all
- *      frames that are complete.
- *
- * Returns:     N/A
- */
-static void ReceiveIrq(
-        SK_AC           *pAC,                   /* pointer to adapter context */
-        RX_PORT         *pRxPort,               /* pointer to receive port struct */
-        SK_BOOL         SlowPathLock)   /* indicates if SlowPathLock is needed */
-{
-RXD                             *pRxd;                  /* pointer to receive descriptors */
-SK_U32                  Control;                /* control field of descriptor */
-struct sk_buff  *pMsg;                  /* pointer to message holding frame */
-struct sk_buff  *pNewMsg;               /* pointer to a new message for copying frame */
-int                             FrameLength;    /* total length of received frame */
-SK_MBUF                 *pRlmtMbuf;             /* ptr to a buffer for giving a frame to rlmt */
-SK_EVPARA               EvPara;                 /* an event parameter union */  
-unsigned long   Flags;                  /* for spin lock */
-int                             PortIndex = pRxPort->PortIndex;
-unsigned int    Offset;
-unsigned int    NumBytes;
-unsigned int    ForRlmt;
-SK_BOOL                 IsBc;
-SK_BOOL                 IsMc;
-SK_BOOL  IsBadFrame;                    /* Bad frame */
-
-SK_U32                  FrameStat;
-SK_U64                  PhysAddr;
-
-rx_start:       
-        /* do forever; exit if BMU_OWN found */
-        for ( pRxd = pRxPort->pRxdRingHead ;
-                  pRxPort->RxdRingFree < pAC->RxDescrPerRing ;
-                  pRxd = pRxd->pNextRxd,
-                  pRxPort->pRxdRingHead = pRxd,
-                  pRxPort->RxdRingFree ++) {
-
-                /*
-                 * For a better understanding of this loop
-                 * Go through every descriptor beginning at the head
-                 * Please note: the ring might be completely received so the OWN bit
-                 * set is not a good crirteria to leave that loop.
-                 * Therefore the RingFree counter is used.
-                 * On entry of this loop pRxd is a pointer to the Rxd that needs
-                 * to be checked next.
-                 */
-
-                Control = pRxd->RBControl;
-        
-                /* check if this descriptor is ready */
-                if ((Control & BMU_OWN) != 0) {
-                        /* this descriptor is not yet ready */
-                        /* This is the usual end of the loop */
-                        /* We don't need to start the ring again */
-                        FillRxRing(pAC, pRxPort);
-                        return;
-                }
-                pAC->DynIrqModInfo.NbrProcessedDescr++;
-
-                /* get length of frame and check it */
-                FrameLength = Control & BMU_BBC;
-                if (FrameLength > pAC->RxBufSize) {
-                        goto rx_failed;
-                }
-
-                /* check for STF and EOF */
-                if ((Control & (BMU_STF | BMU_EOF)) != (BMU_STF | BMU_EOF)) {
-                        goto rx_failed;
-                }
-
-                /* here we have a complete frame in the ring */
-                pMsg = pRxd->pMBuf;
-
-                FrameStat = pRxd->FrameStat;
-
-                /* check for frame length mismatch */
-#define XMR_FS_LEN_SHIFT        18
-#define GMR_FS_LEN_SHIFT        16
-                if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
-                        if (FrameLength != (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)) {
-                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                        SK_DBGCAT_DRV_RX_PROGRESS,
-                                        ("skge: Frame length mismatch (%u/%u).\n",
-                                        FrameLength,
-                                        (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)));
-                                goto rx_failed;
-                        }
-                }
-                else {
-                        if (FrameLength != (SK_U32) (FrameStat >> GMR_FS_LEN_SHIFT)) {
-                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                        SK_DBGCAT_DRV_RX_PROGRESS,
-                                        ("skge: Frame length mismatch (%u/%u).\n",
-                                        FrameLength,
-                                        (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)));
-                                goto rx_failed;
-                        }
-                }
-
-                /* Set Rx Status */
-                if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
-                        IsBc = (FrameStat & XMR_FS_BC) != 0;
-                        IsMc = (FrameStat & XMR_FS_MC) != 0;
-                        IsBadFrame = (FrameStat &
-                                (XMR_FS_ANY_ERR | XMR_FS_2L_VLAN)) != 0;
-                } else {
-                        IsBc = (FrameStat & GMR_FS_BC) != 0;
-                        IsMc = (FrameStat & GMR_FS_MC) != 0;
-                        IsBadFrame = (((FrameStat & GMR_FS_ANY_ERR) != 0) ||
-                                                        ((FrameStat & GMR_FS_RX_OK) == 0));
-                }
-
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 0,
-                        ("Received frame of length %d on port %d\n",
-                        FrameLength, PortIndex));
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 0,
-                        ("Number of free rx descriptors: %d\n",
-                        pRxPort->RxdRingFree));
-/* DumpMsg(pMsg, "Rx"); */
-
-                if ((Control & BMU_STAT_VAL) != BMU_STAT_VAL || (IsBadFrame)) {
-#if 0
-                        (FrameStat & (XMR_FS_ANY_ERR | XMR_FS_2L_VLAN)) != 0) {
-#endif
-                        /* there is a receive error in this frame */
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_RX_PROGRESS,
-                                ("skge: Error in received frame, dropped!\n"
-                                "Control: %x\nRxStat: %x\n",
-                                Control, FrameStat));
-
-                        ReQueueRxBuffer(pAC, pRxPort, pMsg,
-                                pRxd->VDataHigh, pRxd->VDataLow);
-
-                        continue;
-                }
-
-                /*
-                 * if short frame then copy data to reduce memory waste
-                 */
-                if ((FrameLength < SK_COPY_THRESHOLD) &&
-                        ((pNewMsg = alloc_skb(FrameLength+2, GFP_ATOMIC)) != NULL)) {
-                        /*
-                         * Short frame detected and allocation successfull
-                         */
-                        /* use new skb and copy data */
-                        skb_reserve(pNewMsg, 2);
-                        skb_put(pNewMsg, FrameLength);
-                        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
-                        PhysAddr |= (SK_U64) pRxd->VDataLow;
-
-                        pci_dma_sync_single_for_cpu(pAC->PciDev,
-                                                    (dma_addr_t) PhysAddr,
-                                                    FrameLength,
-                                                    PCI_DMA_FROMDEVICE);
-                        skb_copy_to_linear_data(pNewMsg, pMsg, FrameLength);
-
-                        pci_dma_sync_single_for_device(pAC->PciDev,
-                                                       (dma_addr_t) PhysAddr,
-                                                       FrameLength,
-                                                       PCI_DMA_FROMDEVICE);
-                        ReQueueRxBuffer(pAC, pRxPort, pMsg,
-                                pRxd->VDataHigh, pRxd->VDataLow);
-
-                        pMsg = pNewMsg;
-
-                }
-                else {
-                        /*
-                         * if large frame, or SKB allocation failed, pass
-                         * the SKB directly to the networking
-                         */
-
-                        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
-                        PhysAddr |= (SK_U64) pRxd->VDataLow;
-
-                        /* release the DMA mapping */
-                        pci_unmap_single(pAC->PciDev,
-                                         PhysAddr,
-                                         pAC->RxBufSize - 2,
-                                         PCI_DMA_FROMDEVICE);
-
-                        /* set length in message */
-                        skb_put(pMsg, FrameLength);
-                } /* frame > SK_COPY_TRESHOLD */
-
-#ifdef USE_SK_RX_CHECKSUM
-                pMsg->csum = pRxd->TcpSums & 0xffff;
-                pMsg->ip_summed = CHECKSUM_COMPLETE;
-#else
-                pMsg->ip_summed = CHECKSUM_NONE;
-#endif
-
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("V"));
-                ForRlmt = SK_RLMT_RX_PROTOCOL;
-#if 0
-                IsBc = (FrameStat & XMR_FS_BC)==XMR_FS_BC;
-#endif
-                SK_RLMT_PRE_LOOKAHEAD(pAC, PortIndex, FrameLength,
-                        IsBc, &Offset, &NumBytes);
-                if (NumBytes != 0) {
-#if 0
-                        IsMc = (FrameStat & XMR_FS_MC)==XMR_FS_MC;
-#endif
-                        SK_RLMT_LOOKAHEAD(pAC, PortIndex,
-                                &pMsg->data[Offset],
-                                IsBc, IsMc, &ForRlmt);
-                }
-                if (ForRlmt == SK_RLMT_RX_PROTOCOL) {
-                                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("W"));
-                        /* send up only frames from active port */
-                        if ((PortIndex == pAC->ActivePort) ||
-                                (pAC->RlmtNets == 2)) {
-                                /* frame for upper layer */
-                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("U"));
-#ifdef xDEBUG
-                                DumpMsg(pMsg, "Rx");
-#endif
-                                SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,
-                                        FrameLength, pRxPort->PortIndex);
-
-                                pMsg->protocol = eth_type_trans(pMsg,
-                                        pAC->dev[pRxPort->PortIndex]);
-                                netif_rx(pMsg);
-                                pAC->dev[pRxPort->PortIndex]->last_rx = jiffies;
-                        }
-                        else {
-                                /* drop frame */
-                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                        SK_DBGCAT_DRV_RX_PROGRESS,
-                                        ("D"));
-                                DEV_KFREE_SKB(pMsg);
-                        }
-                        
-                } /* if not for rlmt */
-                else {
-                        /* packet for rlmt */
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                SK_DBGCAT_DRV_RX_PROGRESS, ("R"));
-                        pRlmtMbuf = SkDrvAllocRlmtMbuf(pAC,
-                                pAC->IoBase, FrameLength);
-                        if (pRlmtMbuf != NULL) {
-                                pRlmtMbuf->pNext = NULL;
-                                pRlmtMbuf->Length = FrameLength;
-                                pRlmtMbuf->PortIdx = PortIndex;
-                                EvPara.pParaPtr = pRlmtMbuf;
-                                memcpy((char*)(pRlmtMbuf->pData),
-                                           (char*)(pMsg->data),
-                                           FrameLength);
-
-                                /* SlowPathLock needed? */
-                                if (SlowPathLock == SK_TRUE) {
-                                        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-                                        SkEventQueue(pAC, SKGE_RLMT,
-                                                SK_RLMT_PACKET_RECEIVED,
-                                                EvPara);
-                                        pAC->CheckQueue = SK_TRUE;
-                                        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-                                } else {
-                                        SkEventQueue(pAC, SKGE_RLMT,
-                                                SK_RLMT_PACKET_RECEIVED,
-                                                EvPara);
-                                        pAC->CheckQueue = SK_TRUE;
-                                }
-
-                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-                                        SK_DBGCAT_DRV_RX_PROGRESS,
-                                        ("Q"));
-                        }
-                        if ((pAC->dev[pRxPort->PortIndex]->flags &
-                                (IFF_PROMISC | IFF_ALLMULTI)) != 0 ||
-                                (ForRlmt & SK_RLMT_RX_PROTOCOL) ==
-                                SK_RLMT_RX_PROTOCOL) {
-                                pMsg->protocol = eth_type_trans(pMsg,
-                                        pAC->dev[pRxPort->PortIndex]);
-                                netif_rx(pMsg);
-                                pAC->dev[pRxPort->PortIndex]->last_rx = jiffies;
-                        }
-                        else {
-                                DEV_KFREE_SKB(pMsg);
-                        }
-
-                } /* if packet for rlmt */
-        } /* for ... scanning the RXD ring */
-
-        /* RXD ring is empty -> fill and restart */
-        FillRxRing(pAC, pRxPort);
-        /* do not start if called from Close */
-        if (pAC->BoardLevel > SK_INIT_DATA) {
-                ClearAndStartRx(pAC, PortIndex);
-        }
-        return;
-
-rx_failed:
-        /* remove error frame */
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ERROR,
-                ("Schrottdescriptor, length: 0x%x\n", FrameLength));
-
-        /* release the DMA mapping */
-
-        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
-        PhysAddr |= (SK_U64) pRxd->VDataLow;
-        pci_unmap_page(pAC->PciDev,
-                         PhysAddr,
-                         pAC->RxBufSize - 2,
-                         PCI_DMA_FROMDEVICE);
-        DEV_KFREE_SKB_IRQ(pRxd->pMBuf);
-        pRxd->pMBuf = NULL;
-        pRxPort->RxdRingFree++;
-        pRxPort->pRxdRingHead = pRxd->pNextRxd;
-        goto rx_start;
-
-} /* ReceiveIrq */
-
-
-/*****************************************************************************
- *
- *      ClearAndStartRx - give a start receive command to BMU, clear IRQ
- *
- * Description:
- *      This function sends a start command and a clear interrupt
- *      command for one receive queue to the BMU.
- *
- * Returns: N/A
- *      none
- */
-static void ClearAndStartRx(
-SK_AC   *pAC,           /* pointer to the adapter context */
-int     PortIndex)      /* index of the receive port (XMAC) */
-{
-        SK_OUT8(pAC->IoBase,
-                RxQueueAddr[PortIndex]+Q_CSR,
-                CSR_START | CSR_IRQ_CL_F);
-} /* ClearAndStartRx */
-
-
-/*****************************************************************************
- *
- *      ClearTxIrq - give a clear transmit IRQ command to BMU
- *
- * Description:
- *      This function sends a clear tx IRQ command for one
- *      transmit queue to the BMU.
- *
- * Returns: N/A
- */
-static void ClearTxIrq(
-SK_AC   *pAC,           /* pointer to the adapter context */
-int     PortIndex,      /* index of the transmit port (XMAC) */
-int     Prio)           /* priority or normal queue */
-{
-        SK_OUT8(pAC->IoBase, 
-                TxQueueAddr[PortIndex][Prio]+Q_CSR,
-                CSR_IRQ_CL_F);
-} /* ClearTxIrq */
-
-
-/*****************************************************************************
- *
- *      ClearRxRing - remove all buffers from the receive ring
- *
- * Description:
- *      This function removes all receive buffers from the ring.
- *      The receive BMU must be stopped before calling this function.
- *
- * Returns: N/A
- */
-static void ClearRxRing(
-SK_AC   *pAC,           /* pointer to adapter context */
-RX_PORT *pRxPort)       /* pointer to rx port struct */
-{
-RXD             *pRxd;  /* pointer to the current descriptor */
-unsigned long   Flags;
-SK_U64          PhysAddr;
-
-        if (pRxPort->RxdRingFree == pAC->RxDescrPerRing) {
-                return;
-        }
-        spin_lock_irqsave(&pRxPort->RxDesRingLock, Flags);
-        pRxd = pRxPort->pRxdRingHead;
-        do {
-                if (pRxd->pMBuf != NULL) {
-
-                        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
-                        PhysAddr |= (SK_U64) pRxd->VDataLow;
-                        pci_unmap_page(pAC->PciDev,
-                                         PhysAddr,
-                                         pAC->RxBufSize - 2,
-                                         PCI_DMA_FROMDEVICE);
-                        DEV_KFREE_SKB(pRxd->pMBuf);
-                        pRxd->pMBuf = NULL;
-                }
-                pRxd->RBControl &= BMU_OWN;
-                pRxd = pRxd->pNextRxd;
-                pRxPort->RxdRingFree++;
-        } while (pRxd != pRxPort->pRxdRingTail);
-        pRxPort->pRxdRingTail = pRxPort->pRxdRingHead;
-        spin_unlock_irqrestore(&pRxPort->RxDesRingLock, Flags);
-} /* ClearRxRing */
-
-/*****************************************************************************
- *
- *      ClearTxRing - remove all buffers from the transmit ring
- *
- * Description:
- *      This function removes all transmit buffers from the ring.
- *      The transmit BMU must be stopped before calling this function
- *      and transmitting at the upper level must be disabled.
- *      The BMU own bit of all descriptors is cleared, the rest is
- *      done by calling FreeTxDescriptors.
- *
- * Returns: N/A
- */
-static void ClearTxRing(
-SK_AC   *pAC,           /* pointer to adapter context */
-TX_PORT *pTxPort)       /* pointer to tx prt struct */
-{
-TXD             *pTxd;          /* pointer to the current descriptor */
-int             i;
-unsigned long   Flags;
-
-        spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
-        pTxd = pTxPort->pTxdRingHead;
-        for (i=0; i<pAC->TxDescrPerRing; i++) {
-                pTxd->TBControl &= ~BMU_OWN;
-                pTxd = pTxd->pNextTxd;
-        }
-        FreeTxDescriptors(pAC, pTxPort);
-        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
-} /* ClearTxRing */
-
-/*****************************************************************************
- *
- *      SkGeSetMacAddr - Set the hardware MAC address
- *
- * Description:
- *      This function sets the MAC address used by the adapter.
- *
- * Returns:
- *      0, if everything is ok
- *      !=0, on error
- */
-static int SkGeSetMacAddr(struct SK_NET_DEVICE *dev, void *p)
-{
-
-DEV_NET *pNet = netdev_priv(dev);
-SK_AC   *pAC = pNet->pAC;
-
-struct sockaddr *addr = p;
-unsigned long   Flags;
-        
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeSetMacAddr starts now...\n"));
-        if(netif_running(dev))
-                return -EBUSY;
-
-        memcpy(dev->dev_addr, addr->sa_data,dev->addr_len);
-        
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-
-        if (pAC->RlmtNets == 2)
-                SkAddrOverride(pAC, pAC->IoBase, pNet->NetNr,
-                        (SK_MAC_ADDR*)dev->dev_addr, SK_ADDR_VIRTUAL_ADDRESS);
-        else
-                SkAddrOverride(pAC, pAC->IoBase, pAC->ActivePort,
-                        (SK_MAC_ADDR*)dev->dev_addr, SK_ADDR_VIRTUAL_ADDRESS);
-
-        
-        
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-        return 0;
-} /* SkGeSetMacAddr */
-
-
-/*****************************************************************************
- *
- *      SkGeSetRxMode - set receive mode
- *
- * Description:
- *      This function sets the receive mode of an adapter. The adapter
- *      supports promiscuous mode, allmulticast mode and a number of
- *      multicast addresses. If more multicast addresses the available
- *      are selected, a hash function in the hardware is used.
- *
- * Returns:
- *      0, if everything is ok
- *      !=0, on error
- */
-static void SkGeSetRxMode(struct SK_NET_DEVICE *dev)
-{
-
-DEV_NET         *pNet;
-SK_AC           *pAC;
-
-struct dev_mc_list      *pMcList;
-int                     i;
-int                     PortIdx;
-unsigned long           Flags;
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeSetRxMode starts now... "));
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-        if (pAC->RlmtNets == 1)
-                PortIdx = pAC->ActivePort;
-        else
-                PortIdx = pNet->NetNr;
-
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        if (dev->flags & IFF_PROMISC) {
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                        ("PROMISCUOUS mode\n"));
-                SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
-                        SK_PROM_MODE_LLC);
-        } else if (dev->flags & IFF_ALLMULTI) {
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                        ("ALLMULTI mode\n"));
-                SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
-                        SK_PROM_MODE_ALL_MC);
-        } else {
-                SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
-                        SK_PROM_MODE_NONE);
-                SkAddrMcClear(pAC, pAC->IoBase, PortIdx, 0);
-
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                        ("Number of MC entries: %d ", dev->mc_count));
-                
-                pMcList = dev->mc_list;
-                for (i=0; i<dev->mc_count; i++, pMcList = pMcList->next) {
-                        SkAddrMcAdd(pAC, pAC->IoBase, PortIdx,
-                                (SK_MAC_ADDR*)pMcList->dmi_addr, 0);
-                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MCA,
-                                ("%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                pMcList->dmi_addr[0],
-                                pMcList->dmi_addr[1],
-                                pMcList->dmi_addr[2],
-                                pMcList->dmi_addr[3],
-                                pMcList->dmi_addr[4],
-                                pMcList->dmi_addr[5]));
-                }
-                SkAddrMcUpdate(pAC, pAC->IoBase, PortIdx);
-        }
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-        
-        return;
-} /* SkGeSetRxMode */
-
-
-/*****************************************************************************
- *
- *      SkGeChangeMtu - set the MTU to another value
- *
- * Description:
- *      This function sets is called whenever the MTU size is changed
- *      (ifconfig mtu xxx dev ethX). If the MTU is bigger than standard
- *      ethernet MTU size, long frame support is activated.
- *
- * Returns:
- *      0, if everything is ok
- *      !=0, on error
- */
-static int SkGeChangeMtu(struct SK_NET_DEVICE *dev, int NewMtu)
-{
-DEV_NET         *pNet;
-struct net_device *pOtherDev;
-SK_AC           *pAC;
-unsigned long   Flags;
-int             i;
-SK_EVPARA       EvPara;
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeChangeMtu starts now...\n"));
-
-        pNet = netdev_priv(dev);
-        pAC  = pNet->pAC;
-
-        if ((NewMtu < 68) || (NewMtu > SK_JUMBO_MTU)) {
-                return -EINVAL;
-        }
-
-        if(pAC->BoardLevel != SK_INIT_RUN) {
-                return -EINVAL;
-        }
-
-#ifdef SK_DIAG_SUPPORT
-        if (pAC->DiagModeActive == DIAG_ACTIVE) {
-                if (pAC->DiagFlowCtrl == SK_FALSE) {
-                        return -1; /* still in use, deny any actions of MTU */
-                } else {
-                        pAC->DiagFlowCtrl = SK_FALSE;
-                }
-        }
-#endif
-
-        pOtherDev = pAC->dev[1 - pNet->NetNr];
-
-        if ( netif_running(pOtherDev) && (pOtherDev->mtu > 1500)
-             && (NewMtu <= 1500))
-                return 0;
-
-        pAC->RxBufSize = NewMtu + 32;
-        dev->mtu = NewMtu;
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("New MTU: %d\n", NewMtu));
-
-        /* 
-        ** Prevent any reconfiguration while changing the MTU 
-        ** by disabling any interrupts 
-        */
-        SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-
-        /* 
-        ** Notify RLMT that any ports are to be stopped
-        */
-        EvPara.Para32[0] =  0;
-        EvPara.Para32[1] = -1;
-        if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-                EvPara.Para32[0] =  1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-        } else {
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-        }
-
-        /*
-        ** After calling the SkEventDispatcher(), RLMT is aware about
-        ** the stopped ports -> configuration can take place!
-        */
-        SkEventDispatcher(pAC, pAC->IoBase);
-
-        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                spin_lock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
-                netif_stop_queue(pAC->dev[i]);
-
-        }
-
-        /*
-        ** Depending on the desired MTU size change, a different number of 
-        ** RX buffers need to be allocated
-        */
-        if (NewMtu > 1500) {
-            /* 
-            ** Use less rx buffers 
-            */
-            for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-                    pAC->RxPort[i].RxFillLimit =  pAC->RxDescrPerRing -
-                                                 (pAC->RxDescrPerRing / 4);
-                } else {
-                    if (i == pAC->ActivePort) {
-                        pAC->RxPort[i].RxFillLimit = pAC->RxDescrPerRing - 
-                                                    (pAC->RxDescrPerRing / 4);
-                    } else {
-                        pAC->RxPort[i].RxFillLimit = pAC->RxDescrPerRing - 
-                                                    (pAC->RxDescrPerRing / 10);
-                    }
-                }
-            }
-        } else {
-            /* 
-            ** Use the normal amount of rx buffers 
-            */
-            for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-                    pAC->RxPort[i].RxFillLimit = 1;
-                } else {
-                    if (i == pAC->ActivePort) {
-                        pAC->RxPort[i].RxFillLimit = 1;
-                    } else {
-                        pAC->RxPort[i].RxFillLimit = pAC->RxDescrPerRing -
-                                                    (pAC->RxDescrPerRing / 4);
-                    }
-                }
-            }
-        }
-        
-        SkGeDeInit(pAC, pAC->IoBase);
-
-        /*
-        ** enable/disable hardware support for long frames
-        */
-        if (NewMtu > 1500) {
-// pAC->JumboActivated = SK_TRUE; /* is never set back !!! */
-                pAC->GIni.GIPortUsage = SK_JUMBO_LINK;
-        } else {
-            if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-                pAC->GIni.GIPortUsage = SK_MUL_LINK;
-            } else {
-                pAC->GIni.GIPortUsage = SK_RED_LINK;
-            }
-        }
-
-        SkGeInit(   pAC, pAC->IoBase, SK_INIT_IO);
-        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_IO);
-        SkEventInit(pAC, pAC->IoBase, SK_INIT_IO);
-        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_IO);
-        SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
-        SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
-        SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
-        
-        /*
-        ** tschilling:
-        ** Speed and others are set back to default in level 1 init!
-        */
-        GetConfiguration(pAC);
-        
-        SkGeInit(   pAC, pAC->IoBase, SK_INIT_RUN);
-        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_RUN);
-        SkEventInit(pAC, pAC->IoBase, SK_INIT_RUN);
-        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_RUN);
-        SkAddrInit( pAC, pAC->IoBase, SK_INIT_RUN);
-        SkRlmtInit( pAC, pAC->IoBase, SK_INIT_RUN);
-        SkTimerInit(pAC, pAC->IoBase, SK_INIT_RUN);
-
-        /*
-        ** clear and reinit the rx rings here
-        */
-        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-                ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
-                ClearRxRing(pAC, &pAC->RxPort[i]);
-                FillRxRing(pAC, &pAC->RxPort[i]);
-
-                /* 
-                ** Enable transmit descriptor polling
-                */
-                SkGePollTxD(pAC, pAC->IoBase, i, SK_TRUE);
-                FillRxRing(pAC, &pAC->RxPort[i]);
-        };
-
-        SkGeYellowLED(pAC, pAC->IoBase, 1);
-        SkDimEnableModerationIfNeeded(pAC);     
-        SkDimDisplayModerationSettings(pAC);
-
-        netif_start_queue(pAC->dev[pNet->PortNr]);
-        for (i=pAC->GIni.GIMacsFound-1; i>=0; i--) {
-                spin_unlock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
-        }
-
-        /* 
-        ** Enable Interrupts again 
-        */
-        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
-        SK_OUT32(pAC->IoBase, B0_HWE_IMSK, IRQ_HWE_MASK);
-
-        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
-        SkEventDispatcher(pAC, pAC->IoBase);
-
-        /* 
-        ** Notify RLMT about the changing and restarting one (or more) ports
-        */
-        if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-                EvPara.Para32[0] = pAC->RlmtNets;
-                EvPara.Para32[1] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_SET_NETS, EvPara);
-                EvPara.Para32[0] = pNet->PortNr;
-                EvPara.Para32[1] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
-                        
-                if (netif_running(pOtherDev)) {
-                        DEV_NET *pOtherNet = netdev_priv(pOtherDev);
-                        EvPara.Para32[0] = pOtherNet->PortNr;
-                        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
-                }
-        } else {
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
-        }
-
-        SkEventDispatcher(pAC, pAC->IoBase);
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-        
-        /*
-        ** While testing this driver with latest kernel 2.5 (2.5.70), it 
-        ** seems as if upper layers have a problem to handle a successful
-        ** return value of '0'. If such a zero is returned, the complete 
-        ** system hangs for several minutes (!), which is in acceptable.
-        **
-        ** Currently it is not clear, what the exact reason for this problem
-        ** is. The implemented workaround for 2.5 is to return the desired 
-        ** new MTU size if all needed changes for the new MTU size where 
-        ** performed. In kernels 2.2 and 2.4, a zero value is returned,
-        ** which indicates the successful change of the mtu-size.
-        */
-        return NewMtu;
-
-} /* SkGeChangeMtu */
-
-
-/*****************************************************************************
- *
- *      SkGeStats - return ethernet device statistics
- *
- * Description:
- *      This function return statistic data about the ethernet device
- *      to the operating system.
- *
- * Returns:
- *      pointer to the statistic structure.
- */
-static struct net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev)
-{
-DEV_NET *pNet = netdev_priv(dev);
-SK_AC   *pAC = pNet->pAC;
-SK_PNMI_STRUCT_DATA *pPnmiStruct;       /* structure for all Pnmi-Data */
-SK_PNMI_STAT    *pPnmiStat;             /* pointer to virtual XMAC stat. data */
-SK_PNMI_CONF    *pPnmiConf;             /* pointer to virtual link config. */
-unsigned int    Size;                   /* size of pnmi struct */
-unsigned long   Flags;                  /* for spin lock */
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeStats starts now...\n"));
-        pPnmiStruct = &pAC->PnmiStruct;
-
-#ifdef SK_DIAG_SUPPORT
-        if ((pAC->DiagModeActive == DIAG_NOTACTIVE) &&
-                (pAC->BoardLevel == SK_INIT_RUN)) {
-#endif
-        SK_MEMSET(pPnmiStruct, 0, sizeof(SK_PNMI_STRUCT_DATA));
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        Size = SK_PNMI_STRUCT_SIZE;
-                SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, pNet->NetNr);
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-#ifdef SK_DIAG_SUPPORT
-        }
-#endif
-
-        pPnmiStat = &pPnmiStruct->Stat[0];
-        pPnmiConf = &pPnmiStruct->Conf[0];
-
-        pAC->stats.rx_packets = (SK_U32) pPnmiStruct->RxDeliveredCts & 0xFFFFFFFF;
-        pAC->stats.tx_packets = (SK_U32) pPnmiStat->StatTxOkCts & 0xFFFFFFFF;
-        pAC->stats.rx_bytes = (SK_U32) pPnmiStruct->RxOctetsDeliveredCts;
-        pAC->stats.tx_bytes = (SK_U32) pPnmiStat->StatTxOctetsOkCts;
-        
-        if (dev->mtu <= 1500) {
-                pAC->stats.rx_errors = (SK_U32) pPnmiStruct->InErrorsCts & 0xFFFFFFFF;
-        } else {
-                pAC->stats.rx_errors = (SK_U32) ((pPnmiStruct->InErrorsCts -
-                        pPnmiStat->StatRxTooLongCts) & 0xFFFFFFFF);
-        }
-
-
-        if (pAC->GIni.GP[0].PhyType == SK_PHY_XMAC && pAC->HWRevision < 12)
-                pAC->stats.rx_errors = pAC->stats.rx_errors - pPnmiStat->StatRxShortsCts;
-
-        pAC->stats.tx_errors = (SK_U32) pPnmiStat->StatTxSingleCollisionCts & 0xFFFFFFFF;
-        pAC->stats.rx_dropped = (SK_U32) pPnmiStruct->RxNoBufCts & 0xFFFFFFFF;
-        pAC->stats.tx_dropped = (SK_U32) pPnmiStruct->TxNoBufCts & 0xFFFFFFFF;
-        pAC->stats.multicast = (SK_U32) pPnmiStat->StatRxMulticastOkCts & 0xFFFFFFFF;
-        pAC->stats.collisions = (SK_U32) pPnmiStat->StatTxSingleCollisionCts & 0xFFFFFFFF;
-
-        /* detailed rx_errors: */
-        pAC->stats.rx_length_errors = (SK_U32) pPnmiStat->StatRxRuntCts & 0xFFFFFFFF;
-        pAC->stats.rx_over_errors = (SK_U32) pPnmiStat->StatRxFifoOverflowCts & 0xFFFFFFFF;
-        pAC->stats.rx_crc_errors = (SK_U32) pPnmiStat->StatRxFcsCts & 0xFFFFFFFF;
-        pAC->stats.rx_frame_errors = (SK_U32) pPnmiStat->StatRxFramingCts & 0xFFFFFFFF;
-        pAC->stats.rx_fifo_errors = (SK_U32) pPnmiStat->StatRxFifoOverflowCts & 0xFFFFFFFF;
-        pAC->stats.rx_missed_errors = (SK_U32) pPnmiStat->StatRxMissedCts & 0xFFFFFFFF;
-
-        /* detailed tx_errors */
-        pAC->stats.tx_aborted_errors = (SK_U32) 0;
-        pAC->stats.tx_carrier_errors = (SK_U32) pPnmiStat->StatTxCarrierCts & 0xFFFFFFFF;
-        pAC->stats.tx_fifo_errors = (SK_U32) pPnmiStat->StatTxFifoUnderrunCts & 0xFFFFFFFF;
-        pAC->stats.tx_heartbeat_errors = (SK_U32) pPnmiStat->StatTxCarrierCts & 0xFFFFFFFF;
-        pAC->stats.tx_window_errors = (SK_U32) 0;
-
-        return(&pAC->stats);
-} /* SkGeStats */
-
-/*
- * Basic MII register access
- */
-static int SkGeMiiIoctl(struct net_device *dev,
-                        struct mii_ioctl_data *data, int cmd)
-{
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-        SK_IOC IoC = pAC->IoBase;
-        int Port = pNet->PortNr;
-        SK_GEPORT *pPrt = &pAC->GIni.GP[Port];
-        unsigned long Flags;
-        int err = 0;
-        int reg = data->reg_num & 0x1f;
-        SK_U16 val = data->val_in;
-
-        if (!netif_running(dev))
-                return -ENODEV; /* Phy still in reset */
-
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        switch(cmd) {
-        case SIOCGMIIPHY:
-                data->phy_id = pPrt->PhyAddr;
-
-                /* fallthru */
-        case SIOCGMIIREG:
-                if (pAC->GIni.GIGenesis)
-                        SkXmPhyRead(pAC, IoC, Port, reg, &val);
-                else
-                        SkGmPhyRead(pAC, IoC, Port, reg, &val);
-
-                data->val_out = val;
-                break;
-
-        case SIOCSMIIREG:
-                if (!capable(CAP_NET_ADMIN))
-                        err = -EPERM;
-
-                else if (pAC->GIni.GIGenesis)
-                        SkXmPhyWrite(pAC, IoC, Port, reg, val);
-                else
-                        SkGmPhyWrite(pAC, IoC, Port, reg, val);
-                break;
-        default:
-                err = -EOPNOTSUPP;
-        }
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-        return err;
-}
-
-
-/*****************************************************************************
- *
- *      SkGeIoctl - IO-control function
- *
- * Description:
- *      This function is called if an ioctl is issued on the device.
- *      There are three subfunction for reading, writing and test-writing
- *      the private MIB data structure (useful for SysKonnect-internal tools).
- *
- * Returns:
- *      0, if everything is ok
- *      !=0, on error
- */
-static int SkGeIoctl(struct SK_NET_DEVICE *dev, struct ifreq *rq, int cmd)
-{
-DEV_NET         *pNet;
-SK_AC           *pAC;
-void            *pMemBuf;
-struct pci_dev  *pdev = NULL;
-SK_GE_IOCTL     Ioctl;
-unsigned int    Err = 0;
-int             Size = 0;
-int             Ret = 0;
-unsigned int    Length = 0;
-int             HeaderLength = sizeof(SK_U32) + sizeof(SK_U32);
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeIoctl starts now...\n"));
-
-        pNet = netdev_priv(dev);
-        pAC = pNet->pAC;
-        
-        if (cmd == SIOCGMIIPHY || cmd == SIOCSMIIREG || cmd == SIOCGMIIREG)
-            return SkGeMiiIoctl(dev, if_mii(rq), cmd);
-
-        if(copy_from_user(&Ioctl, rq->ifr_data, sizeof(SK_GE_IOCTL))) {
-                return -EFAULT;
-        }
-
-        switch(cmd) {
-        case SK_IOCTL_SETMIB:
-        case SK_IOCTL_PRESETMIB:
-                if (!capable(CAP_NET_ADMIN)) return -EPERM;
-        case SK_IOCTL_GETMIB:
-                if(copy_from_user(&pAC->PnmiStruct, Ioctl.pData,
-                        Ioctl.Len<sizeof(pAC->PnmiStruct)?
-                        Ioctl.Len : sizeof(pAC->PnmiStruct))) {
-                        return -EFAULT;
-                }
-                Size = SkGeIocMib(pNet, Ioctl.Len, cmd);
-                if(copy_to_user(Ioctl.pData, &pAC->PnmiStruct,
-                        Ioctl.Len<Size? Ioctl.Len : Size)) {
-                        return -EFAULT;
-                }
-                Ioctl.Len = Size;
-                if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
-                        return -EFAULT;
-                }
-                break;
-        case SK_IOCTL_GEN:
-                if (Ioctl.Len < (sizeof(pAC->PnmiStruct) + HeaderLength)) {
-                        Length = Ioctl.Len;
-                } else {
-                        Length = sizeof(pAC->PnmiStruct) + HeaderLength;
-                }
-                if (NULL == (pMemBuf = kmalloc(Length, GFP_KERNEL))) {
-                        return -ENOMEM;
-                }
-                if(copy_from_user(pMemBuf, Ioctl.pData, Length)) {
-                        Err = -EFAULT;
-                        goto fault_gen;
-                }
-                if ((Ret = SkPnmiGenIoctl(pAC, pAC->IoBase, pMemBuf, &Length, 0)) < 0) {
-                        Err = -EFAULT;
-                        goto fault_gen;
-                }
-                if(copy_to_user(Ioctl.pData, pMemBuf, Length) ) {
-                        Err = -EFAULT;
-                        goto fault_gen;
-                }
-                Ioctl.Len = Length;
-                if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
-                        Err = -EFAULT;
-                        goto fault_gen;
-                }
-fault_gen:
-                kfree(pMemBuf); /* cleanup everything */
-                break;
-#ifdef SK_DIAG_SUPPORT
-       case SK_IOCTL_DIAG:
-                if (!capable(CAP_NET_ADMIN)) return -EPERM;
-                if (Ioctl.Len < (sizeof(pAC->PnmiStruct) + HeaderLength)) {
-                        Length = Ioctl.Len;
-                } else {
-                        Length = sizeof(pAC->PnmiStruct) + HeaderLength;
-                }
-                if (NULL == (pMemBuf = kmalloc(Length, GFP_KERNEL))) {
-                        return -ENOMEM;
-                }
-                if(copy_from_user(pMemBuf, Ioctl.pData, Length)) {
-                        Err = -EFAULT;
-                        goto fault_diag;
-                }
-                pdev = pAC->PciDev;
-                Length = 3 * sizeof(SK_U32);  /* Error, Bus and Device */
-                /* 
-                ** While coding this new IOCTL interface, only a few lines of code
-                ** are to to be added. Therefore no dedicated function has been 
-                ** added. If more functionality is added, a separate function 
-                ** should be used...
-                */
-                * ((SK_U32 *)pMemBuf) = 0;
-                * ((SK_U32 *)pMemBuf + 1) = pdev->bus->number;
-                * ((SK_U32 *)pMemBuf + 2) = ParseDeviceNbrFromSlotName(pci_name(pdev));
-                if(copy_to_user(Ioctl.pData, pMemBuf, Length) ) {
-                        Err = -EFAULT;
-                        goto fault_diag;
-                }
-                Ioctl.Len = Length;
-                if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
-                        Err = -EFAULT;
-                        goto fault_diag;
-                }
-fault_diag:
-                kfree(pMemBuf); /* cleanup everything */
-                break;
-#endif
-        default:
-                Err = -EOPNOTSUPP;
-        }
-
-        return(Err);
-
-} /* SkGeIoctl */
-
-
-/*****************************************************************************
- *
- *      SkGeIocMib - handle a GetMib, SetMib- or PresetMib-ioctl message
- *
- * Description:
- *      This function reads/writes the MIB data using PNMI (Private Network
- *      Management Interface).
- *      The destination for the data must be provided with the
- *      ioctl call and is given to the driver in the form of
- *      a user space address.
- *      Copying from the user-provided data area into kernel messages
- *      and back is done by copy_from_user and copy_to_user calls in
- *      SkGeIoctl.
- *
- * Returns:
- *      returned size from PNMI call
- */
-static int SkGeIocMib(
-DEV_NET         *pNet,  /* pointer to the adapter context */
-unsigned int    Size,   /* length of ioctl data */
-int             mode)   /* flag for set/preset */
-{
-unsigned long   Flags;  /* for spin lock */
-SK_AC           *pAC;
-
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("SkGeIocMib starts now...\n"));
-        pAC = pNet->pAC;
-        /* access MIB */
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        switch(mode) {
-        case SK_IOCTL_GETMIB:
-                SkPnmiGetStruct(pAC, pAC->IoBase, &pAC->PnmiStruct, &Size,
-                        pNet->NetNr);
-                break;
-        case SK_IOCTL_PRESETMIB:
-                SkPnmiPreSetStruct(pAC, pAC->IoBase, &pAC->PnmiStruct, &Size,
-                        pNet->NetNr);
-                break;
-        case SK_IOCTL_SETMIB:
-                SkPnmiSetStruct(pAC, pAC->IoBase, &pAC->PnmiStruct, &Size,
-                        pNet->NetNr);
-                break;
-        default:
-                break;
-        }
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-                ("MIB data access succeeded\n"));
-        return (Size);
-} /* SkGeIocMib */
-
-
-/*****************************************************************************
- *
- *      GetConfiguration - read configuration information
- *
- * Description:
- *      This function reads per-adapter configuration information from
- *      the options provided on the command line.
- *
- * Returns:
- *      none
- */
-static void GetConfiguration(
-SK_AC   *pAC)   /* pointer to the adapter context structure */
-{
-SK_I32  Port;           /* preferred port */
-SK_BOOL AutoSet;
-SK_BOOL DupSet;
-int     LinkSpeed          = SK_LSPEED_AUTO;    /* Link speed */
-int     AutoNeg            = 1;                 /* autoneg off (0) or on (1) */
-int     DuplexCap          = 0;                 /* 0=both,1=full,2=half */
-int     FlowCtrl           = SK_FLOW_MODE_SYM_OR_REM;   /* FlowControl  */
-int     MSMode             = SK_MS_MODE_AUTO;   /* master/slave mode    */
-
-SK_BOOL IsConTypeDefined   = SK_TRUE;
-SK_BOOL IsLinkSpeedDefined = SK_TRUE;
-SK_BOOL IsFlowCtrlDefined  = SK_TRUE;
-SK_BOOL IsRoleDefined      = SK_TRUE;
-SK_BOOL IsModeDefined      = SK_TRUE;
-/*
- *      The two parameters AutoNeg. and DuplexCap. map to one configuration
- *      parameter. The mapping is described by this table:
- *      DuplexCap ->    |       both    |       full    |       half    |
- *      AutoNeg         |               |               |               |
- *      -----------------------------------------------------------------
- *      Off             |    illegal    |       Full    |       Half    |
- *      -----------------------------------------------------------------
- *      On              |   AutoBoth    |   AutoFull    |   AutoHalf    |
- *      -----------------------------------------------------------------
- *      Sense           |   AutoSense   |   AutoSense   |   AutoSense   |
- */
-int     Capabilities[3][3] =
-                { {                -1, SK_LMODE_FULL     , SK_LMODE_HALF     },
-                  {SK_LMODE_AUTOBOTH , SK_LMODE_AUTOFULL , SK_LMODE_AUTOHALF },
-                  {SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE} };
-
-#define DC_BOTH 0
-#define DC_FULL 1
-#define DC_HALF 2
-#define AN_OFF  0
-#define AN_ON   1
-#define AN_SENS 2
-#define M_CurrPort pAC->GIni.GP[Port]
-
-
-        /*
-        ** Set the default values first for both ports!
-        */
-        for (Port = 0; Port < SK_MAX_MACS; Port++) {
-                M_CurrPort.PLinkModeConf = Capabilities[AN_ON][DC_BOTH];
-                M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_SYM_OR_REM;
-                M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
-                M_CurrPort.PLinkSpeed    = SK_LSPEED_AUTO;
-        }
-
-        /*
-        ** Check merged parameter ConType. If it has not been used,
-        ** verify any other parameter (e.g. AutoNeg) and use default values. 
-        **
-        ** Stating both ConType and other lowlevel link parameters is also
-        ** possible. If this is the case, the passed ConType-parameter is 
-        ** overwritten by the lowlevel link parameter.
-        **
-        ** The following settings are used for a merged ConType-parameter:
-        **
-        ** ConType   DupCap   AutoNeg   FlowCtrl      Role      Speed
-        ** -------   ------   -------   --------   ----------   -----
-        **  Auto      Both      On      SymOrRem      Auto       Auto
-        **  100FD     Full      Off       None      <ignored>    100
-        **  100HD     Half      Off       None      <ignored>    100
-        **  10FD      Full      Off       None      <ignored>    10
-        **  10HD      Half      Off       None      <ignored>    10
-        ** 
-        ** This ConType parameter is used for all ports of the adapter!
-        */
-        if ( (ConType != NULL)                && 
-             (pAC->Index < SK_MAX_CARD_PARAM) &&
-             (ConType[pAC->Index] != NULL) ) {
-
-                        /* Check chipset family */
-                        if ((!pAC->ChipsetType) && 
-                                (strcmp(ConType[pAC->Index],"Auto")!=0) &&
-                                (strcmp(ConType[pAC->Index],"")!=0)) {
-                                /* Set the speed parameter back */
-                                        printk("sk98lin: Illegal value \"%s\" " 
-                                                        "for ConType."
-                                                        " Using Auto.\n", 
-                                                        ConType[pAC->Index]);
-
-                                        sprintf(ConType[pAC->Index], "Auto");   
-                        }
-
-                                if (strcmp(ConType[pAC->Index],"")==0) {
-                        IsConTypeDefined = SK_FALSE; /* No ConType defined */
-                                } else if (strcmp(ConType[pAC->Index],"Auto")==0) {
-                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
-                        M_CurrPort.PLinkModeConf = Capabilities[AN_ON][DC_BOTH];
-                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_SYM_OR_REM;
-                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
-                        M_CurrPort.PLinkSpeed    = SK_LSPEED_AUTO;
-                    }
-                } else if (strcmp(ConType[pAC->Index],"100FD")==0) {
-                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
-                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_FULL];
-                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
-                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
-                        M_CurrPort.PLinkSpeed    = SK_LSPEED_100MBPS;
-                    }
-                } else if (strcmp(ConType[pAC->Index],"100HD")==0) {
-                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
-                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_HALF];
-                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
-                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
-                        M_CurrPort.PLinkSpeed    = SK_LSPEED_100MBPS;
-                    }
-                } else if (strcmp(ConType[pAC->Index],"10FD")==0) {
-                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
-                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_FULL];
-                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
-                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
-                        M_CurrPort.PLinkSpeed    = SK_LSPEED_10MBPS;
-                    }
-                } else if (strcmp(ConType[pAC->Index],"10HD")==0) {
-                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
-                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_HALF];
-                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
-                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
-                        M_CurrPort.PLinkSpeed    = SK_LSPEED_10MBPS;
-                    }
-                } else { 
-                    printk("sk98lin: Illegal value \"%s\" for ConType\n", 
-                        ConType[pAC->Index]);
-                    IsConTypeDefined = SK_FALSE; /* Wrong ConType defined */
-                }
-        } else {
-            IsConTypeDefined = SK_FALSE; /* No ConType defined */
-        }
-
-        /*
-        ** Parse any parameter settings for port A:
-        ** a) any LinkSpeed stated?
-        */
-        if (Speed_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                Speed_A[pAC->Index] != NULL) {
-                if (strcmp(Speed_A[pAC->Index],"")==0) {
-                    IsLinkSpeedDefined = SK_FALSE;
-                } else if (strcmp(Speed_A[pAC->Index],"Auto")==0) {
-                    LinkSpeed = SK_LSPEED_AUTO;
-                } else if (strcmp(Speed_A[pAC->Index],"10")==0) {
-                    LinkSpeed = SK_LSPEED_10MBPS;
-                } else if (strcmp(Speed_A[pAC->Index],"100")==0) {
-                    LinkSpeed = SK_LSPEED_100MBPS;
-                } else if (strcmp(Speed_A[pAC->Index],"1000")==0) {
-                    LinkSpeed = SK_LSPEED_1000MBPS;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for Speed_A\n",
-                        Speed_A[pAC->Index]);
-                    IsLinkSpeedDefined = SK_FALSE;
-                }
-        } else {
-            IsLinkSpeedDefined = SK_FALSE;
-        }
-
-        /* 
-        ** Check speed parameter: 
-        **    Only copper type adapter and GE V2 cards 
-        */
-        if (((!pAC->ChipsetType) || (pAC->GIni.GICopperType != SK_TRUE)) &&
-                ((LinkSpeed != SK_LSPEED_AUTO) &&
-                (LinkSpeed != SK_LSPEED_1000MBPS))) {
-                printk("sk98lin: Illegal value for Speed_A. "
-                        "Not a copper card or GE V2 card\n    Using "
-                        "speed 1000\n");
-                LinkSpeed = SK_LSPEED_1000MBPS;
-        }
-        
-        /*      
-        ** Decide whether to set new config value if somethig valid has
-        ** been received.
-        */
-        if (IsLinkSpeedDefined) {
-                pAC->GIni.GP[0].PLinkSpeed = LinkSpeed;
-        } 
-
-        /* 
-        ** b) Any Autonegotiation and DuplexCapabilities set?
-        **    Please note that both belong together...
-        */
-        AutoNeg = AN_ON; /* tschilling: Default: Autonegotiation on! */
-        AutoSet = SK_FALSE;
-        if (AutoNeg_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                AutoNeg_A[pAC->Index] != NULL) {
-                AutoSet = SK_TRUE;
-                if (strcmp(AutoNeg_A[pAC->Index],"")==0) {
-                    AutoSet = SK_FALSE;
-                } else if (strcmp(AutoNeg_A[pAC->Index],"On")==0) {
-                    AutoNeg = AN_ON;
-                } else if (strcmp(AutoNeg_A[pAC->Index],"Off")==0) {
-                    AutoNeg = AN_OFF;
-                } else if (strcmp(AutoNeg_A[pAC->Index],"Sense")==0) {
-                    AutoNeg = AN_SENS;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for AutoNeg_A\n",
-                        AutoNeg_A[pAC->Index]);
-                }
-        }
-
-        DuplexCap = DC_BOTH;
-        DupSet    = SK_FALSE;
-        if (DupCap_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                DupCap_A[pAC->Index] != NULL) {
-                DupSet = SK_TRUE;
-                if (strcmp(DupCap_A[pAC->Index],"")==0) {
-                    DupSet = SK_FALSE;
-                } else if (strcmp(DupCap_A[pAC->Index],"Both")==0) {
-                    DuplexCap = DC_BOTH;
-                } else if (strcmp(DupCap_A[pAC->Index],"Full")==0) {
-                    DuplexCap = DC_FULL;
-                } else if (strcmp(DupCap_A[pAC->Index],"Half")==0) {
-                    DuplexCap = DC_HALF;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for DupCap_A\n",
-                        DupCap_A[pAC->Index]);
-                }
-        }
-
-        /* 
-        ** Check for illegal combinations 
-        */
-        if ((LinkSpeed == SK_LSPEED_1000MBPS) &&
-                ((DuplexCap == SK_LMODE_STAT_AUTOHALF) ||
-                (DuplexCap == SK_LMODE_STAT_HALF)) &&
-                (pAC->ChipsetType)) {
-                    printk("sk98lin: Half Duplex not possible with Gigabit speed!\n"
-                                        "    Using Full Duplex.\n");
-                                DuplexCap = DC_FULL;
-        }
-
-        if ( AutoSet && AutoNeg==AN_SENS && DupSet) {
-                printk("sk98lin, Port A: DuplexCapabilities"
-                        " ignored using Sense mode\n");
-        }
-
-        if (AutoSet && AutoNeg==AN_OFF && DupSet && DuplexCap==DC_BOTH){
-                printk("sk98lin: Port A: Illegal combination"
-                        " of values AutoNeg. and DuplexCap.\n    Using "
-                        "Full Duplex\n");
-                DuplexCap = DC_FULL;
-        }
-
-        if (AutoSet && AutoNeg==AN_OFF && !DupSet) {
-                DuplexCap = DC_FULL;
-        }
-        
-        if (!AutoSet && DupSet) {
-                printk("sk98lin: Port A: Duplex setting not"
-                        " possible in\n    default AutoNegotiation mode"
-                        " (Sense).\n    Using AutoNegotiation On\n");
-                AutoNeg = AN_ON;
-        }
-        
-        /* 
-        ** set the desired mode 
-        */
-        if (AutoSet || DupSet) {
-            pAC->GIni.GP[0].PLinkModeConf = Capabilities[AutoNeg][DuplexCap];
-        }
-        
-        /* 
-        ** c) Any Flowcontrol-parameter set?
-        */
-        if (FlowCtrl_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                FlowCtrl_A[pAC->Index] != NULL) {
-                if (strcmp(FlowCtrl_A[pAC->Index],"") == 0) {
-                    IsFlowCtrlDefined = SK_FALSE;
-                } else if (strcmp(FlowCtrl_A[pAC->Index],"SymOrRem") == 0) {
-                    FlowCtrl = SK_FLOW_MODE_SYM_OR_REM;
-                } else if (strcmp(FlowCtrl_A[pAC->Index],"Sym")==0) {
-                    FlowCtrl = SK_FLOW_MODE_SYMMETRIC;
-                } else if (strcmp(FlowCtrl_A[pAC->Index],"LocSend")==0) {
-                    FlowCtrl = SK_FLOW_MODE_LOC_SEND;
-                } else if (strcmp(FlowCtrl_A[pAC->Index],"None")==0) {
-                    FlowCtrl = SK_FLOW_MODE_NONE;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for FlowCtrl_A\n",
-                        FlowCtrl_A[pAC->Index]);
-                    IsFlowCtrlDefined = SK_FALSE;
-                }
-        } else {
-           IsFlowCtrlDefined = SK_FALSE;
-        }
-
-        if (IsFlowCtrlDefined) {
-            if ((AutoNeg == AN_OFF) && (FlowCtrl != SK_FLOW_MODE_NONE)) {
-                printk("sk98lin: Port A: FlowControl"
-                        " impossible without AutoNegotiation,"
-                        " disabled\n");
-                FlowCtrl = SK_FLOW_MODE_NONE;
-            }
-            pAC->GIni.GP[0].PFlowCtrlMode = FlowCtrl;
-        }
-
-        /*
-        ** d) What is with the RoleParameter?
-        */
-        if (Role_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                Role_A[pAC->Index] != NULL) {
-                if (strcmp(Role_A[pAC->Index],"")==0) {
-                   IsRoleDefined = SK_FALSE;
-                } else if (strcmp(Role_A[pAC->Index],"Auto")==0) {
-                    MSMode = SK_MS_MODE_AUTO;
-                } else if (strcmp(Role_A[pAC->Index],"Master")==0) {
-                    MSMode = SK_MS_MODE_MASTER;
-                } else if (strcmp(Role_A[pAC->Index],"Slave")==0) {
-                    MSMode = SK_MS_MODE_SLAVE;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for Role_A\n",
-                        Role_A[pAC->Index]);
-                    IsRoleDefined = SK_FALSE;
-                }
-        } else {
-           IsRoleDefined = SK_FALSE;
-        }
-
-        if (IsRoleDefined == SK_TRUE) {
-            pAC->GIni.GP[0].PMSMode = MSMode;
-        }
-        
-
-        
-        /* 
-        ** Parse any parameter settings for port B:
-        ** a) any LinkSpeed stated?
-        */
-        IsConTypeDefined   = SK_TRUE;
-        IsLinkSpeedDefined = SK_TRUE;
-        IsFlowCtrlDefined  = SK_TRUE;
-        IsModeDefined      = SK_TRUE;
-
-        if (Speed_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                Speed_B[pAC->Index] != NULL) {
-                if (strcmp(Speed_B[pAC->Index],"")==0) {
-                    IsLinkSpeedDefined = SK_FALSE;
-                } else if (strcmp(Speed_B[pAC->Index],"Auto")==0) {
-                    LinkSpeed = SK_LSPEED_AUTO;
-                } else if (strcmp(Speed_B[pAC->Index],"10")==0) {
-                    LinkSpeed = SK_LSPEED_10MBPS;
-                } else if (strcmp(Speed_B[pAC->Index],"100")==0) {
-                    LinkSpeed = SK_LSPEED_100MBPS;
-                } else if (strcmp(Speed_B[pAC->Index],"1000")==0) {
-                    LinkSpeed = SK_LSPEED_1000MBPS;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for Speed_B\n",
-                        Speed_B[pAC->Index]);
-                    IsLinkSpeedDefined = SK_FALSE;
-                }
-        } else {
-            IsLinkSpeedDefined = SK_FALSE;
-        }
-
-        /* 
-        ** Check speed parameter:
-        **    Only copper type adapter and GE V2 cards 
-        */
-        if (((!pAC->ChipsetType) || (pAC->GIni.GICopperType != SK_TRUE)) &&
-                ((LinkSpeed != SK_LSPEED_AUTO) &&
-                (LinkSpeed != SK_LSPEED_1000MBPS))) {
-                printk("sk98lin: Illegal value for Speed_B. "
-                        "Not a copper card or GE V2 card\n    Using "
-                        "speed 1000\n");
-                LinkSpeed = SK_LSPEED_1000MBPS;
-        }
-
-        /*      
-        ** Decide whether to set new config value if somethig valid has
-        ** been received.
-        */
-        if (IsLinkSpeedDefined) {
-            pAC->GIni.GP[1].PLinkSpeed = LinkSpeed;
-        }
-
-        /* 
-        ** b) Any Autonegotiation and DuplexCapabilities set?
-        **    Please note that both belong together...
-        */
-        AutoNeg = AN_SENS; /* default: do auto Sense */
-        AutoSet = SK_FALSE;
-        if (AutoNeg_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                AutoNeg_B[pAC->Index] != NULL) {
-                AutoSet = SK_TRUE;
-                if (strcmp(AutoNeg_B[pAC->Index],"")==0) {
-                    AutoSet = SK_FALSE;
-                } else if (strcmp(AutoNeg_B[pAC->Index],"On")==0) {
-                    AutoNeg = AN_ON;
-                } else if (strcmp(AutoNeg_B[pAC->Index],"Off")==0) {
-                    AutoNeg = AN_OFF;
-                } else if (strcmp(AutoNeg_B[pAC->Index],"Sense")==0) {
-                    AutoNeg = AN_SENS;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for AutoNeg_B\n",
-                        AutoNeg_B[pAC->Index]);
-                }
-        }
-
-        DuplexCap = DC_BOTH;
-        DupSet    = SK_FALSE;
-        if (DupCap_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                DupCap_B[pAC->Index] != NULL) {
-                DupSet = SK_TRUE;
-                if (strcmp(DupCap_B[pAC->Index],"")==0) {
-                    DupSet = SK_FALSE;
-                } else if (strcmp(DupCap_B[pAC->Index],"Both")==0) {
-                    DuplexCap = DC_BOTH;
-                } else if (strcmp(DupCap_B[pAC->Index],"Full")==0) {
-                    DuplexCap = DC_FULL;
-                } else if (strcmp(DupCap_B[pAC->Index],"Half")==0) {
-                    DuplexCap = DC_HALF;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for DupCap_B\n",
-                        DupCap_B[pAC->Index]);
-                }
-        }
-
-        
-        /* 
-        ** Check for illegal combinations 
-        */
-        if ((LinkSpeed == SK_LSPEED_1000MBPS) &&
-                ((DuplexCap == SK_LMODE_STAT_AUTOHALF) ||
-                (DuplexCap == SK_LMODE_STAT_HALF)) &&
-                (pAC->ChipsetType)) {
-                    printk("sk98lin: Half Duplex not possible with Gigabit speed!\n"
-                                        "    Using Full Duplex.\n");
-                                DuplexCap = DC_FULL;
-        }
-
-        if (AutoSet && AutoNeg==AN_SENS && DupSet) {
-                printk("sk98lin, Port B: DuplexCapabilities"
-                        " ignored using Sense mode\n");
-        }
-
-        if (AutoSet && AutoNeg==AN_OFF && DupSet && DuplexCap==DC_BOTH){
-                printk("sk98lin: Port B: Illegal combination"
-                        " of values AutoNeg. and DuplexCap.\n    Using "
-                        "Full Duplex\n");
-                DuplexCap = DC_FULL;
-        }
-
-        if (AutoSet && AutoNeg==AN_OFF && !DupSet) {
-                DuplexCap = DC_FULL;
-        }
-        
-        if (!AutoSet && DupSet) {
-                printk("sk98lin: Port B: Duplex setting not"
-                        " possible in\n    default AutoNegotiation mode"
-                        " (Sense).\n    Using AutoNegotiation On\n");
-                AutoNeg = AN_ON;
-        }
-
-        /* 
-        ** set the desired mode 
-        */
-        if (AutoSet || DupSet) {
-            pAC->GIni.GP[1].PLinkModeConf = Capabilities[AutoNeg][DuplexCap];
-        }
-
-        /*
-        ** c) Any FlowCtrl parameter set?
-        */
-        if (FlowCtrl_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                FlowCtrl_B[pAC->Index] != NULL) {
-                if (strcmp(FlowCtrl_B[pAC->Index],"") == 0) {
-                    IsFlowCtrlDefined = SK_FALSE;
-                } else if (strcmp(FlowCtrl_B[pAC->Index],"SymOrRem") == 0) {
-                    FlowCtrl = SK_FLOW_MODE_SYM_OR_REM;
-                } else if (strcmp(FlowCtrl_B[pAC->Index],"Sym")==0) {
-                    FlowCtrl = SK_FLOW_MODE_SYMMETRIC;
-                } else if (strcmp(FlowCtrl_B[pAC->Index],"LocSend")==0) {
-                    FlowCtrl = SK_FLOW_MODE_LOC_SEND;
-                } else if (strcmp(FlowCtrl_B[pAC->Index],"None")==0) {
-                    FlowCtrl = SK_FLOW_MODE_NONE;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for FlowCtrl_B\n",
-                        FlowCtrl_B[pAC->Index]);
-                    IsFlowCtrlDefined = SK_FALSE;
-                }
-        } else {
-                IsFlowCtrlDefined = SK_FALSE;
-        }
-
-        if (IsFlowCtrlDefined) {
-            if ((AutoNeg == AN_OFF) && (FlowCtrl != SK_FLOW_MODE_NONE)) {
-                printk("sk98lin: Port B: FlowControl"
-                        " impossible without AutoNegotiation,"
-                        " disabled\n");
-                FlowCtrl = SK_FLOW_MODE_NONE;
-            }
-            pAC->GIni.GP[1].PFlowCtrlMode = FlowCtrl;
-        }
-
-        /*
-        ** d) What is the RoleParameter?
-        */
-        if (Role_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                Role_B[pAC->Index] != NULL) {
-                if (strcmp(Role_B[pAC->Index],"")==0) {
-                    IsRoleDefined = SK_FALSE;
-                } else if (strcmp(Role_B[pAC->Index],"Auto")==0) {
-                    MSMode = SK_MS_MODE_AUTO;
-                } else if (strcmp(Role_B[pAC->Index],"Master")==0) {
-                    MSMode = SK_MS_MODE_MASTER;
-                } else if (strcmp(Role_B[pAC->Index],"Slave")==0) {
-                    MSMode = SK_MS_MODE_SLAVE;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for Role_B\n",
-                        Role_B[pAC->Index]);
-                    IsRoleDefined = SK_FALSE;
-                }
-        } else {
-            IsRoleDefined = SK_FALSE;
-        }
-
-        if (IsRoleDefined) {
-            pAC->GIni.GP[1].PMSMode = MSMode;
-        }
-        
-        /*
-        ** Evaluate settings for both ports
-        */
-        pAC->ActivePort = 0;
-        if (PrefPort != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                PrefPort[pAC->Index] != NULL) {
-                if (strcmp(PrefPort[pAC->Index],"") == 0) { /* Auto */
-                        pAC->ActivePort             =  0;
-                        pAC->Rlmt.Net[0].Preference = -1; /* auto */
-                        pAC->Rlmt.Net[0].PrefPort   =  0;
-                } else if (strcmp(PrefPort[pAC->Index],"A") == 0) {
-                        /*
-                        ** do not set ActivePort here, thus a port
-                        ** switch is issued after net up.
-                        */
-                        Port                        = 0;
-                        pAC->Rlmt.Net[0].Preference = Port;
-                        pAC->Rlmt.Net[0].PrefPort   = Port;
-                } else if (strcmp(PrefPort[pAC->Index],"B") == 0) {
-                        /*
-                        ** do not set ActivePort here, thus a port
-                        ** switch is issued after net up.
-                        */
-                        if (pAC->GIni.GIMacsFound == 1) {
-                                printk("sk98lin: Illegal value \"B\" for PrefPort.\n"
-                                        "      Port B not available on single port adapters.\n");
-
-                                pAC->ActivePort             =  0;
-                                pAC->Rlmt.Net[0].Preference = -1; /* auto */
-                                pAC->Rlmt.Net[0].PrefPort   =  0;
-                        } else {
-                                Port                        = 1;
-                                pAC->Rlmt.Net[0].Preference = Port;
-                                pAC->Rlmt.Net[0].PrefPort   = Port;
-                        }
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for PrefPort\n",
-                        PrefPort[pAC->Index]);
-                }
-        }
-
-        pAC->RlmtNets = 1;
-
-        if (RlmtMode != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
-                RlmtMode[pAC->Index] != NULL) {
-                if (strcmp(RlmtMode[pAC->Index], "") == 0) {
-                        pAC->RlmtMode = 0;
-                } else if (strcmp(RlmtMode[pAC->Index], "CheckLinkState") == 0) {
-                        pAC->RlmtMode = SK_RLMT_CHECK_LINK;
-                } else if (strcmp(RlmtMode[pAC->Index], "CheckLocalPort") == 0) {
-                        pAC->RlmtMode = SK_RLMT_CHECK_LINK |
-                                        SK_RLMT_CHECK_LOC_LINK;
-                } else if (strcmp(RlmtMode[pAC->Index], "CheckSeg") == 0) {
-                        pAC->RlmtMode = SK_RLMT_CHECK_LINK     |
-                                        SK_RLMT_CHECK_LOC_LINK |
-                                        SK_RLMT_CHECK_SEG;
-                } else if ((strcmp(RlmtMode[pAC->Index], "DualNet") == 0) &&
-                        (pAC->GIni.GIMacsFound == 2)) {
-                        pAC->RlmtMode = SK_RLMT_CHECK_LINK;
-                        pAC->RlmtNets = 2;
-                } else {
-                    printk("sk98lin: Illegal value \"%s\" for"
-                        " RlmtMode, using default\n", 
-                        RlmtMode[pAC->Index]);
-                        pAC->RlmtMode = 0;
-                }
-        } else {
-                pAC->RlmtMode = 0;
-        }
-        
-        /*
-        ** Check the interrupt moderation parameters
-        */
-        if (Moderation[pAC->Index] != NULL) {
-                if (strcmp(Moderation[pAC->Index], "") == 0) {
-                        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
-                } else if (strcmp(Moderation[pAC->Index], "Static") == 0) {
-                        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_STATIC;
-                } else if (strcmp(Moderation[pAC->Index], "Dynamic") == 0) {
-                        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_DYNAMIC;
-                } else if (strcmp(Moderation[pAC->Index], "None") == 0) {
-                        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
-                } else {
-                        printk("sk98lin: Illegal value \"%s\" for Moderation.\n"
-                                "      Disable interrupt moderation.\n",
-                                Moderation[pAC->Index]);
-                        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
-                }
-        } else {
-                pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
-        }
-
-        if (Stats[pAC->Index] != NULL) {
-                if (strcmp(Stats[pAC->Index], "Yes") == 0) {
-                        pAC->DynIrqModInfo.DisplayStats = SK_TRUE;
-                } else {
-                        pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
-                }
-        } else {
-                pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
-        }
-
-        if (ModerationMask[pAC->Index] != NULL) {
-                if (strcmp(ModerationMask[pAC->Index], "Rx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
-                } else if (strcmp(ModerationMask[pAC->Index], "Tx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_ONLY;
-                } else if (strcmp(ModerationMask[pAC->Index], "Sp") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_ONLY;
-                } else if (strcmp(ModerationMask[pAC->Index], "RxSp") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
-                } else if (strcmp(ModerationMask[pAC->Index], "SpRx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
-                } else if (strcmp(ModerationMask[pAC->Index], "RxTx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
-                } else if (strcmp(ModerationMask[pAC->Index], "TxRx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
-                } else if (strcmp(ModerationMask[pAC->Index], "TxSp") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
-                } else if (strcmp(ModerationMask[pAC->Index], "SpTx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
-                } else if (strcmp(ModerationMask[pAC->Index], "RxTxSp") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
-                } else if (strcmp(ModerationMask[pAC->Index], "RxSpTx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
-                } else if (strcmp(ModerationMask[pAC->Index], "TxRxSp") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
-                } else if (strcmp(ModerationMask[pAC->Index], "TxSpRx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
-                } else if (strcmp(ModerationMask[pAC->Index], "SpTxRx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
-                } else if (strcmp(ModerationMask[pAC->Index], "SpRxTx") == 0) {
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
-                } else { /* some rubbish */
-                        pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
-                }
-        } else {  /* operator has stated nothing */
-                pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
-        }
-
-        if (AutoSizing[pAC->Index] != NULL) {
-                if (strcmp(AutoSizing[pAC->Index], "On") == 0) {
-                        pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
-                } else {
-                        pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
-                }
-        } else {  /* operator has stated nothing */
-                pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
-        }
-
-        if (IntsPerSec[pAC->Index] != 0) {
-                if ((IntsPerSec[pAC->Index]< C_INT_MOD_IPS_LOWER_RANGE) || 
-                        (IntsPerSec[pAC->Index] > C_INT_MOD_IPS_UPPER_RANGE)) {
-                        printk("sk98lin: Illegal value \"%d\" for IntsPerSec. (Range: %d - %d)\n"
-                                "      Using default value of %i.\n", 
-                                IntsPerSec[pAC->Index],
-                                C_INT_MOD_IPS_LOWER_RANGE,
-                                C_INT_MOD_IPS_UPPER_RANGE,
-                                C_INTS_PER_SEC_DEFAULT);
-                        pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
-                } else {
-                        pAC->DynIrqModInfo.MaxModIntsPerSec = IntsPerSec[pAC->Index];
-                }
-        } else {
-                pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
-        }
-
-        /*
-        ** Evaluate upper and lower moderation threshold
-        */
-        pAC->DynIrqModInfo.MaxModIntsPerSecUpperLimit =
-                pAC->DynIrqModInfo.MaxModIntsPerSec +
-                (pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
-
-        pAC->DynIrqModInfo.MaxModIntsPerSecLowerLimit =
-                pAC->DynIrqModInfo.MaxModIntsPerSec -
-                (pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
-
-        pAC->DynIrqModInfo.PrevTimeVal = jiffies;  /* initial value */
-
-
-} /* GetConfiguration */
-
-
-/*****************************************************************************
- *
- *      ProductStr - return a adapter identification string from vpd
- *
- * Description:
- *      This function reads the product name string from the vpd area
- *      and puts it the field pAC->DeviceString.
- *
- * Returns: N/A
- */
-static inline int ProductStr(
-        SK_AC   *pAC,           /* pointer to adapter context */
-        char    *DeviceStr,     /* result string */
-        int      StrLen         /* length of the string */
-)
-{
-char    Keyword[] = VPD_NAME;   /* vpd productname identifier */
-int     ReturnCode;             /* return code from vpd_read */
-unsigned long Flags;
-
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        ReturnCode = VpdRead(pAC, pAC->IoBase, Keyword, DeviceStr, &StrLen);
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-
-        return ReturnCode;
-} /* ProductStr */
-
-/*****************************************************************************
- *
- *      StartDrvCleanupTimer - Start timer to check for descriptors which
- *                             might be placed in descriptor ring, but
- *                             havent been handled up to now
- *
- * Description:
- *      This function requests a HW-timer fo the Yukon card. The actions to
- *      perform when this timer expires, are located in the SkDrvEvent().
- *
- * Returns: N/A
- */
-static void
-StartDrvCleanupTimer(SK_AC *pAC) {
-    SK_EVPARA    EventParam;   /* Event struct for timer event */
-
-    SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
-    EventParam.Para32[0] = SK_DRV_RX_CLEANUP_TIMER;
-    SkTimerStart(pAC, pAC->IoBase, &pAC->DrvCleanupTimer,
-                 SK_DRV_RX_CLEANUP_TIMER_LENGTH,
-                 SKGE_DRV, SK_DRV_TIMER, EventParam);
-}
-
-/*****************************************************************************
- *
- *      StopDrvCleanupTimer - Stop timer to check for descriptors
- *
- * Description:
- *      This function requests a HW-timer fo the Yukon card. The actions to
- *      perform when this timer expires, are located in the SkDrvEvent().
- *
- * Returns: N/A
- */
-static void
-StopDrvCleanupTimer(SK_AC *pAC) {
-    SkTimerStop(pAC, pAC->IoBase, &pAC->DrvCleanupTimer);
-    SK_MEMSET((char *) &pAC->DrvCleanupTimer, 0, sizeof(SK_TIMER));
-}
-
-/****************************************************************************/
-/* functions for common modules *********************************************/
-/****************************************************************************/
-
-
-/*****************************************************************************
- *
- *      SkDrvAllocRlmtMbuf - allocate an RLMT mbuf
- *
- * Description:
- *      This routine returns an RLMT mbuf or NULL. The RLMT Mbuf structure
- *      is embedded into a socket buff data area.
- *
- * Context:
- *      runtime
- *
- * Returns:
- *      NULL or pointer to Mbuf.
- */
-SK_MBUF *SkDrvAllocRlmtMbuf(
-SK_AC           *pAC,           /* pointer to adapter context */
-SK_IOC          IoC,            /* the IO-context */
-unsigned        BufferSize)     /* size of the requested buffer */
-{
-SK_MBUF         *pRlmtMbuf;     /* pointer to a new rlmt-mbuf structure */
-struct sk_buff  *pMsgBlock;     /* pointer to a new message block */
-
-        pMsgBlock = alloc_skb(BufferSize + sizeof(SK_MBUF), GFP_ATOMIC);
-        if (pMsgBlock == NULL) {
-                return (NULL);
-        }
-        pRlmtMbuf = (SK_MBUF*) pMsgBlock->data;
-        skb_reserve(pMsgBlock, sizeof(SK_MBUF));
-        pRlmtMbuf->pNext = NULL;
-        pRlmtMbuf->pOs = pMsgBlock;
-        pRlmtMbuf->pData = pMsgBlock->data;     /* Data buffer. */
-        pRlmtMbuf->Size = BufferSize;           /* Data buffer size. */
-        pRlmtMbuf->Length = 0;          /* Length of packet (<= Size). */
-        return (pRlmtMbuf);
-
-} /* SkDrvAllocRlmtMbuf */
-
-
-/*****************************************************************************
- *
- *      SkDrvFreeRlmtMbuf - free an RLMT mbuf
- *
- * Description:
- *      This routine frees one or more RLMT mbuf(s).
- *
- * Context:
- *      runtime
- *
- * Returns:
- *      Nothing
- */
-void  SkDrvFreeRlmtMbuf(
-SK_AC           *pAC,           /* pointer to adapter context */
-SK_IOC          IoC,            /* the IO-context */
-SK_MBUF         *pMbuf)         /* size of the requested buffer */
-{
-SK_MBUF         *pFreeMbuf;
-SK_MBUF         *pNextMbuf;
-
-        pFreeMbuf = pMbuf;
-        do {
-                pNextMbuf = pFreeMbuf->pNext;
-                DEV_KFREE_SKB_ANY(pFreeMbuf->pOs);
-                pFreeMbuf = pNextMbuf;
-        } while ( pFreeMbuf != NULL );
-} /* SkDrvFreeRlmtMbuf */
-
-
-/*****************************************************************************
- *
- *      SkOsGetTime - provide a time value
- *
- * Description:
- *      This routine provides a time value. The unit is 1/HZ (defined by Linux).
- *      It is not used for absolute time, but only for time differences.
- *
- *
- * Returns:
- *      Time value
- */
-SK_U64 SkOsGetTime(SK_AC *pAC)
-{
-        SK_U64  PrivateJiffies;
-        SkOsGetTimeCurrent(pAC, &PrivateJiffies);
-        return PrivateJiffies;
-} /* SkOsGetTime */
-
-
-/*****************************************************************************
- *
- *      SkPciReadCfgDWord - read a 32 bit value from pci config space
- *
- * Description:
- *      This routine reads a 32 bit value from the pci configuration
- *      space.
- *
- * Returns:
- *      0 - indicate everything worked ok.
- *      != 0 - error indication
- */
-int SkPciReadCfgDWord(
-SK_AC *pAC,             /* Adapter Control structure pointer */
-int PciAddr,            /* PCI register address */
-SK_U32 *pVal)           /* pointer to store the read value */
-{
-        pci_read_config_dword(pAC->PciDev, PciAddr, pVal);
-        return(0);
-} /* SkPciReadCfgDWord */
-
-
-/*****************************************************************************
- *
- *      SkPciReadCfgWord - read a 16 bit value from pci config space
- *
- * Description:
- *      This routine reads a 16 bit value from the pci configuration
- *      space.
- *
- * Returns:
- *      0 - indicate everything worked ok.
- *      != 0 - error indication
- */
-int SkPciReadCfgWord(
-SK_AC *pAC,     /* Adapter Control structure pointer */
-int PciAddr,            /* PCI register address */
-SK_U16 *pVal)           /* pointer to store the read value */
-{
-        pci_read_config_word(pAC->PciDev, PciAddr, pVal);
-        return(0);
-} /* SkPciReadCfgWord */
-
-
-/*****************************************************************************
- *
- *      SkPciReadCfgByte - read a 8 bit value from pci config space
- *
- * Description:
- *      This routine reads a 8 bit value from the pci configuration
- *      space.
- *
- * Returns:
- *      0 - indicate everything worked ok.
- *      != 0 - error indication
- */
-int SkPciReadCfgByte(
-SK_AC *pAC,     /* Adapter Control structure pointer */
-int PciAddr,            /* PCI register address */
-SK_U8 *pVal)            /* pointer to store the read value */
-{
-        pci_read_config_byte(pAC->PciDev, PciAddr, pVal);
-        return(0);
-} /* SkPciReadCfgByte */
-
-
-/*****************************************************************************
- *
- *      SkPciWriteCfgWord - write a 16 bit value to pci config space
- *
- * Description:
- *      This routine writes a 16 bit value to the pci configuration
- *      space. The flag PciConfigUp indicates whether the config space
- *      is accesible or must be set up first.
- *
- * Returns:
- *      0 - indicate everything worked ok.
- *      != 0 - error indication
- */
-int SkPciWriteCfgWord(
-SK_AC *pAC,     /* Adapter Control structure pointer */
-int PciAddr,            /* PCI register address */
-SK_U16 Val)             /* pointer to store the read value */
-{
-        pci_write_config_word(pAC->PciDev, PciAddr, Val);
-        return(0);
-} /* SkPciWriteCfgWord */
-
-
-/*****************************************************************************
- *
- *      SkPciWriteCfgWord - write a 8 bit value to pci config space
- *
- * Description:
- *      This routine writes a 8 bit value to the pci configuration
- *      space. The flag PciConfigUp indicates whether the config space
- *      is accesible or must be set up first.
- *
- * Returns:
- *      0 - indicate everything worked ok.
- *      != 0 - error indication
- */
-int SkPciWriteCfgByte(
-SK_AC *pAC,     /* Adapter Control structure pointer */
-int PciAddr,            /* PCI register address */
-SK_U8 Val)              /* pointer to store the read value */
-{
-        pci_write_config_byte(pAC->PciDev, PciAddr, Val);
-        return(0);
-} /* SkPciWriteCfgByte */
-
-
-/*****************************************************************************
- *
- *      SkDrvEvent - handle driver events
- *
- * Description:
- *      This function handles events from all modules directed to the driver
- *
- * Context:
- *      Is called under protection of slow path lock.
- *
- * Returns:
- *      0 if everything ok
- *      < 0  on error
- *      
- */
-int SkDrvEvent(
-SK_AC *pAC,             /* pointer to adapter context */
-SK_IOC IoC,             /* io-context */
-SK_U32 Event,           /* event-id */
-SK_EVPARA Param)        /* event-parameter */
-{
-SK_MBUF         *pRlmtMbuf;     /* pointer to a rlmt-mbuf structure */
-struct sk_buff  *pMsg;          /* pointer to a message block */
-int             FromPort;       /* the port from which we switch away */
-int             ToPort;         /* the port we switch to */
-SK_EVPARA       NewPara;        /* parameter for further events */
-int             Stat;
-unsigned long   Flags;
-SK_BOOL         DualNet;
-
-        switch (Event) {
-        case SK_DRV_ADAP_FAIL:
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("ADAPTER FAIL EVENT\n"));
-                printk("%s: Adapter failed.\n", pAC->dev[0]->name);
-                /* disable interrupts */
-                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-                /* cgoos */
-                break;
-        case SK_DRV_PORT_FAIL:
-                FromPort = Param.Para32[0];
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("PORT FAIL EVENT, Port: %d\n", FromPort));
-                if (FromPort == 0) {
-                        printk("%s: Port A failed.\n", pAC->dev[0]->name);
-                } else {
-                        printk("%s: Port B failed.\n", pAC->dev[1]->name);
-                }
-                /* cgoos */
-                break;
-        case SK_DRV_PORT_RESET:  /* SK_U32 PortIdx */
-                /* action list 4 */
-                FromPort = Param.Para32[0];
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("PORT RESET EVENT, Port: %d ", FromPort));
-                NewPara.Para64 = FromPort;
-                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_XMAC_RESET, NewPara);
-                spin_lock_irqsave(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-
-                SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST);
-                netif_carrier_off(pAC->dev[Param.Para32[0]]);
-                spin_unlock_irqrestore(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-                
-                /* clear rx ring from received frames */
-                ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE);
-                
-                ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
-                spin_lock_irqsave(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-                
-                /* tschilling: Handling of return value inserted. */
-                if (SkGeInitPort(pAC, IoC, FromPort)) {
-                        if (FromPort == 0) {
-                                printk("%s: SkGeInitPort A failed.\n", pAC->dev[0]->name);
-                        } else {
-                                printk("%s: SkGeInitPort B failed.\n", pAC->dev[1]->name);
-                        }
-                }
-                SkAddrMcUpdate(pAC,IoC, FromPort);
-                PortReInitBmu(pAC, FromPort);
-                SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
-                ClearAndStartRx(pAC, FromPort);
-                spin_unlock_irqrestore(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-                break;
-        case SK_DRV_NET_UP:      /* SK_U32 PortIdx */
-        {       struct net_device *dev = pAC->dev[Param.Para32[0]];
-                /* action list 5 */
-                FromPort = Param.Para32[0];
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("NET UP EVENT, Port: %d ", Param.Para32[0]));
-                /* Mac update */
-                SkAddrMcUpdate(pAC,IoC, FromPort);
-
-                if (DoPrintInterfaceChange) {
-                printk("%s: network connection up using"
-                        " port %c\n", pAC->dev[Param.Para32[0]]->name, 'A'+Param.Para32[0]);
-
-                /* tschilling: Values changed according to LinkSpeedUsed. */
-                Stat = pAC->GIni.GP[FromPort].PLinkSpeedUsed;
-                if (Stat == SK_LSPEED_STAT_10MBPS) {
-                        printk("    speed:           10\n");
-                } else if (Stat == SK_LSPEED_STAT_100MBPS) {
-                        printk("    speed:           100\n");
-                } else if (Stat == SK_LSPEED_STAT_1000MBPS) {
-                        printk("    speed:           1000\n");
-                } else {
-                        printk("    speed:           unknown\n");
-                }
-
-
-                Stat = pAC->GIni.GP[FromPort].PLinkModeStatus;
-                if (Stat == SK_LMODE_STAT_AUTOHALF ||
-                        Stat == SK_LMODE_STAT_AUTOFULL) {
-                        printk("    autonegotiation: yes\n");
-                }
-                else {
-                        printk("    autonegotiation: no\n");
-                }
-                if (Stat == SK_LMODE_STAT_AUTOHALF ||
-                        Stat == SK_LMODE_STAT_HALF) {
-                        printk("    duplex mode:     half\n");
-                }
-                else {
-                        printk("    duplex mode:     full\n");
-                }
-                Stat = pAC->GIni.GP[FromPort].PFlowCtrlStatus;
-                if (Stat == SK_FLOW_STAT_REM_SEND ) {
-                        printk("    flowctrl:        remote send\n");
-                }
-                else if (Stat == SK_FLOW_STAT_LOC_SEND ){
-                        printk("    flowctrl:        local send\n");
-                }
-                else if (Stat == SK_FLOW_STAT_SYMMETRIC ){
-                        printk("    flowctrl:        symmetric\n");
-                }
-                else {
-                        printk("    flowctrl:        none\n");
-                }
-                
-                /* tschilling: Check against CopperType now. */
-                if ((pAC->GIni.GICopperType == SK_TRUE) &&
-                        (pAC->GIni.GP[FromPort].PLinkSpeedUsed ==
-                        SK_LSPEED_STAT_1000MBPS)) {
-                        Stat = pAC->GIni.GP[FromPort].PMSStatus;
-                        if (Stat == SK_MS_STAT_MASTER ) {
-                                printk("    role:            master\n");
-                        }
-                        else if (Stat == SK_MS_STAT_SLAVE ) {
-                                printk("    role:            slave\n");
-                        }
-                        else {
-                                printk("    role:            ???\n");
-                        }
-                }
-
-                /* 
-                   Display dim (dynamic interrupt moderation) 
-                   informations
-                 */
-                if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_STATIC)
-                        printk("    irq moderation:  static (%d ints/sec)\n",
-                                        pAC->DynIrqModInfo.MaxModIntsPerSec);
-                else if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_DYNAMIC)
-                        printk("    irq moderation:  dynamic (%d ints/sec)\n",
-                                        pAC->DynIrqModInfo.MaxModIntsPerSec);
-                else
-                        printk("    irq moderation:  disabled\n");
-
-
-                printk("    scatter-gather:  %s\n",
-                       (dev->features & NETIF_F_SG) ? "enabled" : "disabled");
-                printk("    tx-checksum:     %s\n",
-                       (dev->features & NETIF_F_IP_CSUM) ? "enabled" : "disabled");
-                printk("    rx-checksum:     %s\n",
-                       pAC->RxPort[Param.Para32[0]].RxCsum ? "enabled" : "disabled");
-
-                } else {
-                        DoPrintInterfaceChange = SK_TRUE;
-                }
-        
-                if ((Param.Para32[0] != pAC->ActivePort) &&
-                        (pAC->RlmtNets == 1)) {
-                        NewPara.Para32[0] = pAC->ActivePort;
-                        NewPara.Para32[1] = Param.Para32[0];
-                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_SWITCH_INTERN,
-                                NewPara);
-                }
-
-                /* Inform the world that link protocol is up. */
-                netif_carrier_on(dev);
-                break;
-        }
-        case SK_DRV_NET_DOWN:    /* SK_U32 Reason */
-                /* action list 7 */
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("NET DOWN EVENT "));
-                if (DoPrintInterfaceChange) {
-                        printk("%s: network connection down\n", 
-                                pAC->dev[Param.Para32[1]]->name);
-                } else {
-                        DoPrintInterfaceChange = SK_TRUE;
-                }
-                netif_carrier_off(pAC->dev[Param.Para32[1]]);
-                break;
-        case SK_DRV_SWITCH_HARD: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("PORT SWITCH HARD "));
-        case SK_DRV_SWITCH_SOFT: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
-        /* action list 6 */
-                printk("%s: switching to port %c\n", pAC->dev[0]->name,
-                        'A'+Param.Para32[1]);
-        case SK_DRV_SWITCH_INTERN: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
-                FromPort = Param.Para32[0];
-                ToPort = Param.Para32[1];
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("PORT SWITCH EVENT, From: %d  To: %d (Pref %d) ",
-                        FromPort, ToPort, pAC->Rlmt.Net[0].PrefPort));
-                NewPara.Para64 = FromPort;
-                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_XMAC_RESET, NewPara);
-                NewPara.Para64 = ToPort;
-                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_XMAC_RESET, NewPara);
-                spin_lock_irqsave(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-                spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
-                SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_SOFT_RST);
-                SkGeStopPort(pAC, IoC, ToPort, SK_STOP_ALL, SK_SOFT_RST);
-                spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
-                spin_unlock_irqrestore(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-
-                ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE); /* clears rx ring */
-                ReceiveIrq(pAC, &pAC->RxPort[ToPort], SK_FALSE); /* clears rx ring */
-                
-                ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
-                ClearTxRing(pAC, &pAC->TxPort[ToPort][TX_PRIO_LOW]);
-                spin_lock_irqsave(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-                spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
-                pAC->ActivePort = ToPort;
-#if 0
-                SetQueueSizes(pAC);
-#else
-                /* tschilling: New common function with minimum size check. */
-                DualNet = SK_FALSE;
-                if (pAC->RlmtNets == 2) {
-                        DualNet = SK_TRUE;
-                }
-                
-                if (SkGeInitAssignRamToQueues(
-                        pAC,
-                        pAC->ActivePort,
-                        DualNet)) {
-                        spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
-                        spin_unlock_irqrestore(
-                                &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                                Flags);
-                        printk("SkGeInitAssignRamToQueues failed.\n");
-                        break;
-                }
-#endif
-                /* tschilling: Handling of return values inserted. */
-                if (SkGeInitPort(pAC, IoC, FromPort) ||
-                        SkGeInitPort(pAC, IoC, ToPort)) {
-                        printk("%s: SkGeInitPort failed.\n", pAC->dev[0]->name);
-                }
-                if (Event == SK_DRV_SWITCH_SOFT) {
-                        SkMacRxTxEnable(pAC, IoC, FromPort);
-                }
-                SkMacRxTxEnable(pAC, IoC, ToPort);
-                SkAddrSwap(pAC, IoC, FromPort, ToPort);
-                SkAddrMcUpdate(pAC, IoC, FromPort);
-                SkAddrMcUpdate(pAC, IoC, ToPort);
-                PortReInitBmu(pAC, FromPort);
-                PortReInitBmu(pAC, ToPort);
-                SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
-                SkGePollTxD(pAC, IoC, ToPort, SK_TRUE);
-                ClearAndStartRx(pAC, FromPort);
-                ClearAndStartRx(pAC, ToPort);
-                spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
-                spin_unlock_irqrestore(
-                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
-                        Flags);
-                break;
-        case SK_DRV_RLMT_SEND:   /* SK_MBUF *pMb */
-                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                        ("RLS "));
-                pRlmtMbuf = (SK_MBUF*) Param.pParaPtr;
-                pMsg = (struct sk_buff*) pRlmtMbuf->pOs;
-                skb_put(pMsg, pRlmtMbuf->Length);
-                if (XmitFrame(pAC, &pAC->TxPort[pRlmtMbuf->PortIdx][TX_PRIO_LOW],
-                        pMsg) < 0)
-
-                        DEV_KFREE_SKB_ANY(pMsg);
-                break;
-        case SK_DRV_TIMER:
-                if (Param.Para32[0] == SK_DRV_MODERATION_TIMER) {
-                        /*
-                        ** expiration of the moderation timer implies that
-                        ** dynamic moderation is to be applied
-                        */
-                        SkDimStartModerationTimer(pAC);
-                        SkDimModerate(pAC);
-                        if (pAC->DynIrqModInfo.DisplayStats) {
-                            SkDimDisplayModerationSettings(pAC);
-                        }
-                } else if (Param.Para32[0] == SK_DRV_RX_CLEANUP_TIMER) {
-                        /*
-                        ** check if we need to check for descriptors which
-                        ** haven't been handled the last millisecs
-                        */
-                        StartDrvCleanupTimer(pAC);
-                        if (pAC->GIni.GIMacsFound == 2) {
-                                ReceiveIrq(pAC, &pAC->RxPort[1], SK_FALSE);
-                        }
-                        ReceiveIrq(pAC, &pAC->RxPort[0], SK_FALSE);
-                } else {
-                        printk("Expiration of unknown timer\n");
-                }
-                break;
-        default:
-                break;
-        }
-        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-                ("END EVENT "));
-        
-        return (0);
-} /* SkDrvEvent */
-
-
-/*****************************************************************************
- *
- *      SkErrorLog - log errors
- *
- * Description:
- *      This function logs errors to the system buffer and to the console
- *
- * Returns:
- *      0 if everything ok
- *      < 0  on error
- *      
- */
-void SkErrorLog(
-SK_AC   *pAC,
-int     ErrClass,
-int     ErrNum,
-char    *pErrorMsg)
-{
-char    ClassStr[80];
-
-        switch (ErrClass) {
-        case SK_ERRCL_OTHER:
-                strcpy(ClassStr, "Other error");
-                break;
-        case SK_ERRCL_CONFIG:
-                strcpy(ClassStr, "Configuration error");
-                break;
-        case SK_ERRCL_INIT:
-                strcpy(ClassStr, "Initialization error");
-                break;
-        case SK_ERRCL_NORES:
-                strcpy(ClassStr, "Out of resources error");
-                break;
-        case SK_ERRCL_SW:
-                strcpy(ClassStr, "internal Software error");
-                break;
-        case SK_ERRCL_HW:
-                strcpy(ClassStr, "Hardware failure");
-                break;
-        case SK_ERRCL_COMM:
-                strcpy(ClassStr, "Communication error");
-                break;
-        }
-        printk(KERN_INFO "%s: -- ERROR --\n        Class:  %s\n"
-                "        Nr:  0x%x\n        Msg:  %s\n", pAC->dev[0]->name,
-                ClassStr, ErrNum, pErrorMsg);
-
-} /* SkErrorLog */
-
-#ifdef SK_DIAG_SUPPORT
-
-/*****************************************************************************
- *
- *      SkDrvEnterDiagMode - handles DIAG attach request
- *
- * Description:
- *      Notify the kernel to NOT access the card any longer due to DIAG
- *      Deinitialize the Card
- *
- * Returns:
- *      int
- */
-int SkDrvEnterDiagMode(
-SK_AC   *pAc)   /* pointer to adapter context */
-{
-        DEV_NET *pNet = netdev_priv(pAc->dev[0]);
-        SK_AC   *pAC  = pNet->pAC;
-
-        SK_MEMCPY(&(pAc->PnmiBackup), &(pAc->PnmiStruct), 
-                        sizeof(SK_PNMI_STRUCT_DATA));
-
-        pAC->DiagModeActive = DIAG_ACTIVE;
-        if (pAC->BoardLevel > SK_INIT_DATA) {
-                if (netif_running(pAC->dev[0])) {
-                        pAC->WasIfUp[0] = SK_TRUE;
-                        pAC->DiagFlowCtrl = SK_TRUE; /* for SkGeClose      */
-                        DoPrintInterfaceChange = SK_FALSE;
-                        SkDrvDeInitAdapter(pAC, 0);  /* performs SkGeClose */
-                } else {
-                        pAC->WasIfUp[0] = SK_FALSE;
-                }
-                if (pNet != netdev_priv(pAC->dev[1])) {
-                        pNet = netdev_priv(pAC->dev[1]);
-                        if (netif_running(pAC->dev[1])) {
-                                pAC->WasIfUp[1] = SK_TRUE;
-                                pAC->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
-                                DoPrintInterfaceChange = SK_FALSE;
-                                SkDrvDeInitAdapter(pAC, 1);  /* do SkGeClose  */
-                        } else {
-                                pAC->WasIfUp[1] = SK_FALSE;
-                        }
-                }
-                pAC->BoardLevel = SK_INIT_DATA;
-        }
-        return(0);
-}
-
-/*****************************************************************************
- *
- *      SkDrvLeaveDiagMode - handles DIAG detach request
- *
- * Description:
- *      Notify the kernel to may access the card again after use by DIAG
- *      Initialize the Card
- *
- * Returns:
- *      int
- */
-int SkDrvLeaveDiagMode(
-SK_AC   *pAc)   /* pointer to adapter control context */
-{ 
-        SK_MEMCPY(&(pAc->PnmiStruct), &(pAc->PnmiBackup), 
-                        sizeof(SK_PNMI_STRUCT_DATA));
-        pAc->DiagModeActive    = DIAG_NOTACTIVE;
-        pAc->Pnmi.DiagAttached = SK_DIAG_IDLE;
-        if (pAc->WasIfUp[0] == SK_TRUE) {
-                pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
-                DoPrintInterfaceChange = SK_FALSE;
-                SkDrvInitAdapter(pAc, 0);    /* first device  */
-        }
-        if (pAc->WasIfUp[1] == SK_TRUE) {
-                pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
-                DoPrintInterfaceChange = SK_FALSE;
-                SkDrvInitAdapter(pAc, 1);    /* second device */
-        }
-        return(0);
-}
-
-/*****************************************************************************
- *
- *      ParseDeviceNbrFromSlotName - Evaluate PCI device number
- *
- * Description:
- *      This function parses the PCI slot name information string and will
- *      retrieve the devcie number out of it. The slot_name maintianed by
- *      linux is in the form of '02:0a.0', whereas the first two characters 
- *      represent the bus number in hex (in the sample above this is 
- *      pci bus 0x02) and the next two characters the device number (0x0a).
- *
- * Returns:
- *      SK_U32: The device number from the PCI slot name
- */ 
-
-static SK_U32 ParseDeviceNbrFromSlotName(
-const char *SlotName)   /* pointer to pci slot name eg. '02:0a.0' */
-{
-        char    *CurrCharPos    = (char *) SlotName;
-        int     FirstNibble     = -1;
-        int     SecondNibble    = -1;
-        SK_U32  Result          =  0;
-
-        while (*CurrCharPos != '\0') {
-                if (*CurrCharPos == ':') { 
-                        while (*CurrCharPos != '.') {
-                                CurrCharPos++;  
-                                if (    (*CurrCharPos >= '0') && 
-                                        (*CurrCharPos <= '9')) {
-                                        if (FirstNibble == -1) {
-                                                /* dec. value for '0' */
-                                                FirstNibble = *CurrCharPos - 48;
-                                        } else {
-                                                SecondNibble = *CurrCharPos - 48;
-                                        }  
-                                } else if (     (*CurrCharPos >= 'a') && 
-                                                (*CurrCharPos <= 'f')  ) {
-                                        if (FirstNibble == -1) {
-                                                FirstNibble = *CurrCharPos - 87; 
-                                        } else {
-                                                SecondNibble = *CurrCharPos - 87; 
-                                        }
-                                } else {
-                                        Result = 0;
-                                }
-                        }
-
-                        Result = FirstNibble;
-                        Result = Result << 4; /* first nibble is higher one */
-                        Result = Result | SecondNibble;
-                }
-                CurrCharPos++;   /* next character */
-        }
-        return (Result);
-}
-
-/****************************************************************************
- *
- *      SkDrvDeInitAdapter - deinitialize adapter (this function is only 
- *                              called if Diag attaches to that card)
- *
- * Description:
- *      Close initialized adapter.
- *
- * Returns:
- *      0 - on success
- *      error code - on error
- */
-static int SkDrvDeInitAdapter(
-SK_AC   *pAC,           /* pointer to adapter context   */
-int      devNbr)        /* what device is to be handled */
-{
-        struct SK_NET_DEVICE *dev;
-
-        dev = pAC->dev[devNbr];
-
-        /* On Linux 2.6 the network driver does NOT mess with reference
-        ** counts.  The driver MUST be able to be unloaded at any time
-        ** due to the possibility of hotplug.
-        */
-        if (SkGeClose(dev) != 0) {
-                return (-1);
-        }
-        return (0);
-
-} /* SkDrvDeInitAdapter() */
-
-/****************************************************************************
- *
- *      SkDrvInitAdapter - Initialize adapter (this function is only 
- *                              called if Diag deattaches from that card)
- *
- * Description:
- *      Close initialized adapter.
- *
- * Returns:
- *      0 - on success
- *      error code - on error
- */
-static int SkDrvInitAdapter(
-SK_AC   *pAC,           /* pointer to adapter context   */
-int      devNbr)        /* what device is to be handled */
-{
-        struct SK_NET_DEVICE *dev;
-
-        dev = pAC->dev[devNbr];
-
-        if (SkGeOpen(dev) != 0) {
-                return (-1);
-        }
-
-        /*
-        ** Use correct MTU size and indicate to kernel TX queue can be started
-        */ 
-        if (SkGeChangeMtu(dev, dev->mtu) != 0) {
-                return (-1);
-        } 
-        return (0);
-
-} /* SkDrvInitAdapter */
-
-#endif
-
-#ifdef DEBUG
-/****************************************************************************/
-/* "debug only" section *****************************************************/
-/****************************************************************************/
-
-
-/*****************************************************************************
- *
- *      DumpMsg - print a frame
- *
- * Description:
- *      This function prints frames to the system logfile/to the console.
- *
- * Returns: N/A
- *      
- */
-static void DumpMsg(struct sk_buff *skb, char *str)
-{
-        int     msglen;
-
-        if (skb == NULL) {
-                printk("DumpMsg(): NULL-Message\n");
-                return;
-        }
-
-        if (skb->data == NULL) {
-                printk("DumpMsg(): Message empty\n");
-                return;
-        }
-
-        msglen = skb->len;
-        if (msglen > 64)
-                msglen = 64;
-
-        printk("--- Begin of message from %s , len %d (from %d) ----\n", str, msglen, skb->len);
-
-        DumpData((char *)skb->data, msglen);
-
-        printk("------- End of message ---------\n");
-} /* DumpMsg */
-
-
-
-/*****************************************************************************
- *
- *      DumpData - print a data area
- *
- * Description:
- *      This function prints a area of data to the system logfile/to the
- *      console.
- *
- * Returns: N/A
- *      
- */
-static void DumpData(char *p, int size)
-{
-register int    i;
-int     haddr, addr;
-char    hex_buffer[180];
-char    asc_buffer[180];
-char    HEXCHAR[] = "0123456789ABCDEF";
-
-        addr = 0;
-        haddr = 0;
-        hex_buffer[0] = 0;
-        asc_buffer[0] = 0;
-        for (i=0; i < size; ) {
-                if (*p >= '0' && *p <='z')
-                        asc_buffer[addr] = *p;
-                else
-                        asc_buffer[addr] = '.';
-                addr++;
-                asc_buffer[addr] = 0;
-                hex_buffer[haddr] = HEXCHAR[(*p & 0xf0) >> 4];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[*p & 0x0f];
-                haddr++;
-                hex_buffer[haddr] = ' ';
-                haddr++;
-                hex_buffer[haddr] = 0;
-                p++;
-                i++;
-                if (i%16 == 0) {
-                        printk("%s  %s\n", hex_buffer, asc_buffer);
-                        addr = 0;
-                        haddr = 0;
-                }
-        }
-} /* DumpData */
-
-
-/*****************************************************************************
- *
- *      DumpLong - print a data area as long values
- *
- * Description:
- *      This function prints a area of data to the system logfile/to the
- *      console.
- *
- * Returns: N/A
- *      
- */
-static void DumpLong(char *pc, int size)
-{
-register int    i;
-int     haddr, addr;
-char    hex_buffer[180];
-char    asc_buffer[180];
-char    HEXCHAR[] = "0123456789ABCDEF";
-long    *p;
-int     l;
-
-        addr = 0;
-        haddr = 0;
-        hex_buffer[0] = 0;
-        asc_buffer[0] = 0;
-        p = (long*) pc;
-        for (i=0; i < size; ) {
-                l = (long) *p;
-                hex_buffer[haddr] = HEXCHAR[(l >> 28) & 0xf];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[(l >> 24) & 0xf];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[(l >> 20) & 0xf];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[(l >> 16) & 0xf];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[(l >> 12) & 0xf];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[(l >> 8) & 0xf];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[(l >> 4) & 0xf];
-                haddr++;
-                hex_buffer[haddr] = HEXCHAR[l & 0x0f];
-                haddr++;
-                hex_buffer[haddr] = ' ';
-                haddr++;
-                hex_buffer[haddr] = 0;
-                p++;
-                i++;
-                if (i%8 == 0) {
-                        printk("%4x %s\n", (i-8)*4, hex_buffer);
-                        haddr = 0;
-                }
-        }
-        printk("------------------------\n");
-} /* DumpLong */
-
-#endif
-
-static int __devinit skge_probe_one(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
-{
-        SK_AC                   *pAC;
-        DEV_NET                 *pNet = NULL;
-        struct net_device       *dev = NULL;
-        static int boards_found = 0;
-        int error = -ENODEV;
-        int using_dac = 0;
-        char DeviceStr[80];
-
-        if (pci_enable_device(pdev))
-                goto out;
- 
-        /* Configure DMA attributes. */
-        if (sizeof(dma_addr_t) > sizeof(u32) &&
-            !(error = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
-                using_dac = 1;
-                error = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
-                if (error < 0) {
-                        printk(KERN_ERR "sk98lin %s unable to obtain 64 bit DMA "
-                               "for consistent allocations\n", pci_name(pdev));
-                        goto out_disable_device;
-                }
-        } else {
-                error = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-                if (error) {
-                        printk(KERN_ERR "sk98lin %s no usable DMA configuration\n",
-                               pci_name(pdev));
-                        goto out_disable_device;
-                }
-        }
-
-        error = -ENOMEM;
-        dev = alloc_etherdev(sizeof(DEV_NET));
-        if (!dev) {
-                printk(KERN_ERR "sk98lin: unable to allocate etherdev "
-                       "structure!\n");
-                goto out_disable_device;
-        }
-
-        pNet = netdev_priv(dev);
-        pNet->pAC = kzalloc(sizeof(SK_AC), GFP_KERNEL);
-        if (!pNet->pAC) {
-                printk(KERN_ERR "sk98lin: unable to allocate adapter "
-                       "structure!\n");
-                goto out_free_netdev;
-        }
-
-        pAC = pNet->pAC;
-        pAC->PciDev = pdev;
-
-        pAC->dev[0] = dev;
-        pAC->dev[1] = dev;
-        pAC->CheckQueue = SK_FALSE;
-
-        dev->irq = pdev->irq;
-
-        error = SkGeInitPCI(pAC);
-        if (error) {
-                printk(KERN_ERR "sk98lin: PCI setup failed: %i\n", error);
-                goto out_free_netdev;
-        }
-
-        dev->open =             &SkGeOpen;
-        dev->stop =             &SkGeClose;
-        dev->hard_start_xmit =  &SkGeXmit;
-        dev->get_stats =        &SkGeStats;
-        dev->set_multicast_list = &SkGeSetRxMode;
-        dev->set_mac_address =  &SkGeSetMacAddr;
-        dev->do_ioctl =         &SkGeIoctl;
-        dev->change_mtu =       &SkGeChangeMtu;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller =  &SkGePollController;
-#endif
-        SET_NETDEV_DEV(dev, &pdev->dev);
-        SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
-
-        /* Use only if yukon hardware */
-        if (pAC->ChipsetType) {
-#ifdef USE_SK_TX_CHECKSUM
-                dev->features |= NETIF_F_IP_CSUM;
-#endif
-#ifdef SK_ZEROCOPY
-                dev->features |= NETIF_F_SG;
-#endif
-#ifdef USE_SK_RX_CHECKSUM
-                pAC->RxPort[0].RxCsum = 1;
-#endif
-        }
-
-        if (using_dac)
-                dev->features |= NETIF_F_HIGHDMA;
-
-        pAC->Index = boards_found++;
-
-        error = SkGeBoardInit(dev, pAC);
-        if (error)
-                goto out_free_netdev;
-
-        /* Read Adapter name from VPD */
-        if (ProductStr(pAC, DeviceStr, sizeof(DeviceStr)) != 0) {
-                error = -EIO;
-                printk(KERN_ERR "sk98lin: Could not read VPD data.\n");
-                goto out_free_resources;
-        }
-
-        /* Register net device */
-        error = register_netdev(dev);
-        if (error) {
-                printk(KERN_ERR "sk98lin: Could not register device.\n");
-                goto out_free_resources;
-        }
-
-        /* Print adapter specific string from vpd */
-        printk("%s: %s\n", dev->name, DeviceStr);
-
-        /* Print configuration settings */
-        printk("      PrefPort:%c  RlmtMode:%s\n",
-                'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
-                (pAC->RlmtMode==0)  ? "Check Link State" :
-                ((pAC->RlmtMode==1) ? "Check Link State" :
-                ((pAC->RlmtMode==3) ? "Check Local Port" :
-                ((pAC->RlmtMode==7) ? "Check Segmentation" :
-                ((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
-
-        SkGeYellowLED(pAC, pAC->IoBase, 1);
-
-        memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6);
-        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
-        pNet->PortNr = 0;
-        pNet->NetNr  = 0;
-
-        boards_found++;
-
-        pci_set_drvdata(pdev, dev);
-
-        /* More then one port found */
-        if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-                dev = alloc_etherdev(sizeof(DEV_NET));
-                if (!dev) {
-                        printk(KERN_ERR "sk98lin: unable to allocate etherdev "
-                                "structure!\n");
-                        goto single_port;
-                }
-
-                pNet          = netdev_priv(dev);
-                pNet->PortNr  = 1;
-                pNet->NetNr   = 1;
-                pNet->pAC     = pAC;
-
-                dev->open               = &SkGeOpen;
-                dev->stop               = &SkGeClose;
-                dev->hard_start_xmit    = &SkGeXmit;
-                dev->get_stats          = &SkGeStats;
-                dev->set_multicast_list = &SkGeSetRxMode;
-                dev->set_mac_address    = &SkGeSetMacAddr;
-                dev->do_ioctl           = &SkGeIoctl;
-                dev->change_mtu         = &SkGeChangeMtu;
-                SET_NETDEV_DEV(dev, &pdev->dev);
-                SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
-
-                if (pAC->ChipsetType) {
-#ifdef USE_SK_TX_CHECKSUM
-                        dev->features |= NETIF_F_IP_CSUM;
-#endif
-#ifdef SK_ZEROCOPY
-                        dev->features |= NETIF_F_SG;
-#endif
-#ifdef USE_SK_RX_CHECKSUM
-                        pAC->RxPort[1].RxCsum = 1;
-#endif
-                }
-
-                if (using_dac)
-                        dev->features |= NETIF_F_HIGHDMA;
-
-                error = register_netdev(dev);
-                if (error) {
-                        printk(KERN_ERR "sk98lin: Could not register device"
-                               " for second port. (%d)\n", error);
-                        free_netdev(dev);
-                        goto single_port;
-                }
-
-                pAC->dev[1]   = dev;
-                memcpy(&dev->dev_addr,
-                       &pAC->Addr.Net[1].CurrentMacAddress, 6);
-                memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
-                printk("%s: %s\n", dev->name, DeviceStr);
-                printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
-        }
-
-single_port:
-
-        /* Save the hardware revision */
-        pAC->HWRevision = (((pAC->GIni.GIPciHwRev >> 4) & 0x0F)*10) +
-                (pAC->GIni.GIPciHwRev & 0x0F);
-
-        /* Set driver globals */
-        pAC->Pnmi.pDriverFileName    = DRIVER_FILE_NAME;
-        pAC->Pnmi.pDriverReleaseDate = DRIVER_REL_DATE;
-
-        memset(&pAC->PnmiBackup, 0, sizeof(SK_PNMI_STRUCT_DATA));
-        memcpy(&pAC->PnmiBackup, &pAC->PnmiStruct, sizeof(SK_PNMI_STRUCT_DATA));
-
-        return 0;
-
- out_free_resources:
-        FreeResources(dev);
- out_free_netdev:
-        free_netdev(dev);
- out_disable_device:
-        pci_disable_device(pdev);
- out:
-        return error;
-}
-
-static void __devexit skge_remove_one(struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-        struct net_device *otherdev = pAC->dev[1];
-
-        unregister_netdev(dev);
-
-        SkGeYellowLED(pAC, pAC->IoBase, 0);
-
-        if (pAC->BoardLevel == SK_INIT_RUN) {
-                SK_EVPARA EvPara;
-                unsigned long Flags;
-
-                /* board is still alive */
-                spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-                EvPara.Para32[0] = 0;
-                EvPara.Para32[1] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-                EvPara.Para32[0] = 1;
-                EvPara.Para32[1] = -1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-                SkEventDispatcher(pAC, pAC->IoBase);
-                /* disable interrupts */
-                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-                SkGeDeInit(pAC, pAC->IoBase);
-                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-                pAC->BoardLevel = SK_INIT_DATA;
-                /* We do NOT check here, if IRQ was pending, of course*/
-        }
-
-        if (pAC->BoardLevel == SK_INIT_IO) {
-                /* board is still alive */
-                SkGeDeInit(pAC, pAC->IoBase);
-                pAC->BoardLevel = SK_INIT_DATA;
-        }
-
-        FreeResources(dev);
-        free_netdev(dev);
-        if (otherdev != dev)
-                free_netdev(otherdev);
-        kfree(pAC);
-}
-
-#ifdef CONFIG_PM
-static int skge_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-        struct net_device *otherdev = pAC->dev[1];
-
-        if (netif_running(dev)) {
-                netif_carrier_off(dev);
-                DoPrintInterfaceChange = SK_FALSE;
-                SkDrvDeInitAdapter(pAC, 0);  /* performs SkGeClose */
-                netif_device_detach(dev);
-        }
-        if (otherdev != dev) {
-                if (netif_running(otherdev)) {
-                        netif_carrier_off(otherdev);
-                        DoPrintInterfaceChange = SK_FALSE;
-                        SkDrvDeInitAdapter(pAC, 1);  /* performs SkGeClose */
-                        netif_device_detach(otherdev);
-                }
-        }
-
-        pci_save_state(pdev);
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
-        if (pAC->AllocFlag & SK_ALLOC_IRQ) {
-                free_irq(dev->irq, dev);
-        }
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
-        return 0;
-}
-
-static int skge_resume(struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        DEV_NET *pNet = netdev_priv(dev);
-        SK_AC *pAC = pNet->pAC;
-        struct net_device *otherdev = pAC->dev[1];
-        int ret;
-
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-        ret = pci_enable_device(pdev);
-        if (ret) {
-                printk(KERN_WARNING "sk98lin: unable to enable device %s "
-                                "in resume\n", dev->name);
-                goto err_out;
-        }
-        pci_set_master(pdev);
-        if (pAC->GIni.GIMacsFound == 2)
-                ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);
-        else
-                ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED, "sk98lin", dev);
-        if (ret) {
-                printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
-                ret = -EBUSY;
-                goto err_out_disable_pdev;
-        }
-
-        netif_device_attach(dev);
-        if (netif_running(dev)) {
-                DoPrintInterfaceChange = SK_FALSE;
-                SkDrvInitAdapter(pAC, 0);    /* first device  */
-        }
-        if (otherdev != dev) {
-                netif_device_attach(otherdev);
-                if (netif_running(otherdev)) {
-                        DoPrintInterfaceChange = SK_FALSE;
-                        SkDrvInitAdapter(pAC, 1);    /* second device  */
-                }
-        }
-
-        return 0;
-
-err_out_disable_pdev:
-        pci_disable_device(pdev);
-err_out:
-        pAC->AllocFlag &= ~SK_ALLOC_IRQ;
-        dev->irq = 0;
-        return ret;
-}
-#else
-#define skge_suspend NULL
-#define skge_resume NULL
-#endif
-
-static struct pci_device_id skge_pci_tbl[] = {
-#ifdef SK98LIN_ALL_DEVICES
-        { PCI_VENDOR_ID_3COM, 0x1700, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { PCI_VENDOR_ID_3COM, 0x80eb, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-#endif
-#ifdef GENESIS
-        /* Generic SysKonnect SK-98xx Gigabit Ethernet Server Adapter */        
-        { PCI_VENDOR_ID_SYSKONNECT, 0x4300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-#endif
-        /* Generic SysKonnect SK-98xx V2.0 Gigabit Ethernet Adapter */  
-        { PCI_VENDOR_ID_SYSKONNECT, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-#ifdef SK98LIN_ALL_DEVICES
-/* DLink card does not have valid VPD so this driver gags
- *      { PCI_VENDOR_ID_DLINK, 0x4c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- */
-        { PCI_VENDOR_ID_MARVELL, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { PCI_VENDOR_ID_MARVELL, 0x5005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { PCI_VENDOR_ID_CNET, 0x434e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0015, },
-        { PCI_VENDOR_ID_LINKSYS, 0x1064, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-#endif
-        { 0 }
-};
-
-MODULE_DEVICE_TABLE(pci, skge_pci_tbl);
-
-static struct pci_driver skge_driver = {
-        .name           = "sk98lin",
-        .id_table       = skge_pci_tbl,
-        .probe          = skge_probe_one,
-        .remove         = __devexit_p(skge_remove_one),
-        .suspend        = skge_suspend,
-        .resume         = skge_resume,
-};
-
-static int __init skge_init(void)
-{
-        printk(KERN_NOTICE "sk98lin: driver has been replaced by the skge driver"
-               " and is scheduled for removal\n");
-
-        return pci_register_driver(&skge_driver);
-}
-
-static void __exit skge_exit(void)
-{
-        pci_unregister_driver(&skge_driver);
-}
-
-module_init(skge_init);
-module_exit(skge_exit);
diff --git a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c
deleted file mode 100644
index db670993c2df..000000000000
--- a/drivers/net/sk98lin/skgehwt.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgehwt.c
- * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:     $Revision: 1.15 $
- * Date:        $Date: 2003/09/16 13:41:23 $
- * Purpose:     Hardware Timer
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- *      Event queue and dispatcher
- */
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skgehwt.c,v 1.15 2003/09/16 13:41:23 rschmidt Exp $ (C) Marvell.";
-#endif
-
-#include "h/skdrv1st.h"         /* Driver Specific Definitions */
-#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
-
-#ifdef __C2MAN__
-/*
- *   Hardware Timer function queue management.
- */
-intro()
-{}
-#endif
-
-/*
- * Prototypes of local functions.
- */
-#define SK_HWT_MAX      (65000)
-
-/* correction factor */
-#define SK_HWT_FAC      (1000 * (SK_U32)pAC->GIni.GIHstClkFact / 100)
-
-/*
- * Initialize hardware timer.
- *
- * Must be called during init level 1.
- */
-void    SkHwtInit(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  Ioc)    /* IoContext */
-{
-        pAC->Hwt.TStart = 0 ;
-        pAC->Hwt.TStop  = 0 ;
-        pAC->Hwt.TActive = SK_FALSE;
-
-        SkHwtStop(pAC, Ioc);
-}
-
-/*
- *
- * Start hardware timer (clock ticks are 16us).
- *
- */
-void    SkHwtStart(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  Ioc,    /* IoContext */
-SK_U32  Time)   /* Time in units of 16us to load the timer with. */
-{
-        SK_U32  Cnt;
-
-        if (Time > SK_HWT_MAX)
-                Time = SK_HWT_MAX;
-
-        pAC->Hwt.TStart = Time;
-        pAC->Hwt.TStop = 0L;
-
-        Cnt = Time;
-
-        /*
-         * if time < 16 us
-         *      time = 16 us
-         */
-        if (!Cnt) {
-                Cnt++;
-        }
-
-        SK_OUT32(Ioc, B2_TI_INI, Cnt * SK_HWT_FAC);
-        
-        SK_OUT16(Ioc, B2_TI_CTRL, TIM_START);   /* Start timer. */
-
-        pAC->Hwt.TActive = SK_TRUE;
-}
-
-/*
- * Stop hardware timer.
- * and clear the timer IRQ
- */
-void    SkHwtStop(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  Ioc)    /* IoContext */
-{
-        SK_OUT16(Ioc, B2_TI_CTRL, TIM_STOP);
-        
-        SK_OUT16(Ioc, B2_TI_CTRL, TIM_CLR_IRQ);
-
-        pAC->Hwt.TActive = SK_FALSE;
-}
-
-
-/*
- *      Stop hardware timer and read time elapsed since last start.
- *
- * returns
- *      The elapsed time since last start in units of 16us.
- *
- */
-SK_U32  SkHwtRead(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  Ioc)    /* IoContext */
-{
-        SK_U32  TRead;
-        SK_U32  IStatus;
-
-        if (pAC->Hwt.TActive) {
-                
-                SkHwtStop(pAC, Ioc);
-
-                SK_IN32(Ioc, B2_TI_VAL, &TRead);
-                TRead /= SK_HWT_FAC;
-
-                SK_IN32(Ioc, B0_ISRC, &IStatus);
-
-                /* Check if timer expired (or wraped around) */
-                if ((TRead > pAC->Hwt.TStart) || (IStatus & IS_TIMINT)) {
-                        
-                        SkHwtStop(pAC, Ioc);
-                        
-                        pAC->Hwt.TStop = pAC->Hwt.TStart;
-                }
-                else {
-                        
-                        pAC->Hwt.TStop = pAC->Hwt.TStart - TRead;
-                }
-        }
-        return(pAC->Hwt.TStop);
-}
-
-/*
- * interrupt source= timer
- */
-void    SkHwtIsr(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  Ioc)    /* IoContext */
-{
-        SkHwtStop(pAC, Ioc);
-        
-        pAC->Hwt.TStop = pAC->Hwt.TStart;
-        
-        SkTimerDone(pAC, Ioc);
-}
-
-/* End of file */
diff --git a/drivers/net/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c
deleted file mode 100644
index 67f1d6a5c15d..000000000000
--- a/drivers/net/sk98lin/skgeinit.c
+++ /dev/null
@@ -1,2005 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgeinit.c
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.97 $
- * Date:        $Date: 2003/10/02 16:45:31 $
- * Purpose:     Contains functions to initialize the adapter
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#include "h/skdrv1st.h"
-#include "h/skdrv2nd.h"
-
-/* global variables ***********************************************************/
-
-/* local variables ************************************************************/
-
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skgeinit.c,v 1.97 2003/10/02 16:45:31 rschmidt Exp $ (C) Marvell.";
-#endif
-
-struct s_QOffTab {
-        int     RxQOff;         /* Receive Queue Address Offset */
-        int     XsQOff;         /* Sync Tx Queue Address Offset */
-        int     XaQOff;         /* Async Tx Queue Address Offset */
-};
-static struct s_QOffTab QOffTab[] = {
-        {Q_R1, Q_XS1, Q_XA1}, {Q_R2, Q_XS2, Q_XA2}
-};
-
-struct s_Config {
-        char    ScanString[8];
-        SK_U32  Value;
-};
-
-static struct s_Config OemConfig = {
-        {'O','E','M','_','C','o','n','f'},
-#ifdef SK_OEM_CONFIG
-        OEM_CONFIG_VALUE,
-#else
-        0,
-#endif
-};
-
-/******************************************************************************
- *
- *      SkGePollTxD() - Enable / Disable Descriptor Polling of TxD Rings
- *
- * Description:
- *      Enable or disable the descriptor polling of the transmit descriptor
- *      ring(s) (TxD) for port 'Port'.
- *      The new configuration is *not* saved over any SkGeStopPort() and
- *      SkGeInitPort() calls.
- *
- * Returns:
- *      nothing
- */
-void SkGePollTxD(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL PollTxD)        /* SK_TRUE (enable pol.), SK_FALSE (disable pol.) */
-{
-        SK_GEPORT *pPrt;
-        SK_U32  DWord;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        DWord = (SK_U32)(PollTxD ? CSR_ENA_POL : CSR_DIS_POL);
-
-        if (pPrt->PXSQSize != 0) {
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), DWord);
-        }
-        
-        if (pPrt->PXAQSize != 0) {
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), DWord);
-        }
-}       /* SkGePollTxD */
-
-
-/******************************************************************************
- *
- *      SkGeYellowLED() - Switch the yellow LED on or off.
- *
- * Description:
- *      Switch the yellow LED on or off.
- *
- * Note:
- *      This function may be called any time after SkGeInit(Level 1).
- *
- * Returns:
- *      nothing
- */
-void SkGeYellowLED(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             State)          /* yellow LED state, 0 = OFF, 0 != ON */
-{
-        if (State == 0) {
-                /* Switch yellow LED OFF */
-                SK_OUT8(IoC, B0_LED, LED_STAT_OFF);
-        }
-        else {
-                /* Switch yellow LED ON */
-                SK_OUT8(IoC, B0_LED, LED_STAT_ON);
-        }
-}       /* SkGeYellowLED */
-
-
-#if (!defined(SK_SLIM) || defined(GENESIS))
-/******************************************************************************
- *
- *      SkGeXmitLED() - Modify the Operational Mode of a transmission LED.
- *
- * Description:
- *      The Rx or Tx LED which is specified by 'Led' will be
- *      enabled, disabled or switched on in test mode.
- *
- * Note:
- *      'Led' must contain the address offset of the LEDs INI register.
- *
- * Usage:
- *      SkGeXmitLED(pAC, IoC, MR_ADDR(Port, TX_LED_INI), SK_LED_ENA);
- *
- * Returns:
- *      nothing
- */
-void SkGeXmitLED(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Led,            /* offset to the LED Init Value register */
-int             Mode)           /* Mode may be SK_LED_DIS, SK_LED_ENA, SK_LED_TST */
-{
-        SK_U32  LedIni;
-
-        switch (Mode) {
-        case SK_LED_ENA:
-                LedIni = SK_XMIT_DUR * (SK_U32)pAC->GIni.GIHstClkFact / 100;
-                SK_OUT32(IoC, Led + XMIT_LED_INI, LedIni);
-                SK_OUT8(IoC, Led + XMIT_LED_CTRL, LED_START);
-                break;
-        case SK_LED_TST:
-                SK_OUT8(IoC, Led + XMIT_LED_TST, LED_T_ON);
-                SK_OUT32(IoC, Led + XMIT_LED_CNT, 100);
-                SK_OUT8(IoC, Led + XMIT_LED_CTRL, LED_START);
-                break;
-        case SK_LED_DIS:
-        default:
-                /*
-                 * Do NOT stop the LED Timer here. The LED might be
-                 * in on state. But it needs to go off.
-                 */
-                SK_OUT32(IoC, Led + XMIT_LED_CNT, 0);
-                SK_OUT8(IoC, Led + XMIT_LED_TST, LED_T_OFF);
-                break;
-        }
-                        
-        /*
-         * 1000BT: The Transmit LED is driven by the PHY.
-         * But the default LED configuration is used for
-         * Level One and Broadcom PHYs.
-         * (Broadcom: It may be that PHY_B_PEC_EN_LTR has to be set.)
-         * (In this case it has to be added here. But we will see. XXX)
-         */
-}       /* SkGeXmitLED */
-#endif  /* !SK_SLIM || GENESIS */
-
-
-/******************************************************************************
- *
- *      DoCalcAddr() - Calculates the start and the end address of a queue.
- *
- * Description:
- *      This function calculates the start and the end address of a queue.
- *  Afterwards the 'StartVal' is incremented to the next start position.
- *      If the port is already initialized the calculated values
- *      will be checked against the configured values and an
- *      error will be returned, if they are not equal.
- *      If the port is not initialized the values will be written to
- *      *StartAdr and *EndAddr.
- *
- * Returns:
- *      0:      success
- *      1:      configuration error
- */
-static int DoCalcAddr(
-SK_AC           *pAC,                           /* adapter context */
-SK_GEPORT       SK_FAR *pPrt,           /* port index */
-int                     QuSize,                         /* size of the queue to configure in kB */
-SK_U32          SK_FAR *StartVal,       /* start value for address calculation */
-SK_U32          SK_FAR *QuStartAddr,/* start addr to calculate */
-SK_U32          SK_FAR *QuEndAddr)      /* end address to calculate */
-{
-        SK_U32  EndVal;
-        SK_U32  NextStart;
-        int             Rtv;
-
-        Rtv = 0;
-        if (QuSize == 0) {
-                EndVal = *StartVal;
-                NextStart = EndVal;
-        }
-        else {
-                EndVal = *StartVal + ((SK_U32)QuSize * 1024) - 1;
-                NextStart = EndVal + 1;
-        }
-
-        if (pPrt->PState >= SK_PRT_INIT) {
-                if (*StartVal != *QuStartAddr || EndVal != *QuEndAddr) {
-                        Rtv = 1;
-                }
-        }
-        else {
-                *QuStartAddr = *StartVal;
-                *QuEndAddr = EndVal;
-        }
-
-        *StartVal = NextStart;
-        return(Rtv);
-}       /* DoCalcAddr */
-
-/******************************************************************************
- *
- *      SkGeInitAssignRamToQueues() - allocate default queue sizes
- *
- * Description:
- *      This function assigns the memory to the different queues and ports.
- *      When DualNet is set to SK_TRUE all ports get the same amount of memory.
- *  Otherwise the first port gets most of the memory and all the
- *      other ports just the required minimum.
- *      This function can only be called when pAC->GIni.GIRamSize and
- *      pAC->GIni.GIMacsFound have been initialized, usually this happens
- *      at init level 1
- *
- * Returns:
- *      0 - ok
- *      1 - invalid input values
- *      2 - not enough memory
- */
-
-int SkGeInitAssignRamToQueues(
-SK_AC   *pAC,                   /* Adapter context */
-int             ActivePort,             /* Active Port in RLMT mode */
-SK_BOOL DualNet)                /* adapter context */
-{
-        int     i;
-        int     UsedKilobytes;                  /* memory already assigned */
-        int     ActivePortKilobytes;    /* memory available for active port */
-        SK_GEPORT *pGePort;
-
-        UsedKilobytes = 0;
-
-        if (ActivePort >= pAC->GIni.GIMacsFound) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
-                        ("SkGeInitAssignRamToQueues: ActivePort (%d) invalid\n",
-                        ActivePort));
-                return(1);
-        }
-        if (((pAC->GIni.GIMacsFound * (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE)) +
-                ((RAM_QUOTA_SYNC == 0) ? 0 : SK_MIN_TXQ_SIZE)) > pAC->GIni.GIRamSize) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
-                        ("SkGeInitAssignRamToQueues: Not enough memory (%d)\n",
-                         pAC->GIni.GIRamSize));
-                return(2);
-        }
-
-        if (DualNet) {
-                /* every port gets the same amount of memory */
-                ActivePortKilobytes = pAC->GIni.GIRamSize / pAC->GIni.GIMacsFound;
-                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-
-                        pGePort = &pAC->GIni.GP[i];
-                        
-                        /* take away the minimum memory for active queues */
-                        ActivePortKilobytes -= (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE);
-
-                        /* receive queue gets the minimum + 80% of the rest */
-                        pGePort->PRxQSize = (int) (ROUND_QUEUE_SIZE_KB((
-                                ActivePortKilobytes * (unsigned long) RAM_QUOTA_RX) / 100))
-                                + SK_MIN_RXQ_SIZE;
-
-                        ActivePortKilobytes -= (pGePort->PRxQSize - SK_MIN_RXQ_SIZE);
-
-                        /* synchronous transmit queue */
-                        pGePort->PXSQSize = 0;
-
-                        /* asynchronous transmit queue */
-                        pGePort->PXAQSize = (int) ROUND_QUEUE_SIZE_KB(ActivePortKilobytes +
-                                SK_MIN_TXQ_SIZE);
-                }
-        }
-        else {  
-                /* Rlmt Mode or single link adapter */
-
-                /* Set standby queue size defaults for all standby ports */
-                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-
-                        if (i != ActivePort) {
-                                pGePort = &pAC->GIni.GP[i];
-
-                                pGePort->PRxQSize = SK_MIN_RXQ_SIZE;
-                                pGePort->PXAQSize = SK_MIN_TXQ_SIZE;
-                                pGePort->PXSQSize = 0;
-
-                                /* Count used RAM */
-                                UsedKilobytes += pGePort->PRxQSize + pGePort->PXAQSize;
-                        }
-                }
-                /* what's left? */
-                ActivePortKilobytes = pAC->GIni.GIRamSize - UsedKilobytes;
-
-                /* assign it to the active port */
-                /* first take away the minimum memory */
-                ActivePortKilobytes -= (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE);
-                pGePort = &pAC->GIni.GP[ActivePort];
-
-                /* receive queue get's the minimum + 80% of the rest */
-                pGePort->PRxQSize = (int) (ROUND_QUEUE_SIZE_KB((ActivePortKilobytes *
-                        (unsigned long) RAM_QUOTA_RX) / 100)) + SK_MIN_RXQ_SIZE;
-
-                ActivePortKilobytes -= (pGePort->PRxQSize - SK_MIN_RXQ_SIZE);
-
-                /* synchronous transmit queue */
-                pGePort->PXSQSize = 0;
-
-                /* asynchronous transmit queue */
-                pGePort->PXAQSize = (int) ROUND_QUEUE_SIZE_KB(ActivePortKilobytes) +
-                        SK_MIN_TXQ_SIZE;
-        }
-#ifdef VCPU
-        VCPUprintf(0, "PRxQSize=%u, PXSQSize=%u, PXAQSize=%u\n",
-                pGePort->PRxQSize, pGePort->PXSQSize, pGePort->PXAQSize);
-#endif /* VCPU */
-
-        return(0);
-}       /* SkGeInitAssignRamToQueues */
-
-/******************************************************************************
- *
- *      SkGeCheckQSize() - Checks the Adapters Queue Size Configuration
- *
- * Description:
- *      This function verifies the Queue Size Configuration specified
- *      in the variables PRxQSize, PXSQSize, and PXAQSize of all
- *      used ports.
- *      This requirements must be fullfilled to have a valid configuration:
- *              - The size of all queues must not exceed GIRamSize.
- *              - The queue sizes must be specified in units of 8 kB.
- *              - The size of Rx queues of available ports must not be
- *                smaller than 16 kB.
- *              - The size of at least one Tx queue (synch. or asynch.)
- *        of available ports must not be smaller than 16 kB
- *        when Jumbo Frames are used.
- *              - The RAM start and end addresses must not be changed
- *                for ports which are already initialized.
- *      Furthermore SkGeCheckQSize() defines the Start and End Addresses
- *  of all ports and stores them into the HWAC port     structure.
- *
- * Returns:
- *      0:      Queue Size Configuration valid
- *      1:      Queue Size Configuration invalid
- */
-static int SkGeCheckQSize(
-SK_AC    *pAC,          /* adapter context */
-int              Port)          /* port index */
-{
-        SK_GEPORT *pPrt;
-        int     i;
-        int     Rtv;
-        int     Rtv2;
-        SK_U32  StartAddr;
-#ifndef SK_SLIM
-        int     UsedMem;        /* total memory used (max. found ports) */
-#endif  
-
-        Rtv = 0;
-        
-#ifndef SK_SLIM
-
-        UsedMem = 0;
-        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-                pPrt = &pAC->GIni.GP[i];
-
-                if ((pPrt->PRxQSize & QZ_UNITS) != 0 ||
-                        (pPrt->PXSQSize & QZ_UNITS) != 0 ||
-                        (pPrt->PXAQSize & QZ_UNITS) != 0) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E012, SKERR_HWI_E012MSG);
-                        return(1);
-                }
-
-                if (i == Port && pPrt->PRxQSize < SK_MIN_RXQ_SIZE) {
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E011, SKERR_HWI_E011MSG);
-                        return(1);
-                }
-                
-                /*
-                 * the size of at least one Tx queue (synch. or asynch.) has to be > 0.
-                 * if Jumbo Frames are used, this size has to be >= 16 kB.
-                 */
-                if ((i == Port && pPrt->PXSQSize == 0 && pPrt->PXAQSize == 0) ||
-                        (pAC->GIni.GIPortUsage == SK_JUMBO_LINK &&
-            ((pPrt->PXSQSize > 0 && pPrt->PXSQSize < SK_MIN_TXQ_SIZE) ||
-                         (pPrt->PXAQSize > 0 && pPrt->PXAQSize < SK_MIN_TXQ_SIZE)))) {
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E023, SKERR_HWI_E023MSG);
-                                return(1);
-                }
-                
-                UsedMem += pPrt->PRxQSize + pPrt->PXSQSize + pPrt->PXAQSize;
-        }
-        
-        if (UsedMem > pAC->GIni.GIRamSize) {
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E012, SKERR_HWI_E012MSG);
-                return(1);
-        }
-#endif  /* !SK_SLIM */
-
-        /* Now start address calculation */
-        StartAddr = pAC->GIni.GIRamOffs;
-        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-                pPrt = &pAC->GIni.GP[i];
-
-                /* Calculate/Check values for the receive queue */
-                Rtv2 = DoCalcAddr(pAC, pPrt, pPrt->PRxQSize, &StartAddr,
-                        &pPrt->PRxQRamStart, &pPrt->PRxQRamEnd);
-                Rtv |= Rtv2;
-
-                /* Calculate/Check values for the synchronous Tx queue */
-                Rtv2 = DoCalcAddr(pAC, pPrt, pPrt->PXSQSize, &StartAddr,
-                        &pPrt->PXsQRamStart, &pPrt->PXsQRamEnd);
-                Rtv |= Rtv2;
-
-                /* Calculate/Check values for the asynchronous Tx queue */
-                Rtv2 = DoCalcAddr(pAC, pPrt, pPrt->PXAQSize, &StartAddr,
-                        &pPrt->PXaQRamStart, &pPrt->PXaQRamEnd);
-                Rtv |= Rtv2;
-
-                if (Rtv) {
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E013, SKERR_HWI_E013MSG);
-                        return(1);
-                }
-        }
-
-        return(0);
-}       /* SkGeCheckQSize */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkGeInitMacArb() - Initialize the MAC Arbiter
- *
- * Description:
- *      This function initializes the MAC Arbiter.
- *      It must not be called if there is still an
- *      initialized or active port.
- *
- * Returns:
- *      nothing
- */
-static void SkGeInitMacArb(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC)            /* IO context */
-{
-        /* release local reset */
-        SK_OUT16(IoC, B3_MA_TO_CTRL, MA_RST_CLR);
-
-        /* configure timeout values */
-        SK_OUT8(IoC, B3_MA_TOINI_RX1, SK_MAC_TO_53);
-        SK_OUT8(IoC, B3_MA_TOINI_RX2, SK_MAC_TO_53);
-        SK_OUT8(IoC, B3_MA_TOINI_TX1, SK_MAC_TO_53);
-        SK_OUT8(IoC, B3_MA_TOINI_TX2, SK_MAC_TO_53);
-
-        SK_OUT8(IoC, B3_MA_RCINI_RX1, 0);
-        SK_OUT8(IoC, B3_MA_RCINI_RX2, 0);
-        SK_OUT8(IoC, B3_MA_RCINI_TX1, 0);
-        SK_OUT8(IoC, B3_MA_RCINI_TX2, 0);
-
-        /* recovery values are needed for XMAC II Rev. B2 only */
-        /* Fast Output Enable Mode was intended to use with Rev. B2, but now? */
-
-        /*
-         * There is no start or enable button to push, therefore
-         * the MAC arbiter is configured and enabled now.
-         */
-}       /* SkGeInitMacArb */
-
-
-/******************************************************************************
- *
- *      SkGeInitPktArb() - Initialize the Packet Arbiter
- *
- * Description:
- *      This function initializes the Packet Arbiter.
- *      It must not be called if there is still an
- *      initialized or active port.
- *
- * Returns:
- *      nothing
- */
-static void SkGeInitPktArb(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC)            /* IO context */
-{
-        /* release local reset */
-        SK_OUT16(IoC, B3_PA_CTRL, PA_RST_CLR);
-
-        /* configure timeout values */
-        SK_OUT16(IoC, B3_PA_TOINI_RX1, SK_PKT_TO_MAX);
-        SK_OUT16(IoC, B3_PA_TOINI_RX2, SK_PKT_TO_MAX);
-        SK_OUT16(IoC, B3_PA_TOINI_TX1, SK_PKT_TO_MAX);
-        SK_OUT16(IoC, B3_PA_TOINI_TX2, SK_PKT_TO_MAX);
-
-        /*
-         * enable timeout timers if jumbo frames not used
-         * NOTE: the packet arbiter timeout interrupt is needed for
-         * half duplex hangup workaround
-         */
-        if (pAC->GIni.GIPortUsage != SK_JUMBO_LINK) {
-                if (pAC->GIni.GIMacsFound == 1) {
-                        SK_OUT16(IoC, B3_PA_CTRL, PA_ENA_TO_TX1);
-                }
-                else {
-                        SK_OUT16(IoC, B3_PA_CTRL, PA_ENA_TO_TX1 | PA_ENA_TO_TX2);
-                }
-        }
-}       /* SkGeInitPktArb */
-#endif /* GENESIS */
-
-
-/******************************************************************************
- *
- *      SkGeInitMacFifo() - Initialize the MAC FIFOs
- *
- * Description:
- *      Initialize all MAC FIFOs of the specified port
- *
- * Returns:
- *      nothing
- */
-static void SkGeInitMacFifo(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_U16  Word;
-#ifdef VCPU
-        SK_U32  DWord;
-#endif /* VCPU */
-        /*
-         * For each FIFO:
-         *      - release local reset
-         *      - use default value for MAC FIFO size
-         *      - setup defaults for the control register
-         *      - enable the FIFO
-         */
-        
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                /* Configure Rx MAC FIFO */
-                SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_RST_CLR);
-                SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_RX_CTRL_DEF);
-                SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_ENA_OP_MD);
-        
-                /* Configure Tx MAC FIFO */
-                SK_OUT8(IoC, MR_ADDR(Port, TX_MFF_CTRL2), MFF_RST_CLR);
-                SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_TX_CTRL_DEF);
-                SK_OUT8(IoC, MR_ADDR(Port, TX_MFF_CTRL2), MFF_ENA_OP_MD);
-        
-                /* Enable frame flushing if jumbo frames used */
-                if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
-                        SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_ENA_FLUSH);
-                }
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* set Rx GMAC FIFO Flush Mask */
-                SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_MSK), (SK_U16)RX_FF_FL_DEF_MSK);
-                
-                Word = (SK_U16)GMF_RX_CTRL_DEF;
-
-                /* disable Rx GMAC FIFO Flush for YUKON-Lite Rev. A0 only */
-                if (pAC->GIni.GIYukonLite && pAC->GIni.GIChipId == CHIP_ID_YUKON) {
-
-                        Word &= ~GMF_RX_F_FL_ON;
-                }
-                
-                /* Configure Rx MAC FIFO */
-                SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_RST_CLR);
-                SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), Word);
-                
-                /* set Rx GMAC FIFO Flush Threshold (default: 0x0a -> 56 bytes) */
-                SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF);
-                
-                /* Configure Tx MAC FIFO */
-                SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_RST_CLR);
-                SK_OUT16(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U16)GMF_TX_CTRL_DEF);
-                
-#ifdef VCPU
-                SK_IN32(IoC, MR_ADDR(Port, RX_GMF_AF_THR), &DWord);
-                SK_IN32(IoC, MR_ADDR(Port, TX_GMF_AE_THR), &DWord);
-#endif /* VCPU */
-                
-                /* set Tx GMAC FIFO Almost Empty Threshold */
-/*              SK_OUT32(IoC, MR_ADDR(Port, TX_GMF_AE_THR), 0); */
-        }
-#endif /* YUKON */
-
-}       /* SkGeInitMacFifo */
-
-#ifdef  SK_LNK_SYNC_CNT
-/******************************************************************************
- *
- *      SkGeLoadLnkSyncCnt() - Load the Link Sync Counter and starts counting
- *
- * Description:
- *      This function starts the Link Sync Counter of the specified
- *      port and enables the generation of an Link Sync IRQ.
- *      The Link Sync Counter may be used to detect an active link,
- *      if autonegotiation is not used.
- *
- * Note:
- *      o To ensure receiving the Link Sync Event the LinkSyncCounter
- *        should be initialized BEFORE clearing the XMAC's reset!
- *      o Enable IS_LNK_SYNC_M1 and IS_LNK_SYNC_M2 after calling this
- *        function.
- *
- * Returns:
- *      nothing
- */
-void SkGeLoadLnkSyncCnt(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_U32  CntVal)         /* Counter value */
-{
-        SK_U32  OrgIMsk;
-        SK_U32  NewIMsk;
-        SK_U32  ISrc;
-        SK_BOOL IrqPend;
-
-        /* stop counter */
-        SK_OUT8(IoC, MR_ADDR(Port, LNK_SYNC_CTRL), LED_STOP);
-
-        /*
-         * ASIC problem:
-         * Each time starting the Link Sync Counter an IRQ is generated
-         * by the adapter. See problem report entry from 21.07.98
-         *
-         * Workaround:  Disable Link Sync IRQ and clear the unexpeced IRQ
-         *              if no IRQ is already pending.
-         */
-        IrqPend = SK_FALSE;
-        SK_IN32(IoC, B0_ISRC, &ISrc);
-        SK_IN32(IoC, B0_IMSK, &OrgIMsk);
-        if (Port == MAC_1) {
-                NewIMsk = OrgIMsk & ~IS_LNK_SYNC_M1;
-                if ((ISrc & IS_LNK_SYNC_M1) != 0) {
-                        IrqPend = SK_TRUE;
-                }
-        }
-        else {
-                NewIMsk = OrgIMsk & ~IS_LNK_SYNC_M2;
-                if ((ISrc & IS_LNK_SYNC_M2) != 0) {
-                        IrqPend = SK_TRUE;
-                }
-        }
-        if (!IrqPend) {
-                SK_OUT32(IoC, B0_IMSK, NewIMsk);
-        }
-
-        /* load counter */
-        SK_OUT32(IoC, MR_ADDR(Port, LNK_SYNC_INI), CntVal);
-
-        /* start counter */
-        SK_OUT8(IoC, MR_ADDR(Port, LNK_SYNC_CTRL), LED_START);
-
-        if (!IrqPend) {
-                /* clear the unexpected IRQ, and restore the interrupt mask */
-                SK_OUT8(IoC, MR_ADDR(Port, LNK_SYNC_CTRL), LED_CLR_IRQ);
-                SK_OUT32(IoC, B0_IMSK, OrgIMsk);
-        }
-}       /* SkGeLoadLnkSyncCnt*/
-#endif  /* SK_LNK_SYNC_CNT */
-
-#if defined(SK_DIAG) || defined(SK_CFG_SYNC)
-/******************************************************************************
- *
- *      SkGeCfgSync() - Configure synchronous bandwidth for this port.
- *
- * Description:
- *      This function may be used to configure synchronous bandwidth
- *      to the specified port. This may be done any time after
- *      initializing the port. The configuration values are NOT saved
- *      in the HWAC port structure and will be overwritten any
- *      time when stopping and starting the port.
- *      Any values for the synchronous configuration will be ignored
- *      if the size of the synchronous queue is zero!
- *
- *      The default configuration for the synchronous service is
- *      TXA_ENA_FSYNC. This means if the size of
- *      the synchronous queue is unequal zero but no specific
- *      synchronous bandwidth is configured, the synchronous queue
- *      will always have the 'unlimited' transmit priority!
- *
- *      This mode will be restored if the synchronous bandwidth is
- *      deallocated ('IntTime' = 0 and 'LimCount' = 0).
- *
- * Returns:
- *      0:      success
- *      1:      parameter configuration error
- *      2:      try to configure quality of service although no
- *              synchronous queue is configured
- */
-int SkGeCfgSync(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_U32  IntTime,        /* Interval Timer Value in units of 8ns */
-SK_U32  LimCount,       /* Number of bytes to transfer during IntTime */
-int             SyncMode)       /* Sync Mode: TXA_ENA_ALLOC | TXA_DIS_ALLOC | 0 */
-{
-        int Rtv;
-
-        Rtv = 0;
-
-        /* check the parameters */
-        if (LimCount > IntTime ||
-                (LimCount == 0 && IntTime != 0) ||
-                (LimCount != 0 && IntTime == 0)) {
-
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E010, SKERR_HWI_E010MSG);
-                return(1);
-        }
-        
-        if (pAC->GIni.GP[Port].PXSQSize == 0) {
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E009, SKERR_HWI_E009MSG);
-                return(2);
-        }
-        
-        /* calculate register values */
-        IntTime = (IntTime / 2) * pAC->GIni.GIHstClkFact / 100;
-        LimCount = LimCount / 8;
-        
-        if (IntTime > TXA_MAX_VAL || LimCount > TXA_MAX_VAL) {
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E010, SKERR_HWI_E010MSG);
-                return(1);
-        }
-
-        /*
-         * - Enable 'Force Sync' to ensure the synchronous queue
-         *   has the priority while configuring the new values.
-         * - Also 'disable alloc' to ensure the settings complies
-         *   to the SyncMode parameter.
-         * - Disable 'Rate Control' to configure the new values.
-         * - write IntTime and LimCount
-         * - start 'Rate Control' and disable 'Force Sync'
-         *   if Interval Timer or Limit Counter not zero.
-         */
-        SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL),
-                TXA_ENA_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);
-        
-        SK_OUT32(IoC, MR_ADDR(Port, TXA_ITI_INI), IntTime);
-        SK_OUT32(IoC, MR_ADDR(Port, TXA_LIM_INI), LimCount);
-        
-        SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL),
-                (SK_U8)(SyncMode & (TXA_ENA_ALLOC | TXA_DIS_ALLOC)));
-        
-        if (IntTime != 0 || LimCount != 0) {
-                SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL), TXA_DIS_FSYNC | TXA_START_RC);
-        }
-
-        return(0);
-}       /* SkGeCfgSync */
-#endif /* SK_DIAG || SK_CFG_SYNC*/
-
-
-/******************************************************************************
- *
- *      DoInitRamQueue() - Initialize the RAM Buffer Address of a single Queue
- *
- * Desccription:
- *      If the queue is used, enable and initialize it.
- *      Make sure the queue is still reset, if it is not used.
- *
- * Returns:
- *      nothing
- */
-static void DoInitRamQueue(
-SK_AC   *pAC,                   /* adapter context */
-SK_IOC  IoC,                    /* IO context */
-int             QuIoOffs,               /* Queue IO Address Offset */
-SK_U32  QuStartAddr,    /* Queue Start Address */
-SK_U32  QuEndAddr,              /* Queue End Address */
-int             QuType)                 /* Queue Type (SK_RX_SRAM_Q|SK_RX_BRAM_Q|SK_TX_RAM_Q) */
-{
-        SK_U32  RxUpThresVal;
-        SK_U32  RxLoThresVal;
-
-        if (QuStartAddr != QuEndAddr) {
-                /* calculate thresholds, assume we have a big Rx queue */
-                RxUpThresVal = (QuEndAddr + 1 - QuStartAddr - SK_RB_ULPP) / 8;
-                RxLoThresVal = (QuEndAddr + 1 - QuStartAddr - SK_RB_LLPP_B)/8;
-
-                /* build HW address format */
-                QuStartAddr = QuStartAddr / 8;
-                QuEndAddr = QuEndAddr / 8;
-
-                /* release local reset */
-                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_RST_CLR);
-
-                /* configure addresses */
-                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_START), QuStartAddr);
-                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_END), QuEndAddr);
-                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_WP), QuStartAddr);
-                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_RP), QuStartAddr);
-
-                switch (QuType) {
-                case SK_RX_SRAM_Q:
-                        /* configure threshold for small Rx Queue */
-                        RxLoThresVal += (SK_RB_LLPP_B - SK_RB_LLPP_S) / 8;
-
-                        /* continue with SK_RX_BRAM_Q */
-                case SK_RX_BRAM_Q:
-                        /* write threshold for Rx Queue */
-
-                        SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_RX_UTPP), RxUpThresVal);
-                        SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_RX_LTPP), RxLoThresVal);
-
-                        /* the high priority threshold not used */
-                        break;
-                case SK_TX_RAM_Q:
-                        /*
-                         * Do NOT use Store & Forward under normal operation due to
-                         * performance optimization (GENESIS only).
-                         * But if Jumbo Frames are configured (XMAC Tx FIFO is only 4 kB)
-                         * or YUKON is used ((GMAC Tx FIFO is only 1 kB)
-                         * we NEED Store & Forward of the RAM buffer.
-                         */
-                        if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK ||
-                                pAC->GIni.GIYukon) {
-                                /* enable Store & Forward Mode for the Tx Side */
-                                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_ENA_STFWD);
-                        }
-                        break;
-                }
-
-                /* set queue operational */
-                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_ENA_OP_MD);
-        }
-        else {
-                /* ensure the queue is still disabled */
-                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_RST_SET);
-        }
-}       /* DoInitRamQueue */
-
-
-/******************************************************************************
- *
- *      SkGeInitRamBufs() - Initialize the RAM Buffer Queues
- *
- * Description:
- *      Initialize all RAM Buffer Queues of the specified port
- *
- * Returns:
- *      nothing
- */
-static void SkGeInitRamBufs(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT *pPrt;
-        int RxQType;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PRxQSize == SK_MIN_RXQ_SIZE) {
-                RxQType = SK_RX_SRAM_Q;         /* small Rx Queue */
-        }
-        else {
-                RxQType = SK_RX_BRAM_Q;         /* big Rx Queue */
-        }
-
-        DoInitRamQueue(pAC, IoC, pPrt->PRxQOff, pPrt->PRxQRamStart,
-                pPrt->PRxQRamEnd, RxQType);
-        
-        DoInitRamQueue(pAC, IoC, pPrt->PXsQOff, pPrt->PXsQRamStart,
-                pPrt->PXsQRamEnd, SK_TX_RAM_Q);
-        
-        DoInitRamQueue(pAC, IoC, pPrt->PXaQOff, pPrt->PXaQRamStart,
-                pPrt->PXaQRamEnd, SK_TX_RAM_Q);
-
-}       /* SkGeInitRamBufs */
-
-
-/******************************************************************************
- *
- *      SkGeInitRamIface() - Initialize the RAM Interface
- *
- * Description:
- *      This function initializes the Adapters RAM Interface.
- *
- * Note:
- *      This function is used in the diagnostics.
- *
- * Returns:
- *      nothing
- */
-static void SkGeInitRamIface(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC)            /* IO context */
-{
-        /* release local reset */
-        SK_OUT16(IoC, B3_RI_CTRL, RI_RST_CLR);
-
-        /* configure timeout values */
-        SK_OUT8(IoC, B3_RI_WTO_R1, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_WTO_XA1, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_WTO_XS1, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_RTO_R1, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_RTO_XA1, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_RTO_XS1, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_WTO_R2, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_WTO_XA2, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_WTO_XS2, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_RTO_R2, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_RTO_XA2, SK_RI_TO_53);
-        SK_OUT8(IoC, B3_RI_RTO_XS2, SK_RI_TO_53);
-
-}       /* SkGeInitRamIface */
-
-
-/******************************************************************************
- *
- *      SkGeInitBmu() - Initialize the BMU state machines
- *
- * Description:
- *      Initialize all BMU state machines of the specified port
- *
- * Returns:
- *      nothing
- */
-static void SkGeInitBmu(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U32          RxWm;
-        SK_U32          TxWm;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        RxWm = SK_BMU_RX_WM;
-        TxWm = SK_BMU_TX_WM;
-        
-        if (!pAC->GIni.GIPciSlot64 && !pAC->GIni.GIPciClock66) {
-                /* for better performance */
-                RxWm /= 2;
-                TxWm /= 2;
-        }
-
-        /* Rx Queue: Release all local resets and set the watermark */
-        SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_CLR_RESET);
-        SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_F), RxWm);
-
-        /*
-         * Tx Queue: Release all local resets if the queue is used !
-         *              set watermark
-         */
-        if (pPrt->PXSQSize != 0) {
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_CLR_RESET);
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_F), TxWm);
-        }
-        
-        if (pPrt->PXAQSize != 0) {
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_CLR_RESET);
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_F), TxWm);
-        }
-        /*
-         * Do NOT enable the descriptor poll timers here, because
-         * the descriptor addresses are not specified yet.
-         */
-}       /* SkGeInitBmu */
-
-
-/******************************************************************************
- *
- *      TestStopBit() - Test the stop bit of the queue
- *
- * Description:
- *      Stopping a queue is not as simple as it seems to be.
- *      If descriptor polling is enabled, it may happen
- *      that RX/TX stop is done and SV idle is NOT set.
- *      In this case we have to issue another stop command.
- *
- * Returns:
- *      The queues control status register
- */
-static SK_U32 TestStopBit(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             QuIoOffs)       /* Queue IO Address Offset */
-{
-        SK_U32  QuCsr;  /* CSR contents */
-
-        SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
-        
-        if ((QuCsr & (CSR_STOP | CSR_SV_IDLE)) == 0) {
-                /* Stop Descriptor overridden by start command */
-                SK_OUT32(IoC, Q_ADDR(QuIoOffs, Q_CSR), CSR_STOP);
-
-                SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
-        }
-        
-        return(QuCsr);
-}       /* TestStopBit */
-
-
-/******************************************************************************
- *
- *      SkGeStopPort() - Stop the Rx/Tx activity of the port 'Port'.
- *
- * Description:
- *      After calling this function the descriptor rings and Rx and Tx
- *      queues of this port may be reconfigured.
- *
- *      It is possible to stop the receive and transmit path separate or
- *      both together.
- *
- *      Dir =   SK_STOP_TX      Stops the transmit path only and resets the MAC.
- *                              The receive queue is still active and
- *                              the pending Rx frames may be still transferred
- *                              into the RxD.
- *              SK_STOP_RX      Stop the receive path. The tansmit path
- *                              has to be stopped once before.
- *              SK_STOP_ALL     SK_STOP_TX + SK_STOP_RX
- *
- *      RstMode = SK_SOFT_RST   Resets the MAC. The PHY is still alive.
- *                      SK_HARD_RST     Resets the MAC and the PHY.
- *
- * Example:
- *      1) A Link Down event was signaled for a port. Therefore the activity
- *      of this port should be stopped and a hardware reset should be issued
- *      to enable the workaround of XMAC Errata #2. But the received frames
- *      should not be discarded.
- *              ...
- *              SkGeStopPort(pAC, IoC, Port, SK_STOP_TX, SK_HARD_RST);
- *              (transfer all pending Rx frames)
- *              SkGeStopPort(pAC, IoC, Port, SK_STOP_RX, SK_HARD_RST);
- *              ...
- *
- *      2) An event was issued which request the driver to switch
- *      the 'virtual active' link to an other already active port
- *      as soon as possible. The frames in the receive queue of this
- *      port may be lost. But the PHY must not be reset during this
- *      event.
- *              ...
- *              SkGeStopPort(pAC, IoC, Port, SK_STOP_ALL, SK_SOFT_RST);
- *              ...
- *
- * Extended Description:
- *      If SK_STOP_TX is set,
- *              o disable the MAC's receive and transmitter to prevent
- *                from sending incomplete frames
- *              o stop the port's transmit queues before terminating the
- *                BMUs to prevent from performing incomplete PCI cycles
- *                on the PCI bus
- *              - The network Rx and Tx activity and PCI Tx transfer is
- *                disabled now.
- *              o reset the MAC depending on the RstMode
- *              o Stop Interval Timer and Limit Counter of Tx Arbiter,
- *                also disable Force Sync bit and Enable Alloc bit.
- *              o perform a local reset of the port's Tx path
- *                      - reset the PCI FIFO of the async Tx queue
- *                      - reset the PCI FIFO of the sync Tx queue
- *                      - reset the RAM Buffer async Tx queue
- *                      - reset the RAM Buffer sync Tx queue
- *                      - reset the MAC Tx FIFO
- *              o switch Link and Tx LED off, stop the LED counters
- *
- *      If SK_STOP_RX is set,
- *              o stop the port's receive queue
- *              - The path data transfer activity is fully stopped now.
- *              o perform a local reset of the port's Rx path
- *                      - reset the PCI FIFO of the Rx queue
- *                      - reset the RAM Buffer receive queue
- *                      - reset the MAC Rx FIFO
- *              o switch Rx LED off, stop the LED counter
- *
- *      If all ports are stopped,
- *              o reset the RAM Interface.
- *
- * Notes:
- *      o This function may be called during the driver states RESET_PORT and
- *        SWITCH_PORT.
- */
-void SkGeStopPort(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* I/O context */
-int             Port,   /* port to stop (MAC_1 + n) */
-int             Dir,    /* Direction to Stop (SK_STOP_RX, SK_STOP_TX, SK_STOP_ALL) */
-int             RstMode)/* Reset Mode (SK_SOFT_RST, SK_HARD_RST) */
-{
-#ifndef SK_DIAG
-        SK_EVPARA Para;
-#endif /* !SK_DIAG */
-        SK_GEPORT *pPrt;
-        SK_U32  DWord;
-        SK_U32  XsCsr;
-        SK_U32  XaCsr;
-        SK_U64  ToutStart;
-        int             i;
-        int             ToutCnt;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if ((Dir & SK_STOP_TX) != 0) {
-                /* disable receiver and transmitter */
-                SkMacRxTxDisable(pAC, IoC, Port);
-                
-                /* stop both transmit queues */
-                /*
-                 * If the BMU is in the reset state CSR_STOP will terminate
-                 * immediately.
-                 */
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_STOP);
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_STOP);
-
-                ToutStart = SkOsGetTime(pAC);
-                ToutCnt = 0;
-                do {
-                        /*
-                         * Clear packet arbiter timeout to make sure
-                         * this loop will terminate.
-                         */
-                        SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
-                                PA_CLR_TO_TX1 : PA_CLR_TO_TX2));
-
-                        /*
-                         * If the transfer stucks at the MAC the STOP command will not
-                         * terminate if we don't flush the XMAC's transmit FIFO !
-                         */
-                        SkMacFlushTxFifo(pAC, IoC, Port);
-
-                        XsCsr = TestStopBit(pAC, IoC, pPrt->PXsQOff);
-                        XaCsr = TestStopBit(pAC, IoC, pPrt->PXaQOff);
-
-                        if (SkOsGetTime(pAC) - ToutStart > (SK_TICKS_PER_SEC / 18)) {
-                                /*
-                                 * Timeout of 1/18 second reached.
-                                 * This needs to be checked at 1/18 sec only.
-                                 */
-                                ToutCnt++;
-                                if (ToutCnt > 1) {
-                                        /* Might be a problem when the driver event handler
-                                         * calls StopPort again. XXX.
-                                         */
-
-                                        /* Fatal Error, Loop aborted */
-                                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E018,
-                                                SKERR_HWI_E018MSG);
-#ifndef SK_DIAG
-                                        Para.Para64 = Port;
-                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-#endif /* !SK_DIAG */
-                                        return;
-                                }
-                                /*
-                                 * Cache incoherency workaround: Assume a start command
-                                 * has been lost while sending the frame.
-                                 */
-                                ToutStart = SkOsGetTime(pAC);
-
-                                if ((XsCsr & CSR_STOP) != 0) {
-                                        SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_START);
-                                }
-                                if ((XaCsr & CSR_STOP) != 0) {
-                                        SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_START);
-                                }
-                        }
-
-                        /*
-                         * Because of the ASIC problem report entry from 21.08.1998 it is
-                         * required to wait until CSR_STOP is reset and CSR_SV_IDLE is set.
-                         */
-                } while ((XsCsr & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE ||
-                                 (XaCsr & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE);
-
-                /* Reset the MAC depending on the RstMode */
-                if (RstMode == SK_SOFT_RST) {
-                        SkMacSoftRst(pAC, IoC, Port);
-                }
-                else {
-                        SkMacHardRst(pAC, IoC, Port);
-                }
-                
-                /* Disable Force Sync bit and Enable Alloc bit */
-                SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL),
-                        TXA_DIS_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);
-                
-                /* Stop Interval Timer and Limit Counter of Tx Arbiter */
-                SK_OUT32(IoC, MR_ADDR(Port, TXA_ITI_INI), 0L);
-                SK_OUT32(IoC, MR_ADDR(Port, TXA_LIM_INI), 0L);
-
-                /* Perform a local reset of the port's Tx path */
-
-                /* Reset the PCI FIFO of the async Tx queue */
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_SET_RESET);
-                /* Reset the PCI FIFO of the sync Tx queue */
-                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_SET_RESET);
-                /* Reset the RAM Buffer async Tx queue */
-                SK_OUT8(IoC, RB_ADDR(pPrt->PXaQOff, RB_CTRL), RB_RST_SET);
-                /* Reset the RAM Buffer sync Tx queue */
-                SK_OUT8(IoC, RB_ADDR(pPrt->PXsQOff, RB_CTRL), RB_RST_SET);
-                
-                /* Reset Tx MAC FIFO */
-#ifdef GENESIS
-                if (pAC->GIni.GIGenesis) {
-                        /* Note: MFF_RST_SET does NOT reset the XMAC ! */
-                        SK_OUT8(IoC, MR_ADDR(Port, TX_MFF_CTRL2), MFF_RST_SET);
-
-                        /* switch Link and Tx LED off, stop the LED counters */
-                        /* Link LED is switched off by the RLMT and the Diag itself */
-                        SkGeXmitLED(pAC, IoC, MR_ADDR(Port, TX_LED_INI), SK_LED_DIS);
-                }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-                if (pAC->GIni.GIYukon) {
-                        /* Reset TX MAC FIFO */
-                        SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
-                }
-#endif /* YUKON */
-        }
-
-        if ((Dir & SK_STOP_RX) != 0) {
-                /*
-                 * The RX Stop Command will not terminate if no buffers
-                 * are queued in the RxD ring. But it will always reach
-                 * the Idle state. Therefore we can use this feature to
-                 * stop the transfer of received packets.
-                 */
-                /* stop the port's receive queue */
-                SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_STOP);
-                
-                i = 100;
-                do {
-                        /*
-                         * Clear packet arbiter timeout to make sure
-                         * this loop will terminate
-                         */
-                        SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
-                                PA_CLR_TO_RX1 : PA_CLR_TO_RX2));
-
-                        DWord = TestStopBit(pAC, IoC, pPrt->PRxQOff);
-
-                        /* timeout if i==0 (bug fix for #10748) */
-                        if (--i == 0) {
-                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E024,
-                                        SKERR_HWI_E024MSG);
-                                break;
-                        }
-                        /*
-                         * because of the ASIC problem report entry from 21.08.98
-                         * it is required to wait until CSR_STOP is reset and
-                         * CSR_SV_IDLE is set.
-                         */
-                } while ((DWord & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE);
-
-                /* The path data transfer activity is fully stopped now */
-
-                /* Perform a local reset of the port's Rx path */
-
-                 /*     Reset the PCI FIFO of the Rx queue */
-                SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_SET_RESET);
-                /* Reset the RAM Buffer receive queue */
-                SK_OUT8(IoC, RB_ADDR(pPrt->PRxQOff, RB_CTRL), RB_RST_SET);
-
-                /* Reset Rx MAC FIFO */
-#ifdef GENESIS
-                if (pAC->GIni.GIGenesis) {
-                        
-                        SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_RST_SET);
-
-                        /* switch Rx LED off, stop the LED counter */
-                        SkGeXmitLED(pAC, IoC, MR_ADDR(Port, RX_LED_INI), SK_LED_DIS);
-                }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-                if (pAC->GIni.GIYukon) {
-                        /* Reset Rx MAC FIFO */
-                        SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
-                }
-#endif /* YUKON */
-        }
-}       /* SkGeStopPort */
-
-
-/******************************************************************************
- *
- *      SkGeInit0() - Level 0 Initialization
- *
- * Description:
- *      - Initialize the BMU address offsets
- *
- * Returns:
- *      nothing
- */
-static void SkGeInit0(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC)            /* IO context */
-{
-        int i;
-        SK_GEPORT *pPrt;
-
-        for (i = 0; i < SK_MAX_MACS; i++) {
-                pPrt = &pAC->GIni.GP[i];
-
-                pPrt->PState = SK_PRT_RESET;
-                pPrt->PRxQOff = QOffTab[i].RxQOff;
-                pPrt->PXsQOff = QOffTab[i].XsQOff;
-                pPrt->PXaQOff = QOffTab[i].XaQOff;
-                pPrt->PCheckPar = SK_FALSE;
-                pPrt->PIsave = 0;
-                pPrt->PPrevShorts = 0;
-                pPrt->PLinkResCt = 0;
-                pPrt->PAutoNegTOCt = 0;
-                pPrt->PPrevRx = 0;
-                pPrt->PPrevFcs = 0;
-                pPrt->PRxLim = SK_DEF_RX_WA_LIM;
-                pPrt->PLinkMode = (SK_U8)SK_LMODE_AUTOFULL;
-                pPrt->PLinkSpeedCap = (SK_U8)SK_LSPEED_CAP_1000MBPS;
-                pPrt->PLinkSpeed = (SK_U8)SK_LSPEED_1000MBPS;
-                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_UNKNOWN;
-                pPrt->PLinkModeConf = (SK_U8)SK_LMODE_AUTOSENSE;
-                pPrt->PFlowCtrlMode = (SK_U8)SK_FLOW_MODE_SYM_OR_REM;
-                pPrt->PLinkCap = (SK_U8)(SK_LMODE_CAP_HALF | SK_LMODE_CAP_FULL |
-                        SK_LMODE_CAP_AUTOHALF | SK_LMODE_CAP_AUTOFULL);
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
-                pPrt->PFlowCtrlCap = (SK_U8)SK_FLOW_MODE_SYM_OR_REM;
-                pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
-                pPrt->PMSCap = 0;
-                pPrt->PMSMode = (SK_U8)SK_MS_MODE_AUTO;
-                pPrt->PMSStatus = (SK_U8)SK_MS_STAT_UNSET;
-                pPrt->PLipaAutoNeg = (SK_U8)SK_LIPA_UNKNOWN;
-                pPrt->PAutoNegFail = SK_FALSE;
-                pPrt->PHWLinkUp = SK_FALSE;
-                pPrt->PLinkBroken = SK_TRUE; /* See WA code */
-                pPrt->PPhyPowerState = PHY_PM_OPERATIONAL_MODE;
-                pPrt->PMacColThres = TX_COL_DEF;
-                pPrt->PMacJamLen = TX_JAM_LEN_DEF;
-                pPrt->PMacJamIpgVal     = TX_JAM_IPG_DEF;
-                pPrt->PMacJamIpgData = TX_IPG_JAM_DEF;
-                pPrt->PMacIpgData = IPG_DATA_DEF;
-                pPrt->PMacLimit4 = SK_FALSE;
-        }
-
-        pAC->GIni.GIPortUsage = SK_RED_LINK;
-        pAC->GIni.GILedBlinkCtrl = (SK_U16)OemConfig.Value;
-        pAC->GIni.GIValIrqMask = IS_ALL_MSK;
-
-}       /* SkGeInit0*/
-
-
-/******************************************************************************
- *
- *      SkGeInit1() - Level 1 Initialization
- *
- * Description:
- *      o Do a software reset.
- *      o Clear all reset bits.
- *      o Verify that the detected hardware is present.
- *        Return an error if not.
- *      o Get the hardware configuration
- *              + Read the number of MACs/Ports.
- *              + Read the RAM size.
- *              + Read the PCI Revision Id.
- *              + Find out the adapters host clock speed
- *              + Read and check the PHY type
- *
- * Returns:
- *      0:      success
- *      5:      Unexpected PHY type detected
- *      6:      HW self test failed
- */
-static int SkGeInit1(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC)            /* IO context */
-{
-        SK_U8   Byte;
-        SK_U16  Word;
-        SK_U16  CtrlStat;
-        SK_U32  DWord;
-        int     RetVal;
-        int     i;
-
-        RetVal = 0;
-
-        /* save CLK_RUN bits (YUKON-Lite) */
-        SK_IN16(IoC, B0_CTST, &CtrlStat);
-
-        /* do the SW-reset */
-        SK_OUT8(IoC, B0_CTST, CS_RST_SET);
-
-        /* release the SW-reset */
-        SK_OUT8(IoC, B0_CTST, CS_RST_CLR);
-
-        /* reset all error bits in the PCI STATUS register */
-        /*
-         * Note: PCI Cfg cycles cannot be used, because they are not
-         *               available on some platforms after 'boot time'.
-         */
-        SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
-        
-        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
-        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
-
-        /* release Master Reset */
-        SK_OUT8(IoC, B0_CTST, CS_MRST_CLR);
-
-#ifdef CLK_RUN
-        CtrlStat |= CS_CLK_RUN_ENA;
-#endif /* CLK_RUN */
-
-        /* restore CLK_RUN bits */
-        SK_OUT16(IoC, B0_CTST, (SK_U16)(CtrlStat &
-                (CS_CLK_RUN_HOT | CS_CLK_RUN_RST | CS_CLK_RUN_ENA)));
-
-        /* read Chip Identification Number */
-        SK_IN8(IoC, B2_CHIP_ID, &Byte);
-        pAC->GIni.GIChipId = Byte;
-        
-        /* read number of MACs */
-        SK_IN8(IoC, B2_MAC_CFG, &Byte);
-        pAC->GIni.GIMacsFound = (Byte & CFG_SNG_MAC) ? 1 : 2;
-        
-        /* get Chip Revision Number */
-        pAC->GIni.GIChipRev = (SK_U8)((Byte & CFG_CHIP_R_MSK) >> 4);
-
-        /* get diff. PCI parameters */
-        SK_IN16(IoC, B0_CTST, &CtrlStat);
-        
-        /* read the adapters RAM size */
-        SK_IN8(IoC, B2_E_0, &Byte);
-        
-        pAC->GIni.GIGenesis = SK_FALSE;
-        pAC->GIni.GIYukon = SK_FALSE;
-        pAC->GIni.GIYukonLite = SK_FALSE;
-
-#ifdef GENESIS
-        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
-
-                pAC->GIni.GIGenesis = SK_TRUE;
-
-                if (Byte == (SK_U8)3) {                                         
-                        /* special case: 4 x 64k x 36, offset = 0x80000 */
-                        pAC->GIni.GIRamSize = 1024;
-                        pAC->GIni.GIRamOffs = (SK_U32)512 * 1024;
-                }
-                else {
-                        pAC->GIni.GIRamSize = (int)Byte * 512;
-                        pAC->GIni.GIRamOffs = 0;
-                }
-                /* all GE adapters work with 53.125 MHz host clock */
-                pAC->GIni.GIHstClkFact = SK_FACT_53;
-                
-                /* set Descr. Poll Timer Init Value to 250 ms */
-                pAC->GIni.GIPollTimerVal =
-                        SK_DPOLL_DEF * (SK_U32)pAC->GIni.GIHstClkFact / 100;
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIChipId != CHIP_ID_GENESIS) {
-                
-                pAC->GIni.GIYukon = SK_TRUE;
-                
-                pAC->GIni.GIRamSize = (Byte == (SK_U8)0) ? 128 : (int)Byte * 4;
-                
-                pAC->GIni.GIRamOffs = 0;
-                
-                /* WA for chip Rev. A */
-                pAC->GIni.GIWolOffs = (pAC->GIni.GIChipId == CHIP_ID_YUKON &&
-                        pAC->GIni.GIChipRev == 0) ? WOL_REG_OFFS : 0;
-                
-                /* get PM Capabilities of PCI config space */
-                SK_IN16(IoC, PCI_C(PCI_PM_CAP_REG), &Word);
-
-                /* check if VAUX is available */
-                if (((CtrlStat & CS_VAUX_AVAIL) != 0) &&
-                        /* check also if PME from D3cold is set */
-                        ((Word & PCI_PME_D3C_SUP) != 0)) {
-                        /* set entry in GE init struct */
-                        pAC->GIni.GIVauxAvail = SK_TRUE;
-                }
-                
-                if (pAC->GIni.GIChipId == CHIP_ID_YUKON_LITE) {
-                        /* this is Rev. A1 */
-                        pAC->GIni.GIYukonLite = SK_TRUE;
-                }
-                else {
-                        /* save Flash-Address Register */
-                        SK_IN32(IoC, B2_FAR, &DWord);
-
-                        /* test Flash-Address Register */
-                        SK_OUT8(IoC, B2_FAR + 3, 0xff);
-                        SK_IN8(IoC, B2_FAR + 3, &Byte);
-
-                        if (Byte != 0) {
-                                /* this is Rev. A0 */
-                                pAC->GIni.GIYukonLite = SK_TRUE;
-
-                                /* restore Flash-Address Register */
-                                SK_OUT32(IoC, B2_FAR, DWord);
-                        }
-                }
-
-                /* switch power to VCC (WA for VAUX problem) */
-                SK_OUT8(IoC, B0_POWER_CTRL, (SK_U8)(PC_VAUX_ENA | PC_VCC_ENA |
-                        PC_VAUX_OFF | PC_VCC_ON));
-
-                /* read the Interrupt source */
-                SK_IN32(IoC, B0_ISRC, &DWord);
-                
-                if ((DWord & IS_HW_ERR) != 0) {
-                        /* read the HW Error Interrupt source */
-                        SK_IN32(IoC, B0_HWE_ISRC, &DWord);
-                        
-                        if ((DWord & IS_IRQ_SENSOR) != 0) {
-                                /* disable HW Error IRQ */
-                                pAC->GIni.GIValIrqMask &= ~IS_HW_ERR;
-                        }
-                }
-                
-                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-                        /* set GMAC Link Control reset */
-                        SK_OUT16(IoC, MR_ADDR(i, GMAC_LINK_CTRL), GMLC_RST_SET);
-
-                        /* clear GMAC Link Control reset */
-                        SK_OUT16(IoC, MR_ADDR(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
-                }
-                /* all YU chips work with 78.125 MHz host clock */
-                pAC->GIni.GIHstClkFact = SK_FACT_78;
-                
-                pAC->GIni.GIPollTimerVal = SK_DPOLL_MAX;        /* 215 ms */
-        }
-#endif /* YUKON */
-
-        /* check if 64-bit PCI Slot is present */
-        pAC->GIni.GIPciSlot64 = (SK_BOOL)((CtrlStat & CS_BUS_SLOT_SZ) != 0);
-        
-        /* check if 66 MHz PCI Clock is active */
-        pAC->GIni.GIPciClock66 = (SK_BOOL)((CtrlStat & CS_BUS_CLOCK) != 0);
-
-        /* read PCI HW Revision Id. */
-        SK_IN8(IoC, PCI_C(PCI_REV_ID), &Byte);
-        pAC->GIni.GIPciHwRev = Byte;
-
-        /* read the PMD type */
-        SK_IN8(IoC, B2_PMD_TYP, &Byte);
-        pAC->GIni.GICopperType = (SK_U8)(Byte == 'T');
-
-        /* read the PHY type */
-        SK_IN8(IoC, B2_E_1, &Byte);
-
-        Byte &= 0x0f;   /* the PHY type is stored in the lower nibble */
-        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-                
-#ifdef GENESIS
-                if (pAC->GIni.GIGenesis) {
-                        switch (Byte) {
-                        case SK_PHY_XMAC:
-                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_XMAC;
-                                break;
-                        case SK_PHY_BCOM:
-                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_BCOM;
-                                pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
-                                        SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
-                                break;
-#ifdef OTHER_PHY
-                        case SK_PHY_LONE:
-                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_LONE;
-                                break;
-                        case SK_PHY_NAT:
-                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_NAT;
-                                break;
-#endif /* OTHER_PHY */
-                        default:
-                                /* ERROR: unexpected PHY type detected */
-                                RetVal = 5;
-                                break;
-                        }
-                }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-                if (pAC->GIni.GIYukon) {
-                        
-                        if (Byte < (SK_U8)SK_PHY_MARV_COPPER) {
-                                /* if this field is not initialized */
-                                Byte = (SK_U8)SK_PHY_MARV_COPPER;
-                                
-                                pAC->GIni.GICopperType = SK_TRUE;
-                        }
-                        
-                        pAC->GIni.GP[i].PhyAddr = PHY_ADDR_MARV;
-                        
-                        if (pAC->GIni.GICopperType) {
-
-                                pAC->GIni.GP[i].PLinkSpeedCap = (SK_U8)(SK_LSPEED_CAP_AUTO |
-                                        SK_LSPEED_CAP_10MBPS | SK_LSPEED_CAP_100MBPS |
-                                        SK_LSPEED_CAP_1000MBPS);
-                                
-                                pAC->GIni.GP[i].PLinkSpeed = (SK_U8)SK_LSPEED_AUTO;
-                                
-                                pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
-                                        SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
-                        }
-                        else {
-                                Byte = (SK_U8)SK_PHY_MARV_FIBER;
-                        }
-                }
-#endif /* YUKON */
-                
-                pAC->GIni.GP[i].PhyType = (int)Byte;
-                
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
-                        ("PHY type: %d  PHY addr: %04x\n", Byte,
-                        pAC->GIni.GP[i].PhyAddr));
-        }
-        
-        /* get MAC Type & set function pointers dependent on */
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                pAC->GIni.GIMacType = SK_MAC_XMAC;
-
-                pAC->GIni.GIFunc.pFnMacUpdateStats      = SkXmUpdateStats;
-                pAC->GIni.GIFunc.pFnMacStatistic        = SkXmMacStatistic;
-                pAC->GIni.GIFunc.pFnMacResetCounter     = SkXmResetCounter;
-                pAC->GIni.GIFunc.pFnMacOverflow         = SkXmOverflowStatus;
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                pAC->GIni.GIMacType = SK_MAC_GMAC;
-
-                pAC->GIni.GIFunc.pFnMacUpdateStats      = SkGmUpdateStats;
-                pAC->GIni.GIFunc.pFnMacStatistic        = SkGmMacStatistic;
-                pAC->GIni.GIFunc.pFnMacResetCounter     = SkGmResetCounter;
-                pAC->GIni.GIFunc.pFnMacOverflow         = SkGmOverflowStatus;
-
-#ifdef SPECIAL_HANDLING
-                if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
-                        /* check HW self test result */
-                        SK_IN8(IoC, B2_E_3, &Byte);
-                        if (Byte & B2_E3_RES_MASK) {
-                                RetVal = 6;
-                        }
-                }
-#endif
-        }
-#endif /* YUKON */
-        
-        return(RetVal);
-}       /* SkGeInit1 */
-
-
-/******************************************************************************
- *
- *      SkGeInit2() - Level 2 Initialization
- *
- * Description:
- *      - start the Blink Source Counter
- *      - start the Descriptor Poll Timer
- *      - configure the MAC-Arbiter
- *      - configure the Packet-Arbiter
- *      - enable the Tx Arbiters
- *      - enable the RAM Interface Arbiter
- *
- * Returns:
- *      nothing
- */
-static void SkGeInit2(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC)            /* IO context */
-{
-#ifdef GENESIS
-        SK_U32  DWord;
-#endif /* GENESIS */
-        int             i;
-
-        /* start the Descriptor Poll Timer */
-        if (pAC->GIni.GIPollTimerVal != 0) {
-                if (pAC->GIni.GIPollTimerVal > SK_DPOLL_MAX) {
-                        pAC->GIni.GIPollTimerVal = SK_DPOLL_MAX;
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E017, SKERR_HWI_E017MSG);
-                }
-                SK_OUT32(IoC, B28_DPT_INI, pAC->GIni.GIPollTimerVal);
-                SK_OUT8(IoC, B28_DPT_CTRL, DPT_START);
-        }
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                /* start the Blink Source Counter */
-                DWord = SK_BLK_DUR * (SK_U32)pAC->GIni.GIHstClkFact / 100;
-
-                SK_OUT32(IoC, B2_BSC_INI, DWord);
-                SK_OUT8(IoC, B2_BSC_CTRL, BSC_START);
-
-                /*
-                 * Configure the MAC Arbiter and the Packet Arbiter.
-                 * They will be started once and never be stopped.
-                 */
-                SkGeInitMacArb(pAC, IoC);
-
-                SkGeInitPktArb(pAC, IoC);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* start Time Stamp Timer */
-                SK_OUT8(IoC, GMAC_TI_ST_CTRL, (SK_U8)GMT_ST_START);
-        }
-#endif /* YUKON */
-
-        /* enable the Tx Arbiters */
-        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-                SK_OUT8(IoC, MR_ADDR(i, TXA_CTRL), TXA_ENA_ARB);
-        }
-
-        /* enable the RAM Interface Arbiter */
-        SkGeInitRamIface(pAC, IoC);
-
-}       /* SkGeInit2 */
-
-/******************************************************************************
- *
- *      SkGeInit() - Initialize the GE Adapter with the specified level.
- *
- * Description:
- *      Level   0:      Initialize the Module structures.
- *      Level   1:      Generic Hardware Initialization. The IOP/MemBase pointer has
- *                              to be set before calling this level.
- *
- *                      o Do a software reset.
- *                      o Clear all reset bits.
- *                      o Verify that the detected hardware is present.
- *                        Return an error if not.
- *                      o Get the hardware configuration
- *                              + Set GIMacsFound with the number of MACs.
- *                              + Store the RAM size in GIRamSize.
- *                              + Save the PCI Revision ID in GIPciHwRev.
- *                      o return an error
- *                              if Number of MACs > SK_MAX_MACS
- *
- *                      After returning from Level 0 the adapter
- *                      may be accessed with IO operations.
- *
- *      Level   2:      start the Blink Source Counter
- *
- * Returns:
- *      0:      success
- *      1:      Number of MACs exceeds SK_MAX_MACS      (after level 1)
- *      2:      Adapter not present or not accessible
- *      3:      Illegal initialization level
- *      4:      Initialization Level 1 Call missing
- *      5:      Unexpected PHY type detected
- *      6:      HW self test failed
- */
-int     SkGeInit(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Level)          /* initialization level */
-{
-        int             RetVal;         /* return value */
-        SK_U32  DWord;
-
-        RetVal = 0;
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
-                ("SkGeInit(Level %d)\n", Level));
-
-        switch (Level) {
-        case SK_INIT_DATA:
-                /* Initialization Level 0 */
-                SkGeInit0(pAC, IoC);
-                pAC->GIni.GILevel = SK_INIT_DATA;
-                break;
-        
-        case SK_INIT_IO:
-                /* Initialization Level 1 */
-                RetVal = SkGeInit1(pAC, IoC);
-                if (RetVal != 0) {
-                        break;
-                }
-
-                /* check if the adapter seems to be accessible */
-                SK_OUT32(IoC, B2_IRQM_INI, SK_TEST_VAL);
-                SK_IN32(IoC, B2_IRQM_INI, &DWord);
-                SK_OUT32(IoC, B2_IRQM_INI, 0L);
-                
-                if (DWord != SK_TEST_VAL) {
-                        RetVal = 2;
-                        break;
-                }
-
-                /* check if the number of GIMacsFound matches SK_MAX_MACS */
-                if (pAC->GIni.GIMacsFound > SK_MAX_MACS) {
-                        RetVal = 1;
-                        break;
-                }
-
-                /* Level 1 successfully passed */
-                pAC->GIni.GILevel = SK_INIT_IO;
-                break;
-        
-        case SK_INIT_RUN:
-                /* Initialization Level 2 */
-                if (pAC->GIni.GILevel != SK_INIT_IO) {
-#ifndef SK_DIAG
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E002, SKERR_HWI_E002MSG);
-#endif /* !SK_DIAG */
-                        RetVal = 4;
-                        break;
-                }
-                SkGeInit2(pAC, IoC);
-
-                /* Level 2 successfully passed */
-                pAC->GIni.GILevel = SK_INIT_RUN;
-                break;
-        
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E003, SKERR_HWI_E003MSG);
-                RetVal = 3;
-                break;
-        }
-
-        return(RetVal);
-}       /* SkGeInit */
-
-
-/******************************************************************************
- *
- *      SkGeDeInit() - Deinitialize the adapter
- *
- * Description:
- *      All ports of the adapter will be stopped if not already done.
- *      Do a software reset and switch off all LEDs.
- *
- * Returns:
- *      nothing
- */
-void SkGeDeInit(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC)            /* IO context */
-{
-        int     i;
-        SK_U16  Word;
-
-#if (!defined(SK_SLIM) && !defined(VCPU))
-        /* ensure I2C is ready */
-        SkI2cWaitIrq(pAC, IoC);
-#endif  
-
-        /* stop all current transfer activity */
-        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-                if (pAC->GIni.GP[i].PState != SK_PRT_STOP &&
-                        pAC->GIni.GP[i].PState != SK_PRT_RESET) {
-
-                        SkGeStopPort(pAC, IoC, i, SK_STOP_ALL, SK_HARD_RST);
-                }
-        }
-
-        /* Reset all bits in the PCI STATUS register */
-        /*
-         * Note: PCI Cfg cycles cannot be used, because they are not
-         *       available on some platforms after 'boot time'.
-         */
-        SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
-        
-        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
-        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
-
-        /* do the reset, all LEDs are switched off now */
-        SK_OUT8(IoC, B0_CTST, CS_RST_SET);
-        
-        pAC->GIni.GILevel = SK_INIT_DATA;
-}       /* SkGeDeInit */
-
-
-/******************************************************************************
- *
- *      SkGeInitPort()  Initialize the specified port.
- *
- * Description:
- *      PRxQSize, PXSQSize, and PXAQSize has to be
- *      configured for the specified port before calling this function.
- *  The descriptor rings has to be initialized too.
- *
- *      o (Re)configure queues of the specified port.
- *      o configure the MAC of the specified port.
- *      o put ASIC and MAC(s) in operational mode.
- *      o initialize Rx/Tx and Sync LED
- *      o initialize RAM Buffers and MAC FIFOs
- *
- *      The port is ready to connect when returning.
- *
- * Note:
- *      The MAC's Rx and Tx state machine is still disabled when returning.
- *
- * Returns:
- *      0:      success
- *      1:      Queue size initialization error. The configured values
- *              for PRxQSize, PXSQSize, or PXAQSize are invalid for one
- *              or more queues. The specified port was NOT initialized.
- *              An error log entry was generated.
- *      2:      The port has to be stopped before it can be initialized again.
- */
-int SkGeInitPort(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port to configure */
-{
-        SK_GEPORT *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (SkGeCheckQSize(pAC, Port) != 0) {
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E004, SKERR_HWI_E004MSG);
-                return(1);
-        }
-        
-        if (pPrt->PState == SK_PRT_INIT || pPrt->PState == SK_PRT_RUN) {
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E005, SKERR_HWI_E005MSG);
-                return(2);
-        }
-
-        /* configuration ok, initialize the Port now */
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                /* initialize Rx, Tx and Link LED */
-                /*
-                 * If 1000BT Phy needs LED initialization than swap
-                 * LED and XMAC initialization order
-                 */
-                SkGeXmitLED(pAC, IoC, MR_ADDR(Port, TX_LED_INI), SK_LED_ENA);
-                SkGeXmitLED(pAC, IoC, MR_ADDR(Port, RX_LED_INI), SK_LED_ENA);
-                /* The Link LED is initialized by RLMT or Diagnostics itself */
-                
-                SkXmInitMac(pAC, IoC, Port);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-
-                SkGmInitMac(pAC, IoC, Port);
-        }
-#endif /* YUKON */
-        
-        /* do NOT initialize the Link Sync Counter */
-
-        SkGeInitMacFifo(pAC, IoC, Port);
-        
-        SkGeInitRamBufs(pAC, IoC, Port);
-        
-        if (pPrt->PXSQSize != 0) {
-                /* enable Force Sync bit if synchronous queue available */
-                SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL), TXA_ENA_FSYNC);
-        }
-        
-        SkGeInitBmu(pAC, IoC, Port);
-
-        /* mark port as initialized */
-        pPrt->PState = SK_PRT_INIT;
-
-        return(0);
-}       /* SkGeInitPort */
diff --git a/drivers/net/sk98lin/skgemib.c b/drivers/net/sk98lin/skgemib.c
deleted file mode 100644
index fde45083eb7b..000000000000
--- a/drivers/net/sk98lin/skgemib.c
+++ /dev/null
@@ -1,1075 +0,0 @@
-/*****************************************************************************
- *
- * Name:        skgemib.c
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.11 $
- * Date:        $Date: 2003/09/15 13:38:12 $
- * Purpose:     Private Network Management Interface Management Database
- *
- ****************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * PRIVATE OID handler function prototypes
- */
-PNMI_STATIC int Addr(SK_AC *pAC, SK_IOC IoC, int action,
-        SK_U32 Id, char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int CsumStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int General(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int Mac8023Stat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int MacPrivateConf(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int MacPrivateStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int Monitor(SK_AC *pAC, SK_IOC IoC, int action,
-        SK_U32 Id, char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int OidStruct(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int Perform(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int* pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int Rlmt(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int RlmtStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int SensorStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int Vpd(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC int Vct(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-
-#ifdef SK_POWER_MGMT
-PNMI_STATIC int PowerManagement(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-#endif /* SK_POWER_MGMT */
-
-#ifdef SK_DIAG_SUPPORT
-PNMI_STATIC int DiagActions(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance,
-        unsigned int TableIndex, SK_U32 NetIndex);
-#endif /* SK_DIAG_SUPPORT */
-
-
-/* defines *******************************************************************/
-#define ID_TABLE_SIZE   ARRAY_SIZE(IdTable)
-
-
-/* global variables **********************************************************/
-
-/*
- * Table to correlate OID with handler function and index to
- * hardware register stored in StatAddress if applicable.
- */
-PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTable[] = {
-        {OID_GEN_XMIT_OK,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX},
-        {OID_GEN_RCV_OK,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX},
-        {OID_GEN_XMIT_ERROR,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, General, 0},
-        {OID_GEN_RCV_ERROR,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, General, 0},
-        {OID_GEN_RCV_NO_BUFFER,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, General, 0},
-        {OID_GEN_DIRECTED_FRAMES_XMIT,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_UNICAST},
-        {OID_GEN_MULTICAST_FRAMES_XMIT,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_MULTICAST},
-        {OID_GEN_BROADCAST_FRAMES_XMIT,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_BROADCAST},
-        {OID_GEN_DIRECTED_FRAMES_RCV,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_UNICAST},
-        {OID_GEN_MULTICAST_FRAMES_RCV,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_MULTICAST},
-        {OID_GEN_BROADCAST_FRAMES_RCV,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_BROADCAST},
-        {OID_GEN_RCV_CRC_ERROR,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_FCS},
-        {OID_GEN_TRANSMIT_QUEUE_LENGTH,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, General, 0},
-        {OID_802_3_PERMANENT_ADDRESS,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, 0},
-        {OID_802_3_CURRENT_ADDRESS,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, 0},
-        {OID_802_3_RCV_ERROR_ALIGNMENT,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_FRAMING},
-        {OID_802_3_XMIT_ONE_COLLISION,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_SINGLE_COL},
-        {OID_802_3_XMIT_MORE_COLLISIONS,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_MULTI_COL},
-        {OID_802_3_XMIT_DEFERRED,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_DEFFERAL},
-        {OID_802_3_XMIT_MAX_COLLISIONS,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_EXCESS_COL},
-        {OID_802_3_RCV_OVERRUN,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_OVERFLOW},
-        {OID_802_3_XMIT_UNDERRUN,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_UNDERRUN},
-        {OID_802_3_XMIT_TIMES_CRS_LOST,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_CARRIER},
-        {OID_802_3_XMIT_LATE_COLLISIONS,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_LATE_COL},
-#ifdef SK_POWER_MGMT
-        {OID_PNP_CAPABILITIES,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, PowerManagement, 0},
-        {OID_PNP_SET_POWER,
-                0,
-                0,
-                0,
-                SK_PNMI_WO, PowerManagement, 0},
-        {OID_PNP_QUERY_POWER,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, PowerManagement, 0},
-        {OID_PNP_ADD_WAKE_UP_PATTERN,
-                0,
-                0,
-                0,
-                SK_PNMI_WO, PowerManagement, 0},
-        {OID_PNP_REMOVE_WAKE_UP_PATTERN,
-                0,
-                0,
-                0,
-                SK_PNMI_WO, PowerManagement, 0},
-        {OID_PNP_ENABLE_WAKE_UP,
-                0,
-                0,
-                0,
-                SK_PNMI_RW, PowerManagement, 0},
-#endif /* SK_POWER_MGMT */
-#ifdef SK_DIAG_SUPPORT
-        {OID_SKGE_DIAG_MODE,
-                0,
-                0,
-                0,
-                SK_PNMI_RW, DiagActions, 0},
-#endif /* SK_DIAG_SUPPORT */
-        {OID_SKGE_MDB_VERSION,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(MgmtDBVersion),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_SUPPORTED_LIST,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_ALL_DATA,
-                0,
-                0,
-                0,
-                SK_PNMI_RW, OidStruct, 0},
-        {OID_SKGE_VPD_FREE_BYTES,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(VpdFreeBytes),
-                SK_PNMI_RO, Vpd, 0},
-        {OID_SKGE_VPD_ENTRIES_LIST,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(VpdEntriesList),
-                SK_PNMI_RO, Vpd, 0},
-        {OID_SKGE_VPD_ENTRIES_NUMBER,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(VpdEntriesNumber),
-                SK_PNMI_RO, Vpd, 0},
-        {OID_SKGE_VPD_KEY,
-                SK_PNMI_VPD_ENTRIES,
-                sizeof(SK_PNMI_VPD),
-                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdKey),
-                SK_PNMI_RO, Vpd, 0},
-        {OID_SKGE_VPD_VALUE,
-                SK_PNMI_VPD_ENTRIES,
-                sizeof(SK_PNMI_VPD),
-                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdValue),
-                SK_PNMI_RO, Vpd, 0},
-        {OID_SKGE_VPD_ACCESS,
-                SK_PNMI_VPD_ENTRIES,
-                sizeof(SK_PNMI_VPD),
-                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdAccess),
-                SK_PNMI_RO, Vpd, 0},
-        {OID_SKGE_VPD_ACTION,
-                SK_PNMI_VPD_ENTRIES,
-                sizeof(SK_PNMI_VPD),
-                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdAction),
-                SK_PNMI_RW, Vpd, 0},
-        {OID_SKGE_PORT_NUMBER,          
-                1,
-                0,
-                SK_PNMI_MAI_OFF(PortNumber),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_DEVICE_TYPE,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(DeviceType),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_DRIVER_DESCR,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(DriverDescr),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_DRIVER_VERSION,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(DriverVersion),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_DRIVER_RELDATE,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(DriverReleaseDate),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_DRIVER_FILENAME,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(DriverFileName),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_HW_DESCR,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(HwDescr),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_HW_VERSION,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(HwVersion),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_CHIPSET,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(Chipset),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_CHIPID,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(ChipId),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RAMSIZE,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RamSize),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_VAUXAVAIL,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(VauxAvail),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_ACTION,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(Action),
-                SK_PNMI_RW, Perform, 0},
-        {OID_SKGE_RESULT,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TestResult),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_BUS_TYPE,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(BusType),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_BUS_SPEED,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(BusSpeed),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_BUS_WIDTH,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(BusWidth),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TX_SW_QUEUE_LEN,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TxSwQueueLen),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TX_SW_QUEUE_MAX,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TxSwQueueMax),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TX_RETRY,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TxRetryCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RX_INTR_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RxIntrCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TX_INTR_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TxIntrCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RX_NO_BUF_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RxNoBufCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TX_NO_BUF_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TxNoBufCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TX_USED_DESCR_NO,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TxUsedDescrNo),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RX_DELIVERED_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RxDeliveredCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RX_OCTETS_DELIV_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RxOctetsDeliveredCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RX_HW_ERROR_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RxHwErrorsCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TX_HW_ERROR_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TxHwErrorsCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_IN_ERRORS_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(InErrorsCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_OUT_ERROR_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(OutErrorsCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_ERR_RECOVERY_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(ErrRecoveryCts),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_SYSUPTIME,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(SysUpTime),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_SENSOR_NUMBER,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(SensorNumber),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_SENSOR_INDEX,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorIndex),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_DESCR,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorDescr),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_TYPE,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorType),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_VALUE,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorValue),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_WAR_THRES_LOW,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningThresholdLow),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_WAR_THRES_UPP,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningThresholdHigh),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_ERR_THRES_LOW,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorThresholdLow),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_ERR_THRES_UPP,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorThresholdHigh),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_STATUS,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorStatus),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_WAR_CTS,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningCts),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_ERR_CTS,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorCts),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_WAR_TIME,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningTimestamp),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_SENSOR_ERR_TIME,
-                SK_PNMI_SENSOR_ENTRIES,
-                sizeof(SK_PNMI_SENSOR),
-                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorTimestamp),
-                SK_PNMI_RO, SensorStat, 0},
-        {OID_SKGE_CHKSM_NUMBER,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(ChecksumNumber),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_CHKSM_RX_OK_CTS,
-                SKCS_NUM_PROTOCOLS,
-                sizeof(SK_PNMI_CHECKSUM),
-                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumRxOkCts),
-                SK_PNMI_RO, CsumStat, 0},
-        {OID_SKGE_CHKSM_RX_UNABLE_CTS,
-                SKCS_NUM_PROTOCOLS,
-                sizeof(SK_PNMI_CHECKSUM),
-                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumRxUnableCts),
-                SK_PNMI_RO, CsumStat, 0},
-        {OID_SKGE_CHKSM_RX_ERR_CTS,
-                SKCS_NUM_PROTOCOLS,
-                sizeof(SK_PNMI_CHECKSUM),
-                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumRxErrCts),
-                SK_PNMI_RO, CsumStat, 0},
-        {OID_SKGE_CHKSM_TX_OK_CTS,
-                SKCS_NUM_PROTOCOLS,
-                sizeof(SK_PNMI_CHECKSUM),
-                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumTxOkCts),
-                SK_PNMI_RO, CsumStat, 0},
-        {OID_SKGE_CHKSM_TX_UNABLE_CTS,
-                SKCS_NUM_PROTOCOLS,
-                sizeof(SK_PNMI_CHECKSUM),
-                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumTxUnableCts),
-                SK_PNMI_RO, CsumStat, 0},
-        {OID_SKGE_STAT_TX,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX},
-        {OID_SKGE_STAT_TX_OCTETS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxOctetsOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_OCTET},
-        {OID_SKGE_STAT_TX_BROADCAST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxBroadcastOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_BROADCAST},
-        {OID_SKGE_STAT_TX_MULTICAST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMulticastOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MULTICAST},
-        {OID_SKGE_STAT_TX_UNICAST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxUnicastOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_UNICAST},
-        {OID_SKGE_STAT_TX_LONGFRAMES,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxLongFramesCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_LONGFRAMES},
-        {OID_SKGE_STAT_TX_BURST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxBurstCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_BURST},
-        {OID_SKGE_STAT_TX_PFLOWC,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxPauseMacCtrlCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_PMACC},
-        {OID_SKGE_STAT_TX_FLOWC,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMacCtrlCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MACC},
-        {OID_SKGE_STAT_TX_SINGLE_COL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxSingleCollisionCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_SINGLE_COL},
-        {OID_SKGE_STAT_TX_MULTI_COL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMultipleCollisionCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MULTI_COL},
-        {OID_SKGE_STAT_TX_EXCESS_COL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxExcessiveCollisionCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_EXCESS_COL},
-        {OID_SKGE_STAT_TX_LATE_COL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxLateCollisionCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_LATE_COL},
-        {OID_SKGE_STAT_TX_DEFFERAL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxDeferralCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_DEFFERAL},
-        {OID_SKGE_STAT_TX_EXCESS_DEF,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxExcessiveDeferralCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_EXCESS_DEF},
-        {OID_SKGE_STAT_TX_UNDERRUN,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxFifoUnderrunCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_UNDERRUN},
-        {OID_SKGE_STAT_TX_CARRIER,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxCarrierCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_CARRIER},
-/*      {OID_SKGE_STAT_TX_UTIL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxUtilization),
-                SK_PNMI_RO, MacPrivateStat, (SK_U16)(-1)}, */
-        {OID_SKGE_STAT_TX_64,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx64Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_64},
-        {OID_SKGE_STAT_TX_127,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx127Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_127},
-        {OID_SKGE_STAT_TX_255,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx255Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_255},
-        {OID_SKGE_STAT_TX_511,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx511Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_511},
-        {OID_SKGE_STAT_TX_1023,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx1023Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_1023},
-        {OID_SKGE_STAT_TX_MAX,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMaxCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MAX},
-        {OID_SKGE_STAT_TX_SYNC,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxSyncCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_SYNC},
-        {OID_SKGE_STAT_TX_SYNC_OCTETS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxSyncOctetsCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_SYNC_OCTET},
-        {OID_SKGE_STAT_RX,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX},
-        {OID_SKGE_STAT_RX_OCTETS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxOctetsOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_OCTET},
-        {OID_SKGE_STAT_RX_BROADCAST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxBroadcastOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_BROADCAST},
-        {OID_SKGE_STAT_RX_MULTICAST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMulticastOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MULTICAST},
-        {OID_SKGE_STAT_RX_UNICAST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxUnicastOkCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_UNICAST},
-        {OID_SKGE_STAT_RX_LONGFRAMES,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxLongFramesCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_LONGFRAMES},
-        {OID_SKGE_STAT_RX_PFLOWC,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxPauseMacCtrlCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_PMACC},
-        {OID_SKGE_STAT_RX_FLOWC,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMacCtrlCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MACC},
-        {OID_SKGE_STAT_RX_PFLOWC_ERR,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxPauseMacCtrlErrorCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_PMACC_ERR},
-        {OID_SKGE_STAT_RX_FLOWC_UNKWN,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMacCtrlUnknownCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MACC_UNKWN},
-        {OID_SKGE_STAT_RX_BURST,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxBurstCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_BURST},
-        {OID_SKGE_STAT_RX_MISSED,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMissedCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MISSED},
-        {OID_SKGE_STAT_RX_FRAMING,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxFramingCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_FRAMING},
-        {OID_SKGE_STAT_RX_OVERFLOW,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxFifoOverflowCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_OVERFLOW},
-        {OID_SKGE_STAT_RX_JABBER,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxJabberCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_JABBER},
-        {OID_SKGE_STAT_RX_CARRIER,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxCarrierCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_CARRIER},
-        {OID_SKGE_STAT_RX_IR_LENGTH,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxIRLengthCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_IRLENGTH},
-        {OID_SKGE_STAT_RX_SYMBOL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxSymbolCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_SYMBOL},
-        {OID_SKGE_STAT_RX_SHORTS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxShortsCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_SHORTS},
-        {OID_SKGE_STAT_RX_RUNT,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxRuntCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_RUNT},
-        {OID_SKGE_STAT_RX_CEXT,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxCextCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_CEXT},
-        {OID_SKGE_STAT_RX_TOO_LONG,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxTooLongCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_TOO_LONG},
-        {OID_SKGE_STAT_RX_FCS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxFcsCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_FCS},
-/*      {OID_SKGE_STAT_RX_UTIL,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxUtilization),
-                SK_PNMI_RO, MacPrivateStat, (SK_U16)(-1)}, */
-        {OID_SKGE_STAT_RX_64,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx64Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_64},
-        {OID_SKGE_STAT_RX_127,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx127Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_127},
-        {OID_SKGE_STAT_RX_255,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx255Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_255},
-        {OID_SKGE_STAT_RX_511,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx511Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_511},
-        {OID_SKGE_STAT_RX_1023,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx1023Cts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_1023},
-        {OID_SKGE_STAT_RX_MAX,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_STAT),
-                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMaxCts),
-                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MAX},
-        {OID_SKGE_PHYS_CUR_ADDR,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfMacCurrentAddr),
-                SK_PNMI_RW, Addr, 0},
-        {OID_SKGE_PHYS_FAC_ADDR,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfMacFactoryAddr),
-                SK_PNMI_RO, Addr, 0},
-        {OID_SKGE_PMD,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPMD),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_CONNECTOR,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfConnector),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_PHY_TYPE,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyType),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_LINK_CAP,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkCapability),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_LINK_MODE,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkMode),
-                SK_PNMI_RW, MacPrivateConf, 0},
-        {OID_SKGE_LINK_MODE_STATUS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkModeStatus),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_LINK_STATUS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkStatus),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_FLOWCTRL_CAP,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfFlowCtrlCapability),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_FLOWCTRL_MODE,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfFlowCtrlMode),
-                SK_PNMI_RW, MacPrivateConf, 0},
-        {OID_SKGE_FLOWCTRL_STATUS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfFlowCtrlStatus),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_PHY_OPERATION_CAP,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyOperationCapability),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_PHY_OPERATION_MODE,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyOperationMode),
-                SK_PNMI_RW, MacPrivateConf, 0},
-        {OID_SKGE_PHY_OPERATION_STATUS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyOperationStatus),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_SPEED_CAP,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfSpeedCapability),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_SPEED_MODE,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfSpeedMode),
-                SK_PNMI_RW, MacPrivateConf, 0},
-        {OID_SKGE_SPEED_STATUS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_CONF),
-                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfSpeedStatus),
-                SK_PNMI_RO, MacPrivateConf, 0},
-        {OID_SKGE_TRAP,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(Trap),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_TRAP_NUMBER,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(TrapNumber),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RLMT_MODE,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtMode),
-                SK_PNMI_RW, Rlmt, 0},
-        {OID_SKGE_RLMT_PORT_NUMBER,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtPortNumber),
-                SK_PNMI_RO, Rlmt, 0},
-        {OID_SKGE_RLMT_PORT_ACTIVE,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtPortActive),
-                SK_PNMI_RO, Rlmt, 0},
-        {OID_SKGE_RLMT_PORT_PREFERRED,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtPortPreferred),
-                SK_PNMI_RW, Rlmt, 0},
-        {OID_SKGE_RLMT_CHANGE_CTS,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtChangeCts),
-                SK_PNMI_RO, Rlmt, 0},
-        {OID_SKGE_RLMT_CHANGE_TIME,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtChangeTime),
-                SK_PNMI_RO, Rlmt, 0},
-        {OID_SKGE_RLMT_CHANGE_ESTIM,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtChangeEstimate),
-                SK_PNMI_RO, Rlmt, 0},
-        {OID_SKGE_RLMT_CHANGE_THRES,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtChangeThreshold),
-                SK_PNMI_RW, Rlmt, 0},
-        {OID_SKGE_RLMT_PORT_INDEX,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_RLMT),
-                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtIndex),
-                SK_PNMI_RO, RlmtStat, 0},
-        {OID_SKGE_RLMT_STATUS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_RLMT),
-                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtStatus),
-                SK_PNMI_RO, RlmtStat, 0},
-        {OID_SKGE_RLMT_TX_HELLO_CTS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_RLMT),
-                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtTxHelloCts),
-                SK_PNMI_RO, RlmtStat, 0},
-        {OID_SKGE_RLMT_RX_HELLO_CTS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_RLMT),
-                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtRxHelloCts),
-                SK_PNMI_RO, RlmtStat, 0},
-        {OID_SKGE_RLMT_TX_SP_REQ_CTS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_RLMT),
-                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtTxSpHelloReqCts),
-                SK_PNMI_RO, RlmtStat, 0},
-        {OID_SKGE_RLMT_RX_SP_CTS,
-                SK_PNMI_MAC_ENTRIES,
-                sizeof(SK_PNMI_RLMT),
-                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtRxSpHelloCts),
-                SK_PNMI_RO, RlmtStat, 0},
-        {OID_SKGE_RLMT_MONITOR_NUMBER,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(RlmtMonitorNumber),
-                SK_PNMI_RO, General, 0},
-        {OID_SKGE_RLMT_MONITOR_INDEX,
-                SK_PNMI_MONITOR_ENTRIES,
-                sizeof(SK_PNMI_RLMT_MONITOR),
-                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorIndex),
-                SK_PNMI_RO, Monitor, 0},
-        {OID_SKGE_RLMT_MONITOR_ADDR,
-                SK_PNMI_MONITOR_ENTRIES,
-                sizeof(SK_PNMI_RLMT_MONITOR),
-                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorAddr),
-                SK_PNMI_RO, Monitor, 0},
-        {OID_SKGE_RLMT_MONITOR_ERRS,
-                SK_PNMI_MONITOR_ENTRIES,
-                sizeof(SK_PNMI_RLMT_MONITOR),
-                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorErrorCts),
-                SK_PNMI_RO, Monitor, 0},
-        {OID_SKGE_RLMT_MONITOR_TIMESTAMP,
-                SK_PNMI_MONITOR_ENTRIES,
-                sizeof(SK_PNMI_RLMT_MONITOR),
-                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorTimestamp),
-                SK_PNMI_RO, Monitor, 0},
-        {OID_SKGE_RLMT_MONITOR_ADMIN,
-                SK_PNMI_MONITOR_ENTRIES,
-                sizeof(SK_PNMI_RLMT_MONITOR),
-                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorAdmin),
-                SK_PNMI_RW, Monitor, 0},
-        {OID_SKGE_MTU,
-                1,
-                0,
-                SK_PNMI_MAI_OFF(MtuSize),
-                SK_PNMI_RW, MacPrivateConf, 0},
-        {OID_SKGE_VCT_GET,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Vct, 0},
-        {OID_SKGE_VCT_SET,
-                0,
-                0,
-                0,
-                SK_PNMI_WO, Vct, 0},
-        {OID_SKGE_VCT_STATUS,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, Vct, 0},
-        {OID_SKGE_BOARDLEVEL,
-                0,
-                0,
-                0,
-                SK_PNMI_RO, General, 0},
-};
-
diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c
deleted file mode 100644
index 876bb2158fa6..000000000000
--- a/drivers/net/sk98lin/skgepnmi.c
+++ /dev/null
@@ -1,8198 +0,0 @@
-/*****************************************************************************
- *
- * Name:        skgepnmi.c
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.111 $
- * Date:        $Date: 2003/09/15 13:35:35 $
- * Purpose:     Private Network Management Interface
- *
- ****************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-
-#ifndef _lint
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skgepnmi.c,v 1.111 2003/09/15 13:35:35 tschilli Exp $ (C) Marvell.";
-#endif /* !_lint */
-
-#include "h/skdrv1st.h"
-#include "h/sktypes.h"
-#include "h/xmac_ii.h"
-#include "h/skdebug.h"
-#include "h/skqueue.h"
-#include "h/skgepnmi.h"
-#include "h/skgesirq.h"
-#include "h/skcsum.h"
-#include "h/skvpd.h"
-#include "h/skgehw.h"
-#include "h/skgeinit.h"
-#include "h/skdrv2nd.h"
-#include "h/skgepnm2.h"
-#ifdef SK_POWER_MGMT
-#include "h/skgepmgt.h"
-#endif
-/* defines *******************************************************************/
-
-#ifndef DEBUG
-#define PNMI_STATIC     static
-#else   /* DEBUG */
-#define PNMI_STATIC
-#endif /* DEBUG */
-
-/*
- * Public Function prototypes
- */
-int SkPnmiInit(SK_AC *pAC, SK_IOC IoC, int level);
-int SkPnmiSetVar(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, void *pBuf,
-        unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
-int SkPnmiGetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
-        unsigned int *pLen, SK_U32 NetIndex);
-int SkPnmiPreSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
-        unsigned int *pLen, SK_U32 NetIndex);
-int SkPnmiSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
-        unsigned int *pLen, SK_U32 NetIndex);
-int SkPnmiEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Param);
-int SkPnmiGenIoctl(SK_AC *pAC, SK_IOC IoC, void * pBuf,
-        unsigned int * pLen, SK_U32 NetIndex);
-
-
-/*
- * Private Function prototypes
- */
-
-PNMI_STATIC SK_U8 CalculateLinkModeStatus(SK_AC *pAC, SK_IOC IoC, unsigned int
-        PhysPortIndex);
-PNMI_STATIC SK_U8 CalculateLinkStatus(SK_AC *pAC, SK_IOC IoC, unsigned int
-        PhysPortIndex);
-PNMI_STATIC void CopyMac(char *pDst, SK_MAC_ADDR *pMac);
-PNMI_STATIC void CopyTrapQueue(SK_AC *pAC, char *pDstBuf);
-PNMI_STATIC SK_U64 GetPhysStatVal(SK_AC *pAC, SK_IOC IoC,
-        unsigned int PhysPortIndex, unsigned int StatIndex);
-PNMI_STATIC SK_U64 GetStatVal(SK_AC *pAC, SK_IOC IoC, unsigned int LogPortIndex,
-        unsigned int StatIndex, SK_U32 NetIndex);
-PNMI_STATIC char* GetTrapEntry(SK_AC *pAC, SK_U32 TrapId, unsigned int Size);
-PNMI_STATIC void GetTrapQueueLen(SK_AC *pAC, unsigned int *pLen,
-        unsigned int *pEntries);
-PNMI_STATIC int GetVpdKeyArr(SK_AC *pAC, SK_IOC IoC, char *pKeyArr,
-        unsigned int KeyArrLen, unsigned int *pKeyNo);
-PNMI_STATIC int LookupId(SK_U32 Id);
-PNMI_STATIC int MacUpdate(SK_AC *pAC, SK_IOC IoC, unsigned int FirstMac,
-        unsigned int LastMac);
-PNMI_STATIC int PnmiStruct(SK_AC *pAC, SK_IOC IoC, int Action, char *pBuf,
-        unsigned int *pLen, SK_U32 NetIndex);
-PNMI_STATIC int PnmiVar(SK_AC *pAC, SK_IOC IoC, int Action, SK_U32 Id,
-        char *pBuf, unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
-PNMI_STATIC void QueueRlmtNewMacTrap(SK_AC *pAC, unsigned int ActiveMac);
-PNMI_STATIC void QueueRlmtPortTrap(SK_AC *pAC, SK_U32 TrapId,
-        unsigned int PortIndex);
-PNMI_STATIC void QueueSensorTrap(SK_AC *pAC, SK_U32 TrapId,
-        unsigned int SensorIndex);
-PNMI_STATIC void QueueSimpleTrap(SK_AC *pAC, SK_U32 TrapId);
-PNMI_STATIC void ResetCounter(SK_AC *pAC, SK_IOC IoC, SK_U32 NetIndex);
-PNMI_STATIC int RlmtUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 NetIndex);
-PNMI_STATIC int SirqUpdate(SK_AC *pAC, SK_IOC IoC);
-PNMI_STATIC void VirtualConf(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, char *pBuf);
-PNMI_STATIC int Vct(SK_AC *pAC, SK_IOC IoC, int Action, SK_U32 Id, char *pBuf,
-        unsigned int *pLen, SK_U32 Instance, unsigned int TableIndex, SK_U32 NetIndex);
-PNMI_STATIC void CheckVctStatus(SK_AC *, SK_IOC, char *, SK_U32, SK_U32);
-
-/*
- * Table to correlate OID with handler function and index to
- * hardware register stored in StatAddress if applicable.
- */
-#include "skgemib.c"
-
-/* global variables **********************************************************/
-
-/*
- * Overflow status register bit table and corresponding counter
- * dependent on MAC type - the number relates to the size of overflow
- * mask returned by the pFnMacOverflow function
- */
-PNMI_STATIC const SK_U16 StatOvrflwBit[][SK_PNMI_MAC_TYPES] = {
-/* Bit0  */     { SK_PNMI_HTX,                          SK_PNMI_HTX_UNICAST},
-/* Bit1  */     { SK_PNMI_HTX_OCTETHIGH,        SK_PNMI_HTX_BROADCAST},
-/* Bit2  */     { SK_PNMI_HTX_OCTETLOW,         SK_PNMI_HTX_PMACC},
-/* Bit3  */     { SK_PNMI_HTX_BROADCAST,        SK_PNMI_HTX_MULTICAST},
-/* Bit4  */     { SK_PNMI_HTX_MULTICAST,        SK_PNMI_HTX_OCTETLOW},
-/* Bit5  */     { SK_PNMI_HTX_UNICAST,          SK_PNMI_HTX_OCTETHIGH},
-/* Bit6  */     { SK_PNMI_HTX_LONGFRAMES,       SK_PNMI_HTX_64},
-/* Bit7  */     { SK_PNMI_HTX_BURST,            SK_PNMI_HTX_127},
-/* Bit8  */     { SK_PNMI_HTX_PMACC,            SK_PNMI_HTX_255},
-/* Bit9  */     { SK_PNMI_HTX_MACC,             SK_PNMI_HTX_511},
-/* Bit10 */     { SK_PNMI_HTX_SINGLE_COL,       SK_PNMI_HTX_1023},
-/* Bit11 */     { SK_PNMI_HTX_MULTI_COL,        SK_PNMI_HTX_MAX},
-/* Bit12 */     { SK_PNMI_HTX_EXCESS_COL,       SK_PNMI_HTX_LONGFRAMES},
-/* Bit13 */     { SK_PNMI_HTX_LATE_COL,         SK_PNMI_HTX_RESERVED},
-/* Bit14 */     { SK_PNMI_HTX_DEFFERAL,         SK_PNMI_HTX_COL},
-/* Bit15 */     { SK_PNMI_HTX_EXCESS_DEF,       SK_PNMI_HTX_LATE_COL},
-/* Bit16 */     { SK_PNMI_HTX_UNDERRUN,         SK_PNMI_HTX_EXCESS_COL},
-/* Bit17 */     { SK_PNMI_HTX_CARRIER,          SK_PNMI_HTX_MULTI_COL},
-/* Bit18 */     { SK_PNMI_HTX_UTILUNDER,        SK_PNMI_HTX_SINGLE_COL},
-/* Bit19 */     { SK_PNMI_HTX_UTILOVER,         SK_PNMI_HTX_UNDERRUN},
-/* Bit20 */     { SK_PNMI_HTX_64,                       SK_PNMI_HTX_RESERVED},
-/* Bit21 */     { SK_PNMI_HTX_127,                      SK_PNMI_HTX_RESERVED},
-/* Bit22 */     { SK_PNMI_HTX_255,                      SK_PNMI_HTX_RESERVED},
-/* Bit23 */     { SK_PNMI_HTX_511,                      SK_PNMI_HTX_RESERVED},
-/* Bit24 */     { SK_PNMI_HTX_1023,             SK_PNMI_HTX_RESERVED},
-/* Bit25 */     { SK_PNMI_HTX_MAX,                      SK_PNMI_HTX_RESERVED},
-/* Bit26 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
-/* Bit27 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
-/* Bit28 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
-/* Bit29 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
-/* Bit30 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
-/* Bit31 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
-/* Bit32 */     { SK_PNMI_HRX,                          SK_PNMI_HRX_UNICAST},
-/* Bit33 */     { SK_PNMI_HRX_OCTETHIGH,        SK_PNMI_HRX_BROADCAST},
-/* Bit34 */     { SK_PNMI_HRX_OCTETLOW,         SK_PNMI_HRX_PMACC},
-/* Bit35 */     { SK_PNMI_HRX_BROADCAST,        SK_PNMI_HRX_MULTICAST},
-/* Bit36 */     { SK_PNMI_HRX_MULTICAST,        SK_PNMI_HRX_FCS},
-/* Bit37 */     { SK_PNMI_HRX_UNICAST,          SK_PNMI_HRX_RESERVED},
-/* Bit38 */     { SK_PNMI_HRX_PMACC,            SK_PNMI_HRX_OCTETLOW},
-/* Bit39 */     { SK_PNMI_HRX_MACC,             SK_PNMI_HRX_OCTETHIGH},
-/* Bit40 */     { SK_PNMI_HRX_PMACC_ERR,        SK_PNMI_HRX_BADOCTETLOW},
-/* Bit41 */     { SK_PNMI_HRX_MACC_UNKWN,       SK_PNMI_HRX_BADOCTETHIGH},
-/* Bit42 */     { SK_PNMI_HRX_BURST,            SK_PNMI_HRX_UNDERSIZE},
-/* Bit43 */     { SK_PNMI_HRX_MISSED,           SK_PNMI_HRX_RUNT},
-/* Bit44 */     { SK_PNMI_HRX_FRAMING,          SK_PNMI_HRX_64},
-/* Bit45 */     { SK_PNMI_HRX_OVERFLOW,         SK_PNMI_HRX_127},
-/* Bit46 */     { SK_PNMI_HRX_JABBER,           SK_PNMI_HRX_255},
-/* Bit47 */     { SK_PNMI_HRX_CARRIER,          SK_PNMI_HRX_511},
-/* Bit48 */     { SK_PNMI_HRX_IRLENGTH,         SK_PNMI_HRX_1023},
-/* Bit49 */     { SK_PNMI_HRX_SYMBOL,           SK_PNMI_HRX_MAX},
-/* Bit50 */     { SK_PNMI_HRX_SHORTS,           SK_PNMI_HRX_LONGFRAMES},
-/* Bit51 */     { SK_PNMI_HRX_RUNT,             SK_PNMI_HRX_TOO_LONG},
-/* Bit52 */     { SK_PNMI_HRX_TOO_LONG,         SK_PNMI_HRX_JABBER},
-/* Bit53 */     { SK_PNMI_HRX_FCS,                      SK_PNMI_HRX_RESERVED},
-/* Bit54 */     { SK_PNMI_HRX_RESERVED,         SK_PNMI_HRX_OVERFLOW},
-/* Bit55 */     { SK_PNMI_HRX_CEXT,             SK_PNMI_HRX_RESERVED},
-/* Bit56 */     { SK_PNMI_HRX_UTILUNDER,        SK_PNMI_HRX_RESERVED},
-/* Bit57 */     { SK_PNMI_HRX_UTILOVER,         SK_PNMI_HRX_RESERVED},
-/* Bit58 */     { SK_PNMI_HRX_64,                       SK_PNMI_HRX_RESERVED},
-/* Bit59 */     { SK_PNMI_HRX_127,                      SK_PNMI_HRX_RESERVED},
-/* Bit60 */     { SK_PNMI_HRX_255,                      SK_PNMI_HRX_RESERVED},
-/* Bit61 */     { SK_PNMI_HRX_511,                      SK_PNMI_HRX_RESERVED},
-/* Bit62 */     { SK_PNMI_HRX_1023,             SK_PNMI_HRX_RESERVED},
-/* Bit63 */     { SK_PNMI_HRX_MAX,                      SK_PNMI_HRX_RESERVED}
-};
-
-/*
- * Table for hardware register saving on resets and port switches
- */
-PNMI_STATIC const SK_PNMI_STATADDR StatAddr[SK_PNMI_MAX_IDX][SK_PNMI_MAC_TYPES] = {
-        /* SK_PNMI_HTX */
-        {{XM_TXF_OK, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_OCTETHIGH */
-        {{XM_TXO_OK_HI, SK_TRUE}, {GM_TXO_OK_HI, SK_TRUE}},
-        /* SK_PNMI_HTX_OCTETLOW */
-        {{XM_TXO_OK_LO, SK_FALSE}, {GM_TXO_OK_LO, SK_FALSE}},
-        /* SK_PNMI_HTX_BROADCAST */
-        {{XM_TXF_BC_OK, SK_TRUE}, {GM_TXF_BC_OK, SK_TRUE}},
-        /* SK_PNMI_HTX_MULTICAST */
-        {{XM_TXF_MC_OK, SK_TRUE}, {GM_TXF_MC_OK, SK_TRUE}},
-        /* SK_PNMI_HTX_UNICAST */
-        {{XM_TXF_UC_OK, SK_TRUE}, {GM_TXF_UC_OK, SK_TRUE}},
-        /* SK_PNMI_HTX_BURST */
-        {{XM_TXE_BURST, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_PMACC */
-        {{XM_TXF_MPAUSE, SK_TRUE}, {GM_TXF_MPAUSE, SK_TRUE}},
-        /* SK_PNMI_HTX_MACC */
-        {{XM_TXF_MCTRL, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_COL */
-        {{0, SK_FALSE}, {GM_TXF_COL, SK_TRUE}},
-        /* SK_PNMI_HTX_SINGLE_COL */
-        {{XM_TXF_SNG_COL, SK_TRUE}, {GM_TXF_SNG_COL, SK_TRUE}},
-        /* SK_PNMI_HTX_MULTI_COL */
-        {{XM_TXF_MUL_COL, SK_TRUE}, {GM_TXF_MUL_COL, SK_TRUE}},
-        /* SK_PNMI_HTX_EXCESS_COL */
-        {{XM_TXF_ABO_COL, SK_TRUE}, {GM_TXF_ABO_COL, SK_TRUE}},
-        /* SK_PNMI_HTX_LATE_COL */
-        {{XM_TXF_LAT_COL, SK_TRUE}, {GM_TXF_LAT_COL, SK_TRUE}},
-        /* SK_PNMI_HTX_DEFFERAL */
-        {{XM_TXF_DEF, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_EXCESS_DEF */
-        {{XM_TXF_EX_DEF, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_UNDERRUN */
-        {{XM_TXE_FIFO_UR, SK_TRUE}, {GM_TXE_FIFO_UR, SK_TRUE}},
-        /* SK_PNMI_HTX_CARRIER */
-        {{XM_TXE_CS_ERR, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_UTILUNDER */
-        {{0, SK_FALSE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_UTILOVER */
-        {{0, SK_FALSE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_64 */
-        {{XM_TXF_64B, SK_TRUE}, {GM_TXF_64B, SK_TRUE}},
-        /* SK_PNMI_HTX_127 */
-        {{XM_TXF_127B, SK_TRUE}, {GM_TXF_127B, SK_TRUE}},
-        /* SK_PNMI_HTX_255 */
-        {{XM_TXF_255B, SK_TRUE}, {GM_TXF_255B, SK_TRUE}},
-        /* SK_PNMI_HTX_511 */
-        {{XM_TXF_511B, SK_TRUE}, {GM_TXF_511B, SK_TRUE}},
-        /* SK_PNMI_HTX_1023 */
-        {{XM_TXF_1023B, SK_TRUE}, {GM_TXF_1023B, SK_TRUE}},
-        /* SK_PNMI_HTX_MAX */
-        {{XM_TXF_MAX_SZ, SK_TRUE}, {GM_TXF_1518B, SK_TRUE}},
-        /* SK_PNMI_HTX_LONGFRAMES  */
-        {{XM_TXF_LONG, SK_TRUE}, {GM_TXF_MAX_SZ, SK_TRUE}},
-        /* SK_PNMI_HTX_SYNC */
-        {{0, SK_FALSE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_SYNC_OCTET */
-        {{0, SK_FALSE}, {0, SK_FALSE}},
-        /* SK_PNMI_HTX_RESERVED */
-        {{0, SK_FALSE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX */
-        {{XM_RXF_OK, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_OCTETHIGH */
-        {{XM_RXO_OK_HI, SK_TRUE}, {GM_RXO_OK_HI, SK_TRUE}},
-        /* SK_PNMI_HRX_OCTETLOW */
-        {{XM_RXO_OK_LO, SK_FALSE}, {GM_RXO_OK_LO, SK_FALSE}},
-        /* SK_PNMI_HRX_BADOCTETHIGH */
-        {{0, SK_FALSE}, {GM_RXO_ERR_HI, SK_TRUE}},
-        /* SK_PNMI_HRX_BADOCTETLOW */
-        {{0, SK_FALSE}, {GM_RXO_ERR_LO, SK_TRUE}},
-        /* SK_PNMI_HRX_BROADCAST */
-        {{XM_RXF_BC_OK, SK_TRUE}, {GM_RXF_BC_OK, SK_TRUE}},
-        /* SK_PNMI_HRX_MULTICAST */
-        {{XM_RXF_MC_OK, SK_TRUE}, {GM_RXF_MC_OK, SK_TRUE}},
-        /* SK_PNMI_HRX_UNICAST */
-        {{XM_RXF_UC_OK, SK_TRUE}, {GM_RXF_UC_OK, SK_TRUE}},
-        /* SK_PNMI_HRX_PMACC */
-        {{XM_RXF_MPAUSE, SK_TRUE}, {GM_RXF_MPAUSE, SK_TRUE}},
-        /* SK_PNMI_HRX_MACC */
-        {{XM_RXF_MCTRL, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_PMACC_ERR */
-        {{XM_RXF_INV_MP, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_MACC_UNKWN */
-        {{XM_RXF_INV_MOC, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_BURST */
-        {{XM_RXE_BURST, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_MISSED */
-        {{XM_RXE_FMISS, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_FRAMING */
-        {{XM_RXF_FRA_ERR, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_UNDERSIZE */
-        {{0, SK_FALSE}, {GM_RXF_SHT, SK_TRUE}},
-        /* SK_PNMI_HRX_OVERFLOW */
-        {{XM_RXE_FIFO_OV, SK_TRUE}, {GM_RXE_FIFO_OV, SK_TRUE}},
-        /* SK_PNMI_HRX_JABBER */
-        {{XM_RXF_JAB_PKT, SK_TRUE}, {GM_RXF_JAB_PKT, SK_TRUE}},
-        /* SK_PNMI_HRX_CARRIER */
-        {{XM_RXE_CAR_ERR, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_IRLENGTH */
-        {{XM_RXF_LEN_ERR, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_SYMBOL */
-        {{XM_RXE_SYM_ERR, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_SHORTS */
-        {{XM_RXE_SHT_ERR, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_RUNT */
-        {{XM_RXE_RUNT, SK_TRUE}, {GM_RXE_FRAG, SK_TRUE}},
-        /* SK_PNMI_HRX_TOO_LONG */
-        {{XM_RXF_LNG_ERR, SK_TRUE}, {GM_RXF_LNG_ERR, SK_TRUE}},
-        /* SK_PNMI_HRX_FCS */
-        {{XM_RXF_FCS_ERR, SK_TRUE}, {GM_RXF_FCS_ERR, SK_TRUE}},
-        /* SK_PNMI_HRX_CEXT */
-        {{XM_RXF_CEX_ERR, SK_TRUE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_UTILUNDER */
-        {{0, SK_FALSE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_UTILOVER */
-        {{0, SK_FALSE}, {0, SK_FALSE}},
-        /* SK_PNMI_HRX_64 */
-        {{XM_RXF_64B, SK_TRUE}, {GM_RXF_64B, SK_TRUE}},
-        /* SK_PNMI_HRX_127 */
-        {{XM_RXF_127B, SK_TRUE}, {GM_RXF_127B, SK_TRUE}},
-        /* SK_PNMI_HRX_255 */
-        {{XM_RXF_255B, SK_TRUE}, {GM_RXF_255B, SK_TRUE}},
-        /* SK_PNMI_HRX_511 */
-        {{XM_RXF_511B, SK_TRUE}, {GM_RXF_511B, SK_TRUE}},
-        /* SK_PNMI_HRX_1023 */
-        {{XM_RXF_1023B, SK_TRUE}, {GM_RXF_1023B, SK_TRUE}},
-        /* SK_PNMI_HRX_MAX */
-        {{XM_RXF_MAX_SZ, SK_TRUE}, {GM_RXF_1518B, SK_TRUE}},
-        /* SK_PNMI_HRX_LONGFRAMES */
-        {{0, SK_FALSE}, {GM_RXF_MAX_SZ, SK_TRUE}},
-        /* SK_PNMI_HRX_RESERVED */
-        {{0, SK_FALSE}, {0, SK_FALSE}}
-};
-
-
-/*****************************************************************************
- *
- * Public functions
- *
- */
-
-/*****************************************************************************
- *
- * SkPnmiInit - Init function of PNMI
- *
- * Description:
- *      SK_INIT_DATA: Initialises the data structures
- *      SK_INIT_IO:   Resets the XMAC statistics, determines the device and
- *                    connector type.
- *      SK_INIT_RUN:  Starts a timer event for port switch per hour
- *                    calculation.
- *
- * Returns:
- *      Always 0
- */
-int SkPnmiInit(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Level)              /* Initialization level */
-{
-        unsigned int    PortMax;        /* Number of ports */
-        unsigned int    PortIndex;      /* Current port index in loop */
-        SK_U16          Val16;          /* Multiple purpose 16 bit variable */
-        SK_U8           Val8;           /* Mulitple purpose 8 bit variable */
-        SK_EVPARA       EventParam;     /* Event struct for timer event */
-        SK_PNMI_VCT     *pVctBackupData;
-
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                ("PNMI: SkPnmiInit: Called, level=%d\n", Level));
-
-        switch (Level) {
-
-        case SK_INIT_DATA:
-                SK_MEMSET((char *)&pAC->Pnmi, 0, sizeof(pAC->Pnmi));
-                pAC->Pnmi.TrapBufFree = SK_PNMI_TRAP_QUEUE_LEN;
-                pAC->Pnmi.StartUpTime = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
-                pAC->Pnmi.RlmtChangeThreshold = SK_PNMI_DEF_RLMT_CHG_THRES;
-                for (PortIndex = 0; PortIndex < SK_MAX_MACS; PortIndex ++) {
-
-                        pAC->Pnmi.Port[PortIndex].ActiveFlag = SK_FALSE;
-                        pAC->Pnmi.DualNetActiveFlag = SK_FALSE;
-                }
-
-#ifdef SK_PNMI_CHECK
-                if (SK_PNMI_MAX_IDX != SK_PNMI_CNT_NO) {
-                        
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR049, SK_PNMI_ERR049MSG);
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_INIT | SK_DBGCAT_FATAL,
-                                           ("CounterOffset struct size (%d) differs from "
-                                                "SK_PNMI_MAX_IDX (%d)\n",
-                                                SK_PNMI_CNT_NO, SK_PNMI_MAX_IDX));
-                }
-
-#endif /* SK_PNMI_CHECK */
-                break;
-
-        case SK_INIT_IO:
-                /*
-                 * Reset MAC counters
-                 */
-                PortMax = pAC->GIni.GIMacsFound;
-
-                for (PortIndex = 0; PortIndex < PortMax; PortIndex ++) {
-
-                        pAC->GIni.GIFunc.pFnMacResetCounter(pAC, IoC, PortIndex);
-                }
-                
-                /* Initialize DSP variables for Vct() to 0xff => Never written! */              
-                for (PortIndex = 0; PortIndex < PortMax; PortIndex ++) {
-                        pAC->GIni.GP[PortIndex].PCableLen = 0xff;
-                        pVctBackupData = &pAC->Pnmi.VctBackup[PortIndex];
-                        pVctBackupData->PCableLen = 0xff;
-                }
-                
-                /*
-                 * Get pci bus speed
-                 */
-                SK_IN16(IoC, B0_CTST, &Val16);
-                if ((Val16 & CS_BUS_CLOCK) == 0) {
-
-                        pAC->Pnmi.PciBusSpeed = 33;
-                }
-                else {
-                        pAC->Pnmi.PciBusSpeed = 66;
-                }
-
-                /*
-                 * Get pci bus width
-                 */
-                SK_IN16(IoC, B0_CTST, &Val16);
-                if ((Val16 & CS_BUS_SLOT_SZ) == 0) {
-
-                        pAC->Pnmi.PciBusWidth = 32;
-                }
-                else {
-                        pAC->Pnmi.PciBusWidth = 64;
-                }
-
-                /*
-                 * Get chipset
-                 */
-                switch (pAC->GIni.GIChipId) {
-                case CHIP_ID_GENESIS:
-                        pAC->Pnmi.Chipset = SK_PNMI_CHIPSET_XMAC;
-                        break;
-
-                case CHIP_ID_YUKON:
-                        pAC->Pnmi.Chipset = SK_PNMI_CHIPSET_YUKON;
-                        break;
-
-                default:
-                        break;
-                }
-
-                /*
-                 * Get PMD and DeviceType
-                 */
-                SK_IN8(IoC, B2_PMD_TYP, &Val8);
-                switch (Val8) {
-                case 'S':
-                        pAC->Pnmi.PMD = 3;
-                        if (pAC->GIni.GIMacsFound > 1) {
-
-                                pAC->Pnmi.DeviceType = 0x00020002;
-                        }
-                        else {
-                                pAC->Pnmi.DeviceType = 0x00020001;
-                        }
-                        break;
-
-                case 'L':
-                        pAC->Pnmi.PMD = 2;
-                        if (pAC->GIni.GIMacsFound > 1) {
-
-                                pAC->Pnmi.DeviceType = 0x00020004;
-                        }
-                        else {
-                                pAC->Pnmi.DeviceType = 0x00020003;
-                        }
-                        break;
-
-                case 'C':
-                        pAC->Pnmi.PMD = 4;
-                        if (pAC->GIni.GIMacsFound > 1) {
-
-                                pAC->Pnmi.DeviceType = 0x00020006;
-                        }
-                        else {
-                                pAC->Pnmi.DeviceType = 0x00020005;
-                        }
-                        break;
-
-                case 'T':
-                        pAC->Pnmi.PMD = 5;
-                        if (pAC->GIni.GIMacsFound > 1) {
-
-                                pAC->Pnmi.DeviceType = 0x00020008;
-                        }
-                        else {
-                                pAC->Pnmi.DeviceType = 0x00020007;
-                        }
-                        break;
-
-                default :
-                        pAC->Pnmi.PMD = 1;
-                        pAC->Pnmi.DeviceType = 0;
-                        break;
-                }
-
-                /*
-                 * Get connector
-                 */
-                SK_IN8(IoC, B2_CONN_TYP, &Val8);
-                switch (Val8) {
-                case 'C':
-                        pAC->Pnmi.Connector = 2;
-                        break;
-
-                case 'D':
-                        pAC->Pnmi.Connector = 3;
-                        break;
-
-                case 'F':
-                        pAC->Pnmi.Connector = 4;
-                        break;
-
-                case 'J':
-                        pAC->Pnmi.Connector = 5;
-                        break;
-
-                case 'V':
-                        pAC->Pnmi.Connector = 6;
-                        break;
-
-                default:
-                        pAC->Pnmi.Connector = 1;
-                        break;
-                }
-                break;
-
-        case SK_INIT_RUN:
-                /*
-                 * Start timer for RLMT change counter
-                 */
-                SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-                SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
-                        28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
-                        EventParam);
-                break;
-
-        default:
-                break; /* Nothing todo */
-        }
-
-        return (0);
-}
-
-/*****************************************************************************
- *
- * SkPnmiGetVar - Retrieves the value of a single OID
- *
- * Description:
- *      Calls a general sub-function for all this stuff. If the instance
- *      -1 is passed, the values of all instances are returned in an
- *      array of values.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
- *                               the data.
- *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-static int SkPnmiGetVar(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-SK_U32 Id,              /* Object ID that is to be processed */
-void *pBuf,             /* Buffer to which the management data will be copied */
-unsigned int *pLen,     /* On call: buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                ("PNMI: SkPnmiGetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
-                        Id, *pLen, Instance, NetIndex));
-
-        return (PnmiVar(pAC, IoC, SK_PNMI_GET, Id, (char *)pBuf, pLen,
-                Instance, NetIndex));
-}
-
-/*****************************************************************************
- *
- * SkPnmiPreSetVar - Presets the value of a single OID
- *
- * Description:
- *      Calls a general sub-function for all this stuff. The preset does
- *      the same as a set, but returns just before finally setting the
- *      new value. This is useful to check if a set might be successfull.
- *      If the instance -1 is passed, an array of values is supposed and
- *      all instances of the OID will be set.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-static int SkPnmiPreSetVar(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-SK_U32 Id,              /* Object ID that is to be processed */
-void *pBuf,             /* Buffer to which the management data will be copied */
-unsigned int *pLen,     /* Total length of management data */
-SK_U32 Instance,        /* Instance (1..n) that is to be set or -1 */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                ("PNMI: SkPnmiPreSetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
-                        Id, *pLen, Instance, NetIndex));
-
-
-        return (PnmiVar(pAC, IoC, SK_PNMI_PRESET, Id, (char *)pBuf, pLen,
-                Instance, NetIndex));
-}
-
-/*****************************************************************************
- *
- * SkPnmiSetVar - Sets the value of a single OID
- *
- * Description:
- *      Calls a general sub-function for all this stuff. The preset does
- *      the same as a set, but returns just before finally setting the
- *      new value. This is useful to check if a set might be successfull.
- *      If the instance -1 is passed, an array of values is supposed and
- *      all instances of the OID will be set.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-int SkPnmiSetVar(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-SK_U32 Id,              /* Object ID that is to be processed */
-void *pBuf,             /* Buffer to which the management data will be copied */
-unsigned int *pLen,     /* Total length of management data */
-SK_U32 Instance,        /* Instance (1..n) that is to be set or -1 */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                ("PNMI: SkPnmiSetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
-                        Id, *pLen, Instance, NetIndex));
-
-        return (PnmiVar(pAC, IoC, SK_PNMI_SET, Id, (char *)pBuf, pLen,
-                Instance, NetIndex));
-}
-
-/*****************************************************************************
- *
- * SkPnmiGetStruct - Retrieves the management database in SK_PNMI_STRUCT_DATA
- *
- * Description:
- *      Runs through the IdTable, queries the single OIDs and stores the
- *      returned data into the management database structure
- *      SK_PNMI_STRUCT_DATA. The offset of the OID in the structure
- *      is stored in the IdTable. The return value of the function will also
- *      be stored in SK_PNMI_STRUCT_DATA if the passed buffer has the
- *      minimum size of SK_PNMI_MIN_STRUCT_SIZE.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
- *                               the data.
- *      SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
- */
-int SkPnmiGetStruct(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-void *pBuf,             /* Buffer to which the management data will be copied. */
-unsigned int *pLen,     /* Length of buffer */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        int             Ret;
-        unsigned int    TableIndex;
-        unsigned int    DstOffset;
-        unsigned int    InstanceNo;
-        unsigned int    InstanceCnt;
-        SK_U32          Instance;
-        unsigned int    TmpLen;
-        char            KeyArr[SK_PNMI_VPD_ENTRIES][SK_PNMI_VPD_KEY_SIZE];
-
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                ("PNMI: SkPnmiGetStruct: Called, BufLen=%d, NetIndex=%d\n",
-                        *pLen, NetIndex));
-
-        if (*pLen < SK_PNMI_STRUCT_SIZE) {
-
-                if (*pLen >= SK_PNMI_MIN_STRUCT_SIZE) {
-
-                        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT,
-                                (SK_U32)(-1));
-                }
-
-                *pLen = SK_PNMI_STRUCT_SIZE;
-                return (SK_PNMI_ERR_TOO_SHORT);
-        }
-
-    /*
-     * Check NetIndex
-     */
-        if (NetIndex >= pAC->Rlmt.NumNets) {
-                return (SK_PNMI_ERR_UNKNOWN_NET);
-        }
-
-        /* Update statistic */
-        SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On call");
-
-        if ((Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1)) !=
-                SK_PNMI_ERR_OK) {
-
-                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
-                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                return (Ret);
-        }
-
-        if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
-
-                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
-                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                return (Ret);
-        }
-
-        if ((Ret = SirqUpdate(pAC, IoC)) != SK_PNMI_ERR_OK) {
-
-                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
-                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                return (Ret);
-        }
-
-        /*
-         * Increment semaphores to indicate that an update was
-         * already done
-         */
-        pAC->Pnmi.MacUpdatedFlag ++;
-        pAC->Pnmi.RlmtUpdatedFlag ++;
-        pAC->Pnmi.SirqUpdatedFlag ++;
-
-        /* Get vpd keys for instance calculation */
-        Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr), &TmpLen);
-        if (Ret != SK_PNMI_ERR_OK) {
-
-                pAC->Pnmi.MacUpdatedFlag --;
-                pAC->Pnmi.RlmtUpdatedFlag --;
-                pAC->Pnmi.SirqUpdatedFlag --;
-
-                SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On return");
-                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
-                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                return (SK_PNMI_ERR_GENERAL);
-        }
-
-        /* Retrieve values */
-        SK_MEMSET((char *)pBuf, 0, SK_PNMI_STRUCT_SIZE);
-        for (TableIndex = 0; TableIndex < ID_TABLE_SIZE; TableIndex ++) {
-
-                InstanceNo = IdTable[TableIndex].InstanceNo;
-                for (InstanceCnt = 1; InstanceCnt <= InstanceNo;
-                        InstanceCnt ++) {
-
-                        DstOffset = IdTable[TableIndex].Offset +
-                                (InstanceCnt - 1) *
-                                IdTable[TableIndex].StructSize;
-
-                        /*
-                         * For the VPD the instance is not an index number
-                         * but the key itself. Determin with the instance
-                         * counter the VPD key to be used.
-                         */
-                        if (IdTable[TableIndex].Id == OID_SKGE_VPD_KEY ||
-                                IdTable[TableIndex].Id == OID_SKGE_VPD_VALUE ||
-                                IdTable[TableIndex].Id == OID_SKGE_VPD_ACCESS ||
-                                IdTable[TableIndex].Id == OID_SKGE_VPD_ACTION) {
-
-                                SK_STRNCPY((char *)&Instance, KeyArr[InstanceCnt - 1], 4);
-                        }
-                        else {
-                                Instance = (SK_U32)InstanceCnt;
-                        }
-
-                        TmpLen = *pLen - DstOffset;
-                        Ret = IdTable[TableIndex].Func(pAC, IoC, SK_PNMI_GET,
-                                IdTable[TableIndex].Id, (char *)pBuf +
-                                DstOffset, &TmpLen, Instance, TableIndex, NetIndex);
-
-                        /*
-                         * An unknown instance error means that we reached
-                         * the last instance of that variable. Proceed with
-                         * the next OID in the table and ignore the return
-                         * code.
-                         */
-                        if (Ret == SK_PNMI_ERR_UNKNOWN_INST) {
-
-                break;
-                        }
-
-                        if (Ret != SK_PNMI_ERR_OK) {
-
-                                pAC->Pnmi.MacUpdatedFlag --;
-                                pAC->Pnmi.RlmtUpdatedFlag --;
-                                pAC->Pnmi.SirqUpdatedFlag --;
-
-                                SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On return");
-                                SK_PNMI_SET_STAT(pBuf, Ret, DstOffset);
-                                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                                return (Ret);
-                        }
-                }
-        }
-
-        pAC->Pnmi.MacUpdatedFlag --;
-        pAC->Pnmi.RlmtUpdatedFlag --;
-        pAC->Pnmi.SirqUpdatedFlag --;
-
-        *pLen = SK_PNMI_STRUCT_SIZE;
-        SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On return");
-        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_OK, (SK_U32)(-1));
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * SkPnmiPreSetStruct - Presets the management database in SK_PNMI_STRUCT_DATA
- *
- * Description:
- *      Calls a general sub-function for all this set stuff. The preset does
- *      the same as a set, but returns just before finally setting the
- *      new value. This is useful to check if a set might be successfull.
- *      The sub-function runs through the IdTable, checks which OIDs are able
- *      to set, and calls the handler function of the OID to perform the
- *      preset. The return value of the function will also be stored in
- *      SK_PNMI_STRUCT_DATA if the passed buffer has the minimum size of
- *      SK_PNMI_MIN_STRUCT_SIZE.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- */
-int SkPnmiPreSetStruct(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-void *pBuf,             /* Buffer which contains the data to be set */
-unsigned int *pLen,     /* Length of buffer */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                ("PNMI: SkPnmiPreSetStruct: Called, BufLen=%d, NetIndex=%d\n",
-                        *pLen, NetIndex));
-
-        return (PnmiStruct(pAC, IoC, SK_PNMI_PRESET, (char *)pBuf,
-                                        pLen, NetIndex));
-}
-
-/*****************************************************************************
- *
- * SkPnmiSetStruct - Sets the management database in SK_PNMI_STRUCT_DATA
- *
- * Description:
- *      Calls a general sub-function for all this set stuff. The return value
- *      of the function will also be stored in SK_PNMI_STRUCT_DATA if the
- *      passed buffer has the minimum size of SK_PNMI_MIN_STRUCT_SIZE.
- *      The sub-function runs through the IdTable, checks which OIDs are able
- *      to set, and calls the handler function of the OID to perform the
- *      set. The return value of the function will also be stored in
- *      SK_PNMI_STRUCT_DATA if the passed buffer has the minimum size of
- *      SK_PNMI_MIN_STRUCT_SIZE.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- */
-int SkPnmiSetStruct(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-void *pBuf,             /* Buffer which contains the data to be set */
-unsigned int *pLen,     /* Length of buffer */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                ("PNMI: SkPnmiSetStruct: Called, BufLen=%d, NetIndex=%d\n",
-                        *pLen, NetIndex));
-
-        return (PnmiStruct(pAC, IoC, SK_PNMI_SET, (char *)pBuf,
-                                        pLen, NetIndex));
-}
-
-/*****************************************************************************
- *
- * SkPnmiEvent - Event handler
- *
- * Description:
- *      Handles the following events:
- *      SK_PNMI_EVT_SIRQ_OVERFLOW     When a hardware counter overflows an
- *                                    interrupt will be generated which is
- *                                    first handled by SIRQ which generates a
- *                                    this event. The event increments the
- *                                    upper 32 bit of the 64 bit counter.
- *      SK_PNMI_EVT_SEN_XXX           The event is generated by the I2C module
- *                                    when a sensor reports a warning or
- *                                    error. The event will store a trap
- *                                    message in the trap buffer.
- *      SK_PNMI_EVT_CHG_EST_TIMER     The timer event was initiated by this
- *                                    module and is used to calculate the
- *                                    port switches per hour.
- *      SK_PNMI_EVT_CLEAR_COUNTER     The event clears all counters and
- *                                    timestamps.
- *      SK_PNMI_EVT_XMAC_RESET        The event is generated by the driver
- *                                    before a hard reset of the XMAC is
- *                                    performed. All counters will be saved
- *                                    and added to the hardware counter
- *                                    values after reset to grant continuous
- *                                    counter values.
- *      SK_PNMI_EVT_RLMT_PORT_UP      Generated by RLMT to notify that a port
- *                                    went logically up. A trap message will
- *                                    be stored to the trap buffer.
- *      SK_PNMI_EVT_RLMT_PORT_DOWN    Generated by RLMT to notify that a port
- *                                    went logically down. A trap message will
- *                                    be stored to the trap buffer.
- *      SK_PNMI_EVT_RLMT_SEGMENTATION Generated by RLMT to notify that two
- *                                    spanning tree root bridges were
- *                                    detected. A trap message will be stored
- *                                    to the trap buffer.
- *      SK_PNMI_EVT_RLMT_ACTIVE_DOWN  Notifies PNMI that an active port went
- *                                    down. PNMI will not further add the
- *                                    statistic values to the virtual port.
- *      SK_PNMI_EVT_RLMT_ACTIVE_UP    Notifies PNMI that a port went up and
- *                                    is now an active port. PNMI will now
- *                                    add the statistic data of this port to
- *                                    the virtual port.
- *      SK_PNMI_EVT_RLMT_SET_NETS     Notifies PNMI about the net mode. The first parameter
- *                                    contains the number of nets. 1 means single net, 2 means
- *                                    dual net. The second parameter is -1
- *
- * Returns:
- *      Always 0
- */
-int SkPnmiEvent(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-SK_U32 Event,           /* Event-Id */
-SK_EVPARA Param)        /* Event dependent parameter */
-{
-        unsigned int    PhysPortIndex;
-    unsigned int        MaxNetNumber;
-        int                     CounterIndex;
-        int                     Ret;
-        SK_U16          MacStatus;
-        SK_U64          OverflowStatus;
-        SK_U64          Mask;
-        int                     MacType;
-        SK_U64          Value;
-        SK_U32          Val32;
-        SK_U16          Register;
-        SK_EVPARA       EventParam;
-        SK_U64          NewestValue;
-        SK_U64          OldestValue;
-        SK_U64          Delta;
-        SK_PNMI_ESTIMATE *pEst;
-        SK_U32          NetIndex;
-        SK_GEPORT       *pPrt;
-        SK_PNMI_VCT     *pVctBackupData;
-        SK_U32          RetCode;
-        int             i;
-        SK_U32          CableLength;
-
-
-#ifdef DEBUG
-        if (Event != SK_PNMI_EVT_XMAC_RESET) {
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                        ("PNMI: SkPnmiEvent: Called, Event=0x%x, Param=0x%x\n",
-                        (unsigned int)Event, (unsigned int)Param.Para64));
-        }
-#endif /* DEBUG */
-        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On call");
-
-        MacType = pAC->GIni.GIMacType;
-        
-        switch (Event) {
-
-        case SK_PNMI_EVT_SIRQ_OVERFLOW:
-                PhysPortIndex = (int)Param.Para32[0];
-                MacStatus = (SK_U16)Param.Para32[1];
-#ifdef DEBUG
-                if (PhysPortIndex >= SK_MAX_MACS) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SIRQ_OVERFLOW parameter"
-                                 " wrong, PhysPortIndex=0x%x\n",
-                                PhysPortIndex));
-                        return (0);
-                }
-#endif /* DEBUG */
-                OverflowStatus = 0;
-
-                /*
-                 * Check which source caused an overflow interrupt.
-                 */
-                if ((pAC->GIni.GIFunc.pFnMacOverflow(pAC, IoC, PhysPortIndex,
-                                MacStatus, &OverflowStatus) != 0) ||
-                        (OverflowStatus == 0)) {
-
-                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
-                        return (0);
-                }
-
-                /*
-                 * Check the overflow status register and increment
-                 * the upper dword of corresponding counter.
-                 */
-                for (CounterIndex = 0; CounterIndex < sizeof(Mask) * 8;
-                        CounterIndex ++) {
-
-                        Mask = (SK_U64)1 << CounterIndex;
-                        if ((OverflowStatus & Mask) == 0) {
-
-                                continue;
-                        }
-
-                        switch (StatOvrflwBit[CounterIndex][MacType]) {
-
-                        case SK_PNMI_HTX_UTILUNDER:
-                        case SK_PNMI_HTX_UTILOVER:
-                                if (MacType == SK_MAC_XMAC) {
-                                        XM_IN16(IoC, PhysPortIndex, XM_TX_CMD, &Register);
-                                        Register |= XM_TX_SAM_LINE;
-                                        XM_OUT16(IoC, PhysPortIndex, XM_TX_CMD, Register);
-                                }
-                                break;
-
-                        case SK_PNMI_HRX_UTILUNDER:
-                        case SK_PNMI_HRX_UTILOVER:
-                                if (MacType == SK_MAC_XMAC) {
-                                        XM_IN16(IoC, PhysPortIndex, XM_RX_CMD, &Register);
-                                        Register |= XM_RX_SAM_LINE;
-                                        XM_OUT16(IoC, PhysPortIndex, XM_RX_CMD, Register);
-                                }
-                                break;
-
-                        case SK_PNMI_HTX_OCTETHIGH:
-                        case SK_PNMI_HTX_OCTETLOW:
-                        case SK_PNMI_HTX_RESERVED:
-                        case SK_PNMI_HRX_OCTETHIGH:
-                        case SK_PNMI_HRX_OCTETLOW:
-                        case SK_PNMI_HRX_IRLENGTH:
-                        case SK_PNMI_HRX_RESERVED:
-                        
-                        /*
-                         * the following counters aren't be handled (id > 63)
-                         */
-                        case SK_PNMI_HTX_SYNC:
-                        case SK_PNMI_HTX_SYNC_OCTET:
-                                break;
-
-                        case SK_PNMI_HRX_LONGFRAMES:
-                                if (MacType == SK_MAC_GMAC) {
-                                        pAC->Pnmi.Port[PhysPortIndex].
-                                                CounterHigh[CounterIndex] ++;
-                                }
-                                break;
-
-                        default:
-                                pAC->Pnmi.Port[PhysPortIndex].
-                                        CounterHigh[CounterIndex] ++;
-                        }
-                }
-                break;
-
-        case SK_PNMI_EVT_SEN_WAR_LOW:
-#ifdef DEBUG
-                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_WAR_LOW parameter wrong, SensorIndex=%d\n",
-                                (unsigned int)Param.Para64));
-                        return (0);
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Store a trap message in the trap buffer and generate
-                 * an event for user space applications with the
-                 * SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_WAR_LOW,
-                        (unsigned int)Param.Para64);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-                break;
-
-        case SK_PNMI_EVT_SEN_WAR_UPP:
-#ifdef DEBUG
-                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_WAR_UPP parameter wrong, SensorIndex=%d\n",
-                                (unsigned int)Param.Para64));
-                        return (0);
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Store a trap message in the trap buffer and generate
-                 * an event for user space applications with the
-                 * SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_WAR_UPP,
-                        (unsigned int)Param.Para64);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-                break;
-
-        case SK_PNMI_EVT_SEN_ERR_LOW:
-#ifdef DEBUG
-                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_ERR_LOW parameter wrong, SensorIndex=%d\n",
-                                (unsigned int)Param.Para64));
-                        return (0);
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Store a trap message in the trap buffer and generate
-                 * an event for user space applications with the
-                 * SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_ERR_LOW,
-                        (unsigned int)Param.Para64);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-                break;
-        
-        case SK_PNMI_EVT_SEN_ERR_UPP:
-#ifdef DEBUG
-                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_ERR_UPP parameter wrong, SensorIndex=%d\n",
-                                (unsigned int)Param.Para64));
-                        return (0);
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Store a trap message in the trap buffer and generate
-                 * an event for user space applications with the
-                 * SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_ERR_UPP,
-                        (unsigned int)Param.Para64);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-                break;
-
-        case SK_PNMI_EVT_CHG_EST_TIMER:
-                /*
-                 * Calculate port switch average on a per hour basis
-                 *   Time interval for check       : 28125 ms
-                 *   Number of values for average  : 8
-                 *
-                 * Be careful in changing these values, on change check
-                 *   - typedef of SK_PNMI_ESTIMATE (Size of EstValue
-                 *     array one less than value number)
-                 *   - Timer initialization SkTimerStart() in SkPnmiInit
-                 *   - Delta value below must be multiplicated with
-                 *     power of 2
-                 *
-                 */
-                pEst = &pAC->Pnmi.RlmtChangeEstimate;
-                CounterIndex = pEst->EstValueIndex + 1;
-                if (CounterIndex == 7) {
-
-                        CounterIndex = 0;
-                }
-                pEst->EstValueIndex = CounterIndex;
-
-                NewestValue = pAC->Pnmi.RlmtChangeCts;
-                OldestValue = pEst->EstValue[CounterIndex];
-                pEst->EstValue[CounterIndex] = NewestValue;
-
-                /*
-                 * Calculate average. Delta stores the number of
-                 * port switches per 28125 * 8 = 225000 ms
-                 */
-                if (NewestValue >= OldestValue) {
-
-                        Delta = NewestValue - OldestValue;
-                }
-                else {
-                        /* Overflow situation */
-                        Delta = (SK_U64)(0 - OldestValue) + NewestValue;
-                }
-
-                /*
-                 * Extrapolate delta to port switches per hour.
-                 *     Estimate = Delta * (3600000 / 225000)
-                 *              = Delta * 16
-                 *              = Delta << 4
-                 */
-                pAC->Pnmi.RlmtChangeEstimate.Estimate = Delta << 4;
-
-                /*
-                 * Check if threshold is exceeded. If the threshold is
-                 * permanently exceeded every 28125 ms an event will be
-                 * generated to remind the user of this condition.
-                 */
-                if ((pAC->Pnmi.RlmtChangeThreshold != 0) &&
-                        (pAC->Pnmi.RlmtChangeEstimate.Estimate >=
-                        pAC->Pnmi.RlmtChangeThreshold)) {
-
-                        QueueSimpleTrap(pAC, OID_SKGE_TRAP_RLMT_CHANGE_THRES);
-                        (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-                }
-
-                SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-                SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
-                        28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
-                        EventParam);
-                break;
-
-        case SK_PNMI_EVT_CLEAR_COUNTER:
-                /*
-                 *  Param.Para32[0] contains the NetIndex (0 ..1).
-                 *  Param.Para32[1] is reserved, contains -1.
-                 */
-                NetIndex = (SK_U32)Param.Para32[0];
-
-#ifdef DEBUG
-                if (NetIndex >= pAC->Rlmt.NumNets) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_CLEAR_COUNTER parameter wrong, NetIndex=%d\n",
-                                NetIndex));
-
-                        return (0);
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Set all counters and timestamps to zero.
-                 * The according NetIndex is required as a
-                 * parameter of the event.
-                 */
-                ResetCounter(pAC, IoC, NetIndex);
-                break;
-
-        case SK_PNMI_EVT_XMAC_RESET:
-                /*
-                 * To grant continuous counter values store the current
-                 * XMAC statistic values to the entries 1..n of the
-                 * CounterOffset array. XMAC Errata #2
-                 */
-#ifdef DEBUG
-                if ((unsigned int)Param.Para64 >= SK_MAX_MACS) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_XMAC_RESET parameter wrong, PhysPortIndex=%d\n",
-                                (unsigned int)Param.Para64));
-                        return (0);
-                }
-#endif
-                PhysPortIndex = (unsigned int)Param.Para64;
-
-                /*
-                 * Update XMAC statistic to get fresh values
-                 */
-                Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
-                if (Ret != SK_PNMI_ERR_OK) {
-
-                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
-                        return (0);
-                }
-                /*
-                 * Increment semaphore to indicate that an update was
-                 * already done
-                 */
-                pAC->Pnmi.MacUpdatedFlag ++;
-
-                for (CounterIndex = 0; CounterIndex < SK_PNMI_MAX_IDX;
-                        CounterIndex ++) {
-
-                        if (!StatAddr[CounterIndex][MacType].GetOffset) {
-
-                                continue;
-                        }
-
-                        pAC->Pnmi.Port[PhysPortIndex].CounterOffset[CounterIndex] =
-                                GetPhysStatVal(pAC, IoC, PhysPortIndex, CounterIndex);
-                        
-                        pAC->Pnmi.Port[PhysPortIndex].CounterHigh[CounterIndex] = 0;
-                }
-
-                pAC->Pnmi.MacUpdatedFlag --;
-                break;
-
-        case SK_PNMI_EVT_RLMT_PORT_UP:
-                PhysPortIndex = (unsigned int)Param.Para32[0];
-#ifdef DEBUG
-                if (PhysPortIndex >= SK_MAX_MACS) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_PORT_UP parameter"
-                 " wrong, PhysPortIndex=%d\n", PhysPortIndex));
-
-                        return (0);
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Store a trap message in the trap buffer and generate an event for
-                 * user space applications with the SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueRlmtPortTrap(pAC, OID_SKGE_TRAP_RLMT_PORT_UP, PhysPortIndex);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-
-                /* Bugfix for XMAC errata (#10620)*/
-                if (MacType == SK_MAC_XMAC) {
-                        /* Add incremental difference to offset (#10620)*/
-                        (void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                XM_RXE_SHT_ERR, &Val32);
-                        
-                        Value = (((SK_U64)pAC->Pnmi.Port[PhysPortIndex].
-                                 CounterHigh[SK_PNMI_HRX_SHORTS] << 32) | (SK_U64)Val32);
-                        pAC->Pnmi.Port[PhysPortIndex].CounterOffset[SK_PNMI_HRX_SHORTS] +=
-                                Value - pAC->Pnmi.Port[PhysPortIndex].RxShortZeroMark;
-                }
-                
-                /* Tell VctStatus() that a link was up meanwhile. */
-                pAC->Pnmi.VctStatus[PhysPortIndex] |= SK_PNMI_VCT_LINK;         
-                break;
-
-    case SK_PNMI_EVT_RLMT_PORT_DOWN:
-                PhysPortIndex = (unsigned int)Param.Para32[0];
-
-#ifdef DEBUG
-                if (PhysPortIndex >= SK_MAX_MACS) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_PORT_DOWN parameter"
-                 " wrong, PhysPortIndex=%d\n", PhysPortIndex));
-
-                        return (0);
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Store a trap message in the trap buffer and generate an event for
-                 * user space applications with the SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueRlmtPortTrap(pAC, OID_SKGE_TRAP_RLMT_PORT_DOWN, PhysPortIndex);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-
-                /* Bugfix #10620 - get zero level for incremental difference */
-                if (MacType == SK_MAC_XMAC) {
-
-                        (void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                XM_RXE_SHT_ERR, &Val32);
-                        
-                        pAC->Pnmi.Port[PhysPortIndex].RxShortZeroMark =
-                                (((SK_U64)pAC->Pnmi.Port[PhysPortIndex].
-                                 CounterHigh[SK_PNMI_HRX_SHORTS] << 32) | (SK_U64)Val32);
-                }
-                break;
-
-        case SK_PNMI_EVT_RLMT_ACTIVE_DOWN:
-                PhysPortIndex = (unsigned int)Param.Para32[0];
-                NetIndex = (SK_U32)Param.Para32[1];
-
-#ifdef DEBUG
-                if (PhysPortIndex >= SK_MAX_MACS) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_DOWN parameter too high, PhysPort=%d\n",
-                                PhysPortIndex));
-                }
-
-                if (NetIndex >= pAC->Rlmt.NumNets) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_DOWN parameter too high, NetIndex=%d\n",
-                                NetIndex));
-                }
-#endif /* DEBUG */
-
-                /*
-                 * For now, ignore event if NetIndex != 0.
-                 */
-                if (Param.Para32[1] != 0) {
-
-                        return (0);
-                }
-
-                /*
-                 * Nothing to do if port is already inactive
-                 */
-                if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
-                        return (0);
-                }
-
-                /*
-                 * Update statistic counters to calculate new offset for the virtual
-                 * port and increment semaphore to indicate that an update was already
-                 * done.
-                 */
-                if (MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1) !=
-                        SK_PNMI_ERR_OK) {
-
-                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
-                        return (0);
-                }
-                pAC->Pnmi.MacUpdatedFlag ++;
-
-                /*
-                 * Calculate new counter offset for virtual port to grant continous
-                 * counting on port switches. The virtual port consists of all currently
-                 * active ports. The port down event indicates that a port is removed
-                 * from the virtual port. Therefore add the counter value of the removed
-                 * port to the CounterOffset for the virtual port to grant the same
-                 * counter value.
-                 */
-                for (CounterIndex = 0; CounterIndex < SK_PNMI_MAX_IDX;
-                        CounterIndex ++) {
-
-                        if (!StatAddr[CounterIndex][MacType].GetOffset) {
-
-                                continue;
-                        }
-
-                        Value = GetPhysStatVal(pAC, IoC, PhysPortIndex, CounterIndex);
-
-                        pAC->Pnmi.VirtualCounterOffset[CounterIndex] += Value;
-                }
-
-                /*
-                 * Set port to inactive
-                 */
-                pAC->Pnmi.Port[PhysPortIndex].ActiveFlag = SK_FALSE;
-
-                pAC->Pnmi.MacUpdatedFlag --;
-                break;
-
-        case SK_PNMI_EVT_RLMT_ACTIVE_UP:
-                PhysPortIndex = (unsigned int)Param.Para32[0];
-                NetIndex = (SK_U32)Param.Para32[1];
-
-#ifdef DEBUG
-                if (PhysPortIndex >= SK_MAX_MACS) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_UP parameter too high, PhysPort=%d\n",
-                                PhysPortIndex));
-                }
-
-                if (NetIndex >= pAC->Rlmt.NumNets) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_UP parameter too high, NetIndex=%d\n",
-                                NetIndex));
-                }
-#endif /* DEBUG */
-
-                /*
-                 * For now, ignore event if NetIndex != 0.
-                 */
-                if (Param.Para32[1] != 0) {
-
-                        return (0);
-                }
-
-                /*
-                 * Nothing to do if port is already active
-                 */
-                if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
-                        return (0);
-                }
-
-                /*
-                 * Statistic maintenance
-                 */
-                pAC->Pnmi.RlmtChangeCts ++;
-                pAC->Pnmi.RlmtChangeTime = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
-
-                /*
-                 * Store a trap message in the trap buffer and generate an event for
-                 * user space applications with the SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueRlmtNewMacTrap(pAC, PhysPortIndex);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-
-                /*
-                 * Update statistic counters to calculate new offset for the virtual
-                 * port and increment semaphore to indicate that an update was
-                 * already done.
-                 */
-                if (MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1) !=
-                        SK_PNMI_ERR_OK) {
-
-                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
-                        return (0);
-                }
-                pAC->Pnmi.MacUpdatedFlag ++;
-
-                /*
-                 * Calculate new counter offset for virtual port to grant continous
-                 * counting on port switches. A new port is added to the virtual port.
-                 * Therefore substract the counter value of the new port from the
-                 * CounterOffset for the virtual port to grant the same value.
-                 */
-                for (CounterIndex = 0; CounterIndex < SK_PNMI_MAX_IDX;
-                        CounterIndex ++) {
-
-                        if (!StatAddr[CounterIndex][MacType].GetOffset) {
-
-                                continue;
-                        }
-
-                        Value = GetPhysStatVal(pAC, IoC, PhysPortIndex, CounterIndex);
-
-                        pAC->Pnmi.VirtualCounterOffset[CounterIndex] -= Value;
-                }
-
-                /* Set port to active */
-                pAC->Pnmi.Port[PhysPortIndex].ActiveFlag = SK_TRUE;
-
-                pAC->Pnmi.MacUpdatedFlag --;
-                break;
-
-        case SK_PNMI_EVT_RLMT_SEGMENTATION:
-                /*
-                 * Para.Para32[0] contains the NetIndex.
-                 */
-
-                /*
-                 * Store a trap message in the trap buffer and generate an event for
-                 * user space applications with the SK_DRIVER_SENDEVENT macro.
-                 */
-                QueueSimpleTrap(pAC, OID_SKGE_TRAP_RLMT_SEGMENTATION);
-                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
-                break;
-
-    case SK_PNMI_EVT_RLMT_SET_NETS:
-                /*
-                 *  Param.Para32[0] contains the number of Nets.
-                 *  Param.Para32[1] is reserved, contains -1.
-                 */
-            /*
-         * Check number of nets
-                 */
-                MaxNetNumber = pAC->GIni.GIMacsFound;
-                if (((unsigned int)Param.Para32[0] < 1)
-                        || ((unsigned int)Param.Para32[0] > MaxNetNumber)) {
-                        return (SK_PNMI_ERR_UNKNOWN_NET);
-                }
-
-        if ((unsigned int)Param.Para32[0] == 1) { /* single net mode */
-                pAC->Pnmi.DualNetActiveFlag = SK_FALSE;
-        }
-        else { /* dual net mode */
-                pAC->Pnmi.DualNetActiveFlag = SK_TRUE;
-        }
-        break;
-
-    case SK_PNMI_EVT_VCT_RESET:
-                PhysPortIndex = Param.Para32[0];
-                pPrt = &pAC->GIni.GP[PhysPortIndex];
-                pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
-                
-                if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING) {
-                        RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
-                        if (RetCode == 2) {
-                                /*
-                                 * VCT test is still running.
-                                 * Start VCT timer counter again.
-                                 */
-                                SK_MEMSET((char *) &Param, 0, sizeof(Param));
-                                Param.Para32[0] = PhysPortIndex;
-                                Param.Para32[1] = -1;
-                                SkTimerStart(pAC, IoC,
-                                        &pAC->Pnmi.VctTimeout[PhysPortIndex].VctTimer,
-                                4000000, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Param);
-                                break;
-                        }
-                        pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_PENDING;
-                        pAC->Pnmi.VctStatus[PhysPortIndex] |=
-                                (SK_PNMI_VCT_NEW_VCT_DATA | SK_PNMI_VCT_TEST_DONE);
-                        
-                        /* Copy results for later use to PNMI struct. */
-                        for (i = 0; i < 4; i++)  {
-                                if (pPrt->PMdiPairSts[i] == SK_PNMI_VCT_NORMAL_CABLE) {
-                                        if ((pPrt->PMdiPairLen[i] > 35) &&
-                                                (pPrt->PMdiPairLen[i] < 0xff)) {
-                                                pPrt->PMdiPairSts[i] = SK_PNMI_VCT_IMPEDANCE_MISMATCH;
-                                        }
-                                }
-                                if ((pPrt->PMdiPairLen[i] > 35) &&
-                                        (pPrt->PMdiPairLen[i] != 0xff)) {
-                                        CableLength = 1000 *
-                                                (((175 * pPrt->PMdiPairLen[i]) / 210) - 28);
-                                }
-                                else {
-                                        CableLength = 0;
-                                }
-                                pVctBackupData->PMdiPairLen[i] = CableLength;
-                                pVctBackupData->PMdiPairSts[i] = pPrt->PMdiPairSts[i];
-                        }
-                        
-                        Param.Para32[0] = PhysPortIndex;
-                        Param.Para32[1] = -1;
-                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Param);
-                        SkEventDispatcher(pAC, IoC);
-                }
-                
-                break;
-
-        default:
-                break;
-        }
-
-        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
-        return (0);
-}
-
-
-/******************************************************************************
- *
- * Private functions
- *
- */
-
-/*****************************************************************************
- *
- * PnmiVar - Gets, presets, and sets single OIDs
- *
- * Description:
- *      Looks up the requested OID, calls the corresponding handler
- *      function, and passes the parameters with the get, preset, or
- *      set command. The function is called by SkGePnmiGetVar,
- *      SkGePnmiPreSetVar, or SkGePnmiSetVar.
- *
- * Returns:
- *      SK_PNMI_ERR_XXX. For details have a look at the description of the
- *      calling functions.
- *      SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
- */
-PNMI_STATIC int PnmiVar(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* Total length of pBuf management data  */
-SK_U32 Instance,        /* Instance (1..n) that is to be set or -1 */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        unsigned int    TableIndex;
-        int             Ret;
-
-
-        if ((TableIndex = LookupId(Id)) == (unsigned int)(-1)) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_OID);
-        }
-        
-    /* Check NetIndex */
-        if (NetIndex >= pAC->Rlmt.NumNets) {
-                return (SK_PNMI_ERR_UNKNOWN_NET);
-        }
-
-        SK_PNMI_CHECKFLAGS("PnmiVar: On call");
-
-        Ret = IdTable[TableIndex].Func(pAC, IoC, Action, Id, pBuf, pLen,
-                Instance, TableIndex, NetIndex);
-
-        SK_PNMI_CHECKFLAGS("PnmiVar: On return");
-
-        return (Ret);
-}
-
-/*****************************************************************************
- *
- * PnmiStruct - Presets and Sets data in structure SK_PNMI_STRUCT_DATA
- *
- * Description:
- *      The return value of the function will also be stored in
- *      SK_PNMI_STRUCT_DATA if the passed buffer has the minimum size of
- *      SK_PNMI_MIN_STRUCT_SIZE. The sub-function runs through the IdTable,
- *      checks which OIDs are able to set, and calls the handler function of
- *      the OID to perform the set. The return value of the function will
- *      also be stored in SK_PNMI_STRUCT_DATA if the passed buffer has the
- *      minimum size of SK_PNMI_MIN_STRUCT_SIZE. The function is called
- *      by SkGePnmiPreSetStruct and SkGePnmiSetStruct.
- *
- * Returns:
- *      SK_PNMI_ERR_XXX. The codes are described in the calling functions.
- *      SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
- */
-PNMI_STATIC int PnmiStruct(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int  Action,    /* PRESET/SET action to be performed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* Length of pBuf management data buffer */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        int             Ret;
-        unsigned int    TableIndex;
-        unsigned int    DstOffset;
-        unsigned int    Len;
-        unsigned int    InstanceNo;
-        unsigned int    InstanceCnt;
-        SK_U32          Instance;
-        SK_U32          Id;
-
-
-        /* Check if the passed buffer has the right size */
-        if (*pLen < SK_PNMI_STRUCT_SIZE) {
-
-                /* Check if we can return the error within the buffer */
-                if (*pLen >= SK_PNMI_MIN_STRUCT_SIZE) {
-
-                        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT,
-                                (SK_U32)(-1));
-                }
-
-                *pLen = SK_PNMI_STRUCT_SIZE;
-                return (SK_PNMI_ERR_TOO_SHORT);
-        }
-        
-    /* Check NetIndex */
-        if (NetIndex >= pAC->Rlmt.NumNets) {
-                return (SK_PNMI_ERR_UNKNOWN_NET);
-        }
-        
-        SK_PNMI_CHECKFLAGS("PnmiStruct: On call");
-
-        /*
-         * Update the values of RLMT and SIRQ and increment semaphores to
-         * indicate that an update was already done.
-         */
-        if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
-
-                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
-                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                return (Ret);
-        }
-
-        if ((Ret = SirqUpdate(pAC, IoC)) != SK_PNMI_ERR_OK) {
-
-                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
-                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                return (Ret);
-        }
-
-        pAC->Pnmi.RlmtUpdatedFlag ++;
-        pAC->Pnmi.SirqUpdatedFlag ++;
-
-        /* Preset/Set values */
-        for (TableIndex = 0; TableIndex < ID_TABLE_SIZE; TableIndex ++) {
-
-                if ((IdTable[TableIndex].Access != SK_PNMI_RW) &&
-                        (IdTable[TableIndex].Access != SK_PNMI_WO)) {
-
-                        continue;
-                }
-
-                InstanceNo = IdTable[TableIndex].InstanceNo;
-                Id = IdTable[TableIndex].Id;
-
-                for (InstanceCnt = 1; InstanceCnt <= InstanceNo;
-                        InstanceCnt ++) {
-
-                        DstOffset = IdTable[TableIndex].Offset +
-                                (InstanceCnt - 1) *
-                                IdTable[TableIndex].StructSize;
-
-                        /*
-                         * Because VPD multiple instance variables are
-                         * not setable we do not need to evaluate VPD
-                         * instances. Have a look to VPD instance
-                         * calculation in SkPnmiGetStruct().
-                         */
-                        Instance = (SK_U32)InstanceCnt;
-
-                        /*
-                         * Evaluate needed buffer length
-                         */
-                        Len = 0;
-                        Ret = IdTable[TableIndex].Func(pAC, IoC,
-                                SK_PNMI_GET, IdTable[TableIndex].Id,
-                                NULL, &Len, Instance, TableIndex, NetIndex);
-
-                        if (Ret == SK_PNMI_ERR_UNKNOWN_INST) {
-
-                                break;
-                        }
-                        if (Ret != SK_PNMI_ERR_TOO_SHORT) {
-
-                                pAC->Pnmi.RlmtUpdatedFlag --;
-                                pAC->Pnmi.SirqUpdatedFlag --;
-
-                                SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
-                                SK_PNMI_SET_STAT(pBuf,
-                                        SK_PNMI_ERR_GENERAL, DstOffset);
-                                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        if (Id == OID_SKGE_VPD_ACTION) {
-
-                                switch (*(pBuf + DstOffset)) {
-
-                                case SK_PNMI_VPD_CREATE:
-                                        Len = 3 + *(pBuf + DstOffset + 3);
-                                        break;
-
-                                case SK_PNMI_VPD_DELETE:
-                                        Len = 3;
-                                        break;
-
-                                default:
-                                        Len = 1;
-                                        break;
-                                }
-                        }
-
-                        /* Call the OID handler function */
-                        Ret = IdTable[TableIndex].Func(pAC, IoC, Action,
-                                IdTable[TableIndex].Id, pBuf + DstOffset,
-                                &Len, Instance, TableIndex, NetIndex);
-
-                        if (Ret != SK_PNMI_ERR_OK) {
-
-                                pAC->Pnmi.RlmtUpdatedFlag --;
-                                pAC->Pnmi.SirqUpdatedFlag --;
-
-                                SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
-                                SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_BAD_VALUE,
-                                        DstOffset);
-                                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-                }
-        }
-
-        pAC->Pnmi.RlmtUpdatedFlag --;
-        pAC->Pnmi.SirqUpdatedFlag --;
-
-        SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
-        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_OK, (SK_U32)(-1));
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * LookupId - Lookup an OID in the IdTable
- *
- * Description:
- *      Scans the IdTable to find the table entry of an OID.
- *
- * Returns:
- *      The table index or -1 if not found.
- */
-PNMI_STATIC int LookupId(
-SK_U32 Id)              /* Object identifier to be searched */
-{
-        int i;
-
-        for (i = 0; i < ID_TABLE_SIZE; i++) {
-
-                if (IdTable[i].Id == Id) {
-
-                        return i;
-                }
-        }
-
-        return (-1);
-}
-
-/*****************************************************************************
- *
- * OidStruct - Handler of OID_SKGE_ALL_DATA
- *
- * Description:
- *      This OID performs a Get/Preset/SetStruct call and returns all data
- *      in a SK_PNMI_STRUCT_DATA structure.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int OidStruct(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        if (Id != OID_SKGE_ALL_DATA) {
-
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR003,
-                        SK_PNMI_ERR003MSG);
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_GENERAL);
-        }
-
-        /*
-         * Check instance. We only handle single instance variables
-         */
-        if (Instance != (SK_U32)(-1) && Instance != 1) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_INST);
-        }
-
-        switch (Action) {
-
-        case SK_PNMI_GET:
-                return (SkPnmiGetStruct(pAC, IoC, pBuf, pLen, NetIndex));
-
-        case SK_PNMI_PRESET:
-                return (SkPnmiPreSetStruct(pAC, IoC, pBuf, pLen, NetIndex));
-
-        case SK_PNMI_SET:
-                return (SkPnmiSetStruct(pAC, IoC, pBuf, pLen, NetIndex));
-        }
-
-        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR004, SK_PNMI_ERR004MSG);
-
-        *pLen = 0;
-        return (SK_PNMI_ERR_GENERAL);
-}
-
-/*****************************************************************************
- *
- * Perform - OID handler of OID_SKGE_ACTION
- *
- * Description:
- *      None.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int Perform(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        int     Ret;
-        SK_U32  ActionOp;
-
-
-        /*
-         * Check instance. We only handle single instance variables
-         */
-        if (Instance != (SK_U32)(-1) && Instance != 1) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_INST);
-        }
-
-        if (*pLen < sizeof(SK_U32)) {
-
-                *pLen = sizeof(SK_U32);
-                return (SK_PNMI_ERR_TOO_SHORT);
-        }
-
-        /* Check if a get should be performed */
-        if (Action == SK_PNMI_GET) {
-
-                /* A get is easy. We always return the same value */
-                ActionOp = (SK_U32)SK_PNMI_ACT_IDLE;
-                SK_PNMI_STORE_U32(pBuf, ActionOp);
-                *pLen = sizeof(SK_U32);
-
-                return (SK_PNMI_ERR_OK);
-        }
-
-        /* Continue with PRESET/SET action */
-        if (*pLen > sizeof(SK_U32)) {
-
-                return (SK_PNMI_ERR_BAD_VALUE);
-        }
-
-        /* Check if the command is a known one */
-        SK_PNMI_READ_U32(pBuf, ActionOp);
-        if (*pLen > sizeof(SK_U32) ||
-                (ActionOp != SK_PNMI_ACT_IDLE &&
-                ActionOp != SK_PNMI_ACT_RESET &&
-                ActionOp != SK_PNMI_ACT_SELFTEST &&
-                ActionOp != SK_PNMI_ACT_RESETCNT)) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_BAD_VALUE);
-        }
-
-        /* A preset ends here */
-        if (Action == SK_PNMI_PRESET) {
-
-                return (SK_PNMI_ERR_OK);
-        }
-
-        switch (ActionOp) {
-
-        case SK_PNMI_ACT_IDLE:
-                /* Nothing to do */
-                break;
-
-        case SK_PNMI_ACT_RESET:
-                /*
-                 * Perform a driver reset or something that comes near
-                 * to this.
-                 */
-                Ret = SK_DRIVER_RESET(pAC, IoC);
-                if (Ret != 0) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR005,
-                                SK_PNMI_ERR005MSG);
-
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-                break;
-
-        case SK_PNMI_ACT_SELFTEST:
-                /*
-                 * Perform a driver selftest or something similar to this.
-                 * Currently this feature is not used and will probably
-                 * implemented in another way.
-                 */
-                Ret = SK_DRIVER_SELFTEST(pAC, IoC);
-                pAC->Pnmi.TestResult = Ret;
-                break;
-
-        case SK_PNMI_ACT_RESETCNT:
-                /* Set all counters and timestamps to zero */
-                ResetCounter(pAC, IoC, NetIndex);
-                break;
-
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR006,
-                        SK_PNMI_ERR006MSG);
-
-                return (SK_PNMI_ERR_GENERAL);
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * Mac8023Stat - OID handler of OID_GEN_XXX and OID_802_3_XXX
- *
- * Description:
- *      Retrieves the statistic values of the virtual port (logical
- *      index 0). Only special OIDs of NDIS are handled which consist
- *      of a 32 bit instead of a 64 bit value. The OIDs are public
- *      because perhaps some other platform can use them too.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int Mac8023Stat(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex,        /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        int     Ret;
-        SK_U64  StatVal;
-        SK_U32  StatVal32;
-        SK_BOOL Is64BitReq = SK_FALSE;
-
-        /*
-         * Only the active Mac is returned
-         */
-        if (Instance != (SK_U32)(-1) && Instance != 1) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_INST);
-        }
-
-        /*
-         * Check action type
-         */
-        if (Action != SK_PNMI_GET) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_READ_ONLY);
-        }
-
-        /* Check length */
-        switch (Id) {
-
-        case OID_802_3_PERMANENT_ADDRESS:
-        case OID_802_3_CURRENT_ADDRESS:
-                if (*pLen < sizeof(SK_MAC_ADDR)) {
-
-                        *pLen = sizeof(SK_MAC_ADDR);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        default:
-#ifndef SK_NDIS_64BIT_CTR
-                if (*pLen < sizeof(SK_U32)) {
-                        *pLen = sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-
-#else /* SK_NDIS_64BIT_CTR */
-
-                /* for compatibility, at least 32bit are required for OID */
-                if (*pLen < sizeof(SK_U32)) {
-                        /*
-                        * but indicate handling for 64bit values,
-                        * if insufficient space is provided
-                        */
-                        *pLen = sizeof(SK_U64);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-
-                Is64BitReq = (*pLen < sizeof(SK_U64)) ? SK_FALSE : SK_TRUE;
-#endif /* SK_NDIS_64BIT_CTR */
-                break;
-        }
-
-        /*
-         * Update all statistics, because we retrieve virtual MAC, which
-         * consists of multiple physical statistics and increment semaphore
-         * to indicate that an update was already done.
-         */
-        Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
-        if ( Ret != SK_PNMI_ERR_OK) {
-
-                *pLen = 0;
-                return (Ret);
-        }
-        pAC->Pnmi.MacUpdatedFlag ++;
-
-        /*
-         * Get value (MAC Index 0 identifies the virtual MAC)
-         */
-        switch (Id) {
-
-        case OID_802_3_PERMANENT_ADDRESS:
-                CopyMac(pBuf, &pAC->Addr.Net[NetIndex].PermanentMacAddress);
-                *pLen = sizeof(SK_MAC_ADDR);
-                break;
-
-        case OID_802_3_CURRENT_ADDRESS:
-                CopyMac(pBuf, &pAC->Addr.Net[NetIndex].CurrentMacAddress);
-                *pLen = sizeof(SK_MAC_ADDR);
-                break;
-
-        default:
-                StatVal = GetStatVal(pAC, IoC, 0, IdTable[TableIndex].Param, NetIndex);
-
-                /* by default 32bit values are evaluated */
-                if (!Is64BitReq) {
-                        StatVal32 = (SK_U32)StatVal;
-                        SK_PNMI_STORE_U32(pBuf, StatVal32);
-                        *pLen = sizeof(SK_U32);
-                }
-                else {
-                        SK_PNMI_STORE_U64(pBuf, StatVal);
-                        *pLen = sizeof(SK_U64);
-                }
-                break;
-        }
-
-        pAC->Pnmi.MacUpdatedFlag --;
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * MacPrivateStat - OID handler function of OID_SKGE_STAT_XXX
- *
- * Description:
- *      Retrieves the MAC statistic data.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int MacPrivateStat(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        unsigned int    LogPortMax;
-        unsigned int    LogPortIndex;
-        unsigned int    PhysPortMax;
-        unsigned int    Limit;
-        unsigned int    Offset;
-        int                             MacType;
-        int                             Ret;
-        SK_U64                  StatVal;
-        
-        
-
-        /* Calculate instance if wished. MAC index 0 is the virtual MAC */
-        PhysPortMax = pAC->GIni.GIMacsFound;
-        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
-        
-        MacType = pAC->GIni.GIMacType;
-
-        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
-                LogPortMax--;
-        }
-
-        if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
-                /* Check instance range */
-                if ((Instance < 1) || (Instance > LogPortMax)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-                LogPortIndex = SK_PNMI_PORT_INST2LOG(Instance);
-                Limit = LogPortIndex + 1;
-        }
-
-        else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
-
-                LogPortIndex = 0;
-                Limit = LogPortMax;
-        }
-
-        /* Check action */
-        if (Action != SK_PNMI_GET) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_READ_ONLY);
-        }
-
-        /* Check length */
-        if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U64)) {
-
-                *pLen = (Limit - LogPortIndex) * sizeof(SK_U64);
-                return (SK_PNMI_ERR_TOO_SHORT);
-        }
-
-        /*
-         * Update MAC statistic and increment semaphore to indicate that
-         * an update was already done.
-         */
-        Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
-        if (Ret != SK_PNMI_ERR_OK) {
-
-                *pLen = 0;
-                return (Ret);
-        }
-        pAC->Pnmi.MacUpdatedFlag ++;
-
-        /* Get value */
-        Offset = 0;
-        for (; LogPortIndex < Limit; LogPortIndex ++) {
-
-                switch (Id) {
-
-/* XXX not yet implemented due to XMAC problems
-                case OID_SKGE_STAT_TX_UTIL:
-                        return (SK_PNMI_ERR_GENERAL);
-*/
-/* XXX not yet implemented due to XMAC problems
-                case OID_SKGE_STAT_RX_UTIL:
-                        return (SK_PNMI_ERR_GENERAL);
-*/
-                case OID_SKGE_STAT_RX:
-                        if (MacType == SK_MAC_GMAC) {
-                                StatVal =
-                                        GetStatVal(pAC, IoC, LogPortIndex,
-                                                           SK_PNMI_HRX_BROADCAST, NetIndex) +
-                                        GetStatVal(pAC, IoC, LogPortIndex,
-                                                           SK_PNMI_HRX_MULTICAST, NetIndex) +
-                                        GetStatVal(pAC, IoC, LogPortIndex,
-                                                           SK_PNMI_HRX_UNICAST, NetIndex) +
-                                        GetStatVal(pAC, IoC, LogPortIndex,
-                                                           SK_PNMI_HRX_UNDERSIZE, NetIndex);
-                        }
-                        else {
-                                StatVal = GetStatVal(pAC, IoC, LogPortIndex,
-                                        IdTable[TableIndex].Param, NetIndex);
-                        }
-                        break;
-
-                case OID_SKGE_STAT_TX:
-                        if (MacType == SK_MAC_GMAC) {
-                                StatVal =
-                                        GetStatVal(pAC, IoC, LogPortIndex,
-                                                           SK_PNMI_HTX_BROADCAST, NetIndex) +
-                                        GetStatVal(pAC, IoC, LogPortIndex,
-                                                           SK_PNMI_HTX_MULTICAST, NetIndex) +
-                                        GetStatVal(pAC, IoC, LogPortIndex,
-                                                           SK_PNMI_HTX_UNICAST, NetIndex);
-                        }
-                        else {
-                                StatVal = GetStatVal(pAC, IoC, LogPortIndex,
-                                        IdTable[TableIndex].Param, NetIndex);
-                        }
-                        break;
-
-                default:
-                        StatVal = GetStatVal(pAC, IoC, LogPortIndex,
-                                IdTable[TableIndex].Param, NetIndex);
-                }
-                SK_PNMI_STORE_U64(pBuf + Offset, StatVal);
-
-                Offset += sizeof(SK_U64);
-        }
-        *pLen = Offset;
-
-        pAC->Pnmi.MacUpdatedFlag --;
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * Addr - OID handler function of OID_SKGE_PHYS_CUR_ADDR and _FAC_ADDR
- *
- * Description:
- *      Get/Presets/Sets the current and factory MAC address. The MAC
- *      address of the virtual port, which is reported to the OS, may
- *      not be changed, but the physical ones. A set to the virtual port
- *      will be ignored. No error should be reported because otherwise
- *      a multiple instance set (-1) would always fail.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int Addr(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        int             Ret;
-        unsigned int    LogPortMax;
-        unsigned int    PhysPortMax;
-        unsigned int    LogPortIndex;
-        unsigned int    PhysPortIndex;
-        unsigned int    Limit;
-        unsigned int    Offset = 0;
-
-        /*
-         * Calculate instance if wished. MAC index 0 is the virtual
-         * MAC.
-         */
-        PhysPortMax = pAC->GIni.GIMacsFound;
-        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
-
-        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
-                LogPortMax--;
-        }
-
-        if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
-                /* Check instance range */
-                if ((Instance < 1) || (Instance > LogPortMax)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-                LogPortIndex = SK_PNMI_PORT_INST2LOG(Instance);
-                Limit = LogPortIndex + 1;
-        }
-        else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
-
-                LogPortIndex = 0;
-                Limit = LogPortMax;
-        }
-
-        /*
-         * Perform Action
-         */
-        if (Action == SK_PNMI_GET) {
-
-                /* Check length */
-                if (*pLen < (Limit - LogPortIndex) * 6) {
-
-                        *pLen = (Limit - LogPortIndex) * 6;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-
-                /*
-                 * Get value
-                 */
-                for (; LogPortIndex < Limit; LogPortIndex ++) {
-
-                        switch (Id) {
-
-                        case OID_SKGE_PHYS_CUR_ADDR:
-                                if (LogPortIndex == 0) {
-                                        CopyMac(pBuf + Offset, &pAC->Addr.Net[NetIndex].CurrentMacAddress);
-                                }
-                                else {
-                                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
-
-                                        CopyMac(pBuf + Offset,
-                                                &pAC->Addr.Port[PhysPortIndex].CurrentMacAddress);
-                                }
-                                Offset += 6;
-                                break;
-
-                        case OID_SKGE_PHYS_FAC_ADDR:
-                                if (LogPortIndex == 0) {
-                                        CopyMac(pBuf + Offset,
-                                                &pAC->Addr.Net[NetIndex].PermanentMacAddress);
-                                }
-                                else {
-                                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                pAC, LogPortIndex);
-
-                                        CopyMac(pBuf + Offset,
-                                                &pAC->Addr.Port[PhysPortIndex].PermanentMacAddress);
-                                }
-                                Offset += 6;
-                                break;
-
-                        default:
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR008,
-                                        SK_PNMI_ERR008MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                }
-
-                *pLen = Offset;
-        }
-        else {
-                /*
-                 * The logical MAC address may not be changed only
-                 * the physical ones
-                 */
-                if (Id == OID_SKGE_PHYS_FAC_ADDR) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_READ_ONLY);
-                }
-
-                /*
-                 * Only the current address may be changed
-                 */
-                if (Id != OID_SKGE_PHYS_CUR_ADDR) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR009,
-                                SK_PNMI_ERR009MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                /* Check length */
-                if (*pLen < (Limit - LogPortIndex) * 6) {
-
-                        *pLen = (Limit - LogPortIndex) * 6;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                if (*pLen > (Limit - LogPortIndex) * 6) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_BAD_VALUE);
-                }
-
-                /*
-                 * Check Action
-                 */
-                if (Action == SK_PNMI_PRESET) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_OK);
-                }
-
-                /*
-                 * Set OID_SKGE_MAC_CUR_ADDR
-                 */
-                for (; LogPortIndex < Limit; LogPortIndex ++, Offset += 6) {
-
-                        /*
-                         * A set to virtual port and set of broadcast
-                         * address will be ignored
-                         */
-                        if (LogPortIndex == 0 || SK_MEMCMP(pBuf + Offset,
-                                "\xff\xff\xff\xff\xff\xff", 6) == 0) {
-
-                                continue;
-                        }
-
-                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC,
-                                LogPortIndex);
-
-                        Ret = SkAddrOverride(pAC, IoC, PhysPortIndex,
-                                (SK_MAC_ADDR *)(pBuf + Offset),
-                                (LogPortIndex == 0 ? SK_ADDR_VIRTUAL_ADDRESS :
-                                SK_ADDR_PHYSICAL_ADDRESS));
-                        if (Ret != SK_ADDR_OVERRIDE_SUCCESS) {
-
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                }
-                *pLen = Offset;
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * CsumStat - OID handler function of OID_SKGE_CHKSM_XXX
- *
- * Description:
- *      Retrieves the statistic values of the CSUM module. The CSUM data
- *      structure must be available in the SK_AC even if the CSUM module
- *      is not included, because PNMI reads the statistic data from the
- *      CSUM part of SK_AC directly.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int CsumStat(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        unsigned int    Index;
-        unsigned int    Limit;
-        unsigned int    Offset = 0;
-        SK_U64          StatVal;
-
-
-        /*
-         * Calculate instance if wished
-         */
-        if (Instance != (SK_U32)(-1)) {
-
-                if ((Instance < 1) || (Instance > SKCS_NUM_PROTOCOLS)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-                Index = (unsigned int)Instance - 1;
-                Limit = Index + 1;
-        }
-        else {
-                Index = 0;
-                Limit = SKCS_NUM_PROTOCOLS;
-        }
-
-        /*
-         * Check action
-         */
-        if (Action != SK_PNMI_GET) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_READ_ONLY);
-        }
-
-        /* Check length */
-        if (*pLen < (Limit - Index) * sizeof(SK_U64)) {
-
-                *pLen = (Limit - Index) * sizeof(SK_U64);
-                return (SK_PNMI_ERR_TOO_SHORT);
-        }
-
-        /*
-         * Get value
-         */
-        for (; Index < Limit; Index ++) {
-
-                switch (Id) {
-
-                case OID_SKGE_CHKSM_RX_OK_CTS:
-                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].RxOkCts;
-                        break;
-
-                case OID_SKGE_CHKSM_RX_UNABLE_CTS:
-                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].RxUnableCts;
-                        break;
-
-                case OID_SKGE_CHKSM_RX_ERR_CTS:
-                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].RxErrCts;
-                        break;
-
-                case OID_SKGE_CHKSM_TX_OK_CTS:
-                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].TxOkCts;
-                        break;
-
-                case OID_SKGE_CHKSM_TX_UNABLE_CTS:
-                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].TxUnableCts;
-                        break;
-
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR010,
-                                SK_PNMI_ERR010MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                SK_PNMI_STORE_U64(pBuf + Offset, StatVal);
-                Offset += sizeof(SK_U64);
-        }
-
-        /*
-         * Store used buffer space
-         */
-        *pLen = Offset;
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * SensorStat - OID handler function of OID_SKGE_SENSOR_XXX
- *
- * Description:
- *      Retrieves the statistic values of the I2C module, which handles
- *      the temperature and voltage sensors.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int SensorStat(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        unsigned int    i;
-        unsigned int    Index;
-        unsigned int    Limit;
-        unsigned int    Offset;
-        unsigned int    Len;
-        SK_U32          Val32;
-        SK_U64          Val64;
-
-
-        /*
-         * Calculate instance if wished
-         */
-        if ((Instance != (SK_U32)(-1))) {
-
-                if ((Instance < 1) || (Instance > (SK_U32)pAC->I2c.MaxSens)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-
-                Index = (unsigned int)Instance -1;
-                Limit = (unsigned int)Instance;
-        }
-        else {
-                Index = 0;
-                Limit = (unsigned int) pAC->I2c.MaxSens;
-        }
-
-        /*
-         * Check action
-         */
-        if (Action != SK_PNMI_GET) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_READ_ONLY);
-        }
-
-        /* Check length */
-        switch (Id) {
-
-        case OID_SKGE_SENSOR_VALUE:
-        case OID_SKGE_SENSOR_WAR_THRES_LOW:
-        case OID_SKGE_SENSOR_WAR_THRES_UPP:
-        case OID_SKGE_SENSOR_ERR_THRES_LOW:
-        case OID_SKGE_SENSOR_ERR_THRES_UPP:
-                if (*pLen < (Limit - Index) * sizeof(SK_U32)) {
-
-                        *pLen = (Limit - Index) * sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        case OID_SKGE_SENSOR_DESCR:
-                for (Offset = 0, i = Index; i < Limit; i ++) {
-
-                        Len = (unsigned int)
-                                SK_STRLEN(pAC->I2c.SenTable[i].SenDesc) + 1;
-                        if (Len >= SK_PNMI_STRINGLEN2) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR011,
-                                        SK_PNMI_ERR011MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        Offset += Len;
-                }
-                if (*pLen < Offset) {
-
-                        *pLen = Offset;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        case OID_SKGE_SENSOR_INDEX:
-        case OID_SKGE_SENSOR_TYPE:
-        case OID_SKGE_SENSOR_STATUS:
-                if (*pLen < Limit - Index) {
-
-                        *pLen = Limit - Index;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        case OID_SKGE_SENSOR_WAR_CTS:
-        case OID_SKGE_SENSOR_WAR_TIME:
-        case OID_SKGE_SENSOR_ERR_CTS:
-        case OID_SKGE_SENSOR_ERR_TIME:
-                if (*pLen < (Limit - Index) * sizeof(SK_U64)) {
-
-                        *pLen = (Limit - Index) * sizeof(SK_U64);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR012,
-                        SK_PNMI_ERR012MSG);
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_GENERAL);
-
-        }
-
-        /*
-         * Get value
-         */
-        for (Offset = 0; Index < Limit; Index ++) {
-
-                switch (Id) {
-
-                case OID_SKGE_SENSOR_INDEX:
-                        *(pBuf + Offset) = (char)Index;
-                        Offset += sizeof(char);
-                        break;
-
-                case OID_SKGE_SENSOR_DESCR:
-                        Len = SK_STRLEN(pAC->I2c.SenTable[Index].SenDesc);
-                        SK_MEMCPY(pBuf + Offset + 1,
-                                pAC->I2c.SenTable[Index].SenDesc, Len);
-                        *(pBuf + Offset) = (char)Len;
-                        Offset += Len + 1;
-                        break;
-
-                case OID_SKGE_SENSOR_TYPE:
-                        *(pBuf + Offset) =
-                                (char)pAC->I2c.SenTable[Index].SenType;
-                        Offset += sizeof(char);
-                        break;
-
-                case OID_SKGE_SENSOR_VALUE:
-                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].SenValue;
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                        Offset += sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_SENSOR_WAR_THRES_LOW:
-                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].
-                                SenThreWarnLow;
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                        Offset += sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_SENSOR_WAR_THRES_UPP:
-                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].
-                                SenThreWarnHigh;
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                        Offset += sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_SENSOR_ERR_THRES_LOW:
-                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].
-                                SenThreErrLow;
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                        Offset += sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_SENSOR_ERR_THRES_UPP:
-                        Val32 = pAC->I2c.SenTable[Index].SenThreErrHigh;
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                        Offset += sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_SENSOR_STATUS:
-                        *(pBuf + Offset) =
-                                (char)pAC->I2c.SenTable[Index].SenErrFlag;
-                        Offset += sizeof(char);
-                        break;
-
-                case OID_SKGE_SENSOR_WAR_CTS:
-                        Val64 = pAC->I2c.SenTable[Index].SenWarnCts;
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_SENSOR_ERR_CTS:
-                        Val64 = pAC->I2c.SenTable[Index].SenErrCts;
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_SENSOR_WAR_TIME:
-                        Val64 = SK_PNMI_HUNDREDS_SEC(pAC->I2c.SenTable[Index].
-                                SenBegWarnTS);
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_SENSOR_ERR_TIME:
-                        Val64 = SK_PNMI_HUNDREDS_SEC(pAC->I2c.SenTable[Index].
-                                SenBegErrTS);
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                default:
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
-                                ("SensorStat: Unknown OID should be handled before"));
-
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-        }
-
-        /*
-         * Store used buffer space
-         */
-        *pLen = Offset;
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * Vpd - OID handler function of OID_SKGE_VPD_XXX
- *
- * Description:
- *      Get/preset/set of VPD data. As instance the name of a VPD key
- *      can be passed. The Instance parameter is a SK_U32 and can be
- *      used as a string buffer for the VPD key, because their maximum
- *      length is 4 byte.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int Vpd(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        SK_VPD_STATUS   *pVpdStatus;
-        unsigned int    BufLen;
-        char            Buf[256];
-        char            KeyArr[SK_PNMI_VPD_ENTRIES][SK_PNMI_VPD_KEY_SIZE];
-        char            KeyStr[SK_PNMI_VPD_KEY_SIZE];
-        unsigned int    KeyNo;
-        unsigned int    Offset;
-        unsigned int    Index;
-        unsigned int    FirstIndex;
-        unsigned int    LastIndex;
-        unsigned int    Len;
-        int             Ret;
-        SK_U32          Val32;
-
-        /*
-         * Get array of all currently stored VPD keys
-         */
-        Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr), &KeyNo);
-        if (Ret != SK_PNMI_ERR_OK) {
-                *pLen = 0;
-                return (Ret);
-        }
-
-        /*
-         * If instance is not -1, try to find the requested VPD key for
-         * the multiple instance variables. The other OIDs as for example
-         * OID VPD_ACTION are single instance variables and must be
-         * handled separatly.
-         */
-        FirstIndex = 0;
-        LastIndex = KeyNo;
-
-        if ((Instance != (SK_U32)(-1))) {
-
-                if (Id == OID_SKGE_VPD_KEY || Id == OID_SKGE_VPD_VALUE ||
-                        Id == OID_SKGE_VPD_ACCESS) {
-
-                        SK_STRNCPY(KeyStr, (char *)&Instance, 4);
-                        KeyStr[4] = 0;
-
-                        for (Index = 0; Index < KeyNo; Index ++) {
-
-                                if (SK_STRCMP(KeyStr, KeyArr[Index]) == 0) {
-                                        FirstIndex = Index;
-                                        LastIndex = Index+1;
-                                        break;
-                                }
-                        }
-                        if (Index == KeyNo) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_UNKNOWN_INST);
-                        }
-                }
-                else if (Instance != 1) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-        }
-
-        /*
-         * Get value, if a query should be performed
-         */
-        if (Action == SK_PNMI_GET) {
-
-                switch (Id) {
-
-                case OID_SKGE_VPD_FREE_BYTES:
-                        /* Check length of buffer */
-                        if (*pLen < sizeof(SK_U32)) {
-
-                                *pLen = sizeof(SK_U32);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        /* Get number of free bytes */
-                        pVpdStatus = VpdStat(pAC, IoC);
-                        if (pVpdStatus == NULL) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR017,
-                                        SK_PNMI_ERR017MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        if ((pVpdStatus->vpd_status & VPD_VALID) == 0) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR018,
-                                        SK_PNMI_ERR018MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        
-                        Val32 = (SK_U32)pVpdStatus->vpd_free_rw;
-                        SK_PNMI_STORE_U32(pBuf, Val32);
-                        *pLen = sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_VPD_ENTRIES_LIST:
-                        /* Check length */
-                        for (Len = 0, Index = 0; Index < KeyNo; Index ++) {
-
-                                Len += SK_STRLEN(KeyArr[Index]) + 1;
-                        }
-                        if (*pLen < Len) {
-
-                                *pLen = Len;
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-
-                        /* Get value */
-                        *(pBuf) = (char)Len - 1;
-                        for (Offset = 1, Index = 0; Index < KeyNo; Index ++) {
-
-                                Len = SK_STRLEN(KeyArr[Index]);
-                                SK_MEMCPY(pBuf + Offset, KeyArr[Index], Len);
-
-                                Offset += Len;
-
-                                if (Index < KeyNo - 1) {
-
-                                        *(pBuf + Offset) = ' ';
-                                        Offset ++;
-                                }
-                        }
-                        *pLen = Offset;
-                        break;
-
-                case OID_SKGE_VPD_ENTRIES_NUMBER:
-                        /* Check length */
-                        if (*pLen < sizeof(SK_U32)) {
-
-                                *pLen = sizeof(SK_U32);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-
-                        Val32 = (SK_U32)KeyNo;
-                        SK_PNMI_STORE_U32(pBuf, Val32);
-                        *pLen = sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_VPD_KEY:
-                        /* Check buffer length, if it is large enough */
-                        for (Len = 0, Index = FirstIndex;
-                                Index < LastIndex; Index ++) {
-
-                                Len += SK_STRLEN(KeyArr[Index]) + 1;
-                        }
-                        if (*pLen < Len) {
-
-                                *pLen = Len;
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-
-                        /*
-                         * Get the key to an intermediate buffer, because
-                         * we have to prepend a length byte.
-                         */
-                        for (Offset = 0, Index = FirstIndex;
-                                Index < LastIndex; Index ++) {
-
-                                Len = SK_STRLEN(KeyArr[Index]);
-
-                                *(pBuf + Offset) = (char)Len;
-                                SK_MEMCPY(pBuf + Offset + 1, KeyArr[Index],
-                                        Len);
-                                Offset += Len + 1;
-                        }
-                        *pLen = Offset;
-                        break;
-
-                case OID_SKGE_VPD_VALUE:
-                        /* Check the buffer length if it is large enough */
-                        for (Offset = 0, Index = FirstIndex;
-                                Index < LastIndex; Index ++) {
-
-                                BufLen = 256;
-                                if (VpdRead(pAC, IoC, KeyArr[Index], Buf,
-                                        (int *)&BufLen) > 0 ||
-                                        BufLen >= SK_PNMI_VPD_DATALEN) {
-
-                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                SK_PNMI_ERR021,
-                                                SK_PNMI_ERR021MSG);
-
-                                        return (SK_PNMI_ERR_GENERAL);
-                                }
-                                Offset += BufLen + 1;
-                        }
-                        if (*pLen < Offset) {
-
-                                *pLen = Offset;
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-
-                        /*
-                         * Get the value to an intermediate buffer, because
-                         * we have to prepend a length byte.
-                         */
-                        for (Offset = 0, Index = FirstIndex;
-                                Index < LastIndex; Index ++) {
-
-                                BufLen = 256;
-                                if (VpdRead(pAC, IoC, KeyArr[Index], Buf,
-                                        (int *)&BufLen) > 0 ||
-                                        BufLen >= SK_PNMI_VPD_DATALEN) {
-
-                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                SK_PNMI_ERR022,
-                                                SK_PNMI_ERR022MSG);
-
-                                        *pLen = 0;
-                                        return (SK_PNMI_ERR_GENERAL);
-                                }
-
-                                *(pBuf + Offset) = (char)BufLen;
-                                SK_MEMCPY(pBuf + Offset + 1, Buf, BufLen);
-                                Offset += BufLen + 1;
-                        }
-                        *pLen = Offset;
-                        break;
-
-                case OID_SKGE_VPD_ACCESS:
-                        if (*pLen < LastIndex - FirstIndex) {
-
-                                *pLen = LastIndex - FirstIndex;
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-
-                        for (Offset = 0, Index = FirstIndex;
-                                Index < LastIndex; Index ++) {
-
-                                if (VpdMayWrite(KeyArr[Index])) {
-
-                                        *(pBuf + Offset) = SK_PNMI_VPD_RW;
-                                }
-                                else {
-                                        *(pBuf + Offset) = SK_PNMI_VPD_RO;
-                                }
-                                Offset ++;
-                        }
-                        *pLen = Offset;
-                        break;
-
-                case OID_SKGE_VPD_ACTION:
-                        Offset = LastIndex - FirstIndex;
-                        if (*pLen < Offset) {
-
-                                *pLen = Offset;
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        SK_MEMSET(pBuf, 0, Offset);
-                        *pLen = Offset;
-                        break;
-
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR023,
-                                SK_PNMI_ERR023MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-        }
-        else {
-                /* The only OID which can be set is VPD_ACTION */
-                if (Id != OID_SKGE_VPD_ACTION) {
-
-                        if (Id == OID_SKGE_VPD_FREE_BYTES ||
-                                Id == OID_SKGE_VPD_ENTRIES_LIST ||
-                                Id == OID_SKGE_VPD_ENTRIES_NUMBER ||
-                                Id == OID_SKGE_VPD_KEY ||
-                                Id == OID_SKGE_VPD_VALUE ||
-                                Id == OID_SKGE_VPD_ACCESS) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_READ_ONLY);
-                        }
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR024,
-                                SK_PNMI_ERR024MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                /*
-                 * From this point we handle VPD_ACTION. Check the buffer
-                 * length. It should at least have the size of one byte.
-                 */
-                if (*pLen < 1) {
-
-                        *pLen = 1;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-
-                /*
-                 * The first byte contains the VPD action type we should
-                 * perform.
-                 */
-                switch (*pBuf) {
-
-                case SK_PNMI_VPD_IGNORE:
-                        /* Nothing to do */
-                        break;
-
-                case SK_PNMI_VPD_CREATE:
-                        /*
-                         * We have to create a new VPD entry or we modify
-                         * an existing one. Check first the buffer length.
-                         */
-                        if (*pLen < 4) {
-
-                                *pLen = 4;
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        KeyStr[0] = pBuf[1];
-                        KeyStr[1] = pBuf[2];
-                        KeyStr[2] = 0;
-
-                        /*
-                         * Is the entry writable or does it belong to the
-                         * read-only area?
-                         */
-                        if (!VpdMayWrite(KeyStr)) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-
-                        Offset = (int)pBuf[3] & 0xFF;
-
-                        SK_MEMCPY(Buf, pBuf + 4, Offset);
-                        Buf[Offset] = 0;
-
-                        /* A preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        /* Write the new entry or modify an existing one */
-                        Ret = VpdWrite(pAC, IoC, KeyStr, Buf);
-                        if (Ret == SK_PNMI_VPD_NOWRITE ) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-                        else if (Ret != SK_PNMI_VPD_OK) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR025,
-                                        SK_PNMI_ERR025MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-
-                        /*
-                         * Perform an update of the VPD data. This is
-                         * not mandantory, but just to be sure.
-                         */
-                        Ret = VpdUpdate(pAC, IoC);
-                        if (Ret != SK_PNMI_VPD_OK) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR026,
-                                        SK_PNMI_ERR026MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        break;
-
-                case SK_PNMI_VPD_DELETE:
-                        /* Check if the buffer size is plausible */
-                        if (*pLen < 3) {
-
-                                *pLen = 3;
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        if (*pLen > 3) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-                        KeyStr[0] = pBuf[1];
-                        KeyStr[1] = pBuf[2];
-                        KeyStr[2] = 0;
-
-                        /* Find the passed key in the array */
-                        for (Index = 0; Index < KeyNo; Index ++) {
-
-                                if (SK_STRCMP(KeyStr, KeyArr[Index]) == 0) {
-
-                                        break;
-                                }
-                        }
-                        /*
-                         * If we cannot find the key it is wrong, so we
-                         * return an appropriate error value.
-                         */
-                        if (Index == KeyNo) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-
-                        if (Action == SK_PNMI_PRESET) {
-
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        /* Ok, you wanted it and you will get it */
-                        Ret = VpdDelete(pAC, IoC, KeyStr);
-                        if (Ret != SK_PNMI_VPD_OK) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR027,
-                                        SK_PNMI_ERR027MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-
-                        /*
-                         * Perform an update of the VPD data. This is
-                         * not mandantory, but just to be sure.
-                         */
-                        Ret = VpdUpdate(pAC, IoC);
-                        if (Ret != SK_PNMI_VPD_OK) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR028,
-                                        SK_PNMI_ERR028MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        break;
-
-                default:
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_BAD_VALUE);
-                }
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * General - OID handler function of various single instance OIDs
- *
- * Description:
- *      The code is simple. No description necessary.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int General(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        int             Ret;
-        unsigned int    Index;
-        unsigned int    Len;
-        unsigned int    Offset;
-        unsigned int    Val;
-        SK_U8           Val8;
-        SK_U16          Val16;
-        SK_U32          Val32;
-        SK_U64          Val64;
-        SK_U64          Val64RxHwErrs = 0;
-        SK_U64          Val64TxHwErrs = 0;
-        SK_BOOL         Is64BitReq = SK_FALSE;
-        char            Buf[256];
-        int                     MacType;
-
-        /*
-         * Check instance. We only handle single instance variables.
-         */
-        if (Instance != (SK_U32)(-1) && Instance != 1) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_INST);
-        }
-
-        /*
-         * Check action. We only allow get requests.
-         */
-        if (Action != SK_PNMI_GET) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_READ_ONLY);
-        }
-        
-        MacType = pAC->GIni.GIMacType;
-        
-        /*
-         * Check length for the various supported OIDs
-         */
-        switch (Id) {
-
-        case OID_GEN_XMIT_ERROR:
-        case OID_GEN_RCV_ERROR:
-        case OID_GEN_RCV_NO_BUFFER:
-#ifndef SK_NDIS_64BIT_CTR
-                if (*pLen < sizeof(SK_U32)) {
-                        *pLen = sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-
-#else /* SK_NDIS_64BIT_CTR */
-
-                /*
-                 * for compatibility, at least 32bit are required for oid
-                 */
-                if (*pLen < sizeof(SK_U32)) {
-                        /*
-                        * but indicate handling for 64bit values,
-                        * if insufficient space is provided
-                        */
-                        *pLen = sizeof(SK_U64);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-
-                Is64BitReq = (*pLen < sizeof(SK_U64)) ? SK_FALSE : SK_TRUE;
-#endif /* SK_NDIS_64BIT_CTR */
-                break;
-
-        case OID_SKGE_PORT_NUMBER:
-        case OID_SKGE_DEVICE_TYPE:
-        case OID_SKGE_RESULT:
-        case OID_SKGE_RLMT_MONITOR_NUMBER:
-        case OID_GEN_TRANSMIT_QUEUE_LENGTH:
-        case OID_SKGE_TRAP_NUMBER:
-        case OID_SKGE_MDB_VERSION:
-        case OID_SKGE_BOARDLEVEL:
-        case OID_SKGE_CHIPID:
-        case OID_SKGE_RAMSIZE:
-                if (*pLen < sizeof(SK_U32)) {
-
-                        *pLen = sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        case OID_SKGE_CHIPSET:
-                if (*pLen < sizeof(SK_U16)) {
-
-                        *pLen = sizeof(SK_U16);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        case OID_SKGE_BUS_TYPE:
-        case OID_SKGE_BUS_SPEED:
-        case OID_SKGE_BUS_WIDTH:
-        case OID_SKGE_SENSOR_NUMBER:
-        case OID_SKGE_CHKSM_NUMBER:
-        case OID_SKGE_VAUXAVAIL:
-                if (*pLen < sizeof(SK_U8)) {
-
-                        *pLen = sizeof(SK_U8);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        case OID_SKGE_TX_SW_QUEUE_LEN:
-        case OID_SKGE_TX_SW_QUEUE_MAX:
-        case OID_SKGE_TX_RETRY:
-        case OID_SKGE_RX_INTR_CTS:
-        case OID_SKGE_TX_INTR_CTS:
-        case OID_SKGE_RX_NO_BUF_CTS:
-        case OID_SKGE_TX_NO_BUF_CTS:
-        case OID_SKGE_TX_USED_DESCR_NO:
-        case OID_SKGE_RX_DELIVERED_CTS:
-        case OID_SKGE_RX_OCTETS_DELIV_CTS:
-        case OID_SKGE_RX_HW_ERROR_CTS:
-        case OID_SKGE_TX_HW_ERROR_CTS:
-        case OID_SKGE_IN_ERRORS_CTS:
-        case OID_SKGE_OUT_ERROR_CTS:
-        case OID_SKGE_ERR_RECOVERY_CTS:
-        case OID_SKGE_SYSUPTIME:
-                if (*pLen < sizeof(SK_U64)) {
-
-                        *pLen = sizeof(SK_U64);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        default:
-                /* Checked later */
-                break;
-        }
-
-        /* Update statistic */
-        if (Id == OID_SKGE_RX_HW_ERROR_CTS ||
-                Id == OID_SKGE_TX_HW_ERROR_CTS ||
-                Id == OID_SKGE_IN_ERRORS_CTS ||
-                Id == OID_SKGE_OUT_ERROR_CTS ||
-                Id == OID_GEN_XMIT_ERROR ||
-                Id == OID_GEN_RCV_ERROR) {
-
-                /* Force the XMAC to update its statistic counters and
-                 * Increment semaphore to indicate that an update was
-                 * already done.
-                 */
-                Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
-                if (Ret != SK_PNMI_ERR_OK) {
-
-                        *pLen = 0;
-                        return (Ret);
-                }
-                pAC->Pnmi.MacUpdatedFlag ++;
-
-                /*
-                 * Some OIDs consist of multiple hardware counters. Those
-                 * values which are contained in all of them will be added
-                 * now.
-                 */
-                switch (Id) {
-
-                case OID_SKGE_RX_HW_ERROR_CTS:
-                case OID_SKGE_IN_ERRORS_CTS:
-                case OID_GEN_RCV_ERROR:
-                        Val64RxHwErrs =
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_MISSED, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_FRAMING, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_OVERFLOW, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_JABBER, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_CARRIER, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_IRLENGTH, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_SYMBOL, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_SHORTS, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_RUNT, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_TOO_LONG, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_FCS, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_CEXT, NetIndex);
-                break;
-
-                case OID_SKGE_TX_HW_ERROR_CTS:
-                case OID_SKGE_OUT_ERROR_CTS:
-                case OID_GEN_XMIT_ERROR:
-                        Val64TxHwErrs =
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_EXCESS_COL, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_LATE_COL, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_UNDERRUN, NetIndex) +
-                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_CARRIER, NetIndex);
-                        break;
-                }
-        }
-
-        /*
-         * Retrieve value
-         */
-        switch (Id) {
-
-        case OID_SKGE_SUPPORTED_LIST:
-                Len = ID_TABLE_SIZE * sizeof(SK_U32);
-                if (*pLen < Len) {
-
-                        *pLen = Len;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                for (Offset = 0, Index = 0; Offset < Len;
-                        Offset += sizeof(SK_U32), Index ++) {
-
-                        Val32 = (SK_U32)IdTable[Index].Id;
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                }
-                *pLen = Len;
-                break;
-
-        case OID_SKGE_BOARDLEVEL:
-                Val32 = (SK_U32)pAC->GIni.GILevel;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_PORT_NUMBER:
-                Val32 = (SK_U32)pAC->GIni.GIMacsFound;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_DEVICE_TYPE:
-                Val32 = (SK_U32)pAC->Pnmi.DeviceType;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_DRIVER_DESCR:
-                if (pAC->Pnmi.pDriverDescription == NULL) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR007,
-                                SK_PNMI_ERR007MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                Len = SK_STRLEN(pAC->Pnmi.pDriverDescription) + 1;
-                if (Len > SK_PNMI_STRINGLEN1) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR029,
-                                SK_PNMI_ERR029MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                if (*pLen < Len) {
-
-                        *pLen = Len;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                *pBuf = (char)(Len - 1);
-                SK_MEMCPY(pBuf + 1, pAC->Pnmi.pDriverDescription, Len - 1);
-                *pLen = Len;
-                break;
-
-        case OID_SKGE_DRIVER_VERSION:
-                if (pAC->Pnmi.pDriverVersion == NULL) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
-                                SK_PNMI_ERR030MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                Len = SK_STRLEN(pAC->Pnmi.pDriverVersion) + 1;
-                if (Len > SK_PNMI_STRINGLEN1) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
-                                SK_PNMI_ERR031MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                if (*pLen < Len) {
-
-                        *pLen = Len;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                *pBuf = (char)(Len - 1);
-                SK_MEMCPY(pBuf + 1, pAC->Pnmi.pDriverVersion, Len - 1);
-                *pLen = Len;
-                break;
-
-        case OID_SKGE_DRIVER_RELDATE:
-                if (pAC->Pnmi.pDriverReleaseDate == NULL) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
-                                SK_PNMI_ERR053MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                Len = SK_STRLEN(pAC->Pnmi.pDriverReleaseDate) + 1;
-                if (Len > SK_PNMI_STRINGLEN1) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
-                                SK_PNMI_ERR054MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                if (*pLen < Len) {
-
-                        *pLen = Len;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                *pBuf = (char)(Len - 1);
-                SK_MEMCPY(pBuf + 1, pAC->Pnmi.pDriverReleaseDate, Len - 1);
-                *pLen = Len;
-                break;
-
-        case OID_SKGE_DRIVER_FILENAME:
-                if (pAC->Pnmi.pDriverFileName == NULL) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
-                                SK_PNMI_ERR055MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                Len = SK_STRLEN(pAC->Pnmi.pDriverFileName) + 1;
-                if (Len > SK_PNMI_STRINGLEN1) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
-                                SK_PNMI_ERR056MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                if (*pLen < Len) {
-
-                        *pLen = Len;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                *pBuf = (char)(Len - 1);
-                SK_MEMCPY(pBuf + 1, pAC->Pnmi.pDriverFileName, Len - 1);
-                *pLen = Len;
-                break;
-
-        case OID_SKGE_HW_DESCR:
-                /*
-                 * The hardware description is located in the VPD. This
-                 * query may move to the initialisation routine. But
-                 * the VPD data is cached and therefore a call here
-                 * will not make much difference.
-                 */
-                Len = 256;
-                if (VpdRead(pAC, IoC, VPD_NAME, Buf, (int *)&Len) > 0) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR032,
-                                SK_PNMI_ERR032MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-                Len ++;
-                if (Len > SK_PNMI_STRINGLEN1) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR033,
-                                SK_PNMI_ERR033MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-                if (*pLen < Len) {
-
-                        *pLen = Len;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                *pBuf = (char)(Len - 1);
-                SK_MEMCPY(pBuf + 1, Buf, Len - 1);
-                *pLen = Len;
-                break;
-
-        case OID_SKGE_HW_VERSION:
-                /* Oh, I love to do some string manipulation */
-                if (*pLen < 5) {
-
-                        *pLen = 5;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                Val8 = (SK_U8)pAC->GIni.GIPciHwRev;
-                pBuf[0] = 4;
-                pBuf[1] = 'v';
-                pBuf[2] = (char)(0x30 | ((Val8 >> 4) & 0x0F));
-                pBuf[3] = '.';
-                pBuf[4] = (char)(0x30 | (Val8 & 0x0F));
-                *pLen = 5;
-                break;
-
-        case OID_SKGE_CHIPSET:
-                Val16 = pAC->Pnmi.Chipset;
-                SK_PNMI_STORE_U16(pBuf, Val16);
-                *pLen = sizeof(SK_U16);
-                break;
-
-        case OID_SKGE_CHIPID:
-                Val32 = pAC->GIni.GIChipId;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_RAMSIZE:
-                Val32 = pAC->GIni.GIRamSize;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_VAUXAVAIL:
-                *pBuf = (char) pAC->GIni.GIVauxAvail;
-                *pLen = sizeof(char);
-                break;
-
-        case OID_SKGE_BUS_TYPE:
-                *pBuf = (char) SK_PNMI_BUS_PCI;
-                *pLen = sizeof(char);
-                break;
-
-        case OID_SKGE_BUS_SPEED:
-                *pBuf = pAC->Pnmi.PciBusSpeed;
-                *pLen = sizeof(char);
-                break;
-
-        case OID_SKGE_BUS_WIDTH:
-                *pBuf = pAC->Pnmi.PciBusWidth;
-                *pLen = sizeof(char);
-                break;
-
-        case OID_SKGE_RESULT:
-                Val32 = pAC->Pnmi.TestResult;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_SENSOR_NUMBER:
-                *pBuf = (char)pAC->I2c.MaxSens;
-                *pLen = sizeof(char);
-                break;
-
-        case OID_SKGE_CHKSM_NUMBER:
-                *pBuf = SKCS_NUM_PROTOCOLS;
-                *pLen = sizeof(char);
-                break;
-
-        case OID_SKGE_TRAP_NUMBER:
-                GetTrapQueueLen(pAC, &Len, &Val);
-                Val32 = (SK_U32)Val;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_TRAP:
-                GetTrapQueueLen(pAC, &Len, &Val);
-                if (*pLen < Len) {
-
-                        *pLen = Len;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                CopyTrapQueue(pAC, pBuf);
-                *pLen = Len;
-                break;
-
-        case OID_SKGE_RLMT_MONITOR_NUMBER:
-/* XXX Not yet implemented by RLMT therefore we return zero elements */
-                Val32 = 0;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_SKGE_TX_SW_QUEUE_LEN:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxSwQueueLen;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].TxSwQueueLen +
-                                        pAC->Pnmi.BufPort[1].TxSwQueueLen;
-                        }                       
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].TxSwQueueLen;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].TxSwQueueLen +
-                                        pAC->Pnmi.Port[1].TxSwQueueLen;
-                        }                       
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-
-        case OID_SKGE_TX_SW_QUEUE_MAX:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxSwQueueMax;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].TxSwQueueMax +
-                                        pAC->Pnmi.BufPort[1].TxSwQueueMax;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].TxSwQueueMax;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].TxSwQueueMax +
-                                        pAC->Pnmi.Port[1].TxSwQueueMax;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_TX_RETRY:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxRetryCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].TxRetryCts +
-                                        pAC->Pnmi.BufPort[1].TxRetryCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].TxRetryCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].TxRetryCts +
-                                        pAC->Pnmi.Port[1].TxRetryCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_RX_INTR_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxIntrCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].RxIntrCts +
-                                        pAC->Pnmi.BufPort[1].RxIntrCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].RxIntrCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].RxIntrCts +
-                                        pAC->Pnmi.Port[1].RxIntrCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_TX_INTR_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxIntrCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].TxIntrCts +
-                                        pAC->Pnmi.BufPort[1].TxIntrCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].TxIntrCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].TxIntrCts +
-                                        pAC->Pnmi.Port[1].TxIntrCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_RX_NO_BUF_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].RxNoBufCts +
-                                        pAC->Pnmi.BufPort[1].RxNoBufCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].RxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].RxNoBufCts +
-                                        pAC->Pnmi.Port[1].RxNoBufCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_TX_NO_BUF_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].TxNoBufCts +
-                                        pAC->Pnmi.BufPort[1].TxNoBufCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].TxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].TxNoBufCts +
-                                        pAC->Pnmi.Port[1].TxNoBufCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_TX_USED_DESCR_NO:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxUsedDescrNo;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].TxUsedDescrNo +
-                                        pAC->Pnmi.BufPort[1].TxUsedDescrNo;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].TxUsedDescrNo;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].TxUsedDescrNo +
-                                        pAC->Pnmi.Port[1].TxUsedDescrNo;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_RX_DELIVERED_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxDeliveredCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].RxDeliveredCts +
-                                        pAC->Pnmi.BufPort[1].RxDeliveredCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].RxDeliveredCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].RxDeliveredCts +
-                                        pAC->Pnmi.Port[1].RxDeliveredCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_RX_OCTETS_DELIV_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxOctetsDeliveredCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].RxOctetsDeliveredCts +
-                                        pAC->Pnmi.BufPort[1].RxOctetsDeliveredCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].RxOctetsDeliveredCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].RxOctetsDeliveredCts +
-                                        pAC->Pnmi.Port[1].RxOctetsDeliveredCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_RX_HW_ERROR_CTS:
-                SK_PNMI_STORE_U64(pBuf, Val64RxHwErrs);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_TX_HW_ERROR_CTS:
-                SK_PNMI_STORE_U64(pBuf, Val64TxHwErrs);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_IN_ERRORS_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = Val64RxHwErrs + pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = Val64RxHwErrs +
-                                        pAC->Pnmi.BufPort[0].RxNoBufCts +
-                                        pAC->Pnmi.BufPort[1].RxNoBufCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = Val64RxHwErrs + pAC->Pnmi.Port[NetIndex].RxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = Val64RxHwErrs +
-                                        pAC->Pnmi.Port[0].RxNoBufCts +
-                                        pAC->Pnmi.Port[1].RxNoBufCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_OUT_ERROR_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = Val64TxHwErrs + pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = Val64TxHwErrs +
-                                        pAC->Pnmi.BufPort[0].TxNoBufCts +
-                                        pAC->Pnmi.BufPort[1].TxNoBufCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = Val64TxHwErrs + pAC->Pnmi.Port[NetIndex].TxNoBufCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = Val64TxHwErrs +
-                                        pAC->Pnmi.Port[0].TxNoBufCts +
-                                        pAC->Pnmi.Port[1].TxNoBufCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_ERR_RECOVERY_CTS:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.BufPort[NetIndex].ErrRecoveryCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.BufPort[0].ErrRecoveryCts +
-                                        pAC->Pnmi.BufPort[1].ErrRecoveryCts;
-                        }
-                }
-                else {
-                        /* Dual net mode */
-                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                                Val64 = pAC->Pnmi.Port[NetIndex].ErrRecoveryCts;
-                        }
-                        /* Single net mode */
-                        else {
-                                Val64 = pAC->Pnmi.Port[0].ErrRecoveryCts +
-                                        pAC->Pnmi.Port[1].ErrRecoveryCts;
-                        }
-                }
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_SYSUPTIME:
-                Val64 = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
-                Val64 -= pAC->Pnmi.StartUpTime;
-                SK_PNMI_STORE_U64(pBuf, Val64);
-                *pLen = sizeof(SK_U64);
-                break;
-
-        case OID_SKGE_MDB_VERSION:
-                Val32 = SK_PNMI_MDB_VERSION;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        case OID_GEN_RCV_ERROR:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        Val64 = Val64RxHwErrs + pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
-                }
-                else {
-                        Val64 = Val64RxHwErrs + pAC->Pnmi.Port[NetIndex].RxNoBufCts;
-                }
-
-                /*
-                 * by default 32bit values are evaluated
-                 */
-                if (!Is64BitReq) {
-                        Val32 = (SK_U32)Val64;
-                        SK_PNMI_STORE_U32(pBuf, Val32);
-                        *pLen = sizeof(SK_U32);
-                }
-                else {
-                        SK_PNMI_STORE_U64(pBuf, Val64);
-                        *pLen = sizeof(SK_U64);
-                }
-                break;
-
-        case OID_GEN_XMIT_ERROR:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        Val64 = Val64TxHwErrs + pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
-                }
-                else {
-                        Val64 = Val64TxHwErrs + pAC->Pnmi.Port[NetIndex].TxNoBufCts;
-                }
-
-                /*
-                 * by default 32bit values are evaluated
-                 */
-                if (!Is64BitReq) {
-                        Val32 = (SK_U32)Val64;
-                        SK_PNMI_STORE_U32(pBuf, Val32);
-                        *pLen = sizeof(SK_U32);
-                }
-                else {
-                        SK_PNMI_STORE_U64(pBuf, Val64);
-                        *pLen = sizeof(SK_U64);
-                }
-                break;
-
-        case OID_GEN_RCV_NO_BUFFER:
-                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-                if (MacType == SK_MAC_XMAC) {
-                        Val64 = pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
-                }
-                else {
-                        Val64 = pAC->Pnmi.Port[NetIndex].RxNoBufCts;
-                }
-
-                /*
-                 * by default 32bit values are evaluated
-                 */
-                if (!Is64BitReq) {
-                        Val32 = (SK_U32)Val64;
-                        SK_PNMI_STORE_U32(pBuf, Val32);
-                        *pLen = sizeof(SK_U32);
-                }
-                else {
-                        SK_PNMI_STORE_U64(pBuf, Val64);
-                        *pLen = sizeof(SK_U64);
-                }
-                break;
-
-        case OID_GEN_TRANSMIT_QUEUE_LENGTH:
-                Val32 = (SK_U32)pAC->Pnmi.Port[NetIndex].TxSwQueueLen;
-                SK_PNMI_STORE_U32(pBuf, Val32);
-                *pLen = sizeof(SK_U32);
-                break;
-
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR034,
-                        SK_PNMI_ERR034MSG);
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_GENERAL);
-        }
-
-        if (Id == OID_SKGE_RX_HW_ERROR_CTS ||
-                Id == OID_SKGE_TX_HW_ERROR_CTS ||
-                Id == OID_SKGE_IN_ERRORS_CTS ||
-                Id == OID_SKGE_OUT_ERROR_CTS ||
-                Id == OID_GEN_XMIT_ERROR ||
-                Id == OID_GEN_RCV_ERROR) {
-
-                pAC->Pnmi.MacUpdatedFlag --;
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * Rlmt - OID handler function of OID_SKGE_RLMT_XXX single instance.
- *
- * Description:
- *      Get/Presets/Sets the RLMT OIDs.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int Rlmt(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        int             Ret;
-        unsigned int    PhysPortIndex;
-        unsigned int    PhysPortMax;
-        SK_EVPARA       EventParam;
-        SK_U32          Val32;
-        SK_U64          Val64;
-
-
-        /*
-         * Check instance. Only single instance OIDs are allowed here.
-         */
-        if (Instance != (SK_U32)(-1) && Instance != 1) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_INST);
-        }
-
-        /*
-         * Perform the requested action.
-         */
-        if (Action == SK_PNMI_GET) {
-
-                /*
-                 * Check if the buffer length is large enough.
-                 */
-
-                switch (Id) {
-
-                case OID_SKGE_RLMT_MODE:
-                case OID_SKGE_RLMT_PORT_ACTIVE:
-                case OID_SKGE_RLMT_PORT_PREFERRED:
-                        if (*pLen < sizeof(SK_U8)) {
-
-                                *pLen = sizeof(SK_U8);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        break;
-
-                case OID_SKGE_RLMT_PORT_NUMBER:
-                        if (*pLen < sizeof(SK_U32)) {
-
-                                *pLen = sizeof(SK_U32);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        break;
-
-                case OID_SKGE_RLMT_CHANGE_CTS:
-                case OID_SKGE_RLMT_CHANGE_TIME:
-                case OID_SKGE_RLMT_CHANGE_ESTIM:
-                case OID_SKGE_RLMT_CHANGE_THRES:
-                        if (*pLen < sizeof(SK_U64)) {
-
-                                *pLen = sizeof(SK_U64);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        break;
-
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR035,
-                                SK_PNMI_ERR035MSG);
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                /*
-                 * Update RLMT statistic and increment semaphores to indicate
-                 * that an update was already done. Maybe RLMT will hold its
-                 * statistic always up to date some time. Then we can
-                 * remove this type of call.
-                 */
-                if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
-
-                        *pLen = 0;
-                        return (Ret);
-                }
-                pAC->Pnmi.RlmtUpdatedFlag ++;
-
-                /*
-                 * Retrieve Value
-                */
-                switch (Id) {
-
-                case OID_SKGE_RLMT_MODE:
-                        *pBuf = (char)pAC->Rlmt.Net[0].RlmtMode;
-                        *pLen = sizeof(char);
-                        break;
-
-                case OID_SKGE_RLMT_PORT_NUMBER:
-                        Val32 = (SK_U32)pAC->GIni.GIMacsFound;
-                        SK_PNMI_STORE_U32(pBuf, Val32);
-                        *pLen = sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_RLMT_PORT_ACTIVE:
-                        *pBuf = 0;
-                        /*
-                         * If multiple ports may become active this OID
-                         * doesn't make sense any more. A new variable in
-                         * the port structure should be created. However,
-                         * for this variable the first active port is
-                         * returned.
-                         */
-                        PhysPortMax = pAC->GIni.GIMacsFound;
-
-                        for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
-                                PhysPortIndex ++) {
-
-                                if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
-                                        *pBuf = (char)SK_PNMI_PORT_PHYS2LOG(PhysPortIndex);
-                                        break;
-                                }
-                        }
-                        *pLen = sizeof(char);
-                        break;
-
-                case OID_SKGE_RLMT_PORT_PREFERRED:
-                        *pBuf = (char)SK_PNMI_PORT_PHYS2LOG(pAC->Rlmt.Net[NetIndex].Preference);
-                        *pLen = sizeof(char);
-                        break;
-
-                case OID_SKGE_RLMT_CHANGE_CTS:
-                        Val64 = pAC->Pnmi.RlmtChangeCts;
-                        SK_PNMI_STORE_U64(pBuf, Val64);
-                        *pLen = sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_RLMT_CHANGE_TIME:
-                        Val64 = pAC->Pnmi.RlmtChangeTime;
-                        SK_PNMI_STORE_U64(pBuf, Val64);
-                        *pLen = sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_RLMT_CHANGE_ESTIM:
-                        Val64 = pAC->Pnmi.RlmtChangeEstimate.Estimate;
-                        SK_PNMI_STORE_U64(pBuf, Val64);
-                        *pLen = sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_RLMT_CHANGE_THRES:
-                        Val64 = pAC->Pnmi.RlmtChangeThreshold;
-                        SK_PNMI_STORE_U64(pBuf, Val64);
-                        *pLen = sizeof(SK_U64);
-                        break;
-
-                default:
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
-                                ("Rlmt: Unknown OID should be handled before"));
-
-                        pAC->Pnmi.RlmtUpdatedFlag --;
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                pAC->Pnmi.RlmtUpdatedFlag --;
-        }
-        else {
-                /* Perform a preset or set */
-                switch (Id) {
-
-                case OID_SKGE_RLMT_MODE:
-                        /* Check if the buffer length is plausible */
-                        if (*pLen < sizeof(char)) {
-
-                                *pLen = sizeof(char);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        /* Check if the value range is correct */
-                        if (*pLen != sizeof(char) ||
-                                (*pBuf & SK_PNMI_RLMT_MODE_CHK_LINK) == 0 ||
-                                *(SK_U8 *)pBuf > 15) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-                        /* The preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_OK);
-                        }
-                        /* Send an event to RLMT to change the mode */
-                        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-                        EventParam.Para32[0] |= (SK_U32)(*pBuf);
-                        EventParam.Para32[1] = 0;
-                        if (SkRlmtEvent(pAC, IoC, SK_RLMT_MODE_CHANGE,
-                                EventParam) > 0) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR037,
-                                        SK_PNMI_ERR037MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        break;
-
-                case OID_SKGE_RLMT_PORT_PREFERRED:
-                        /* Check if the buffer length is plausible */
-                        if (*pLen < sizeof(char)) {
-
-                                *pLen = sizeof(char);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        /* Check if the value range is correct */
-                        if (*pLen != sizeof(char) || *(SK_U8 *)pBuf >
-                                (SK_U8)pAC->GIni.GIMacsFound) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-                        /* The preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        /*
-                         * Send an event to RLMT change the preferred port.
-                         * A param of -1 means automatic mode. RLMT will
-                         * make the decision which is the preferred port.
-                         */
-                        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-                        EventParam.Para32[0] = (SK_U32)(*pBuf) - 1;
-                        EventParam.Para32[1] = NetIndex;
-                        if (SkRlmtEvent(pAC, IoC, SK_RLMT_PREFPORT_CHANGE,
-                                EventParam) > 0) {
-
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR038,
-                                        SK_PNMI_ERR038MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                        break;
-
-                case OID_SKGE_RLMT_CHANGE_THRES:
-                        /* Check if the buffer length is plausible */
-                        if (*pLen < sizeof(SK_U64)) {
-
-                                *pLen = sizeof(SK_U64);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        /*
-                         * There are not many restrictions to the
-                         * value range.
-                         */
-                        if (*pLen != sizeof(SK_U64)) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-                        /* A preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_OK);
-                        }
-                        /*
-                         * Store the new threshold, which will be taken
-                         * on the next timer event.
-                         */
-                        SK_PNMI_READ_U64(pBuf, Val64);
-                        pAC->Pnmi.RlmtChangeThreshold = Val64;
-                        break;
-
-                default:
-                        /* The other OIDs are not be able for set */
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_READ_ONLY);
-                }
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * RlmtStat - OID handler function of OID_SKGE_RLMT_XXX multiple instance.
- *
- * Description:
- *      Performs get requests on multiple instance variables.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int RlmtStat(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        unsigned int    PhysPortMax;
-        unsigned int    PhysPortIndex;
-        unsigned int    Limit;
-        unsigned int    Offset;
-        int             Ret;
-        SK_U32          Val32;
-        SK_U64          Val64;
-
-        /*
-         * Calculate the port indexes from the instance.
-         */
-        PhysPortMax = pAC->GIni.GIMacsFound;
-
-        if ((Instance != (SK_U32)(-1))) {
-                /* Check instance range */
-                if ((Instance < 1) || (Instance > PhysPortMax)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-
-                /* Single net mode */
-                PhysPortIndex = Instance - 1;
-
-                /* Dual net mode */
-                if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                        PhysPortIndex = NetIndex;
-                }
-
-                /* Both net modes */
-                Limit = PhysPortIndex + 1;
-        }
-        else {
-                /* Single net mode */
-                PhysPortIndex = 0;
-                Limit = PhysPortMax;
-
-                /* Dual net mode */
-                if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                        PhysPortIndex = NetIndex;
-                        Limit = PhysPortIndex + 1;
-                }
-        }
-
-        /*
-         * Currently only get requests are allowed.
-         */
-        if (Action != SK_PNMI_GET) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_READ_ONLY);
-        }
-
-        /*
-         * Check if the buffer length is large enough.
-         */
-        switch (Id) {
-
-        case OID_SKGE_RLMT_PORT_INDEX:
-        case OID_SKGE_RLMT_STATUS:
-                if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U32)) {
-
-                        *pLen = (Limit - PhysPortIndex) * sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        case OID_SKGE_RLMT_TX_HELLO_CTS:
-        case OID_SKGE_RLMT_RX_HELLO_CTS:
-        case OID_SKGE_RLMT_TX_SP_REQ_CTS:
-        case OID_SKGE_RLMT_RX_SP_CTS:
-                if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U64)) {
-
-                        *pLen = (Limit - PhysPortIndex) * sizeof(SK_U64);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR039,
-                        SK_PNMI_ERR039MSG);
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_GENERAL);
-
-        }
-
-        /*
-         * Update statistic and increment semaphores to indicate that
-         * an update was already done.
-         */
-        if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
-
-                *pLen = 0;
-                return (Ret);
-        }
-        pAC->Pnmi.RlmtUpdatedFlag ++;
-
-        /*
-         * Get value
-         */
-        Offset = 0;
-        for (; PhysPortIndex < Limit; PhysPortIndex ++) {
-
-                switch (Id) {
-
-                case OID_SKGE_RLMT_PORT_INDEX:
-                        Val32 = PhysPortIndex;
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                        Offset += sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_RLMT_STATUS:
-                        if (pAC->Rlmt.Port[PhysPortIndex].PortState ==
-                                SK_RLMT_PS_INIT ||
-                                pAC->Rlmt.Port[PhysPortIndex].PortState ==
-                                SK_RLMT_PS_DOWN) {
-
-                                Val32 = SK_PNMI_RLMT_STATUS_ERROR;
-                        }
-                        else if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
-                                Val32 = SK_PNMI_RLMT_STATUS_ACTIVE;
-                        }
-                        else {
-                                Val32 = SK_PNMI_RLMT_STATUS_STANDBY;
-                        }
-                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-                        Offset += sizeof(SK_U32);
-                        break;
-
-                case OID_SKGE_RLMT_TX_HELLO_CTS:
-                        Val64 = pAC->Rlmt.Port[PhysPortIndex].TxHelloCts;
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_RLMT_RX_HELLO_CTS:
-                        Val64 = pAC->Rlmt.Port[PhysPortIndex].RxHelloCts;
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_RLMT_TX_SP_REQ_CTS:
-                        Val64 = pAC->Rlmt.Port[PhysPortIndex].TxSpHelloReqCts;
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                case OID_SKGE_RLMT_RX_SP_CTS:
-                        Val64 = pAC->Rlmt.Port[PhysPortIndex].RxSpHelloCts;
-                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
-                        Offset += sizeof(SK_U64);
-                        break;
-
-                default:
-                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
-                                ("RlmtStat: Unknown OID should be errored before"));
-
-                        pAC->Pnmi.RlmtUpdatedFlag --;
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-        }
-        *pLen = Offset;
-
-        pAC->Pnmi.RlmtUpdatedFlag --;
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * MacPrivateConf - OID handler function of OIDs concerning the configuration
- *
- * Description:
- *      Get/Presets/Sets the OIDs concerning the configuration.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int MacPrivateConf(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        unsigned int    PhysPortMax;
-        unsigned int    PhysPortIndex;
-        unsigned int    LogPortMax;
-        unsigned int    LogPortIndex;
-        unsigned int    Limit;
-        unsigned int    Offset;
-        char            Val8;
-        char            *pBufPtr;
-        int                     Ret;
-        SK_EVPARA       EventParam;
-        SK_U32          Val32;
-
-        /*
-         * Calculate instance if wished. MAC index 0 is the virtual MAC.
-         */
-        PhysPortMax = pAC->GIni.GIMacsFound;
-        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
-
-        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
-                LogPortMax--;
-        }
-
-        if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
-                /* Check instance range */
-                if ((Instance < 1) || (Instance > LogPortMax)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-                LogPortIndex = SK_PNMI_PORT_INST2LOG(Instance);
-                Limit = LogPortIndex + 1;
-        }
-
-        else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
-
-                LogPortIndex = 0;
-                Limit = LogPortMax;
-        }
-
-        /*
-         * Perform action
-         */
-        if (Action == SK_PNMI_GET) {
-
-                /* Check length */
-                switch (Id) {
-
-                case OID_SKGE_PMD:
-                case OID_SKGE_CONNECTOR:
-                case OID_SKGE_LINK_CAP:
-                case OID_SKGE_LINK_MODE:
-                case OID_SKGE_LINK_MODE_STATUS:
-                case OID_SKGE_LINK_STATUS:
-                case OID_SKGE_FLOWCTRL_CAP:
-                case OID_SKGE_FLOWCTRL_MODE:
-                case OID_SKGE_FLOWCTRL_STATUS:
-                case OID_SKGE_PHY_OPERATION_CAP:
-                case OID_SKGE_PHY_OPERATION_MODE:
-                case OID_SKGE_PHY_OPERATION_STATUS:
-                case OID_SKGE_SPEED_CAP:
-                case OID_SKGE_SPEED_MODE:
-                case OID_SKGE_SPEED_STATUS:
-                        if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U8)) {
-
-                                *pLen = (Limit - LogPortIndex) * sizeof(SK_U8);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        break;
-
-        case OID_SKGE_MTU:
-        case OID_SKGE_PHY_TYPE:
-                        if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U32)) {
-
-                                *pLen = (Limit - LogPortIndex) * sizeof(SK_U32);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        break;
-
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR041,
-                                SK_PNMI_ERR041MSG);
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                /*
-                 * Update statistic and increment semaphore to indicate
-                 * that an update was already done.
-                 */
-                if ((Ret = SirqUpdate(pAC, IoC)) != SK_PNMI_ERR_OK) {
-
-                        *pLen = 0;
-                        return (Ret);
-                }
-                pAC->Pnmi.SirqUpdatedFlag ++;
-
-                /*
-                 * Get value
-                 */
-                Offset = 0;
-                for (; LogPortIndex < Limit; LogPortIndex ++) {
-
-                        pBufPtr = pBuf + Offset;
-                        
-                        switch (Id) {
-
-                        case OID_SKGE_PMD:
-                                *pBufPtr = pAC->Pnmi.PMD;
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_CONNECTOR:
-                                *pBufPtr = pAC->Pnmi.Connector;
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_PHY_TYPE:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                continue;
-                                        }
-                                        else {
-                                                /* Get value for physical ports */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-                                                Val32 = pAC->GIni.GP[PhysPortIndex].PhyType;
-                                                SK_PNMI_STORE_U32(pBufPtr, Val32);
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                        
-                                        Val32 = pAC->GIni.GP[NetIndex].PhyType;
-                                        SK_PNMI_STORE_U32(pBufPtr, Val32);
-                                }
-                                Offset += sizeof(SK_U32);
-                                break;
-
-                        case OID_SKGE_LINK_CAP:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical ports */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkCap;
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                        
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkCap;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_LINK_MODE:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical ports */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkModeConf;
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkModeConf;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_LINK_MODE_STATUS:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical port */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-
-                                                *pBufPtr =
-                                                        CalculateLinkModeStatus(pAC, IoC, PhysPortIndex);
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                        
-                                        *pBufPtr = CalculateLinkModeStatus(pAC, IoC, NetIndex);
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_LINK_STATUS:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical ports */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = CalculateLinkStatus(pAC, IoC, PhysPortIndex);
-                                        }
-                                }
-                                else { /* DualNetMode */
-
-                                        *pBufPtr = CalculateLinkStatus(pAC, IoC, NetIndex);
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_FLOWCTRL_CAP:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical ports */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlCap;
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlCap;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_FLOWCTRL_MODE:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical port */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlMode;
-                                        }
-                                }
-                                else { /* DualNetMode */
-
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlMode;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_FLOWCTRL_STATUS:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical port */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlStatus;
-                                        }
-                                }
-                                else { /* DualNetMode */
-
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlStatus;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_PHY_OPERATION_CAP:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical ports */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSCap;
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PMSCap;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_PHY_OPERATION_MODE:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical port */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSMode;
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PMSMode;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_PHY_OPERATION_STATUS:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical port */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSStatus;
-                                        }
-                                }
-                                else {
-                                
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PMSStatus;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_SPEED_CAP:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical ports */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedCap;
-                                        }
-                                }
-                                else { /* DualNetMode */
-                                
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedCap;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_SPEED_MODE:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical port */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeed;
-                                        }
-                                }
-                                else { /* DualNetMode */
-
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeed;
-                                }
-                                Offset += sizeof(char);
-                                break;
-
-                        case OID_SKGE_SPEED_STATUS:
-                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
-                                        if (LogPortIndex == 0) {
-                                                /* Get value for virtual port */
-                                                VirtualConf(pAC, IoC, Id, pBufPtr);
-                                        }
-                                        else {
-                                                /* Get value for physical port */
-                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-                                                        pAC, LogPortIndex);
-        
-                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed;
-                                        }
-                                }
-                                else { /* DualNetMode */
-
-                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedUsed;
-                                }
-                                Offset += sizeof(char);
-                                break;
-                        
-                        case OID_SKGE_MTU:
-                                Val32 = SK_DRIVER_GET_MTU(pAC, IoC, NetIndex);
-                                SK_PNMI_STORE_U32(pBufPtr, Val32);
-                                Offset += sizeof(SK_U32);
-                                break;
-
-                        default:
-                                SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
-                                        ("MacPrivateConf: Unknown OID should be handled before"));
-
-                                pAC->Pnmi.SirqUpdatedFlag --;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                }
-                *pLen = Offset;
-                pAC->Pnmi.SirqUpdatedFlag --;
-
-                return (SK_PNMI_ERR_OK);
-        }
-
-        /*
-         * From here SET or PRESET action. Check if the passed
-         * buffer length is plausible.
-         */
-        switch (Id) {
-
-        case OID_SKGE_LINK_MODE:
-        case OID_SKGE_FLOWCTRL_MODE:
-        case OID_SKGE_PHY_OPERATION_MODE:
-        case OID_SKGE_SPEED_MODE:
-                if (*pLen < Limit - LogPortIndex) {
-
-                        *pLen = Limit - LogPortIndex;
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                if (*pLen != Limit - LogPortIndex) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_BAD_VALUE);
-                }
-                break;
-
-        case OID_SKGE_MTU:
-                if (*pLen < sizeof(SK_U32)) {
-
-                        *pLen = sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                if (*pLen != sizeof(SK_U32)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_BAD_VALUE);
-                }
-                break;
-
-    default:
-                *pLen = 0;
-                return (SK_PNMI_ERR_READ_ONLY);
-        }
-
-        /*
-         * Perform preset or set
-         */
-        Offset = 0;
-        for (; LogPortIndex < Limit; LogPortIndex ++) {
-
-                switch (Id) {
-
-                case OID_SKGE_LINK_MODE:
-                        /* Check the value range */
-                        Val8 = *(pBuf + Offset);
-                        if (Val8 == 0) {
-
-                                Offset += sizeof(char);
-                                break;
-                        }
-                        if (Val8 < SK_LMODE_HALF ||
-                                (LogPortIndex != 0 && Val8 > SK_LMODE_AUTOSENSE) ||
-                                (LogPortIndex == 0 && Val8 > SK_LMODE_INDETERMINATED)) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-
-                        /* The preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        if (LogPortIndex == 0) {
-
-                                /*
-                                 * The virtual port consists of all currently
-                                 * active ports. Find them and send an event
-                                 * with the new link mode to SIRQ.
-                                 */
-                                for (PhysPortIndex = 0;
-                                        PhysPortIndex < PhysPortMax;
-                                        PhysPortIndex ++) {
-
-                                        if (!pAC->Pnmi.Port[PhysPortIndex].
-                                                ActiveFlag) {
-
-                                                continue;
-                                        }
-
-                                        EventParam.Para32[0] = PhysPortIndex;
-                                        EventParam.Para32[1] = (SK_U32)Val8;
-                                        if (SkGeSirqEvent(pAC, IoC,
-                                                SK_HWEV_SET_LMODE,
-                                                EventParam) > 0) {
-
-                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                        SK_PNMI_ERR043,
-                                                        SK_PNMI_ERR043MSG);
-
-                                                *pLen = 0;
-                                                return (SK_PNMI_ERR_GENERAL);
-                                        }
-                                }
-                        }
-                        else {
-                                /*
-                                 * Send an event with the new link mode to
-                                 * the SIRQ module.
-                                 */
-                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-                                        pAC, LogPortIndex);
-                                EventParam.Para32[1] = (SK_U32)Val8;
-                                if (SkGeSirqEvent(pAC, IoC, SK_HWEV_SET_LMODE,
-                                        EventParam) > 0) {
-
-                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                SK_PNMI_ERR043,
-                                                SK_PNMI_ERR043MSG);
-
-                                        *pLen = 0;
-                                        return (SK_PNMI_ERR_GENERAL);
-                                }
-                        }
-                        Offset += sizeof(char);
-                        break;
-
-                case OID_SKGE_FLOWCTRL_MODE:
-                        /* Check the value range */
-                        Val8 = *(pBuf + Offset);
-                        if (Val8 == 0) {
-
-                                Offset += sizeof(char);
-                                break;
-                        }
-                        if (Val8 < SK_FLOW_MODE_NONE ||
-                                (LogPortIndex != 0 && Val8 > SK_FLOW_MODE_SYM_OR_REM) ||
-                                (LogPortIndex == 0 && Val8 > SK_FLOW_MODE_INDETERMINATED)) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-
-                        /* The preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        if (LogPortIndex == 0) {
-
-                                /*
-                                 * The virtual port consists of all currently
-                                 * active ports. Find them and send an event
-                                 * with the new flow control mode to SIRQ.
-                                 */
-                                for (PhysPortIndex = 0;
-                                        PhysPortIndex < PhysPortMax;
-                                        PhysPortIndex ++) {
-
-                                        if (!pAC->Pnmi.Port[PhysPortIndex].
-                                                ActiveFlag) {
-
-                                                continue;
-                                        }
-
-                                        EventParam.Para32[0] = PhysPortIndex;
-                                        EventParam.Para32[1] = (SK_U32)Val8;
-                                        if (SkGeSirqEvent(pAC, IoC,
-                                                SK_HWEV_SET_FLOWMODE,
-                                                EventParam) > 0) {
-
-                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                        SK_PNMI_ERR044,
-                                                        SK_PNMI_ERR044MSG);
-
-                                                *pLen = 0;
-                                                return (SK_PNMI_ERR_GENERAL);
-                                        }
-                                }
-                        }
-                        else {
-                                /*
-                                 * Send an event with the new flow control
-                                 * mode to the SIRQ module.
-                                 */
-                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-                                        pAC, LogPortIndex);
-                                EventParam.Para32[1] = (SK_U32)Val8;
-                                if (SkGeSirqEvent(pAC, IoC,
-                                        SK_HWEV_SET_FLOWMODE, EventParam)
-                                        > 0) {
-
-                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                SK_PNMI_ERR044,
-                                                SK_PNMI_ERR044MSG);
-
-                                        *pLen = 0;
-                                        return (SK_PNMI_ERR_GENERAL);
-                                }
-                        }
-                        Offset += sizeof(char);
-                        break;
-
-                case OID_SKGE_PHY_OPERATION_MODE :
-                        /* Check the value range */
-                        Val8 = *(pBuf + Offset);
-                        if (Val8 == 0) {
-                                /* mode of this port remains unchanged */
-                                Offset += sizeof(char);
-                                break;
-                        }
-                        if (Val8 < SK_MS_MODE_AUTO ||
-                                (LogPortIndex != 0 && Val8 > SK_MS_MODE_SLAVE) ||
-                                (LogPortIndex == 0 && Val8 > SK_MS_MODE_INDETERMINATED)) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-
-                        /* The preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        if (LogPortIndex == 0) {
-
-                                /*
-                                 * The virtual port consists of all currently
-                                 * active ports. Find them and send an event
-                                 * with new master/slave (role) mode to SIRQ.
-                                 */
-                                for (PhysPortIndex = 0;
-                                        PhysPortIndex < PhysPortMax;
-                                        PhysPortIndex ++) {
-
-                                        if (!pAC->Pnmi.Port[PhysPortIndex].
-                                                ActiveFlag) {
-
-                                                continue;
-                                        }
-
-                                        EventParam.Para32[0] = PhysPortIndex;
-                                        EventParam.Para32[1] = (SK_U32)Val8;
-                                        if (SkGeSirqEvent(pAC, IoC,
-                                                SK_HWEV_SET_ROLE,
-                                                EventParam) > 0) {
-
-                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                        SK_PNMI_ERR042,
-                                                        SK_PNMI_ERR042MSG);
-
-                                                *pLen = 0;
-                                                return (SK_PNMI_ERR_GENERAL);
-                                        }
-                                }
-                        }
-                        else {
-                                /*
-                                 * Send an event with the new master/slave
-                                 * (role) mode to the SIRQ module.
-                                 */
-                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-                                        pAC, LogPortIndex);
-                                EventParam.Para32[1] = (SK_U32)Val8;
-                                if (SkGeSirqEvent(pAC, IoC,
-                                        SK_HWEV_SET_ROLE, EventParam) > 0) {
-
-                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                SK_PNMI_ERR042,
-                                                SK_PNMI_ERR042MSG);
-
-                                        *pLen = 0;
-                                        return (SK_PNMI_ERR_GENERAL);
-                                }
-                        }
-
-                        Offset += sizeof(char);
-                        break;
-
-                case OID_SKGE_SPEED_MODE:
-                        /* Check the value range */
-                        Val8 = *(pBuf + Offset);
-                        if (Val8 == 0) {
-
-                                Offset += sizeof(char);
-                                break;
-                        }
-                        if (Val8 < (SK_LSPEED_AUTO) ||
-                                (LogPortIndex != 0 && Val8 > (SK_LSPEED_1000MBPS)) ||
-                                (LogPortIndex == 0 && Val8 > (SK_LSPEED_INDETERMINATED))) {
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-
-                        /* The preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        if (LogPortIndex == 0) {
-
-                                /*
-                                 * The virtual port consists of all currently
-                                 * active ports. Find them and send an event
-                                 * with the new flow control mode to SIRQ.
-                                 */
-                                for (PhysPortIndex = 0;
-                                        PhysPortIndex < PhysPortMax;
-                                        PhysPortIndex ++) {
-
-                                        if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
-                                                continue;
-                                        }
-
-                                        EventParam.Para32[0] = PhysPortIndex;
-                                        EventParam.Para32[1] = (SK_U32)Val8;
-                                        if (SkGeSirqEvent(pAC, IoC,
-                                                SK_HWEV_SET_SPEED,
-                                                EventParam) > 0) {
-
-                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                        SK_PNMI_ERR045,
-                                                        SK_PNMI_ERR045MSG);
-
-                                                *pLen = 0;
-                                                return (SK_PNMI_ERR_GENERAL);
-                                        }
-                                }
-                        }
-                        else {
-                                /*
-                                 * Send an event with the new flow control
-                                 * mode to the SIRQ module.
-                                 */
-                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-                                        pAC, LogPortIndex);
-                                EventParam.Para32[1] = (SK_U32)Val8;
-                                if (SkGeSirqEvent(pAC, IoC,
-                                        SK_HWEV_SET_SPEED,
-                                        EventParam) > 0) {
-
-                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
-                                                SK_PNMI_ERR045,
-                                                SK_PNMI_ERR045MSG);
-
-                                        *pLen = 0;
-                                        return (SK_PNMI_ERR_GENERAL);
-                                }
-                        }
-                        Offset += sizeof(char);
-                        break;
-
-                case OID_SKGE_MTU :
-                        /* Check the value range */
-                        Val32 = *(SK_U32*)(pBuf + Offset);
-                        if (Val32 == 0) {
-                                /* mtu of this port remains unchanged */
-                                Offset += sizeof(SK_U32);
-                                break;
-                        }
-                        if (SK_DRIVER_PRESET_MTU(pAC, IoC, NetIndex, Val32) != 0) {
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_BAD_VALUE);
-                        }
-
-                        /* The preset ends here */
-                        if (Action == SK_PNMI_PRESET) {
-                                return (SK_PNMI_ERR_OK);
-                        }
-
-                        if (SK_DRIVER_SET_MTU(pAC, IoC, NetIndex, Val32) != 0) {
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-
-                        Offset += sizeof(SK_U32);
-                        break;
-                
-                default:
-            SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
-                ("MacPrivateConf: Unknown OID should be handled before set"));
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * Monitor - OID handler function for RLMT_MONITOR_XXX
- *
- * Description:
- *      Because RLMT currently does not support the monitoring of
- *      remote adapter cards, we return always an empty table.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
- *                               value range.
- *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-PNMI_STATIC int Monitor(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        unsigned int    Index;
-        unsigned int    Limit;
-        unsigned int    Offset;
-        unsigned int    Entries;
-
-        
-        /*
-         * Calculate instance if wished.
-         */
-        /* XXX Not yet implemented. Return always an empty table. */
-        Entries = 0;
-
-        if ((Instance != (SK_U32)(-1))) {
-
-                if ((Instance < 1) || (Instance > Entries)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-
-                Index = (unsigned int)Instance - 1;
-                Limit = (unsigned int)Instance;
-        }
-        else {
-                Index = 0;
-                Limit = Entries;
-        }
-
-        /*
-         * Get/Set value
-        */
-        if (Action == SK_PNMI_GET) {
-
-                for (Offset=0; Index < Limit; Index ++) {
-
-                        switch (Id) {
-
-                        case OID_SKGE_RLMT_MONITOR_INDEX:
-                        case OID_SKGE_RLMT_MONITOR_ADDR:
-                        case OID_SKGE_RLMT_MONITOR_ERRS:
-                        case OID_SKGE_RLMT_MONITOR_TIMESTAMP:
-                        case OID_SKGE_RLMT_MONITOR_ADMIN:
-                                break;
-
-                        default:
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR046,
-                                        SK_PNMI_ERR046MSG);
-
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                }
-                *pLen = Offset;
-        }
-        else {
-                /* Only MONITOR_ADMIN can be set */
-                if (Id != OID_SKGE_RLMT_MONITOR_ADMIN) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_READ_ONLY);
-                }
-
-                /* Check if the length is plausible */
-                if (*pLen < (Limit - Index)) {
-
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                /* Okay, we have a wide value range */
-                if (*pLen != (Limit - Index)) {
-
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_BAD_VALUE);
-                }
-/*
-                for (Offset=0; Index < Limit; Index ++) {
-                }
-*/
-/*
- * XXX Not yet implemented. Return always BAD_VALUE, because the table
- * is empty.
- */
-                *pLen = 0;
-                return (SK_PNMI_ERR_BAD_VALUE);
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * VirtualConf - Calculates the values of configuration OIDs for virtual port
- *
- * Description:
- *      We handle here the get of the configuration group OIDs, which are
- *      a little bit complicated. The virtual port consists of all currently
- *      active physical ports. If multiple ports are active and configured
- *      differently we get in some trouble to return a single value. So we
- *      get the value of the first active port and compare it with that of
- *      the other active ports. If they are not the same, we return a value
- *      that indicates that the state is indeterminated.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void VirtualConf(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf)             /* Buffer used for the management data transfer */
-{
-        unsigned int    PhysPortMax;
-        unsigned int    PhysPortIndex;
-        SK_U8           Val8;
-        SK_U32          Val32;
-        SK_BOOL         PortActiveFlag;
-        SK_GEPORT       *pPrt;
-
-        *pBuf = 0;
-        PortActiveFlag = SK_FALSE;
-        PhysPortMax = pAC->GIni.GIMacsFound;
-        
-        for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
-                PhysPortIndex ++) {
-
-                pPrt = &pAC->GIni.GP[PhysPortIndex];
-
-                /* Check if the physical port is active */
-                if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
-                        continue;
-                }
-
-                PortActiveFlag = SK_TRUE;
-
-                switch (Id) {
-
-                case OID_SKGE_PHY_TYPE:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-                                Val32 = pPrt->PhyType;
-                                SK_PNMI_STORE_U32(pBuf, Val32);
-                                continue;
-                        }
-
-                case OID_SKGE_LINK_CAP:
-
-                        /*
-                         * Different capabilities should not happen, but
-                         * in the case of the cases OR them all together.
-                         * From a curious point of view the virtual port
-                         * is capable of all found capabilities.
-                         */
-                        *pBuf |= pPrt->PLinkCap;
-                        break;
-
-                case OID_SKGE_LINK_MODE:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PLinkModeConf;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different link
-                         * mode than the first one we return a value that
-                         * indicates that the link mode is indeterminated.
-                         */
-                        if (*pBuf != pPrt->PLinkModeConf) {
-
-                                *pBuf = SK_LMODE_INDETERMINATED;
-                        }
-                        break;
-
-                case OID_SKGE_LINK_MODE_STATUS:
-                        /* Get the link mode of the physical port */
-                        Val8 = CalculateLinkModeStatus(pAC, IoC, PhysPortIndex);
-
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = Val8;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different link
-                         * mode status than the first one we return a value
-                         * that indicates that the link mode status is
-                         * indeterminated.
-                         */
-                        if (*pBuf != Val8) {
-
-                                *pBuf = SK_LMODE_STAT_INDETERMINATED;
-                        }
-                        break;
-
-                case OID_SKGE_LINK_STATUS:
-                        /* Get the link status of the physical port */
-                        Val8 = CalculateLinkStatus(pAC, IoC, PhysPortIndex);
-
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = Val8;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different link
-                         * status than the first one, we return a value
-                         * that indicates that the link status is
-                         * indeterminated.
-                         */
-                        if (*pBuf != Val8) {
-
-                                *pBuf = SK_PNMI_RLMT_LSTAT_INDETERMINATED;
-                        }
-                        break;
-
-                case OID_SKGE_FLOWCTRL_CAP:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PFlowCtrlCap;
-                                continue;
-                        }
-
-                        /*
-                         * From a curious point of view the virtual port
-                         * is capable of all found capabilities.
-                         */
-                        *pBuf |= pPrt->PFlowCtrlCap;
-                        break;
-
-                case OID_SKGE_FLOWCTRL_MODE:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PFlowCtrlMode;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different flow
-                         * control mode than the first one, we return a value
-                         * that indicates that the mode is indeterminated.
-                         */
-                        if (*pBuf != pPrt->PFlowCtrlMode) {
-
-                                *pBuf = SK_FLOW_MODE_INDETERMINATED;
-                        }
-                        break;
-
-                case OID_SKGE_FLOWCTRL_STATUS:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PFlowCtrlStatus;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different flow
-                         * control status than the first one, we return a
-                         * value that indicates that the status is
-                         * indeterminated.
-                         */
-                        if (*pBuf != pPrt->PFlowCtrlStatus) {
-
-                                *pBuf = SK_FLOW_STAT_INDETERMINATED;
-                        }
-                        break;
-                
-                case OID_SKGE_PHY_OPERATION_CAP:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PMSCap;
-                                continue;
-                        }
-
-                        /*
-                         * From a curious point of view the virtual port
-                         * is capable of all found capabilities.
-                         */
-                        *pBuf |= pPrt->PMSCap;
-                        break;
-
-                case OID_SKGE_PHY_OPERATION_MODE:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PMSMode;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different master/
-                         * slave mode than the first one, we return a value
-                         * that indicates that the mode is indeterminated.
-                         */
-                        if (*pBuf != pPrt->PMSMode) {
-
-                                *pBuf = SK_MS_MODE_INDETERMINATED;
-                        }
-                        break;
-
-                case OID_SKGE_PHY_OPERATION_STATUS:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PMSStatus;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different master/
-                         * slave status than the first one, we return a
-                         * value that indicates that the status is
-                         * indeterminated.
-                         */
-                        if (*pBuf != pPrt->PMSStatus) {
-
-                                *pBuf = SK_MS_STAT_INDETERMINATED;
-                        }
-                        break;
-                
-                case OID_SKGE_SPEED_MODE:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PLinkSpeed;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different flow
-                         * control mode than the first one, we return a value
-                         * that indicates that the mode is indeterminated.
-                         */
-                        if (*pBuf != pPrt->PLinkSpeed) {
-
-                                *pBuf = SK_LSPEED_INDETERMINATED;
-                        }
-                        break;
-                
-                case OID_SKGE_SPEED_STATUS:
-                        /* Check if it is the first active port */
-                        if (*pBuf == 0) {
-
-                                *pBuf = pPrt->PLinkSpeedUsed;
-                                continue;
-                        }
-
-                        /*
-                         * If we find an active port with a different flow
-                         * control status than the first one, we return a
-                         * value that indicates that the status is
-                         * indeterminated.
-                         */
-                        if (*pBuf != pPrt->PLinkSpeedUsed) {
-
-                                *pBuf = SK_LSPEED_STAT_INDETERMINATED;
-                        }
-                        break;
-                }
-        }
-
-        /*
-         * If no port is active return an indeterminated answer
-         */
-        if (!PortActiveFlag) {
-
-                switch (Id) {
-
-                case OID_SKGE_LINK_CAP:
-                        *pBuf = SK_LMODE_CAP_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_LINK_MODE:
-                        *pBuf = SK_LMODE_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_LINK_MODE_STATUS:
-                        *pBuf = SK_LMODE_STAT_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_LINK_STATUS:
-                        *pBuf = SK_PNMI_RLMT_LSTAT_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_FLOWCTRL_CAP:
-                case OID_SKGE_FLOWCTRL_MODE:
-                        *pBuf = SK_FLOW_MODE_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_FLOWCTRL_STATUS:
-                        *pBuf = SK_FLOW_STAT_INDETERMINATED;
-                        break;
-                        
-                case OID_SKGE_PHY_OPERATION_CAP:
-                        *pBuf = SK_MS_CAP_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_PHY_OPERATION_MODE:
-                        *pBuf = SK_MS_MODE_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_PHY_OPERATION_STATUS:
-                        *pBuf = SK_MS_STAT_INDETERMINATED;
-                        break;
-                case OID_SKGE_SPEED_CAP:
-                        *pBuf = SK_LSPEED_CAP_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_SPEED_MODE:
-                        *pBuf = SK_LSPEED_INDETERMINATED;
-                        break;
-
-                case OID_SKGE_SPEED_STATUS:
-                        *pBuf = SK_LSPEED_STAT_INDETERMINATED;
-                        break;
-                }
-        }
-}
-
-/*****************************************************************************
- *
- * CalculateLinkStatus - Determins the link status of a physical port
- *
- * Description:
- *      Determins the link status the following way:
- *        LSTAT_PHY_DOWN:  Link is down
- *        LSTAT_AUTONEG:   Auto-negotiation failed
- *        LSTAT_LOG_DOWN:  Link is up but RLMT did not yet put the port
- *                         logically up.
- *        LSTAT_LOG_UP:    RLMT marked the port as up
- *
- * Returns:
- *      Link status of physical port
- */
-PNMI_STATIC SK_U8 CalculateLinkStatus(
-SK_AC *pAC,                     /* Pointer to adapter context */
-SK_IOC IoC,                     /* IO context handle */
-unsigned int PhysPortIndex)     /* Physical port index */
-{
-        SK_U8   Result;
-
-        if (!pAC->GIni.GP[PhysPortIndex].PHWLinkUp) {
-
-                Result = SK_PNMI_RLMT_LSTAT_PHY_DOWN;
-        }
-        else if (pAC->GIni.GP[PhysPortIndex].PAutoNegFail > 0) {
-
-                Result = SK_PNMI_RLMT_LSTAT_AUTONEG;
-                                }
-        else if (!pAC->Rlmt.Port[PhysPortIndex].PortDown) {
-
-                Result = SK_PNMI_RLMT_LSTAT_LOG_UP;
-        }
-        else {
-                Result = SK_PNMI_RLMT_LSTAT_LOG_DOWN;
-        }
-
-        return (Result);
-}
-
-/*****************************************************************************
- *
- * CalculateLinkModeStatus - Determins the link mode status of a phys. port
- *
- * Description:
- *      The COMMON module only tells us if the mode is half or full duplex.
- *      But in the decade of auto sensing it is useful for the user to
- *      know if the mode was negotiated or forced. Therefore we have a
- *      look to the mode, which was last used by the negotiation process.
- *
- * Returns:
- *      The link mode status
- */
-PNMI_STATIC SK_U8 CalculateLinkModeStatus(
-SK_AC *pAC,                     /* Pointer to adapter context */
-SK_IOC IoC,                     /* IO context handle */
-unsigned int PhysPortIndex)     /* Physical port index */
-{
-        SK_U8   Result;
-
-        /* Get the current mode, which can be full or half duplex */
-        Result = pAC->GIni.GP[PhysPortIndex].PLinkModeStatus;
-
-        /* Check if no valid mode could be found (link is down) */
-        if (Result < SK_LMODE_STAT_HALF) {
-
-                Result = SK_LMODE_STAT_UNKNOWN;
-        }
-        else if (pAC->GIni.GP[PhysPortIndex].PLinkMode >= SK_LMODE_AUTOHALF) {
-
-                /*
-                 * Auto-negotiation was used to bring up the link. Change
-                 * the already found duplex status that it indicates
-                 * auto-negotiation was involved.
-                 */
-                if (Result == SK_LMODE_STAT_HALF) {
-
-                        Result = SK_LMODE_STAT_AUTOHALF;
-                }
-                else if (Result == SK_LMODE_STAT_FULL) {
-
-                        Result = SK_LMODE_STAT_AUTOFULL;
-                }
-        }
-
-        return (Result);
-}
-
-/*****************************************************************************
- *
- * GetVpdKeyArr - Obtain an array of VPD keys
- *
- * Description:
- *      Read the VPD keys and build an array of VPD keys, which are
- *      easy to access.
- *
- * Returns:
- *      SK_PNMI_ERR_OK       Task successfully performed.
- *      SK_PNMI_ERR_GENERAL  Something went wrong.
- */
-PNMI_STATIC int GetVpdKeyArr(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-char *pKeyArr,          /* Ptr KeyArray */
-unsigned int KeyArrLen, /* Length of array in bytes */
-unsigned int *pKeyNo)   /* Number of keys */
-{
-        unsigned int            BufKeysLen = SK_PNMI_VPD_BUFSIZE;
-        char                    BufKeys[SK_PNMI_VPD_BUFSIZE];
-        unsigned int            StartOffset;
-        unsigned int            Offset;
-        int                     Index;
-        int                     Ret;
-
-
-        SK_MEMSET(pKeyArr, 0, KeyArrLen);
-
-        /*
-         * Get VPD key list
-         */
-        Ret = VpdKeys(pAC, IoC, (char *)&BufKeys, (int *)&BufKeysLen,
-                (int *)pKeyNo);
-        if (Ret > 0) {
-
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR014,
-                        SK_PNMI_ERR014MSG);
-
-                return (SK_PNMI_ERR_GENERAL);
-        }
-        /* If no keys are available return now */
-        if (*pKeyNo == 0 || BufKeysLen == 0) {
-
-                return (SK_PNMI_ERR_OK);
-        }
-        /*
-         * If the key list is too long for us trunc it and give a
-         * errorlog notification. This case should not happen because
-         * the maximum number of keys is limited due to RAM limitations
-         */
-        if (*pKeyNo > SK_PNMI_VPD_ENTRIES) {
-
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR015,
-                        SK_PNMI_ERR015MSG);
-
-                *pKeyNo = SK_PNMI_VPD_ENTRIES;
-        }
-
-        /*
-         * Now build an array of fixed string length size and copy
-         * the keys together.
-         */
-        for (Index = 0, StartOffset = 0, Offset = 0; Offset < BufKeysLen;
-                Offset ++) {
-
-                if (BufKeys[Offset] != 0) {
-
-                        continue;
-                }
-
-                if (Offset - StartOffset > SK_PNMI_VPD_KEY_SIZE) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR016,
-                                SK_PNMI_ERR016MSG);
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-
-                SK_STRNCPY(pKeyArr + Index * SK_PNMI_VPD_KEY_SIZE,
-                        &BufKeys[StartOffset], SK_PNMI_VPD_KEY_SIZE);
-
-                Index ++;
-                StartOffset = Offset + 1;
-        }
-
-        /* Last key not zero terminated? Get it anyway */
-        if (StartOffset < Offset) {
-
-                SK_STRNCPY(pKeyArr + Index * SK_PNMI_VPD_KEY_SIZE,
-                        &BufKeys[StartOffset], SK_PNMI_VPD_KEY_SIZE);
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * SirqUpdate - Let the SIRQ update its internal values
- *
- * Description:
- *      Just to be sure that the SIRQ module holds its internal data
- *      structures up to date, we send an update event before we make
- *      any access.
- *
- * Returns:
- *      SK_PNMI_ERR_OK       Task successfully performed.
- *      SK_PNMI_ERR_GENERAL  Something went wrong.
- */
-PNMI_STATIC int SirqUpdate(
-SK_AC *pAC,     /* Pointer to adapter context */
-SK_IOC IoC)     /* IO context handle */
-{
-        SK_EVPARA       EventParam;
-
-
-        /* Was the module already updated during the current PNMI call? */
-        if (pAC->Pnmi.SirqUpdatedFlag > 0) {
-
-                return (SK_PNMI_ERR_OK);
-        }
-
-        /* Send an synchronuous update event to the module */
-        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-        if (SkGeSirqEvent(pAC, IoC, SK_HWEV_UPDATE_STAT, EventParam) > 0) {
-
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR047,
-                        SK_PNMI_ERR047MSG);
-
-                return (SK_PNMI_ERR_GENERAL);
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * RlmtUpdate - Let the RLMT update its internal values
- *
- * Description:
- *      Just to be sure that the RLMT module holds its internal data
- *      structures up to date, we send an update event before we make
- *      any access.
- *
- * Returns:
- *      SK_PNMI_ERR_OK       Task successfully performed.
- *      SK_PNMI_ERR_GENERAL  Something went wrong.
- */
-PNMI_STATIC int RlmtUpdate(
-SK_AC *pAC,     /* Pointer to adapter context */
-SK_IOC IoC,     /* IO context handle */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode allways zero */
-{
-        SK_EVPARA       EventParam;
-
-
-        /* Was the module already updated during the current PNMI call? */
-        if (pAC->Pnmi.RlmtUpdatedFlag > 0) {
-
-                return (SK_PNMI_ERR_OK);
-        }
-
-        /* Send an synchronuous update event to the module */
-        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-        EventParam.Para32[0] = NetIndex;
-        EventParam.Para32[1] = (SK_U32)-1;
-        if (SkRlmtEvent(pAC, IoC, SK_RLMT_STATS_UPDATE, EventParam) > 0) {
-
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR048,
-                        SK_PNMI_ERR048MSG);
-
-                return (SK_PNMI_ERR_GENERAL);
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * MacUpdate - Force the XMAC to output the current statistic
- *
- * Description:
- *      The XMAC holds its statistic internally. To obtain the current
- *      values we must send a command so that the statistic data will
- *      be written to a predefined memory area on the adapter.
- *
- * Returns:
- *      SK_PNMI_ERR_OK       Task successfully performed.
- *      SK_PNMI_ERR_GENERAL  Something went wrong.
- */
-PNMI_STATIC int MacUpdate(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-unsigned int FirstMac,  /* Index of the first Mac to be updated */
-unsigned int LastMac)   /* Index of the last Mac to be updated */
-{
-        unsigned int    MacIndex;
-
-        /*
-         * Were the statistics already updated during the
-         * current PNMI call?
-         */
-        if (pAC->Pnmi.MacUpdatedFlag > 0) {
-
-                return (SK_PNMI_ERR_OK);
-        }
-
-        /* Send an update command to all MACs specified */
-        for (MacIndex = FirstMac; MacIndex <= LastMac; MacIndex ++) {
-
-                /*
-                 * 2002-09-13 pweber:   Freeze the current SW counters.
-                 *                      (That should be done as close as
-                 *                      possible to the update of the
-                 *                      HW counters)
-                 */
-                if (pAC->GIni.GIMacType == SK_MAC_XMAC) {
-                        pAC->Pnmi.BufPort[MacIndex] = pAC->Pnmi.Port[MacIndex];
-                }
-                        
-                /* 2002-09-13 pweber:  Update the HW counter  */
-                if (pAC->GIni.GIFunc.pFnMacUpdateStats(pAC, IoC, MacIndex) != 0) {
-
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-        }
-
-        return (SK_PNMI_ERR_OK);
-}
-
-/*****************************************************************************
- *
- * GetStatVal - Retrieve an XMAC statistic counter
- *
- * Description:
- *      Retrieves the statistic counter of a virtual or physical port. The
- *      virtual port is identified by the index 0. It consists of all
- *      currently active ports. To obtain the counter value for this port
- *      we must add the statistic counter of all active ports. To grant
- *      continuous counter values for the virtual port even when port
- *      switches occur we must additionally add a delta value, which was
- *      calculated during a SK_PNMI_EVT_RLMT_ACTIVE_UP event.
- *
- * Returns:
- *      Requested statistic value
- */
-PNMI_STATIC SK_U64 GetStatVal(
-SK_AC *pAC,                                     /* Pointer to adapter context */
-SK_IOC IoC,                                     /* IO context handle */
-unsigned int LogPortIndex,      /* Index of the logical Port to be processed */
-unsigned int StatIndex,         /* Index to statistic value */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode allways zero */
-{
-        unsigned int    PhysPortIndex;
-        unsigned int    PhysPortMax;
-        SK_U64                  Val = 0;
-
-
-        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {   /* Dual net mode */
-
-                PhysPortIndex = NetIndex;
-                
-                Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
-        }
-        else {  /* Single Net mode */
-
-                if (LogPortIndex == 0) {
-
-                        PhysPortMax = pAC->GIni.GIMacsFound;
-
-                        /* Add counter of all active ports */
-                        for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
-                                PhysPortIndex ++) {
-
-                                if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
-                                        Val += GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
-                                }
-                        }
-
-                        /* Correct value because of port switches */
-                        Val += pAC->Pnmi.VirtualCounterOffset[StatIndex];
-                }
-                else {
-                        /* Get counter value of physical port */
-                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
-                        
-                        Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
-                }
-        }
-        return (Val);
-}
-
-/*****************************************************************************
- *
- * GetPhysStatVal - Get counter value for physical port
- *
- * Description:
- *      Builds a 64bit counter value. Except for the octet counters
- *      the lower 32bit are counted in hardware and the upper 32bit
- *      in software by monitoring counter overflow interrupts in the
- *      event handler. To grant continous counter values during XMAC
- *      resets (caused by a workaround) we must add a delta value.
- *      The delta was calculated in the event handler when a
- *      SK_PNMI_EVT_XMAC_RESET was received.
- *
- * Returns:
- *      Counter value
- */
-PNMI_STATIC SK_U64 GetPhysStatVal(
-SK_AC *pAC,                                     /* Pointer to adapter context */
-SK_IOC IoC,                                     /* IO context handle */
-unsigned int PhysPortIndex,     /* Index of the logical Port to be processed */
-unsigned int StatIndex)         /* Index to statistic value */
-{
-        SK_U64  Val = 0;
-        SK_U32  LowVal = 0;
-        SK_U32  HighVal = 0;
-        SK_U16  Word;
-        int             MacType;
-        unsigned int HelpIndex;
-        SK_GEPORT       *pPrt;
-        
-        SK_PNMI_PORT    *pPnmiPrt;
-        SK_GEMACFUNC    *pFnMac;
-        
-        pPrt = &pAC->GIni.GP[PhysPortIndex];
-        
-        MacType = pAC->GIni.GIMacType;
-        
-        /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
-        if (MacType == SK_MAC_XMAC) {
-                pPnmiPrt = &pAC->Pnmi.BufPort[PhysPortIndex];
-        }
-        else {
-                pPnmiPrt = &pAC->Pnmi.Port[PhysPortIndex];
-        }
-        
-        pFnMac   = &pAC->GIni.GIFunc;
-
-        switch (StatIndex) {
-        case SK_PNMI_HTX:
-                if (MacType == SK_MAC_GMAC) {
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                        StatAddr[SK_PNMI_HTX_BROADCAST][MacType].Reg,
-                                                        &LowVal);
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                        StatAddr[SK_PNMI_HTX_MULTICAST][MacType].Reg,
-                                                        &HighVal);
-                        LowVal += HighVal;
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                        StatAddr[SK_PNMI_HTX_UNICAST][MacType].Reg,
-                                                        &HighVal);
-                        LowVal += HighVal;
-                }
-                else {
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                                  StatAddr[StatIndex][MacType].Reg,
-                                                                                  &LowVal);
-                }
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-        
-        case SK_PNMI_HRX:
-                if (MacType == SK_MAC_GMAC) {
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                        StatAddr[SK_PNMI_HRX_BROADCAST][MacType].Reg,
-                                                        &LowVal);
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                        StatAddr[SK_PNMI_HRX_MULTICAST][MacType].Reg,
-                                                        &HighVal);
-                        LowVal += HighVal;
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                        StatAddr[SK_PNMI_HRX_UNICAST][MacType].Reg,
-                                                        &HighVal);
-                        LowVal += HighVal;
-                }
-                else {
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                                  StatAddr[StatIndex][MacType].Reg,
-                                                                                  &LowVal);
-                }
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-
-        case SK_PNMI_HTX_OCTET:
-        case SK_PNMI_HRX_OCTET:
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &HighVal);
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex + 1][MacType].Reg,
-                                                                          &LowVal);
-                break;
-
-        case SK_PNMI_HTX_BURST:
-        case SK_PNMI_HTX_EXCESS_DEF:
-        case SK_PNMI_HTX_CARRIER:
-                /* Not supported by GMAC */
-                if (MacType == SK_MAC_GMAC) {
-                        return (Val);
-                }
-
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &LowVal);
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-
-        case SK_PNMI_HTX_MACC:
-                /* GMAC only supports PAUSE MAC control frames */
-                if (MacType == SK_MAC_GMAC) {
-                        HelpIndex = SK_PNMI_HTX_PMACC;
-                }
-                else {
-                        HelpIndex = StatIndex;
-                }
-                
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                StatAddr[HelpIndex][MacType].Reg,
-                                                                &LowVal);
-
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-
-        case SK_PNMI_HTX_COL:
-        case SK_PNMI_HRX_UNDERSIZE:
-                /* Not supported by XMAC */
-                if (MacType == SK_MAC_XMAC) {
-                        return (Val);
-                }
-
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &LowVal);
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-
-        case SK_PNMI_HTX_DEFFERAL:
-                /* Not supported by GMAC */
-                if (MacType == SK_MAC_GMAC) {
-                        return (Val);
-                }
-                
-                /*
-                 * XMAC counts frames with deferred transmission
-                 * even in full-duplex mode.
-                 *
-                 * In full-duplex mode the counter remains constant!
-                 */
-                if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL) ||
-                        (pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL)) {
-
-                        LowVal = 0;
-                        HighVal = 0;
-                }
-                else {
-                        /* Otherwise get contents of hardware register */
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                                  StatAddr[StatIndex][MacType].Reg,
-                                                                                  &LowVal);
-                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                }
-                break;
-
-        case SK_PNMI_HRX_BADOCTET:
-                /* Not supported by XMAC */
-                if (MacType == SK_MAC_XMAC) {
-                        return (Val);
-                }
-
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &HighVal);
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex + 1][MacType].Reg,
-                                      &LowVal);
-                break;
-
-        case SK_PNMI_HTX_OCTETLOW:
-        case SK_PNMI_HRX_OCTETLOW:
-        case SK_PNMI_HRX_BADOCTETLOW:
-                return (Val);
-
-        case SK_PNMI_HRX_LONGFRAMES:
-                /* For XMAC the SW counter is managed by PNMI */
-                if (MacType == SK_MAC_XMAC) {
-                        return (pPnmiPrt->StatRxLongFrameCts);
-                }
-                
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &LowVal);
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-                
-        case SK_PNMI_HRX_TOO_LONG:
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                StatAddr[StatIndex][MacType].Reg,
-                                                                &LowVal);
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                
-                Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
-
-                if (MacType == SK_MAC_GMAC) {
-                        /* For GMAC the SW counter is additionally managed by PNMI */
-                        Val += pPnmiPrt->StatRxFrameTooLongCts;
-                }
-                else {
-                        /*
-                         * Frames longer than IEEE 802.3 frame max size are counted
-                         * by XMAC in frame_too_long counter even reception of long
-                         * frames was enabled and the frame was correct.
-                         * So correct the value by subtracting RxLongFrame counter.
-                         */
-                        Val -= pPnmiPrt->StatRxLongFrameCts;
-                }
-
-                LowVal = (SK_U32)Val;
-                HighVal = (SK_U32)(Val >> 32);
-                break;
-                
-        case SK_PNMI_HRX_SHORTS:
-                /* Not supported by GMAC */
-                if (MacType == SK_MAC_GMAC) {
-                        /* GM_RXE_FRAG?? */
-                        return (Val);
-                }
-                
-                /*
-                 * XMAC counts short frame errors even if link down (#10620)
-                 *
-                 * If link-down the counter remains constant
-                 */
-                if (pPrt->PLinkModeStatus != SK_LMODE_STAT_UNKNOWN) {
-
-                        /* Otherwise get incremental difference */
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                                  StatAddr[StatIndex][MacType].Reg,
-                                                                                  &LowVal);
-                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
-
-                        Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
-                        Val -= pPnmiPrt->RxShortZeroMark;
-
-                        LowVal = (SK_U32)Val;
-                        HighVal = (SK_U32)(Val >> 32);
-                }
-                break;
-
-        case SK_PNMI_HRX_MACC:
-        case SK_PNMI_HRX_MACC_UNKWN:
-        case SK_PNMI_HRX_BURST:
-        case SK_PNMI_HRX_MISSED:
-        case SK_PNMI_HRX_FRAMING:
-        case SK_PNMI_HRX_CARRIER:
-        case SK_PNMI_HRX_IRLENGTH:
-        case SK_PNMI_HRX_SYMBOL:
-        case SK_PNMI_HRX_CEXT:
-                /* Not supported by GMAC */
-                if (MacType == SK_MAC_GMAC) {
-                        return (Val);
-                }
-
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &LowVal);
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-
-        case SK_PNMI_HRX_PMACC_ERR:
-                /* For GMAC the SW counter is managed by PNMI */
-                if (MacType == SK_MAC_GMAC) {
-                        return (pPnmiPrt->StatRxPMaccErr);
-                }
-                
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &LowVal);
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-
-        /* SW counter managed by PNMI */
-        case SK_PNMI_HTX_SYNC:
-                LowVal = (SK_U32)pPnmiPrt->StatSyncCts;
-                HighVal = (SK_U32)(pPnmiPrt->StatSyncCts >> 32);
-                break;
-
-        /* SW counter managed by PNMI */
-        case SK_PNMI_HTX_SYNC_OCTET:
-                LowVal = (SK_U32)pPnmiPrt->StatSyncOctetsCts;
-                HighVal = (SK_U32)(pPnmiPrt->StatSyncOctetsCts >> 32);
-                break;
-
-        case SK_PNMI_HRX_FCS:
-                /*
-                 * Broadcom filters FCS errors and counts it in
-                 * Receive Error Counter register
-                 */
-                if (pPrt->PhyType == SK_PHY_BCOM) {
-                        /* do not read while not initialized (PHY_READ hangs!)*/
-                        if (pPrt->PState != SK_PRT_RESET) {
-                                SkXmPhyRead(pAC, IoC, PhysPortIndex, PHY_BCOM_RE_CTR, &Word);
-                                
-                                LowVal = Word;
-                        }
-                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                }
-                else {
-                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                                  StatAddr[StatIndex][MacType].Reg,
-                                                                                  &LowVal);
-                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                }
-                break;
-
-        default:
-                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-                                                                          StatAddr[StatIndex][MacType].Reg,
-                                                                          &LowVal);
-                HighVal = pPnmiPrt->CounterHigh[StatIndex];
-                break;
-        }
-
-        Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
-
-        /* Correct value because of possible XMAC reset. XMAC Errata #2 */
-        Val += pPnmiPrt->CounterOffset[StatIndex];
-
-        return (Val);
-}
-
-/*****************************************************************************
- *
- * ResetCounter - Set all counters and timestamps to zero
- *
- * Description:
- *      Notifies other common modules which store statistic data to
- *      reset their counters and finally reset our own counters.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void ResetCounter(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-SK_U32 NetIndex)
-{
-        unsigned int    PhysPortIndex;
-        SK_EVPARA       EventParam;
-
-
-        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-
-        /* Notify sensor module */
-        SkEventQueue(pAC, SKGE_I2C, SK_I2CEV_CLEAR, EventParam);
-
-        /* Notify RLMT module */
-        EventParam.Para32[0] = NetIndex;
-        EventParam.Para32[1] = (SK_U32)-1;
-        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STATS_CLEAR, EventParam);
-        EventParam.Para32[1] = 0;
-
-        /* Notify SIRQ module */
-        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_CLEAR_STAT, EventParam);
-
-        /* Notify CSUM module */
-#ifdef SK_USE_CSUM
-        EventParam.Para32[0] = NetIndex;
-        EventParam.Para32[1] = (SK_U32)-1;
-        SkEventQueue(pAC, SKGE_CSUM, SK_CSUM_EVENT_CLEAR_PROTO_STATS,
-                EventParam);
-#endif /* SK_USE_CSUM */
-        
-        /* Clear XMAC statistic */
-        for (PhysPortIndex = 0; PhysPortIndex <
-                (unsigned int)pAC->GIni.GIMacsFound; PhysPortIndex ++) {
-
-                (void)pAC->GIni.GIFunc.pFnMacResetCounter(pAC, IoC, PhysPortIndex);
-
-                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].CounterHigh,
-                        0, sizeof(pAC->Pnmi.Port[PhysPortIndex].CounterHigh));
-                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
-                        CounterOffset, 0, sizeof(pAC->Pnmi.Port[
-                        PhysPortIndex].CounterOffset));
-                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].StatSyncCts,
-                        0, sizeof(pAC->Pnmi.Port[PhysPortIndex].StatSyncCts));
-                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
-                        StatSyncOctetsCts, 0, sizeof(pAC->Pnmi.Port[
-                        PhysPortIndex].StatSyncOctetsCts));
-                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
-                        StatRxLongFrameCts, 0, sizeof(pAC->Pnmi.Port[
-                        PhysPortIndex].StatRxLongFrameCts));
-                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
-                                  StatRxFrameTooLongCts, 0, sizeof(pAC->Pnmi.Port[
-                        PhysPortIndex].StatRxFrameTooLongCts));
-                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
-                                  StatRxPMaccErr, 0, sizeof(pAC->Pnmi.Port[
-                        PhysPortIndex].StatRxPMaccErr));
-        }
-
-        /*
-         * Clear local statistics
-         */
-        SK_MEMSET((char *)&pAC->Pnmi.VirtualCounterOffset, 0,
-                  sizeof(pAC->Pnmi.VirtualCounterOffset));
-        pAC->Pnmi.RlmtChangeCts = 0;
-        pAC->Pnmi.RlmtChangeTime = 0;
-        SK_MEMSET((char *)&pAC->Pnmi.RlmtChangeEstimate.EstValue[0], 0,
-                sizeof(pAC->Pnmi.RlmtChangeEstimate.EstValue));
-        pAC->Pnmi.RlmtChangeEstimate.EstValueIndex = 0;
-        pAC->Pnmi.RlmtChangeEstimate.Estimate = 0;
-        pAC->Pnmi.Port[NetIndex].TxSwQueueMax = 0;
-        pAC->Pnmi.Port[NetIndex].TxRetryCts = 0;
-        pAC->Pnmi.Port[NetIndex].RxIntrCts = 0;
-        pAC->Pnmi.Port[NetIndex].TxIntrCts = 0;
-        pAC->Pnmi.Port[NetIndex].RxNoBufCts = 0;
-        pAC->Pnmi.Port[NetIndex].TxNoBufCts = 0;
-        pAC->Pnmi.Port[NetIndex].TxUsedDescrNo = 0;
-        pAC->Pnmi.Port[NetIndex].RxDeliveredCts = 0;
-        pAC->Pnmi.Port[NetIndex].RxOctetsDeliveredCts = 0;
-        pAC->Pnmi.Port[NetIndex].ErrRecoveryCts = 0;
-}
-
-/*****************************************************************************
- *
- * GetTrapEntry - Get an entry in the trap buffer
- *
- * Description:
- *      The trap buffer stores various events. A user application somehow
- *      gets notified that an event occured and retrieves the trap buffer
- *      contens (or simply polls the buffer). The buffer is organized as
- *      a ring which stores the newest traps at the beginning. The oldest
- *      traps are overwritten by the newest ones. Each trap entry has a
- *      unique number, so that applications may detect new trap entries.
- *
- * Returns:
- *      A pointer to the trap entry
- */
-PNMI_STATIC char* GetTrapEntry(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_U32 TrapId,          /* SNMP ID of the trap */
-unsigned int Size)      /* Space needed for trap entry */
-{
-        unsigned int            BufPad = pAC->Pnmi.TrapBufPad;
-        unsigned int            BufFree = pAC->Pnmi.TrapBufFree;
-        unsigned int            Beg = pAC->Pnmi.TrapQueueBeg;
-        unsigned int            End = pAC->Pnmi.TrapQueueEnd;
-        char                    *pBuf = &pAC->Pnmi.TrapBuf[0];
-        int                     Wrap;
-        unsigned int            NeededSpace;
-        unsigned int            EntrySize;
-        SK_U32                  Val32;
-        SK_U64                  Val64;
-
-
-        /* Last byte of entry will get a copy of the entry length */
-        Size ++;
-
-        /*
-         * Calculate needed buffer space */
-        if (Beg >= Size) {
-
-                NeededSpace = Size;
-                Wrap = SK_FALSE;
-        }
-        else {
-                NeededSpace = Beg + Size;
-                Wrap = SK_TRUE;
-        }
-
-        /*
-         * Check if enough buffer space is provided. Otherwise
-         * free some entries. Leave one byte space between begin
-         * and end of buffer to make it possible to detect whether
-         * the buffer is full or empty
-         */
-        while (BufFree < NeededSpace + 1) {
-
-                if (End == 0) {
-
-                        End = SK_PNMI_TRAP_QUEUE_LEN;
-                }
-
-                EntrySize = (unsigned int)*((unsigned char *)pBuf + End - 1);
-                BufFree += EntrySize;
-                End -= EntrySize;
-#ifdef DEBUG
-                SK_MEMSET(pBuf + End, (char)(-1), EntrySize);
-#endif /* DEBUG */
-                if (End == BufPad) {
-#ifdef DEBUG
-                        SK_MEMSET(pBuf, (char)(-1), End);
-#endif /* DEBUG */
-                        BufFree += End;
-                        End = 0;
-                        BufPad = 0;
-                }
-        }
-
-        /*
-         * Insert new entry as first entry. Newest entries are
-         * stored at the beginning of the queue.
-         */
-        if (Wrap) {
-
-                BufPad = Beg;
-                Beg = SK_PNMI_TRAP_QUEUE_LEN - Size;
-        }
-        else {
-                Beg = Beg - Size;
-        }
-        BufFree -= NeededSpace;
-
-        /* Save the current offsets */
-        pAC->Pnmi.TrapQueueBeg = Beg;
-        pAC->Pnmi.TrapQueueEnd = End;
-        pAC->Pnmi.TrapBufPad = BufPad;
-        pAC->Pnmi.TrapBufFree = BufFree;
-
-        /* Initialize the trap entry */
-        *(pBuf + Beg + Size - 1) = (char)Size;
-        *(pBuf + Beg) = (char)Size;
-        Val32 = (pAC->Pnmi.TrapUnique) ++;
-        SK_PNMI_STORE_U32(pBuf + Beg + 1, Val32);
-        SK_PNMI_STORE_U32(pBuf + Beg + 1 + sizeof(SK_U32), TrapId);
-        Val64 = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
-        SK_PNMI_STORE_U64(pBuf + Beg + 1 + 2 * sizeof(SK_U32), Val64);
-
-        return (pBuf + Beg);
-}
-
-/*****************************************************************************
- *
- * CopyTrapQueue - Copies the trap buffer for the TRAP OID
- *
- * Description:
- *      On a query of the TRAP OID the trap buffer contents will be
- *      copied continuously to the request buffer, which must be large
- *      enough. No length check is performed.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void CopyTrapQueue(
-SK_AC *pAC,             /* Pointer to adapter context */
-char *pDstBuf)          /* Buffer to which the queued traps will be copied */
-{
-        unsigned int    BufPad = pAC->Pnmi.TrapBufPad;
-        unsigned int    Trap = pAC->Pnmi.TrapQueueBeg;
-        unsigned int    End = pAC->Pnmi.TrapQueueEnd;
-        char            *pBuf = &pAC->Pnmi.TrapBuf[0];
-        unsigned int    Len;
-        unsigned int    DstOff = 0;
-
-
-        while (Trap != End) {
-
-                Len = (unsigned int)*(pBuf + Trap);
-
-                /*
-                 * Last byte containing a copy of the length will
-                 * not be copied.
-                 */
-                *(pDstBuf + DstOff) = (char)(Len - 1);
-                SK_MEMCPY(pDstBuf + DstOff + 1, pBuf + Trap + 1, Len - 2);
-                DstOff += Len - 1;
-
-                Trap += Len;
-                if (Trap == SK_PNMI_TRAP_QUEUE_LEN) {
-
-                        Trap = BufPad;
-                }
-        }
-}
-
-/*****************************************************************************
- *
- * GetTrapQueueLen - Get the length of the trap buffer
- *
- * Description:
- *      Evaluates the number of currently stored traps and the needed
- *      buffer size to retrieve them.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void GetTrapQueueLen(
-SK_AC *pAC,             /* Pointer to adapter context */
-unsigned int *pLen,     /* Length in Bytes of all queued traps */
-unsigned int *pEntries) /* Returns number of trapes stored in queue */
-{
-        unsigned int    BufPad = pAC->Pnmi.TrapBufPad;
-        unsigned int    Trap = pAC->Pnmi.TrapQueueBeg;
-        unsigned int    End = pAC->Pnmi.TrapQueueEnd;
-        char            *pBuf = &pAC->Pnmi.TrapBuf[0];
-        unsigned int    Len;
-        unsigned int    Entries = 0;
-        unsigned int    TotalLen = 0;
-
-
-        while (Trap != End) {
-
-                Len = (unsigned int)*(pBuf + Trap);
-                TotalLen += Len - 1;
-                Entries ++;
-
-                Trap += Len;
-                if (Trap == SK_PNMI_TRAP_QUEUE_LEN) {
-
-                        Trap = BufPad;
-                }
-        }
-
-        *pEntries = Entries;
-        *pLen = TotalLen;
-}
-
-/*****************************************************************************
- *
- * QueueSimpleTrap - Store a simple trap to the trap buffer
- *
- * Description:
- *      A simple trap is a trap with now additional data. It consists
- *      simply of a trap code.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void QueueSimpleTrap(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_U32 TrapId)          /* Type of sensor trap */
-{
-        GetTrapEntry(pAC, TrapId, SK_PNMI_TRAP_SIMPLE_LEN);
-}
-
-/*****************************************************************************
- *
- * QueueSensorTrap - Stores a sensor trap in the trap buffer
- *
- * Description:
- *      Gets an entry in the trap buffer and fills it with sensor related
- *      data.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void QueueSensorTrap(
-SK_AC *pAC,                     /* Pointer to adapter context */
-SK_U32 TrapId,                  /* Type of sensor trap */
-unsigned int SensorIndex)       /* Index of sensor which caused the trap */
-{
-        char            *pBuf;
-        unsigned int    Offset;
-        unsigned int    DescrLen;
-        SK_U32          Val32;
-
-
-        /* Get trap buffer entry */
-        DescrLen = SK_STRLEN(pAC->I2c.SenTable[SensorIndex].SenDesc);
-        pBuf = GetTrapEntry(pAC, TrapId,
-                SK_PNMI_TRAP_SENSOR_LEN_BASE + DescrLen);
-        Offset = SK_PNMI_TRAP_SIMPLE_LEN;
-
-        /* Store additionally sensor trap related data */
-        Val32 = OID_SKGE_SENSOR_INDEX;
-        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-        *(pBuf + Offset + 4) = 4;
-        Val32 = (SK_U32)SensorIndex;
-        SK_PNMI_STORE_U32(pBuf + Offset + 5, Val32);
-        Offset += 9;
-        
-        Val32 = (SK_U32)OID_SKGE_SENSOR_DESCR;
-        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-        *(pBuf + Offset + 4) = (char)DescrLen;
-        SK_MEMCPY(pBuf + Offset + 5, pAC->I2c.SenTable[SensorIndex].SenDesc,
-                DescrLen);
-        Offset += DescrLen + 5;
-
-        Val32 = OID_SKGE_SENSOR_TYPE;
-        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-        *(pBuf + Offset + 4) = 1;
-        *(pBuf + Offset + 5) = (char)pAC->I2c.SenTable[SensorIndex].SenType;
-        Offset += 6;
-
-        Val32 = OID_SKGE_SENSOR_VALUE;
-        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
-        *(pBuf + Offset + 4) = 4;
-        Val32 = (SK_U32)pAC->I2c.SenTable[SensorIndex].SenValue;
-        SK_PNMI_STORE_U32(pBuf + Offset + 5, Val32);
-}
-
-/*****************************************************************************
- *
- * QueueRlmtNewMacTrap - Store a port switch trap in the trap buffer
- *
- * Description:
- *      Nothing further to explain.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void QueueRlmtNewMacTrap(
-SK_AC *pAC,             /* Pointer to adapter context */
-unsigned int ActiveMac) /* Index (0..n) of the currently active port */
-{
-        char    *pBuf;
-        SK_U32  Val32;
-
-
-        pBuf = GetTrapEntry(pAC, OID_SKGE_TRAP_RLMT_CHANGE_PORT,
-                SK_PNMI_TRAP_RLMT_CHANGE_LEN);
-
-        Val32 = OID_SKGE_RLMT_PORT_ACTIVE;
-        SK_PNMI_STORE_U32(pBuf + SK_PNMI_TRAP_SIMPLE_LEN, Val32);
-        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 4) = 1;
-        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 5) = (char)ActiveMac;
-}
-
-/*****************************************************************************
- *
- * QueueRlmtPortTrap - Store port related RLMT trap to trap buffer
- *
- * Description:
- *      Nothing further to explain.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void QueueRlmtPortTrap(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_U32 TrapId,          /* Type of RLMT port trap */
-unsigned int PortIndex) /* Index of the port, which changed its state */
-{
-        char    *pBuf;
-        SK_U32  Val32;
-
-
-        pBuf = GetTrapEntry(pAC, TrapId, SK_PNMI_TRAP_RLMT_PORT_LEN);
-
-        Val32 = OID_SKGE_RLMT_PORT_INDEX;
-        SK_PNMI_STORE_U32(pBuf + SK_PNMI_TRAP_SIMPLE_LEN, Val32);
-        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 4) = 1;
-        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 5) = (char)PortIndex;
-}
-
-/*****************************************************************************
- *
- * CopyMac - Copies a MAC address
- *
- * Description:
- *      Nothing further to explain.
- *
- * Returns:
- *      Nothing
- */
-PNMI_STATIC void CopyMac(
-char *pDst,             /* Pointer to destination buffer */
-SK_MAC_ADDR *pMac)      /* Pointer of Source */
-{
-        int     i;
-
-
-        for (i = 0; i < sizeof(SK_MAC_ADDR); i ++) {
-
-                *(pDst + i) = pMac->a[i];
-        }
-}
-
-#ifdef SK_POWER_MGMT
-/*****************************************************************************
- *
- * PowerManagement - OID handler function of PowerManagement OIDs
- *
- * Description:
- *      The code is simple. No description necessary.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-
-PNMI_STATIC int PowerManagement(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* Get/PreSet/Set action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,     /* On call: buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode allways zero */
-{
-        
-        SK_U32  RetCode = SK_PNMI_ERR_GENERAL;
-
-        /*
-         * Check instance. We only handle single instance variables
-         */
-        if (Instance != (SK_U32)(-1) && Instance != 1) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_INST);
-        }
-        
-    
-    /* Check length */
-    switch (Id) {
-
-    case OID_PNP_CAPABILITIES:
-        if (*pLen < sizeof(SK_PNP_CAPABILITIES)) {
-
-            *pLen = sizeof(SK_PNP_CAPABILITIES);
-            return (SK_PNMI_ERR_TOO_SHORT);
-        }
-        break;
-
-        case OID_PNP_SET_POWER:
-    case OID_PNP_QUERY_POWER:
-        if (*pLen < sizeof(SK_DEVICE_POWER_STATE))
-        {
-                *pLen = sizeof(SK_DEVICE_POWER_STATE);
-                return (SK_PNMI_ERR_TOO_SHORT);
-        }
-        break;
-
-    case OID_PNP_ADD_WAKE_UP_PATTERN:
-    case OID_PNP_REMOVE_WAKE_UP_PATTERN:
-                if (*pLen < sizeof(SK_PM_PACKET_PATTERN)) {
-
-                        *pLen = sizeof(SK_PM_PACKET_PATTERN);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-    case OID_PNP_ENABLE_WAKE_UP:
-        if (*pLen < sizeof(SK_U32)) {
-
-            *pLen = sizeof(SK_U32);
-            return (SK_PNMI_ERR_TOO_SHORT);
-        }
-        break;
-    }
-        
-    /*
-         * Perform action
-         */
-        if (Action == SK_PNMI_GET) {
-
-                /*
-                 * Get value
-                 */
-                switch (Id) {
-
-                case OID_PNP_CAPABILITIES:
-                        RetCode = SkPowerQueryPnPCapabilities(pAC, IoC, pBuf, pLen);
-                        break;
-
-                case OID_PNP_QUERY_POWER:
-                        /* The Windows DDK describes: An OID_PNP_QUERY_POWER requests
-                         the miniport to indicate whether it can transition its NIC
-                         to the low-power state.
-                         A miniport driver must always return NDIS_STATUS_SUCCESS
-                         to a query of OID_PNP_QUERY_POWER. */
-                        *pLen = sizeof(SK_DEVICE_POWER_STATE);
-            RetCode = SK_PNMI_ERR_OK;
-                        break;
-
-                        /* NDIS handles these OIDs as write-only.
-                         * So in case of get action the buffer with written length = 0
-                         * is returned
-                         */
-                case OID_PNP_SET_POWER:
-                case OID_PNP_ADD_WAKE_UP_PATTERN:
-                case OID_PNP_REMOVE_WAKE_UP_PATTERN:
-                        *pLen = 0;      
-            RetCode = SK_PNMI_ERR_NOT_SUPPORTED;
-                        break;
-
-                case OID_PNP_ENABLE_WAKE_UP:
-                        RetCode = SkPowerGetEnableWakeUp(pAC, IoC, pBuf, pLen);
-                        break;
-
-                default:
-                        RetCode = SK_PNMI_ERR_GENERAL;
-                        break;
-                }
-
-                return (RetCode);
-        }
-        
-
-        /*
-         * Perform preset or set
-         */
-        
-        /* POWER module does not support PRESET action */
-        if (Action == SK_PNMI_PRESET) {
-                return (SK_PNMI_ERR_OK);
-        }
-
-        switch (Id) {
-        case OID_PNP_SET_POWER:
-                RetCode = SkPowerSetPower(pAC, IoC, pBuf, pLen);        
-                break;
-
-        case OID_PNP_ADD_WAKE_UP_PATTERN:
-                RetCode = SkPowerAddWakeUpPattern(pAC, IoC, pBuf, pLen);        
-                break;
-                
-        case OID_PNP_REMOVE_WAKE_UP_PATTERN:
-                RetCode = SkPowerRemoveWakeUpPattern(pAC, IoC, pBuf, pLen);     
-                break;
-                
-        case OID_PNP_ENABLE_WAKE_UP:
-                RetCode = SkPowerSetEnableWakeUp(pAC, IoC, pBuf, pLen);
-                break;
-                
-        default:
-                RetCode = SK_PNMI_ERR_READ_ONLY;
-        }
-        
-        return (RetCode);
-}
-#endif /* SK_POWER_MGMT */
-
-#ifdef SK_DIAG_SUPPORT
-/*****************************************************************************
- *
- * DiagActions - OID handler function of Diagnostic driver 
- *
- * Description:
- *      The code is simple. No description necessary.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-
-PNMI_STATIC int DiagActions(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-
-        SK_U32  DiagStatus;
-        SK_U32  RetCode = SK_PNMI_ERR_GENERAL;
-
-        /*
-         * Check instance. We only handle single instance variables.
-         */
-        if (Instance != (SK_U32)(-1) && Instance != 1) {
-
-                *pLen = 0;
-                return (SK_PNMI_ERR_UNKNOWN_INST);
-        }
-
-        /*
-         * Check length.
-         */
-        switch (Id) {
-
-        case OID_SKGE_DIAG_MODE:
-                if (*pLen < sizeof(SK_U32)) {
-
-                        *pLen = sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR040, SK_PNMI_ERR040MSG);
-                *pLen = 0;
-                return (SK_PNMI_ERR_GENERAL);
-        }
-
-        /* Perform action. */
-
-        /* GET value. */
-        if (Action == SK_PNMI_GET) {
-
-                switch (Id) {
-
-                case OID_SKGE_DIAG_MODE:
-                        DiagStatus = pAC->Pnmi.DiagAttached;
-                        SK_PNMI_STORE_U32(pBuf, DiagStatus);
-                        *pLen = sizeof(SK_U32); 
-                        RetCode = SK_PNMI_ERR_OK;
-                        break;
-
-                default:
-                        *pLen = 0;      
-                        RetCode = SK_PNMI_ERR_GENERAL;
-                        break;
-                }
-                return (RetCode); 
-        }
-
-        /* From here SET or PRESET value. */
-        
-        /* PRESET value is not supported. */
-        if (Action == SK_PNMI_PRESET) {
-                return (SK_PNMI_ERR_OK); 
-        }
-
-        /* SET value. */
-        switch (Id) {
-                case OID_SKGE_DIAG_MODE:
-
-                        /* Handle the SET. */
-                        switch (*pBuf) {
-
-                                /* Attach the DIAG to this adapter. */
-                                case SK_DIAG_ATTACHED:
-                                        /* Check if we come from running */
-                                        if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
-
-                                                RetCode = SkDrvLeaveDiagMode(pAC);
-
-                                        }
-                                        else if (pAC->Pnmi.DiagAttached == SK_DIAG_IDLE) {
-
-                                                RetCode = SK_PNMI_ERR_OK;
-                                        }       
-                                        
-                                        else {
-
-                                                RetCode = SK_PNMI_ERR_GENERAL;
-
-                                        }
-                                        
-                                        if (RetCode == SK_PNMI_ERR_OK) {
-
-                                                pAC->Pnmi.DiagAttached = SK_DIAG_ATTACHED;
-                                        }
-                                        break;
-
-                                /* Enter the DIAG mode in the driver. */
-                                case SK_DIAG_RUNNING:
-                                        RetCode = SK_PNMI_ERR_OK;
-                                        
-                                        /*
-                                         * If DiagAttached is set, we can tell the driver
-                                         * to enter the DIAG mode.
-                                         */
-                                        if (pAC->Pnmi.DiagAttached == SK_DIAG_ATTACHED) {
-                                                /* If DiagMode is not active, we can enter it. */
-                                                if (!pAC->DiagModeActive) {
-
-                                                        RetCode = SkDrvEnterDiagMode(pAC); 
-                                                }
-                                                else {
-
-                                                        RetCode = SK_PNMI_ERR_GENERAL;
-                                                }
-                                        }
-                                        else {
-
-                                                RetCode = SK_PNMI_ERR_GENERAL;
-                                        }
-                                        
-                                        if (RetCode == SK_PNMI_ERR_OK) {
-
-                                                pAC->Pnmi.DiagAttached = SK_DIAG_RUNNING;
-                                        }
-                                        break;
-
-                                case SK_DIAG_IDLE:
-                                        /* Check if we come from running */
-                                        if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
-
-                                                RetCode = SkDrvLeaveDiagMode(pAC);
-
-                                        }
-                                        else if (pAC->Pnmi.DiagAttached == SK_DIAG_ATTACHED) {
-
-                                                RetCode = SK_PNMI_ERR_OK;
-                                        }       
-                                        
-                                        else {
-
-                                                RetCode = SK_PNMI_ERR_GENERAL;
-
-                                        }
-
-                                        if (RetCode == SK_PNMI_ERR_OK) {
-
-                                                pAC->Pnmi.DiagAttached = SK_DIAG_IDLE;
-                                        }
-                                        break;
-
-                                default:
-                                        RetCode = SK_PNMI_ERR_BAD_VALUE;
-                                        break;
-                        }
-                        break;
-
-                default:
-                        RetCode = SK_PNMI_ERR_GENERAL;
-        }
-
-        if (RetCode == SK_PNMI_ERR_OK) {
-                *pLen = sizeof(SK_U32);
-        }
-        else {
-
-                *pLen = 0;
-        }
-        return (RetCode);
-}
-#endif /* SK_DIAG_SUPPORT */
-
-/*****************************************************************************
- *
- * Vct - OID handler function of  OIDs
- *
- * Description:
- *      The code is simple. No description necessary.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was performed successfully.
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
- *                               the correct data (e.g. a 32bit value is
- *                               needed, but a 16 bit value was passed).
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter).
- *      SK_PNMI_ERR_READ_ONLY    Only the Get action is allowed.
- *
- */
-
-PNMI_STATIC int Vct(
-SK_AC *pAC,             /* Pointer to adapter context */
-SK_IOC IoC,             /* IO context handle */
-int Action,             /* GET/PRESET/SET action */
-SK_U32 Id,              /* Object ID that is to be processed */
-char *pBuf,             /* Buffer used for the management data transfer */
-unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
-SK_U32 Instance,        /* Instance (-1,2..n) that is to be queried */
-unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
-{
-        SK_GEPORT       *pPrt;
-        SK_PNMI_VCT     *pVctBackupData;
-        SK_U32          LogPortMax;
-        SK_U32          PhysPortMax;
-        SK_U32          PhysPortIndex;
-        SK_U32          Limit;
-        SK_U32          Offset;
-        SK_BOOL         Link;
-        SK_U32          RetCode = SK_PNMI_ERR_GENERAL;
-        int             i;
-        SK_EVPARA       Para;
-        SK_U32          CableLength;
-        
-        /*
-         * Calculate the port indexes from the instance.
-         */
-        PhysPortMax = pAC->GIni.GIMacsFound;
-        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
-        
-        /* Dual net mode? */
-        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                LogPortMax--;
-        }
-        
-        if ((Instance != (SK_U32) (-1))) {
-                /* Check instance range. */
-                if ((Instance < 2) || (Instance > LogPortMax)) {
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_UNKNOWN_INST);
-                }
-                
-                if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
-                        PhysPortIndex = NetIndex;
-                }
-                else {
-                        PhysPortIndex = Instance - 2;
-                }
-                Limit = PhysPortIndex + 1;
-        }
-        else {
-                /*
-                 * Instance == (SK_U32) (-1), get all Instances of that OID.
-                 *
-                 * Not implemented yet. May be used in future releases.
-                 */
-                PhysPortIndex = 0;
-                Limit = PhysPortMax;
-        }
-        
-        pPrt = &pAC->GIni.GP[PhysPortIndex];
-        if (pPrt->PHWLinkUp) {
-                Link = SK_TRUE;
-        }
-        else {
-                Link = SK_FALSE;
-        }
-        
-        /* Check MAC type */
-        if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
-                *pLen = 0;
-                return (SK_PNMI_ERR_GENERAL);
-        }
-        
-        /* Initialize backup data pointer. */
-        pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
-        
-        /* Check action type */
-        if (Action == SK_PNMI_GET) {
-                /* Check length */
-                switch (Id) {
-                
-                case OID_SKGE_VCT_GET:
-                        if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_PNMI_VCT)) {
-                                *pLen = (Limit - PhysPortIndex) * sizeof(SK_PNMI_VCT);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        break;
-                
-                case OID_SKGE_VCT_STATUS:
-                        if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U8)) {
-                                *pLen = (Limit - PhysPortIndex) * sizeof(SK_U8);
-                                return (SK_PNMI_ERR_TOO_SHORT);
-                        }
-                        break;
-                
-                default:
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }       
-                
-                /* Get value */
-                Offset = 0;
-                for (; PhysPortIndex < Limit; PhysPortIndex++) {
-                        switch (Id) {
-                        
-                        case OID_SKGE_VCT_GET:
-                                if ((Link == SK_FALSE) &&
-                                        (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING)) {
-                                        RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
-                                        if (RetCode == 0) {
-                                                pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_PENDING;
-                                                pAC->Pnmi.VctStatus[PhysPortIndex] |=
-                                                        (SK_PNMI_VCT_NEW_VCT_DATA | SK_PNMI_VCT_TEST_DONE);
-                                                
-                                                /* Copy results for later use to PNMI struct. */
-                                                for (i = 0; i < 4; i++)  {
-                                                        if (pPrt->PMdiPairSts[i] == SK_PNMI_VCT_NORMAL_CABLE) {
-                                                                if ((pPrt->PMdiPairLen[i] > 35) && (pPrt->PMdiPairLen[i] < 0xff)) {
-                                                                        pPrt->PMdiPairSts[i] = SK_PNMI_VCT_IMPEDANCE_MISMATCH;
-                                                                }
-                                                        }
-                                                        if ((pPrt->PMdiPairLen[i] > 35) && (pPrt->PMdiPairLen[i] != 0xff)) {
-                                                                CableLength = 1000 * (((175 * pPrt->PMdiPairLen[i]) / 210) - 28);
-                                                        }
-                                                        else {
-                                                                CableLength = 0;
-                                                        }
-                                                        pVctBackupData->PMdiPairLen[i] = CableLength;
-                                                        pVctBackupData->PMdiPairSts[i] = pPrt->PMdiPairSts[i];
-                                                }
-
-                                                Para.Para32[0] = PhysPortIndex;
-                                                Para.Para32[1] = -1;
-                                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
-                                                SkEventDispatcher(pAC, IoC);
-                                        }
-                                        else {
-                                                ; /* VCT test is running. */
-                                        }
-                                }
-                                
-                                /* Get all results. */
-                                CheckVctStatus(pAC, IoC, pBuf, Offset, PhysPortIndex);
-                                Offset += sizeof(SK_U8);
-                                *(pBuf + Offset) = pPrt->PCableLen;
-                                Offset += sizeof(SK_U8);
-                                for (i = 0; i < 4; i++)  {
-                                        SK_PNMI_STORE_U32((pBuf + Offset), pVctBackupData->PMdiPairLen[i]);
-                                        Offset += sizeof(SK_U32);
-                                }
-                                for (i = 0; i < 4; i++)  {
-                                        *(pBuf + Offset) = pVctBackupData->PMdiPairSts[i];
-                                        Offset += sizeof(SK_U8);
-                                }
-                                
-                                RetCode = SK_PNMI_ERR_OK;
-                                break;
-                
-                        case OID_SKGE_VCT_STATUS:
-                                CheckVctStatus(pAC, IoC, pBuf, Offset, PhysPortIndex);
-                                Offset += sizeof(SK_U8);
-                                RetCode = SK_PNMI_ERR_OK;
-                                break;
-                        
-                        default:
-                                *pLen = 0;
-                                return (SK_PNMI_ERR_GENERAL);
-                        }
-                } /* for */
-                *pLen = Offset;
-                return (RetCode);
-        
-        } /* if SK_PNMI_GET */
-        
-        /*
-         * From here SET or PRESET action. Check if the passed
-         * buffer length is plausible.
-         */
-        
-        /* Check length */
-        switch (Id) {
-        case OID_SKGE_VCT_SET:
-                if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U32)) {
-                        *pLen = (Limit - PhysPortIndex) * sizeof(SK_U32);
-                        return (SK_PNMI_ERR_TOO_SHORT);
-                }
-                break;
-        
-        default:
-                *pLen = 0;
-                return (SK_PNMI_ERR_GENERAL);
-        }
-        
-        /*
-         * Perform preset or set.
-         */
-        
-        /* VCT does not support PRESET action. */
-        if (Action == SK_PNMI_PRESET) {
-                return (SK_PNMI_ERR_OK);
-        }
-        
-        Offset = 0;
-        for (; PhysPortIndex < Limit; PhysPortIndex++) {
-                switch (Id) {
-                case OID_SKGE_VCT_SET: /* Start VCT test. */
-                        if (Link == SK_FALSE) {
-                                SkGeStopPort(pAC, IoC, PhysPortIndex, SK_STOP_ALL, SK_SOFT_RST);
-                                
-                                RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_TRUE);
-                                if (RetCode == 0) { /* RetCode: 0 => Start! */
-                                        pAC->Pnmi.VctStatus[PhysPortIndex] |= SK_PNMI_VCT_PENDING;
-                                        pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_NEW_VCT_DATA;
-                                        pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_LINK;
-                                        
-                                        /*
-                                         * Start VCT timer counter.
-                                         */
-                                        SK_MEMSET((char *) &Para, 0, sizeof(Para));
-                                        Para.Para32[0] = PhysPortIndex;
-                                        Para.Para32[1] = -1;
-                                        SkTimerStart(pAC, IoC, &pAC->Pnmi.VctTimeout[PhysPortIndex].VctTimer,
-                                                4000000, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Para);
-                                        SK_PNMI_STORE_U32((pBuf + Offset), RetCode);
-                                        RetCode = SK_PNMI_ERR_OK;
-                                }
-                                else { /* RetCode: 2 => Running! */
-                                        SK_PNMI_STORE_U32((pBuf + Offset), RetCode);
-                                        RetCode = SK_PNMI_ERR_OK;
-                                }
-                        }
-                        else { /* RetCode: 4 => Link! */
-                                RetCode = 4;
-                                SK_PNMI_STORE_U32((pBuf + Offset), RetCode);
-                                RetCode = SK_PNMI_ERR_OK;
-                        }
-                        Offset += sizeof(SK_U32);
-                        break;
-        
-                default:
-                        *pLen = 0;
-                        return (SK_PNMI_ERR_GENERAL);
-                }
-        } /* for */
-        *pLen = Offset;
-        return (RetCode);
-
-} /* Vct */
-
-
-PNMI_STATIC void CheckVctStatus(
-SK_AC           *pAC,
-SK_IOC          IoC,
-char            *pBuf,
-SK_U32          Offset,
-SK_U32          PhysPortIndex)
-{
-        SK_GEPORT       *pPrt;
-        SK_PNMI_VCT     *pVctData;
-        SK_U32          RetCode;
-        
-        pPrt = &pAC->GIni.GP[PhysPortIndex];
-        
-        pVctData = (SK_PNMI_VCT *) (pBuf + Offset);
-        pVctData->VctStatus = SK_PNMI_VCT_NONE;
-        
-        if (!pPrt->PHWLinkUp) {
-                
-                /* Was a VCT test ever made before? */
-                if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_TEST_DONE) {
-                        if ((pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_LINK)) {
-                                pVctData->VctStatus |= SK_PNMI_VCT_OLD_VCT_DATA;
-                        }
-                        else {
-                                pVctData->VctStatus |= SK_PNMI_VCT_NEW_VCT_DATA;
-                        }
-                }
-                
-                /* Check VCT test status. */
-                RetCode = SkGmCableDiagStatus(pAC,IoC, PhysPortIndex, SK_FALSE);
-                if (RetCode == 2) { /* VCT test is running. */
-                        pVctData->VctStatus |= SK_PNMI_VCT_RUNNING;
-                }
-                else { /* VCT data was copied to pAC here. Check PENDING state. */
-                        if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING) {
-                                pVctData->VctStatus |= SK_PNMI_VCT_NEW_VCT_DATA;
-                        }
-                }
-                
-                if (pPrt->PCableLen != 0xff) { /* Old DSP value. */
-                        pVctData->VctStatus |= SK_PNMI_VCT_OLD_DSP_DATA;
-                }
-        }
-        else {
-                
-                /* Was a VCT test ever made before? */
-                if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_TEST_DONE) {
-                        pVctData->VctStatus &= ~SK_PNMI_VCT_NEW_VCT_DATA;
-                        pVctData->VctStatus |= SK_PNMI_VCT_OLD_VCT_DATA;
-                }
-                
-                /* DSP only valid in 100/1000 modes. */
-                if (pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed !=
-                        SK_LSPEED_STAT_10MBPS) {        
-                        pVctData->VctStatus |= SK_PNMI_VCT_NEW_DSP_DATA;
-                }
-        }
-} /* CheckVctStatus */
-
-
-/*****************************************************************************
- *
- *      SkPnmiGenIoctl - Handles new generic PNMI IOCTL, calls the needed
- *                       PNMI function depending on the subcommand and
- *                       returns all data belonging to the complete database
- *                       or OID request.
- *
- * Description:
- *      Looks up the requested subcommand, calls the corresponding handler
- *      function and passes all required parameters to it.
- *      The function is called by the driver. It is needed to handle the new
- *  generic PNMI IOCTL. This IOCTL is given to the driver and contains both
- *  the OID and a subcommand to decide what kind of request has to be done.
- *
- * Returns:
- *      SK_PNMI_ERR_OK           The request was successfully performed
- *      SK_PNMI_ERR_GENERAL      A general severe internal error occured
- *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
- *                               the data.
- *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown
- *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                           exist (e.g. port instance 3 on a two port
- *                               adapter.
- */
-int SkPnmiGenIoctl(
-SK_AC           *pAC,           /* Pointer to adapter context struct */
-SK_IOC          IoC,            /* I/O context */
-void            *pBuf,          /* Buffer used for the management data transfer */
-unsigned int *pLen,             /* Length of buffer */
-SK_U32          NetIndex)       /* NetIndex (0..n), in single net mode always zero */
-{
-SK_I32  Mode;                   /* Store value of subcommand. */
-SK_U32  Oid;                    /* Store value of OID. */
-int             ReturnCode;             /* Store return value to show status of PNMI action. */
-int     HeaderLength;   /* Length of desired action plus OID. */
-
-        ReturnCode = SK_PNMI_ERR_GENERAL;
-        
-        SK_MEMCPY(&Mode, pBuf, sizeof(SK_I32));
-        SK_MEMCPY(&Oid, (char *) pBuf + sizeof(SK_I32), sizeof(SK_U32));
-        HeaderLength = sizeof(SK_I32) + sizeof(SK_U32);
-        *pLen = *pLen - HeaderLength;
-        SK_MEMCPY((char *) pBuf + sizeof(SK_I32), (char *) pBuf + HeaderLength, *pLen);
-        
-        switch(Mode) {
-        case SK_GET_SINGLE_VAR:
-                ReturnCode = SkPnmiGetVar(pAC, IoC, Oid, 
-                                (char *) pBuf + sizeof(SK_I32), pLen,
-                                ((SK_U32) (-1)), NetIndex);
-                SK_PNMI_STORE_U32(pBuf, ReturnCode);
-                *pLen = *pLen + sizeof(SK_I32);
-                break;
-        case SK_PRESET_SINGLE_VAR:
-                ReturnCode = SkPnmiPreSetVar(pAC, IoC, Oid, 
-                                (char *) pBuf + sizeof(SK_I32), pLen,
-                                ((SK_U32) (-1)), NetIndex);
-                SK_PNMI_STORE_U32(pBuf, ReturnCode);
-                *pLen = *pLen + sizeof(SK_I32);
-                break;
-        case SK_SET_SINGLE_VAR:
-                ReturnCode = SkPnmiSetVar(pAC, IoC, Oid, 
-                                (char *) pBuf + sizeof(SK_I32), pLen,
-                                ((SK_U32) (-1)), NetIndex);
-                SK_PNMI_STORE_U32(pBuf, ReturnCode);
-                *pLen = *pLen + sizeof(SK_I32);
-                break;
-        case SK_GET_FULL_MIB:
-                ReturnCode = SkPnmiGetStruct(pAC, IoC, pBuf, pLen, NetIndex);
-                break;
-        case SK_PRESET_FULL_MIB:
-                ReturnCode = SkPnmiPreSetStruct(pAC, IoC, pBuf, pLen, NetIndex);
-                break;
-        case SK_SET_FULL_MIB:
-                ReturnCode = SkPnmiSetStruct(pAC, IoC, pBuf, pLen, NetIndex);
-                break;
-        default:
-                break;
-        }
-        
-        return (ReturnCode);
-
-} /* SkGeIocGen */
diff --git a/drivers/net/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c
deleted file mode 100644
index e5ee6d63ba4e..000000000000
--- a/drivers/net/sk98lin/skgesirq.c
+++ /dev/null
@@ -1,2229 +0,0 @@
-/******************************************************************************
- *
- * Name:        skgesirq.c
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.92 $
- * Date:        $Date: 2003/09/16 14:37:07 $
- * Purpose:     Special IRQ module
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- *      Special Interrupt handler
- *
- *      The following abstract should show how this module is included
- *      in the driver path:
- *
- *      In the ISR of the driver the bits for frame transmission complete and
- *      for receive complete are checked and handled by the driver itself.
- *      The bits of the slow path mask are checked after that and then the
- *      entry into the so-called "slow path" is prepared. It is an implementors
- *      decision whether this is executed directly or just scheduled by
- *      disabling the mask. In the interrupt service routine some events may be
- *      generated, so it would be a good idea to call the EventDispatcher
- *      right after this ISR.
- *
- *      The Interrupt source register of the adapter is NOT read by this module.
- *  SO if the drivers implementor needs a while loop around the
- *      slow data paths interrupt bits, he needs to call the SkGeSirqIsr() for
- *      each loop entered.
- *
- *      However, the MAC Interrupt status registers are read in a while loop.
- *
- */
-
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skgesirq.c,v 1.92 2003/09/16 14:37:07 rschmidt Exp $ (C) Marvell.";
-#endif
-
-#include "h/skdrv1st.h"         /* Driver Specific Definitions */
-#ifndef SK_SLIM
-#include "h/skgepnmi.h"         /* PNMI Definitions */
-#include "h/skrlmt.h"           /* RLMT Definitions */
-#endif
-#include "h/skdrv2nd.h"         /* Adapter Control and Driver specific Def. */
-
-/* local function prototypes */
-#ifdef GENESIS
-static int      SkGePortCheckUpXmac(SK_AC*, SK_IOC, int, SK_BOOL);
-static int      SkGePortCheckUpBcom(SK_AC*, SK_IOC, int, SK_BOOL);
-static void     SkPhyIsrBcom(SK_AC*, SK_IOC, int, SK_U16);
-#endif /* GENESIS */
-#ifdef YUKON
-static int      SkGePortCheckUpGmac(SK_AC*, SK_IOC, int, SK_BOOL);
-static void     SkPhyIsrGmac(SK_AC*, SK_IOC, int, SK_U16);
-#endif /* YUKON */
-#ifdef OTHER_PHY
-static int      SkGePortCheckUpLone(SK_AC*, SK_IOC, int, SK_BOOL);
-static int      SkGePortCheckUpNat(SK_AC*, SK_IOC, int, SK_BOOL);
-static void     SkPhyIsrLone(SK_AC*, SK_IOC, int, SK_U16);
-#endif /* OTHER_PHY */
-
-#ifdef GENESIS
-/*
- * array of Rx counter from XMAC which are checked
- * in AutoSense mode to check whether a link is not able to auto-negotiate.
- */
-static const SK_U16 SkGeRxRegs[]= {
-        XM_RXF_64B,
-        XM_RXF_127B,
-        XM_RXF_255B,
-        XM_RXF_511B,
-        XM_RXF_1023B,
-        XM_RXF_MAX_SZ
-} ;
-#endif /* GENESIS */
-
-#ifdef __C2MAN__
-/*
- *      Special IRQ function
- *
- *      General Description:
- *
- */
-intro()
-{}
-#endif
-
-/******************************************************************************
- *
- *      SkHWInitDefSense() - Default Autosensing mode initialization
- *
- * Description: sets the PLinkMode for HWInit
- *
- * Returns: N/A
- */
-static void SkHWInitDefSense(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        pPrt->PAutoNegTimeOut = 0;
-
-        if (pPrt->PLinkModeConf != SK_LMODE_AUTOSENSE) {
-                pPrt->PLinkMode = pPrt->PLinkModeConf;
-                return;
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                ("AutoSensing: First mode %d on Port %d\n",
-                (int)SK_LMODE_AUTOFULL, Port));
-
-        pPrt->PLinkMode = (SK_U8)SK_LMODE_AUTOFULL;
-
-        return;
-}       /* SkHWInitDefSense */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkHWSenseGetNext() - Get Next Autosensing Mode
- *
- * Description: gets the appropriate next mode
- *
- * Note:
- *
- */
-static SK_U8 SkHWSenseGetNext(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        pPrt->PAutoNegTimeOut = 0;
-
-    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
-                /* Leave all as configured */
-                return(pPrt->PLinkModeConf);
-        }
-
-    if (pPrt->PLinkMode == (SK_U8)SK_LMODE_AUTOFULL) {
-                /* Return next mode AUTOBOTH */
-        return ((SK_U8)SK_LMODE_AUTOBOTH);
-        }
-
-        /* Return default autofull */
-    return ((SK_U8)SK_LMODE_AUTOFULL);
-}       /* SkHWSenseGetNext */
-
-
-/******************************************************************************
- *
- *      SkHWSenseSetNext() - Autosensing Set next mode
- *
- * Description: sets the appropriate next mode
- *
- * Returns: N/A
- */
-static void SkHWSenseSetNext(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_U8   NewMode)        /* New Mode to be written in sense mode */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        pPrt->PAutoNegTimeOut = 0;
-
-    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
-                return;
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                ("AutoSensing: next mode %d on Port %d\n",
-                (int)NewMode, Port));
-
-        pPrt->PLinkMode = NewMode;
-
-        return;
-}       /* SkHWSenseSetNext */
-#endif /* GENESIS */
-
-
-/******************************************************************************
- *
- *      SkHWLinkDown() - Link Down handling
- *
- * Description: handles the hardware link down signal
- *
- * Returns: N/A
- */
-void SkHWLinkDown(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Disable all MAC interrupts */
-        SkMacIrqDisable(pAC, IoC, Port);
-
-        /* Disable Receiver and Transmitter */
-        SkMacRxTxDisable(pAC, IoC, Port);
-        
-        /* Init default sense mode */
-        SkHWInitDefSense(pAC, IoC, Port);
-
-        if (pPrt->PHWLinkUp == SK_FALSE) {
-                return;
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                ("Link down Port %d\n", Port));
-
-        /* Set Link to DOWN */
-        pPrt->PHWLinkUp = SK_FALSE;
-
-        /* Reset Port stati */
-    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
-    pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
-        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_INDETERMINATED;
-
-        /* Re-init Phy especially when the AutoSense default is set now */
-        SkMacInitPhy(pAC, IoC, Port, SK_FALSE);
-
-        /* GP0: used for workaround of Rev. C Errata 2 */
-
-        /* Do NOT signal to RLMT */
-
-        /* Do NOT start the timer here */
-}       /* SkHWLinkDown */
-
-
-/******************************************************************************
- *
- *      SkHWLinkUp() - Link Up handling
- *
- * Description: handles the hardware link up signal
- *
- * Returns: N/A
- */
-static void SkHWLinkUp(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PHWLinkUp) {
-                /* We do NOT need to proceed on active link */
-                return;
-        }
-
-        pPrt->PHWLinkUp = SK_TRUE;
-        pPrt->PAutoNegFail = SK_FALSE;
-    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
-
-    if (pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOHALF &&
-        pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOFULL &&
-        pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOBOTH) {
-                /* Link is up and no Auto-negotiation should be done */
-
-                /* Link speed should be the configured one */
-                switch (pPrt->PLinkSpeed) {
-                case SK_LSPEED_AUTO:
-                        /* default is 1000 Mbps */
-                case SK_LSPEED_1000MBPS:
-                        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
-                        break;
-                case SK_LSPEED_100MBPS:
-                        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
-                        break;
-                case SK_LSPEED_10MBPS:
-                        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
-                        break;
-                }
-
-                /* Set Link Mode Status */
-                if (pPrt->PLinkMode == SK_LMODE_FULL) {
-                        pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_FULL;
-                }
-                else {
-            pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_HALF;
-                }
-
-                /* No flow control without auto-negotiation */
-        pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
-
-                /* enable Rx/Tx */
-        (void)SkMacRxTxEnable(pAC, IoC, Port);
-        }
-}       /* SkHWLinkUp */
-
-
-/******************************************************************************
- *
- *      SkMacParity() - MAC parity workaround
- *
- * Description: handles MAC parity errors correctly
- *
- * Returns: N/A
- */
-static void SkMacParity(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index of the port failed */
-{
-        SK_EVPARA       Para;
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        SK_U32          TxMax;          /* Tx Max Size Counter */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Clear IRQ Tx Parity Error */
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-
-                SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_PERR);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* HW-Bug #8: cleared by GMF_CLI_TX_FC instead of GMF_CLI_TX_PE */
-                SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T),
-                        (SK_U8)((pAC->GIni.GIChipId == CHIP_ID_YUKON &&
-                        pAC->GIni.GIChipRev == 0) ? GMF_CLI_TX_FC : GMF_CLI_TX_PE));
-        }
-#endif /* YUKON */
-        
-        if (pPrt->PCheckPar) {
-
-                if (Port == MAC_1) {
-                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E016, SKERR_SIRQ_E016MSG);
-                }
-                else {
-                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E017, SKERR_SIRQ_E017MSG);
-                }
-                Para.Para64 = Port;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                
-                Para.Para32[0] = Port;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-
-                return;
-        }
-
-        /* Check whether frames with a size of 1k were sent */
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                /* Snap statistic counters */
-                (void)SkXmUpdateStats(pAC, IoC, Port);
-                
-                (void)SkXmMacStatistic(pAC, IoC, Port, XM_TXF_MAX_SZ, &TxMax);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-
-                (void)SkGmMacStatistic(pAC, IoC, Port, GM_TXF_1518B, &TxMax);
-        }
-#endif /* YUKON */
-        
-        if (TxMax > 0) {
-                /* From now on check the parity */
-                pPrt->PCheckPar = SK_TRUE;
-        }
-}       /* SkMacParity */
-
-
-/******************************************************************************
- *
- *      SkGeHwErr() - Hardware Error service routine
- *
- * Description: handles all HW Error interrupts
- *
- * Returns: N/A
- */
-static void SkGeHwErr(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-SK_U32  HwStatus)       /* Interrupt status word */
-{
-        SK_EVPARA       Para;
-        SK_U16          Word;
-
-        if ((HwStatus & (IS_IRQ_MST_ERR | IS_IRQ_STAT)) != 0) {
-                /* PCI Errors occured */
-                if ((HwStatus & IS_IRQ_STAT) != 0) {
-                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E013, SKERR_SIRQ_E013MSG);
-                }
-                else {
-                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E012, SKERR_SIRQ_E012MSG);
-                }
-
-                /* Reset all bits in the PCI STATUS register */
-                SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
-                
-                SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
-                SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
-
-                Para.Para64 = 0;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
-        }
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-
-                if ((HwStatus & IS_NO_STAT_M1) != 0) {
-                        /* Ignore it */
-                        /* This situation is also indicated in the descriptor */
-                        SK_OUT16(IoC, MR_ADDR(MAC_1, RX_MFF_CTRL1), MFF_CLR_INSTAT);
-                }
-
-                if ((HwStatus & IS_NO_STAT_M2) != 0) {
-                        /* Ignore it */
-                        /* This situation is also indicated in the descriptor */
-                        SK_OUT16(IoC, MR_ADDR(MAC_2, RX_MFF_CTRL1), MFF_CLR_INSTAT);
-                }
-
-                if ((HwStatus & IS_NO_TIST_M1) != 0) {
-                        /* Ignore it */
-                        /* This situation is also indicated in the descriptor */
-                        SK_OUT16(IoC, MR_ADDR(MAC_1, RX_MFF_CTRL1), MFF_CLR_INTIST);
-                }
-
-                if ((HwStatus & IS_NO_TIST_M2) != 0) {
-                        /* Ignore it */
-                        /* This situation is also indicated in the descriptor */
-                        SK_OUT16(IoC, MR_ADDR(MAC_2, RX_MFF_CTRL1), MFF_CLR_INTIST);
-                }
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* This is necessary only for Rx timing measurements */
-                if ((HwStatus & IS_IRQ_TIST_OV) != 0) {
-                        /* increment Time Stamp Timer counter (high) */
-                        pAC->GIni.GITimeStampCnt++;
-
-                        /* Clear Time Stamp Timer IRQ */
-                        SK_OUT8(IoC, GMAC_TI_ST_CTRL, (SK_U8)GMT_ST_CLR_IRQ);
-                }
-
-                if ((HwStatus & IS_IRQ_SENSOR) != 0) {
-                        /* no sensors on 32-bit Yukon */
-                        if (pAC->GIni.GIYukon32Bit) {
-                                /* disable HW Error IRQ */
-                                pAC->GIni.GIValIrqMask &= ~IS_HW_ERR;
-                        }
-                }
-        }
-#endif /* YUKON */
-
-        if ((HwStatus & IS_RAM_RD_PAR) != 0) {
-                SK_OUT16(IoC, B3_RI_CTRL, RI_CLR_RD_PERR);
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E014, SKERR_SIRQ_E014MSG);
-                Para.Para64 = 0;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
-        }
-
-        if ((HwStatus & IS_RAM_WR_PAR) != 0) {
-                SK_OUT16(IoC, B3_RI_CTRL, RI_CLR_WR_PERR);
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E015, SKERR_SIRQ_E015MSG);
-                Para.Para64 = 0;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
-        }
-
-        if ((HwStatus & IS_M1_PAR_ERR) != 0) {
-                SkMacParity(pAC, IoC, MAC_1);
-        }
-
-        if ((HwStatus & IS_M2_PAR_ERR) != 0) {
-                SkMacParity(pAC, IoC, MAC_2);
-        }
-
-        if ((HwStatus & IS_R1_PAR_ERR) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_R1_CSR, CSR_IRQ_CL_P);
-
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E018, SKERR_SIRQ_E018MSG);
-                Para.Para64 = MAC_1;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                
-                Para.Para32[0] = MAC_1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-        if ((HwStatus & IS_R2_PAR_ERR) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_R2_CSR, CSR_IRQ_CL_P);
-
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E019, SKERR_SIRQ_E019MSG);
-                Para.Para64 = MAC_2;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                
-                Para.Para32[0] = MAC_2;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-}       /* SkGeHwErr */
-
-
-/******************************************************************************
- *
- *      SkGeSirqIsr() - Special Interrupt Service Routine
- *
- * Description: handles all non data transfer specific interrupts (slow path)
- *
- * Returns: N/A
- */
-void SkGeSirqIsr(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-SK_U32  Istatus)        /* Interrupt status word */
-{
-        SK_EVPARA       Para;
-        SK_U32          RegVal32;       /* Read register value */
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        SK_U16          PhyInt;
-        int                     i;
-
-        if (((Istatus & IS_HW_ERR) & pAC->GIni.GIValIrqMask) != 0) {
-                /* read the HW Error Interrupt source */
-                SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
-                
-                SkGeHwErr(pAC, IoC, RegVal32);
-        }
-
-        /*
-         * Packet Timeout interrupts
-         */
-        /* Check whether MACs are correctly initialized */
-        if (((Istatus & (IS_PA_TO_RX1 | IS_PA_TO_TX1)) != 0) &&
-                pAC->GIni.GP[MAC_1].PState == SK_PRT_RESET) {
-                /* MAC 1 was not initialized but Packet timeout occured */
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E004,
-                        SKERR_SIRQ_E004MSG);
-        }
-
-        if (((Istatus & (IS_PA_TO_RX2 | IS_PA_TO_TX2)) != 0) &&
-            pAC->GIni.GP[MAC_2].PState == SK_PRT_RESET) {
-                /* MAC 2 was not initialized but Packet timeout occured */
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E005,
-                        SKERR_SIRQ_E005MSG);
-        }
-
-        if ((Istatus & IS_PA_TO_RX1) != 0) {
-                /* Means network is filling us up */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW | SK_ERRCL_INIT, SKERR_SIRQ_E002,
-                        SKERR_SIRQ_E002MSG);
-                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_RX1);
-        }
-
-        if ((Istatus & IS_PA_TO_RX2) != 0) {
-                /* Means network is filling us up */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW | SK_ERRCL_INIT, SKERR_SIRQ_E003,
-                        SKERR_SIRQ_E003MSG);
-                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_RX2);
-        }
-
-        if ((Istatus & IS_PA_TO_TX1) != 0) {
-                
-                pPrt = &pAC->GIni.GP[0];
-
-                /* May be a normal situation in a server with a slow network */
-                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_TX1);
-
-#ifdef GENESIS
-                if (pAC->GIni.GIGenesis) {
-                        /*
-                         * workaround: if in half duplex mode, check for Tx hangup.
-                         * Read number of TX'ed bytes, wait for 10 ms, then compare
-                         * the number with current value. If nothing changed, we assume
-                         * that Tx is hanging and do a FIFO flush (see event routine).
-                         */
-                        if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
-                                pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
-                                !pPrt->HalfDupTimerActive) {
-                                /*
-                                 * many more pack. arb. timeouts may come in between,
-                                 * we ignore those
-                                 */
-                                pPrt->HalfDupTimerActive = SK_TRUE;
-                                /* Snap statistic counters */
-                                (void)SkXmUpdateStats(pAC, IoC, 0);
-
-                                (void)SkXmMacStatistic(pAC, IoC, 0, XM_TXO_OK_HI, &RegVal32);
-
-                                pPrt->LastOctets = (SK_U64)RegVal32 << 32;
-                                
-                                (void)SkXmMacStatistic(pAC, IoC, 0, XM_TXO_OK_LO, &RegVal32);
-
-                                pPrt->LastOctets += RegVal32;
-                                
-                                Para.Para32[0] = 0;
-                                SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
-                                        SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
-                        }
-                }
-#endif /* GENESIS */
-        }
-
-        if ((Istatus & IS_PA_TO_TX2) != 0) {
-                
-                pPrt = &pAC->GIni.GP[1];
-
-                /* May be a normal situation in a server with a slow network */
-                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_TX2);
-
-#ifdef GENESIS
-                if (pAC->GIni.GIGenesis) {
-                        /* workaround: see above */
-                        if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
-                                 pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
-                                !pPrt->HalfDupTimerActive) {
-                                pPrt->HalfDupTimerActive = SK_TRUE;
-                                /* Snap statistic counters */
-                                (void)SkXmUpdateStats(pAC, IoC, 1);
-
-                                (void)SkXmMacStatistic(pAC, IoC, 1, XM_TXO_OK_HI, &RegVal32);
-
-                                pPrt->LastOctets = (SK_U64)RegVal32 << 32;
-                                
-                                (void)SkXmMacStatistic(pAC, IoC, 1, XM_TXO_OK_LO, &RegVal32);
-
-                                pPrt->LastOctets += RegVal32;
-                                
-                                Para.Para32[0] = 1;
-                                SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
-                                        SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
-                        }
-                }
-#endif /* GENESIS */
-        }
-
-        /* Check interrupts of the particular queues */
-        if ((Istatus & IS_R1_C) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_R1_CSR, CSR_IRQ_CL_C);
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E006,
-                        SKERR_SIRQ_E006MSG);
-                Para.Para64 = MAC_1;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                Para.Para32[0] = MAC_1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-        if ((Istatus & IS_R2_C) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_R2_CSR, CSR_IRQ_CL_C);
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E007,
-                        SKERR_SIRQ_E007MSG);
-                Para.Para64 = MAC_2;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                Para.Para32[0] = MAC_2;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-        if ((Istatus & IS_XS1_C) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_XS1_CSR, CSR_IRQ_CL_C);
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E008,
-                        SKERR_SIRQ_E008MSG);
-                Para.Para64 = MAC_1;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                Para.Para32[0] = MAC_1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-        if ((Istatus & IS_XA1_C) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_XA1_CSR, CSR_IRQ_CL_C);
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E009,
-                        SKERR_SIRQ_E009MSG);
-                Para.Para64 = MAC_1;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                Para.Para32[0] = MAC_1;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-        if ((Istatus & IS_XS2_C) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_XS2_CSR, CSR_IRQ_CL_C);
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E010,
-                        SKERR_SIRQ_E010MSG);
-                Para.Para64 = MAC_2;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                Para.Para32[0] = MAC_2;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-        if ((Istatus & IS_XA2_C) != 0) {
-                /* Clear IRQ */
-                SK_OUT32(IoC, B0_XA2_CSR, CSR_IRQ_CL_C);
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E011,
-                        SKERR_SIRQ_E011MSG);
-                Para.Para64 = MAC_2;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-                Para.Para32[0] = MAC_2;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-        /* External reg interrupt */
-        if ((Istatus & IS_EXT_REG) != 0) {
-                /* Test IRQs from PHY */
-                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-                        
-                        pPrt = &pAC->GIni.GP[i];
-                        
-                        if (pPrt->PState == SK_PRT_RESET) {
-                                continue;
-                        }
-                        
-#ifdef GENESIS
-                        if (pAC->GIni.GIGenesis) {
-                                
-                                switch (pPrt->PhyType) {
-                                
-                                case SK_PHY_XMAC:
-                                        break;
-                                
-                                case SK_PHY_BCOM:
-                                        SkXmPhyRead(pAC, IoC, i, PHY_BCOM_INT_STAT, &PhyInt);
-        
-                                        if ((PhyInt & ~PHY_B_DEF_MSK) != 0) {
-                                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                                        ("Port %d Bcom Int: 0x%04X\n",
-                                                        i, PhyInt));
-                                                SkPhyIsrBcom(pAC, IoC, i, PhyInt);
-                                        }
-                                        break;
-#ifdef OTHER_PHY
-                                case SK_PHY_LONE:
-                                        SkXmPhyRead(pAC, IoC, i, PHY_LONE_INT_STAT, &PhyInt);
-                                        
-                                        if ((PhyInt & PHY_L_DEF_MSK) != 0) {
-                                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                                        ("Port %d Lone Int: %x\n",
-                                                        i, PhyInt));
-                                                SkPhyIsrLone(pAC, IoC, i, PhyInt);
-                                        }
-                                        break;
-#endif /* OTHER_PHY */
-                                }
-                        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-                        if (pAC->GIni.GIYukon) {
-                                /* Read PHY Interrupt Status */
-                                SkGmPhyRead(pAC, IoC, i, PHY_MARV_INT_STAT, &PhyInt);
-
-                                if ((PhyInt & PHY_M_DEF_MSK) != 0) {
-                                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                                ("Port %d Marv Int: 0x%04X\n",
-                                                i, PhyInt));
-                                        SkPhyIsrGmac(pAC, IoC, i, PhyInt);
-                                }
-                        }
-#endif /* YUKON */
-                }
-        }
-
-        /* I2C Ready interrupt */
-        if ((Istatus & IS_I2C_READY) != 0) {
-#ifdef SK_SLIM
-        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
-#else           
-                SkI2cIsr(pAC, IoC);
-#endif          
-        }
-
-        /* SW forced interrupt */
-        if ((Istatus & IS_IRQ_SW) != 0) {
-                /* clear the software IRQ */
-                SK_OUT8(IoC, B0_CTST, CS_CL_SW_IRQ);
-        }
-
-        if ((Istatus & IS_LNK_SYNC_M1) != 0) {
-                /*
-                 * We do NOT need the Link Sync interrupt, because it shows
-                 * us only a link going down.
-                 */
-                /* clear interrupt */
-                SK_OUT8(IoC, MR_ADDR(MAC_1, LNK_SYNC_CTRL), LED_CLR_IRQ);
-        }
-
-        /* Check MAC after link sync counter */
-        if ((Istatus & IS_MAC1) != 0) {
-                /* IRQ from MAC 1 */
-                SkMacIrq(pAC, IoC, MAC_1);
-        }
-
-        if ((Istatus & IS_LNK_SYNC_M2) != 0) {
-                /*
-                 * We do NOT need the Link Sync interrupt, because it shows
-                 * us only a link going down.
-                 */
-                /* clear interrupt */
-                SK_OUT8(IoC, MR_ADDR(MAC_2, LNK_SYNC_CTRL), LED_CLR_IRQ);
-        }
-
-        /* Check MAC after link sync counter */
-        if ((Istatus & IS_MAC2) != 0) {
-                /* IRQ from MAC 2 */
-                SkMacIrq(pAC, IoC, MAC_2);
-        }
-
-        /* Timer interrupt (served last) */
-        if ((Istatus & IS_TIMINT) != 0) {
-                /* check for HW Errors */
-                if (((Istatus & IS_HW_ERR) & ~pAC->GIni.GIValIrqMask) != 0) {
-                        /* read the HW Error Interrupt source */
-                        SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
-
-                        SkGeHwErr(pAC, IoC, RegVal32);
-                }
-
-                SkHwtIsr(pAC, IoC);
-        }
-
-}       /* SkGeSirqIsr */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- * SkGePortCheckShorts() - Implementing XMAC Workaround Errata # 2
- *
- * return:
- *      0       o.k. nothing needed
- *      1       Restart needed on this port
- */
-static int SkGePortCheckShorts(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             Port)           /* Which port should be checked */
-{
-        SK_U32          Shorts;                 /* Short Event Counter */
-        SK_U32          CheckShorts;    /* Check value for Short Event Counter */
-        SK_U64          RxCts;                  /* Rx Counter (packets on network) */
-        SK_U32          RxTmp;                  /* Rx temp. Counter */
-        SK_U32          FcsErrCts;              /* FCS Error Counter */
-        SK_GEPORT       *pPrt;                  /* GIni Port struct pointer */
-        int                     Rtv;                    /* Return value */
-        int                     i;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Default: no action */
-        Rtv = SK_HW_PS_NONE;
-
-        (void)SkXmUpdateStats(pAC, IoC, Port);
-
-        /* Extra precaution: check for short Event counter */
-        (void)SkXmMacStatistic(pAC, IoC, Port, XM_RXE_SHT_ERR, &Shorts);
-
-        /*
-         * Read Rx counters (packets seen on the network and not necessarily
-         * really received.
-         */
-        RxCts = 0;
-
-        for (i = 0; i < ARRAY_SIZE(SkGeRxRegs); i++) {
-                
-                (void)SkXmMacStatistic(pAC, IoC, Port, SkGeRxRegs[i], &RxTmp);
-                
-                RxCts += (SK_U64)RxTmp;
-        }
-
-        /* On default: check shorts against zero */
-        CheckShorts = 0;
-
-        /* Extra precaution on active links */
-        if (pPrt->PHWLinkUp) {
-                /* Reset Link Restart counter */
-                pPrt->PLinkResCt = 0;
-                pPrt->PAutoNegTOCt = 0;
-
-                /* If link is up check for 2 */
-                CheckShorts = 2;
-
-                (void)SkXmMacStatistic(pAC, IoC, Port, XM_RXF_FCS_ERR, &FcsErrCts);
-                
-                if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
-                    pPrt->PLipaAutoNeg == SK_LIPA_UNKNOWN &&
-                    (pPrt->PLinkMode == SK_LMODE_HALF ||
-                         pPrt->PLinkMode == SK_LMODE_FULL)) {
-                        /*
-                         * This is autosensing and we are in the fallback
-                         * manual full/half duplex mode.
-                         */
-                        if (RxCts == pPrt->PPrevRx) {
-                                /* Nothing received, restart link */
-                                pPrt->PPrevFcs = FcsErrCts;
-                                pPrt->PPrevShorts = Shorts;
-                                
-                                return(SK_HW_PS_RESTART);
-                        }
-                        else {
-                                pPrt->PLipaAutoNeg = SK_LIPA_MANUAL;
-                        }
-                }
-
-                if (((RxCts - pPrt->PPrevRx) > pPrt->PRxLim) ||
-                    (!(FcsErrCts - pPrt->PPrevFcs))) {
-                        /*
-                         * Note: The compare with zero above has to be done the way shown,
-                         * otherwise the Linux driver will have a problem.
-                         */
-                        /*
-                         * We received a bunch of frames or no CRC error occured on the
-                         * network -> ok.
-                         */
-                        pPrt->PPrevRx = RxCts;
-                        pPrt->PPrevFcs = FcsErrCts;
-                        pPrt->PPrevShorts = Shorts;
-
-                        return(SK_HW_PS_NONE);
-                }
-
-                pPrt->PPrevFcs = FcsErrCts;
-        }
-
-
-        if ((Shorts - pPrt->PPrevShorts) > CheckShorts) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("Short Event Count Restart Port %d \n", Port));
-                Rtv = SK_HW_PS_RESTART;
-        }
-
-        pPrt->PPrevShorts = Shorts;
-        pPrt->PPrevRx = RxCts;
-
-        return(Rtv);
-}       /* SkGePortCheckShorts */
-#endif /* GENESIS */
-
-
-/******************************************************************************
- *
- * SkGePortCheckUp() - Check if the link is up
- *
- * return:
- *      0       o.k. nothing needed
- *      1       Restart needed on this port
- *      2       Link came up
- */
-static int SkGePortCheckUp(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             Port)           /* Which port should be checked */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        SK_BOOL         AutoNeg;        /* Is Auto-negotiation used ? */
-        int                     Rtv;            /* Return value */
-
-        Rtv = SK_HW_PS_NONE;
-        
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-                AutoNeg = SK_FALSE;
-        }
-        else {
-                AutoNeg = SK_TRUE;
-        }
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-
-                switch (pPrt->PhyType) {
-                
-                case SK_PHY_XMAC:
-                        Rtv = SkGePortCheckUpXmac(pAC, IoC, Port, AutoNeg);
-                        break;
-                case SK_PHY_BCOM:
-                        Rtv = SkGePortCheckUpBcom(pAC, IoC, Port, AutoNeg);
-                        break;
-#ifdef OTHER_PHY
-                case SK_PHY_LONE:
-                        Rtv = SkGePortCheckUpLone(pAC, IoC, Port, AutoNeg);
-                        break;
-                case SK_PHY_NAT:
-                        Rtv = SkGePortCheckUpNat(pAC, IoC, Port, AutoNeg);
-                        break;
-#endif /* OTHER_PHY */
-                }
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                Rtv = SkGePortCheckUpGmac(pAC, IoC, Port, AutoNeg);
-        }
-#endif /* YUKON */
-
-        return(Rtv);    
-}       /* SkGePortCheckUp */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- * SkGePortCheckUpXmac() - Implementing of the Workaround Errata # 2
- *
- * return:
- *      0       o.k. nothing needed
- *      1       Restart needed on this port
- *      2       Link came up
- */
-static int SkGePortCheckUpXmac(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             Port,           /* Which port should be checked */
-SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
-{
-        SK_U32          Shorts;         /* Short Event Counter */
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        int                     Done;
-        SK_U32          GpReg;          /* General Purpose register value */
-        SK_U16          Isrc;           /* Interrupt source register */
-        SK_U16          IsrcSum;        /* Interrupt source register sum */
-        SK_U16          LpAb;           /* Link Partner Ability */
-        SK_U16          ResAb;          /* Resolved Ability */
-        SK_U16          ExtStat;        /* Extended Status Register */
-        SK_U8           NextMode;       /* Next AutoSensing Mode */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PHWLinkUp) {
-                if (pPrt->PhyType != SK_PHY_XMAC) {
-                        return(SK_HW_PS_NONE);
-                }
-                else {
-                        return(SkGePortCheckShorts(pAC, IoC, Port));
-                }
-        }
-
-        IsrcSum = pPrt->PIsave;
-        pPrt->PIsave = 0;
-
-        /* Now wait for each port's link */
-        if (pPrt->PLinkBroken) {
-                /* Link was broken */
-                XM_IN32(IoC, Port, XM_GP_PORT, &GpReg);
-
-                if ((GpReg & XM_GP_INP_ASS) == 0) {
-                        /* The Link is in sync */
-                        XM_IN16(IoC, Port, XM_ISRC, &Isrc);
-                        IsrcSum |= Isrc;
-                        SkXmAutoNegLipaXmac(pAC, IoC, Port, IsrcSum);
-                        
-                        if ((Isrc & XM_IS_INP_ASS) == 0) {
-                                /* It has been in sync since last time */
-                                /* Restart the PORT */
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                        ("Link in sync Restart Port %d\n", Port));
-
-                                (void)SkXmUpdateStats(pAC, IoC, Port);
-
-                                /* We now need to reinitialize the PrevShorts counter */
-                                (void)SkXmMacStatistic(pAC, IoC, Port, XM_RXE_SHT_ERR, &Shorts);
-                                pPrt->PPrevShorts = Shorts;
-
-                                pPrt->PLinkBroken = SK_FALSE;
-
-                                /*
-                                 * Link Restart Workaround:
-                                 *  it may be possible that the other Link side
-                                 *  restarts its link as well an we detect
-                                 *  another LinkBroken. To prevent this
-                                 *  happening we check for a maximum number
-                                 *  of consecutive restart. If those happens,
-                                 *  we do NOT restart the active link and
-                                 *  check whether the link is now o.k.
-                                 */
-                                pPrt->PLinkResCt++;
-                                
-                                pPrt->PAutoNegTimeOut = 0;
-
-                                if (pPrt->PLinkResCt < SK_MAX_LRESTART) {
-                                        return(SK_HW_PS_RESTART);
-                                }
-
-                                pPrt->PLinkResCt = 0;
-                                
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                        ("Do NOT restart on Port %d %x %x\n", Port, Isrc, IsrcSum));
-                        }
-                        else {
-                                pPrt->PIsave = (SK_U16)(IsrcSum & XM_IS_AND);
-                                
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                        ("Save Sync/nosync Port %d %x %x\n", Port, Isrc, IsrcSum));
-
-                                /* Do nothing more if link is broken */
-                                return(SK_HW_PS_NONE);
-                        }
-                }
-                else {
-                        /* Do nothing more if link is broken */
-                        return(SK_HW_PS_NONE);
-                }
-
-        }
-        else {
-                /* Link was not broken, check if it is */
-                XM_IN16(IoC, Port, XM_ISRC, &Isrc);
-                IsrcSum |= Isrc;
-                if ((Isrc & XM_IS_INP_ASS) != 0) {
-                        XM_IN16(IoC, Port, XM_ISRC, &Isrc);
-                        IsrcSum |= Isrc;
-                        if ((Isrc & XM_IS_INP_ASS) != 0) {
-                                XM_IN16(IoC, Port, XM_ISRC, &Isrc);
-                                IsrcSum |= Isrc;
-                                if ((Isrc & XM_IS_INP_ASS) != 0) {
-                                        pPrt->PLinkBroken = SK_TRUE;
-                                        /* Re-Init Link partner Autoneg flag */
-                                        pPrt->PLipaAutoNeg = SK_LIPA_UNKNOWN;
-                                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                                ("Link broken Port %d\n", Port));
-
-                                        /* Cable removed-> reinit sense mode */
-                                        SkHWInitDefSense(pAC, IoC, Port);
-
-                                        return(SK_HW_PS_RESTART);
-                                }
-                        }
-                }
-                else {
-                        SkXmAutoNegLipaXmac(pAC, IoC, Port, Isrc);
-                        
-                        if (SkGePortCheckShorts(pAC, IoC, Port) == SK_HW_PS_RESTART) {
-                                return(SK_HW_PS_RESTART);
-                        }
-                }
-        }
-
-        /*
-         * here we usually can check whether the link is in sync and
-         * auto-negotiation is done.
-         */
-        XM_IN32(IoC, Port, XM_GP_PORT, &GpReg);
-        XM_IN16(IoC, Port, XM_ISRC, &Isrc);
-        IsrcSum |= Isrc;
-
-        SkXmAutoNegLipaXmac(pAC, IoC, Port, IsrcSum);
-        
-        if ((GpReg & XM_GP_INP_ASS) != 0 || (IsrcSum & XM_IS_INP_ASS) != 0) {
-                if ((GpReg & XM_GP_INP_ASS) == 0) {
-                        /* Save Auto-negotiation Done interrupt only if link is in sync */
-                        pPrt->PIsave = (SK_U16)(IsrcSum & XM_IS_AND);
-                }
-#ifdef DEBUG
-                if ((pPrt->PIsave & XM_IS_AND) != 0) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                ("AutoNeg done rescheduled Port %d\n", Port));
-                }
-#endif /* DEBUG */
-                return(SK_HW_PS_NONE);
-        }
-
-        if (AutoNeg) {
-                if ((IsrcSum & XM_IS_AND) != 0) {
-                        SkHWLinkUp(pAC, IoC, Port);
-                        Done = SkMacAutoNegDone(pAC, IoC, Port);
-                        if (Done != SK_AND_OK) {
-                                /* Get PHY parameters, for debugging only */
-                                SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_LP, &LpAb);
-                                SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_RES_ABI, &ResAb);
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                        ("AutoNeg FAIL Port %d (LpAb %x, ResAb %x)\n",
-                                         Port, LpAb, ResAb));
-                                        
-                                /* Try next possible mode */
-                                NextMode = SkHWSenseGetNext(pAC, IoC, Port);
-                                SkHWLinkDown(pAC, IoC, Port);
-                                if (Done == SK_AND_DUP_CAP) {
-                                        /* GoTo next mode */
-                                        SkHWSenseSetNext(pAC, IoC, Port, NextMode);
-                                }
-
-                                return(SK_HW_PS_RESTART);
-                        }
-                        /*
-                         * Dummy Read extended status to prevent extra link down/ups
-                         * (clear Page Received bit if set)
-                         */
-                        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_EXP, &ExtStat);
-                        
-                        return(SK_HW_PS_LINK);
-                }
-                
-                /* AutoNeg not done, but HW link is up. Check for timeouts */
-                pPrt->PAutoNegTimeOut++;
-                if (pPrt->PAutoNegTimeOut >= SK_AND_MAX_TO) {
-                        /* Increase the Timeout counter */
-                        pPrt->PAutoNegTOCt++;
-
-                        /* Timeout occured */
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                ("AutoNeg timeout Port %d\n", Port));
-                        if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
-                                pPrt->PLipaAutoNeg != SK_LIPA_AUTO) {
-                                /* Set Link manually up */
-                                SkHWSenseSetNext(pAC, IoC, Port, SK_LMODE_FULL);
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                        ("Set manual full duplex Port %d\n", Port));
-                        }
-
-                        if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
-                                pPrt->PLipaAutoNeg == SK_LIPA_AUTO &&
-                                pPrt->PAutoNegTOCt >= SK_MAX_ANEG_TO) {
-                                /*
-                                 * This is rather complicated.
-                                 * we need to check here whether the LIPA_AUTO
-                                 * we saw before is false alert. We saw at one
-                                 * switch ( SR8800) that on boot time it sends
-                                 * just one auto-neg packet and does no further
-                                 * auto-negotiation.
-                                 * Solution: we restart the autosensing after
-                                 * a few timeouts.
-                                 */
-                                pPrt->PAutoNegTOCt = 0;
-                                pPrt->PLipaAutoNeg = SK_LIPA_UNKNOWN;
-                                SkHWInitDefSense(pAC, IoC, Port);
-                        }
-
-                        /* Do the restart */
-                        return(SK_HW_PS_RESTART);
-                }
-        }
-        else {
-                /* Link is up and we don't need more */
-#ifdef DEBUG
-                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                ("ERROR: Lipa auto detected on port %d\n", Port));
-                }
-#endif /* DEBUG */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("Link sync(GP), Port %d\n", Port));
-                SkHWLinkUp(pAC, IoC, Port);
-                
-                /*
-                 * Link sync (GP) and so assume a good connection. But if not received
-                 * a bunch of frames received in a time slot (maybe broken tx cable)
-                 * the port is restart.
-                 */
-                return(SK_HW_PS_LINK);
-        }
-
-        return(SK_HW_PS_NONE);
-}       /* SkGePortCheckUpXmac */
-
-
-/******************************************************************************
- *
- * SkGePortCheckUpBcom() - Check if the link is up on Bcom PHY
- *
- * return:
- *      0       o.k. nothing needed
- *      1       Restart needed on this port
- *      2       Link came up
- */
-static int SkGePortCheckUpBcom(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             Port,           /* Which port should be checked */
-SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        int                     Done;
-        SK_U16          Isrc;           /* Interrupt source register */
-        SK_U16          PhyStat;        /* Phy Status Register */
-        SK_U16          ResAb;          /* Master/Slave resolution */
-        SK_U16          Ctrl;           /* Broadcom control flags */
-#ifdef DEBUG
-        SK_U16          LpAb;
-        SK_U16          ExtStat;
-#endif /* DEBUG */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Check for No HCD Link events (#10523) */
-        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &Isrc);
-
-#ifdef xDEBUG
-        if ((Isrc & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) ==
-                (PHY_B_IS_SCR_S_ER | PHY_B_IS_RRS_CHANGE | PHY_B_IS_LRS_CHANGE)) {
-
-                SK_U32  Stat1, Stat2, Stat3;
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_MASK, &Stat1);
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "CheckUp1 - Stat: %x, Mask: %x",
-                        (void *)Isrc,
-                        (void *)Stat1);
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Stat1);
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &Stat2);
-                Stat1 = Stat1 << 16 | Stat2;
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, &Stat2);
-                Stat3 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &Stat3);
-                Stat2 = Stat2 << 16 | Stat3;
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "Ctrl/Stat: %x, AN Adv/LP: %x",
-                        (void *)Stat1,
-                        (void *)Stat2);
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_EXP, &Stat1);
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_EXT_STAT, &Stat2);
-                Stat1 = Stat1 << 16 | Stat2;
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, &Stat2);
-                Stat3 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &Stat3);
-                Stat2 = Stat2 << 16 | Stat3;
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "AN Exp/IEEE Ext: %x, 1000T Ctrl/Stat: %x",
-                        (void *)Stat1,
-                        (void *)Stat2);
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, &Stat1);
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_STAT, &Stat2);
-                Stat1 = Stat1 << 16 | Stat2;
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Stat2);
-                Stat3 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &Stat3);
-                Stat2 = Stat2 << 16 | Stat3;
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "PHY Ext Ctrl/Stat: %x, Aux Ctrl/Stat: %x",
-                        (void *)Stat1,
-                        (void *)Stat2);
-        }
-#endif /* DEBUG */
-
-        if ((Isrc & (PHY_B_IS_NO_HDCL /* | PHY_B_IS_NO_HDC */)) != 0) {
-                /*
-                 * Workaround BCom Errata:
-                 *      enable and disable loopback mode if "NO HCD" occurs.
-                 */
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Ctrl);
-                SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_CTRL,
-                        (SK_U16)(Ctrl | PHY_CT_LOOP));
-                SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_CTRL,
-                        (SK_U16)(Ctrl & ~PHY_CT_LOOP));
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("No HCD Link event, Port %d\n", Port));
-#ifdef xDEBUG
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "No HCD link event, port %d.",
-                        (void *)Port,
-                        (void *)NULL);
-#endif /* DEBUG */
-        }
-
-        /* Not obsolete: link status bit is latched to 0 and autoclearing! */
-        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
-
-        if (pPrt->PHWLinkUp) {
-                return(SK_HW_PS_NONE);
-        }
-
-#ifdef xDEBUG
-        {
-                SK_U32  Stat1, Stat2, Stat3;
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_MASK, &Stat1);
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "CheckUp1a - Stat: %x, Mask: %x",
-                        (void *)Isrc,
-                        (void *)Stat1);
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Stat1);
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
-                Stat1 = Stat1 << 16 | PhyStat;
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, &Stat2);
-                Stat3 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &Stat3);
-                Stat2 = Stat2 << 16 | Stat3;
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "Ctrl/Stat: %x, AN Adv/LP: %x",
-                        (void *)Stat1,
-                        (void *)Stat2);
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_EXP, &Stat1);
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_EXT_STAT, &Stat2);
-                Stat1 = Stat1 << 16 | Stat2;
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, &Stat2);
-                Stat3 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
-                Stat2 = Stat2 << 16 | ResAb;
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "AN Exp/IEEE Ext: %x, 1000T Ctrl/Stat: %x",
-                        (void *)Stat1,
-                        (void *)Stat2);
-
-                Stat1 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, &Stat1);
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_STAT, &Stat2);
-                Stat1 = Stat1 << 16 | Stat2;
-                Stat2 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Stat2);
-                Stat3 = 0;
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &Stat3);
-                Stat2 = Stat2 << 16 | Stat3;
-                CMSMPrintString(
-                        pAC->pConfigTable,
-                        MSG_TYPE_RUNTIME_INFO,
-                        "PHY Ext Ctrl/Stat: %x, Aux Ctrl/Stat: %x",
-                        (void *)Stat1,
-                        (void *)Stat2);
-        }
-#endif /* DEBUG */
-
-        /*
-         * Here we usually can check whether the link is in sync and
-         * auto-negotiation is done.
-         */
-
-        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
-
-        SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("CheckUp Port %d, PhyStat: 0x%04X\n", Port, PhyStat));
-
-        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
-
-        if ((ResAb & PHY_B_1000S_MSF) != 0) {
-                /* Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Master/Slave Fault port %d\n", Port));
-                
-                pPrt->PAutoNegFail = SK_TRUE;
-                pPrt->PMSStatus = SK_MS_STAT_FAULT;
-                
-                return(SK_HW_PS_RESTART);
-        }
-
-        if ((PhyStat & PHY_ST_LSYNC) == 0) {
-                return(SK_HW_PS_NONE);
-        }
-        
-        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
-                SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Port %d, ResAb: 0x%04X\n", Port, ResAb));
-
-        if (AutoNeg) {
-                if ((PhyStat & PHY_ST_AN_OVER) != 0) {
-                        
-                        SkHWLinkUp(pAC, IoC, Port);
-                        
-                        Done = SkMacAutoNegDone(pAC, IoC, Port);
-                        
-                        if (Done != SK_AND_OK) {
-#ifdef DEBUG
-                                /* Get PHY parameters, for debugging only */
-                                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &LpAb);
-                                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ExtStat);
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                        ("AutoNeg FAIL Port %d (LpAb %x, 1000TStat %x)\n",
-                                        Port, LpAb, ExtStat));
-#endif /* DEBUG */
-                                return(SK_HW_PS_RESTART);
-                        }
-                        else {
-#ifdef xDEBUG
-                                /* Dummy read ISR to prevent extra link downs/ups */
-                                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &ExtStat);
-
-                                if ((ExtStat & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) != 0) {
-                                        CMSMPrintString(
-                                                pAC->pConfigTable,
-                                                MSG_TYPE_RUNTIME_INFO,
-                                                "CheckUp2 - Stat: %x",
-                                                (void *)ExtStat,
-                                                (void *)NULL);
-                                }
-#endif /* DEBUG */
-                                return(SK_HW_PS_LINK);
-                        }
-                }
-        }
-        else {  /* !AutoNeg */
-                /* Link is up and we don't need more. */
-#ifdef DEBUG
-                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                ("ERROR: Lipa auto detected on port %d\n", Port));
-                }
-#endif /* DEBUG */
-
-#ifdef xDEBUG
-                /* Dummy read ISR to prevent extra link downs/ups */
-                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &ExtStat);
-
-                if ((ExtStat & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) != 0) {
-                        CMSMPrintString(
-                                pAC->pConfigTable,
-                                MSG_TYPE_RUNTIME_INFO,
-                                "CheckUp3 - Stat: %x",
-                                (void *)ExtStat,
-                                (void *)NULL);
-                }
-#endif /* DEBUG */
-                
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("Link sync(GP), Port %d\n", Port));
-                SkHWLinkUp(pAC, IoC, Port);
-                
-                return(SK_HW_PS_LINK);
-        }
-
-        return(SK_HW_PS_NONE);
-}       /* SkGePortCheckUpBcom */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- * SkGePortCheckUpGmac() - Check if the link is up on Marvell PHY
- *
- * return:
- *      0       o.k. nothing needed
- *      1       Restart needed on this port
- *      2       Link came up
- */
-static int SkGePortCheckUpGmac(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             Port,           /* Which port should be checked */
-SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        int                     Done;
-        SK_U16          PhyIsrc;        /* PHY Interrupt source */
-        SK_U16          PhyStat;        /* PPY Status */
-        SK_U16          PhySpecStat;/* PHY Specific Status */
-        SK_U16          ResAb;          /* Master/Slave resolution */
-        SK_EVPARA       Para;
-#ifdef DEBUG
-        SK_U16          Word;           /* I/O helper */
-#endif /* DEBUG */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PHWLinkUp) {
-                return(SK_HW_PS_NONE);
-        }
-
-        /* Read PHY Status */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("CheckUp Port %d, PhyStat: 0x%04X\n", Port, PhyStat));
-
-        /* Read PHY Interrupt Status */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_INT_STAT, &PhyIsrc);
-
-        if ((PhyIsrc & PHY_M_IS_AN_COMPL) != 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Auto-Negotiation Completed, PhyIsrc: 0x%04X\n", PhyIsrc));
-        }
-
-        if ((PhyIsrc & PHY_M_IS_LSP_CHANGE) != 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Link Speed Changed, PhyIsrc: 0x%04X\n", PhyIsrc));
-        }
-
-        SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
-        
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
-
-        if ((ResAb & PHY_B_1000S_MSF) != 0) {
-                /* Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Master/Slave Fault port %d\n", Port));
-                
-                pPrt->PAutoNegFail = SK_TRUE;
-                pPrt->PMSStatus = SK_MS_STAT_FAULT;
-                
-                return(SK_HW_PS_RESTART);
-        }
-
-        /* Read PHY Specific Status */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Phy1000BT: 0x%04X, PhySpecStat: 0x%04X\n", ResAb, PhySpecStat));
-
-#ifdef DEBUG
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_EXP, &Word);
-
-        if ((PhyIsrc & PHY_M_IS_AN_PR) != 0 || (Word & PHY_ANE_RX_PG) != 0 ||
-                (PhySpecStat & PHY_M_PS_PAGE_REC) != 0)  {
-                /* Read PHY Next Page Link Partner */
-                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_NEPG_LP, &Word);
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Page Received, NextPage: 0x%04X\n", Word));
-        }
-#endif /* DEBUG */
-
-        if ((PhySpecStat & PHY_M_PS_LINK_UP) == 0) {
-                return(SK_HW_PS_NONE);
-        }
-        
-        if ((PhySpecStat & PHY_M_PS_DOWNS_STAT) != 0 ||
-                (PhyIsrc & PHY_M_IS_DOWNSH_DET) != 0) {
-                /* Downshift detected */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E025, SKERR_SIRQ_E025MSG);
-                
-                Para.Para64 = Port;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_DOWNSHIFT_DET, Para);
-                
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Downshift detected, PhyIsrc: 0x%04X\n", PhyIsrc));
-        }
-
-        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
-                SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
-        
-        pPrt->PCableLen = (SK_U8)((PhySpecStat & PHY_M_PS_CABLE_MSK) >> 7);
-        
-        if (AutoNeg) {
-                /* Auto-Negotiation Over ? */
-                if ((PhyStat & PHY_ST_AN_OVER) != 0) {
-                        
-                        SkHWLinkUp(pAC, IoC, Port);
-                        
-                        Done = SkMacAutoNegDone(pAC, IoC, Port);
-                        
-                        if (Done != SK_AND_OK) {
-                                return(SK_HW_PS_RESTART);
-                        }
-                        
-                        return(SK_HW_PS_LINK);
-                }
-        }
-        else {  /* !AutoNeg */
-                /* Link is up and we don't need more */
-#ifdef DEBUG
-                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                ("ERROR: Lipa auto detected on port %d\n", Port));
-                }
-#endif /* DEBUG */
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("Link sync, Port %d\n", Port));
-                SkHWLinkUp(pAC, IoC, Port);
-                
-                return(SK_HW_PS_LINK);
-        }
-
-        return(SK_HW_PS_NONE);
-}       /* SkGePortCheckUpGmac */
-#endif /* YUKON */
-
-
-#ifdef OTHER_PHY
-/******************************************************************************
- *
- * SkGePortCheckUpLone() - Check if the link is up on Level One PHY
- *
- * return:
- *      0       o.k. nothing needed
- *      1       Restart needed on this port
- *      2       Link came up
- */
-static int SkGePortCheckUpLone(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             Port,           /* Which port should be checked */
-SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        int                     Done;
-        SK_U16          Isrc;           /* Interrupt source register */
-        SK_U16          LpAb;           /* Link Partner Ability */
-        SK_U16          ExtStat;        /* Extended Status Register */
-        SK_U16          PhyStat;        /* Phy Status Register */
-        SK_U16          StatSum;
-        SK_U8           NextMode;       /* Next AutoSensing Mode */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PHWLinkUp) {
-                return(SK_HW_PS_NONE);
-        }
-
-        StatSum = pPrt->PIsave;
-        pPrt->PIsave = 0;
-
-        /*
-         * here we usually can check whether the link is in sync and
-         * auto-negotiation is done.
-         */
-        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_STAT, &PhyStat);
-        StatSum |= PhyStat;
-
-        SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
-        
-        if ((PhyStat & PHY_ST_LSYNC) == 0) {
-                /* Save Auto-negotiation Done bit */
-                pPrt->PIsave = (SK_U16)(StatSum & PHY_ST_AN_OVER);
-#ifdef DEBUG
-                if ((pPrt->PIsave & PHY_ST_AN_OVER) != 0) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                ("AutoNeg done rescheduled Port %d\n", Port));
-                }
-#endif /* DEBUG */
-                return(SK_HW_PS_NONE);
-        }
-
-        if (AutoNeg) {
-                if ((StatSum & PHY_ST_AN_OVER) != 0) {
-                        SkHWLinkUp(pAC, IoC, Port);
-                        Done = SkMacAutoNegDone(pAC, IoC, Port);
-                        if (Done != SK_AND_OK) {
-                                /* Get PHY parameters, for debugging only */
-                                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_AUNE_LP, &LpAb);
-                                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_1000T_STAT, &ExtStat);
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                        ("AutoNeg FAIL Port %d (LpAb %x, 1000TStat %x)\n",
-                                         Port, LpAb, ExtStat));
-                                        
-                                /* Try next possible mode */
-                                NextMode = SkHWSenseGetNext(pAC, IoC, Port);
-                                SkHWLinkDown(pAC, IoC, Port);
-                                if (Done == SK_AND_DUP_CAP) {
-                                        /* GoTo next mode */
-                                        SkHWSenseSetNext(pAC, IoC, Port, NextMode);
-                                }
-
-                                return(SK_HW_PS_RESTART);
-
-                        }
-                        else {
-                                /*
-                                 * Dummy Read interrupt status to prevent
-                                 * extra link down/ups
-                                 */
-                                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_INT_STAT, &ExtStat);
-                                return(SK_HW_PS_LINK);
-                        }
-                }
-                
-                /* AutoNeg not done, but HW link is up. Check for timeouts */
-                pPrt->PAutoNegTimeOut++;
-                if (pPrt->PAutoNegTimeOut >= SK_AND_MAX_TO) {
-                        /* Timeout occured */
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                ("AutoNeg timeout Port %d\n", Port));
-                        if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
-                                pPrt->PLipaAutoNeg != SK_LIPA_AUTO) {
-                                /* Set Link manually up */
-                                SkHWSenseSetNext(pAC, IoC, Port, SK_LMODE_FULL);
-                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                                        ("Set manual full duplex Port %d\n", Port));
-                        }
-
-                        /* Do the restart */
-                        return(SK_HW_PS_RESTART);
-                }
-        }
-        else {
-                /* Link is up and we don't need more */
-#ifdef DEBUG
-                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                                ("ERROR: Lipa auto detected on port %d\n", Port));
-                }
-#endif /* DEBUG */
-
-                /*
-                 * Dummy Read interrupt status to prevent
-                 * extra link down/ups
-                 */
-                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_INT_STAT, &ExtStat);
-                
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("Link sync(GP), Port %d\n", Port));
-                SkHWLinkUp(pAC, IoC, Port);
-                
-                return(SK_HW_PS_LINK);
-        }
-
-        return(SK_HW_PS_NONE);
-}       /* SkGePortCheckUpLone */
-
-
-/******************************************************************************
- *
- * SkGePortCheckUpNat() - Check if the link is up on National PHY
- *
- * return:
- *      0       o.k. nothing needed
- *      1       Restart needed on this port
- *      2       Link came up
- */
-static int SkGePortCheckUpNat(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO Context */
-int             Port,           /* Which port should be checked */
-SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
-{
-        /* todo: National */
-        return(SK_HW_PS_NONE);
-}       /* SkGePortCheckUpNat */
-#endif /* OTHER_PHY */
-
-
-/******************************************************************************
- *
- *      SkGeSirqEvent() - Event Service Routine
- *
- * Description:
- *
- * Notes:
- */
-int     SkGeSirqEvent(
-SK_AC           *pAC,           /* Adapter Context */
-SK_IOC          IoC,            /* Io Context */
-SK_U32          Event,          /* Module specific Event */
-SK_EVPARA       Para)           /* Event specific Parameter */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        SK_U32          Port;
-        SK_U32          Val32;
-        int                     PortStat;
-        SK_U8           Val8;
-#ifdef GENESIS
-        SK_U64          Octets;
-#endif /* GENESIS */
-
-        Port = Para.Para32[0];
-        pPrt = &pAC->GIni.GP[Port];
-
-        switch (Event) {
-        case SK_HWEV_WATIM:
-                if (pPrt->PState == SK_PRT_RESET) {
-                
-                        PortStat = SK_HW_PS_NONE;
-                }
-                else {
-                        /* Check whether port came up */
-                        PortStat = SkGePortCheckUp(pAC, IoC, (int)Port);
-                }
-
-                switch (PortStat) {
-                case SK_HW_PS_RESTART:
-                        if (pPrt->PHWLinkUp) {
-                                /* Set Link to down */
-                                SkHWLinkDown(pAC, IoC, (int)Port);
-
-                                /*
-                                 * Signal directly to RLMT to ensure correct
-                                 * sequence of SWITCH and RESET event.
-                                 */
-                                SkRlmtEvent(pAC, IoC, SK_RLMT_LINK_DOWN, Para);
-                        }
-
-                        /* Restart needed */
-                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
-                        break;
-
-                case SK_HW_PS_LINK:
-                        /* Signal to RLMT */
-                        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_UP, Para);
-                        break;
-                }
-                
-                /* Start again the check Timer */
-                if (pPrt->PHWLinkUp) {
-                        Val32 = SK_WA_ACT_TIME;
-                }
-                else {
-                        Val32 = SK_WA_INA_TIME;
-                }
-
-                /* Todo: still needed for non-XMAC PHYs??? */
-                /* Start workaround Errata #2 timer */
-                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, Val32,
-                        SKGE_HWAC, SK_HWEV_WATIM, Para);
-                break;
-
-        case SK_HWEV_PORT_START:
-                if (pPrt->PHWLinkUp) {
-                        /*
-                         * Signal directly to RLMT to ensure correct
-                         * sequence of SWITCH and RESET event.
-                         */
-                        SkRlmtEvent(pAC, IoC, SK_RLMT_LINK_DOWN, Para);
-                }
-
-                SkHWLinkDown(pAC, IoC, (int)Port);
-
-                /* Schedule Port RESET */
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
-
-                /* Start workaround Errata #2 timer */
-                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, SK_WA_INA_TIME,
-                        SKGE_HWAC, SK_HWEV_WATIM, Para);
-                break;
-
-        case SK_HWEV_PORT_STOP:
-                if (pPrt->PHWLinkUp) {
-                        /*
-                         * Signal directly to RLMT to ensure correct
-                         * sequence of SWITCH and RESET event.
-                         */
-                        SkRlmtEvent(pAC, IoC, SK_RLMT_LINK_DOWN, Para);
-                }
-
-                /* Stop Workaround Timer */
-                SkTimerStop(pAC, IoC, &pPrt->PWaTimer);
-
-                SkHWLinkDown(pAC, IoC, (int)Port);
-                break;
-
-        case SK_HWEV_UPDATE_STAT:
-                /* We do NOT need to update any statistics */
-                break;
-
-        case SK_HWEV_CLEAR_STAT:
-                /* We do NOT need to clear any statistics */
-                for (Port = 0; Port < (SK_U32)pAC->GIni.GIMacsFound; Port++) {
-                        pPrt->PPrevRx = 0;
-                        pPrt->PPrevFcs = 0;
-                        pPrt->PPrevShorts = 0;
-                }
-                break;
-
-        case SK_HWEV_SET_LMODE:
-                Val8 = (SK_U8)Para.Para32[1];
-                if (pPrt->PLinkModeConf != Val8) {
-                        /* Set New link mode */
-                        pPrt->PLinkModeConf = Val8;
-
-                        /* Restart Port */
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
-                }
-                break;
-
-        case SK_HWEV_SET_FLOWMODE:
-                Val8 = (SK_U8)Para.Para32[1];
-                if (pPrt->PFlowCtrlMode != Val8) {
-                        /* Set New Flow Control mode */
-                        pPrt->PFlowCtrlMode = Val8;
-
-                        /* Restart Port */
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
-                }
-                break;
-
-        case SK_HWEV_SET_ROLE:
-                /* not possible for fiber */
-                if (!pAC->GIni.GICopperType) {
-                        break;
-                }
-                Val8 = (SK_U8)Para.Para32[1];
-                if (pPrt->PMSMode != Val8) {
-                        /* Set New Role (Master/Slave) mode */
-                        pPrt->PMSMode = Val8;
-
-                        /* Restart Port */
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
-                }
-                break;
-
-        case SK_HWEV_SET_SPEED:
-                if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
-                        break;
-                }
-                Val8 = (SK_U8)Para.Para32[1];
-                if (pPrt->PLinkSpeed != Val8) {
-                        /* Set New Speed parameter */
-                        pPrt->PLinkSpeed = Val8;
-
-                        /* Restart Port */
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
-                }
-                break;
-
-#ifdef GENESIS
-        case SK_HWEV_HALFDUP_CHK:
-                if (pAC->GIni.GIGenesis) {
-                        /*
-                         * half duplex hangup workaround.
-                         * See packet arbiter timeout interrupt for description
-                         */
-                        pPrt->HalfDupTimerActive = SK_FALSE;
-                        if (pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
-                                pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) {
-                                /* Snap statistic counters */
-                                (void)SkXmUpdateStats(pAC, IoC, Port);
-
-                                (void)SkXmMacStatistic(pAC, IoC, Port, XM_TXO_OK_HI, &Val32);
-
-                                Octets = (SK_U64)Val32 << 32;
-                                
-                                (void)SkXmMacStatistic(pAC, IoC, Port, XM_TXO_OK_LO, &Val32);
-
-                                Octets += Val32;
-                                
-                                if (pPrt->LastOctets == Octets) {
-                                        /* Tx hanging, a FIFO flush restarts it */
-                                        SkMacFlushTxFifo(pAC, IoC, Port);
-                                }
-                        }
-                }
-                break;
-#endif /* GENESIS */
-        
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_SIRQ_E001, SKERR_SIRQ_E001MSG);
-                break;
-        }
-
-        return(0);
-}       /* SkGeSirqEvent */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkPhyIsrBcom() - PHY interrupt service routine
- *
- * Description: handles all interrupts from BCom PHY
- *
- * Returns: N/A
- */
-static void SkPhyIsrBcom(
-SK_AC           *pAC,           /* Adapter Context */
-SK_IOC          IoC,            /* Io Context */
-int                     Port,           /* Port Num = PHY Num */
-SK_U16          IStatus)        /* Interrupt Status */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        SK_EVPARA       Para;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if ((IStatus & PHY_B_IS_PSE) != 0) {
-                /* Incorrectable pair swap error */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW | SK_ERRCL_INIT, SKERR_SIRQ_E022,
-                        SKERR_SIRQ_E022MSG);
-        }
-        
-        if ((IStatus & (PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE)) != 0) {
-
-                SkHWLinkDown(pAC, IoC, Port);
-
-                Para.Para32[0] = (SK_U32)Port;
-                /* Signal to RLMT */
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-
-                /* Start workaround Errata #2 timer */
-                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, SK_WA_INA_TIME,
-                        SKGE_HWAC, SK_HWEV_WATIM, Para);
-        }
-
-}       /* SkPhyIsrBcom */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkPhyIsrGmac() - PHY interrupt service routine
- *
- * Description: handles all interrupts from Marvell PHY
- *
- * Returns: N/A
- */
-static void SkPhyIsrGmac(
-SK_AC           *pAC,           /* Adapter Context */
-SK_IOC          IoC,            /* Io Context */
-int                     Port,           /* Port Num = PHY Num */
-SK_U16          IStatus)        /* Interrupt Status */
-{
-        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
-        SK_EVPARA       Para;
-        SK_U16          Word;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if ((IStatus & (PHY_M_IS_AN_PR | PHY_M_IS_LST_CHANGE)) != 0) {
-
-                SkHWLinkDown(pAC, IoC, Port);
-
-                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_ADV, &Word);
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNeg.Adv: 0x%04X\n", Word));
-                
-                /* Set Auto-negotiation advertisement */
-                if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM) {
-                        /* restore Asymmetric Pause bit */
-                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_AUNE_ADV,
-                                (SK_U16)(Word | PHY_M_AN_ASP));
-                }
-                
-                Para.Para32[0] = (SK_U32)Port;
-                /* Signal to RLMT */
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-        
-        if ((IStatus & PHY_M_IS_AN_ERROR) != 0) {
-                /* Auto-Negotiation Error */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E023, SKERR_SIRQ_E023MSG);
-        }
-        
-        if ((IStatus & PHY_M_IS_FIFO_ERROR) != 0) {
-                /* FIFO Overflow/Underrun Error */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E024, SKERR_SIRQ_E024MSG);
-        }
-        
-}       /* SkPhyIsrGmac */
-#endif /* YUKON */
-
-
-#ifdef OTHER_PHY
-/******************************************************************************
- *
- *      SkPhyIsrLone() - PHY interrupt service routine
- *
- * Description: handles all interrupts from LONE PHY
- *
- * Returns: N/A
- */
-static void SkPhyIsrLone(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* Io Context */
-int             Port,           /* Port Num = PHY Num */
-SK_U16  IStatus)        /* Interrupt Status */
-{
-        SK_EVPARA       Para;
-
-        if (IStatus & (PHY_L_IS_DUP | PHY_L_IS_ISOL)) {
-                
-                SkHWLinkDown(pAC, IoC, Port);
-
-                Para.Para32[0] = (SK_U32)Port;
-                /* Signal to RLMT */
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-        }
-
-}       /* SkPhyIsrLone */
-#endif /* OTHER_PHY */
-
-/* End of File */
diff --git a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c
deleted file mode 100644
index 79bf57cb5326..000000000000
--- a/drivers/net/sk98lin/ski2c.c
+++ /dev/null
@@ -1,1296 +0,0 @@
-/******************************************************************************
- *
- * Name:        ski2c.c
- * Project:     Gigabit Ethernet Adapters, TWSI-Module
- * Version:     $Revision: 1.59 $
- * Date:        $Date: 2003/10/20 09:07:25 $
- * Purpose:     Functions to access Voltage and Temperature Sensor
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- *      I2C Protocol
- */
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: ski2c.c,v 1.59 2003/10/20 09:07:25 rschmidt Exp $ (C) Marvell. ";
-#endif
-
-#include "h/skdrv1st.h"         /* Driver Specific Definitions */
-#include "h/lm80.h"
-#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
-
-#ifdef __C2MAN__
-/*
-        I2C protocol implementation.
-
-        General Description:
-
-        The I2C protocol is used for the temperature sensors and for
-        the serial EEPROM which hold the configuration.
-
-        This file covers functions that allow to read write and do
-        some bulk requests a specified I2C address.
-
-        The Genesis has 2 I2C buses. One for the EEPROM which holds
-        the VPD Data and one for temperature and voltage sensor.
-        The following picture shows the I2C buses, I2C devices and
-        their control registers.
-
-        Note: The VPD functions are in skvpd.c
-.
-.       PCI Config I2C Bus for VPD Data:
-.
-.                     +------------+
-.                     | VPD EEPROM |
-.                     +------------+
-.                            |
-.                            | <-- I2C
-.                            |
-.                +-----------+-----------+
-.                |                       |
-.       +-----------------+     +-----------------+
-.       | PCI_VPD_ADR_REG |     | PCI_VPD_DAT_REG |
-.       +-----------------+     +-----------------+
-.
-.
-.       I2C Bus for LM80 sensor:
-.
-.                       +-----------------+
-.                       | Temperature and |
-.                       | Voltage Sensor  |
-.                       |       LM80      |
-.                       +-----------------+
-.                               |
-.                               |
-.                       I2C --> |
-.                               |
-.                            +----+
-.            +-------------->| OR |<--+
-.            |               +----+   |
-.     +------+------+                 |
-.     |             |                 |
-. +--------+    +--------+      +----------+
-. | B2_I2C |    | B2_I2C |      |  B2_I2C  |
-. | _CTRL  |    | _DATA  |      |   _SW    |
-. +--------+    +--------+      +----------+
-.
-        The I2C bus may be driven by the B2_I2C_SW or by the B2_I2C_CTRL
-        and B2_I2C_DATA registers.
-        For driver software it is recommended to use the I2C control and
-        data register, because I2C bus timing is done by the ASIC and
-        an interrupt may be received when the I2C request is completed.
-
-        Clock Rate Timing:                      MIN     MAX     generated by
-                VPD EEPROM:                     50 kHz  100 kHz         HW
-                LM80 over I2C Ctrl/Data reg.    50 kHz  100 kHz         HW
-                LM80 over B2_I2C_SW register    0       400 kHz         SW
-
-        Note:   The clock generated by the hardware is dependend on the
-                PCI clock. If the PCI bus clock is 33 MHz, the I2C/VPD
-                clock is 50 kHz.
- */
-intro()
-{}
-#endif
-
-#ifdef SK_DIAG
-/*
- * I2C Fast Mode timing values used by the LM80.
- * If new devices are added to the I2C bus the timing values have to be checked.
- */
-#ifndef I2C_SLOW_TIMING
-#define T_CLK_LOW                       1300L   /* clock low time in ns */
-#define T_CLK_HIGH                       600L   /* clock high time in ns */
-#define T_DATA_IN_SETUP          100L   /* data in Set-up Time */
-#define T_START_HOLD             600L   /* start condition hold time */
-#define T_START_SETUP            600L   /* start condition Set-up time */
-#define T_STOP_SETUP             600L   /* stop condition Set-up time */
-#define T_BUS_IDLE                      1300L   /* time the bus must free after Tx */
-#define T_CLK_2_DATA_OUT         900L   /* max. clock low to data output valid */
-#else   /* I2C_SLOW_TIMING */
-/* I2C Standard Mode Timing */
-#define T_CLK_LOW                       4700L   /* clock low time in ns */
-#define T_CLK_HIGH                      4000L   /* clock high time in ns */
-#define T_DATA_IN_SETUP          250L   /* data in Set-up Time */
-#define T_START_HOLD            4000L   /* start condition hold time */
-#define T_START_SETUP           4700L   /* start condition Set-up time */
-#define T_STOP_SETUP            4000L   /* stop condition Set-up time */
-#define T_BUS_IDLE                      4700L   /* time the bus must free after Tx */
-#endif  /* !I2C_SLOW_TIMING */
-
-#define NS2BCLK(x)      (((x)*125)/10000)
-
-/*
- * I2C Wire Operations
- *
- * About I2C_CLK_LOW():
- *
- * The Data Direction bit (I2C_DATA_DIR) has to be set to input when setting
- * clock to low, to prevent the ASIC and the I2C data client from driving the
- * serial data line simultaneously (ASIC: last bit of a byte = '1', I2C client
- * send an 'ACK'). See also Concentrator Bugreport No. 10192.
- */
-#define I2C_DATA_HIGH(IoC)      SK_I2C_SET_BIT(IoC, I2C_DATA)
-#define I2C_DATA_LOW(IoC)       SK_I2C_CLR_BIT(IoC, I2C_DATA)
-#define I2C_DATA_OUT(IoC)       SK_I2C_SET_BIT(IoC, I2C_DATA_DIR)
-#define I2C_DATA_IN(IoC)        SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA)
-#define I2C_CLK_HIGH(IoC)       SK_I2C_SET_BIT(IoC, I2C_CLK)
-#define I2C_CLK_LOW(IoC)        SK_I2C_CLR_BIT(IoC, I2C_CLK | I2C_DATA_DIR)
-#define I2C_START_COND(IoC)     SK_I2C_CLR_BIT(IoC, I2C_CLK)
-
-#define NS2CLKT(x)      ((x*125L)/10000)
-
-/*--------------- I2C Interface Register Functions --------------- */
-
-/*
- * sending one bit
- */
-void SkI2cSndBit(
-SK_IOC  IoC,    /* I/O Context */
-SK_U8   Bit)    /* Bit to send */
-{
-        I2C_DATA_OUT(IoC);
-        if (Bit) {
-                I2C_DATA_HIGH(IoC);
-        }
-        else {
-                I2C_DATA_LOW(IoC);
-        }
-        SkDgWaitTime(IoC, NS2BCLK(T_DATA_IN_SETUP));
-        I2C_CLK_HIGH(IoC);
-        SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
-        I2C_CLK_LOW(IoC);
-}       /* SkI2cSndBit*/
-
-
-/*
- * Signal a start to the I2C Bus.
- *
- * A start is signaled when data goes to low in a high clock cycle.
- *
- * Ends with Clock Low.
- *
- * Status: not tested
- */
-void SkI2cStart(
-SK_IOC  IoC)    /* I/O Context */
-{
-        /* Init data and Clock to output lines */
-        /* Set Data high */
-        I2C_DATA_OUT(IoC);
-        I2C_DATA_HIGH(IoC);
-        /* Set Clock high */
-        I2C_CLK_HIGH(IoC);
-
-        SkDgWaitTime(IoC, NS2BCLK(T_START_SETUP));
-
-        /* Set Data Low */
-        I2C_DATA_LOW(IoC);
-
-        SkDgWaitTime(IoC, NS2BCLK(T_START_HOLD));
-
-        /* Clock low without Data to Input */
-        I2C_START_COND(IoC);
-
-        SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW));
-}       /* SkI2cStart */
-
-
-void SkI2cStop(
-SK_IOC  IoC)    /* I/O Context */
-{
-        /* Init data and Clock to output lines */
-        /* Set Data low */
-        I2C_DATA_OUT(IoC);
-        I2C_DATA_LOW(IoC);
-
-        SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
-
-        /* Set Clock high */
-        I2C_CLK_HIGH(IoC);
-
-        SkDgWaitTime(IoC, NS2BCLK(T_STOP_SETUP));
-
-        /*
-         * Set Data High:       Do it by setting the Data Line to Input.
-         *                      Because of a pull up resistor the Data Line
-         *                      floods to high.
-         */
-        I2C_DATA_IN(IoC);
-
-        /*
-         *      When I2C activity is stopped
-         *       o      DATA should be set to input and
-         *       o      CLOCK should be set to high!
-         */
-        SkDgWaitTime(IoC, NS2BCLK(T_BUS_IDLE));
-}       /* SkI2cStop */
-
-
-/*
- * Receive just one bit via the I2C bus.
- *
- * Note:        Clock must be set to LOW before calling this function.
- *
- * Returns The received bit.
- */
-int SkI2cRcvBit(
-SK_IOC  IoC)    /* I/O Context */
-{
-        int     Bit;
-        SK_U8   I2cSwCtrl;
-
-        /* Init data as input line */
-        I2C_DATA_IN(IoC);
-
-        SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
-
-        I2C_CLK_HIGH(IoC);
-
-        SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
-
-        SK_I2C_GET_SW(IoC, &I2cSwCtrl);
-        
-        Bit = (I2cSwCtrl & I2C_DATA) ? 1 : 0;
-
-        I2C_CLK_LOW(IoC);
-        SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW-T_CLK_2_DATA_OUT));
-
-        return(Bit);
-}       /* SkI2cRcvBit */
-
-
-/*
- * Receive an ACK.
- *
- * returns      0 If acknowledged
- *              1 in case of an error
- */
-int SkI2cRcvAck(
-SK_IOC  IoC)    /* I/O Context */
-{
-        /*
-         * Received bit must be zero.
-         */
-        return(SkI2cRcvBit(IoC) != 0);
-}       /* SkI2cRcvAck */
-
-
-/*
- * Send an NACK.
- */
-void SkI2cSndNAck(
-SK_IOC  IoC)    /* I/O Context */
-{
-        /*
-         * Received bit must be zero.
-         */
-        SkI2cSndBit(IoC, 1);
-}       /* SkI2cSndNAck */
-
-
-/*
- * Send an ACK.
- */
-void SkI2cSndAck(
-SK_IOC IoC)     /* I/O Context */
-{
-        /*
-         * Received bit must be zero.
-         */
-        SkI2cSndBit(IoC, 0);
-}       /* SkI2cSndAck */
-
-
-/*
- * Send one byte to the I2C device and wait for ACK.
- *
- * Return acknowleged status.
- */
-int SkI2cSndByte(
-SK_IOC  IoC,    /* I/O Context */
-int             Byte)   /* byte to send */
-{
-        int     i;
-
-        for (i = 0; i < 8; i++) {
-                if (Byte & (1<<(7-i))) {
-                        SkI2cSndBit(IoC, 1);
-                }
-                else {
-                        SkI2cSndBit(IoC, 0);
-                }
-        }
-
-        return(SkI2cRcvAck(IoC));
-}       /* SkI2cSndByte */
-
-
-/*
- * Receive one byte and ack it.
- *
- * Return byte.
- */
-int SkI2cRcvByte(
-SK_IOC  IoC,    /* I/O Context */
-int             Last)   /* Last Byte Flag */
-{
-        int     i;
-        int     Byte = 0;
-
-        for (i = 0; i < 8; i++) {
-                Byte <<= 1;
-                Byte |= SkI2cRcvBit(IoC);
-        }
-
-        if (Last) {
-                SkI2cSndNAck(IoC);
-        }
-        else {
-                SkI2cSndAck(IoC);
-        }
-
-        return(Byte);
-}       /* SkI2cRcvByte */
-
-
-/*
- * Start dialog and send device address
- *
- * Return 0 if acknowleged, 1 in case of an error
- */
-int     SkI2cSndDev(
-SK_IOC  IoC,    /* I/O Context */
-int             Addr,   /* Device Address */
-int             Rw)             /* Read / Write Flag */
-{
-        SkI2cStart(IoC);
-        Rw = ~Rw;
-        Rw &= I2C_WRITE;
-        return(SkI2cSndByte(IoC, (Addr<<1) | Rw));
-}       /* SkI2cSndDev */
-
-#endif /* SK_DIAG */
-
-/*----------------- I2C CTRL Register Functions ----------*/
-
-/*
- * waits for a completion of an I2C transfer
- *
- * returns      0:      success, transfer completes
- *                      1:      error,   transfer does not complete, I2C transfer
- *                                               killed, wait loop terminated.
- */
-static int      SkI2cWait(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC,    /* I/O Context */
-int             Event)  /* complete event to wait for (I2C_READ or I2C_WRITE) */
-{
-        SK_U64  StartTime;
-        SK_U64  CurrentTime;
-        SK_U32  I2cCtrl;
-
-        StartTime = SkOsGetTime(pAC);
-        
-        do {
-                CurrentTime = SkOsGetTime(pAC);
-
-                if (CurrentTime - StartTime > SK_TICKS_PER_SEC / 8) {
-                        
-                        SK_I2C_STOP(IoC);
-#ifndef SK_DIAG
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E002, SKERR_I2C_E002MSG);
-#endif /* !SK_DIAG */
-                        return(1);
-                }
-                
-                SK_I2C_GET_CTL(IoC, &I2cCtrl);
-
-#ifdef xYUKON_DBG
-                printf("StartTime=%lu, CurrentTime=%lu\n",
-                        StartTime, CurrentTime);
-                if (kbhit()) {
-                        return(1);
-                }
-#endif /* YUKON_DBG */
-        
-        } while ((I2cCtrl & I2C_FLAG) == (SK_U32)Event << 31);
-
-        return(0);
-}       /* SkI2cWait */
-
-
-/*
- * waits for a completion of an I2C transfer
- *
- * Returns
- *      Nothing
- */
-void SkI2cWaitIrq(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC)    /* I/O Context */
-{
-        SK_SENSOR       *pSen;
-        SK_U64          StartTime;
-        SK_U32          IrqSrc;
-
-        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-
-        if (pSen->SenState == SK_SEN_IDLE) {
-                return;
-        }
-
-        StartTime = SkOsGetTime(pAC);
-        
-        do {
-                if (SkOsGetTime(pAC) - StartTime > SK_TICKS_PER_SEC / 8) {
-                        
-                        SK_I2C_STOP(IoC);
-#ifndef SK_DIAG
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E016, SKERR_I2C_E016MSG);
-#endif /* !SK_DIAG */
-                        return;
-                }
-                
-                SK_IN32(IoC, B0_ISRC, &IrqSrc);
-
-        } while ((IrqSrc & IS_I2C_READY) == 0);
-
-        pSen->SenState = SK_SEN_IDLE;
-        return;
-}       /* SkI2cWaitIrq */
-
-/*
- * writes a single byte or 4 bytes into the I2C device
- *
- * returns      0:      success
- *                      1:      error
- */
-static int SkI2cWrite(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-SK_U32  I2cData,        /* I2C Data to write */
-int             I2cDev,         /* I2C Device Address */
-int             I2cDevSize, /* I2C Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
-int             I2cReg,         /* I2C Device Register Address */
-int             I2cBurst)       /* I2C Burst Flag */
-{
-        SK_OUT32(IoC, B2_I2C_DATA, I2cData);
-        
-        SK_I2C_CTL(IoC, I2C_WRITE, I2cDev, I2cDevSize, I2cReg, I2cBurst);
-        
-        return(SkI2cWait(pAC, IoC, I2C_WRITE));
-}       /* SkI2cWrite*/
-
-
-#ifdef  SK_DIAG
-/*
- * reads a single byte or 4 bytes from the I2C device
- *
- * returns      the word read
- */
-SK_U32 SkI2cRead(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-int             I2cDev,         /* I2C Device Address */
-int             I2cDevSize, /* I2C Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
-int             I2cReg,         /* I2C Device Register Address */
-int             I2cBurst)       /* I2C Burst Flag */
-{
-        SK_U32  Data;
-
-        SK_OUT32(IoC, B2_I2C_DATA, 0);
-        SK_I2C_CTL(IoC, I2C_READ, I2cDev, I2cDevSize, I2cReg, I2cBurst);
-        
-        if (SkI2cWait(pAC, IoC, I2C_READ) != 0) {
-                w_print("%s\n", SKERR_I2C_E002MSG);
-        }
-        
-        SK_IN32(IoC, B2_I2C_DATA, &Data);
-        
-        return(Data);
-}       /* SkI2cRead */
-#endif /* SK_DIAG */
-
-
-/*
- * read a sensor's value
- *
- * This function reads a sensor's value from the I2C sensor chip. The sensor
- * is defined by its index into the sensors database in the struct pAC points
- * to.
- * Returns
- *              1 if the read is completed
- *              0 if the read must be continued (I2C Bus still allocated)
- */
-static int      SkI2cReadSensor(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_SENSOR       *pSen)  /* Sensor to be read */
-{
-    if (pSen->SenRead != NULL) {
-        return((*pSen->SenRead)(pAC, IoC, pSen));
-    }
-        else {
-        return(0); /* no success */
-        }
-}       /* SkI2cReadSensor */
-
-/*
- * Do the Init state 0 initialization
- */
-static int SkI2cInit0(
-SK_AC   *pAC)   /* Adapter Context */
-{
-        int     i;
-
-        /* Begin with first sensor */
-        pAC->I2c.CurrSens = 0;
-        
-        /* Begin with timeout control for state machine */
-        pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
-        
-        /* Set sensor number to zero */
-        pAC->I2c.MaxSens = 0;
-
-#ifndef SK_DIAG
-        /* Initialize Number of Dummy Reads */
-        pAC->I2c.DummyReads = SK_MAX_SENSORS;
-#endif
-
-        for (i = 0; i < SK_MAX_SENSORS; i++) {
-                pAC->I2c.SenTable[i].SenDesc = "unknown";
-                pAC->I2c.SenTable[i].SenType = SK_SEN_UNKNOWN;
-                pAC->I2c.SenTable[i].SenThreErrHigh = 0;
-                pAC->I2c.SenTable[i].SenThreErrLow = 0;
-                pAC->I2c.SenTable[i].SenThreWarnHigh = 0;
-                pAC->I2c.SenTable[i].SenThreWarnLow = 0;
-                pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
-                pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_NONE;
-                pAC->I2c.SenTable[i].SenValue = 0;
-                pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_NOT_PRESENT;
-                pAC->I2c.SenTable[i].SenErrCts = 0;
-                pAC->I2c.SenTable[i].SenBegErrTS = 0;
-                pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
-                pAC->I2c.SenTable[i].SenRead = NULL;
-                pAC->I2c.SenTable[i].SenDev = 0;
-        }
-
-        /* Now we are "INIT data"ed */
-        pAC->I2c.InitLevel = SK_INIT_DATA;
-        return(0);
-}       /* SkI2cInit0*/
-
-
-/*
- * Do the init state 1 initialization
- *
- * initialize the following register of the LM80:
- * Configuration register:
- * - START, noINT, activeLOW, noINT#Clear, noRESET, noCI, noGPO#, noINIT
- *
- * Interrupt Mask Register 1:
- * - all interrupts are Disabled (0xff)
- *
- * Interrupt Mask Register 2:
- * - all interrupts are Disabled (0xff) Interrupt modi doesn't matter.
- *
- * Fan Divisor/RST_OUT register:
- * - Divisors set to 1 (bits 00), all others 0s.
- *
- * OS# Configuration/Temperature resolution Register:
- * - all 0s
- *
- */
-static int SkI2cInit1(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC)    /* I/O Context */
-{
-    int i;
-    SK_U8 I2cSwCtrl;
-        SK_GEPORT *pPrt;        /* GIni Port struct pointer */
-
-        if (pAC->I2c.InitLevel != SK_INIT_DATA) {
-                /* ReInit not needed in I2C module */
-                return(0);
-        }
-
-    /* Set the Direction of I2C-Data Pin to IN */
-    SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA);
-    /* Check for 32-Bit Yukon with Low at I2C-Data Pin */
-        SK_I2C_GET_SW(IoC, &I2cSwCtrl);
-
-        if ((I2cSwCtrl & I2C_DATA) == 0) {
-                /* this is a 32-Bit board */
-                pAC->GIni.GIYukon32Bit = SK_TRUE;
-        return(0);
-    }
-
-        /* Check for 64 Bit Yukon without sensors */
-        if (SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_CFG, 0) != 0) {
-        return(0);
-    }
-
-        (void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_1, 0);
-        
-        (void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_2, 0);
-        
-        (void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_FAN_CTRL, 0);
-        
-        (void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_TEMP_CTRL, 0);
-        
-        (void)SkI2cWrite(pAC, IoC, (SK_U32)LM80_CFG_START, LM80_ADDR, I2C_025K_DEV,
-                LM80_CFG, 0);
-        
-        /*
-         * MaxSens has to be updated here, because PhyType is not
-         * set when performing Init Level 0
-         */
-    pAC->I2c.MaxSens = 5;
-        
-        pPrt = &pAC->GIni.GP[0];
-        
-        if (pAC->GIni.GIGenesis) {
-                if (pPrt->PhyType == SK_PHY_BCOM) {
-                        if (pAC->GIni.GIMacsFound == 1) {
-                                pAC->I2c.MaxSens += 1;
-                        }
-                        else {
-                                pAC->I2c.MaxSens += 3;
-                        }
-                }
-        }
-        else {
-                pAC->I2c.MaxSens += 3;
-        }
-        
-        for (i = 0; i < pAC->I2c.MaxSens; i++) {
-                switch (i) {
-                case 0:
-                        pAC->I2c.SenTable[i].SenDesc = "Temperature";
-                        pAC->I2c.SenTable[i].SenType = SK_SEN_TEMP;
-                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_TEMP_HIGH_ERR;
-                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_TEMP_HIGH_WARN;
-                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_TEMP_LOW_WARN;
-                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_TEMP_LOW_ERR;
-                        pAC->I2c.SenTable[i].SenReg = LM80_TEMP_IN;
-                        break;
-                case 1:
-                        pAC->I2c.SenTable[i].SenDesc = "Voltage PCI";
-                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_5V_HIGH_ERR;
-                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_5V_HIGH_WARN;
-                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_5V_LOW_WARN;
-                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_5V_LOW_ERR;
-                        pAC->I2c.SenTable[i].SenReg = LM80_VT0_IN;
-                        break;
-                case 2:
-                        pAC->I2c.SenTable[i].SenDesc = "Voltage PCI-IO";
-                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_IO_5V_HIGH_ERR;
-                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_IO_5V_HIGH_WARN;
-                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_IO_3V3_LOW_WARN;
-                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_IO_3V3_LOW_ERR;
-                        pAC->I2c.SenTable[i].SenReg = LM80_VT1_IN;
-                        pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_PCI_IO;
-                        break;
-                case 3:
-                        pAC->I2c.SenTable[i].SenDesc = "Voltage ASIC";
-                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VDD_HIGH_ERR;
-                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VDD_HIGH_WARN;
-                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VDD_LOW_WARN;
-                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VDD_LOW_ERR;
-                        pAC->I2c.SenTable[i].SenReg = LM80_VT2_IN;
-                        break;
-                case 4:
-                        if (pAC->GIni.GIGenesis) {
-                                if (pPrt->PhyType == SK_PHY_BCOM) {
-                                        pAC->I2c.SenTable[i].SenDesc = "Voltage PHY A PLL";
-                                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
-                                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
-                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
-                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
-                                }
-                                else {
-                                        pAC->I2c.SenTable[i].SenDesc = "Voltage PMA";
-                                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
-                                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
-                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
-                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
-                                }
-                        }
-                        else {
-                                pAC->I2c.SenTable[i].SenDesc = "Voltage VAUX";
-                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VAUX_3V3_HIGH_ERR;
-                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VAUX_3V3_HIGH_WARN;
-                                if (pAC->GIni.GIVauxAvail) {
-                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
-                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
-                                }
-                                else {
-                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VAUX_0V_WARN_ERR;
-                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VAUX_0V_WARN_ERR;
-                                }
-                        }
-                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-                        pAC->I2c.SenTable[i].SenReg = LM80_VT3_IN;
-                        break;
-                case 5:
-                        if (pAC->GIni.GIGenesis) {
-                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
-                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
-                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
-                                pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
-                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
-                        }
-                        else {
-                                pAC->I2c.SenTable[i].SenDesc = "Voltage Core 1V5";
-                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_CORE_1V5_HIGH_ERR;
-                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_CORE_1V5_HIGH_WARN;
-                                pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_CORE_1V5_LOW_WARN;
-                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_CORE_1V5_LOW_ERR;
-                        }
-                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-                        pAC->I2c.SenTable[i].SenReg = LM80_VT4_IN;
-                        break;
-                case 6:
-                        if (pAC->GIni.GIGenesis) {
-                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY B PLL";
-                        }
-                        else {
-                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 3V3";
-                        }
-                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
-                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
-                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
-                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
-                        pAC->I2c.SenTable[i].SenReg = LM80_VT5_IN;
-                        break;
-                case 7:
-                        if (pAC->GIni.GIGenesis) {
-                                pAC->I2c.SenTable[i].SenDesc = "Speed Fan";
-                                pAC->I2c.SenTable[i].SenType = SK_SEN_FAN;
-                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_FAN_HIGH_ERR;
-                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_FAN_HIGH_WARN;
-                                pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_FAN_LOW_WARN;
-                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_FAN_LOW_ERR;
-                                pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
-                        }
-                        else {
-                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
-                                pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
-                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
-                                pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
-                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
-                                pAC->I2c.SenTable[i].SenReg = LM80_VT6_IN;
-                        }
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_INIT | SK_ERRCL_SW,
-                                SKERR_I2C_E001, SKERR_I2C_E001MSG);
-                        break;
-                }
-
-                pAC->I2c.SenTable[i].SenValue = 0;
-                pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
-                pAC->I2c.SenTable[i].SenErrCts = 0;
-                pAC->I2c.SenTable[i].SenBegErrTS = 0;
-                pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
-                pAC->I2c.SenTable[i].SenRead = SkLm80ReadSensor;
-                pAC->I2c.SenTable[i].SenDev = LM80_ADDR;
-        }
-
-#ifndef SK_DIAG
-        pAC->I2c.DummyReads = pAC->I2c.MaxSens;
-#endif /* !SK_DIAG */
-        
-        /* Clear I2C IRQ */
-        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
-        
-        /* Now we are I/O initialized */
-        pAC->I2c.InitLevel = SK_INIT_IO;
-        return(0);
-}       /* SkI2cInit1 */
-
-
-/*
- * Init level 2: Start first sensor read.
- */
-static int SkI2cInit2(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC)    /* I/O Context */
-{
-        int             ReadComplete;
-        SK_SENSOR       *pSen;
-
-        if (pAC->I2c.InitLevel != SK_INIT_IO) {
-                /* ReInit not needed in I2C module */
-                /* Init0 and Init2 not permitted */
-                return(0);
-        }
-
-        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-        ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
-
-        if (ReadComplete) {
-                SK_ERR_LOG(pAC, SK_ERRCL_INIT, SKERR_I2C_E008, SKERR_I2C_E008MSG);
-        }
-
-        /* Now we are correctly initialized */
-        pAC->I2c.InitLevel = SK_INIT_RUN;
-
-        return(0);
-}       /* SkI2cInit2*/
-
-
-/*
- * Initialize I2C devices
- *
- * Get the first voltage value and discard it.
- * Go into temperature read mode. A default pointer is not set.
- *
- * The things to be done depend on the init level in the parameter list:
- * Level 0:
- *      Initialize only the data structures. Do NOT access hardware.
- * Level 1:
- *      Initialize hardware through SK_IN / SK_OUT commands. Do NOT use interrupts.
- * Level 2:
- *      Everything is possible. Interrupts may be used from now on.
- *
- * return:
- *      0 = success
- *      other = error.
- */
-int     SkI2cInit(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC,    /* I/O Context needed in levels 1 and 2 */
-int             Level)  /* Init Level */
-{
-
-        switch (Level) {
-        case SK_INIT_DATA:
-                return(SkI2cInit0(pAC));
-        case SK_INIT_IO:
-                return(SkI2cInit1(pAC, IoC));
-        case SK_INIT_RUN:
-                return(SkI2cInit2(pAC, IoC));
-        default:
-                break;
-        }
-
-        return(0);
-}       /* SkI2cInit */
-
-
-#ifndef SK_DIAG
-
-/*
- * Interrupt service function for the I2C Interface
- *
- * Clears the Interrupt source
- *
- * Reads the register and check it for sending a trap.
- *
- * Starts the timer if necessary.
- */
-void SkI2cIsr(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC)    /* I/O Context */
-{
-        SK_EVPARA       Para;
-
-        /* Clear I2C IRQ */
-        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
-
-        Para.Para64 = 0;
-        SkEventQueue(pAC, SKGE_I2C, SK_I2CEV_IRQ, Para);
-}       /* SkI2cIsr */
-
-
-/*
- * Check this sensors Value against the threshold and send events.
- */
-static void SkI2cCheckSensor(
-SK_AC           *pAC,   /* Adapter Context */
-SK_SENSOR       *pSen)
-{
-        SK_EVPARA       ParaLocal;
-        SK_BOOL         TooHigh;        /* Is sensor too high? */
-        SK_BOOL         TooLow;         /* Is sensor too low? */
-        SK_U64          CurrTime;       /* Current Time */
-        SK_BOOL         DoTrapSend;     /* We need to send a trap */
-        SK_BOOL         DoErrLog;       /* We need to log the error */
-        SK_BOOL         IsError;        /* We need to log the error */
-
-        /* Check Dummy Reads first */
-        if (pAC->I2c.DummyReads > 0) {
-                pAC->I2c.DummyReads--;
-                return;
-        }
-
-        /* Get the current time */
-        CurrTime = SkOsGetTime(pAC);
-
-        /* Set para to the most useful setting: The current sensor. */
-        ParaLocal.Para64 = (SK_U64)pAC->I2c.CurrSens;
-
-        /* Check the Value against the thresholds. First: Error Thresholds */
-        TooHigh = (pSen->SenValue > pSen->SenThreErrHigh);
-        TooLow = (pSen->SenValue < pSen->SenThreErrLow);
-                
-        IsError = SK_FALSE;
-        if (TooHigh || TooLow) {
-                /* Error condition is satisfied */
-                DoTrapSend = SK_TRUE;
-                DoErrLog = SK_TRUE;
-
-                /* Now error condition is satisfied */
-                IsError = SK_TRUE;
-
-                if (pSen->SenErrFlag == SK_SEN_ERR_ERR) {
-                        /* This state is the former one */
-
-                        /* So check first whether we have to send a trap */
-                        if (pSen->SenLastErrTrapTS + SK_SEN_ERR_TR_HOLD >
-                            CurrTime) {
-                                /*
-                                 * Do NOT send the Trap. The hold back time
-                                 * has to run out first.
-                                 */
-                                DoTrapSend = SK_FALSE;
-                        }
-
-                        /* Check now whether we have to log an Error */
-                        if (pSen->SenLastErrLogTS + SK_SEN_ERR_LOG_HOLD >
-                            CurrTime) {
-                                /*
-                                 * Do NOT log the error. The hold back time
-                                 * has to run out first.
-                                 */
-                                DoErrLog = SK_FALSE;
-                        }
-                }
-                else {
-                        /* We came from a different state -> Set Begin Time Stamp */
-                        pSen->SenBegErrTS = CurrTime;
-                        pSen->SenErrFlag = SK_SEN_ERR_ERR;
-                }
-
-                if (DoTrapSend) {
-                        /* Set current Time */
-                        pSen->SenLastErrTrapTS = CurrTime;
-                        pSen->SenErrCts++;
-
-                        /* Queue PNMI Event */
-                        SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
-                                SK_PNMI_EVT_SEN_ERR_UPP :
-                                SK_PNMI_EVT_SEN_ERR_LOW),
-                                ParaLocal);
-                }
-
-                if (DoErrLog) {
-                        /* Set current Time */
-                        pSen->SenLastErrLogTS = CurrTime;
-
-                        if (pSen->SenType == SK_SEN_TEMP) {
-                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E011, SKERR_I2C_E011MSG);
-                        }
-                        else if (pSen->SenType == SK_SEN_VOLT) {
-                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E012, SKERR_I2C_E012MSG);
-                        }
-                        else {
-                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E015, SKERR_I2C_E015MSG);
-                        }
-                }
-        }
-
-        /* Check the Value against the thresholds */
-        /* 2nd: Warning thresholds */
-        TooHigh = (pSen->SenValue > pSen->SenThreWarnHigh);
-        TooLow = (pSen->SenValue < pSen->SenThreWarnLow);
-                
-        if (!IsError && (TooHigh || TooLow)) {
-                /* Error condition is satisfied */
-                DoTrapSend = SK_TRUE;
-                DoErrLog = SK_TRUE;
-
-                if (pSen->SenErrFlag == SK_SEN_ERR_WARN) {
-                        /* This state is the former one */
-
-                        /* So check first whether we have to send a trap */
-                        if (pSen->SenLastWarnTrapTS + SK_SEN_WARN_TR_HOLD > CurrTime) {
-                                /*
-                                 * Do NOT send the Trap. The hold back time
-                                 * has to run out first.
-                                 */
-                                DoTrapSend = SK_FALSE;
-                        }
-
-                        /* Check now whether we have to log an Error */
-                        if (pSen->SenLastWarnLogTS + SK_SEN_WARN_LOG_HOLD > CurrTime) {
-                                /*
-                                 * Do NOT log the error. The hold back time
-                                 * has to run out first.
-                                 */
-                                DoErrLog = SK_FALSE;
-                        }
-                }
-                else {
-                        /* We came from a different state -> Set Begin Time Stamp */
-                        pSen->SenBegWarnTS = CurrTime;
-                        pSen->SenErrFlag = SK_SEN_ERR_WARN;
-                }
-
-                if (DoTrapSend) {
-                        /* Set current Time */
-                        pSen->SenLastWarnTrapTS = CurrTime;
-                        pSen->SenWarnCts++;
-
-                        /* Queue PNMI Event */
-                        SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
-                                SK_PNMI_EVT_SEN_WAR_UPP :
-                                SK_PNMI_EVT_SEN_WAR_LOW),
-                                ParaLocal);
-                }
-
-                if (DoErrLog) {
-                        /* Set current Time */
-                        pSen->SenLastWarnLogTS = CurrTime;
-
-                        if (pSen->SenType == SK_SEN_TEMP) {
-                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E009, SKERR_I2C_E009MSG);
-                        }
-                        else if (pSen->SenType == SK_SEN_VOLT) {
-                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E010, SKERR_I2C_E010MSG);
-                        }
-                        else {
-                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E014, SKERR_I2C_E014MSG);
-                        }
-                }
-        }
-
-        /* Check for NO error at all */
-        if (!IsError && !TooHigh && !TooLow) {
-                /* Set o.k. Status if no error and no warning condition */
-                pSen->SenErrFlag = SK_SEN_ERR_OK;
-        }
-
-        /* End of check against the thresholds */
-
-        /* Bug fix AF: 16.Aug.2001: Correct the init base
-         * of LM80 sensor.
-         */
-        if (pSen->SenInit == SK_SEN_DYN_INIT_PCI_IO) {
-
-        pSen->SenInit = SK_SEN_DYN_INIT_NONE;
-
-                if (pSen->SenValue > SK_SEN_PCI_IO_RANGE_LIMITER) {
-                        /* 5V PCI-IO Voltage */
-                        pSen->SenThreWarnLow = SK_SEN_PCI_IO_5V_LOW_WARN;
-                        pSen->SenThreErrLow = SK_SEN_PCI_IO_5V_LOW_ERR;
-                }
-                else {
-                        /* 3.3V PCI-IO Voltage */
-                        pSen->SenThreWarnHigh = SK_SEN_PCI_IO_3V3_HIGH_WARN;
-                        pSen->SenThreErrHigh = SK_SEN_PCI_IO_3V3_HIGH_ERR;
-                }
-        }
-        
-#ifdef TEST_ONLY
-    /* Dynamic thresholds also for VAUX of LM80 sensor */
-        if (pSen->SenInit == SK_SEN_DYN_INIT_VAUX) {
-
-        pSen->SenInit = SK_SEN_DYN_INIT_NONE;
-
-                /* 3.3V VAUX Voltage */
-                if (pSen->SenValue > SK_SEN_VAUX_RANGE_LIMITER) {
-                        pSen->SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
-                        pSen->SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
-                }
-                /* 0V VAUX Voltage */
-                else {
-                        pSen->SenThreWarnHigh = SK_SEN_VAUX_0V_WARN_ERR;
-                        pSen->SenThreErrHigh = SK_SEN_VAUX_0V_WARN_ERR;
-                }
-        }
-
-        /*
-         * Check initialization state:
-         * The VIO Thresholds need adaption
-         */
-        if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
-             pSen->SenValue > SK_SEN_WARNLOW2C &&
-             pSen->SenValue < SK_SEN_WARNHIGH2) {
-                pSen->SenThreErrLow = SK_SEN_ERRLOW2C;
-                pSen->SenThreWarnLow = SK_SEN_WARNLOW2C;
-                pSen->SenInit = SK_TRUE;
-        }
-
-        if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
-             pSen->SenValue > SK_SEN_WARNLOW2 &&
-             pSen->SenValue < SK_SEN_WARNHIGH2C) {
-                pSen->SenThreErrHigh = SK_SEN_ERRHIGH2C;
-                pSen->SenThreWarnHigh = SK_SEN_WARNHIGH2C;
-                pSen->SenInit = SK_TRUE;
-        }
-#endif
-
-        if (pSen->SenInit != SK_SEN_DYN_INIT_NONE) {
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E013, SKERR_I2C_E013MSG);
-        }
-}       /* SkI2cCheckSensor */
-
-
-/*
- * The only Event to be served is the timeout event
- *
- */
-int     SkI2cEvent(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_U32          Event,  /* Module specific Event */
-SK_EVPARA       Para)   /* Event specific Parameter */
-{
-        int                     ReadComplete;
-        SK_SENSOR       *pSen;
-        SK_U32          Time;
-        SK_EVPARA       ParaLocal;
-        int                     i;
-
-        /* New case: no sensors */
-        if (pAC->I2c.MaxSens == 0) {
-                return(0);
-        }
-
-        switch (Event) {
-        case SK_I2CEV_IRQ:
-                pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-                ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
-
-                if (ReadComplete) {
-                        /* Check sensor against defined thresholds */
-                        SkI2cCheckSensor(pAC, pSen);
-
-                        /* Increment Current sensor and set appropriate Timeout */
-                        pAC->I2c.CurrSens++;
-                        if (pAC->I2c.CurrSens >= pAC->I2c.MaxSens) {
-                                pAC->I2c.CurrSens = 0;
-                                Time = SK_I2C_TIM_LONG;
-                        }
-                        else {
-                                Time = SK_I2C_TIM_SHORT;
-                        }
-
-                        /* Start Timer */
-                        ParaLocal.Para64 = (SK_U64)0;
-
-                        pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
-                        
-                        SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
-                                SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-                }
-        else {
-                        /* Start Timer */
-                        ParaLocal.Para64 = (SK_U64)0;
-
-                        pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
-
-            SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, SK_I2C_TIM_WATCH,
-                                SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-                }
-                break;
-        case SK_I2CEV_TIM:
-                if (pAC->I2c.TimerMode == SK_TIMER_NEW_GAUGING) {
-
-                        ParaLocal.Para64 = (SK_U64)0;
-                        SkTimerStop(pAC, IoC, &pAC->I2c.SenTimer);
-
-                        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-                        ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
-
-                        if (ReadComplete) {
-                                /* Check sensor against defined thresholds */
-                                SkI2cCheckSensor(pAC, pSen);
-
-                                /* Increment Current sensor and set appropriate Timeout */
-                                pAC->I2c.CurrSens++;
-                                if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
-                                        pAC->I2c.CurrSens = 0;
-                                        Time = SK_I2C_TIM_LONG;
-                                }
-                                else {
-                                        Time = SK_I2C_TIM_SHORT;
-                                }
-
-                                /* Start Timer */
-                                ParaLocal.Para64 = (SK_U64)0;
-
-                                pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
-
-                                SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
-                                        SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-                        }
-                }
-                else {
-                        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-                        pSen->SenErrFlag = SK_SEN_ERR_FAULTY;
-                        SK_I2C_STOP(IoC);
-
-                        /* Increment Current sensor and set appropriate Timeout */
-                        pAC->I2c.CurrSens++;
-                        if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
-                                pAC->I2c.CurrSens = 0;
-                                Time = SK_I2C_TIM_LONG;
-                        }
-                        else {
-                                Time = SK_I2C_TIM_SHORT;
-                        }
-
-                        /* Start Timer */
-                        ParaLocal.Para64 = (SK_U64)0;
-
-                        pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
-
-                        SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
-                                SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-                }
-                break;
-        case SK_I2CEV_CLEAR:
-                for (i = 0; i < SK_MAX_SENSORS; i++) {
-                        pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
-                        pAC->I2c.SenTable[i].SenErrCts = 0;
-                        pAC->I2c.SenTable[i].SenWarnCts = 0;
-                        pAC->I2c.SenTable[i].SenBegErrTS = 0;
-                        pAC->I2c.SenTable[i].SenBegWarnTS = 0;
-                        pAC->I2c.SenTable[i].SenLastErrTrapTS = (SK_U64)0;
-                        pAC->I2c.SenTable[i].SenLastErrLogTS = (SK_U64)0;
-                        pAC->I2c.SenTable[i].SenLastWarnTrapTS = (SK_U64)0;
-                        pAC->I2c.SenTable[i].SenLastWarnLogTS = (SK_U64)0;
-                }
-                break;
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E006, SKERR_I2C_E006MSG);
-        }
-
-        return(0);
-}       /* SkI2cEvent*/
-
-#endif /* !SK_DIAG */
diff --git a/drivers/net/sk98lin/sklm80.c b/drivers/net/sk98lin/sklm80.c
deleted file mode 100644
index a204f5bb55d4..000000000000
--- a/drivers/net/sk98lin/sklm80.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/******************************************************************************
- *
- * Name:        sklm80.c
- * Project:     Gigabit Ethernet Adapters, TWSI-Module
- * Version:     $Revision: 1.22 $
- * Date:        $Date: 2003/10/20 09:08:21 $
- * Purpose:     Functions to access Voltage and Temperature Sensor (LM80)
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
-        LM80 functions
-*/
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: sklm80.c,v 1.22 2003/10/20 09:08:21 rschmidt Exp $ (C) Marvell. ";
-#endif
-
-#include "h/skdrv1st.h"         /* Driver Specific Definitions */
-#include "h/lm80.h"
-#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
-
-#define BREAK_OR_WAIT(pAC,IoC,Event)    break
-
-/*
- * read a sensors value (LM80 specific)
- *
- * This function reads a sensors value from the I2C sensor chip LM80.
- * The sensor is defined by its index into the sensors database in the struct
- * pAC points to.
- *
- * Returns      1 if the read is completed
- *              0 if the read must be continued (I2C Bus still allocated)
- */
-int SkLm80ReadSensor(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context needed in level 1 and 2 */
-SK_SENSOR       *pSen)  /* Sensor to be read */
-{
-        SK_I32          Value;
-
-        switch (pSen->SenState) {
-        case SK_SEN_IDLE:
-                /* Send address to ADDR register */
-                SK_I2C_CTL(IoC, I2C_READ, pSen->SenDev, I2C_025K_DEV, pSen->SenReg, 0);
-
-                pSen->SenState = SK_SEN_VALUE ;
-                BREAK_OR_WAIT(pAC, IoC, I2C_READ);
-        
-        case SK_SEN_VALUE:
-                /* Read value from data register */
-                SK_IN32(IoC, B2_I2C_DATA, ((SK_U32 *)&Value));
-                
-                Value &= 0xff; /* only least significant byte is valid */
-
-                /* Do NOT check the Value against the thresholds */
-                /* Checking is done in the calling instance */
-
-                if (pSen->SenType == SK_SEN_VOLT) {
-                        /* Voltage sensor */
-                        pSen->SenValue = Value * SK_LM80_VT_LSB;
-                        pSen->SenState = SK_SEN_IDLE ;
-                        return(1);
-                }
-
-                if (pSen->SenType == SK_SEN_FAN) {
-                        if (Value != 0 && Value != 0xff) {
-                                /* Fan speed counter */
-                                pSen->SenValue = SK_LM80_FAN_FAKTOR/Value;
-                        }
-                        else {
-                                /* Indicate Fan error */
-                                pSen->SenValue = 0;
-                        }
-                        pSen->SenState = SK_SEN_IDLE ;
-                        return(1);
-                }
-
-                /* First: correct the value: it might be negative */
-                if ((Value & 0x80) != 0) {
-                        /* Value is negative */
-                        Value = Value - 256;
-                }
-
-                /* We have a temperature sensor and need to get the signed extension.
-                 * For now we get the extension from the last reading, so in the normal
-                 * case we won't see flickering temperatures.
-                 */
-                pSen->SenValue = (Value * SK_LM80_TEMP_LSB) +
-                        (pSen->SenValue % SK_LM80_TEMP_LSB);
-
-                /* Send address to ADDR register */
-                SK_I2C_CTL(IoC, I2C_READ, pSen->SenDev, I2C_025K_DEV, LM80_TEMP_CTRL, 0);
-
-                pSen->SenState = SK_SEN_VALEXT ;
-                BREAK_OR_WAIT(pAC, IoC, I2C_READ);
-        
-        case SK_SEN_VALEXT:
-                /* Read value from data register */
-                SK_IN32(IoC, B2_I2C_DATA, ((SK_U32 *)&Value));
-                Value &= LM80_TEMP_LSB_9; /* only bit 7 is valid */
-
-                /* cut the LSB bit */
-                pSen->SenValue = ((pSen->SenValue / SK_LM80_TEMP_LSB) *
-                        SK_LM80_TEMP_LSB);
-
-                if (pSen->SenValue < 0) {
-                        /* Value negative: The bit value must be subtracted */
-                        pSen->SenValue -= ((Value >> 7) * SK_LM80_TEMPEXT_LSB);
-                }
-                else {
-                        /* Value positive: The bit value must be added */
-                        pSen->SenValue += ((Value >> 7) * SK_LM80_TEMPEXT_LSB);
-                }
-
-                pSen->SenState = SK_SEN_IDLE ;
-                return(1);
-        
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E007, SKERR_I2C_E007MSG);
-                return(1);
-        }
-
-        /* Not completed */
-        return(0);
-}
-
diff --git a/drivers/net/sk98lin/skqueue.c b/drivers/net/sk98lin/skqueue.c
deleted file mode 100644
index 0275b4f71d9b..000000000000
--- a/drivers/net/sk98lin/skqueue.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/******************************************************************************
- *
- * Name:        skqueue.c
- * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:     $Revision: 1.20 $
- * Date:        $Date: 2003/09/16 13:44:00 $
- * Purpose:     Management of an event queue.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-
-/*
- *      Event queue and dispatcher
- */
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skqueue.c,v 1.20 2003/09/16 13:44:00 rschmidt Exp $ (C) Marvell.";
-#endif
-
-#include "h/skdrv1st.h"         /* Driver Specific Definitions */
-#include "h/skqueue.h"          /* Queue Definitions */
-#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
-
-#ifdef __C2MAN__
-/*
-        Event queue management.
-
-        General Description:
-
- */
-intro()
-{}
-#endif
-
-#define PRINTF(a,b,c)
-
-/*
- * init event queue management
- *
- * Must be called during init level 0.
- */
-void    SkEventInit(
-SK_AC   *pAC,   /* Adapter context */
-SK_IOC  Ioc,    /* IO context */
-int             Level)  /* Init level */
-{
-        switch (Level) {
-        case SK_INIT_DATA:
-                pAC->Event.EvPut = pAC->Event.EvGet = pAC->Event.EvQueue;
-                break;
-        default:
-                break;
-        }
-}
-
-/*
- * add event to queue
- */
-void    SkEventQueue(
-SK_AC           *pAC,   /* Adapters context */
-SK_U32          Class,  /* Event Class */
-SK_U32          Event,  /* Event to be queued */
-SK_EVPARA       Para)   /* Event parameter */
-{
-        pAC->Event.EvPut->Class = Class;
-        pAC->Event.EvPut->Event = Event;
-        pAC->Event.EvPut->Para = Para;
-        
-        if (++pAC->Event.EvPut == &pAC->Event.EvQueue[SK_MAX_EVENT])
-                pAC->Event.EvPut = pAC->Event.EvQueue;
-
-        if (pAC->Event.EvPut == pAC->Event.EvGet) {
-                SK_ERR_LOG(pAC, SK_ERRCL_NORES, SKERR_Q_E001, SKERR_Q_E001MSG);
-        }
-}
-
-/*
- * event dispatcher
- *      while event queue is not empty
- *              get event from queue
- *              send command to state machine
- *      end
- *      return error reported by individual Event function
- *              0 if no error occured.
- */
-int     SkEventDispatcher(
-SK_AC   *pAC,   /* Adapters Context */
-SK_IOC  Ioc)    /* Io context */
-{
-        SK_EVENTELEM    *pEv;   /* pointer into queue */
-        SK_U32                  Class;
-        int                     Rtv;
-
-        pEv = pAC->Event.EvGet;
-        
-        PRINTF("dispatch get %x put %x\n", pEv, pAC->Event.ev_put);
-        
-        while (pEv != pAC->Event.EvPut) {
-                PRINTF("dispatch Class %d Event %d\n", pEv->Class, pEv->Event);
-
-                switch (Class = pEv->Class) {
-#ifndef SK_USE_LAC_EV
-#ifndef SK_SLIM
-                case SKGE_RLMT:         /* RLMT Event */
-                        Rtv = SkRlmtEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-                case SKGE_I2C:          /* I2C Event */
-                        Rtv = SkI2cEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-                case SKGE_PNMI:         /* PNMI Event */
-                        Rtv = SkPnmiEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-#endif  /* not SK_SLIM */
-#endif  /* not SK_USE_LAC_EV */
-                case SKGE_DRV:          /* Driver Event */
-                        Rtv = SkDrvEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-#ifndef SK_USE_SW_TIMER
-                case SKGE_HWAC:
-                        Rtv = SkGeSirqEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-#else /* !SK_USE_SW_TIMER */
-        case SKGE_SWT :
-                        Rtv = SkSwtEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-#endif /* !SK_USE_SW_TIMER */
-#ifdef SK_USE_LAC_EV
-                case SKGE_LACP :
-                        Rtv = SkLacpEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-                case SKGE_RSF :
-                        Rtv = SkRsfEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-                case SKGE_MARKER :
-                        Rtv = SkMarkerEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-                case SKGE_FD :
-                        Rtv = SkFdEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-#endif /* SK_USE_LAC_EV */
-#ifdef  SK_USE_CSUM
-                case SKGE_CSUM :
-                        Rtv = SkCsEvent(pAC, Ioc, pEv->Event, pEv->Para);
-                        break;
-#endif  /* SK_USE_CSUM */
-                default :
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_Q_E002, SKERR_Q_E002MSG);
-                        Rtv = 0;
-                }
-
-                if (Rtv != 0) {
-                        return(Rtv);
-                }
-
-                if (++pEv == &pAC->Event.EvQueue[SK_MAX_EVENT])
-                        pEv = pAC->Event.EvQueue;
-
-                /* Renew get: it is used in queue_events to detect overruns */
-                pAC->Event.EvGet = pEv;
-        }
-
-        return(0);
-}
-
-/* End of file */
diff --git a/drivers/net/sk98lin/skrlmt.c b/drivers/net/sk98lin/skrlmt.c
deleted file mode 100644
index be8d1ccddf6d..000000000000
--- a/drivers/net/sk98lin/skrlmt.c
+++ /dev/null
@@ -1,3257 +0,0 @@
-/******************************************************************************
- *
- * Name:        skrlmt.c
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.69 $
- * Date:        $Date: 2003/04/15 09:39:22 $
- * Purpose:     Manage links on SK-NET Adapters, esp. redundant ones.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Description:
- *
- * This module contains code for Link ManagemenT (LMT) of SK-NET Adapters.
- * It is mainly intended for adapters with more than one link.
- * For such adapters, this module realizes Redundant Link ManagemenT (RLMT).
- *
- * Include File Hierarchy:
- *
- *      "skdrv1st.h"
- *      "skdrv2nd.h"
- *
- ******************************************************************************/
-
-#ifndef lint
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skrlmt.c,v 1.69 2003/04/15 09:39:22 tschilli Exp $ (C) Marvell.";
-#endif  /* !defined(lint) */
-
-#define __SKRLMT_C
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* cplusplus */
-
-#include "h/skdrv1st.h"
-#include "h/skdrv2nd.h"
-
-/* defines ********************************************************************/
-
-#ifndef SK_HWAC_LINK_LED
-#define SK_HWAC_LINK_LED(a,b,c,d)
-#endif  /* !defined(SK_HWAC_LINK_LED) */
-
-#ifndef DEBUG
-#define RLMT_STATIC     static
-#else   /* DEBUG */
-#define RLMT_STATIC
-
-#ifndef SK_LITTLE_ENDIAN
-/* First 32 bits */
-#define OFFS_LO32       1
-
-/* Second 32 bits */
-#define OFFS_HI32       0
-#else   /* SK_LITTLE_ENDIAN */
-/* First 32 bits */
-#define OFFS_LO32       0
-
-/* Second 32 bits */
-#define OFFS_HI32       1
-#endif  /* SK_LITTLE_ENDIAN */
-
-#endif  /* DEBUG */
-
-/* ----- Private timeout values ----- */
-
-#define SK_RLMT_MIN_TO_VAL                         125000       /* 1/8 sec. */
-#define SK_RLMT_DEF_TO_VAL                        1000000       /* 1 sec. */
-#define SK_RLMT_PORTDOWN_TIM_VAL           900000       /* another 0.9 sec. */
-#define SK_RLMT_PORTSTART_TIM_VAL          100000       /* 0.1 sec. */
-#define SK_RLMT_PORTUP_TIM_VAL            2500000       /* 2.5 sec. */
-#define SK_RLMT_SEG_TO_VAL                      900000000       /* 15 min. */
-
-/* Assume tick counter increment is 1 - may be set OS-dependent. */
-#ifndef SK_TICK_INCR
-#define SK_TICK_INCR    SK_CONSTU64(1)
-#endif  /* !defined(SK_TICK_INCR) */
-
-/*
- * Amount that a time stamp must be later to be recognized as "substantially
- * later". This is about 1/128 sec, but above 1 tick counter increment.
- */
-#define SK_RLMT_BC_DELTA                (1 + ((SK_TICKS_PER_SEC >> 7) > SK_TICK_INCR ? \
-                                                                        (SK_TICKS_PER_SEC >> 7) : SK_TICK_INCR))
-
-/* ----- Private RLMT defaults ----- */
-
-#define SK_RLMT_DEF_PREF_PORT   0                                       /* "Lower" port. */
-#define SK_RLMT_DEF_MODE                SK_RLMT_CHECK_LINK      /* Default RLMT Mode. */
-
-/* ----- Private RLMT checking states ----- */
-
-#define SK_RLMT_RCS_SEG                 1               /* RLMT Check State: check seg. */
-#define SK_RLMT_RCS_START_SEG   2               /* RLMT Check State: start check seg. */
-#define SK_RLMT_RCS_SEND_SEG    4               /* RLMT Check State: send BPDU packet */
-#define SK_RLMT_RCS_REPORT_SEG  8               /* RLMT Check State: report seg. */
-
-/* ----- Private PORT checking states ----- */
-
-#define SK_RLMT_PCS_TX                  1               /* Port Check State: check tx. */
-#define SK_RLMT_PCS_RX                  2               /* Port Check State: check rx. */
-
-/* ----- Private PORT events ----- */
-
-/* Note: Update simulation when changing these. */
-#define SK_RLMT_PORTSTART_TIM   1100    /* Port start timeout. */
-#define SK_RLMT_PORTUP_TIM              1101    /* Port can now go up. */
-#define SK_RLMT_PORTDOWN_RX_TIM 1102    /* Port did not receive once ... */
-#define SK_RLMT_PORTDOWN                1103    /* Port went down. */
-#define SK_RLMT_PORTDOWN_TX_TIM 1104    /* Partner did not receive ... */
-
-/* ----- Private RLMT events ----- */
-
-/* Note: Update simulation when changing these. */
-#define SK_RLMT_TIM                             2100    /* RLMT timeout. */
-#define SK_RLMT_SEG_TIM                 2101    /* RLMT segmentation check timeout. */
-
-#define TO_SHORTEN(tim) ((tim) / 2)
-
-/* Error numbers and messages. */
-#define SKERR_RLMT_E001         (SK_ERRBASE_RLMT + 0)
-#define SKERR_RLMT_E001_MSG     "No Packet."
-#define SKERR_RLMT_E002         (SKERR_RLMT_E001 + 1)
-#define SKERR_RLMT_E002_MSG     "Short Packet."
-#define SKERR_RLMT_E003         (SKERR_RLMT_E002 + 1)
-#define SKERR_RLMT_E003_MSG     "Unknown RLMT event."
-#define SKERR_RLMT_E004         (SKERR_RLMT_E003 + 1)
-#define SKERR_RLMT_E004_MSG     "PortsUp incorrect."
-#define SKERR_RLMT_E005         (SKERR_RLMT_E004 + 1)
-#define SKERR_RLMT_E005_MSG     \
- "Net seems to be segmented (different root bridges are reported on the ports)."
-#define SKERR_RLMT_E006         (SKERR_RLMT_E005 + 1)
-#define SKERR_RLMT_E006_MSG     "Duplicate MAC Address detected."
-#define SKERR_RLMT_E007         (SKERR_RLMT_E006 + 1)
-#define SKERR_RLMT_E007_MSG     "LinksUp incorrect."
-#define SKERR_RLMT_E008         (SKERR_RLMT_E007 + 1)
-#define SKERR_RLMT_E008_MSG     "Port not started but link came up."
-#define SKERR_RLMT_E009         (SKERR_RLMT_E008 + 1)
-#define SKERR_RLMT_E009_MSG     "Corrected illegal setting of Preferred Port."
-#define SKERR_RLMT_E010         (SKERR_RLMT_E009 + 1)
-#define SKERR_RLMT_E010_MSG     "Ignored illegal Preferred Port."
-
-/* LLC field values. */
-#define LLC_COMMAND_RESPONSE_BIT                1
-#define LLC_TEST_COMMAND                                0xE3
-#define LLC_UI                                                  0x03
-
-/* RLMT Packet fields. */
-#define SK_RLMT_DSAP                                    0
-#define SK_RLMT_SSAP                                    0
-#define SK_RLMT_CTRL                                    (LLC_TEST_COMMAND)
-#define SK_RLMT_INDICATOR0                              0x53    /* S */
-#define SK_RLMT_INDICATOR1                              0x4B    /* K */
-#define SK_RLMT_INDICATOR2                              0x2D    /* - */
-#define SK_RLMT_INDICATOR3                              0x52    /* R */
-#define SK_RLMT_INDICATOR4                              0x4C    /* L */
-#define SK_RLMT_INDICATOR5                              0x4D    /* M */
-#define SK_RLMT_INDICATOR6                              0x54    /* T */
-#define SK_RLMT_PACKET_VERSION                  0
-
-/* RLMT SPT Flag values. */
-#define SK_RLMT_SPT_FLAG_CHANGE                 0x01
-#define SK_RLMT_SPT_FLAG_CHANGE_ACK             0x80
-
-/* RLMT SPT Packet fields. */
-#define SK_RLMT_SPT_DSAP                                0x42
-#define SK_RLMT_SPT_SSAP                                0x42
-#define SK_RLMT_SPT_CTRL                                (LLC_UI)
-#define SK_RLMT_SPT_PROTOCOL_ID0                0x00
-#define SK_RLMT_SPT_PROTOCOL_ID1                0x00
-#define SK_RLMT_SPT_PROTOCOL_VERSION_ID 0x00
-#define SK_RLMT_SPT_BPDU_TYPE                   0x00
-#define SK_RLMT_SPT_FLAGS                               0x00    /* ?? */
-#define SK_RLMT_SPT_ROOT_ID0                    0xFF    /* Lowest possible priority. */
-#define SK_RLMT_SPT_ROOT_ID1                    0xFF    /* Lowest possible priority. */
-
-/* Remaining 6 bytes will be the current port address. */
-#define SK_RLMT_SPT_ROOT_PATH_COST0             0x00
-#define SK_RLMT_SPT_ROOT_PATH_COST1             0x00
-#define SK_RLMT_SPT_ROOT_PATH_COST2             0x00
-#define SK_RLMT_SPT_ROOT_PATH_COST3             0x00
-#define SK_RLMT_SPT_BRIDGE_ID0                  0xFF    /* Lowest possible priority. */
-#define SK_RLMT_SPT_BRIDGE_ID1                  0xFF    /* Lowest possible priority. */
-
-/* Remaining 6 bytes will be the current port address. */
-#define SK_RLMT_SPT_PORT_ID0                    0xFF    /* Lowest possible priority. */
-#define SK_RLMT_SPT_PORT_ID1                    0xFF    /* Lowest possible priority. */
-#define SK_RLMT_SPT_MSG_AGE0                    0x00
-#define SK_RLMT_SPT_MSG_AGE1                    0x00
-#define SK_RLMT_SPT_MAX_AGE0                    0x00
-#define SK_RLMT_SPT_MAX_AGE1                    0xFF
-#define SK_RLMT_SPT_HELLO_TIME0                 0x00
-#define SK_RLMT_SPT_HELLO_TIME1                 0xFF
-#define SK_RLMT_SPT_FWD_DELAY0                  0x00
-#define SK_RLMT_SPT_FWD_DELAY1                  0x40
-
-/* Size defines. */
-#define SK_RLMT_MIN_PACKET_SIZE                 34
-#define SK_RLMT_MAX_PACKET_SIZE                 (SK_RLMT_MAX_TX_BUF_SIZE)
-#define SK_PACKET_DATA_LEN                              (SK_RLMT_MAX_PACKET_SIZE - \
-                                                                                SK_RLMT_MIN_PACKET_SIZE)
-
-/* ----- RLMT packet types ----- */
-#define SK_PACKET_ANNOUNCE                              1       /* Port announcement. */
-#define SK_PACKET_ALIVE                                 2       /* Alive packet to port. */
-#define SK_PACKET_ADDR_CHANGED                  3       /* Port address changed. */
-#define SK_PACKET_CHECK_TX                              4       /* Check your tx line. */
-
-#ifdef SK_LITTLE_ENDIAN
-#define SK_U16_TO_NETWORK_ORDER(Val,Addr) { \
-        SK_U8   *_Addr = (SK_U8*)(Addr); \
-        SK_U16  _Val = (SK_U16)(Val); \
-        *_Addr++ = (SK_U8)(_Val >> 8); \
-        *_Addr = (SK_U8)(_Val & 0xFF); \
-}
-#endif  /* SK_LITTLE_ENDIAN */
-
-#ifdef SK_BIG_ENDIAN
-#define SK_U16_TO_NETWORK_ORDER(Val,Addr) (*(SK_U16*)(Addr) = (SK_U16)(Val))
-#endif  /* SK_BIG_ENDIAN */
-
-#define AUTONEG_FAILED  SK_FALSE
-#define AUTONEG_SUCCESS SK_TRUE
-
-
-/* typedefs *******************************************************************/
-
-/* RLMT packet.  Length: SK_RLMT_MAX_PACKET_SIZE (60) bytes. */
-typedef struct s_RlmtPacket {
-        SK_U8   DstAddr[SK_MAC_ADDR_LEN];
-        SK_U8   SrcAddr[SK_MAC_ADDR_LEN];
-        SK_U8   TypeLen[2];
-        SK_U8   DSap;
-        SK_U8   SSap;
-        SK_U8   Ctrl;
-        SK_U8   Indicator[7];
-        SK_U8   RlmtPacketType[2];
-        SK_U8   Align1[2];
-        SK_U8   Random[4];                              /* Random value of requesting(!) station. */
-        SK_U8   RlmtPacketVersion[2];   /* RLMT Packet version. */
-        SK_U8   Data[SK_PACKET_DATA_LEN];
-} SK_RLMT_PACKET;
-
-typedef struct s_SpTreeRlmtPacket {
-        SK_U8   DstAddr[SK_MAC_ADDR_LEN];
-        SK_U8   SrcAddr[SK_MAC_ADDR_LEN];
-        SK_U8   TypeLen[2];
-        SK_U8   DSap;
-        SK_U8   SSap;
-        SK_U8   Ctrl;
-        SK_U8   ProtocolId[2];
-        SK_U8   ProtocolVersionId;
-        SK_U8   BpduType;
-        SK_U8   Flags;
-        SK_U8   RootId[8];
-        SK_U8   RootPathCost[4];
-        SK_U8   BridgeId[8];
-        SK_U8   PortId[2];
-        SK_U8   MessageAge[2];
-        SK_U8   MaxAge[2];
-        SK_U8   HelloTime[2];
-        SK_U8   ForwardDelay[2];
-} SK_SPTREE_PACKET;
-
-/* global variables ***********************************************************/
-
-SK_MAC_ADDR     SkRlmtMcAddr =  {{0x01,  0x00,  0x5A,  0x52,  0x4C,  0x4D}};
-SK_MAC_ADDR     BridgeMcAddr =  {{0x01,  0x80,  0xC2,  0x00,  0x00,  0x00}};
-
-/* local variables ************************************************************/
-
-/* None. */
-
-/* functions ******************************************************************/
-
-RLMT_STATIC void        SkRlmtCheckSwitch(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        SK_U32  NetIdx);
-RLMT_STATIC void        SkRlmtCheckSeg(
-        SK_AC   *pAC,
-        SK_IOC  IoC,
-        SK_U32  NetIdx);
-RLMT_STATIC void        SkRlmtEvtSetNets(
-        SK_AC           *pAC,
-        SK_IOC          IoC,
-        SK_EVPARA       Para);
-
-/******************************************************************************
- *
- *      SkRlmtInit - initialize data, set state to init
- *
- * Description:
- *
- *      SK_INIT_DATA
- *      ============
- *
- *      This routine initializes all RLMT-related variables to a known state.
- *      The initial state is SK_RLMT_RS_INIT.
- *      All ports are initialized to SK_RLMT_PS_INIT.
- *
- *
- *      SK_INIT_IO
- *      ==========
- *
- *      Nothing.
- *
- *
- *      SK_INIT_RUN
- *      ===========
- *
- *      Determine the adapter's random value.
- *      Set the hw registers, the "logical MAC address", the
- *      RLMT multicast address, and eventually the BPDU multicast address.
- *
- * Context:
- *      init, pageable
- *
- * Returns:
- *      Nothing.
- */
-void    SkRlmtInit(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC,    /* I/O Context */
-int             Level)  /* Initialization Level */
-{
-        SK_U32          i, j;
-        SK_U64          Random;
-        SK_EVPARA       Para;
-    SK_MAC_ADDR         VirtualMacAddress;
-    SK_MAC_ADDR         PhysicalAMacAddress;
-    SK_BOOL             VirtualMacAddressSet;
-    SK_BOOL             PhysicalAMacAddressSet;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_INIT,
-                ("RLMT Init level %d.\n", Level))
-
-        switch (Level) {
-        case SK_INIT_DATA:      /* Initialize data structures. */
-                SK_MEMSET((char *)&pAC->Rlmt, 0, sizeof(SK_RLMT));
-
-                for (i = 0; i < SK_MAX_MACS; i++) {
-                        pAC->Rlmt.Port[i].PortState = SK_RLMT_PS_INIT;
-                        pAC->Rlmt.Port[i].LinkDown = SK_TRUE;
-                        pAC->Rlmt.Port[i].PortDown = SK_TRUE;
-                        pAC->Rlmt.Port[i].PortStarted = SK_FALSE;
-                        pAC->Rlmt.Port[i].PortNoRx = SK_FALSE;
-                        pAC->Rlmt.Port[i].RootIdSet = SK_FALSE;
-                        pAC->Rlmt.Port[i].PortNumber = i;
-                        pAC->Rlmt.Port[i].Net = &pAC->Rlmt.Net[0];
-                        pAC->Rlmt.Port[i].AddrPort = &pAC->Addr.Port[i];
-                }
-
-                pAC->Rlmt.NumNets = 1;
-                for (i = 0; i < SK_MAX_NETS; i++) {
-                        pAC->Rlmt.Net[i].RlmtState = SK_RLMT_RS_INIT;
-                        pAC->Rlmt.Net[i].RootIdSet = SK_FALSE;
-                        pAC->Rlmt.Net[i].PrefPort = SK_RLMT_DEF_PREF_PORT;
-                        pAC->Rlmt.Net[i].Preference = 0xFFFFFFFF;         /* Automatic. */
-                        /* Just assuming. */
-                        pAC->Rlmt.Net[i].ActivePort = pAC->Rlmt.Net[i].PrefPort;
-                        pAC->Rlmt.Net[i].RlmtMode = SK_RLMT_DEF_MODE;
-                        pAC->Rlmt.Net[i].TimeoutValue = SK_RLMT_DEF_TO_VAL;
-                        pAC->Rlmt.Net[i].NetNumber = i;
-                }
-
-                pAC->Rlmt.Net[0].Port[0] = &pAC->Rlmt.Port[0];
-                pAC->Rlmt.Net[0].Port[1] = &pAC->Rlmt.Port[1];
-#if SK_MAX_NETS > 1
-                pAC->Rlmt.Net[1].Port[0] = &pAC->Rlmt.Port[1];
-#endif  /* SK_MAX_NETS > 1 */
-                break;
-
-        case SK_INIT_IO:        /* GIMacsFound first available here. */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_INIT,
-                        ("RLMT: %d MACs were detected.\n", pAC->GIni.GIMacsFound))
-
-                pAC->Rlmt.Net[0].NumPorts = pAC->GIni.GIMacsFound;
-
-                /* Initialize HW registers? */
-                if (pAC->GIni.GIMacsFound == 1) {
-                        Para.Para32[0] = SK_RLMT_MODE_CLS;
-                        Para.Para32[1] = 0;
-                        (void)SkRlmtEvent(pAC, IoC, SK_RLMT_MODE_CHANGE, Para);
-                }
-                break;
-
-        case SK_INIT_RUN:
-                /* Ensure RLMT is set to one net. */
-                if (pAC->Rlmt.NumNets > 1) {
-                        Para.Para32[0] = 1;
-                        Para.Para32[1] = -1;
-                        SkRlmtEvtSetNets(pAC, IoC, Para);
-                }
-
-                for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                        Random = SkOsGetTime(pAC);
-                        *(SK_U32*)&pAC->Rlmt.Port[i].Random = *(SK_U32*)&Random;
-
-                        for (j = 0; j < 4; j++) {
-                                pAC->Rlmt.Port[i].Random[j] ^= pAC->Rlmt.Port[i].AddrPort->
-                                        CurrentMacAddress.a[SK_MAC_ADDR_LEN - 1 - j];
-                        }
-
-                        (void)SkAddrMcClear(pAC, IoC, i, SK_ADDR_PERMANENT | SK_MC_SW_ONLY);
-                        
-                        /* Add RLMT MC address. */
-                        (void)SkAddrMcAdd(pAC, IoC, i, &SkRlmtMcAddr, SK_ADDR_PERMANENT);
-
-                        if (pAC->Rlmt.Net[0].RlmtMode & SK_RLMT_CHECK_SEG) {
-                                /* Add BPDU MC address. */
-                                (void)SkAddrMcAdd(pAC, IoC, i, &BridgeMcAddr, SK_ADDR_PERMANENT);
-                        }
-
-                        (void)SkAddrMcUpdate(pAC, IoC, i);
-                }
-
-        VirtualMacAddressSet = SK_FALSE;
-                /* Read virtual MAC address from Control Register File. */
-                for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
-                        
-            SK_IN8(IoC, B2_MAC_1 + j, &VirtualMacAddress.a[j]);
-            VirtualMacAddressSet |= VirtualMacAddress.a[j];
-                }
-        
-        PhysicalAMacAddressSet = SK_FALSE;
-                /* Read physical MAC address for MAC A from Control Register File. */
-                for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
-                        
-            SK_IN8(IoC, B2_MAC_2 + j, &PhysicalAMacAddress.a[j]);
-            PhysicalAMacAddressSet |= PhysicalAMacAddress.a[j];
-                }
-
-        /* check if the two mac addresses contain reasonable values */
-        if (!VirtualMacAddressSet || !PhysicalAMacAddressSet) {
-
-            pAC->Rlmt.RlmtOff = SK_TRUE;
-        }
-
-        /* if the two mac addresses are equal switch off the RLMT_PRE_LOOKAHEAD
-           and the RLMT_LOOKAHEAD macros */
-        else if (SK_ADDR_EQUAL(PhysicalAMacAddress.a, VirtualMacAddress.a)) {
-
-            pAC->Rlmt.RlmtOff = SK_TRUE;
-        }
-                else {
-                        pAC->Rlmt.RlmtOff = SK_FALSE;
-                }
-                break;
-
-        default:        /* error */
-                break;
-        }
-        return;
-}       /* SkRlmtInit */
-
-
-/******************************************************************************
- *
- *      SkRlmtBuildCheckChain - build the check chain
- *
- * Description:
- *      This routine builds the local check chain:
- *      - Each port that is up checks the next port.
- *      - The last port that is up checks the first port that is up.
- *
- * Notes:
- *      - Currently only local ports are considered when building the chain.
- *      - Currently the SuspectState is just reset;
- *        it would be better to save it ...
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtBuildCheckChain(
-SK_AC   *pAC,   /* Adapter Context */
-SK_U32  NetIdx) /* Net Number */
-{
-        SK_U32                  i;
-        SK_U32                  NumMacsUp;
-        SK_RLMT_PORT *  FirstMacUp;
-        SK_RLMT_PORT *  PrevMacUp;
-
-        FirstMacUp      = NULL;
-        PrevMacUp       = NULL;
-        
-        if (!(pAC->Rlmt.Net[NetIdx].RlmtMode & SK_RLMT_CHECK_LOC_LINK)) {
-                for (i = 0; i < pAC->Rlmt.Net[i].NumPorts; i++) {
-                        pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked = 0;
-                }
-                return; /* Done. */
-        }
-                        
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SkRlmtBuildCheckChain.\n"))
-
-        NumMacsUp = 0;
-
-        for (i = 0; i < pAC->Rlmt.Net[NetIdx].NumPorts; i++) {
-                pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked = 0;
-                pAC->Rlmt.Net[NetIdx].Port[i]->PortsSuspect = 0;
-                pAC->Rlmt.Net[NetIdx].Port[i]->CheckingState &=
-                        ~(SK_RLMT_PCS_RX | SK_RLMT_PCS_TX);
-
-                /*
-                 * If more than two links are detected we should consider
-                 * checking at least two other ports:
-                 * 1. the next port that is not LinkDown and
-                 * 2. the next port that is not PortDown.
-                 */
-                if (!pAC->Rlmt.Net[NetIdx].Port[i]->LinkDown) {
-                        if (NumMacsUp == 0) {
-                                FirstMacUp = pAC->Rlmt.Net[NetIdx].Port[i];
-                        }
-                        else {
-                                PrevMacUp->PortCheck[
-                                        pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked].CheckAddr =
-                                        pAC->Rlmt.Net[NetIdx].Port[i]->AddrPort->CurrentMacAddress;
-                                PrevMacUp->PortCheck[
-                                        PrevMacUp->PortsChecked].SuspectTx = SK_FALSE;
-                                PrevMacUp->PortsChecked++;
-                        }
-                        PrevMacUp = pAC->Rlmt.Net[NetIdx].Port[i];
-                        NumMacsUp++;
-                }
-        }
-
-        if (NumMacsUp > 1) {
-                PrevMacUp->PortCheck[PrevMacUp->PortsChecked].CheckAddr =
-                        FirstMacUp->AddrPort->CurrentMacAddress;
-                PrevMacUp->PortCheck[PrevMacUp->PortsChecked].SuspectTx =
-                        SK_FALSE;
-                PrevMacUp->PortsChecked++;
-        }
-
-#ifdef DEBUG
-        for (i = 0; i < pAC->Rlmt.Net[NetIdx].NumPorts; i++) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Port %d checks %d other ports: %2X.\n", i,
-                                pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked,
-                                pAC->Rlmt.Net[NetIdx].Port[i]->PortCheck[0].CheckAddr.a[5]))
-        }
-#endif  /* DEBUG */
-
-        return;
-}       /* SkRlmtBuildCheckChain */
-
-
-/******************************************************************************
- *
- *      SkRlmtBuildPacket - build an RLMT packet
- *
- * Description:
- *      This routine sets up an RLMT packet.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      NULL or pointer to RLMT mbuf
- */
-RLMT_STATIC SK_MBUF     *SkRlmtBuildPacket(
-SK_AC           *pAC,           /* Adapter Context */
-SK_IOC          IoC,            /* I/O Context */
-SK_U32          PortNumber,     /* Sending port */
-SK_U16          PacketType,     /* RLMT packet type */
-SK_MAC_ADDR     *SrcAddr,       /* Source address */
-SK_MAC_ADDR     *DestAddr)      /* Destination address */
-{
-        int             i;
-        SK_U16          Length;
-        SK_MBUF         *pMb;
-        SK_RLMT_PACKET  *pPacket;
-
-#ifdef DEBUG
-        SK_U8   CheckSrc  = 0;
-        SK_U8   CheckDest = 0;
-        
-        for (i = 0; i < SK_MAC_ADDR_LEN; ++i) {
-                CheckSrc  |= SrcAddr->a[i];
-                CheckDest |= DestAddr->a[i];
-        }
-
-        if ((CheckSrc == 0) || (CheckDest == 0)) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_ERR,
-                        ("SkRlmtBuildPacket: Invalid %s%saddr.\n",
-                         (CheckSrc == 0 ? "Src" : ""), (CheckDest == 0 ? "Dest" : "")))
-        }
-#endif
-
-        if ((pMb = SkDrvAllocRlmtMbuf(pAC, IoC, SK_RLMT_MAX_PACKET_SIZE)) != NULL) {
-                pPacket = (SK_RLMT_PACKET*)pMb->pData;
-                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
-                        pPacket->DstAddr[i] = DestAddr->a[i];
-                        pPacket->SrcAddr[i] = SrcAddr->a[i];
-                }
-                pPacket->DSap = SK_RLMT_DSAP;
-                pPacket->SSap = SK_RLMT_SSAP;
-                pPacket->Ctrl = SK_RLMT_CTRL;
-                pPacket->Indicator[0] = SK_RLMT_INDICATOR0;
-                pPacket->Indicator[1] = SK_RLMT_INDICATOR1;
-                pPacket->Indicator[2] = SK_RLMT_INDICATOR2;
-                pPacket->Indicator[3] = SK_RLMT_INDICATOR3;
-                pPacket->Indicator[4] = SK_RLMT_INDICATOR4;
-                pPacket->Indicator[5] = SK_RLMT_INDICATOR5;
-                pPacket->Indicator[6] = SK_RLMT_INDICATOR6;
-
-                SK_U16_TO_NETWORK_ORDER(PacketType, &pPacket->RlmtPacketType[0]);
-
-                for (i = 0; i < 4; i++) {
-                        pPacket->Random[i] = pAC->Rlmt.Port[PortNumber].Random[i];
-                }
-                
-                SK_U16_TO_NETWORK_ORDER(
-                        SK_RLMT_PACKET_VERSION, &pPacket->RlmtPacketVersion[0]);
-
-                for (i = 0; i < SK_PACKET_DATA_LEN; i++) {
-                        pPacket->Data[i] = 0x00;
-                }
-
-                Length = SK_RLMT_MAX_PACKET_SIZE;       /* Or smaller. */
-                pMb->Length = Length;
-                pMb->PortIdx = PortNumber;
-                Length -= 14;
-                SK_U16_TO_NETWORK_ORDER(Length, &pPacket->TypeLen[0]);
-
-                if (PacketType == SK_PACKET_ALIVE) {
-                        pAC->Rlmt.Port[PortNumber].TxHelloCts++;
-                }
-        }
-
-        return (pMb);
-}       /* SkRlmtBuildPacket */
-
-
-/******************************************************************************
- *
- *      SkRlmtBuildSpanningTreePacket - build spanning tree check packet
- *
- * Description:
- *      This routine sets up a BPDU packet for spanning tree check.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      NULL or pointer to RLMT mbuf
- */
-RLMT_STATIC SK_MBUF     *SkRlmtBuildSpanningTreePacket(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-SK_U32  PortNumber)     /* Sending port */
-{
-        unsigned                        i;
-        SK_U16                          Length;
-        SK_MBUF                         *pMb;
-        SK_SPTREE_PACKET        *pSPacket;
-
-        if ((pMb = SkDrvAllocRlmtMbuf(pAC, IoC, SK_RLMT_MAX_PACKET_SIZE)) !=
-                NULL) {
-                pSPacket = (SK_SPTREE_PACKET*)pMb->pData;
-                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
-                        pSPacket->DstAddr[i] = BridgeMcAddr.a[i];
-                        pSPacket->SrcAddr[i] =
-                                pAC->Addr.Port[PortNumber].CurrentMacAddress.a[i];
-                }
-                pSPacket->DSap = SK_RLMT_SPT_DSAP;
-                pSPacket->SSap = SK_RLMT_SPT_SSAP;
-                pSPacket->Ctrl = SK_RLMT_SPT_CTRL;
-
-                pSPacket->ProtocolId[0] = SK_RLMT_SPT_PROTOCOL_ID0;
-                pSPacket->ProtocolId[1] = SK_RLMT_SPT_PROTOCOL_ID1;
-                pSPacket->ProtocolVersionId = SK_RLMT_SPT_PROTOCOL_VERSION_ID;
-                pSPacket->BpduType = SK_RLMT_SPT_BPDU_TYPE;
-                pSPacket->Flags = SK_RLMT_SPT_FLAGS;
-                pSPacket->RootId[0] = SK_RLMT_SPT_ROOT_ID0;
-                pSPacket->RootId[1] = SK_RLMT_SPT_ROOT_ID1;
-                pSPacket->RootPathCost[0] = SK_RLMT_SPT_ROOT_PATH_COST0;
-                pSPacket->RootPathCost[1] = SK_RLMT_SPT_ROOT_PATH_COST1;
-                pSPacket->RootPathCost[2] = SK_RLMT_SPT_ROOT_PATH_COST2;
-                pSPacket->RootPathCost[3] = SK_RLMT_SPT_ROOT_PATH_COST3;
-                pSPacket->BridgeId[0] = SK_RLMT_SPT_BRIDGE_ID0;
-                pSPacket->BridgeId[1] = SK_RLMT_SPT_BRIDGE_ID1;
-
-                /*
-                 * Use logical MAC address as bridge ID and filter these packets
-                 * on receive.
-                 */
-                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
-                        pSPacket->BridgeId[i + 2] = pSPacket->RootId[i + 2] =
-                                pAC->Addr.Net[pAC->Rlmt.Port[PortNumber].Net->NetNumber].
-                                        CurrentMacAddress.a[i];
-                }
-                pSPacket->PortId[0] = SK_RLMT_SPT_PORT_ID0;
-                pSPacket->PortId[1] = SK_RLMT_SPT_PORT_ID1;
-                pSPacket->MessageAge[0] = SK_RLMT_SPT_MSG_AGE0;
-                pSPacket->MessageAge[1] = SK_RLMT_SPT_MSG_AGE1;
-                pSPacket->MaxAge[0] = SK_RLMT_SPT_MAX_AGE0;
-                pSPacket->MaxAge[1] = SK_RLMT_SPT_MAX_AGE1;
-                pSPacket->HelloTime[0] = SK_RLMT_SPT_HELLO_TIME0;
-                pSPacket->HelloTime[1] = SK_RLMT_SPT_HELLO_TIME1;
-                pSPacket->ForwardDelay[0] = SK_RLMT_SPT_FWD_DELAY0;
-                pSPacket->ForwardDelay[1] = SK_RLMT_SPT_FWD_DELAY1;
-
-                Length = SK_RLMT_MAX_PACKET_SIZE;       /* Or smaller. */
-                pMb->Length = Length;
-                pMb->PortIdx = PortNumber;
-                Length -= 14;
-                SK_U16_TO_NETWORK_ORDER(Length, &pSPacket->TypeLen[0]);
-
-                pAC->Rlmt.Port[PortNumber].TxSpHelloReqCts++;
-        }
-
-        return (pMb);
-}       /* SkRlmtBuildSpanningTreePacket */
-
-
-/******************************************************************************
- *
- *      SkRlmtSend - build and send check packets
- *
- * Description:
- *      Depending on the RLMT state and the checking state, several packets
- *      are sent through the indicated port.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      Nothing.
- */
-RLMT_STATIC void        SkRlmtSend(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-SK_U32  PortNumber)     /* Sending port */
-{
-        unsigned        j;
-        SK_EVPARA       Para;
-        SK_RLMT_PORT    *pRPort;
-
-        pRPort = &pAC->Rlmt.Port[PortNumber];
-        if (pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_LOC_LINK) {
-                if (pRPort->CheckingState & (SK_RLMT_PCS_TX | SK_RLMT_PCS_RX)) {
-                        /* Port is suspicious. Send the RLMT packet to the RLMT mc addr. */
-                        if ((Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, PortNumber,
-                                SK_PACKET_ALIVE, &pAC->Addr.Port[PortNumber].CurrentMacAddress,
-                                &SkRlmtMcAddr)) != NULL) {
-                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                        }
-                }
-                else {
-                        /*
-                         * Send a directed RLMT packet to all ports that are
-                         * checked by the indicated port.
-                         */
-                        for (j = 0; j < pRPort->PortsChecked; j++) {
-                                if ((Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, PortNumber,
-                                        SK_PACKET_ALIVE, &pAC->Addr.Port[PortNumber].CurrentMacAddress,
-                                        &pRPort->PortCheck[j].CheckAddr)) != NULL) {
-                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                                }
-                        }
-                }
-        }
-
-        if ((pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_SEG) &&
-                (pAC->Rlmt.Port[PortNumber].Net->CheckingState & SK_RLMT_RCS_SEND_SEG)) {
-                /*
-                 * Send a BPDU packet to make a connected switch tell us
-                 * the correct root bridge.
-                 */
-                if ((Para.pParaPtr =
-                        SkRlmtBuildSpanningTreePacket(pAC, IoC, PortNumber)) != NULL) {
-                        pAC->Rlmt.Port[PortNumber].Net->CheckingState &= ~SK_RLMT_RCS_SEND_SEG;
-                        pRPort->RootIdSet = SK_FALSE;
-
-                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_TX,
-                                ("SkRlmtSend: BPDU Packet on Port %u.\n", PortNumber))
-                }
-        }
-        return;
-}       /* SkRlmtSend */
-
-
-/******************************************************************************
- *
- *      SkRlmtPortReceives - check if port is (going) down and bring it up
- *
- * Description:
- *      This routine checks if a port who received a non-BPDU packet
- *      needs to go up or needs to be stopped going down.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      Nothing.
- */
-RLMT_STATIC void        SkRlmtPortReceives(
-SK_AC   *pAC,                   /* Adapter Context */
-SK_IOC  IoC,                    /* I/O Context */
-SK_U32  PortNumber)             /* Port to check */
-{
-        SK_RLMT_PORT    *pRPort;
-        SK_EVPARA               Para;
-
-        pRPort = &pAC->Rlmt.Port[PortNumber];
-        pRPort->PortNoRx = SK_FALSE;
-
-        if ((pRPort->PortState == SK_RLMT_PS_DOWN) &&
-                !(pRPort->CheckingState & SK_RLMT_PCS_TX)) {
-                /*
-                 * Port is marked down (rx), but received a non-BPDU packet.
-                 * Bring it up.
-                 */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                        ("SkRlmtPacketReceive: Received on PortDown.\n"))
-
-                pRPort->PortState = SK_RLMT_PS_GOING_UP;
-                pRPort->GuTimeStamp = SkOsGetTime(pAC);
-                Para.Para32[0] = PortNumber;
-                Para.Para32[1] = (SK_U32)-1;
-                SkTimerStart(pAC, IoC, &pRPort->UpTimer, SK_RLMT_PORTUP_TIM_VAL,
-                        SKGE_RLMT, SK_RLMT_PORTUP_TIM, Para);
-                pRPort->CheckingState &= ~SK_RLMT_PCS_RX;
-                /* pAC->Rlmt.CheckSwitch = SK_TRUE; */
-                SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
-        }       /* PortDown && !SuspectTx */
-        else if (pRPort->CheckingState & SK_RLMT_PCS_RX) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                        ("SkRlmtPacketReceive: Stop bringing port down.\n"))
-                SkTimerStop(pAC, IoC, &pRPort->DownRxTimer);
-                pRPort->CheckingState &= ~SK_RLMT_PCS_RX;
-                /* pAC->Rlmt.CheckSwitch = SK_TRUE; */
-                SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
-        }       /* PortGoingDown */
-
-        return;
-}       /* SkRlmtPortReceives */
-
-
-/******************************************************************************
- *
- *      SkRlmtPacketReceive - receive a packet for closer examination
- *
- * Description:
- *      This routine examines a packet more closely than SK_RLMT_LOOKAHEAD.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      Nothing.
- */
-RLMT_STATIC void        SkRlmtPacketReceive(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC,    /* I/O Context */
-SK_MBUF *pMb)   /* Received packet */
-{
-#ifdef xDEBUG
-        extern  void DumpData(char *p, int size);
-#endif  /* DEBUG */
-        int                                     i;
-        unsigned                        j;
-        SK_U16                          PacketType;
-        SK_U32                          PortNumber;
-        SK_ADDR_PORT            *pAPort;
-        SK_RLMT_PORT            *pRPort;
-        SK_RLMT_PACKET          *pRPacket;
-        SK_SPTREE_PACKET        *pSPacket;
-        SK_EVPARA                       Para;
-
-        PortNumber      = pMb->PortIdx;
-        pAPort = &pAC->Addr.Port[PortNumber];
-        pRPort = &pAC->Rlmt.Port[PortNumber];
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                ("SkRlmtPacketReceive: PortNumber == %d.\n", PortNumber))
-
-        pRPacket = (SK_RLMT_PACKET*)pMb->pData;
-        pSPacket = (SK_SPTREE_PACKET*)pRPacket;
-
-#ifdef xDEBUG
-        DumpData((char *)pRPacket, 32);
-#endif  /* DEBUG */
-
-        if ((pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot) != 0) {
-                SkRlmtPortReceives(pAC, IoC, PortNumber);
-        }
-        
-        /* Check destination address. */
-
-        if (!SK_ADDR_EQUAL(pAPort->CurrentMacAddress.a, pRPacket->DstAddr) &&
-                !SK_ADDR_EQUAL(SkRlmtMcAddr.a, pRPacket->DstAddr) &&
-                !SK_ADDR_EQUAL(BridgeMcAddr.a, pRPacket->DstAddr)) {
-
-                /* Not sent to current MAC or registered MC address => Trash it. */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                        ("SkRlmtPacketReceive: Not for me.\n"))
-
-                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                return;
-        }
-        else if (SK_ADDR_EQUAL(pAPort->CurrentMacAddress.a, pRPacket->SrcAddr)) {
-
-                /*
-                 * Was sent by same port (may happen during port switching
-                 * or in case of duplicate MAC addresses).
-                 */
-
-                /*
-                 * Check for duplicate address here:
-                 * If Packet.Random != My.Random => DupAddr.
-                 */
-                for (i = 3; i >= 0; i--) {
-                        if (pRPort->Random[i] != pRPacket->Random[i]) {
-                                break;
-                        }
-                }
-
-                /*
-                 * CAUTION: Do not check for duplicate MAC address in RLMT Alive Reply
-                 * packets (they have the LLC_COMMAND_RESPONSE_BIT set in
-                 * pRPacket->SSap).
-                 */
-                if (i >= 0 && pRPacket->DSap == SK_RLMT_DSAP &&
-                        pRPacket->Ctrl == SK_RLMT_CTRL &&
-                        pRPacket->SSap == SK_RLMT_SSAP &&
-                        pRPacket->Indicator[0] == SK_RLMT_INDICATOR0 &&
-                        pRPacket->Indicator[1] == SK_RLMT_INDICATOR1 &&
-                        pRPacket->Indicator[2] == SK_RLMT_INDICATOR2 &&
-                        pRPacket->Indicator[3] == SK_RLMT_INDICATOR3 &&
-                        pRPacket->Indicator[4] == SK_RLMT_INDICATOR4 &&
-                        pRPacket->Indicator[5] == SK_RLMT_INDICATOR5 &&
-                        pRPacket->Indicator[6] == SK_RLMT_INDICATOR6) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                ("SkRlmtPacketReceive: Duplicate MAC Address.\n"))
-
-                        /* Error Log entry. */
-                        SK_ERR_LOG(pAC, SK_ERRCL_COMM, SKERR_RLMT_E006, SKERR_RLMT_E006_MSG);
-                }
-                else {
-                        /* Simply trash it. */
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                ("SkRlmtPacketReceive: Sent by me.\n"))
-                }
-
-                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                return;
-        }
-
-        /* Check SuspectTx entries. */
-        if (pRPort->PortsSuspect > 0) {
-                for (j = 0; j < pRPort->PortsChecked; j++) {
-                        if (pRPort->PortCheck[j].SuspectTx &&
-                                SK_ADDR_EQUAL(
-                                        pRPacket->SrcAddr, pRPort->PortCheck[j].CheckAddr.a)) {
-                                pRPort->PortCheck[j].SuspectTx = SK_FALSE;
-                                pRPort->PortsSuspect--;
-                                break;
-                        }
-                }
-        }
-
-        /* Determine type of packet. */
-        if (pRPacket->DSap == SK_RLMT_DSAP &&
-                pRPacket->Ctrl == SK_RLMT_CTRL &&
-                (pRPacket->SSap & ~LLC_COMMAND_RESPONSE_BIT) == SK_RLMT_SSAP &&
-                pRPacket->Indicator[0] == SK_RLMT_INDICATOR0 &&
-                pRPacket->Indicator[1] == SK_RLMT_INDICATOR1 &&
-                pRPacket->Indicator[2] == SK_RLMT_INDICATOR2 &&
-                pRPacket->Indicator[3] == SK_RLMT_INDICATOR3 &&
-                pRPacket->Indicator[4] == SK_RLMT_INDICATOR4 &&
-                pRPacket->Indicator[5] == SK_RLMT_INDICATOR5 &&
-                pRPacket->Indicator[6] == SK_RLMT_INDICATOR6) {
-
-                /* It's an RLMT packet. */
-                PacketType = (SK_U16)((pRPacket->RlmtPacketType[0] << 8) |
-                        pRPacket->RlmtPacketType[1]);
-
-                switch (PacketType) {
-                case SK_PACKET_ANNOUNCE:        /* Not yet used. */
-#if 0
-                        /* Build the check chain. */
-                        SkRlmtBuildCheckChain(pAC);
-#endif  /* 0 */
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                ("SkRlmtPacketReceive: Announce.\n"))
-
-                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                        break;
-
-                case SK_PACKET_ALIVE:
-                        if (pRPacket->SSap & LLC_COMMAND_RESPONSE_BIT) {
-                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                        ("SkRlmtPacketReceive: Alive Reply.\n"))
-
-                                if (!(pAC->Addr.Port[PortNumber].PromMode & SK_PROM_MODE_LLC) ||
-                                        SK_ADDR_EQUAL(
-                                                pRPacket->DstAddr, pAPort->CurrentMacAddress.a)) {
-                                        /* Obviously we could send something. */
-                                        if (pRPort->CheckingState & SK_RLMT_PCS_TX) {
-                                                pRPort->CheckingState &=  ~SK_RLMT_PCS_TX;
-                                                SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
-                                        }
-
-                                        if ((pRPort->PortState == SK_RLMT_PS_DOWN) &&
-                                                !(pRPort->CheckingState & SK_RLMT_PCS_RX)) {
-                                                pRPort->PortState = SK_RLMT_PS_GOING_UP;
-                                                pRPort->GuTimeStamp = SkOsGetTime(pAC);
-
-                                                SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
-
-                                                Para.Para32[0] = PortNumber;
-                                                Para.Para32[1] = (SK_U32)-1;
-                                                SkTimerStart(pAC, IoC, &pRPort->UpTimer,
-                                                        SK_RLMT_PORTUP_TIM_VAL, SKGE_RLMT,
-                                                        SK_RLMT_PORTUP_TIM, Para);
-                                        }
-                                }
-
-                                /* Mark sending port as alive? */
-                                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                        }
-                        else {  /* Alive Request Packet. */
-                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                        ("SkRlmtPacketReceive: Alive Request.\n"))
-
-                                pRPort->RxHelloCts++;
-
-                                /* Answer. */
-                                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
-                                        pRPacket->DstAddr[i] = pRPacket->SrcAddr[i];
-                                        pRPacket->SrcAddr[i] =
-                                                pAC->Addr.Port[PortNumber].CurrentMacAddress.a[i];
-                                }
-                                pRPacket->SSap |= LLC_COMMAND_RESPONSE_BIT;
-
-                                Para.pParaPtr = pMb;
-                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                        }
-                        break;
-
-                case SK_PACKET_CHECK_TX:
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                ("SkRlmtPacketReceive: Check your tx line.\n"))
-
-                        /* A port checking us requests us to check our tx line. */
-                        pRPort->CheckingState |= SK_RLMT_PCS_TX;
-
-                        /* Start PortDownTx timer. */
-                        Para.Para32[0] = PortNumber;
-                        Para.Para32[1] = (SK_U32)-1;
-                        SkTimerStart(pAC, IoC, &pRPort->DownTxTimer,
-                                SK_RLMT_PORTDOWN_TIM_VAL, SKGE_RLMT,
-                                SK_RLMT_PORTDOWN_TX_TIM, Para);
-
-                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-
-                        if ((Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, PortNumber,
-                                SK_PACKET_ALIVE, &pAC->Addr.Port[PortNumber].CurrentMacAddress,
-                                &SkRlmtMcAddr)) != NULL) {
-                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                        }
-                        break;
-
-                case SK_PACKET_ADDR_CHANGED:
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                ("SkRlmtPacketReceive: Address Change.\n"))
-
-                        /* Build the check chain. */
-                        SkRlmtBuildCheckChain(pAC, pRPort->Net->NetNumber);
-                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                        break;
-
-                default:
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                                ("SkRlmtPacketReceive: Unknown RLMT packet.\n"))
-
-                        /* RA;:;: ??? */
-                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                }
-        }
-        else if (pSPacket->DSap == SK_RLMT_SPT_DSAP &&
-                pSPacket->Ctrl == SK_RLMT_SPT_CTRL &&
-                (pSPacket->SSap & ~LLC_COMMAND_RESPONSE_BIT) == SK_RLMT_SPT_SSAP) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                        ("SkRlmtPacketReceive: BPDU Packet.\n"))
-
-                /* Spanning Tree packet. */
-                pRPort->RxSpHelloCts++;
-
-                if (!SK_ADDR_EQUAL(&pSPacket->RootId[2], &pAC->Addr.Net[pAC->Rlmt.
-                        Port[PortNumber].Net->NetNumber].CurrentMacAddress.a[0])) {
-                        /*
-                         * Check segmentation if a new root bridge is set and
-                         * the segmentation check is not currently running.
-                         */
-                        if (!SK_ADDR_EQUAL(&pSPacket->RootId[2], &pRPort->Root.Id[2]) &&
-                                (pAC->Rlmt.Port[PortNumber].Net->LinksUp > 1) &&
-                                (pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_SEG)
-                                != 0 && (pAC->Rlmt.Port[PortNumber].Net->CheckingState &
-                                SK_RLMT_RCS_SEG) == 0) {
-                                pAC->Rlmt.Port[PortNumber].Net->CheckingState |=
-                                        SK_RLMT_RCS_START_SEG | SK_RLMT_RCS_SEND_SEG;
-                        }
-
-                        /* Store tree view of this port. */
-                        for (i = 0; i < 8; i++) {
-                                pRPort->Root.Id[i] = pSPacket->RootId[i];
-                        }
-                        pRPort->RootIdSet = SK_TRUE;
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_DUMP,
-                                ("Root ID %d: %02x %02x %02x %02x %02x %02x %02x %02x.\n",
-                                        PortNumber,
-                                        pRPort->Root.Id[0], pRPort->Root.Id[1],
-                                        pRPort->Root.Id[2], pRPort->Root.Id[3],
-                                        pRPort->Root.Id[4], pRPort->Root.Id[5],
-                                        pRPort->Root.Id[6], pRPort->Root.Id[7]))
-                }
-
-                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                if ((pAC->Rlmt.Port[PortNumber].Net->CheckingState &
-                        SK_RLMT_RCS_REPORT_SEG) != 0) {
-                        SkRlmtCheckSeg(pAC, IoC, pAC->Rlmt.Port[PortNumber].Net->NetNumber);
-                }
-        }
-        else {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-                        ("SkRlmtPacketReceive: Unknown Packet Type.\n"))
-
-                /* Unknown packet. */
-                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-        }
-        return;
-}       /* SkRlmtPacketReceive */
-
-
-/******************************************************************************
- *
- *      SkRlmtCheckPort - check if a port works
- *
- * Description:
- *      This routine checks if a port whose link is up received something
- *      and if it seems to transmit successfully.
- *
- *      # PortState: PsInit, PsLinkDown, PsDown, PsGoingUp, PsUp
- *      # PortCheckingState (Bitfield): ChkTx, ChkRx, ChkSeg
- *      # RlmtCheckingState (Bitfield): ChkSeg, StartChkSeg, ReportSeg
- *
- *      if (Rx - RxBpdu == 0) { # No rx.
- *              if (state == PsUp) {
- *                      PortCheckingState |= ChkRx
- *              }
- *              if (ModeCheckSeg && (Timeout ==
- *                      TO_SHORTEN(RLMT_DEFAULT_TIMEOUT))) {
- *                      RlmtCheckingState |= ChkSeg)
- *                      PortCheckingState |= ChkSeg
- *              }
- *              NewTimeout = TO_SHORTEN(Timeout)
- *              if (NewTimeout < RLMT_MIN_TIMEOUT) {
- *                      NewTimeout = RLMT_MIN_TIMEOUT
- *                      PortState = PsDown
- *                      ...
- *              }
- *      }
- *      else {  # something was received
- *              # Set counter to 0 at LinkDown?
- *              #   No - rx may be reported after LinkDown ???
- *              PortCheckingState &= ~ChkRx
- *              NewTimeout = RLMT_DEFAULT_TIMEOUT
- *              if (RxAck == 0) {
- *                      possible reasons:
- *                      is my tx line bad? --
- *                              send RLMT multicast and report
- *                              back internally? (only possible
- *                              between ports on same adapter)
- *              }
- *              if (RxChk == 0) {
- *                      possible reasons:
- *                      - tx line of port set to check me
- *                        maybe bad
- *                      - no other port/adapter available or set
- *                        to check me
- *                      - adapter checking me has a longer
- *                        timeout
- *                      ??? anything that can be done here?
- *              }
- *      }
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      New timeout value.
- */
-RLMT_STATIC SK_U32      SkRlmtCheckPort(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-SK_U32  PortNumber)     /* Port to check */
-{
-        unsigned                i;
-        SK_U32                  NewTimeout;
-        SK_RLMT_PORT    *pRPort;
-        SK_EVPARA               Para;
-
-        pRPort = &pAC->Rlmt.Port[PortNumber];
-
-        if ((pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot) == 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SkRlmtCheckPort %d: No (%d) receives in last time slot.\n",
-                                PortNumber, pRPort->PacketsPerTimeSlot))
-
-                /*
-                 * Check segmentation if there was no receive at least twice
-                 * in a row (PortNoRx is already set) and the segmentation
-                 * check is not currently running.
-                 */
-
-                if (pRPort->PortNoRx && (pAC->Rlmt.Port[PortNumber].Net->LinksUp > 1) &&
-                        (pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_SEG) &&
-                        !(pAC->Rlmt.Port[PortNumber].Net->CheckingState & SK_RLMT_RCS_SEG)) {
-                        pAC->Rlmt.Port[PortNumber].Net->CheckingState |=
-                                SK_RLMT_RCS_START_SEG | SK_RLMT_RCS_SEND_SEG;
-                }
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SkRlmtCheckPort: PortsSuspect %d, PcsRx %d.\n",
-                                pRPort->PortsSuspect, pRPort->CheckingState & SK_RLMT_PCS_RX))
-
-                if (pRPort->PortState != SK_RLMT_PS_DOWN) {
-                        NewTimeout = TO_SHORTEN(pAC->Rlmt.Port[PortNumber].Net->TimeoutValue);
-                        if (NewTimeout < SK_RLMT_MIN_TO_VAL) {
-                                NewTimeout = SK_RLMT_MIN_TO_VAL;
-                        }
-
-                        if (!(pRPort->CheckingState & SK_RLMT_PCS_RX)) {
-                                Para.Para32[0] = PortNumber;
-                                pRPort->CheckingState |= SK_RLMT_PCS_RX;
-
-                                /*
-                                 * What shall we do if the port checked by this one receives
-                                 * our request frames?  What's bad - our rx line or his tx line?
-                                 */
-                                Para.Para32[1] = (SK_U32)-1;
-                                SkTimerStart(pAC, IoC, &pRPort->DownRxTimer,
-                                        SK_RLMT_PORTDOWN_TIM_VAL, SKGE_RLMT,
-                                        SK_RLMT_PORTDOWN_RX_TIM, Para);
-
-                                for (i = 0; i < pRPort->PortsChecked; i++) {
-                                        if (pRPort->PortCheck[i].SuspectTx) {
-                                                continue;
-                                        }
-                                        pRPort->PortCheck[i].SuspectTx = SK_TRUE;
-                                        pRPort->PortsSuspect++;
-                                        if ((Para.pParaPtr =
-                                                SkRlmtBuildPacket(pAC, IoC, PortNumber, SK_PACKET_CHECK_TX,
-                                                        &pAC->Addr.Port[PortNumber].CurrentMacAddress,
-                                                        &pRPort->PortCheck[i].CheckAddr)) != NULL) {
-                                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                                        }
-                                }
-                        }
-                }
-                else {  /* PortDown -- or all partners suspect. */
-                        NewTimeout = SK_RLMT_DEF_TO_VAL;
-                }
-                pRPort->PortNoRx = SK_TRUE;
-        }
-        else {  /* A non-BPDU packet was received. */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SkRlmtCheckPort %d: %d (%d) receives in last time slot.\n",
-                                PortNumber,
-                                pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot,
-                                pRPort->PacketsPerTimeSlot))
-                
-                SkRlmtPortReceives(pAC, IoC, PortNumber);
-                if (pAC->Rlmt.CheckSwitch) {
-                        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
-                }
-
-                NewTimeout = SK_RLMT_DEF_TO_VAL;
-        }
-
-        return (NewTimeout);
-}       /* SkRlmtCheckPort */
-
-
-/******************************************************************************
- *
- *      SkRlmtSelectBcRx - select new active port, criteria 1 (CLP)
- *
- * Description:
- *      This routine selects the port that received a broadcast frame
- *      substantially later than all other ports.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      SK_BOOL
- */
-RLMT_STATIC SK_BOOL     SkRlmtSelectBcRx(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-SK_U32  Active,         /* Active port */
-SK_U32  PrefPort,       /* Preferred port */
-SK_U32  *pSelect)       /* New active port */
-{
-        SK_U64          BcTimeStamp;
-        SK_U32          i;
-        SK_BOOL         PortFound;
-
-        BcTimeStamp = 0;        /* Not totally necessary, but feeling better. */
-        PortFound = SK_FALSE;
-        
-        /* Select port with the latest TimeStamp. */
-        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("TimeStamp Port %d (Down: %d, NoRx: %d): %08x %08x.\n",
-                                i,
-                                pAC->Rlmt.Port[i].PortDown, pAC->Rlmt.Port[i].PortNoRx,
-                                *((SK_U32*)(&pAC->Rlmt.Port[i].BcTimeStamp) + OFFS_HI32),
-                                *((SK_U32*)(&pAC->Rlmt.Port[i].BcTimeStamp) + OFFS_LO32)))
-
-                if (!pAC->Rlmt.Port[i].PortDown && !pAC->Rlmt.Port[i].PortNoRx) {
-                        if (!PortFound || pAC->Rlmt.Port[i].BcTimeStamp > BcTimeStamp) {
-                                BcTimeStamp = pAC->Rlmt.Port[i].BcTimeStamp;
-                                *pSelect = i;
-                                PortFound = SK_TRUE;
-                        }
-                }
-        }
-
-        if (PortFound) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Port %d received the last broadcast.\n", *pSelect))
-
-                /* Look if another port's time stamp is similar. */
-                for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                        if (i == *pSelect) {
-                                continue;
-                        }
-                        if (!pAC->Rlmt.Port[i].PortDown && !pAC->Rlmt.Port[i].PortNoRx &&
-                                (pAC->Rlmt.Port[i].BcTimeStamp >
-                                 BcTimeStamp - SK_RLMT_BC_DELTA ||
-                                pAC->Rlmt.Port[i].BcTimeStamp +
-                                 SK_RLMT_BC_DELTA > BcTimeStamp)) {
-                                PortFound = SK_FALSE;
-                                
-                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                        ("Port %d received a broadcast at a similar time.\n", i))
-                                break;
-                        }
-                }
-        }
-
-#ifdef DEBUG
-        if (PortFound) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SELECT_BCRX found Port %d receiving the substantially "
-                         "latest broadcast (%u).\n",
-                                *pSelect,
-                                BcTimeStamp - pAC->Rlmt.Port[1 - *pSelect].BcTimeStamp))
-        }
-#endif  /* DEBUG */
-
-        return (PortFound);
-}       /* SkRlmtSelectBcRx */
-
-
-/******************************************************************************
- *
- *      SkRlmtSelectNotSuspect - select new active port, criteria 2 (CLP)
- *
- * Description:
- *      This routine selects a good port (it is PortUp && !SuspectRx).
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      SK_BOOL
- */
-RLMT_STATIC SK_BOOL     SkRlmtSelectNotSuspect(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-SK_U32  Active,         /* Active port */
-SK_U32  PrefPort,       /* Preferred port */
-SK_U32  *pSelect)       /* New active port */
-{
-        SK_U32          i;
-        SK_BOOL         PortFound;
-
-        PortFound = SK_FALSE;
-
-        /* Select first port that is PortUp && !SuspectRx. */
-        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                if (!pAC->Rlmt.Port[i].PortDown &&
-                        !(pAC->Rlmt.Port[i].CheckingState & SK_RLMT_PCS_RX)) {
-                        *pSelect = i;
-                        if (!pAC->Rlmt.Port[Active].PortDown &&
-                                !(pAC->Rlmt.Port[Active].CheckingState & SK_RLMT_PCS_RX)) {
-                                *pSelect = Active;
-                        }
-                        if (!pAC->Rlmt.Port[PrefPort].PortDown &&
-                                !(pAC->Rlmt.Port[PrefPort].CheckingState & SK_RLMT_PCS_RX)) {
-                                *pSelect = PrefPort;
-                        }
-                        PortFound = SK_TRUE;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                ("SK_RLMT_SELECT_NOTSUSPECT found Port %d up and not check RX.\n",
-                                        *pSelect))
-                        break;
-                }
-        }
-        return (PortFound);
-}       /* SkRlmtSelectNotSuspect */
-
-
-/******************************************************************************
- *
- *      SkRlmtSelectUp - select new active port, criteria 3, 4 (CLP)
- *
- * Description:
- *      This routine selects a port that is up.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      SK_BOOL
- */
-RLMT_STATIC SK_BOOL     SkRlmtSelectUp(
-SK_AC   *pAC,                   /* Adapter Context */
-SK_IOC  IoC,                    /* I/O Context */
-SK_U32  Active,                 /* Active port */
-SK_U32  PrefPort,               /* Preferred port */
-SK_U32  *pSelect,               /* New active port */
-SK_BOOL AutoNegDone)    /* Successfully auto-negotiated? */
-{
-        SK_U32          i;
-        SK_BOOL         PortFound;
-
-        PortFound = SK_FALSE;
-
-        /* Select first port that is PortUp. */
-        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_UP &&
-                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
-                        *pSelect = i;
-                        if (pAC->Rlmt.Port[Active].PortState == SK_RLMT_PS_UP &&
-                                pAC->GIni.GP[Active].PAutoNegFail != AutoNegDone) {
-                                *pSelect = Active;
-                        }
-                        if (pAC->Rlmt.Port[PrefPort].PortState == SK_RLMT_PS_UP &&
-                                pAC->GIni.GP[PrefPort].PAutoNegFail != AutoNegDone) {
-                                *pSelect = PrefPort;
-                        }
-                        PortFound = SK_TRUE;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                ("SK_RLMT_SELECT_UP found Port %d up.\n", *pSelect))
-                        break;
-                }
-        }
-        return (PortFound);
-}       /* SkRlmtSelectUp */
-
-
-/******************************************************************************
- *
- *      SkRlmtSelectGoingUp - select new active port, criteria 5, 6 (CLP)
- *
- * Description:
- *      This routine selects the port that is going up for the longest time.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      SK_BOOL
- */
-RLMT_STATIC SK_BOOL     SkRlmtSelectGoingUp(
-SK_AC   *pAC,                   /* Adapter Context */
-SK_IOC  IoC,                    /* I/O Context */
-SK_U32  Active,                 /* Active port */
-SK_U32  PrefPort,               /* Preferred port */
-SK_U32  *pSelect,               /* New active port */
-SK_BOOL AutoNegDone)    /* Successfully auto-negotiated? */
-{
-        SK_U64          GuTimeStamp;
-        SK_U32          i;
-        SK_BOOL         PortFound;
-
-        GuTimeStamp = 0;
-        PortFound = SK_FALSE;
-
-        /* Select port that is PortGoingUp for the longest time. */
-        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_GOING_UP &&
-                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
-                        GuTimeStamp = pAC->Rlmt.Port[i].GuTimeStamp;
-                        *pSelect = i;
-                        PortFound = SK_TRUE;
-                        break;
-                }
-        }
-
-        if (!PortFound) {
-                return (SK_FALSE);
-        }
-
-        for (i = *pSelect + 1; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_GOING_UP &&
-                        pAC->Rlmt.Port[i].GuTimeStamp < GuTimeStamp &&
-                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
-                        GuTimeStamp = pAC->Rlmt.Port[i].GuTimeStamp;
-                        *pSelect = i;
-                }
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_SELECT_GOINGUP found Port %d going up.\n", *pSelect))
-        return (SK_TRUE);
-}       /* SkRlmtSelectGoingUp */
-
-
-/******************************************************************************
- *
- *      SkRlmtSelectDown - select new active port, criteria 7, 8 (CLP)
- *
- * Description:
- *      This routine selects a port that is down.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      SK_BOOL
- */
-RLMT_STATIC SK_BOOL     SkRlmtSelectDown(
-SK_AC   *pAC,                   /* Adapter Context */
-SK_IOC  IoC,                    /* I/O Context */
-SK_U32  Active,                 /* Active port */
-SK_U32  PrefPort,               /* Preferred port */
-SK_U32  *pSelect,               /* New active port */
-SK_BOOL AutoNegDone)    /* Successfully auto-negotiated? */
-{
-        SK_U32          i;
-        SK_BOOL         PortFound;
-
-        PortFound = SK_FALSE;
-
-        /* Select first port that is PortDown. */
-        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_DOWN &&
-                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
-                        *pSelect = i;
-                        if (pAC->Rlmt.Port[Active].PortState == SK_RLMT_PS_DOWN &&
-                                pAC->GIni.GP[Active].PAutoNegFail != AutoNegDone) {
-                                *pSelect = Active;
-                        }
-                        if (pAC->Rlmt.Port[PrefPort].PortState == SK_RLMT_PS_DOWN &&
-                                pAC->GIni.GP[PrefPort].PAutoNegFail != AutoNegDone) {
-                                *pSelect = PrefPort;
-                        }
-                        PortFound = SK_TRUE;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                ("SK_RLMT_SELECT_DOWN found Port %d down.\n", *pSelect))
-                        break;
-                }
-        }
-        return (PortFound);
-}       /* SkRlmtSelectDown */
-
-
-/******************************************************************************
- *
- *      SkRlmtCheckSwitch - select new active port and switch to it
- *
- * Description:
- *      This routine decides which port should be the active one and queues
- *      port switching if necessary.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      Nothing.
- */
-RLMT_STATIC void        SkRlmtCheckSwitch(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC,    /* I/O Context */
-SK_U32  NetIdx) /* Net index */
-{
-        SK_EVPARA       Para;
-        SK_U32          Active;
-        SK_U32          PrefPort;
-        SK_U32          i;
-        SK_BOOL         PortFound;
-
-        Active = pAC->Rlmt.Net[NetIdx].ActivePort;      /* Index of active port. */
-        PrefPort = pAC->Rlmt.Net[NetIdx].PrefPort;      /* Index of preferred port. */
-        PortFound = SK_FALSE;
-        pAC->Rlmt.CheckSwitch = SK_FALSE;
-
-#if 0   /* RW 2001/10/18 - active port becomes always prefered one */
-        if (pAC->Rlmt.Net[NetIdx].Preference == 0xFFFFFFFF) { /* Automatic */
-                /* disable auto-fail back */
-                PrefPort = Active;
-        }
-#endif
-
-        if (pAC->Rlmt.Net[NetIdx].LinksUp == 0) {
-                /* Last link went down - shut down the net. */
-                pAC->Rlmt.Net[NetIdx].RlmtState = SK_RLMT_RS_NET_DOWN;
-                Para.Para32[0] = SK_RLMT_NET_DOWN_TEMP;
-                Para.Para32[1] = NetIdx;
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_NET_DOWN, Para);
-
-                Para.Para32[0] = pAC->Rlmt.Net[NetIdx].
-                        Port[pAC->Rlmt.Net[NetIdx].ActivePort]->PortNumber;
-                Para.Para32[1] = NetIdx;
-                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_DOWN, Para);
-                return;
-        }       /* pAC->Rlmt.LinksUp == 0 */
-        else if (pAC->Rlmt.Net[NetIdx].LinksUp == 1 &&
-                pAC->Rlmt.Net[NetIdx].RlmtState == SK_RLMT_RS_NET_DOWN) {
-                /* First link came up - get the net up. */
-                pAC->Rlmt.Net[NetIdx].RlmtState = SK_RLMT_RS_NET_UP;
-
-                /*
-                 * If pAC->Rlmt.ActivePort != Para.Para32[0],
-                 * the DRV switches to the port that came up.
-                 */
-                for (i = 0; i < pAC->Rlmt.Net[NetIdx].NumPorts; i++) {
-                        if (!pAC->Rlmt.Net[NetIdx].Port[i]->LinkDown) {
-                                if (!pAC->Rlmt.Net[NetIdx].Port[Active]->LinkDown) {
-                                        i = Active;
-                                }
-                                if (!pAC->Rlmt.Net[NetIdx].Port[PrefPort]->LinkDown) {
-                                        i = PrefPort;
-                                }
-                                PortFound = SK_TRUE;
-                                break;
-                        }
-                }
-
-                if (PortFound) {
-                        Para.Para32[0] = pAC->Rlmt.Net[NetIdx].Port[i]->PortNumber;
-                        Para.Para32[1] = NetIdx;
-                        SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_UP, Para);
-
-                        pAC->Rlmt.Net[NetIdx].ActivePort = i;
-                        Para.Para32[0] = pAC->Rlmt.Net[NetIdx].Port[i]->PortNumber;
-                        Para.Para32[1] = NetIdx;
-                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_NET_UP, Para);
-
-                        if ((pAC->Rlmt.Net[NetIdx].RlmtMode & SK_RLMT_TRANSPARENT) == 0 &&
-                                (Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC,
-                                pAC->Rlmt.Net[NetIdx].Port[i]->PortNumber,
-                                SK_PACKET_ANNOUNCE, &pAC->Addr.Net[NetIdx].
-                                CurrentMacAddress, &SkRlmtMcAddr)) != NULL) {
-                                /*
-                                 * Send announce packet to RLMT multicast address to force
-                                 * switches to learn the new location of the logical MAC address.
-                                 */
-                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                        }
-                }
-                else {
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E007, SKERR_RLMT_E007_MSG);
-                }
-
-                return;
-        }       /* LinksUp == 1 && RlmtState == SK_RLMT_RS_NET_DOWN */
-        else {  /* Cannot be reached in dual-net mode. */
-                Para.Para32[0] = Active;
-
-                /*
-                 * Preselection:
-                 *      If RLMT Mode != CheckLinkState
-                 *              select port that received a broadcast frame substantially later
-                 *              than all other ports
-                 *      else select first port that is not SuspectRx
-                 *      else select first port that is PortUp
-                 *      else select port that is PortGoingUp for the longest time
-                 *      else select first port that is PortDown
-                 *      else stop.
-                 *
-                 * For the preselected port:
-                 *      If ActivePort is equal in quality, select ActivePort.
-                 *
-                 *      If PrefPort is equal in quality, select PrefPort.
-                 *
-                 *      If ActivePort != SelectedPort,
-                 *              If old ActivePort is LinkDown,
-                 *                      SwitchHard
-                 *              else
-                 *                      SwitchSoft
-                 */
-                /* check of ChgBcPrio flag added */
-                if ((pAC->Rlmt.Net[0].RlmtMode != SK_RLMT_MODE_CLS) &&
-                        (!pAC->Rlmt.Net[0].ChgBcPrio)) {
-                        
-                        if (!PortFound) {
-                                PortFound = SkRlmtSelectBcRx(
-                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
-                        }
-
-                        if (!PortFound) {
-                                PortFound = SkRlmtSelectNotSuspect(
-                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
-                        }
-                }       /* pAC->Rlmt.RlmtMode != SK_RLMT_MODE_CLS */
-
-                /* with changed priority for last broadcast received */
-                if ((pAC->Rlmt.Net[0].RlmtMode != SK_RLMT_MODE_CLS) &&
-                        (pAC->Rlmt.Net[0].ChgBcPrio)) {
-                        if (!PortFound) {
-                                PortFound = SkRlmtSelectNotSuspect(
-                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
-                        }
-
-                        if (!PortFound) {
-                                PortFound = SkRlmtSelectBcRx(
-                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
-                        }
-                }       /* pAC->Rlmt.RlmtMode != SK_RLMT_MODE_CLS */
-
-                if (!PortFound) {
-                        PortFound = SkRlmtSelectUp(
-                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_SUCCESS);
-                }
-
-                if (!PortFound) {
-                        PortFound = SkRlmtSelectUp(
-                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_FAILED);
-                }
-
-                if (!PortFound) {
-                        PortFound = SkRlmtSelectGoingUp(
-                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_SUCCESS);
-                }
-
-                if (!PortFound) {
-                        PortFound = SkRlmtSelectGoingUp(
-                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_FAILED);
-                }
-
-                if (pAC->Rlmt.Net[0].RlmtMode != SK_RLMT_MODE_CLS) {
-                        if (!PortFound) {
-                                PortFound = SkRlmtSelectDown(pAC, IoC,
-                                        Active, PrefPort, &Para.Para32[1], AUTONEG_SUCCESS);
-                        }
-
-                        if (!PortFound) {
-                                PortFound = SkRlmtSelectDown(pAC, IoC,
-                                        Active, PrefPort, &Para.Para32[1], AUTONEG_FAILED);
-                        }
-                }       /* pAC->Rlmt.RlmtMode != SK_RLMT_MODE_CLS */
-
-                if (PortFound) {
-
-                        if (Para.Para32[1] != Active) {
-                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                        ("Active: %d, Para1: %d.\n", Active, Para.Para32[1]))
-                                pAC->Rlmt.Net[NetIdx].ActivePort = Para.Para32[1];
-                                Para.Para32[0] = pAC->Rlmt.Net[NetIdx].
-                                        Port[Para.Para32[0]]->PortNumber;
-                                Para.Para32[1] = pAC->Rlmt.Net[NetIdx].
-                                        Port[Para.Para32[1]]->PortNumber;
-                                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[1], SK_LED_ACTIVE);
-                                if (pAC->Rlmt.Port[Active].LinkDown) {
-                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_SWITCH_HARD, Para);
-                                }
-                                else {
-                                        SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_STANDBY);
-                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_SWITCH_SOFT, Para);
-                                }
-                                Para.Para32[1] = NetIdx;
-                                Para.Para32[0] =
-                                        pAC->Rlmt.Net[NetIdx].Port[Para.Para32[0]]->PortNumber;
-                                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_DOWN, Para);
-                                Para.Para32[0] = pAC->Rlmt.Net[NetIdx].
-                                        Port[pAC->Rlmt.Net[NetIdx].ActivePort]->PortNumber;
-                                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_UP, Para);
-                                if ((pAC->Rlmt.Net[NetIdx].RlmtMode & SK_RLMT_TRANSPARENT) == 0 &&
-                                        (Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, Para.Para32[0],
-                                        SK_PACKET_ANNOUNCE, &pAC->Addr.Net[NetIdx].CurrentMacAddress,
-                                        &SkRlmtMcAddr)) != NULL) {
-                                        /*
-                                         * Send announce packet to RLMT multicast address to force
-                                         * switches to learn the new location of the logical
-                                         * MAC address.
-                                         */
-                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
-                                }       /* (Para.pParaPtr = SkRlmtBuildPacket(...)) != NULL */
-                        }       /* Para.Para32[1] != Active */
-                }       /* PortFound */
-                else {
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E004, SKERR_RLMT_E004_MSG);
-                }
-        }       /* LinksUp > 1 || LinksUp == 1 && RlmtState != SK_RLMT_RS_NET_DOWN */
-        return;
-}       /* SkRlmtCheckSwitch */
-
-
-/******************************************************************************
- *
- *      SkRlmtCheckSeg - Report if segmentation is detected
- *
- * Description:
- *      This routine checks if the ports see different root bridges and reports
- *      segmentation in such a case.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      Nothing.
- */
-RLMT_STATIC void        SkRlmtCheckSeg(
-SK_AC   *pAC,   /* Adapter Context */
-SK_IOC  IoC,    /* I/O Context */
-SK_U32  NetIdx) /* Net number */
-{
-        SK_EVPARA       Para;
-        SK_RLMT_NET     *pNet;
-        SK_U32          i, j;
-        SK_BOOL         Equal;
-
-        pNet = &pAC->Rlmt.Net[NetIdx];
-        pNet->RootIdSet = SK_FALSE;
-        Equal = SK_TRUE;
-
-        for (i = 0; i < pNet->NumPorts; i++) {
-                if (pNet->Port[i]->LinkDown || !pNet->Port[i]->RootIdSet) {
-                        continue;
-                }
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_DUMP,
-                        ("Root ID %d: %02x %02x %02x %02x %02x %02x %02x %02x.\n", i,
-                                pNet->Port[i]->Root.Id[0], pNet->Port[i]->Root.Id[1],
-                                pNet->Port[i]->Root.Id[2], pNet->Port[i]->Root.Id[3],
-                                pNet->Port[i]->Root.Id[4], pNet->Port[i]->Root.Id[5],
-                                pNet->Port[i]->Root.Id[6], pNet->Port[i]->Root.Id[7]))
-
-                if (!pNet->RootIdSet) {
-                        pNet->Root = pNet->Port[i]->Root;
-                        pNet->RootIdSet = SK_TRUE;
-                        continue;
-                }
-
-                for (j = 0; j < 8; j ++) {
-                        Equal &= pNet->Port[i]->Root.Id[j] == pNet->Root.Id[j];
-                        if (!Equal) {
-                                break;
-                        }
-                }
-                
-                if (!Equal) {
-                        SK_ERR_LOG(pAC, SK_ERRCL_COMM, SKERR_RLMT_E005, SKERR_RLMT_E005_MSG);
-                        Para.Para32[0] = NetIdx;
-                        Para.Para32[1] = (SK_U32)-1;
-                        SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SEGMENTATION, Para);
-
-                        pNet->CheckingState &= ~SK_RLMT_RCS_REPORT_SEG;
-
-                        /* 2000-03-06 RA: New. */
-                        Para.Para32[0] = NetIdx;
-                        Para.Para32[1] = (SK_U32)-1;
-                        SkTimerStart(pAC, IoC, &pNet->SegTimer, SK_RLMT_SEG_TO_VAL,
-                                SKGE_RLMT, SK_RLMT_SEG_TIM, Para);
-                        break;
-                }
-        }       /* for (i = 0; i < pNet->NumPorts; i++) */
-
-        /* 2000-03-06 RA: Moved here. */
-        /* Segmentation check not running anymore. */
-        pNet->CheckingState &= ~SK_RLMT_RCS_SEG;
-
-}       /* SkRlmtCheckSeg */
-
-
-/******************************************************************************
- *
- *      SkRlmtPortStart - initialize port variables and start port
- *
- * Description:
- *      This routine initializes a port's variables and issues a PORT_START
- *      to the HWAC module.  This handles retries if the start fails or the
- *      link eventually goes down.
- *
- * Context:
- *      runtime, pageable?
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtPortStart(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-SK_U32  PortNumber)     /* Port number */
-{
-        SK_EVPARA       Para;
-
-        pAC->Rlmt.Port[PortNumber].PortState = SK_RLMT_PS_LINK_DOWN;
-        pAC->Rlmt.Port[PortNumber].PortStarted = SK_TRUE;
-        pAC->Rlmt.Port[PortNumber].LinkDown = SK_TRUE;
-        pAC->Rlmt.Port[PortNumber].PortDown = SK_TRUE;
-        pAC->Rlmt.Port[PortNumber].CheckingState = 0;
-        pAC->Rlmt.Port[PortNumber].RootIdSet = SK_FALSE;
-        Para.Para32[0] = PortNumber;
-        Para.Para32[1] = (SK_U32)-1;
-        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
-}       /* SkRlmtPortStart */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtPortStartTim - PORT_START_TIM
- *
- * Description:
- *      This routine handles PORT_START_TIM events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtPortStartTim(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
-{
-        SK_U32                  i;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PORTSTART_TIMEOUT Port %d Event BEGIN.\n", Para.Para32[0]))
-
-                if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PORTSTART_TIMEOUT Event EMPTY.\n"))
-                return;
-        }
-
-        /*
-         * Used to start non-preferred ports if the preferred one
-         * does not come up.
-         * This timeout needs only be set when starting the first
-         * (preferred) port.
-         */
-        if (pAC->Rlmt.Port[Para.Para32[0]].LinkDown) {
-                /* PORT_START failed. */
-                for (i = 0; i < pAC->Rlmt.Port[Para.Para32[0]].Net->NumPorts; i++) {
-                        if (!pAC->Rlmt.Port[Para.Para32[0]].Net->Port[i]->PortStarted) {
-                                SkRlmtPortStart(pAC, IoC,
-                                        pAC->Rlmt.Port[Para.Para32[0]].Net->Port[i]->PortNumber);
-                        }
-                }
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PORTSTART_TIMEOUT Event END.\n"))
-}       /* SkRlmtEvtPortStartTim */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtLinkUp - LINK_UP
- *
- * Description:
- *      This routine handles LLINK_UP events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtLinkUp(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 Undefined */
-{
-        SK_U32                  i;
-        SK_RLMT_PORT    *pRPort;
-        SK_EVPARA               Para2;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_LINK_UP Port %d Event BEGIN.\n", Para.Para32[0]))
-
-        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
-        if (!pRPort->PortStarted) {
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E008, SKERR_RLMT_E008_MSG);
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                ("SK_RLMT_LINK_UP Event EMPTY.\n"))
-                return;
-        }
-
-        if (!pRPort->LinkDown) {
-                /* RA;:;: Any better solution? */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_LINK_UP Event EMPTY.\n"))
-                return;
-        }
-
-        SkTimerStop(pAC, IoC, &pRPort->UpTimer);
-        SkTimerStop(pAC, IoC, &pRPort->DownRxTimer);
-        SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
-
-        /* Do something if timer already fired? */
-
-        pRPort->LinkDown = SK_FALSE;
-        pRPort->PortState = SK_RLMT_PS_GOING_UP;
-        pRPort->GuTimeStamp = SkOsGetTime(pAC);
-        pRPort->BcTimeStamp = 0;
-        pRPort->Net->LinksUp++;
-        if (pRPort->Net->LinksUp == 1) {
-                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_ACTIVE);
-        }
-        else {
-                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_STANDBY);
-        }
-
-        for (i = 0; i < pRPort->Net->NumPorts; i++) {
-                if (!pRPort->Net->Port[i]->PortStarted) {
-                        SkRlmtPortStart(pAC, IoC, pRPort->Net->Port[i]->PortNumber);
-                }
-        }
-
-        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
-
-        if (pRPort->Net->LinksUp >= 2) {
-                if (pRPort->Net->RlmtMode & SK_RLMT_CHECK_LOC_LINK) {
-                        /* Build the check chain. */
-                        SkRlmtBuildCheckChain(pAC, pRPort->Net->NetNumber);
-                }
-        }
-
-        /* If the first link comes up, start the periodical RLMT timeout. */
-        if (pRPort->Net->NumPorts > 1 && pRPort->Net->LinksUp == 1 &&
-                (pRPort->Net->RlmtMode & SK_RLMT_CHECK_OTHERS) != 0) {
-                Para2.Para32[0] = pRPort->Net->NetNumber;
-                Para2.Para32[1] = (SK_U32)-1;
-                SkTimerStart(pAC, IoC, &pRPort->Net->LocTimer,
-                        pRPort->Net->TimeoutValue, SKGE_RLMT, SK_RLMT_TIM, Para2);
-        }
-
-        Para2 = Para;
-        Para2.Para32[1] = (SK_U32)-1;
-        SkTimerStart(pAC, IoC, &pRPort->UpTimer, SK_RLMT_PORTUP_TIM_VAL,
-                SKGE_RLMT, SK_RLMT_PORTUP_TIM, Para2);
-        
-        /* Later: if (pAC->Rlmt.RlmtMode & SK_RLMT_CHECK_LOC_LINK) && */
-        if ((pRPort->Net->RlmtMode & SK_RLMT_TRANSPARENT) == 0 &&
-                (pRPort->Net->RlmtMode & SK_RLMT_CHECK_LINK) != 0 &&
-                (Para2.pParaPtr =
-                        SkRlmtBuildPacket(pAC, IoC, Para.Para32[0], SK_PACKET_ANNOUNCE,
-                        &pAC->Addr.Port[Para.Para32[0]].CurrentMacAddress, &SkRlmtMcAddr)
-                ) != NULL) {
-                /* Send "new" packet to RLMT multicast address. */
-                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para2);
-        }
-
-        if (pRPort->Net->RlmtMode & SK_RLMT_CHECK_SEG) {
-                if ((Para2.pParaPtr =
-                        SkRlmtBuildSpanningTreePacket(pAC, IoC, Para.Para32[0])) != NULL) {
-                        pAC->Rlmt.Port[Para.Para32[0]].RootIdSet = SK_FALSE;
-                        pRPort->Net->CheckingState |=
-                                SK_RLMT_RCS_SEG | SK_RLMT_RCS_REPORT_SEG;
-
-                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para2);
-
-                        Para.Para32[1] = (SK_U32)-1;
-                        SkTimerStart(pAC, IoC, &pRPort->Net->SegTimer,
-                                SK_RLMT_SEG_TO_VAL, SKGE_RLMT, SK_RLMT_SEG_TIM, Para);
-                }
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_LINK_UP Event END.\n"))
-}       /* SkRlmtEvtLinkUp */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtPortUpTim - PORT_UP_TIM
- *
- * Description:
- *      This routine handles PORT_UP_TIM events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtPortUpTim(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
-{
-        SK_RLMT_PORT    *pRPort;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PORTUP_TIM Port %d Event BEGIN.\n", Para.Para32[0]))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PORTUP_TIM Event EMPTY.\n"))
-                return;
-        }
-
-        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
-        if (pRPort->LinkDown || (pRPort->PortState == SK_RLMT_PS_UP)) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PORTUP_TIM Port %d Event EMPTY.\n", Para.Para32[0]))
-                return;
-        }
-
-        pRPort->PortDown = SK_FALSE;
-        pRPort->PortState = SK_RLMT_PS_UP;
-        pRPort->Net->PortsUp++;
-        if (pRPort->Net->RlmtState != SK_RLMT_RS_INIT) {
-                if (pAC->Rlmt.NumNets <= 1) {
-                        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
-                }
-                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_PORT_UP, Para);
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PORTUP_TIM Event END.\n"))
-}       /* SkRlmtEvtPortUpTim */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtPortDownTim - PORT_DOWN_*
- *
- * Description:
- *      This routine handles PORT_DOWN_* events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtPortDownX(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_U32          Event,  /* Event code */
-SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
-{
-        SK_RLMT_PORT    *pRPort;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PORTDOWN* Port %d Event (%d) BEGIN.\n",
-                        Para.Para32[0], Event))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PORTDOWN* Event EMPTY.\n"))
-                return;
-        }
-
-        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
-        if (!pRPort->PortStarted || (Event == SK_RLMT_PORTDOWN_TX_TIM &&
-                !(pRPort->CheckingState & SK_RLMT_PCS_TX))) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PORTDOWN* Event (%d) EMPTY.\n", Event))
-                return;
-        }
-        
-        /* Stop port's timers. */
-        SkTimerStop(pAC, IoC, &pRPort->UpTimer);
-        SkTimerStop(pAC, IoC, &pRPort->DownRxTimer);
-        SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
-
-        if (pRPort->PortState != SK_RLMT_PS_LINK_DOWN) {
-                pRPort->PortState = SK_RLMT_PS_DOWN;
-        }
-
-        if (!pRPort->PortDown) {
-                pRPort->Net->PortsUp--;
-                pRPort->PortDown = SK_TRUE;
-                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_PORT_DOWN, Para);
-        }
-
-        pRPort->PacketsPerTimeSlot = 0;
-        /* pRPort->DataPacketsPerTimeSlot = 0; */
-        pRPort->BpduPacketsPerTimeSlot = 0;
-        pRPort->BcTimeStamp = 0;
-
-        /*
-         * RA;:;: To be checked:
-         * - actions at RLMT_STOP: We should not switch anymore.
-         */
-        if (pRPort->Net->RlmtState != SK_RLMT_RS_INIT) {
-                if (Para.Para32[0] ==
-                        pRPort->Net->Port[pRPort->Net->ActivePort]->PortNumber) {
-                        /* Active Port went down. */
-                        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
-                }
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PORTDOWN* Event (%d) END.\n", Event))
-}       /* SkRlmtEvtPortDownX */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtLinkDown - LINK_DOWN
- *
- * Description:
- *      This routine handles LINK_DOWN events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtLinkDown(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 Undefined */
-{
-        SK_RLMT_PORT    *pRPort;
-
-        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_LINK_DOWN Port %d Event BEGIN.\n", Para.Para32[0]))
-
-        if (!pAC->Rlmt.Port[Para.Para32[0]].LinkDown) {
-                pRPort->Net->LinksUp--;
-                pRPort->LinkDown = SK_TRUE;
-                pRPort->PortState = SK_RLMT_PS_LINK_DOWN;
-                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_OFF);
-
-                if ((pRPort->Net->RlmtMode & SK_RLMT_CHECK_LOC_LINK) != 0) {
-                        /* Build the check chain. */
-                        SkRlmtBuildCheckChain(pAC, pRPort->Net->NetNumber);
-                }
-
-                /* Ensure that port is marked down. */
-                Para.Para32[1] = -1;
-                (void)SkRlmtEvent(pAC, IoC, SK_RLMT_PORTDOWN, Para);
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_LINK_DOWN Event END.\n"))
-}       /* SkRlmtEvtLinkDown */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtPortAddr - PORT_ADDR
- *
- * Description:
- *      This routine handles PORT_ADDR events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtPortAddr(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
-{
-        SK_U32                  i, j;
-        SK_RLMT_PORT    *pRPort;
-        SK_MAC_ADDR             *pOldMacAddr;
-        SK_MAC_ADDR             *pNewMacAddr;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PORT_ADDR Port %d Event BEGIN.\n", Para.Para32[0]))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PORT_ADDR Event EMPTY.\n"))
-                return;
-        }
-
-        /* Port's physical MAC address changed. */
-        pOldMacAddr = &pAC->Addr.Port[Para.Para32[0]].PreviousMacAddress;
-        pNewMacAddr = &pAC->Addr.Port[Para.Para32[0]].CurrentMacAddress;
-
-        /*
-         * NOTE: This is not scalable for solutions where ports are
-         *       checked remotely.  There, we need to send an RLMT
-         *       address change packet - and how do we ensure delivery?
-         */
-        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
-                pRPort = &pAC->Rlmt.Port[i];
-                for (j = 0; j < pRPort->PortsChecked; j++) {
-                        if (SK_ADDR_EQUAL(
-                                pRPort->PortCheck[j].CheckAddr.a, pOldMacAddr->a)) {
-                                pRPort->PortCheck[j].CheckAddr = *pNewMacAddr;
-                        }
-                }
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PORT_ADDR Event END.\n"))
-}       /* SkRlmtEvtPortAddr */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtStart - START
- *
- * Description:
- *      This routine handles START events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtStart(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
-{
-        SK_EVPARA       Para2;
-        SK_U32          PortIdx;
-        SK_U32          PortNumber;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_START Net %d Event BEGIN.\n", Para.Para32[0]))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_START Event EMPTY.\n"))
-                return;
-        }
-
-        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad NetNumber %d.\n", Para.Para32[0]))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_START Event EMPTY.\n"))
-                return;
-        }
-
-        if (pAC->Rlmt.Net[Para.Para32[0]].RlmtState != SK_RLMT_RS_INIT) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_START Event EMPTY.\n"))
-                return;
-        }
-
-        if (pAC->Rlmt.NetsStarted >= pAC->Rlmt.NumNets) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("All nets should have been started.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_START Event EMPTY.\n"))
-                return;
-        }
-
-        if (pAC->Rlmt.Net[Para.Para32[0]].PrefPort >=
-                pAC->Rlmt.Net[Para.Para32[0]].NumPorts) {
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E009, SKERR_RLMT_E009_MSG);
-
-                /* Change PrefPort to internal default. */
-                Para2.Para32[0] = 0xFFFFFFFF;
-                Para2.Para32[1] = Para.Para32[0];
-                (void)SkRlmtEvent(pAC, IoC, SK_RLMT_PREFPORT_CHANGE, Para2);
-        }
-
-        PortIdx = pAC->Rlmt.Net[Para.Para32[0]].PrefPort;
-        PortNumber = pAC->Rlmt.Net[Para.Para32[0]].Port[PortIdx]->PortNumber;
-
-        pAC->Rlmt.Net[Para.Para32[0]].LinksUp = 0;
-        pAC->Rlmt.Net[Para.Para32[0]].PortsUp = 0;
-        pAC->Rlmt.Net[Para.Para32[0]].CheckingState = 0;
-        pAC->Rlmt.Net[Para.Para32[0]].RlmtState = SK_RLMT_RS_NET_DOWN;
-
-        /* Start preferred port. */
-        SkRlmtPortStart(pAC, IoC, PortNumber);
-
-        /* Start Timer (for first port only). */
-        Para2.Para32[0] = PortNumber;
-        Para2.Para32[1] = (SK_U32)-1;
-        SkTimerStart(pAC, IoC, &pAC->Rlmt.Port[PortNumber].UpTimer,
-                SK_RLMT_PORTSTART_TIM_VAL, SKGE_RLMT, SK_RLMT_PORTSTART_TIM, Para2);
-
-        pAC->Rlmt.NetsStarted++;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_START Event END.\n"))
-}       /* SkRlmtEvtStart */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtStop - STOP
- *
- * Description:
- *      This routine handles STOP events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtStop(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
-{
-        SK_EVPARA       Para2;
-        SK_U32          PortNumber;
-        SK_U32          i;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_STOP Net %d Event BEGIN.\n", Para.Para32[0]))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STOP Event EMPTY.\n"))
-                return;
-        }
-
-        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad NetNumber %d.\n", Para.Para32[0]))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STOP Event EMPTY.\n"))
-                return;
-        }
-
-        if (pAC->Rlmt.Net[Para.Para32[0]].RlmtState == SK_RLMT_RS_INIT) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STOP Event EMPTY.\n"))
-                return;
-        }
-
-        if (pAC->Rlmt.NetsStarted == 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("All nets are stopped.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STOP Event EMPTY.\n"))
-                return;
-        }
-
-        /* Stop RLMT timers. */
-        SkTimerStop(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].LocTimer);
-        SkTimerStop(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].SegTimer);
-
-        /* Stop net. */
-        pAC->Rlmt.Net[Para.Para32[0]].RlmtState = SK_RLMT_RS_INIT;
-        pAC->Rlmt.Net[Para.Para32[0]].RootIdSet = SK_FALSE;
-        Para2.Para32[0] = SK_RLMT_NET_DOWN_FINAL;
-        Para2.Para32[1] = Para.Para32[0];                       /* Net# */
-        SkEventQueue(pAC, SKGE_DRV, SK_DRV_NET_DOWN, Para2);
-
-        /* Stop ports. */
-        for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
-                PortNumber = pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber;
-                if (pAC->Rlmt.Port[PortNumber].PortState != SK_RLMT_PS_INIT) {
-                        SkTimerStop(pAC, IoC, &pAC->Rlmt.Port[PortNumber].UpTimer);
-                        SkTimerStop(pAC, IoC, &pAC->Rlmt.Port[PortNumber].DownRxTimer);
-                        SkTimerStop(pAC, IoC, &pAC->Rlmt.Port[PortNumber].DownTxTimer);
-
-                        pAC->Rlmt.Port[PortNumber].PortState = SK_RLMT_PS_INIT;
-                        pAC->Rlmt.Port[PortNumber].RootIdSet = SK_FALSE;
-                        pAC->Rlmt.Port[PortNumber].PortStarted = SK_FALSE;
-                        Para2.Para32[0] = PortNumber;
-                        Para2.Para32[1] = (SK_U32)-1;
-                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para2);
-                }
-        }
-
-        pAC->Rlmt.NetsStarted--;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_STOP Event END.\n"))
-}       /* SkRlmtEvtStop */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtTim - TIM
- *
- * Description:
- *      This routine handles TIM events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtTim(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
-{
-        SK_RLMT_PORT    *pRPort;
-        SK_U32                  Timeout;
-        SK_U32                  NewTimeout;
-        SK_U32                  PortNumber;
-        SK_U32                  i;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_TIM Event BEGIN.\n"))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_TIM Event EMPTY.\n"))
-                return;
-        }
-
-        if ((pAC->Rlmt.Net[Para.Para32[0]].RlmtMode & SK_RLMT_CHECK_OTHERS) == 0 ||
-                pAC->Rlmt.Net[Para.Para32[0]].LinksUp == 0) {
-                /* Mode changed or all links down: No more link checking. */
-                return;
-        }
-
-#if 0
-        pAC->Rlmt.SwitchCheckCounter--;
-        if (pAC->Rlmt.SwitchCheckCounter == 0) {
-                pAC->Rlmt.SwitchCheckCounter;
-        }
-#endif  /* 0 */
-
-        NewTimeout = SK_RLMT_DEF_TO_VAL;
-        for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
-                PortNumber = pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber;
-                pRPort = &pAC->Rlmt.Port[PortNumber];
-                if (!pRPort->LinkDown) {
-                        Timeout = SkRlmtCheckPort(pAC, IoC, PortNumber);
-                        if (Timeout < NewTimeout) {
-                                NewTimeout = Timeout;
-                        }
-
-                        /*
-                         * These counters should be set to 0 for all ports before the
-                         * first frame is sent in the next loop.
-                         */
-                        pRPort->PacketsPerTimeSlot = 0;
-                        /* pRPort->DataPacketsPerTimeSlot = 0; */
-                        pRPort->BpduPacketsPerTimeSlot = 0;
-                }
-        }
-        pAC->Rlmt.Net[Para.Para32[0]].TimeoutValue = NewTimeout;
-
-        if (pAC->Rlmt.Net[Para.Para32[0]].LinksUp > 1) {
-                /*
-                 * If checking remote ports, also send packets if
-                 *   (LinksUp == 1) &&
-                 *   this port checks at least one (remote) port.
-                 */
-
-                /*
-                 * Must be new loop, as SkRlmtCheckPort can request to
-                 * check segmentation when e.g. checking the last port.
-                 */
-                for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
-                        if (!pAC->Rlmt.Net[Para.Para32[0]].Port[i]->LinkDown) {
-                                SkRlmtSend(pAC, IoC,
-                                        pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber);
-                        }
-                }
-        }
-
-        SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].LocTimer,
-                pAC->Rlmt.Net[Para.Para32[0]].TimeoutValue, SKGE_RLMT, SK_RLMT_TIM,
-                Para);
-
-        if (pAC->Rlmt.Net[Para.Para32[0]].LinksUp > 1 &&
-                (pAC->Rlmt.Net[Para.Para32[0]].RlmtMode & SK_RLMT_CHECK_SEG) &&
-                (pAC->Rlmt.Net[Para.Para32[0]].CheckingState & SK_RLMT_RCS_START_SEG)) {
-                SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].SegTimer,
-                        SK_RLMT_SEG_TO_VAL, SKGE_RLMT, SK_RLMT_SEG_TIM, Para);
-                pAC->Rlmt.Net[Para.Para32[0]].CheckingState &= ~SK_RLMT_RCS_START_SEG;
-                pAC->Rlmt.Net[Para.Para32[0]].CheckingState |=
-                        SK_RLMT_RCS_SEG | SK_RLMT_RCS_REPORT_SEG;
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_TIM Event END.\n"))
-}       /* SkRlmtEvtTim */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtSegTim - SEG_TIM
- *
- * Description:
- *      This routine handles SEG_TIM events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtSegTim(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
-{
-#ifdef xDEBUG
-        int j;
-#endif  /* DEBUG */
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_SEG_TIM Event BEGIN.\n"))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SEG_TIM Event EMPTY.\n"))
-                return;
-        }
-
-#ifdef xDEBUG
-        for (j = 0; j < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; j++) {
-                SK_ADDR_PORT    *pAPort;
-                SK_U32                  k;
-                SK_U16                  *InAddr;
-                SK_U8                   InAddr8[6];
-
-                InAddr = (SK_U16 *)&InAddr8[0];
-                pAPort = pAC->Rlmt.Net[Para.Para32[0]].Port[j]->AddrPort;
-                for (k = 0; k < pAPort->NextExactMatchRlmt; k++) {
-                        /* Get exact match address k from port j. */
-                        XM_INADDR(IoC, pAC->Rlmt.Net[Para.Para32[0]].Port[j]->PortNumber,
-                                XM_EXM(k), InAddr);
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                ("MC address %d on Port %u: %02x %02x %02x %02x %02x %02x --  %02x %02x %02x %02x %02x %02x.\n",
-                                        k, pAC->Rlmt.Net[Para.Para32[0]].Port[j]->PortNumber,
-                                        InAddr8[0], InAddr8[1], InAddr8[2],
-                                        InAddr8[3], InAddr8[4], InAddr8[5],
-                                        pAPort->Exact[k].a[0], pAPort->Exact[k].a[1],
-                                        pAPort->Exact[k].a[2], pAPort->Exact[k].a[3],
-                                        pAPort->Exact[k].a[4], pAPort->Exact[k].a[5]))
-                }
-        }
-#endif  /* xDEBUG */
-                                
-        SkRlmtCheckSeg(pAC, IoC, Para.Para32[0]);
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SEG_TIM Event END.\n"))
-}       /* SkRlmtEvtSegTim */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtPacketRx - PACKET_RECEIVED
- *
- * Description:
- *      This routine handles PACKET_RECEIVED events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtPacketRx(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_MBUF *pMb */
-{
-        SK_MBUF *pMb;
-        SK_MBUF *pNextMb;
-        SK_U32  NetNumber;
-
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PACKET_RECEIVED Event BEGIN.\n"))
-
-        /* Should we ignore frames during port switching? */
-
-#ifdef DEBUG
-        pMb = Para.pParaPtr;
-        if (pMb == NULL) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL, ("No mbuf.\n"))
-        }
-        else if (pMb->pNext != NULL) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("More than one mbuf or pMb->pNext not set.\n"))
-        }
-#endif  /* DEBUG */
-
-        for (pMb = Para.pParaPtr; pMb != NULL; pMb = pNextMb) {
-                pNextMb = pMb->pNext;
-                pMb->pNext = NULL;
-
-                NetNumber = pAC->Rlmt.Port[pMb->PortIdx].Net->NetNumber;
-                if (pAC->Rlmt.Net[NetNumber].RlmtState == SK_RLMT_RS_INIT) {
-                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
-                }
-                else {
-                        SkRlmtPacketReceive(pAC, IoC, pMb);
-                }
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PACKET_RECEIVED Event END.\n"))
-}       /* SkRlmtEvtPacketRx */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtStatsClear - STATS_CLEAR
- *
- * Description:
- *      This routine handles STATS_CLEAR events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtStatsClear(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
-{
-        SK_U32                  i;
-        SK_RLMT_PORT    *pRPort;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_STATS_CLEAR Event BEGIN.\n"))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STATS_CLEAR Event EMPTY.\n"))
-                return;
-        }
-
-        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad NetNumber %d.\n", Para.Para32[0]))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STATS_CLEAR Event EMPTY.\n"))
-                return;
-        }
-
-        /* Clear statistics for logical and physical ports. */
-        for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
-                pRPort =
-                        &pAC->Rlmt.Port[pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber];
-                pRPort->TxHelloCts = 0;
-                pRPort->RxHelloCts = 0;
-                pRPort->TxSpHelloReqCts = 0;
-                pRPort->RxSpHelloCts = 0;
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_STATS_CLEAR Event END.\n"))
-}       /* SkRlmtEvtStatsClear */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtStatsUpdate - STATS_UPDATE
- *
- * Description:
- *      This routine handles STATS_UPDATE events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtStatsUpdate(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
-{
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_STATS_UPDATE Event BEGIN.\n"))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STATS_UPDATE Event EMPTY.\n"))
-                return;
-        }
-
-        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad NetNumber %d.\n", Para.Para32[0]))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_STATS_UPDATE Event EMPTY.\n"))
-                return;
-        }
-
-        /* Update statistics - currently always up-to-date. */
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_STATS_UPDATE Event END.\n"))
-}       /* SkRlmtEvtStatsUpdate */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtPrefportChange - PREFPORT_CHANGE
- *
- * Description:
- *      This routine handles PREFPORT_CHANGE events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtPrefportChange(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 PortIndex; SK_U32 NetNumber */
-{
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PREFPORT_CHANGE to Port %d Event BEGIN.\n", Para.Para32[0]))
-
-        if (Para.Para32[1] >= pAC->Rlmt.NumNets) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad NetNumber %d.\n", Para.Para32[1]))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"))
-                return;
-        }
-
-        /* 0xFFFFFFFF == auto-mode. */
-        if (Para.Para32[0] == 0xFFFFFFFF) {
-                pAC->Rlmt.Net[Para.Para32[1]].PrefPort = SK_RLMT_DEF_PREF_PORT;
-        }
-        else {
-                if (Para.Para32[0] >= pAC->Rlmt.Net[Para.Para32[1]].NumPorts) {
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E010, SKERR_RLMT_E010_MSG);
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                                ("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"))
-                        return;
-                }
-
-                pAC->Rlmt.Net[Para.Para32[1]].PrefPort = Para.Para32[0];
-        }
-
-        pAC->Rlmt.Net[Para.Para32[1]].Preference = Para.Para32[0];
-
-        if (pAC->Rlmt.Net[Para.Para32[1]].RlmtState != SK_RLMT_RS_INIT) {
-                SkRlmtCheckSwitch(pAC, IoC, Para.Para32[1]);
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_PREFPORT_CHANGE Event END.\n"))
-}       /* SkRlmtEvtPrefportChange */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtSetNets - SET_NETS
- *
- * Description:
- *      This routine handles SET_NETS events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtSetNets(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NumNets; SK_U32 -1 */
-{
-        int i;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_SET_NETS Event BEGIN.\n"))
-
-        if (Para.Para32[1] != (SK_U32)-1) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad Parameter.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
-                return;
-        }
-
-        if (Para.Para32[0] == 0 || Para.Para32[0] > SK_MAX_NETS ||
-                Para.Para32[0] > (SK_U32)pAC->GIni.GIMacsFound) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad number of nets: %d.\n", Para.Para32[0]))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
-                return;
-        }
-
-        if (Para.Para32[0] == pAC->Rlmt.NumNets) {      /* No change. */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
-                return;
-        }
-
-        /* Entering and leaving dual mode only allowed while nets are stopped. */
-        if (pAC->Rlmt.NetsStarted > 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Changing dual mode only allowed while all nets are stopped.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
-                return;
-        }
-
-        if (Para.Para32[0] == 1) {
-                if (pAC->Rlmt.NumNets > 1) {
-                        /* Clear logical MAC addr from second net's active port. */
-                        (void)SkAddrOverride(pAC, IoC, pAC->Rlmt.Net[1].Port[pAC->Addr.
-                                Net[1].ActivePort]->PortNumber, NULL, SK_ADDR_CLEAR_LOGICAL);
-                        pAC->Rlmt.Net[1].NumPorts = 0;
-                }
-
-                pAC->Rlmt.NumNets = Para.Para32[0];
-                for (i = 0; (SK_U32)i < pAC->Rlmt.NumNets; i++) {
-                        pAC->Rlmt.Net[i].RlmtState = SK_RLMT_RS_INIT;
-                        pAC->Rlmt.Net[i].RootIdSet = SK_FALSE;
-                        pAC->Rlmt.Net[i].Preference = 0xFFFFFFFF;         /* "Automatic" */
-                        pAC->Rlmt.Net[i].PrefPort = SK_RLMT_DEF_PREF_PORT;
-                        /* Just assuming. */
-                        pAC->Rlmt.Net[i].ActivePort = pAC->Rlmt.Net[i].PrefPort;
-                        pAC->Rlmt.Net[i].RlmtMode = SK_RLMT_DEF_MODE;
-                        pAC->Rlmt.Net[i].TimeoutValue = SK_RLMT_DEF_TO_VAL;
-                        pAC->Rlmt.Net[i].NetNumber = i;
-                }
-
-                pAC->Rlmt.Port[1].Net= &pAC->Rlmt.Net[0];
-                pAC->Rlmt.Net[0].NumPorts = pAC->GIni.GIMacsFound;
-
-                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SET_NETS, Para);
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("RLMT: Changed to one net with two ports.\n"))
-        }
-        else if (Para.Para32[0] == 2) {
-                pAC->Rlmt.Port[1].Net= &pAC->Rlmt.Net[1];
-                pAC->Rlmt.Net[1].NumPorts = pAC->GIni.GIMacsFound - 1;
-                pAC->Rlmt.Net[0].NumPorts =
-                        pAC->GIni.GIMacsFound - pAC->Rlmt.Net[1].NumPorts;
-                
-                pAC->Rlmt.NumNets = Para.Para32[0];
-                for (i = 0; (SK_U32)i < pAC->Rlmt.NumNets; i++) {
-                        pAC->Rlmt.Net[i].RlmtState = SK_RLMT_RS_INIT;
-                        pAC->Rlmt.Net[i].RootIdSet = SK_FALSE;
-                        pAC->Rlmt.Net[i].Preference = 0xFFFFFFFF;         /* "Automatic" */
-                        pAC->Rlmt.Net[i].PrefPort = SK_RLMT_DEF_PREF_PORT;
-                        /* Just assuming. */
-                        pAC->Rlmt.Net[i].ActivePort = pAC->Rlmt.Net[i].PrefPort;
-                        pAC->Rlmt.Net[i].RlmtMode = SK_RLMT_DEF_MODE;
-                        pAC->Rlmt.Net[i].TimeoutValue = SK_RLMT_DEF_TO_VAL;
-
-                        pAC->Rlmt.Net[i].NetNumber = i;
-                }
-
-                /* Set logical MAC addr on second net's active port. */
-                (void)SkAddrOverride(pAC, IoC, pAC->Rlmt.Net[1].Port[pAC->Addr.
-                        Net[1].ActivePort]->PortNumber, NULL, SK_ADDR_SET_LOGICAL);
-
-                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SET_NETS, Para);
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("RLMT: Changed to two nets with one port each.\n"))
-        }
-        else {
-                /* Not implemented for more than two nets. */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SetNets not implemented for more than two nets.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
-                return;
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_SET_NETS Event END.\n"))
-}       /* SkRlmtSetNets */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvtModeChange - MODE_CHANGE
- *
- * Description:
- *      This routine handles MODE_CHANGE events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      Nothing
- */
-RLMT_STATIC void        SkRlmtEvtModeChange(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_EVPARA       Para)   /* SK_U32 NewMode; SK_U32 NetNumber */
-{
-        SK_EVPARA       Para2;
-        SK_U32          i;
-        SK_U32          PrevRlmtMode;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                ("SK_RLMT_MODE_CHANGE Event BEGIN.\n"))
-
-        if (Para.Para32[1] >= pAC->Rlmt.NumNets) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Bad NetNumber %d.\n", Para.Para32[1]))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_MODE_CHANGE Event EMPTY.\n"))
-                return;
-        }
-
-        Para.Para32[0] |= SK_RLMT_CHECK_LINK;
-
-        if ((pAC->Rlmt.Net[Para.Para32[1]].NumPorts == 1) &&
-                Para.Para32[0] != SK_RLMT_MODE_CLS) {
-                pAC->Rlmt.Net[Para.Para32[1]].RlmtMode = SK_RLMT_MODE_CLS;
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Forced RLMT mode to CLS on single port net.\n"))
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_MODE_CHANGE Event EMPTY.\n"))
-                return;
-        }
-
-        /* Update RLMT mode. */
-        PrevRlmtMode = pAC->Rlmt.Net[Para.Para32[1]].RlmtMode;
-        pAC->Rlmt.Net[Para.Para32[1]].RlmtMode = Para.Para32[0];
-
-        if ((PrevRlmtMode & SK_RLMT_CHECK_LOC_LINK) !=
-                (pAC->Rlmt.Net[Para.Para32[1]].RlmtMode & SK_RLMT_CHECK_LOC_LINK)) {
-                /* SK_RLMT_CHECK_LOC_LINK bit changed. */
-                if ((PrevRlmtMode & SK_RLMT_CHECK_OTHERS) == 0 &&
-                        pAC->Rlmt.Net[Para.Para32[1]].NumPorts > 1 &&
-                        pAC->Rlmt.Net[Para.Para32[1]].PortsUp >= 1) {
-                        /* 20001207 RA: Was "PortsUp == 1". */
-                        Para2.Para32[0] = Para.Para32[1];
-                        Para2.Para32[1] = (SK_U32)-1;
-                        SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[1]].LocTimer,
-                                pAC->Rlmt.Net[Para.Para32[1]].TimeoutValue,
-                                SKGE_RLMT, SK_RLMT_TIM, Para2);
-                }
-        }
-
-        if ((PrevRlmtMode & SK_RLMT_CHECK_SEG) !=
-                (pAC->Rlmt.Net[Para.Para32[1]].RlmtMode & SK_RLMT_CHECK_SEG)) {
-                /* SK_RLMT_CHECK_SEG bit changed. */
-                for (i = 0; i < pAC->Rlmt.Net[Para.Para32[1]].NumPorts; i++) {
-                        (void)SkAddrMcClear(pAC, IoC,
-                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber,
-                                SK_ADDR_PERMANENT | SK_MC_SW_ONLY);
-
-                        /* Add RLMT MC address. */
-                        (void)SkAddrMcAdd(pAC, IoC,
-                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber,
-                                &SkRlmtMcAddr, SK_ADDR_PERMANENT);
-
-                        if ((pAC->Rlmt.Net[Para.Para32[1]].RlmtMode &
-                                SK_RLMT_CHECK_SEG) != 0) {
-                                /* Add BPDU MC address. */
-                                (void)SkAddrMcAdd(pAC, IoC,
-                                        pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber,
-                                        &BridgeMcAddr, SK_ADDR_PERMANENT);
-
-                                if (pAC->Rlmt.Net[Para.Para32[1]].RlmtState != SK_RLMT_RS_INIT) {
-                                        if (!pAC->Rlmt.Net[Para.Para32[1]].Port[i]->LinkDown &&
-                                                (Para2.pParaPtr = SkRlmtBuildSpanningTreePacket(
-                                                pAC, IoC, i)) != NULL) {
-                                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->RootIdSet =
-                                                        SK_FALSE;
-                                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para2);
-                                        }
-                                }
-                        }
-                        (void)SkAddrMcUpdate(pAC, IoC,
-                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber);
-                }       /* for ... */
-
-                if ((pAC->Rlmt.Net[Para.Para32[1]].RlmtMode & SK_RLMT_CHECK_SEG) != 0) {
-                        Para2.Para32[0] = Para.Para32[1];
-                        Para2.Para32[1] = (SK_U32)-1;
-                        SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[1]].SegTimer,
-                                SK_RLMT_SEG_TO_VAL, SKGE_RLMT, SK_RLMT_SEG_TIM, Para2);
-                }
-        }       /* SK_RLMT_CHECK_SEG bit changed. */
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("SK_RLMT_MODE_CHANGE Event END.\n"))
-}       /* SkRlmtEvtModeChange */
-
-
-/******************************************************************************
- *
- *      SkRlmtEvent - a PORT- or an RLMT-specific event happened
- *
- * Description:
- *      This routine calls subroutines to handle PORT- and RLMT-specific events.
- *
- * Context:
- *      runtime, pageable?
- *      may be called after SK_INIT_IO
- *
- * Returns:
- *      0
- */
-int     SkRlmtEvent(
-SK_AC           *pAC,   /* Adapter Context */
-SK_IOC          IoC,    /* I/O Context */
-SK_U32          Event,  /* Event code */
-SK_EVPARA       Para)   /* Event-specific parameter */
-{
-        switch (Event) {
-        
-        /* ----- PORT events ----- */
-
-        case SK_RLMT_PORTSTART_TIM:     /* From RLMT via TIME. */
-                SkRlmtEvtPortStartTim(pAC, IoC, Para);
-                break;
-        case SK_RLMT_LINK_UP:           /* From SIRQ. */
-                SkRlmtEvtLinkUp(pAC, IoC, Para);
-                break;
-        case SK_RLMT_PORTUP_TIM:        /* From RLMT via TIME. */
-                SkRlmtEvtPortUpTim(pAC, IoC, Para);
-                break;
-        case SK_RLMT_PORTDOWN:                  /* From RLMT. */
-        case SK_RLMT_PORTDOWN_RX_TIM:   /* From RLMT via TIME. */
-        case SK_RLMT_PORTDOWN_TX_TIM:   /* From RLMT via TIME. */
-                SkRlmtEvtPortDownX(pAC, IoC, Event, Para);
-                break;
-        case SK_RLMT_LINK_DOWN:         /* From SIRQ. */
-                SkRlmtEvtLinkDown(pAC, IoC, Para);
-                break;
-        case SK_RLMT_PORT_ADDR:         /* From ADDR. */
-                SkRlmtEvtPortAddr(pAC, IoC, Para);
-                break;
-
-        /* ----- RLMT events ----- */
-
-        case SK_RLMT_START:             /* From DRV. */
-                SkRlmtEvtStart(pAC, IoC, Para);
-                break;
-        case SK_RLMT_STOP:              /* From DRV. */
-                SkRlmtEvtStop(pAC, IoC, Para);
-                break;
-        case SK_RLMT_TIM:               /* From RLMT via TIME. */
-                SkRlmtEvtTim(pAC, IoC, Para);
-                break;
-        case SK_RLMT_SEG_TIM:
-                SkRlmtEvtSegTim(pAC, IoC, Para);
-                break;
-        case SK_RLMT_PACKET_RECEIVED:   /* From DRV. */
-                SkRlmtEvtPacketRx(pAC, IoC, Para);
-                break;
-        case SK_RLMT_STATS_CLEAR:       /* From PNMI. */
-                SkRlmtEvtStatsClear(pAC, IoC, Para);
-                break;
-        case SK_RLMT_STATS_UPDATE:      /* From PNMI. */
-                SkRlmtEvtStatsUpdate(pAC, IoC, Para);
-                break;
-        case SK_RLMT_PREFPORT_CHANGE:   /* From PNMI. */
-                SkRlmtEvtPrefportChange(pAC, IoC, Para);
-                break;
-        case SK_RLMT_MODE_CHANGE:       /* From PNMI. */
-                SkRlmtEvtModeChange(pAC, IoC, Para);
-                break;
-        case SK_RLMT_SET_NETS:  /* From DRV. */
-                SkRlmtEvtSetNets(pAC, IoC, Para);
-                break;
-
-        /* ----- Unknown events ----- */
-
-        default:        /* Create error log entry. */
-                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-                        ("Unknown RLMT Event %d.\n", Event))
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E003, SKERR_RLMT_E003_MSG);
-                break;
-        }       /* switch() */
-
-        return (0);
-}       /* SkRlmtEvent */
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
diff --git a/drivers/net/sk98lin/sktimer.c b/drivers/net/sk98lin/sktimer.c
deleted file mode 100644
index 4e462955ecd8..000000000000
--- a/drivers/net/sk98lin/sktimer.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/******************************************************************************
- *
- * Name:        sktimer.c
- * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:     $Revision: 1.14 $
- * Date:        $Date: 2003/09/16 13:46:51 $
- * Purpose:     High level timer functions.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect GmbH.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-
-/*
- *      Event queue and dispatcher
- */
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: sktimer.c,v 1.14 2003/09/16 13:46:51 rschmidt Exp $ (C) Marvell.";
-#endif
-
-#include "h/skdrv1st.h"         /* Driver Specific Definitions */
-#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
-
-#ifdef __C2MAN__
-/*
-        Event queue management.
-
-        General Description:
-
- */
-intro()
-{}
-#endif
-
-
-/* Forward declaration */
-static void timer_done(SK_AC *pAC,SK_IOC Ioc,int Restart);
-
-
-/*
- * Inits the software timer
- *
- * needs to be called during Init level 1.
- */
-void    SkTimerInit(
-SK_AC   *pAC,           /* Adapters context */
-SK_IOC  Ioc,            /* IoContext */
-int             Level)          /* Init Level */
-{
-        switch (Level) {
-        case SK_INIT_DATA:
-                pAC->Tim.StQueue = NULL;
-                break;
-        case SK_INIT_IO:
-                SkHwtInit(pAC, Ioc);
-                SkTimerDone(pAC, Ioc);
-                break;
-        default:
-                break;
-        }
-}
-
-/*
- * Stops a high level timer
- * - If a timer is not in the queue the function returns normally, too.
- */
-void    SkTimerStop(
-SK_AC           *pAC,           /* Adapters context */
-SK_IOC          Ioc,            /* IoContext */
-SK_TIMER        *pTimer)        /* Timer Pointer to be started */
-{
-        SK_TIMER        **ppTimPrev;
-        SK_TIMER        *pTm;
-
-        /*
-         * remove timer from queue
-         */
-        pTimer->TmActive = SK_FALSE;
-        
-        if (pAC->Tim.StQueue == pTimer && !pTimer->TmNext) {
-                SkHwtStop(pAC, Ioc);
-        }
-        
-        for (ppTimPrev = &pAC->Tim.StQueue; (pTm = *ppTimPrev);
-                ppTimPrev = &pTm->TmNext ) {
-                
-                if (pTm == pTimer) {
-                        /*
-                         * Timer found in queue
-                         * - dequeue it and
-                         * - correct delta of the next timer
-                         */
-                        *ppTimPrev = pTm->TmNext;
-
-                        if (pTm->TmNext) {
-                                /* correct delta of next timer in queue */
-                                pTm->TmNext->TmDelta += pTm->TmDelta;
-                        }
-                        return;
-                }
-        }
-}
-
-/*
- * Start a high level software timer
- */
-void    SkTimerStart(
-SK_AC           *pAC,           /* Adapters context */
-SK_IOC          Ioc,            /* IoContext */
-SK_TIMER        *pTimer,        /* Timer Pointer to be started */
-SK_U32          Time,           /* Time value */
-SK_U32          Class,          /* Event Class for this timer */
-SK_U32          Event,          /* Event Value for this timer */
-SK_EVPARA       Para)           /* Event Parameter for this timer */
-{
-        SK_TIMER        **ppTimPrev;
-        SK_TIMER        *pTm;
-        SK_U32          Delta;
-
-        Time /= 16;             /* input is uS, clock ticks are 16uS */
-        
-        if (!Time)
-                Time = 1;
-
-        SkTimerStop(pAC, Ioc, pTimer);
-
-        pTimer->TmClass = Class;
-        pTimer->TmEvent = Event;
-        pTimer->TmPara = Para;
-        pTimer->TmActive = SK_TRUE;
-
-        if (!pAC->Tim.StQueue) {
-                /* First Timer to be started */
-                pAC->Tim.StQueue = pTimer;
-                pTimer->TmNext = NULL;
-                pTimer->TmDelta = Time;
-                
-                SkHwtStart(pAC, Ioc, Time);
-                
-                return;
-        }
-
-        /*
-         * timer correction
-         */
-        timer_done(pAC, Ioc, 0);
-
-        /*
-         * find position in queue
-         */
-        Delta = 0;
-        for (ppTimPrev = &pAC->Tim.StQueue; (pTm = *ppTimPrev);
-                ppTimPrev = &pTm->TmNext ) {
-                
-                if (Delta + pTm->TmDelta > Time) {
-                        /* Position found */
-                        /* Here the timer needs to be inserted. */
-                        break;
-                }
-                Delta += pTm->TmDelta;
-        }
-
-        /* insert in queue */
-        *ppTimPrev = pTimer;
-        pTimer->TmNext = pTm;
-        pTimer->TmDelta = Time - Delta;
-
-        if (pTm) {
-                /* There is a next timer
-                 * -> correct its Delta value.
-                 */
-                pTm->TmDelta -= pTimer->TmDelta;
-        }
-
-        /* restart with first */
-        SkHwtStart(pAC, Ioc, pAC->Tim.StQueue->TmDelta);
-}
-
-
-void    SkTimerDone(
-SK_AC   *pAC,           /* Adapters context */
-SK_IOC  Ioc)            /* IoContext */
-{
-        timer_done(pAC, Ioc, 1);
-}
-
-
-static void     timer_done(
-SK_AC   *pAC,           /* Adapters context */
-SK_IOC  Ioc,            /* IoContext */
-int             Restart)        /* Do we need to restart the Hardware timer ? */
-{
-        SK_U32          Delta;
-        SK_TIMER        *pTm;
-        SK_TIMER        *pTComp;        /* Timer completed now now */
-        SK_TIMER        **ppLast;       /* Next field of Last timer to be deq */
-        int             Done = 0;
-
-        Delta = SkHwtRead(pAC, Ioc);
-        
-        ppLast = &pAC->Tim.StQueue;
-        pTm = pAC->Tim.StQueue;
-        while (pTm && !Done) {
-                if (Delta >= pTm->TmDelta) {
-                        /* Timer ran out */
-                        pTm->TmActive = SK_FALSE;
-                        Delta -= pTm->TmDelta;
-                        ppLast = &pTm->TmNext;
-                        pTm = pTm->TmNext;
-                }
-                else {
-                        /* We found the first timer that did not run out */
-                        pTm->TmDelta -= Delta;
-                        Delta = 0;
-                        Done = 1;
-                }
-        }
-        *ppLast = NULL;
-        /*
-         * pTm points to the first Timer that did not run out.
-         * StQueue points to the first Timer that run out.
-         */
-
-        for ( pTComp = pAC->Tim.StQueue; pTComp; pTComp = pTComp->TmNext) {
-                SkEventQueue(pAC,pTComp->TmClass, pTComp->TmEvent, pTComp->TmPara);
-        }
-
-        /* Set head of timer queue to the first timer that did not run out */
-        pAC->Tim.StQueue = pTm;
-
-        if (Restart && pAC->Tim.StQueue) {
-                /* Restart HW timer */
-                SkHwtStart(pAC, Ioc, pAC->Tim.StQueue->TmDelta);
-        }
-}
-
-/* End of file */
diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c
deleted file mode 100644
index 1e662aaebf84..000000000000
--- a/drivers/net/sk98lin/skvpd.c
+++ /dev/null
@@ -1,1091 +0,0 @@
-/******************************************************************************
- *
- * Name:        skvpd.c
- * Project:     GEnesis, PCI Gigabit Ethernet Adapter
- * Version:     $Revision: 1.37 $
- * Date:        $Date: 2003/01/13 10:42:45 $
- * Purpose:     Shared software to read and write VPD data
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2003 SysKonnect GmbH.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
-        Please refer skvpd.txt for information how to include this module
- */
-static const char SysKonnectFileId[] =
-        "@(#)$Id: skvpd.c,v 1.37 2003/01/13 10:42:45 rschmidt Exp $ (C) SK";
-
-#include "h/skdrv1st.h"
-#include "h/sktypes.h"
-#include "h/skdebug.h"
-#include "h/skdrv2nd.h"
-
-/*
- * Static functions
- */
-#ifndef SK_KR_PROTO
-static SK_VPD_PARA      *vpd_find_para(
-        SK_AC   *pAC,
-        const char      *key,
-        SK_VPD_PARA *p);
-#else   /* SK_KR_PROTO */
-static SK_VPD_PARA      *vpd_find_para();
-#endif  /* SK_KR_PROTO */
-
-/*
- * waits for a completion of a VPD transfer
- * The VPD transfer must complete within SK_TICKS_PER_SEC/16
- *
- * returns      0:      success, transfer completes
- *              error   exit(9) with a error message
- */
-static int VpdWait(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC,    /* IO Context */
-int             event)  /* event to wait for (VPD_READ / VPD_write) completion*/
-{
-        SK_U64  start_time;
-        SK_U16  state;
-
-        SK_DBG_MSG(pAC,SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("VPD wait for %s\n", event?"Write":"Read"));
-        start_time = SkOsGetTime(pAC);
-        do {
-                if (SkOsGetTime(pAC) - start_time > SK_TICKS_PER_SEC) {
-
-                        /* Bug fix AF: Thu Mar 28 2002
-                         * Do not call: VPD_STOP(pAC, IoC);
-                         * A pending VPD read cycle can not be aborted by writing
-                         * VPD_WRITE to the PCI_VPD_ADR_REG (VPD address register).
-                         * Although the write threshold in the OUR-register protects
-                         * VPD read only space from being overwritten this does not
-                         * protect a VPD read from being `converted` into a VPD write
-                         * operation (on the fly). As a consequence the VPD_STOP would
-                         * delete VPD read only data. In case of any problems with the
-                         * I2C bus we exit the loop here. The I2C read operation can
-                         * not be aborted except by a reset (->LR).
-                         */
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_FATAL | SK_DBGCAT_ERR,
-                                ("ERROR:VPD wait timeout\n"));
-                        return(1);
-                }
-                
-                VPD_IN16(pAC, IoC, PCI_VPD_ADR_REG, &state);
-                
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                        ("state = %x, event %x\n",state,event));
-        } while((int)(state & PCI_VPD_FLAG) == event);
-
-        return(0);
-}
-
-#ifdef SKDIAG
-
-/*
- * Read the dword at address 'addr' from the VPD EEPROM.
- *
- * Needed Time: MIN 1,3 ms      MAX 2,6 ms
- *
- * Note: The DWord is returned in the endianess of the machine the routine
- *       is running on.
- *
- * Returns the data read.
- */
-SK_U32 VpdReadDWord(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC,    /* IO Context */
-int             addr)   /* VPD address */
-{
-        SK_U32  Rtv;
-
-        /* start VPD read */
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("VPD read dword at 0x%x\n",addr));
-        addr &= ~VPD_WRITE;             /* ensure the R/W bit is set to read */
-
-        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, (SK_U16)addr);
-
-        /* ignore return code here */
-        (void)VpdWait(pAC, IoC, VPD_READ);
-
-        /* Don't swap here, it's a data stream of bytes */
-        Rtv = 0;
-
-        VPD_IN32(pAC, IoC, PCI_VPD_DAT_REG, &Rtv);
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("VPD read dword data = 0x%x\n",Rtv));
-        return(Rtv);
-}
-
-#endif  /* SKDIAG */
-
-/*
- *      Read one Stream of 'len' bytes of VPD data, starting at 'addr' from
- *      or to the I2C EEPROM.
- *
- * Returns number of bytes read / written.
- */
-static int VpdWriteStream(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC,    /* IO Context */
-char    *buf,   /* data buffer */
-int             Addr,   /* VPD start address */
-int             Len)    /* number of bytes to read / to write */
-{
-        int             i;
-        int             j;
-        SK_U16  AdrReg;
-        int             Rtv;
-        SK_U8   * pComp;        /* Compare pointer */
-        SK_U8   Data;           /* Input Data for Compare */
-
-        /* Init Compare Pointer */
-        pComp = (SK_U8 *) buf;
-
-        for (i = 0; i < Len; i++, buf++) {
-                if ((i%sizeof(SK_U32)) == 0) {
-                        /*
-                         * At the begin of each cycle read the Data Reg
-                         * So it is initialized even if only a few bytes
-                         * are written.
-                         */
-                        AdrReg = (SK_U16) Addr;
-                        AdrReg &= ~VPD_WRITE;   /* READ operation */
-
-                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
-
-                        /* Wait for termination */
-                        Rtv = VpdWait(pAC, IoC, VPD_READ);
-                        if (Rtv != 0) {
-                                return(i);
-                        }
-                }
-
-                /* Write current Byte */
-                VPD_OUT8(pAC, IoC, PCI_VPD_DAT_REG + (i%sizeof(SK_U32)),
-                                *(SK_U8*)buf);
-
-                if (((i%sizeof(SK_U32)) == 3) || (i == (Len - 1))) {
-                        /* New Address needs to be written to VPD_ADDR reg */
-                        AdrReg = (SK_U16) Addr;
-                        Addr += sizeof(SK_U32);
-                        AdrReg |= VPD_WRITE;    /* WRITE operation */
-
-                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
-
-                        /* Wait for termination */
-                        Rtv = VpdWait(pAC, IoC, VPD_WRITE);
-                        if (Rtv != 0) {
-                                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                        ("Write Timed Out\n"));
-                                return(i - (i%sizeof(SK_U32)));
-                        }
-
-                        /*
-                         * Now re-read to verify
-                         */
-                        AdrReg &= ~VPD_WRITE;   /* READ operation */
-
-                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
-
-                        /* Wait for termination */
-                        Rtv = VpdWait(pAC, IoC, VPD_READ);
-                        if (Rtv != 0) {
-                                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                        ("Verify Timed Out\n"));
-                                return(i - (i%sizeof(SK_U32)));
-                        }
-
-                        for (j = 0; j <= (int)(i%sizeof(SK_U32)); j++, pComp++) {
-                                
-                                VPD_IN8(pAC, IoC, PCI_VPD_DAT_REG + j, &Data);
-                                
-                                if (Data != *pComp) {
-                                        /* Verify Error */
-                                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                                ("WriteStream Verify Error\n"));
-                                        return(i - (i%sizeof(SK_U32)) + j);
-                                }
-                        }
-                }
-        }
-
-        return(Len);
-}
-        
-
-/*
- *      Read one Stream of 'len' bytes of VPD data, starting at 'addr' from
- *      or to the I2C EEPROM.
- *
- * Returns number of bytes read / written.
- */
-static int VpdReadStream(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC,    /* IO Context */
-char    *buf,   /* data buffer */
-int             Addr,   /* VPD start address */
-int             Len)    /* number of bytes to read / to write */
-{
-        int             i;
-        SK_U16  AdrReg;
-        int             Rtv;
-
-        for (i = 0; i < Len; i++, buf++) {
-                if ((i%sizeof(SK_U32)) == 0) {
-                        /* New Address needs to be written to VPD_ADDR reg */
-                        AdrReg = (SK_U16) Addr;
-                        Addr += sizeof(SK_U32);
-                        AdrReg &= ~VPD_WRITE;   /* READ operation */
-
-                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
-
-                        /* Wait for termination */
-                        Rtv = VpdWait(pAC, IoC, VPD_READ);
-                        if (Rtv != 0) {
-                                return(i);
-                        }
-                }
-                VPD_IN8(pAC, IoC, PCI_VPD_DAT_REG + (i%sizeof(SK_U32)),
-                        (SK_U8 *)buf);
-        }
-
-        return(Len);
-}
-
-/*
- *      Read ore writes 'len' bytes of VPD data, starting at 'addr' from
- *      or to the I2C EEPROM.
- *
- * Returns number of bytes read / written.
- */
-static int VpdTransferBlock(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC,    /* IO Context */
-char    *buf,   /* data buffer */
-int             addr,   /* VPD start address */
-int             len,    /* number of bytes to read / to write */
-int             dir)    /* transfer direction may be VPD_READ or VPD_WRITE */
-{
-        int             Rtv;    /* Return value */
-        int             vpd_rom_size;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("VPD %s block, addr = 0x%x, len = %d\n",
-                dir ? "write" : "read", addr, len));
-
-        if (len == 0)
-                return(0);
-
-        vpd_rom_size = pAC->vpd.rom_size;
-        
-        if (addr > vpd_rom_size - 4) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Address error: 0x%x, exp. < 0x%x\n",
-                        addr, vpd_rom_size - 4));
-                return(0);
-        }
-        
-        if (addr + len > vpd_rom_size) {
-                len = vpd_rom_size - addr;
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("Warning: len was cut to %d\n", len));
-        }
-
-        if (dir == VPD_READ) {
-                Rtv = VpdReadStream(pAC, IoC, buf, addr, len);
-        }
-        else {
-                Rtv = VpdWriteStream(pAC, IoC, buf, addr, len);
-        }
-
-        return(Rtv);
-}
-
-#ifdef SKDIAG
-
-/*
- *      Read 'len' bytes of VPD data, starting at 'addr'.
- *
- * Returns number of bytes read.
- */
-int VpdReadBlock(
-SK_AC   *pAC,   /* pAC pointer */
-SK_IOC  IoC,    /* IO Context */
-char    *buf,   /* buffer were the data should be stored */
-int             addr,   /* start reading at the VPD address */
-int             len)    /* number of bytes to read */
-{
-        return(VpdTransferBlock(pAC, IoC, buf, addr, len, VPD_READ));
-}
-
-/*
- *      Write 'len' bytes of *but to the VPD EEPROM, starting at 'addr'.
- *
- * Returns number of bytes writes.
- */
-int VpdWriteBlock(
-SK_AC   *pAC,   /* pAC pointer */
-SK_IOC  IoC,    /* IO Context */
-char    *buf,   /* buffer, holds the data to write */
-int             addr,   /* start writing at the VPD address */
-int             len)    /* number of bytes to write */
-{
-        return(VpdTransferBlock(pAC, IoC, buf, addr, len, VPD_WRITE));
-}
-#endif  /* SKDIAG */
-
-/*
- * (re)initialize the VPD buffer
- *
- * Reads the VPD data from the EEPROM into the VPD buffer.
- * Get the remaining read only and read / write space.
- *
- * return       0:      success
- *              1:      fatal VPD error
- */
-static int VpdInit(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC)    /* IO Context */
-{
-        SK_VPD_PARA *r, rp;     /* RW or RV */
-        int             i;
-        unsigned char   x;
-        int             vpd_size;
-        SK_U16  dev_id;
-        SK_U32  our_reg2;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_INIT, ("VpdInit .. "));
-        
-        VPD_IN16(pAC, IoC, PCI_DEVICE_ID, &dev_id);
-        
-        VPD_IN32(pAC, IoC, PCI_OUR_REG_2, &our_reg2);
-        
-        pAC->vpd.rom_size = 256 << ((our_reg2 & PCI_VPD_ROM_SZ) >> 14);
-        
-        /*
-         * this function might get used before the hardware is initialized
-         * therefore we cannot always trust in GIChipId
-         */
-        if (((pAC->vpd.v.vpd_status & VPD_VALID) == 0 &&
-                dev_id != VPD_DEV_ID_GENESIS) ||
-                ((pAC->vpd.v.vpd_status & VPD_VALID) != 0 &&
-                !pAC->GIni.GIGenesis)) {
-
-                /* for Yukon the VPD size is always 256 */
-                vpd_size = VPD_SIZE_YUKON;
-        }
-        else {
-                /* Genesis uses the maximum ROM size up to 512 for VPD */
-                if (pAC->vpd.rom_size > VPD_SIZE_GENESIS) {
-                        vpd_size = VPD_SIZE_GENESIS;
-                }
-                else {
-                        vpd_size = pAC->vpd.rom_size;
-                }
-        }
-
-        /* read the VPD data into the VPD buffer */
-        if (VpdTransferBlock(pAC, IoC, pAC->vpd.vpd_buf, 0, vpd_size, VPD_READ)
-                != vpd_size) {
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("Block Read Error\n"));
-                return(1);
-        }
-        
-        pAC->vpd.vpd_size = vpd_size;
-
-        /* Asus K8V Se Deluxe bugfix. Correct VPD content */
-        /* MBo April 2004 */
-        if (((unsigned char)pAC->vpd.vpd_buf[0x3f] == 0x38) &&
-            ((unsigned char)pAC->vpd.vpd_buf[0x40] == 0x3c) &&
-            ((unsigned char)pAC->vpd.vpd_buf[0x41] == 0x45)) {
-                printk("sk98lin: Asus mainboard with buggy VPD? "
-                                "Correcting data.\n");
-                pAC->vpd.vpd_buf[0x40] = 0x38;
-        }
-
-
-        /* find the end tag of the RO area */
-        if (!(r = vpd_find_para(pAC, VPD_RV, &rp))) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Encoding Error: RV Tag not found\n"));
-                return(1);
-        }
-        
-        if (r->p_val + r->p_len > pAC->vpd.vpd_buf + vpd_size/2) {
-                SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Encoding Error: Invalid VPD struct size\n"));
-                return(1);
-        }
-        pAC->vpd.v.vpd_free_ro = r->p_len - 1;
-
-        /* test the checksum */
-        for (i = 0, x = 0; (unsigned)i <= (unsigned)vpd_size/2 - r->p_len; i++) {
-                x += pAC->vpd.vpd_buf[i];
-        }
-        
-        if (x != 0) {
-                /* checksum error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("VPD Checksum Error\n"));
-                return(1);
-        }
-
-        /* find and check the end tag of the RW area */
-        if (!(r = vpd_find_para(pAC, VPD_RW, &rp))) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Encoding Error: RV Tag not found\n"));
-                return(1);
-        }
-        
-        if (r->p_val < pAC->vpd.vpd_buf + vpd_size/2) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Encoding Error: Invalid VPD struct size\n"));
-                return(1);
-        }
-        pAC->vpd.v.vpd_free_rw = r->p_len;
-
-        /* everything seems to be ok */
-        if (pAC->GIni.GIChipId != 0) {
-                pAC->vpd.v.vpd_status |= VPD_VALID;
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_INIT,
-                ("done. Free RO = %d, Free RW = %d\n",
-                pAC->vpd.v.vpd_free_ro, pAC->vpd.v.vpd_free_rw));
-
-        return(0);
-}
-
-/*
- *      find the Keyword 'key' in the VPD buffer and fills the
- *      parameter struct 'p' with it's values
- *
- * returns      *p      success
- *              0:      parameter was not found or VPD encoding error
- */
-static SK_VPD_PARA *vpd_find_para(
-SK_AC           *pAC,   /* common data base */
-const char      *key,   /* keyword to find (e.g. "MN") */
-SK_VPD_PARA *p)         /* parameter description struct */
-{
-        char *v ;       /* points to VPD buffer */
-        int max;        /* Maximum Number of Iterations */
-
-        v = pAC->vpd.vpd_buf;
-        max = 128;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("VPD find para %s .. ",key));
-
-        /* check mandatory resource type ID string (Product Name) */
-        if (*v != (char)RES_ID) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Error: 0x%x missing\n", RES_ID));
-                return NULL;
-        }
-
-        if (strcmp(key, VPD_NAME) == 0) {
-                p->p_len = VPD_GET_RES_LEN(v);
-                p->p_val = VPD_GET_VAL(v);
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                        ("found, len = %d\n", p->p_len));
-                return(p);
-        }
-
-        v += 3 + VPD_GET_RES_LEN(v) + 3;
-        for (;; ) {
-                if (SK_MEMCMP(key,v,2) == 0) {
-                        p->p_len = VPD_GET_VPD_LEN(v);
-                        p->p_val = VPD_GET_VAL(v);
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                                ("found, len = %d\n",p->p_len));
-                        return(p);
-                }
-
-                /* exit when reaching the "RW" Tag or the maximum of itera. */
-                max--;
-                if (SK_MEMCMP(VPD_RW,v,2) == 0 || max == 0) {
-                        break;
-                }
-
-                if (SK_MEMCMP(VPD_RV,v,2) == 0) {
-                        v += 3 + VPD_GET_VPD_LEN(v) + 3;        /* skip VPD-W */
-                }
-                else {
-                        v += 3 + VPD_GET_VPD_LEN(v);
-                }
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                        ("scanning '%c%c' len = %d\n",v[0],v[1],v[2]));
-        }
-
-#ifdef DEBUG
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL, ("not found\n"));
-        if (max == 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Key/Len Encoding error\n"));
-        }
-#endif /* DEBUG */
-        return NULL;
-}
-
-/*
- *      Move 'n' bytes. Begin with the last byte if 'n' is > 0,
- *      Start with the last byte if n is < 0.
- *
- * returns nothing
- */
-static void vpd_move_para(
-char    *start,         /* start of memory block */
-char    *end,           /* end of memory block to move */
-int             n)                      /* number of bytes the memory block has to be moved */
-{
-        char *p;
-        int i;          /* number of byte copied */
-
-        if (n == 0)
-                return;
-
-        i = (int) (end - start + 1);
-        if (n < 0) {
-                p = start + n;
-                while (i != 0) {
-                        *p++ = *start++;
-                        i--;
-                }
-        }
-        else {
-                p = end + n;
-                while (i != 0) {
-                        *p-- = *end--;
-                        i--;
-                }
-        }
-}
-
-/*
- *      setup the VPD keyword 'key' at 'ip'.
- *
- * returns nothing
- */
-static void vpd_insert_key(
-const char      *key,   /* keyword to insert */
-const char      *buf,   /* buffer with the keyword value */
-int             len,            /* length of the value string */
-char    *ip)            /* inseration point */
-{
-        SK_VPD_KEY *p;
-
-        p = (SK_VPD_KEY *) ip;
-        p->p_key[0] = key[0];
-        p->p_key[1] = key[1];
-        p->p_len = (unsigned char) len;
-        SK_MEMCPY(&p->p_val,buf,len);
-}
-
-/*
- *      Setup the VPD end tag "RV" / "RW".
- *      Also correct the remaining space variables vpd_free_ro / vpd_free_rw.
- *
- * returns      0:      success
- *              1:      encoding error
- */
-static int vpd_mod_endtag(
-SK_AC   *pAC,           /* common data base */
-char    *etp)           /* end pointer input position */
-{
-        SK_VPD_KEY *p;
-        unsigned char   x;
-        int     i;
-        int     vpd_size;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("VPD modify endtag at 0x%x = '%c%c'\n",etp,etp[0],etp[1]));
-
-        vpd_size = pAC->vpd.vpd_size;
-
-        p = (SK_VPD_KEY *) etp;
-
-        if (p->p_key[0] != 'R' || (p->p_key[1] != 'V' && p->p_key[1] != 'W')) {
-                /* something wrong here, encoding error */
-                SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
-                        ("Encoding Error: invalid end tag\n"));
-                return(1);
-        }
-        if (etp > pAC->vpd.vpd_buf + vpd_size/2) {
-                /* create "RW" tag */
-                p->p_len = (unsigned char)(pAC->vpd.vpd_buf+vpd_size-etp-3-1);
-                pAC->vpd.v.vpd_free_rw = (int) p->p_len;
-                i = pAC->vpd.v.vpd_free_rw;
-                etp += 3;
-        }
-        else {
-                /* create "RV" tag */
-                p->p_len = (unsigned char)(pAC->vpd.vpd_buf+vpd_size/2-etp-3);
-                pAC->vpd.v.vpd_free_ro = (int) p->p_len - 1;
-
-                /* setup checksum */
-                for (i = 0, x = 0; i < vpd_size/2 - p->p_len; i++) {
-                        x += pAC->vpd.vpd_buf[i];
-                }
-                p->p_val = (char) 0 - x;
-                i = pAC->vpd.v.vpd_free_ro;
-                etp += 4;
-        }
-        while (i) {
-                *etp++ = 0x00;
-                i--;
-        }
-
-        return(0);
-}
-
-/*
- *      Insert a VPD keyword into the VPD buffer.
- *
- *      The keyword 'key' is inserted at the position 'ip' in the
- *      VPD buffer.
- *      The keywords behind the input position will
- *      be moved. The VPD end tag "RV" or "RW" is generated again.
- *
- * returns      0:      success
- *              2:      value string was cut
- *              4:      VPD full, keyword was not written
- *              6:      fatal VPD error
- *
- */
-static int      VpdSetupPara(
-SK_AC   *pAC,           /* common data base */
-const char      *key,   /* keyword to insert */
-const char      *buf,   /* buffer with the keyword value */
-int             len,            /* length of the keyword value */
-int             type,           /* VPD_RO_KEY or VPD_RW_KEY */
-int             op)                     /* operation to do: ADD_KEY or OWR_KEY */
-{
-        SK_VPD_PARA vp;
-        char    *etp;           /* end tag position */
-        int     free;           /* remaining space in selected area */
-        char    *ip;            /* input position inside the VPD buffer */
-        int     rtv;            /* return code */
-        int     head;           /* additional haeder bytes to move */
-        int     found;          /* additinoal bytes if the keyword was found */
-        int vpd_size;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("VPD setup para key = %s, val = %s\n",key,buf));
-        
-        vpd_size = pAC->vpd.vpd_size;
-
-        rtv = 0;
-        ip = NULL;
-        if (type == VPD_RW_KEY) {
-                /* end tag is "RW" */
-                free = pAC->vpd.v.vpd_free_rw;
-                etp = pAC->vpd.vpd_buf + (vpd_size - free - 1 - 3);
-        }
-        else {
-                /* end tag is "RV" */
-                free = pAC->vpd.v.vpd_free_ro;
-                etp = pAC->vpd.vpd_buf + (vpd_size/2 - free - 4);
-        }
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                ("Free RO = %d, Free RW = %d\n",
-                pAC->vpd.v.vpd_free_ro, pAC->vpd.v.vpd_free_rw));
-
-        head = 0;
-        found = 0;
-        if (op == OWR_KEY) {
-                if (vpd_find_para(pAC, key, &vp)) {
-                        found = 3;
-                        ip = vp.p_val - 3;
-                        free += vp.p_len + 3;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                                ("Overwrite Key\n"));
-                }
-                else {
-                        op = ADD_KEY;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
-                                ("Add Key\n"));
-                }
-        }
-        if (op == ADD_KEY) {
-                ip = etp;
-                vp.p_len = 0;
-                head = 3;
-        }
-
-        if (len + 3 > free) {
-                if (free < 7) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("VPD Buffer Overflow, keyword not written\n"));
-                        return(4);
-                }
-                /* cut it again */
-                len = free - 3;
-                rtv = 2;
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("VPD Buffer Full, Keyword was cut\n"));
-        }
-
-        vpd_move_para(ip + vp.p_len + found, etp+2, len-vp.p_len+head);
-        vpd_insert_key(key, buf, len, ip);
-        if (vpd_mod_endtag(pAC, etp + len - vp.p_len + head)) {
-                pAC->vpd.v.vpd_status &= ~VPD_VALID;
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("VPD Encoding Error\n"));
-                return(6);
-        }
-
-        return(rtv);
-}
-
-
-/*
- *      Read the contents of the VPD EEPROM and copy it to the
- *      VPD buffer if not already done.
- *
- * return:      A pointer to the vpd_status structure. The structure contains
- *              this fields.
- */
-SK_VPD_STATUS *VpdStat(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC)    /* IO Context */
-{
-        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
-                (void)VpdInit(pAC, IoC);
-        }
-        return(&pAC->vpd.v);
-}
-
-
-/*
- *      Read the contents of the VPD EEPROM and copy it to the VPD
- *      buffer if not already done.
- *      Scan the VPD buffer for VPD keywords and create the VPD
- *      keyword list by copying the keywords to 'buf', all after
- *      each other and terminated with a '\0'.
- *
- * Exceptions:  o The Resource Type ID String (product name) is called "Name"
- *              o The VPD end tags 'RV' and 'RW' are not listed
- *
- *      The number of copied keywords is counted in 'elements'.
- *
- * returns      0:      success
- *              2:      buffer overfull, one or more keywords are missing
- *              6:      fatal VPD error
- *
- *      example values after returning:
- *
- *              buf =   "Name\0PN\0EC\0MN\0SN\0CP\0VF\0VL\0YA\0"
- *              *len =          30
- *              *elements =      9
- */
-int VpdKeys(
-SK_AC   *pAC,           /* common data base */
-SK_IOC  IoC,            /* IO Context */
-char    *buf,           /* buffer where to copy the keywords */
-int             *len,           /* buffer length */
-int             *elements)      /* number of keywords returned */
-{
-        char *v;
-        int n;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX, ("list VPD keys .. "));
-        *elements = 0;
-        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
-                if (VpdInit(pAC, IoC) != 0) {
-                        *len = 0;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("VPD Init Error, terminated\n"));
-                        return(6);
-                }
-        }
-
-        if ((signed)strlen(VPD_NAME) + 1 <= *len) {
-                v = pAC->vpd.vpd_buf;
-                strcpy(buf,VPD_NAME);
-                n = strlen(VPD_NAME) + 1;
-                buf += n;
-                *elements = 1;
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX,
-                        ("'%c%c' ",v[0],v[1]));
-        }
-        else {
-                *len = 0;
-                SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR,
-                        ("buffer overflow\n"));
-                return(2);
-        }
-
-        v += 3 + VPD_GET_RES_LEN(v) + 3;
-        for (;; ) {
-                /* exit when reaching the "RW" Tag */
-                if (SK_MEMCMP(VPD_RW,v,2) == 0) {
-                        break;
-                }
-
-                if (SK_MEMCMP(VPD_RV,v,2) == 0) {
-                        v += 3 + VPD_GET_VPD_LEN(v) + 3;        /* skip VPD-W */
-                        continue;
-                }
-
-                if (n+3 <= *len) {
-                        SK_MEMCPY(buf,v,2);
-                        buf += 2;
-                        *buf++ = '\0';
-                        n += 3;
-                        v += 3 + VPD_GET_VPD_LEN(v);
-                        *elements += 1;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX,
-                                ("'%c%c' ",v[0],v[1]));
-                }
-                else {
-                        *len = n;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("buffer overflow\n"));
-                        return(2);
-                }
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX, ("\n"));
-        *len = n;
-        return(0);
-}
-
-
-/*
- *      Read the contents of the VPD EEPROM and copy it to the
- *      VPD buffer if not already done. Search for the VPD keyword
- *      'key' and copy its value to 'buf'. Add a terminating '\0'.
- *      If the value does not fit into the buffer cut it after
- *      'len' - 1 bytes.
- *
- * returns      0:      success
- *              1:      keyword not found
- *              2:      value string was cut
- *              3:      VPD transfer timeout
- *              6:      fatal VPD error
- */
-int VpdRead(
-SK_AC           *pAC,   /* common data base */
-SK_IOC          IoC,    /* IO Context */
-const char      *key,   /* keyword to read (e.g. "MN") */
-char            *buf,   /* buffer where to copy the keyword value */
-int                     *len)   /* buffer length */
-{
-        SK_VPD_PARA *p, vp;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX, ("VPD read %s .. ", key));
-        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
-                if (VpdInit(pAC, IoC) != 0) {
-                        *len = 0;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("VPD init error\n"));
-                        return(6);
-                }
-        }
-
-        if ((p = vpd_find_para(pAC, key, &vp)) != NULL) {
-                if (p->p_len > (*(unsigned *)len)-1) {
-                        p->p_len = *len - 1;
-                }
-                SK_MEMCPY(buf, p->p_val, p->p_len);
-                buf[p->p_len] = '\0';
-                *len = p->p_len;
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX,
-                        ("%c%c%c%c.., len = %d\n",
-                        buf[0],buf[1],buf[2],buf[3],*len));
-        }
-        else {
-                *len = 0;
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR, ("not found\n"));
-                return(1);
-        }
-        return(0);
-}
-
-
-/*
- *      Check whether a given key may be written
- *
- * returns
- *      SK_TRUE         Yes it may be written
- *      SK_FALSE        No it may be written
- */
-SK_BOOL VpdMayWrite(
-char    *key)   /* keyword to write (allowed values "Yx", "Vx") */
-{
-        if ((*key != 'Y' && *key != 'V') ||
-                key[1] < '0' || key[1] > 'Z' ||
-                (key[1] > '9' && key[1] < 'A') || strlen(key) != 2) {
-
-                return(SK_FALSE);
-        }
-        return(SK_TRUE);
-}
-
-/*
- *      Read the contents of the VPD EEPROM and copy it to the VPD
- *      buffer if not already done. Insert/overwrite the keyword 'key'
- *      in the VPD buffer. Cut the keyword value if it does not fit
- *      into the VPD read / write area.
- *
- * returns      0:      success
- *              2:      value string was cut
- *              3:      VPD transfer timeout
- *              4:      VPD full, keyword was not written
- *              5:      keyword cannot be written
- *              6:      fatal VPD error
- */
-int VpdWrite(
-SK_AC           *pAC,   /* common data base */
-SK_IOC          IoC,    /* IO Context */
-const char      *key,   /* keyword to write (allowed values "Yx", "Vx") */
-const char      *buf)   /* buffer where the keyword value can be read from */
-{
-        int len;                /* length of the keyword to write */
-        int rtv;                /* return code */
-        int rtv2;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_TX,
-                ("VPD write %s = %s\n",key,buf));
-
-        if ((*key != 'Y' && *key != 'V') ||
-                key[1] < '0' || key[1] > 'Z' ||
-                (key[1] > '9' && key[1] < 'A') || strlen(key) != 2) {
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("illegal key tag, keyword not written\n"));
-                return(5);
-        }
-
-        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
-                if (VpdInit(pAC, IoC) != 0) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("VPD init error\n"));
-                        return(6);
-                }
-        }
-
-        rtv = 0;
-        len = strlen(buf);
-        if (len > VPD_MAX_LEN) {
-                /* cut it */
-                len = VPD_MAX_LEN;
-                rtv = 2;
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("keyword too long, cut after %d bytes\n",VPD_MAX_LEN));
-        }
-        if ((rtv2 = VpdSetupPara(pAC, key, buf, len, VPD_RW_KEY, OWR_KEY)) != 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("VPD write error\n"));
-                return(rtv2);
-        }
-
-        return(rtv);
-}
-
-/*
- *      Read the contents of the VPD EEPROM and copy it to the
- *      VPD buffer if not already done. Remove the VPD keyword
- *      'key' from the VPD buffer.
- *      Only the keywords in the read/write area can be deleted.
- *      Keywords in the read only area cannot be deleted.
- *
- * returns      0:      success, keyword was removed
- *              1:      keyword not found
- *              5:      keyword cannot be deleted
- *              6:      fatal VPD error
- */
-int VpdDelete(
-SK_AC   *pAC,   /* common data base */
-SK_IOC  IoC,    /* IO Context */
-char    *key)   /* keyword to read (e.g. "MN") */
-{
-        SK_VPD_PARA *p, vp;
-        char *etp;
-        int     vpd_size;
-
-        vpd_size = pAC->vpd.vpd_size;
-
-        SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_TX,("VPD delete key %s\n",key));
-        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
-                if (VpdInit(pAC, IoC) != 0) {
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("VPD init error\n"));
-                        return(6);
-                }
-        }
-
-        if ((p = vpd_find_para(pAC, key, &vp)) != NULL) {
-                if (p->p_val < pAC->vpd.vpd_buf + vpd_size/2) {
-                        /* try to delete read only keyword */
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("cannot delete RO keyword\n"));
-                        return(5);
-                }
-
-                etp = pAC->vpd.vpd_buf + (vpd_size-pAC->vpd.v.vpd_free_rw-1-3);
-
-                vpd_move_para(vp.p_val+vp.p_len, etp+2,
-                        - ((int)(vp.p_len + 3)));
-                if (vpd_mod_endtag(pAC, etp - vp.p_len - 3)) {
-                        pAC->vpd.v.vpd_status &= ~VPD_VALID;
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("VPD encoding error\n"));
-                        return(6);
-                }
-        }
-        else {
-                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                        ("keyword not found\n"));
-                return(1);
-        }
-
-        return(0);
-}
-
-/*
- *      If the VPD buffer contains valid data write the VPD
- *      read/write area back to the VPD EEPROM.
- *
- * returns      0:      success
- *              3:      VPD transfer timeout
- */
-int VpdUpdate(
-SK_AC   *pAC,   /* Adapters context */
-SK_IOC  IoC)    /* IO Context */
-{
-        int vpd_size;
-
-        vpd_size = pAC->vpd.vpd_size;
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_TX, ("VPD update .. "));
-        if ((pAC->vpd.v.vpd_status & VPD_VALID) != 0) {
-                if (VpdTransferBlock(pAC, IoC, pAC->vpd.vpd_buf + vpd_size/2,
-                        vpd_size/2, vpd_size/2, VPD_WRITE) != vpd_size/2) {
-
-                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
-                                ("transfer timed out\n"));
-                        return(3);
-                }
-        }
-        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_TX, ("done\n"));
-        return(0);
-}
-
diff --git a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c
deleted file mode 100644
index b4e75022a657..000000000000
--- a/drivers/net/sk98lin/skxmac2.c
+++ /dev/null
@@ -1,4160 +0,0 @@
-/******************************************************************************
- *
- * Name:        skxmac2.c
- * Project:     Gigabit Ethernet Adapters, Common Modules
- * Version:     $Revision: 1.102 $
- * Date:        $Date: 2003/10/02 16:53:58 $
- * Purpose:     Contains functions to initialize the MACs and PHYs
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *      (C)Copyright 1998-2002 SysKonnect.
- *      (C)Copyright 2002-2003 Marvell.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-#include "h/skdrv1st.h"
-#include "h/skdrv2nd.h"
-
-/* typedefs *******************************************************************/
-
-/* BCOM PHY magic pattern list */
-typedef struct s_PhyHack {
-        int             PhyReg;         /* Phy register */
-        SK_U16  PhyVal;         /* Value to write */
-} BCOM_HACK;
-
-/* local variables ************************************************************/
-
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-        "@(#) $Id: skxmac2.c,v 1.102 2003/10/02 16:53:58 rschmidt Exp $ (C) Marvell.";
-#endif
-
-#ifdef GENESIS
-static BCOM_HACK BcomRegA1Hack[] = {
- { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1104 }, { 0x17, 0x0013 },
- { 0x15, 0x0404 }, { 0x17, 0x8006 }, { 0x15, 0x0132 }, { 0x17, 0x8006 },
- { 0x15, 0x0232 }, { 0x17, 0x800D }, { 0x15, 0x000F }, { 0x18, 0x0420 },
- { 0, 0 }
-};
-static BCOM_HACK BcomRegC0Hack[] = {
- { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1204 }, { 0x17, 0x0013 },
- { 0x15, 0x0A04 }, { 0x18, 0x0420 },
- { 0, 0 }
-};
-#endif
-
-/* function prototypes ********************************************************/
-#ifdef GENESIS
-static void     SkXmInitPhyXmac(SK_AC*, SK_IOC, int, SK_BOOL);
-static void     SkXmInitPhyBcom(SK_AC*, SK_IOC, int, SK_BOOL);
-static int      SkXmAutoNegDoneXmac(SK_AC*, SK_IOC, int);
-static int      SkXmAutoNegDoneBcom(SK_AC*, SK_IOC, int);
-#endif /* GENESIS */
-#ifdef YUKON
-static void     SkGmInitPhyMarv(SK_AC*, SK_IOC, int, SK_BOOL);
-static int      SkGmAutoNegDoneMarv(SK_AC*, SK_IOC, int);
-#endif /* YUKON */
-#ifdef OTHER_PHY
-static void     SkXmInitPhyLone(SK_AC*, SK_IOC, int, SK_BOOL);
-static void     SkXmInitPhyNat (SK_AC*, SK_IOC, int, SK_BOOL);
-static int      SkXmAutoNegDoneLone(SK_AC*, SK_IOC, int);
-static int      SkXmAutoNegDoneNat (SK_AC*, SK_IOC, int);
-#endif /* OTHER_PHY */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmPhyRead() - Read from XMAC PHY register
- *
- * Description: reads a 16-bit word from XMAC PHY or ext. PHY
- *
- * Returns:
- *      nothing
- */
-void SkXmPhyRead(
-SK_AC   *pAC,                   /* Adapter Context */
-SK_IOC  IoC,                    /* I/O Context */
-int             Port,                   /* Port Index (MAC_1 + n) */
-int             PhyReg,                 /* Register Address (Offset) */
-SK_U16  SK_FAR *pVal)   /* Pointer to Value */
-{
-        SK_U16          Mmu;
-        SK_GEPORT       *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-        
-        /* write the PHY register's address */
-        XM_OUT16(IoC, Port, XM_PHY_ADDR, PhyReg | pPrt->PhyAddr);
-        
-        /* get the PHY register's value */
-        XM_IN16(IoC, Port, XM_PHY_DATA, pVal);
-        
-        if (pPrt->PhyType != SK_PHY_XMAC) {
-                do {
-                        XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
-                        /* wait until 'Ready' is set */
-                } while ((Mmu & XM_MMU_PHY_RDY) == 0);
-
-                /* get the PHY register's value */
-                XM_IN16(IoC, Port, XM_PHY_DATA, pVal);
-        }
-}       /* SkXmPhyRead */
-
-
-/******************************************************************************
- *
- *      SkXmPhyWrite() - Write to XMAC PHY register
- *
- * Description: writes a 16-bit word to XMAC PHY or ext. PHY
- *
- * Returns:
- *      nothing
- */
-void SkXmPhyWrite(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             PhyReg,         /* Register Address (Offset) */
-SK_U16  Val)            /* Value */
-{
-        SK_U16          Mmu;
-        SK_GEPORT       *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-        
-        if (pPrt->PhyType != SK_PHY_XMAC) {
-                do {
-                        XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
-                        /* wait until 'Busy' is cleared */
-                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);
-        }
-        
-        /* write the PHY register's address */
-        XM_OUT16(IoC, Port, XM_PHY_ADDR, PhyReg | pPrt->PhyAddr);
-        
-        /* write the PHY register's value */
-        XM_OUT16(IoC, Port, XM_PHY_DATA, Val);
-        
-        if (pPrt->PhyType != SK_PHY_XMAC) {
-                do {
-                        XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
-                        /* wait until 'Busy' is cleared */
-                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);
-        }
-}       /* SkXmPhyWrite */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkGmPhyRead() - Read from GPHY register
- *
- * Description: reads a 16-bit word from GPHY through MDIO
- *
- * Returns:
- *      nothing
- */
-void SkGmPhyRead(
-SK_AC   *pAC,                   /* Adapter Context */
-SK_IOC  IoC,                    /* I/O Context */
-int             Port,                   /* Port Index (MAC_1 + n) */
-int             PhyReg,                 /* Register Address (Offset) */
-SK_U16  SK_FAR *pVal)   /* Pointer to Value */
-{
-        SK_U16  Ctrl;
-        SK_GEPORT       *pPrt;
-#ifdef VCPU
-        u_long SimCyle;
-        u_long SimLowTime;
-        
-        VCPUgetTime(&SimCyle, &SimLowTime);
-        VCPUprintf(0, "SkGmPhyRead(%u), SimCyle=%u, SimLowTime=%u\n",
-                PhyReg, SimCyle, SimLowTime);
-#endif /* VCPU */
-        
-        pPrt = &pAC->GIni.GP[Port];
-        
-        /* set PHY-Register offset and 'Read' OpCode (= 1) */
-        *pVal = (SK_U16)(GM_SMI_CT_PHY_AD(pPrt->PhyAddr) |
-                GM_SMI_CT_REG_AD(PhyReg) | GM_SMI_CT_OP_RD);
-
-        GM_OUT16(IoC, Port, GM_SMI_CTRL, *pVal);
-
-        GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
-        
-        /* additional check for MDC/MDIO activity */
-        if ((Ctrl & GM_SMI_CT_BUSY) == 0) {
-                *pVal = 0;
-                return;
-        }
-
-        *pVal |= GM_SMI_CT_BUSY;
-        
-        do {
-#ifdef VCPU
-                VCPUwaitTime(1000);
-#endif /* VCPU */
-
-                GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
-
-        /* wait until 'ReadValid' is set */
-        } while (Ctrl == *pVal);
-        
-        /* get the PHY register's value */
-        GM_IN16(IoC, Port, GM_SMI_DATA, pVal);
-
-#ifdef VCPU
-        VCPUgetTime(&SimCyle, &SimLowTime);
-        VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
-                SimCyle, SimLowTime);
-#endif /* VCPU */
-
-}       /* SkGmPhyRead */
-
-
-/******************************************************************************
- *
- *      SkGmPhyWrite() - Write to GPHY register
- *
- * Description: writes a 16-bit word to GPHY through MDIO
- *
- * Returns:
- *      nothing
- */
-void SkGmPhyWrite(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             PhyReg,         /* Register Address (Offset) */
-SK_U16  Val)            /* Value */
-{
-        SK_U16  Ctrl;
-        SK_GEPORT       *pPrt;
-#ifdef VCPU
-        SK_U32  DWord;
-        u_long  SimCyle;
-        u_long  SimLowTime;
-        
-        VCPUgetTime(&SimCyle, &SimLowTime);
-        VCPUprintf(0, "SkGmPhyWrite(Reg=%u, Val=0x%04x), SimCyle=%u, SimLowTime=%u\n",
-                PhyReg, Val, SimCyle, SimLowTime);
-#endif /* VCPU */
-        
-        pPrt = &pAC->GIni.GP[Port];
-        
-        /* write the PHY register's value */
-        GM_OUT16(IoC, Port, GM_SMI_DATA, Val);
-        
-        /* set PHY-Register offset and 'Write' OpCode (= 0) */
-        Val = GM_SMI_CT_PHY_AD(pPrt->PhyAddr) | GM_SMI_CT_REG_AD(PhyReg);
-
-        GM_OUT16(IoC, Port, GM_SMI_CTRL, Val);
-
-        GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
-        
-        /* additional check for MDC/MDIO activity */
-        if ((Ctrl & GM_SMI_CT_BUSY) == 0) {
-                return;
-        }
-        
-        Val |= GM_SMI_CT_BUSY;
-
-        do {
-#ifdef VCPU
-                /* read Timer value */
-                SK_IN32(IoC, B2_TI_VAL, &DWord);
-
-                VCPUwaitTime(1000);
-#endif /* VCPU */
-
-                GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
-
-        /* wait until 'Busy' is cleared */
-        } while (Ctrl == Val);
-        
-#ifdef VCPU
-        VCPUgetTime(&SimCyle, &SimLowTime);
-        VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
-                SimCyle, SimLowTime);
-#endif /* VCPU */
-
-}       /* SkGmPhyWrite */
-#endif /* YUKON */
-
-
-#ifdef SK_DIAG
-/******************************************************************************
- *
- *      SkGePhyRead() - Read from PHY register
- *
- * Description: calls a read PHY routine dep. on board type
- *
- * Returns:
- *      nothing
- */
-void SkGePhyRead(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             PhyReg,         /* Register Address (Offset) */
-SK_U16  *pVal)          /* Pointer to Value */
-{
-        void (*r_func)(SK_AC *pAC, SK_IOC IoC, int Port, int Reg, SK_U16 *pVal);
-
-        if (pAC->GIni.GIGenesis) {
-                r_func = SkXmPhyRead;
-        }
-        else {
-                r_func = SkGmPhyRead;
-        }
-        
-        r_func(pAC, IoC, Port, PhyReg, pVal);
-}       /* SkGePhyRead */
-
-
-/******************************************************************************
- *
- *      SkGePhyWrite() - Write to PHY register
- *
- * Description: calls a write PHY routine dep. on board type
- *
- * Returns:
- *      nothing
- */
-void SkGePhyWrite(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* I/O Context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             PhyReg,         /* Register Address (Offset) */
-SK_U16  Val)            /* Value */
-{
-        void (*w_func)(SK_AC *pAC, SK_IOC IoC, int Port, int Reg, SK_U16 Val);
-
-        if (pAC->GIni.GIGenesis) {
-                w_func = SkXmPhyWrite;
-        }
-        else {
-                w_func = SkGmPhyWrite;
-        }
-        
-        w_func(pAC, IoC, Port, PhyReg, Val);
-}       /* SkGePhyWrite */
-#endif /* SK_DIAG */
-
-
-/******************************************************************************
- *
- *      SkMacPromiscMode() - Enable / Disable Promiscuous Mode
- *
- * Description:
- *   enables / disables promiscuous mode by setting Mode Register (XMAC) or
- *   Receive Control Register (GMAC) dep. on board type         
- *
- * Returns:
- *      nothing
- */
-void SkMacPromiscMode(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port,   /* Port Index (MAC_1 + n) */
-SK_BOOL Enable) /* Enable / Disable */
-{
-#ifdef YUKON
-        SK_U16  RcReg;
-#endif
-#ifdef GENESIS
-        SK_U32  MdReg;
-#endif  
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                XM_IN32(IoC, Port, XM_MODE, &MdReg);
-                /* enable or disable promiscuous mode */
-                if (Enable) {
-                        MdReg |= XM_MD_ENA_PROM;
-                }
-                else {
-                        MdReg &= ~XM_MD_ENA_PROM;
-                }
-                /* setup Mode Register */
-                XM_OUT32(IoC, Port, XM_MODE, MdReg);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
-                
-                /* enable or disable unicast and multicast filtering */
-                if (Enable) {
-                        RcReg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
-                }
-                else {
-                        RcReg |= (GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
-                }
-                /* setup Receive Control Register */
-                GM_OUT16(IoC, Port, GM_RX_CTRL, RcReg);
-        }
-#endif /* YUKON */
-
-}       /* SkMacPromiscMode*/
-
-
-/******************************************************************************
- *
- *      SkMacHashing() - Enable / Disable Hashing
- *
- * Description:
- *   enables / disables hashing by setting Mode Register (XMAC) or
- *   Receive Control Register (GMAC) dep. on board type         
- *
- * Returns:
- *      nothing
- */
-void SkMacHashing(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port,   /* Port Index (MAC_1 + n) */
-SK_BOOL Enable) /* Enable / Disable */
-{
-#ifdef YUKON
-        SK_U16  RcReg;
-#endif  
-#ifdef GENESIS
-        SK_U32  MdReg;
-#endif
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                XM_IN32(IoC, Port, XM_MODE, &MdReg);
-                /* enable or disable hashing */
-                if (Enable) {
-                        MdReg |= XM_MD_ENA_HASH;
-                }
-                else {
-                        MdReg &= ~XM_MD_ENA_HASH;
-                }
-                /* setup Mode Register */
-                XM_OUT32(IoC, Port, XM_MODE, MdReg);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
-                
-                /* enable or disable multicast filtering */
-                if (Enable) {
-                        RcReg |= GM_RXCR_MCF_ENA;
-                }
-                else {
-                        RcReg &= ~GM_RXCR_MCF_ENA;
-                }
-                /* setup Receive Control Register */
-                GM_OUT16(IoC, Port, GM_RX_CTRL, RcReg);
-        }
-#endif /* YUKON */
-
-}       /* SkMacHashing*/
-
-
-#ifdef SK_DIAG
-/******************************************************************************
- *
- *      SkXmSetRxCmd() - Modify the value of the XMAC's Rx Command Register
- *
- * Description:
- *      The features
- *       - FCS stripping,                                       SK_STRIP_FCS_ON/OFF
- *       - pad byte stripping,                          SK_STRIP_PAD_ON/OFF
- *       - don't set XMR_FS_ERR in status       SK_LENERR_OK_ON/OFF
- *         for inrange length error frames
- *       - don't set XMR_FS_ERR in status       SK_BIG_PK_OK_ON/OFF
- *         for frames > 1514 bytes
- *   - enable Rx of own packets         SK_SELF_RX_ON/OFF
- *
- *      for incoming packets may be enabled/disabled by this function.
- *      Additional modes may be added later.
- *      Multiple modes can be enabled/disabled at the same time.
- *      The new configuration is written to the Rx Command register immediately.
- *
- * Returns:
- *      nothing
- */
-static void SkXmSetRxCmd(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             Mode)           /* Mode is SK_STRIP_FCS_ON/OFF, SK_STRIP_PAD_ON/OFF,
-                                           SK_LENERR_OK_ON/OFF, or SK_BIG_PK_OK_ON/OFF */
-{
-        SK_U16  OldRxCmd;
-        SK_U16  RxCmd;
-
-        XM_IN16(IoC, Port, XM_RX_CMD, &OldRxCmd);
-
-        RxCmd = OldRxCmd;
-        
-        switch (Mode & (SK_STRIP_FCS_ON | SK_STRIP_FCS_OFF)) {
-        case SK_STRIP_FCS_ON:
-                RxCmd |= XM_RX_STRIP_FCS;
-                break;
-        case SK_STRIP_FCS_OFF:
-                RxCmd &= ~XM_RX_STRIP_FCS;
-                break;
-        }
-
-        switch (Mode & (SK_STRIP_PAD_ON | SK_STRIP_PAD_OFF)) {
-        case SK_STRIP_PAD_ON:
-                RxCmd |= XM_RX_STRIP_PAD;
-                break;
-        case SK_STRIP_PAD_OFF:
-                RxCmd &= ~XM_RX_STRIP_PAD;
-                break;
-        }
-
-        switch (Mode & (SK_LENERR_OK_ON | SK_LENERR_OK_OFF)) {
-        case SK_LENERR_OK_ON:
-                RxCmd |= XM_RX_LENERR_OK;
-                break;
-        case SK_LENERR_OK_OFF:
-                RxCmd &= ~XM_RX_LENERR_OK;
-                break;
-        }
-
-        switch (Mode & (SK_BIG_PK_OK_ON | SK_BIG_PK_OK_OFF)) {
-        case SK_BIG_PK_OK_ON:
-                RxCmd |= XM_RX_BIG_PK_OK;
-                break;
-        case SK_BIG_PK_OK_OFF:
-                RxCmd &= ~XM_RX_BIG_PK_OK;
-                break;
-        }
-
-        switch (Mode & (SK_SELF_RX_ON | SK_SELF_RX_OFF)) {
-        case SK_SELF_RX_ON:
-                RxCmd |= XM_RX_SELF_RX;
-                break;
-        case SK_SELF_RX_OFF:
-                RxCmd &= ~XM_RX_SELF_RX;
-                break;
-        }
-
-        /* Write the new mode to the Rx command register if required */
-        if (OldRxCmd != RxCmd) {
-                XM_OUT16(IoC, Port, XM_RX_CMD, RxCmd);
-        }
-}       /* SkXmSetRxCmd */
-
-
-/******************************************************************************
- *
- *      SkGmSetRxCmd() - Modify the value of the GMAC's Rx Control Register
- *
- * Description:
- *      The features
- *       - FCS (CRC) stripping,                         SK_STRIP_FCS_ON/OFF
- *       - don't set GMR_FS_LONG_ERR            SK_BIG_PK_OK_ON/OFF
- *         for frames > 1514 bytes
- *   - enable Rx of own packets         SK_SELF_RX_ON/OFF
- *
- *      for incoming packets may be enabled/disabled by this function.
- *      Additional modes may be added later.
- *      Multiple modes can be enabled/disabled at the same time.
- *      The new configuration is written to the Rx Command register immediately.
- *
- * Returns:
- *      nothing
- */
-static void SkGmSetRxCmd(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             Mode)           /* Mode is SK_STRIP_FCS_ON/OFF, SK_STRIP_PAD_ON/OFF,
-                                           SK_LENERR_OK_ON/OFF, or SK_BIG_PK_OK_ON/OFF */
-{
-        SK_U16  OldRxCmd;
-        SK_U16  RxCmd;
-
-        if ((Mode & (SK_STRIP_FCS_ON | SK_STRIP_FCS_OFF)) != 0) {
-                
-                GM_IN16(IoC, Port, GM_RX_CTRL, &OldRxCmd);
-
-                RxCmd = OldRxCmd;
-
-                if ((Mode & SK_STRIP_FCS_ON) != 0) {
-                        RxCmd |= GM_RXCR_CRC_DIS;
-                }
-                else {
-                        RxCmd &= ~GM_RXCR_CRC_DIS;
-                }
-                /* Write the new mode to the Rx control register if required */
-                if (OldRxCmd != RxCmd) {
-                        GM_OUT16(IoC, Port, GM_RX_CTRL, RxCmd);
-                }
-        }
-
-        if ((Mode & (SK_BIG_PK_OK_ON | SK_BIG_PK_OK_OFF)) != 0) {
-                
-                GM_IN16(IoC, Port, GM_SERIAL_MODE, &OldRxCmd);
-
-                RxCmd = OldRxCmd;
-
-                if ((Mode & SK_BIG_PK_OK_ON) != 0) {
-                        RxCmd |= GM_SMOD_JUMBO_ENA;
-                }
-                else {
-                        RxCmd &= ~GM_SMOD_JUMBO_ENA;
-                }
-                /* Write the new mode to the Rx control register if required */
-                if (OldRxCmd != RxCmd) {
-                        GM_OUT16(IoC, Port, GM_SERIAL_MODE, RxCmd);
-                }
-        }
-}       /* SkGmSetRxCmd */
-
-
-/******************************************************************************
- *
- *      SkMacSetRxCmd() - Modify the value of the MAC's Rx Control Register
- *
- * Description: modifies the MAC's Rx Control reg. dep. on board type
- *
- * Returns:
- *      nothing
- */
-void SkMacSetRxCmd(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             Mode)           /* Rx Mode */
-{
-        if (pAC->GIni.GIGenesis) {
-                
-                SkXmSetRxCmd(pAC, IoC, Port, Mode);
-        }
-        else {
-                
-                SkGmSetRxCmd(pAC, IoC, Port, Mode);
-        }
-
-}       /* SkMacSetRxCmd */
-
-
-/******************************************************************************
- *
- *      SkMacCrcGener() - Enable / Disable CRC Generation
- *
- * Description: enables / disables CRC generation dep. on board type
- *
- * Returns:
- *      nothing
- */
-void SkMacCrcGener(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port,   /* Port Index (MAC_1 + n) */
-SK_BOOL Enable) /* Enable / Disable */
-{
-        SK_U16  Word;
-
-        if (pAC->GIni.GIGenesis) {
-                
-                XM_IN16(IoC, Port, XM_TX_CMD, &Word);
-
-                if (Enable) {
-                        Word &= ~XM_TX_NO_CRC;
-                }
-                else {
-                        Word |= XM_TX_NO_CRC;
-                }
-                /* setup Tx Command Register */
-                XM_OUT16(IoC, Port, XM_TX_CMD, Word);
-        }
-        else {
-                
-                GM_IN16(IoC, Port, GM_TX_CTRL, &Word);
-                
-                if (Enable) {
-                        Word &= ~GM_TXCR_CRC_DIS;
-                }
-                else {
-                        Word |= GM_TXCR_CRC_DIS;
-                }
-                /* setup Tx Control Register */
-                GM_OUT16(IoC, Port, GM_TX_CTRL, Word);
-        }
-
-}       /* SkMacCrcGener*/
-
-#endif /* SK_DIAG */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmClrExactAddr() - Clear Exact Match Address Registers
- *
- * Description:
- *      All Exact Match Address registers of the XMAC 'Port' will be
- *      cleared starting with 'StartNum' up to (and including) the
- *      Exact Match address number of 'StopNum'.
- *
- * Returns:
- *      nothing
- */
-void SkXmClrExactAddr(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-int             StartNum,       /* Begin with this Address Register Index (0..15) */
-int             StopNum)        /* Stop after finished with this Register Idx (0..15) */
-{
-        int             i;
-        SK_U16  ZeroAddr[3] = {0x0000, 0x0000, 0x0000};
-
-        if ((unsigned)StartNum > 15 || (unsigned)StopNum > 15 ||
-                StartNum > StopNum) {
-
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E001, SKERR_HWI_E001MSG);
-                return;
-        }
-
-        for (i = StartNum; i <= StopNum; i++) {
-                XM_OUTADDR(IoC, Port, XM_EXM(i), &ZeroAddr[0]);
-        }
-}       /* SkXmClrExactAddr */
-#endif /* GENESIS */
-
-
-/******************************************************************************
- *
- *      SkMacFlushTxFifo() - Flush the MAC's transmit FIFO
- *
- * Description:
- *      Flush the transmit FIFO of the MAC specified by the index 'Port'
- *
- * Returns:
- *      nothing
- */
-void SkMacFlushTxFifo(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-#ifdef GENESIS
-        SK_U32  MdReg;
-
-        if (pAC->GIni.GIGenesis) {
-                
-                XM_IN32(IoC, Port, XM_MODE, &MdReg);
-
-                XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FTF);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* no way to flush the FIFO we have to issue a reset */
-                /* TBD */
-        }
-#endif /* YUKON */
-
-}       /* SkMacFlushTxFifo */
-
-
-/******************************************************************************
- *
- *      SkMacFlushRxFifo() - Flush the MAC's receive FIFO
- *
- * Description:
- *      Flush the receive FIFO of the MAC specified by the index 'Port'
- *
- * Returns:
- *      nothing
- */
-static void SkMacFlushRxFifo(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-#ifdef GENESIS
-        SK_U32  MdReg;
-
-        if (pAC->GIni.GIGenesis) {
-
-                XM_IN32(IoC, Port, XM_MODE, &MdReg);
-
-                XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FRF);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* no way to flush the FIFO we have to issue a reset */
-                /* TBD */
-        }
-#endif /* YUKON */
-
-}       /* SkMacFlushRxFifo */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmSoftRst() - Do a XMAC software reset
- *
- * Description:
- *      The PHY registers should not be destroyed during this
- *      kind of software reset. Therefore the XMAC Software Reset
- *      (XM_GP_RES_MAC bit in XM_GP_PORT) must not be used!
- *
- *      The software reset is done by
- *              - disabling the Rx and Tx state machine,
- *              - resetting the statistics module,
- *              - clear all other significant XMAC Mode,
- *                Command, and Control Registers
- *              - clearing the Hash Register and the
- *                Exact Match Address registers, and
- *              - flushing the XMAC's Rx and Tx FIFOs.
- *
- * Note:
- *      Another requirement when stopping the XMAC is to
- *      avoid sending corrupted frames on the network.
- *      Disabling the Tx state machine will NOT interrupt
- *      the currently transmitted frame. But we must take care
- *      that the Tx FIFO is cleared AFTER the current frame
- *      is complete sent to the network.
- *
- *      It takes about 12ns to send a frame with 1538 bytes.
- *      One PCI clock goes at least 15ns (66MHz). Therefore
- *      after reading XM_GP_PORT back, we are sure that the
- *      transmitter is disabled AND idle. And this means
- *      we may flush the transmit FIFO now.
- *
- * Returns:
- *      nothing
- */
-static void SkXmSoftRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_U16  ZeroAddr[4] = {0x0000, 0x0000, 0x0000, 0x0000};
-        
-        /* reset the statistics module */
-        XM_OUT32(IoC, Port, XM_GP_PORT, XM_GP_RES_STAT);
-
-        /* disable all XMAC IRQs */
-        XM_OUT16(IoC, Port, XM_IMSK, 0xffff);
-        
-        XM_OUT32(IoC, Port, XM_MODE, 0);                /* clear Mode Reg */
-        
-        XM_OUT16(IoC, Port, XM_TX_CMD, 0);              /* reset TX CMD Reg */
-        XM_OUT16(IoC, Port, XM_RX_CMD, 0);              /* reset RX CMD Reg */
-        
-        /* disable all PHY IRQs */
-        switch (pAC->GIni.GP[Port].PhyType) {
-        case SK_PHY_BCOM:
-                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK, 0xffff);
-                        break;
-#ifdef OTHER_PHY
-                case SK_PHY_LONE:
-                        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_INT_ENAB, 0);
-                        break;
-                case SK_PHY_NAT:
-                        /* todo: National
-                         SkXmPhyWrite(pAC, IoC, Port, PHY_NAT_INT_MASK, 0xffff); */
-                        break;
-#endif /* OTHER_PHY */
-        }
-
-        /* clear the Hash Register */
-        XM_OUTHASH(IoC, Port, XM_HSM, &ZeroAddr);
-
-        /* clear the Exact Match Address registers */
-        SkXmClrExactAddr(pAC, IoC, Port, 0, 15);
-        
-        /* clear the Source Check Address registers */
-        XM_OUTHASH(IoC, Port, XM_SRC_CHK, &ZeroAddr);
-
-}       /* SkXmSoftRst */
-
-
-/******************************************************************************
- *
- *      SkXmHardRst() - Do a XMAC hardware reset
- *
- * Description:
- *      The XMAC of the specified 'Port' and all connected devices
- *      (PHY and SERDES) will receive a reset signal on its *Reset pins.
- *      External PHYs must be reset by clearing a bit in the GPIO register
- *  (Timing requirements: Broadcom: 400ns, Level One: none, National: 80ns).
- *
- * ATTENTION:
- *      It is absolutely necessary to reset the SW_RST Bit first
- *      before calling this function.
- *
- * Returns:
- *      nothing
- */
-static void SkXmHardRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_U32  Reg;
-        int             i;
-        int             TOut;
-        SK_U16  Word;
-
-        for (i = 0; i < 4; i++) {
-                /* TX_MFF_CTRL1 has 32 bits, but only the lowest 16 bits are used */
-                SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
-
-                TOut = 0;
-                do {
-                        if (TOut++ > 10000) {
-                                /*
-                                 * Adapter seems to be in RESET state.
-                                 * Registers cannot be written.
-                                 */
-                                return;
-                        }
-
-                        SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
-                        
-                        SK_IN16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), &Word);
-                
-                } while ((Word & MFF_SET_MAC_RST) == 0);
-        }
-
-        /* For external PHYs there must be special handling */
-        if (pAC->GIni.GP[Port].PhyType != SK_PHY_XMAC) {
-                
-                SK_IN32(IoC, B2_GP_IO, &Reg);
-                
-                if (Port == 0) {
-                        Reg |= GP_DIR_0;        /* set to output */
-                        Reg &= ~GP_IO_0;        /* set PHY reset (active low) */
-                }
-                else {
-                        Reg |= GP_DIR_2;        /* set to output */
-                        Reg &= ~GP_IO_2;        /* set PHY reset (active low) */
-                }
-                /* reset external PHY */
-                SK_OUT32(IoC, B2_GP_IO, Reg);
-
-                /* short delay */
-                SK_IN32(IoC, B2_GP_IO, &Reg);
-        }
-}       /* SkXmHardRst */
-
-
-/******************************************************************************
- *
- *      SkXmClearRst() - Release the PHY & XMAC reset
- *
- * Description:
- *
- * Returns:
- *      nothing
- */
-static void SkXmClearRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_U32  DWord;
-        
-        /* clear HW reset */
-        SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
-
-        if (pAC->GIni.GP[Port].PhyType != SK_PHY_XMAC) {
-
-                SK_IN32(IoC, B2_GP_IO, &DWord);
-
-                if (Port == 0) {
-                        DWord |= (GP_DIR_0 | GP_IO_0); /* set to output */
-                }
-                else {
-                        DWord |= (GP_DIR_2 | GP_IO_2); /* set to output */
-                }
-                /* Clear PHY reset */
-                SK_OUT32(IoC, B2_GP_IO, DWord);
-
-                /* Enable GMII interface */
-                XM_OUT16(IoC, Port, XM_HW_CFG, XM_HW_GMII_MD);
-        }
-}       /* SkXmClearRst */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkGmSoftRst() - Do a GMAC software reset
- *
- * Description:
- *      The GPHY registers should not be destroyed during this
- *      kind of software reset.
- *
- * Returns:
- *      nothing
- */
-static void SkGmSoftRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_U16  EmptyHash[4] = {0x0000, 0x0000, 0x0000, 0x0000};
-        SK_U16  RxCtrl;
-
-        /* reset the statistics module */
-
-        /* disable all GMAC IRQs */
-        SK_OUT8(IoC, GMAC_IRQ_MSK, 0);
-        
-        /* disable all PHY IRQs */
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, 0);
-        
-        /* clear the Hash Register */
-        GM_OUTHASH(IoC, Port, GM_MC_ADDR_H1, EmptyHash);
-
-        /* Enable Unicast and Multicast filtering */
-        GM_IN16(IoC, Port, GM_RX_CTRL, &RxCtrl);
-        
-        GM_OUT16(IoC, Port, GM_RX_CTRL,
-                (SK_U16)(RxCtrl | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA));
-
-}       /* SkGmSoftRst */
-
-
-/******************************************************************************
- *
- *      SkGmHardRst() - Do a GMAC hardware reset
- *
- * Description:
- *
- * Returns:
- *      nothing
- */
-static void SkGmHardRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_U32  DWord;
-        
-        /* WA code for COMA mode */
-        if (pAC->GIni.GIYukonLite &&
-                pAC->GIni.GIChipRev >= CHIP_REV_YU_LITE_A3) {
-                
-                SK_IN32(IoC, B2_GP_IO, &DWord);
-
-                DWord |= (GP_DIR_9 | GP_IO_9);
-
-                /* set PHY reset */
-                SK_OUT32(IoC, B2_GP_IO, DWord);
-        }
-
-        /* set GPHY Control reset */
-        SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), GPC_RST_SET);
-
-        /* set GMAC Control reset */
-        SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
-
-}       /* SkGmHardRst */
-
-
-/******************************************************************************
- *
- *      SkGmClearRst() - Release the GPHY & GMAC reset
- *
- * Description:
- *
- * Returns:
- *      nothing
- */
-static void SkGmClearRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_U32  DWord;
-        
-#ifdef XXX
-                /* clear GMAC Control reset */
-                SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_CLR);
-
-                /* set GMAC Control reset */
-                SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
-#endif /* XXX */
-
-        /* WA code for COMA mode */
-        if (pAC->GIni.GIYukonLite &&
-                pAC->GIni.GIChipRev >= CHIP_REV_YU_LITE_A3) {
-                
-                SK_IN32(IoC, B2_GP_IO, &DWord);
-
-                DWord |= GP_DIR_9;              /* set to output */
-                DWord &= ~GP_IO_9;              /* clear PHY reset (active high) */
-
-                /* clear PHY reset */
-                SK_OUT32(IoC, B2_GP_IO, DWord);
-        }
-
-        /* set HWCFG_MODE */
-        DWord = GPC_INT_POL_HI | GPC_DIS_FC | GPC_DIS_SLEEP |
-                GPC_ENA_XC | GPC_ANEG_ADV_ALL_M | GPC_ENA_PAUSE |
-                (pAC->GIni.GICopperType ? GPC_HWCFG_GMII_COP :
-                GPC_HWCFG_GMII_FIB);
-
-        /* set GPHY Control reset */
-        SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_SET);
-
-        /* release GPHY Control reset */
-        SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_CLR);
-
-#ifdef VCPU
-        VCpuWait(9000);
-#endif /* VCPU */
-
-        /* clear GMAC Control reset */
-        SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
-
-#ifdef VCPU
-        VCpuWait(2000);
-        
-        SK_IN32(IoC, MR_ADDR(Port, GPHY_CTRL), &DWord);
-                        
-        SK_IN32(IoC, B0_ISRC, &DWord);
-#endif /* VCPU */
-
-}       /* SkGmClearRst */
-#endif /* YUKON */
-
-
-/******************************************************************************
- *
- *      SkMacSoftRst() - Do a MAC software reset
- *
- * Description: calls a MAC software reset routine dep. on board type
- *
- * Returns:
- *      nothing
- */
-void SkMacSoftRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* disable receiver and transmitter */
-        SkMacRxTxDisable(pAC, IoC, Port);
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                SkXmSoftRst(pAC, IoC, Port);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                SkGmSoftRst(pAC, IoC, Port);
-        }
-#endif /* YUKON */
-
-        /* flush the MAC's Rx and Tx FIFOs */
-        SkMacFlushTxFifo(pAC, IoC, Port);
-        
-        SkMacFlushRxFifo(pAC, IoC, Port);
-
-        pPrt->PState = SK_PRT_STOP;
-
-}       /* SkMacSoftRst */
-
-
-/******************************************************************************
- *
- *      SkMacHardRst() - Do a MAC hardware reset
- *
- * Description: calls a MAC hardware reset routine dep. on board type
- *
- * Returns:
- *      nothing
- */
-void SkMacHardRst(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port)   /* Port Index (MAC_1 + n) */
-{
-        
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                SkXmHardRst(pAC, IoC, Port);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                SkGmHardRst(pAC, IoC, Port);
-        }
-#endif /* YUKON */
-
-        pAC->GIni.GP[Port].PState = SK_PRT_RESET;
-
-}       /* SkMacHardRst */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmInitMac() - Initialize the XMAC II
- *
- * Description:
- *      Initialize the XMAC of the specified port.
- *      The XMAC must be reset or stopped before calling this function.
- *
- * Note:
- *      The XMAC's Rx and Tx state machine is still disabled when returning.
- *
- * Returns:
- *      nothing
- */
-void SkXmInitMac(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        int                     i;
-        SK_U16          SWord;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PState == SK_PRT_STOP) {
-                /* Port State: SK_PRT_STOP */
-                /* Verify that the reset bit is cleared */
-                SK_IN16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), &SWord);
-
-                if ((SWord & MFF_SET_MAC_RST) != 0) {
-                        /* PState does not match HW state */
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E006, SKERR_HWI_E006MSG);
-                        /* Correct it */
-                        pPrt->PState = SK_PRT_RESET;
-                }
-        }
-
-        if (pPrt->PState == SK_PRT_RESET) {
-
-                SkXmClearRst(pAC, IoC, Port);
-
-                if (pPrt->PhyType != SK_PHY_XMAC) {
-                        /* read Id from external PHY (all have the same address) */
-                        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_ID1, &pPrt->PhyId1);
-
-                        /*
-                         * Optimize MDIO transfer by suppressing preamble.
-                         * Must be done AFTER first access to BCOM chip.
-                         */
-                        XM_IN16(IoC, Port, XM_MMU_CMD, &SWord);
-                        
-                        XM_OUT16(IoC, Port, XM_MMU_CMD, SWord | XM_MMU_NO_PRE);
-
-                        if (pPrt->PhyId1 == PHY_BCOM_ID1_C0) {
-                                /*
-                                 * Workaround BCOM Errata for the C0 type.
-                                 * Write magic patterns to reserved registers.
-                                 */
-                                i = 0;
-                                while (BcomRegC0Hack[i].PhyReg != 0) {
-                                        SkXmPhyWrite(pAC, IoC, Port, BcomRegC0Hack[i].PhyReg,
-                                                BcomRegC0Hack[i].PhyVal);
-                                        i++;
-                                }
-                        }
-                        else if (pPrt->PhyId1 == PHY_BCOM_ID1_A1) {
-                                /*
-                                 * Workaround BCOM Errata for the A1 type.
-                                 * Write magic patterns to reserved registers.
-                                 */
-                                i = 0;
-                                while (BcomRegA1Hack[i].PhyReg != 0) {
-                                        SkXmPhyWrite(pAC, IoC, Port, BcomRegA1Hack[i].PhyReg,
-                                                BcomRegA1Hack[i].PhyVal);
-                                        i++;
-                                }
-                        }
-
-                        /*
-                         * Workaround BCOM Errata (#10523) for all BCom PHYs.
-                         * Disable Power Management after reset.
-                         */
-                        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &SWord);
-                        
-                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL,
-                                (SK_U16)(SWord | PHY_B_AC_DIS_PM));
-
-                        /* PHY LED initialization is done in SkGeXmitLED() */
-                }
-
-                /* Dummy read the Interrupt source register */
-                XM_IN16(IoC, Port, XM_ISRC, &SWord);
-                
-                /*
-                 * The auto-negotiation process starts immediately after
-                 * clearing the reset. The auto-negotiation process should be
-                 * started by the SIRQ, therefore stop it here immediately.
-                 */
-                SkMacInitPhy(pAC, IoC, Port, SK_FALSE);
-
-#ifdef TEST_ONLY
-                /* temp. code: enable signal detect */
-                /* WARNING: do not override GMII setting above */
-                XM_OUT16(IoC, Port, XM_HW_CFG, XM_HW_COM4SIG);
-#endif
-        }
-
-        /*
-         * configure the XMACs Station Address
-         * B2_MAC_2 = xx xx xx xx xx x1 is programmed to XMAC A
-         * B2_MAC_3 = xx xx xx xx xx x2 is programmed to XMAC B
-         */
-        for (i = 0; i < 3; i++) {
-                /*
-                 * The following 2 statements are together endianess
-                 * independent. Remember this when changing.
-                 */
-                SK_IN16(IoC, (B2_MAC_2 + Port * 8 + i * 2), &SWord);
-                
-                XM_OUT16(IoC, Port, (XM_SA + i * 2), SWord);
-        }
-
-        /* Tx Inter Packet Gap (XM_TX_IPG):     use default */
-        /* Tx High Water Mark (XM_TX_HI_WM):    use default */
-        /* Tx Low Water Mark (XM_TX_LO_WM):     use default */
-        /* Host Request Threshold (XM_HT_THR):  use default */
-        /* Rx Request Threshold (XM_RX_THR):    use default */
-        /* Rx Low Water Mark (XM_RX_LO_WM):     use default */
-
-        /* configure Rx High Water Mark (XM_RX_HI_WM) */
-        XM_OUT16(IoC, Port, XM_RX_HI_WM, SK_XM_RX_HI_WM);
-
-        /* Configure Tx Request Threshold */
-        SWord = SK_XM_THR_SL;                           /* for single port */
-
-        if (pAC->GIni.GIMacsFound > 1) {
-                switch (pAC->GIni.GIPortUsage) {
-                case SK_RED_LINK:
-                        SWord = SK_XM_THR_REDL;         /* redundant link */
-                        break;
-                case SK_MUL_LINK:
-                        SWord = SK_XM_THR_MULL;         /* load balancing */
-                        break;
-                case SK_JUMBO_LINK:
-                        SWord = SK_XM_THR_JUMBO;        /* jumbo frames */
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E014, SKERR_HWI_E014MSG);
-                        break;
-                }
-        }
-        XM_OUT16(IoC, Port, XM_TX_THR, SWord);
-
-        /* setup register defaults for the Tx Command Register */
-        XM_OUT16(IoC, Port, XM_TX_CMD, XM_TX_AUTO_PAD);
-
-        /* setup register defaults for the Rx Command Register */
-        SWord = XM_RX_STRIP_FCS | XM_RX_LENERR_OK;
-
-        if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
-                SWord |= XM_RX_BIG_PK_OK;
-        }
-
-        if (pPrt->PLinkMode == SK_LMODE_HALF) {
-                /*
-                 * If in manual half duplex mode the other side might be in
-                 * full duplex mode, so ignore if a carrier extension is not seen
-                 * on frames received
-                 */
-                SWord |= XM_RX_DIS_CEXT;
-        }
-        
-        XM_OUT16(IoC, Port, XM_RX_CMD, SWord);
-
-        /*
-         * setup register defaults for the Mode Register
-         *      - Don't strip error frames to avoid Store & Forward
-         *        on the Rx side.
-         *      - Enable 'Check Station Address' bit
-         *      - Enable 'Check Address Array' bit
-         */
-        XM_OUT32(IoC, Port, XM_MODE, XM_DEF_MODE);
-
-        /*
-         * Initialize the Receive Counter Event Mask (XM_RX_EV_MSK)
-         *      - Enable all bits excepting 'Octets Rx OK Low CntOv'
-         *        and 'Octets Rx OK Hi Cnt Ov'.
-         */
-        XM_OUT32(IoC, Port, XM_RX_EV_MSK, XMR_DEF_MSK);
-
-        /*
-         * Initialize the Transmit Counter Event Mask (XM_TX_EV_MSK)
-         *      - Enable all bits excepting 'Octets Tx OK Low CntOv'
-         *        and 'Octets Tx OK Hi Cnt Ov'.
-         */
-        XM_OUT32(IoC, Port, XM_TX_EV_MSK, XMT_DEF_MSK);
-
-        /*
-         * Do NOT init XMAC interrupt mask here.
-         * All interrupts remain disable until link comes up!
-         */
-
-        /*
-         * Any additional configuration changes may be done now.
-         * The last action is to enable the Rx and Tx state machine.
-         * This should be done after the auto-negotiation process
-         * has been completed successfully.
-         */
-}       /* SkXmInitMac */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkGmInitMac() - Initialize the GMAC
- *
- * Description:
- *      Initialize the GMAC of the specified port.
- *      The GMAC must be reset or stopped before calling this function.
- *
- * Note:
- *      The GMAC's Rx and Tx state machine is still disabled when returning.
- *
- * Returns:
- *      nothing
- */
-void SkGmInitMac(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        int                     i;
-        SK_U16          SWord;
-        SK_U32          DWord;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PState == SK_PRT_STOP) {
-                /* Port State: SK_PRT_STOP */
-                /* Verify that the reset bit is cleared */
-                SK_IN32(IoC, MR_ADDR(Port, GMAC_CTRL), &DWord);
-                
-                if ((DWord & GMC_RST_SET) != 0) {
-                        /* PState does not match HW state */
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E006, SKERR_HWI_E006MSG);
-                        /* Correct it */
-                        pPrt->PState = SK_PRT_RESET;
-                }
-        }
-
-        if (pPrt->PState == SK_PRT_RESET) {
-                
-                SkGmHardRst(pAC, IoC, Port);
-
-                SkGmClearRst(pAC, IoC, Port);
-                
-                /* Auto-negotiation ? */
-                if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-                        /* Auto-negotiation disabled */
-
-                        /* get General Purpose Control */
-                        GM_IN16(IoC, Port, GM_GP_CTRL, &SWord);
-
-                        /* disable auto-update for speed, duplex and flow-control */
-                        SWord |= GM_GPCR_AU_ALL_DIS;
-                        
-                        /* setup General Purpose Control Register */
-                        GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
-                        
-                        SWord = GM_GPCR_AU_ALL_DIS;
-                }
-                else {
-                        SWord = 0;
-                }
-
-                /* speed settings */
-                switch (pPrt->PLinkSpeed) {
-                case SK_LSPEED_AUTO:
-                case SK_LSPEED_1000MBPS:
-                        SWord |= GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100;
-                        break;
-                case SK_LSPEED_100MBPS:
-                        SWord |= GM_GPCR_SPEED_100;
-                        break;
-                case SK_LSPEED_10MBPS:
-                        break;
-                }
-
-                /* duplex settings */
-                if (pPrt->PLinkMode != SK_LMODE_HALF) {
-                        /* set full duplex */
-                        SWord |= GM_GPCR_DUP_FULL;
-                }
-
-                /* flow-control settings */
-                switch (pPrt->PFlowCtrlMode) {
-                case SK_FLOW_MODE_NONE:
-                        /* set Pause Off */
-                        SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_OFF);
-                        /* disable Tx & Rx flow-control */
-                        SWord |= GM_GPCR_FC_TX_DIS | GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
-                        break;
-                case SK_FLOW_MODE_LOC_SEND:
-                        /* disable Rx flow-control */
-                        SWord |= GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
-                        break;
-                case SK_FLOW_MODE_SYMMETRIC:
-                case SK_FLOW_MODE_SYM_OR_REM:
-                        /* enable Tx & Rx flow-control */
-                        break;
-                }
-
-                /* setup General Purpose Control Register */
-                GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
-
-                /* dummy read the Interrupt Source Register */
-                SK_IN16(IoC, GMAC_IRQ_SRC, &SWord);
-                
-#ifndef VCPU
-                /* read Id from PHY */
-                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_ID1, &pPrt->PhyId1);
-                
-                SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
-#endif /* VCPU */
-        }
-
-        (void)SkGmResetCounter(pAC, IoC, Port);
-
-        /* setup Transmit Control Register */
-        GM_OUT16(IoC, Port, GM_TX_CTRL, TX_COL_THR(pPrt->PMacColThres));
-
-        /* setup Receive Control Register */
-        GM_OUT16(IoC, Port, GM_RX_CTRL, GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA |
-                GM_RXCR_CRC_DIS);
-
-        /* setup Transmit Flow Control Register */
-        GM_OUT16(IoC, Port, GM_TX_FLOW_CTRL, 0xffff);
-
-        /* setup Transmit Parameter Register */
-#ifdef VCPU
-        GM_IN16(IoC, Port, GM_TX_PARAM, &SWord);
-#endif /* VCPU */
-
-    SWord = TX_JAM_LEN_VAL(pPrt->PMacJamLen) |
-                        TX_JAM_IPG_VAL(pPrt->PMacJamIpgVal) |
-                        TX_IPG_JAM_DATA(pPrt->PMacJamIpgData);
-        
-        GM_OUT16(IoC, Port, GM_TX_PARAM, SWord);
-
-        /* configure the Serial Mode Register */
-#ifdef VCPU
-        GM_IN16(IoC, Port, GM_SERIAL_MODE, &SWord);
-#endif /* VCPU */
-        
-        SWord = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(pPrt->PMacIpgData);
-
-        if (pPrt->PMacLimit4) {
-                /* reset of collision counter after 4 consecutive collisions */
-                SWord |= GM_SMOD_LIMIT_4;
-        }
-
-        if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
-                /* enable jumbo mode (Max. Frame Length = 9018) */
-                SWord |= GM_SMOD_JUMBO_ENA;
-        }
-        
-        GM_OUT16(IoC, Port, GM_SERIAL_MODE, SWord);
-        
-        /*
-         * configure the GMACs Station Addresses
-         * in PROM you can find our addresses at:
-         * B2_MAC_1 = xx xx xx xx xx x0 virtual address
-         * B2_MAC_2 = xx xx xx xx xx x1 is programmed to GMAC A
-         * B2_MAC_3 = xx xx xx xx xx x2 is reserved for DualPort
-         */
-
-        for (i = 0; i < 3; i++) {
-                /*
-                 * The following 2 statements are together endianess
-                 * independent. Remember this when changing.
-                 */
-                /* physical address: will be used for pause frames */
-                SK_IN16(IoC, (B2_MAC_2 + Port * 8 + i * 2), &SWord);
-
-#ifdef WA_DEV_16
-                /* WA for deviation #16 */
-                if (pAC->GIni.GIChipId == CHIP_ID_YUKON && pAC->GIni.GIChipRev == 0) {
-                        /* swap the address bytes */
-                        SWord = ((SWord & 0xff00) >> 8) | ((SWord & 0x00ff) << 8);
-
-                        /* write to register in reversed order */
-                        GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + (2 - i) * 4), SWord);
-                }
-                else {
-                        GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + i * 4), SWord);
-                }
-#else           
-                GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + i * 4), SWord);
-#endif /* WA_DEV_16 */
-                
-                /* virtual address: will be used for data */
-                SK_IN16(IoC, (B2_MAC_1 + Port * 8 + i * 2), &SWord);
-
-                GM_OUT16(IoC, Port, (GM_SRC_ADDR_2L + i * 4), SWord);
-                
-                /* reset Multicast filtering Hash registers 1-3 */
-                GM_OUT16(IoC, Port, GM_MC_ADDR_H1 + 4*i, 0);
-        }
-
-        /* reset Multicast filtering Hash register 4 */
-        GM_OUT16(IoC, Port, GM_MC_ADDR_H4, 0);
-
-        /* enable interrupt mask for counter overflows */
-        GM_OUT16(IoC, Port, GM_TX_IRQ_MSK, 0);
-        GM_OUT16(IoC, Port, GM_RX_IRQ_MSK, 0);
-        GM_OUT16(IoC, Port, GM_TR_IRQ_MSK, 0);
-
-#if defined(SK_DIAG) || defined(DEBUG)
-        /* read General Purpose Status */
-        GM_IN16(IoC, Port, GM_GP_STAT, &SWord);
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("MAC Stat Reg.=0x%04X\n", SWord));
-#endif /* SK_DIAG || DEBUG */
-
-#ifdef SK_DIAG
-        c_print("MAC Stat Reg=0x%04X\n", SWord);
-#endif /* SK_DIAG */
-
-}       /* SkGmInitMac */
-#endif /* YUKON */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmInitDupMd() - Initialize the XMACs Duplex Mode
- *
- * Description:
- *      This function initializes the XMACs Duplex Mode.
- *      It should be called after successfully finishing
- *      the Auto-negotiation Process
- *
- * Returns:
- *      nothing
- */
-static void SkXmInitDupMd(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        switch (pAC->GIni.GP[Port].PLinkModeStatus) {
-        case SK_LMODE_STAT_AUTOHALF:
-        case SK_LMODE_STAT_HALF:
-                /* Configuration Actions for Half Duplex Mode */
-                /*
-                 * XM_BURST = default value. We are probable not quick
-                 *      enough at the 'XMAC' bus to burst 8kB.
-                 *      The XMAC stops bursting if no transmit frames
-                 *      are available or the burst limit is exceeded.
-                 */
-                /* XM_TX_RT_LIM = default value (15) */
-                /* XM_TX_STIME = default value (0xff = 4096 bit times) */
-                break;
-        case SK_LMODE_STAT_AUTOFULL:
-        case SK_LMODE_STAT_FULL:
-                /* Configuration Actions for Full Duplex Mode */
-                /*
-                 * The duplex mode is configured by the PHY,
-                 * therefore it seems to be that there is nothing
-                 * to do here.
-                 */
-                break;
-        case SK_LMODE_STAT_UNKNOWN:
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E007, SKERR_HWI_E007MSG);
-                break;
-        }
-}       /* SkXmInitDupMd */
-
-
-/******************************************************************************
- *
- *      SkXmInitPauseMd() - initialize the Pause Mode to be used for this port
- *
- * Description:
- *      This function initializes the Pause Mode which should
- *      be used for this port.
- *      It should be called after successfully finishing
- *      the Auto-negotiation Process
- *
- * Returns:
- *      nothing
- */
-static void SkXmInitPauseMd(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U32          DWord;
-        SK_U16          Word;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
-        
-        if (pPrt->PFlowCtrlStatus == SK_FLOW_STAT_NONE ||
-                pPrt->PFlowCtrlStatus == SK_FLOW_STAT_LOC_SEND) {
-
-                /* Disable Pause Frame Reception */
-                Word |= XM_MMU_IGN_PF;
-        }
-        else {
-                /*
-                 * enabling pause frame reception is required for 1000BT
-                 * because the XMAC is not reset if the link is going down
-                 */
-                /* Enable Pause Frame Reception */
-                Word &= ~XM_MMU_IGN_PF;
-        }       
-        
-        XM_OUT16(IoC, Port, XM_MMU_CMD, Word);
-
-        XM_IN32(IoC, Port, XM_MODE, &DWord);
-
-        if (pPrt->PFlowCtrlStatus == SK_FLOW_STAT_SYMMETRIC ||
-                pPrt->PFlowCtrlStatus == SK_FLOW_STAT_LOC_SEND) {
-
-                /*
-                 * Configure Pause Frame Generation
-                 * Use internal and external Pause Frame Generation.
-                 * Sending pause frames is edge triggered.
-                 * Send a Pause frame with the maximum pause time if
-                 * internal oder external FIFO full condition occurs.
-                 * Send a zero pause time frame to re-start transmission.
-                 */
-
-                /* XM_PAUSE_DA = '010000C28001' (default) */
-
-                /* XM_MAC_PTIME = 0xffff (maximum) */
-                /* remember this value is defined in big endian (!) */
-                XM_OUT16(IoC, Port, XM_MAC_PTIME, 0xffff);
-
-                /* Set Pause Mode in Mode Register */
-                DWord |= XM_PAUSE_MODE;
-
-                /* Set Pause Mode in MAC Rx FIFO */
-                SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_ENA_PAUSE);
-        }
-        else {
-                /*
-                 * disable pause frame generation is required for 1000BT
-                 * because the XMAC is not reset if the link is going down
-                 */
-                /* Disable Pause Mode in Mode Register */
-                DWord &= ~XM_PAUSE_MODE;
-
-                /* Disable Pause Mode in MAC Rx FIFO */
-                SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_DIS_PAUSE);
-        }
-        
-        XM_OUT32(IoC, Port, XM_MODE, DWord);
-}       /* SkXmInitPauseMd*/
-
-
-/******************************************************************************
- *
- *      SkXmInitPhyXmac() - Initialize the XMAC Phy registers
- *
- * Description: initializes all the XMACs Phy registers
- *
- * Note:
- *
- * Returns:
- *      nothing
- */
-static void SkXmInitPhyXmac(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          Ctrl;
-
-        pPrt = &pAC->GIni.GP[Port];
-        Ctrl = 0;
-        
-        /* Auto-negotiation ? */
-        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("InitPhyXmac: no auto-negotiation Port %d\n", Port));
-                /* Set DuplexMode in Config register */
-                if (pPrt->PLinkMode == SK_LMODE_FULL) {
-                        Ctrl |= PHY_CT_DUP_MD;
-                }
-
-                /*
-                 * Do NOT enable Auto-negotiation here. This would hold
-                 * the link down because no IDLEs are transmitted
-                 */
-        }
-        else {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("InitPhyXmac: with auto-negotiation Port %d\n", Port));
-                /* Set Auto-negotiation advertisement */
-
-                /* Set Full/half duplex capabilities */
-                switch (pPrt->PLinkMode) {
-                case SK_LMODE_AUTOHALF:
-                        Ctrl |= PHY_X_AN_HD;
-                        break;
-                case SK_LMODE_AUTOFULL:
-                        Ctrl |= PHY_X_AN_FD;
-                        break;
-                case SK_LMODE_AUTOBOTH:
-                        Ctrl |= PHY_X_AN_FD | PHY_X_AN_HD;
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
-                                SKERR_HWI_E015MSG);
-                }
-
-                /* Set Flow-control capabilities */
-                switch (pPrt->PFlowCtrlMode) {
-                case SK_FLOW_MODE_NONE:
-                        Ctrl |= PHY_X_P_NO_PAUSE;
-                        break;
-                case SK_FLOW_MODE_LOC_SEND:
-                        Ctrl |= PHY_X_P_ASYM_MD;
-                        break;
-                case SK_FLOW_MODE_SYMMETRIC:
-                        Ctrl |= PHY_X_P_SYM_MD;
-                        break;
-                case SK_FLOW_MODE_SYM_OR_REM:
-                        Ctrl |= PHY_X_P_BOTH_MD;
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
-                                SKERR_HWI_E016MSG);
-                }
-
-                /* Write AutoNeg Advertisement Register */
-                SkXmPhyWrite(pAC, IoC, Port, PHY_XMAC_AUNE_ADV, Ctrl);
-
-                /* Restart Auto-negotiation */
-                Ctrl = PHY_CT_ANE | PHY_CT_RE_CFG;
-        }
-
-        if (DoLoop) {
-                /* Set the Phy Loopback bit, too */
-                Ctrl |= PHY_CT_LOOP;
-        }
-
-        /* Write to the Phy control register */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_XMAC_CTRL, Ctrl);
-}       /* SkXmInitPhyXmac */
-
-
-/******************************************************************************
- *
- *      SkXmInitPhyBcom() - Initialize the Broadcom Phy registers
- *
- * Description: initializes all the Broadcom Phy registers
- *
- * Note:
- *
- * Returns:
- *      nothing
- */
-static void SkXmInitPhyBcom(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          Ctrl1;
-        SK_U16          Ctrl2;
-        SK_U16          Ctrl3;
-        SK_U16          Ctrl4;
-        SK_U16          Ctrl5;
-
-        Ctrl1 = PHY_CT_SP1000;
-        Ctrl2 = 0;
-        Ctrl3 = PHY_SEL_TYPE;
-        Ctrl4 = PHY_B_PEC_EN_LTR;
-        Ctrl5 = PHY_B_AC_TX_TST;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* manually Master/Slave ? */
-        if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
-                Ctrl2 |= PHY_B_1000C_MSE;
-                
-                if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
-                        Ctrl2 |= PHY_B_1000C_MSC;
-                }
-        }
-        /* Auto-negotiation ? */
-        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("InitPhyBcom: no auto-negotiation Port %d\n", Port));
-                /* Set DuplexMode in Config register */
-                if (pPrt->PLinkMode == SK_LMODE_FULL) {
-                        Ctrl1 |= PHY_CT_DUP_MD;
-                }
-
-                /* Determine Master/Slave manually if not already done */
-                if (pPrt->PMSMode == SK_MS_MODE_AUTO) {
-                        Ctrl2 |= PHY_B_1000C_MSE;       /* set it to Slave */
-                }
-
-                /*
-                 * Do NOT enable Auto-negotiation here. This would hold
-                 * the link down because no IDLES are transmitted
-                 */
-        }
-        else {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("InitPhyBcom: with auto-negotiation Port %d\n", Port));
-                /* Set Auto-negotiation advertisement */
-
-                /*
-                 * Workaround BCOM Errata #1 for the C5 type.
-                 * 1000Base-T Link Acquisition Failure in Slave Mode
-                 * Set Repeater/DTE bit 10 of the 1000Base-T Control Register
-                 */
-                Ctrl2 |= PHY_B_1000C_RD;
-                
-                 /* Set Full/half duplex capabilities */
-                switch (pPrt->PLinkMode) {
-                case SK_LMODE_AUTOHALF:
-                        Ctrl2 |= PHY_B_1000C_AHD;
-                        break;
-                case SK_LMODE_AUTOFULL:
-                        Ctrl2 |= PHY_B_1000C_AFD;
-                        break;
-                case SK_LMODE_AUTOBOTH:
-                        Ctrl2 |= PHY_B_1000C_AFD | PHY_B_1000C_AHD;
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
-                                SKERR_HWI_E015MSG);
-                }
-
-                /* Set Flow-control capabilities */
-                switch (pPrt->PFlowCtrlMode) {
-                case SK_FLOW_MODE_NONE:
-                        Ctrl3 |= PHY_B_P_NO_PAUSE;
-                        break;
-                case SK_FLOW_MODE_LOC_SEND:
-                        Ctrl3 |= PHY_B_P_ASYM_MD;
-                        break;
-                case SK_FLOW_MODE_SYMMETRIC:
-                        Ctrl3 |= PHY_B_P_SYM_MD;
-                        break;
-                case SK_FLOW_MODE_SYM_OR_REM:
-                        Ctrl3 |= PHY_B_P_BOTH_MD;
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
-                                SKERR_HWI_E016MSG);
-                }
-
-                /* Restart Auto-negotiation */
-                Ctrl1 |= PHY_CT_ANE | PHY_CT_RE_CFG;
-        }
-        
-        /* Initialize LED register here? */
-        /* No. Please do it in SkDgXmitLed() (if required) and swap
-           init order of LEDs and XMAC. (MAl) */
-        
-        /* Write 1000Base-T Control Register */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, Ctrl2);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Set 1000B-T Ctrl Reg=0x%04X\n", Ctrl2));
-        
-        /* Write AutoNeg Advertisement Register */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, Ctrl3);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Set Auto-Neg.Adv.Reg=0x%04X\n", Ctrl3));
-        
-        if (DoLoop) {
-                /* Set the Phy Loopback bit, too */
-                Ctrl1 |= PHY_CT_LOOP;
-        }
-
-        if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
-                /* configure FIFO to high latency for transmission of ext. packets */
-                Ctrl4 |= PHY_B_PEC_HIGH_LA;
-
-                /* configure reception of extended packets */
-                Ctrl5 |= PHY_B_AC_LONG_PACK;
-
-                SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, Ctrl5);
-        }
-
-        /* Configure LED Traffic Mode and Jumbo Frame usage if specified */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, Ctrl4);
-        
-        /* Write to the Phy control register */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_CTRL, Ctrl1);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("PHY Control Reg=0x%04X\n", Ctrl1));
-}       /* SkXmInitPhyBcom */
-#endif /* GENESIS */
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkGmInitPhyMarv() - Initialize the Marvell Phy registers
- *
- * Description: initializes all the Marvell Phy registers
- *
- * Note:
- *
- * Returns:
- *      nothing
- */
-static void SkGmInitPhyMarv(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          PhyCtrl;
-        SK_U16          C1000BaseT;
-        SK_U16          AutoNegAdv;
-        SK_U16          ExtPhyCtrl;
-        SK_U16          LedCtrl;
-        SK_BOOL         AutoNeg;
-#if defined(SK_DIAG) || defined(DEBUG)
-        SK_U16          PhyStat;
-        SK_U16          PhyStat1;
-        SK_U16          PhySpecStat;
-#endif /* SK_DIAG || DEBUG */
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Auto-negotiation ? */
-        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-                AutoNeg = SK_FALSE;
-        }
-        else {
-                AutoNeg = SK_TRUE;
-        }
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("InitPhyMarv: Port %d, auto-negotiation %s\n",
-                 Port, AutoNeg ? "ON" : "OFF"));
-
-#ifdef VCPU
-        VCPUprintf(0, "SkGmInitPhyMarv(), Port=%u, DoLoop=%u\n",
-                Port, DoLoop);
-#else /* VCPU */
-        if (DoLoop) {
-                /* Set 'MAC Power up'-bit, set Manual MDI configuration */
-                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL,
-                        PHY_M_PC_MAC_POW_UP);
-        }
-        else if (AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_AUTO) {
-                /* Read Ext. PHY Specific Control */
-                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
-                
-                ExtPhyCtrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
-                        PHY_M_EC_MAC_S_MSK);
-                
-                ExtPhyCtrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ) |
-                        PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
-        
-                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL, ExtPhyCtrl);
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Set Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
-        }
-
-        /* Read PHY Control */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
-
-        if (!AutoNeg) {
-                /* Disable Auto-negotiation */
-                PhyCtrl &= ~PHY_CT_ANE;
-        }
-
-        PhyCtrl |= PHY_CT_RESET;
-        /* Assert software reset */
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PhyCtrl);
-#endif /* VCPU */
-
-        PhyCtrl = 0 /* PHY_CT_COL_TST */;
-        C1000BaseT = 0;
-        AutoNegAdv = PHY_SEL_TYPE;
-
-        /* manually Master/Slave ? */
-        if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
-                /* enable Manual Master/Slave */
-                C1000BaseT |= PHY_M_1000C_MSE;
-                
-                if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
-                        C1000BaseT |= PHY_M_1000C_MSC;  /* set it to Master */
-                }
-        }
-        
-        /* Auto-negotiation ? */
-        if (!AutoNeg) {
-                
-                if (pPrt->PLinkMode == SK_LMODE_FULL) {
-                        /* Set Full Duplex Mode */
-                        PhyCtrl |= PHY_CT_DUP_MD;
-                }
-
-                /* Set Master/Slave manually if not already done */
-                if (pPrt->PMSMode == SK_MS_MODE_AUTO) {
-                        C1000BaseT |= PHY_M_1000C_MSE;  /* set it to Slave */
-                }
-
-                /* Set Speed */
-                switch (pPrt->PLinkSpeed) {
-                case SK_LSPEED_AUTO:
-                case SK_LSPEED_1000MBPS:
-                        PhyCtrl |= PHY_CT_SP1000;
-                        break;
-                case SK_LSPEED_100MBPS:
-                        PhyCtrl |= PHY_CT_SP100;
-                        break;
-                case SK_LSPEED_10MBPS:
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E019,
-                                SKERR_HWI_E019MSG);
-                }
-
-                if (!DoLoop) {
-                        PhyCtrl |= PHY_CT_RESET;
-                }
-        }
-        else {
-                /* Set Auto-negotiation advertisement */
-                
-                if (pAC->GIni.GICopperType) {
-                        /* Set Speed capabilities */
-                        switch (pPrt->PLinkSpeed) {
-                        case SK_LSPEED_AUTO:
-                                C1000BaseT |= PHY_M_1000C_AHD | PHY_M_1000C_AFD;
-                                AutoNegAdv |= PHY_M_AN_100_FD | PHY_M_AN_100_HD |
-                                        PHY_M_AN_10_FD | PHY_M_AN_10_HD;
-                                break;
-                        case SK_LSPEED_1000MBPS:
-                                C1000BaseT |= PHY_M_1000C_AHD | PHY_M_1000C_AFD;
-                                break;
-                        case SK_LSPEED_100MBPS:
-                                AutoNegAdv |= PHY_M_AN_100_FD | PHY_M_AN_100_HD |
-                                        /* advertise 10Base-T also */
-                                        PHY_M_AN_10_FD | PHY_M_AN_10_HD;
-                                break;
-                        case SK_LSPEED_10MBPS:
-                                AutoNegAdv |= PHY_M_AN_10_FD | PHY_M_AN_10_HD;
-                                break;
-                        default:
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E019,
-                                        SKERR_HWI_E019MSG);
-                        }
-
-                        /* Set Full/half duplex capabilities */
-                        switch (pPrt->PLinkMode) {
-                        case SK_LMODE_AUTOHALF:
-                                C1000BaseT &= ~PHY_M_1000C_AFD;
-                                AutoNegAdv &= ~(PHY_M_AN_100_FD | PHY_M_AN_10_FD);
-                                break;
-                        case SK_LMODE_AUTOFULL:
-                                C1000BaseT &= ~PHY_M_1000C_AHD;
-                                AutoNegAdv &= ~(PHY_M_AN_100_HD | PHY_M_AN_10_HD);
-                                break;
-                        case SK_LMODE_AUTOBOTH:
-                                break;
-                        default:
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
-                                        SKERR_HWI_E015MSG);
-                        }
-                        
-                        /* Set Flow-control capabilities */
-                        switch (pPrt->PFlowCtrlMode) {
-                        case SK_FLOW_MODE_NONE:
-                                AutoNegAdv |= PHY_B_P_NO_PAUSE;
-                                break;
-                        case SK_FLOW_MODE_LOC_SEND:
-                                AutoNegAdv |= PHY_B_P_ASYM_MD;
-                                break;
-                        case SK_FLOW_MODE_SYMMETRIC:
-                                AutoNegAdv |= PHY_B_P_SYM_MD;
-                                break;
-                        case SK_FLOW_MODE_SYM_OR_REM:
-                                AutoNegAdv |= PHY_B_P_BOTH_MD;
-                                break;
-                        default:
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
-                                        SKERR_HWI_E016MSG);
-                        }
-                }
-                else {  /* special defines for FIBER (88E1011S only) */
-                        
-                        /* Set Full/half duplex capabilities */
-                        switch (pPrt->PLinkMode) {
-                        case SK_LMODE_AUTOHALF:
-                                AutoNegAdv |= PHY_M_AN_1000X_AHD;
-                                break;
-                        case SK_LMODE_AUTOFULL:
-                                AutoNegAdv |= PHY_M_AN_1000X_AFD;
-                                break;
-                        case SK_LMODE_AUTOBOTH:
-                                AutoNegAdv |= PHY_M_AN_1000X_AHD | PHY_M_AN_1000X_AFD;
-                                break;
-                        default:
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
-                                        SKERR_HWI_E015MSG);
-                        }
-                        
-                        /* Set Flow-control capabilities */
-                        switch (pPrt->PFlowCtrlMode) {
-                        case SK_FLOW_MODE_NONE:
-                                AutoNegAdv |= PHY_M_P_NO_PAUSE_X;
-                                break;
-                        case SK_FLOW_MODE_LOC_SEND:
-                                AutoNegAdv |= PHY_M_P_ASYM_MD_X;
-                                break;
-                        case SK_FLOW_MODE_SYMMETRIC:
-                                AutoNegAdv |= PHY_M_P_SYM_MD_X;
-                                break;
-                        case SK_FLOW_MODE_SYM_OR_REM:
-                                AutoNegAdv |= PHY_M_P_BOTH_MD_X;
-                                break;
-                        default:
-                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
-                                        SKERR_HWI_E016MSG);
-                        }
-                }
-
-                if (!DoLoop) {
-                        /* Restart Auto-negotiation */
-                        PhyCtrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
-                }
-        }
-        
-#ifdef VCPU
-        /*
-         * E-mail from Gu Lin (08-03-2002):
-         */
-        
-        /* Program PHY register 30 as 16'h0708 for simulation speed up */
-        SkGmPhyWrite(pAC, IoC, Port, 30, 0x0700 /* 0x0708 */);
-        
-        VCpuWait(2000);
-
-#else /* VCPU */
-        
-        /* Write 1000Base-T Control Register */
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_1000T_CTRL, C1000BaseT);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Set 1000B-T Ctrl =0x%04X\n", C1000BaseT));
-        
-        /* Write AutoNeg Advertisement Register */
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_AUNE_ADV, AutoNegAdv);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Set Auto-Neg.Adv.=0x%04X\n", AutoNegAdv));
-#endif /* VCPU */
-        
-        if (DoLoop) {
-                /* Set the PHY Loopback bit */
-                PhyCtrl |= PHY_CT_LOOP;
-
-#ifdef XXX
-                /* Program PHY register 16 as 16'h0400 to force link good */
-                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, PHY_M_PC_FL_GOOD);
-#endif /* XXX */
-
-#ifndef VCPU
-                if (pPrt->PLinkSpeed != SK_LSPEED_AUTO) {
-                        /* Write Ext. PHY Specific Control */
-                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL,
-                                (SK_U16)((pPrt->PLinkSpeed + 2) << 4));
-                }
-#endif /* VCPU */
-        }
-#ifdef TEST_ONLY
-        else if (pPrt->PLinkSpeed == SK_LSPEED_10MBPS) {
-                        /* Write PHY Specific Control */
-                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL,
-                                PHY_M_PC_EN_DET_MSK);
-        }
-#endif
-
-        /* Write to the PHY Control register */
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PhyCtrl);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Set PHY Ctrl Reg.=0x%04X\n", PhyCtrl));
-
-#ifdef VCPU
-        VCpuWait(2000);
-#else
-
-        LedCtrl = PHY_M_LED_PULS_DUR(PULS_170MS) | PHY_M_LED_BLINK_RT(BLINK_84MS);
-
-        if ((pAC->GIni.GILedBlinkCtrl & SK_ACT_LED_BLINK) != 0) {
-                LedCtrl |= PHY_M_LEDC_RX_CTRL | PHY_M_LEDC_TX_CTRL;
-        }
-
-        if ((pAC->GIni.GILedBlinkCtrl & SK_DUP_LED_NORMAL) != 0) {
-                LedCtrl |= PHY_M_LEDC_DP_CTRL;
-        }
-        
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_CTRL, LedCtrl);
-
-        if ((pAC->GIni.GILedBlinkCtrl & SK_LED_LINK100_ON) != 0) {
-                /* only in forced 100 Mbps mode */
-                if (!AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_100MBPS) {
-
-                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_OVER,
-                                PHY_M_LED_MO_100(MO_LED_ON));
-                }
-        }
-
-#ifdef SK_DIAG
-        c_print("Set PHY Ctrl=0x%04X\n", PhyCtrl);
-        c_print("Set 1000 B-T=0x%04X\n", C1000BaseT);
-        c_print("Set Auto-Neg=0x%04X\n", AutoNegAdv);
-        c_print("Set Ext Ctrl=0x%04X\n", ExtPhyCtrl);
-#endif /* SK_DIAG */
-
-#if defined(SK_DIAG) || defined(DEBUG)
-        /* Read PHY Control */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("PHY Ctrl Reg.=0x%04X\n", PhyCtrl));
-        
-        /* Read 1000Base-T Control Register */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_CTRL, &C1000BaseT);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("1000B-T Ctrl =0x%04X\n", C1000BaseT));
-        
-        /* Read AutoNeg Advertisement Register */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_ADV, &AutoNegAdv);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Auto-Neg.Adv.=0x%04X\n", AutoNegAdv));
-        
-        /* Read Ext. PHY Specific Control */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
-        
-        /* Read PHY Status */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("PHY Stat Reg.=0x%04X\n", PhyStat));
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat1);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("PHY Stat Reg.=0x%04X\n", PhyStat1));
-        
-        /* Read PHY Specific Status */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("PHY Spec Stat=0x%04X\n", PhySpecStat));
-#endif /* SK_DIAG || DEBUG */
-
-#ifdef SK_DIAG
-        c_print("PHY Ctrl Reg=0x%04X\n", PhyCtrl);
-        c_print("PHY 1000 Reg=0x%04X\n", C1000BaseT);
-        c_print("PHY AnAd Reg=0x%04X\n", AutoNegAdv);
-        c_print("Ext Ctrl Reg=0x%04X\n", ExtPhyCtrl);
-        c_print("PHY Stat Reg=0x%04X\n", PhyStat);
-        c_print("PHY Stat Reg=0x%04X\n", PhyStat1);
-        c_print("PHY Spec Reg=0x%04X\n", PhySpecStat);
-#endif /* SK_DIAG */
-
-#endif /* VCPU */
-
-}       /* SkGmInitPhyMarv */
-#endif /* YUKON */
-
-
-#ifdef OTHER_PHY
-/******************************************************************************
- *
- *      SkXmInitPhyLone() - Initialize the Level One Phy registers
- *
- * Description: initializes all the Level One Phy registers
- *
- * Note:
- *
- * Returns:
- *      nothing
- */
-static void SkXmInitPhyLone(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          Ctrl1;
-        SK_U16          Ctrl2;
-        SK_U16          Ctrl3;
-
-        Ctrl1 = PHY_CT_SP1000;
-        Ctrl2 = 0;
-        Ctrl3 = PHY_SEL_TYPE;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* manually Master/Slave ? */
-        if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
-                Ctrl2 |= PHY_L_1000C_MSE;
-                
-                if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
-                        Ctrl2 |= PHY_L_1000C_MSC;
-                }
-        }
-        /* Auto-negotiation ? */
-        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-                /*
-                 * level one spec say: "1000 Mbps: manual mode not allowed"
-                 * but lets see what happens...
-                 */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("InitPhyLone: no auto-negotiation Port %d\n", Port));
-                /* Set DuplexMode in Config register */
-                if (pPrt->PLinkMode == SK_LMODE_FULL) {
-                        Ctrl1 |= PHY_CT_DUP_MD;
-                }
-
-                /* Determine Master/Slave manually if not already done */
-                if (pPrt->PMSMode == SK_MS_MODE_AUTO) {
-                        Ctrl2 |= PHY_L_1000C_MSE;       /* set it to Slave */
-                }
-
-                /*
-                 * Do NOT enable Auto-negotiation here. This would hold
-                 * the link down because no IDLES are transmitted
-                 */
-        }
-        else {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("InitPhyLone: with auto-negotiation Port %d\n", Port));
-                /* Set Auto-negotiation advertisement */
-
-                /* Set Full/half duplex capabilities */
-                switch (pPrt->PLinkMode) {
-                case SK_LMODE_AUTOHALF:
-                        Ctrl2 |= PHY_L_1000C_AHD;
-                        break;
-                case SK_LMODE_AUTOFULL:
-                        Ctrl2 |= PHY_L_1000C_AFD;
-                        break;
-                case SK_LMODE_AUTOBOTH:
-                        Ctrl2 |= PHY_L_1000C_AFD | PHY_L_1000C_AHD;
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
-                                SKERR_HWI_E015MSG);
-                }
-
-                /* Set Flow-control capabilities */
-                switch (pPrt->PFlowCtrlMode) {
-                case SK_FLOW_MODE_NONE:
-                        Ctrl3 |= PHY_L_P_NO_PAUSE;
-                        break;
-                case SK_FLOW_MODE_LOC_SEND:
-                        Ctrl3 |= PHY_L_P_ASYM_MD;
-                        break;
-                case SK_FLOW_MODE_SYMMETRIC:
-                        Ctrl3 |= PHY_L_P_SYM_MD;
-                        break;
-                case SK_FLOW_MODE_SYM_OR_REM:
-                        Ctrl3 |= PHY_L_P_BOTH_MD;
-                        break;
-                default:
-                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
-                                SKERR_HWI_E016MSG);
-                }
-
-                /* Restart Auto-negotiation */
-                Ctrl1 = PHY_CT_ANE | PHY_CT_RE_CFG;
-        }
-        
-        /* Write 1000Base-T Control Register */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_1000T_CTRL, Ctrl2);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("1000B-T Ctrl Reg=0x%04X\n", Ctrl2));
-        
-        /* Write AutoNeg Advertisement Register */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_AUNE_ADV, Ctrl3);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Auto-Neg.Adv.Reg=0x%04X\n", Ctrl3));
-
-        if (DoLoop) {
-                /* Set the Phy Loopback bit, too */
-                Ctrl1 |= PHY_CT_LOOP;
-        }
-
-        /* Write to the Phy control register */
-        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_CTRL, Ctrl1);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("PHY Control Reg=0x%04X\n", Ctrl1));
-}       /* SkXmInitPhyLone */
-
-
-/******************************************************************************
- *
- *      SkXmInitPhyNat() - Initialize the National Phy registers
- *
- * Description: initializes all the National Phy registers
- *
- * Note:
- *
- * Returns:
- *      nothing
- */
-static void SkXmInitPhyNat(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
-{
-/* todo: National */
-}       /* SkXmInitPhyNat */
-#endif /* OTHER_PHY */
-
-
-/******************************************************************************
- *
- *      SkMacInitPhy() - Initialize the PHY registers
- *
- * Description: calls the Init PHY routines dep. on board type
- *
- * Note:
- *
- * Returns:
- *      nothing
- */
-void SkMacInitPhy(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
-{
-        SK_GEPORT       *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                switch (pPrt->PhyType) {
-                case SK_PHY_XMAC:
-                        SkXmInitPhyXmac(pAC, IoC, Port, DoLoop);
-                        break;
-                case SK_PHY_BCOM:
-                        SkXmInitPhyBcom(pAC, IoC, Port, DoLoop);
-                        break;
-#ifdef OTHER_PHY
-                case SK_PHY_LONE:
-                        SkXmInitPhyLone(pAC, IoC, Port, DoLoop);
-                        break;
-                case SK_PHY_NAT:
-                        SkXmInitPhyNat(pAC, IoC, Port, DoLoop);
-                        break;
-#endif /* OTHER_PHY */
-                }
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                SkGmInitPhyMarv(pAC, IoC, Port, DoLoop);
-        }
-#endif /* YUKON */
-
-}       /* SkMacInitPhy */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmAutoNegDoneXmac() - Auto-negotiation handling
- *
- * Description:
- *      This function handles the auto-negotiation if the Done bit is set.
- *
- * Returns:
- *      SK_AND_OK       o.k.
- *      SK_AND_DUP_CAP  Duplex capability error happened
- *      SK_AND_OTHER    Other error happened
- */
-static int SkXmAutoNegDoneXmac(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          ResAb;          /* Resolved Ability */
-        SK_U16          LPAb;           /* Link Partner Ability */
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("AutoNegDoneXmac, Port %d\n", Port));
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Get PHY parameters */
-        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_LP, &LPAb);
-        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_RES_ABI, &ResAb);
-
-        if ((LPAb & PHY_X_AN_RFB) != 0) {
-                /* At least one of the remote fault bit is set */
-                /* Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                return(SK_AND_OTHER);
-        }
-
-        /* Check Duplex mismatch */
-        if ((ResAb & (PHY_X_RS_HD | PHY_X_RS_FD)) == PHY_X_RS_FD) {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
-        }
-        else if ((ResAb & (PHY_X_RS_HD | PHY_X_RS_FD)) == PHY_X_RS_HD) {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
-        }
-        else {
-                /* Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegFail: Duplex mode mismatch Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                return(SK_AND_DUP_CAP);
-        }
-
-        /* Check PAUSE mismatch */
-        /* We are NOT using chapter 4.23 of the Xaqti manual */
-        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
-        if ((pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYMMETRIC ||
-             pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM) &&
-            (LPAb & PHY_X_P_SYM_MD) != 0) {
-                /* Symmetric PAUSE */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
-        }
-        else if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM &&
-                   (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_ASYM_MD) {
-                /* Enable PAUSE receive, disable PAUSE transmit */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
-        }
-        else if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_LOC_SEND &&
-                   (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_BOTH_MD) {
-                /* Disable PAUSE receive, enable PAUSE transmit */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
-        }
-        else {
-                /* PAUSE mismatch -> no PAUSE */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
-        }
-        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
-
-        return(SK_AND_OK);
-}       /* SkXmAutoNegDoneXmac */
-
-
-/******************************************************************************
- *
- *      SkXmAutoNegDoneBcom() - Auto-negotiation handling
- *
- * Description:
- *      This function handles the auto-negotiation if the Done bit is set.
- *
- * Returns:
- *      SK_AND_OK       o.k.
- *      SK_AND_DUP_CAP  Duplex capability error happened
- *      SK_AND_OTHER    Other error happened
- */
-static int SkXmAutoNegDoneBcom(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          LPAb;           /* Link Partner Ability */
-        SK_U16          AuxStat;        /* Auxiliary Status */
-
-#ifdef TEST_ONLY
-01-Sep-2000 RA;:;:
-        SK_U16          ResAb;          /* Resolved Ability */
-#endif  /* 0 */
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("AutoNegDoneBcom, Port %d\n", Port));
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Get PHY parameters */
-        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &LPAb);
-#ifdef TEST_ONLY
-01-Sep-2000 RA;:;:
-        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
-#endif  /* 0 */
-        
-        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &AuxStat);
-
-        if ((LPAb & PHY_B_AN_RF) != 0) {
-                /* Remote fault bit is set: Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                return(SK_AND_OTHER);
-        }
-
-        /* Check Duplex mismatch */
-        if ((AuxStat & PHY_B_AS_AN_RES_MSK) == PHY_B_RES_1000FD) {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
-        }
-        else if ((AuxStat & PHY_B_AS_AN_RES_MSK) == PHY_B_RES_1000HD) {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
-        }
-        else {
-                /* Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegFail: Duplex mode mismatch Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                return(SK_AND_DUP_CAP);
-        }
-        
-#ifdef TEST_ONLY
-01-Sep-2000 RA;:;:
-        /* Check Master/Slave resolution */
-        if ((ResAb & PHY_B_1000S_MSF) != 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Master/Slave Fault Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                pPrt->PMSStatus = SK_MS_STAT_FAULT;
-                return(SK_AND_OTHER);
-        }
-        
-        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
-                SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
-#endif  /* 0 */
-
-        /* Check PAUSE mismatch ??? */
-        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
-        if ((AuxStat & PHY_B_AS_PAUSE_MSK) == PHY_B_AS_PAUSE_MSK) {
-                /* Symmetric PAUSE */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
-        }
-        else if ((AuxStat & PHY_B_AS_PAUSE_MSK) == PHY_B_AS_PRR) {
-                /* Enable PAUSE receive, disable PAUSE transmit */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
-        }
-        else if ((AuxStat & PHY_B_AS_PAUSE_MSK) == PHY_B_AS_PRT) {
-                /* Disable PAUSE receive, enable PAUSE transmit */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
-        }
-        else {
-                /* PAUSE mismatch -> no PAUSE */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
-        }
-        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
-
-        return(SK_AND_OK);
-}       /* SkXmAutoNegDoneBcom */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkGmAutoNegDoneMarv() - Auto-negotiation handling
- *
- * Description:
- *      This function handles the auto-negotiation if the Done bit is set.
- *
- * Returns:
- *      SK_AND_OK       o.k.
- *      SK_AND_DUP_CAP  Duplex capability error happened
- *      SK_AND_OTHER    Other error happened
- */
-static int SkGmAutoNegDoneMarv(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          LPAb;           /* Link Partner Ability */
-        SK_U16          ResAb;          /* Resolved Ability */
-        SK_U16          AuxStat;        /* Auxiliary Status */
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("AutoNegDoneMarv, Port %d\n", Port));
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Get PHY parameters */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_LP, &LPAb);
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("Link P.Abil.=0x%04X\n", LPAb));
-        
-        if ((LPAb & PHY_M_AN_RF) != 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                return(SK_AND_OTHER);
-        }
-
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
-        
-        /* Check Master/Slave resolution */
-        if ((ResAb & PHY_B_1000S_MSF) != 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Master/Slave Fault Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                pPrt->PMSStatus = SK_MS_STAT_FAULT;
-                return(SK_AND_OTHER);
-        }
-        
-        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
-                (SK_U8)SK_MS_STAT_MASTER : (SK_U8)SK_MS_STAT_SLAVE;
-        
-        /* Read PHY Specific Status */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &AuxStat);
-        
-        /* Check Speed & Duplex resolved */
-        if ((AuxStat & PHY_M_PS_SPDUP_RES) == 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegFail: Speed & Duplex not resolved, Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
-                return(SK_AND_DUP_CAP);
-        }
-        
-        if ((AuxStat & PHY_M_PS_FULL_DUP) != 0) {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
-        }
-        else {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
-        }
-        
-        /* Check PAUSE mismatch ??? */
-        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
-        if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_PAUSE_MSK) {
-                /* Symmetric PAUSE */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
-        }
-        else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_RX_P_EN) {
-                /* Enable PAUSE receive, disable PAUSE transmit */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
-        }
-        else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_TX_P_EN) {
-                /* Disable PAUSE receive, enable PAUSE transmit */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
-        }
-        else {
-                /* PAUSE mismatch -> no PAUSE */
-                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
-        }
-        
-        /* set used link speed */
-        switch ((unsigned)(AuxStat & PHY_M_PS_SPEED_MSK)) {
-        case (unsigned)PHY_M_PS_SPEED_1000:
-                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
-                break;
-        case PHY_M_PS_SPEED_100:
-                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
-                break;
-        default:
-                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
-        }
-
-        return(SK_AND_OK);
-}       /* SkGmAutoNegDoneMarv */
-#endif /* YUKON */
-
-
-#ifdef OTHER_PHY
-/******************************************************************************
- *
- *      SkXmAutoNegDoneLone() - Auto-negotiation handling
- *
- * Description:
- *      This function handles the auto-negotiation if the Done bit is set.
- *
- * Returns:
- *      SK_AND_OK       o.k.
- *      SK_AND_DUP_CAP  Duplex capability error happened
- *      SK_AND_OTHER    Other error happened
- */
-static int SkXmAutoNegDoneLone(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          ResAb;          /* Resolved Ability */
-        SK_U16          LPAb;           /* Link Partner Ability */
-        SK_U16          QuickStat;      /* Auxiliary Status */
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("AutoNegDoneLone, Port %d\n", Port));
-        pPrt = &pAC->GIni.GP[Port];
-
-        /* Get PHY parameters */
-        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_AUNE_LP, &LPAb);
-        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_1000T_STAT, &ResAb);
-        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_Q_STAT, &QuickStat);
-
-        if ((LPAb & PHY_L_AN_RF) != 0) {
-                /* Remote fault bit is set */
-                /* Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                return(SK_AND_OTHER);
-        }
-
-        /* Check Duplex mismatch */
-        if ((QuickStat & PHY_L_QS_DUP_MOD) != 0) {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
-        }
-        else {
-                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
-        }
-        
-        /* Check Master/Slave resolution */
-        if ((ResAb & PHY_L_1000S_MSF) != 0) {
-                /* Error */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("Master/Slave Fault Port %d\n", Port));
-                pPrt->PAutoNegFail = SK_TRUE;
-                pPrt->PMSStatus = SK_MS_STAT_FAULT;
-                return(SK_AND_OTHER);
-        }
-        else if (ResAb & PHY_L_1000S_MSR) {
-                pPrt->PMSStatus = SK_MS_STAT_MASTER;
-        }
-        else {
-                pPrt->PMSStatus = SK_MS_STAT_SLAVE;
-        }
-
-        /* Check PAUSE mismatch */
-        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
-        /* we must manually resolve the abilities here */
-        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
-        
-        switch (pPrt->PFlowCtrlMode) {
-        case SK_FLOW_MODE_NONE:
-                /* default */
-                break;
-        case SK_FLOW_MODE_LOC_SEND:
-                if ((QuickStat & (PHY_L_QS_PAUSE | PHY_L_QS_AS_PAUSE)) ==
-                        (PHY_L_QS_PAUSE | PHY_L_QS_AS_PAUSE)) {
-                        /* Disable PAUSE receive, enable PAUSE transmit */
-                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
-                }
-                break;
-        case SK_FLOW_MODE_SYMMETRIC:
-                if ((QuickStat & PHY_L_QS_PAUSE) != 0) {
-                        /* Symmetric PAUSE */
-                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
-                }
-                break;
-        case SK_FLOW_MODE_SYM_OR_REM:
-                if ((QuickStat & (PHY_L_QS_PAUSE | PHY_L_QS_AS_PAUSE)) ==
-                        PHY_L_QS_AS_PAUSE) {
-                        /* Enable PAUSE receive, disable PAUSE transmit */
-                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
-                }
-                else if ((QuickStat & PHY_L_QS_PAUSE) != 0) {
-                        /* Symmetric PAUSE */
-                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
-                }
-                break;
-        default:
-                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
-                        SKERR_HWI_E016MSG);
-        }
-        
-        return(SK_AND_OK);
-}       /* SkXmAutoNegDoneLone */
-
-
-/******************************************************************************
- *
- *      SkXmAutoNegDoneNat() - Auto-negotiation handling
- *
- * Description:
- *      This function handles the auto-negotiation if the Done bit is set.
- *
- * Returns:
- *      SK_AND_OK       o.k.
- *      SK_AND_DUP_CAP  Duplex capability error happened
- *      SK_AND_OTHER    Other error happened
- */
-static int SkXmAutoNegDoneNat(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-/* todo: National */
-        return(SK_AND_OK);
-}       /* SkXmAutoNegDoneNat */
-#endif /* OTHER_PHY */
-
-
-/******************************************************************************
- *
- *      SkMacAutoNegDone() - Auto-negotiation handling
- *
- * Description: calls the auto-negotiation done routines dep. on board type
- *
- * Returns:
- *      SK_AND_OK       o.k.
- *      SK_AND_DUP_CAP  Duplex capability error happened
- *      SK_AND_OTHER    Other error happened
- */
-int     SkMacAutoNegDone(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        int     Rtv;
-
-        Rtv = SK_AND_OK;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                switch (pPrt->PhyType) {
-                
-                case SK_PHY_XMAC:
-                        Rtv = SkXmAutoNegDoneXmac(pAC, IoC, Port);
-                        break;
-                case SK_PHY_BCOM:
-                        Rtv = SkXmAutoNegDoneBcom(pAC, IoC, Port);
-                        break;
-#ifdef OTHER_PHY
-                case SK_PHY_LONE:
-                        Rtv = SkXmAutoNegDoneLone(pAC, IoC, Port);
-                        break;
-                case SK_PHY_NAT:
-                        Rtv = SkXmAutoNegDoneNat(pAC, IoC, Port);
-                        break;
-#endif /* OTHER_PHY */
-                default:
-                        return(SK_AND_OTHER);
-                }
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                Rtv = SkGmAutoNegDoneMarv(pAC, IoC, Port);
-        }
-#endif /* YUKON */
-        
-        if (Rtv != SK_AND_OK) {
-                return(Rtv);
-        }
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("AutoNeg done Port %d\n", Port));
-        
-        /* We checked everything and may now enable the link */
-        pPrt->PAutoNegFail = SK_FALSE;
-
-        SkMacRxTxEnable(pAC, IoC, Port);
-        
-        return(SK_AND_OK);
-}       /* SkMacAutoNegDone */
-
-
-/******************************************************************************
- *
- *      SkMacRxTxEnable() - Enable Rx/Tx activity if port is up
- *
- * Description: enables Rx/Tx dep. on board type
- *
- * Returns:
- *      0       o.k.
- *      != 0    Error happened
- */
-int SkMacRxTxEnable(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          Reg;            /* 16-bit register value */
-        SK_U16          IntMask;        /* MAC interrupt mask */
-#ifdef GENESIS
-        SK_U16          SWord;
-#endif
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (!pPrt->PHWLinkUp) {
-                /* The Hardware link is NOT up */
-                return(0);
-        }
-
-        if ((pPrt->PLinkMode == SK_LMODE_AUTOHALF ||
-             pPrt->PLinkMode == SK_LMODE_AUTOFULL ||
-             pPrt->PLinkMode == SK_LMODE_AUTOBOTH) &&
-             pPrt->PAutoNegFail) {
-                /* Auto-negotiation is not done or failed */
-                return(0);
-        }
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                /* set Duplex Mode and Pause Mode */
-                SkXmInitDupMd(pAC, IoC, Port);
-                
-                SkXmInitPauseMd(pAC, IoC, Port);
-        
-                /*
-                 * Initialize the Interrupt Mask Register. Default IRQs are...
-                 *      - Link Asynchronous Event
-                 *      - Link Partner requests config
-                 *      - Auto Negotiation Done
-                 *      - Rx Counter Event Overflow
-                 *      - Tx Counter Event Overflow
-                 *      - Transmit FIFO Underrun
-                 */
-                IntMask = XM_DEF_MSK;
-
-#ifdef DEBUG
-                /* add IRQ for Receive FIFO Overflow */
-                IntMask &= ~XM_IS_RXF_OV;
-#endif /* DEBUG */
-                
-                if (pPrt->PhyType != SK_PHY_XMAC) {
-                        /* disable GP0 interrupt bit */
-                        IntMask |= XM_IS_INP_ASS;
-                }
-                XM_OUT16(IoC, Port, XM_IMSK, IntMask);
-        
-                /* get MMU Command Reg. */
-                XM_IN16(IoC, Port, XM_MMU_CMD, &Reg);
-                
-                if (pPrt->PhyType != SK_PHY_XMAC &&
-                        (pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL ||
-                         pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL)) {
-                        /* set to Full Duplex */
-                        Reg |= XM_MMU_GMII_FD;
-                }
-                
-                switch (pPrt->PhyType) {
-                case SK_PHY_BCOM:
-                        /*
-                         * Workaround BCOM Errata (#10523) for all BCom Phys
-                         * Enable Power Management after link up
-                         */
-                        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &SWord);
-                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL,
-                                (SK_U16)(SWord & ~PHY_B_AC_DIS_PM));
-            SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK,
-                                (SK_U16)PHY_B_DEF_MSK);
-                        break;
-#ifdef OTHER_PHY
-                case SK_PHY_LONE:
-                        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_INT_ENAB, PHY_L_DEF_MSK);
-                        break;
-                case SK_PHY_NAT:
-                        /* todo National:
-                        SkXmPhyWrite(pAC, IoC, Port, PHY_NAT_INT_MASK, PHY_N_DEF_MSK); */
-                        /* no interrupts possible from National ??? */
-                        break;
-#endif /* OTHER_PHY */
-                }
-                
-                /* enable Rx/Tx */
-                XM_OUT16(IoC, Port, XM_MMU_CMD, Reg | XM_MMU_ENA_RX | XM_MMU_ENA_TX);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /*
-                 * Initialize the Interrupt Mask Register. Default IRQs are...
-                 *      - Rx Counter Event Overflow
-                 *      - Tx Counter Event Overflow
-                 *      - Transmit FIFO Underrun
-                 */
-                IntMask = GMAC_DEF_MSK;
-
-#ifdef DEBUG
-                /* add IRQ for Receive FIFO Overrun */
-                IntMask |= GM_IS_RX_FF_OR;
-#endif /* DEBUG */
-                
-                SK_OUT8(IoC, GMAC_IRQ_MSK, (SK_U8)IntMask);
-                
-                /* get General Purpose Control */
-                GM_IN16(IoC, Port, GM_GP_CTRL, &Reg);
-                
-                if (pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL ||
-                        pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL) {
-                        /* set to Full Duplex */
-                        Reg |= GM_GPCR_DUP_FULL;
-                }
-                
-                /* enable Rx/Tx */
-        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Reg | GM_GPCR_RX_ENA |
-                        GM_GPCR_TX_ENA));
-
-#ifndef VCPU
-                /* Enable all PHY interrupts */
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK,
-                        (SK_U16)PHY_M_DEF_MSK);
-#endif /* VCPU */
-        }
-#endif /* YUKON */
-                                        
-        return(0);
-
-}       /* SkMacRxTxEnable */
-
-
-/******************************************************************************
- *
- *      SkMacRxTxDisable() - Disable Receiver and Transmitter
- *
- * Description: disables Rx/Tx dep. on board type
- *
- * Returns: N/A
- */
-void SkMacRxTxDisable(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_U16  Word;
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
-                
-                XM_OUT16(IoC, Port, XM_MMU_CMD, Word & ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX));
-        
-                /* dummy read to ensure writing */
-                XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                
-                GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
-
-        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Word & ~(GM_GPCR_RX_ENA |
-                        GM_GPCR_TX_ENA)));
-
-                /* dummy read to ensure writing */
-                GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
-        }
-#endif /* YUKON */
-
-}       /* SkMacRxTxDisable */
-
-
-/******************************************************************************
- *
- *      SkMacIrqDisable() - Disable IRQ from MAC
- *
- * Description: sets the IRQ-mask to disable IRQ dep. on board type
- *
- * Returns: N/A
- */
-void SkMacIrqDisable(
-SK_AC   *pAC,           /* Adapter Context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-#ifdef GENESIS
-        SK_U16          Word;
-#endif
-
-        pPrt = &pAC->GIni.GP[Port];
-
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                
-                /* disable all XMAC IRQs */
-                XM_OUT16(IoC, Port, XM_IMSK, 0xffff);   
-                
-                /* Disable all PHY interrupts */
-                switch (pPrt->PhyType) {
-                        case SK_PHY_BCOM:
-                                /* Make sure that PHY is initialized */
-                                if (pPrt->PState != SK_PRT_RESET) {
-                                        /* NOT allowed if BCOM is in RESET state */
-                                        /* Workaround BCOM Errata (#10523) all BCom */
-                                        /* Disable Power Management if link is down */
-                                        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Word);
-                                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL,
-                                                (SK_U16)(Word | PHY_B_AC_DIS_PM));
-                                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK, 0xffff);
-                                }
-                                break;
-#ifdef OTHER_PHY
-                        case SK_PHY_LONE:
-                                SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_INT_ENAB, 0);
-                                break;
-                        case SK_PHY_NAT:
-                                /* todo: National
-                                SkXmPhyWrite(pAC, IoC, Port, PHY_NAT_INT_MASK, 0xffff); */
-                                break;
-#endif /* OTHER_PHY */
-                }
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* disable all GMAC IRQs */
-                SK_OUT8(IoC, GMAC_IRQ_MSK, 0);
-                
-#ifndef VCPU
-                /* Disable all PHY interrupts */
-                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, 0);
-#endif /* VCPU */
-        }
-#endif /* YUKON */
-
-}       /* SkMacIrqDisable */
-
-
-#ifdef SK_DIAG
-/******************************************************************************
- *
- *      SkXmSendCont() - Enable / Disable Send Continuous Mode
- *
- * Description: enable / disable Send Continuous Mode on XMAC
- *
- * Returns:
- *      nothing
- */
-void SkXmSendCont(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port,   /* Port Index (MAC_1 + n) */
-SK_BOOL Enable) /* Enable / Disable */
-{
-        SK_U32  MdReg;
-
-        XM_IN32(IoC, Port, XM_MODE, &MdReg);
-
-        if (Enable) {
-                MdReg |= XM_MD_TX_CONT;
-        }
-        else {
-                MdReg &= ~XM_MD_TX_CONT;
-        }
-        /* setup Mode Register */
-        XM_OUT32(IoC, Port, XM_MODE, MdReg);
-
-}       /* SkXmSendCont */
-
-
-/******************************************************************************
- *
- *      SkMacTimeStamp() - Enable / Disable Time Stamp
- *
- * Description: enable / disable Time Stamp generation for Rx packets
- *
- * Returns:
- *      nothing
- */
-void SkMacTimeStamp(
-SK_AC   *pAC,   /* adapter context */
-SK_IOC  IoC,    /* IO context */
-int             Port,   /* Port Index (MAC_1 + n) */
-SK_BOOL Enable) /* Enable / Disable */
-{
-        SK_U32  MdReg;
-        SK_U8   TimeCtrl;
-
-        if (pAC->GIni.GIGenesis) {
-
-                XM_IN32(IoC, Port, XM_MODE, &MdReg);
-
-                if (Enable) {
-                        MdReg |= XM_MD_ATS;
-                }
-                else {
-                        MdReg &= ~XM_MD_ATS;
-                }
-                /* setup Mode Register */
-                XM_OUT32(IoC, Port, XM_MODE, MdReg);
-        }
-        else {
-                if (Enable) {
-                        TimeCtrl = GMT_ST_START | GMT_ST_CLR_IRQ;
-                }
-                else {
-                        TimeCtrl = GMT_ST_STOP | GMT_ST_CLR_IRQ;
-                }
-                /* Start/Stop Time Stamp Timer */
-                SK_OUT8(IoC, GMAC_TI_ST_CTRL, TimeCtrl);
-        }
-
-}       /* SkMacTimeStamp*/
-
-#else /* !SK_DIAG */
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmAutoNegLipaXmac() - Decides whether Link Partner could do auto-neg
- *
- *      This function analyses the Interrupt status word. If any of the
- *      Auto-negotiating interrupt bits are set, the PLipaAutoNeg variable
- *      is set true.
- */
-void SkXmAutoNegLipaXmac(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_U16  IStatus)        /* Interrupt Status word to analyse */
-{
-        SK_GEPORT       *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
-                (IStatus & (XM_IS_LIPA_RC | XM_IS_RX_PAGE | XM_IS_AND)) != 0) {
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegLipa: AutoNeg detected on Port %d, IStatus=0x%04X\n",
-                        Port, IStatus));
-                pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
-        }
-}       /* SkXmAutoNegLipaXmac */
-#endif /* GENESIS */
-
-
-/******************************************************************************
- *
- *      SkMacAutoNegLipaPhy() - Decides whether Link Partner could do auto-neg
- *
- *      This function analyses the PHY status word.
- *  If any of the Auto-negotiating bits are set, the PLipaAutoNeg variable
- *      is set true.
- */
-void SkMacAutoNegLipaPhy(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_U16  PhyStat)        /* PHY Status word to analyse */
-{
-        SK_GEPORT       *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
-                (PhyStat & PHY_ST_AN_OVER) != 0) {
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("AutoNegLipa: AutoNeg detected on Port %d, PhyStat=0x%04X\n",
-                        Port, PhyStat));
-                pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
-        }
-}       /* SkMacAutoNegLipaPhy */
-
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmIrq() - Interrupt Service Routine
- *
- * Description: services an Interrupt Request of the XMAC
- *
- * Note:
- *      With an external PHY, some interrupt bits are not meaningfull any more:
- *      - LinkAsyncEvent (bit #14)              XM_IS_LNK_AE
- *      - LinkPartnerReqConfig (bit #10)        XM_IS_LIPA_RC
- *      - Page Received (bit #9)                XM_IS_RX_PAGE
- *      - NextPageLoadedForXmt (bit #8)         XM_IS_TX_PAGE
- *      - AutoNegDone (bit #7)                  XM_IS_AND
- *      Also probably not valid any more is the GP0 input bit:
- *      - GPRegisterBit0set                     XM_IS_INP_ASS
- *
- * Returns:
- *      nothing
- */
-static void SkXmIrq(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_EVPARA       Para;
-        SK_U16          IStatus;        /* Interrupt status read from the XMAC */
-        SK_U16          IStatus2;
-#ifdef SK_SLIM
-    SK_U64      OverflowStatus;
-#endif  
-
-        pPrt = &pAC->GIni.GP[Port];
-        
-        XM_IN16(IoC, Port, XM_ISRC, &IStatus);
-        
-        /* LinkPartner Auto-negable? */
-        if (pPrt->PhyType == SK_PHY_XMAC) {
-                SkXmAutoNegLipaXmac(pAC, IoC, Port, IStatus);
-        }
-        else {
-                /* mask bits that are not used with ext. PHY */
-                IStatus &= ~(XM_IS_LNK_AE | XM_IS_LIPA_RC |
-                        XM_IS_RX_PAGE | XM_IS_TX_PAGE |
-                        XM_IS_AND | XM_IS_INP_ASS);
-        }
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                ("XmacIrq Port %d Isr 0x%04X\n", Port, IStatus));
-
-        if (!pPrt->PHWLinkUp) {
-                /* Spurious XMAC interrupt */
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("SkXmIrq: spurious interrupt on Port %d\n", Port));
-                return;
-        }
-
-        if ((IStatus & XM_IS_INP_ASS) != 0) {
-                /* Reread ISR Register if link is not in sync */
-                XM_IN16(IoC, Port, XM_ISRC, &IStatus2);
-
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("SkXmIrq: Link async. Double check Port %d 0x%04X 0x%04X\n",
-                         Port, IStatus, IStatus2));
-                IStatus &= ~XM_IS_INP_ASS;
-                IStatus |= IStatus2;
-        }
-
-        if ((IStatus & XM_IS_LNK_AE) != 0) {
-                /* not used, GP0 is used instead */
-        }
-
-        if ((IStatus & XM_IS_TX_ABORT) != 0) {
-                /* not used */
-        }
-
-        if ((IStatus & XM_IS_FRC_INT) != 0) {
-                /* not used, use ASIC IRQ instead if needed */
-        }
-
-        if ((IStatus & (XM_IS_INP_ASS | XM_IS_LIPA_RC | XM_IS_RX_PAGE)) != 0) {
-                SkHWLinkDown(pAC, IoC, Port);
-
-                /* Signal to RLMT */
-                Para.Para32[0] = (SK_U32)Port;
-                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
-
-                /* Start workaround Errata #2 timer */
-                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, SK_WA_INA_TIME,
-                        SKGE_HWAC, SK_HWEV_WATIM, Para);
-        }
-
-        if ((IStatus & XM_IS_RX_PAGE) != 0) {
-                /* not used */
-        }
-
-        if ((IStatus & XM_IS_TX_PAGE) != 0) {
-                /* not used */
-        }
-
-        if ((IStatus & XM_IS_AND) != 0) {
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                        ("SkXmIrq: AND on link that is up Port %d\n", Port));
-        }
-
-        if ((IStatus & XM_IS_TSC_OV) != 0) {
-                /* not used */
-        }
-
-        /* Combined Tx & Rx Counter Overflow SIRQ Event */
-        if ((IStatus & (XM_IS_RXC_OV | XM_IS_TXC_OV)) != 0) {
-#ifdef SK_SLIM
-                SkXmOverflowStatus(pAC, IoC, Port, IStatus, &OverflowStatus);
-#else
-                Para.Para32[0] = (SK_U32)Port;
-                Para.Para32[1] = (SK_U32)IStatus;
-                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_SIRQ_OVERFLOW, Para);
-#endif /* SK_SLIM */
-        }
-
-        if ((IStatus & XM_IS_RXF_OV) != 0) {
-                /* normal situation -> no effect */
-#ifdef DEBUG
-                pPrt->PRxOverCnt++;
-#endif /* DEBUG */
-        }
-
-        if ((IStatus & XM_IS_TXF_UR) != 0) {
-                /* may NOT happen -> error log */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E020, SKERR_SIRQ_E020MSG);
-        }
-
-        if ((IStatus & XM_IS_TX_COMP) != 0) {
-                /* not served here */
-        }
-
-        if ((IStatus & XM_IS_RX_COMP) != 0) {
-                /* not served here */
-        }
-}       /* SkXmIrq */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkGmIrq() - Interrupt Service Routine
- *
- * Description: services an Interrupt Request of the GMAC
- *
- * Note:
- *
- * Returns:
- *      nothing
- */
-static void SkGmIrq(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U8           IStatus;        /* Interrupt status */
-#ifdef SK_SLIM
-    SK_U64      OverflowStatus;
-#else
-        SK_EVPARA       Para;
-#endif  
-
-        pPrt = &pAC->GIni.GP[Port];
-        
-        SK_IN8(IoC, GMAC_IRQ_SRC, &IStatus);
-        
-#ifdef XXX
-        /* LinkPartner Auto-negable? */
-        SkMacAutoNegLipaPhy(pAC, IoC, Port, IStatus);
-#endif /* XXX */
-        
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-                ("GmacIrq Port %d Isr 0x%04X\n", Port, IStatus));
-
-        /* Combined Tx & Rx Counter Overflow SIRQ Event */
-        if (IStatus & (GM_IS_RX_CO_OV | GM_IS_TX_CO_OV)) {
-                /* these IRQs will be cleared by reading GMACs register */
-#ifdef SK_SLIM
-        SkGmOverflowStatus(pAC, IoC, Port, IStatus, &OverflowStatus);
-#else
-                Para.Para32[0] = (SK_U32)Port;
-                Para.Para32[1] = (SK_U32)IStatus;
-                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_SIRQ_OVERFLOW, Para);
-#endif          
-        }
-
-        if (IStatus & GM_IS_RX_FF_OR) {
-                /* clear GMAC Rx FIFO Overrun IRQ */
-                SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_CLI_RX_FO);
-#ifdef DEBUG
-                pPrt->PRxOverCnt++;
-#endif /* DEBUG */
-        }
-
-        if (IStatus & GM_IS_TX_FF_UR) {
-                /* clear GMAC Tx FIFO Underrun IRQ */
-                SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_CLI_TX_FU);
-                /* may NOT happen -> error log */
-                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E020, SKERR_SIRQ_E020MSG);
-        }
-
-        if (IStatus & GM_IS_TX_COMPL) {
-                /* not served here */
-        }
-
-        if (IStatus & GM_IS_RX_COMPL) {
-                /* not served here */
-        }
-}       /* SkGmIrq */
-#endif /* YUKON */
-
-
-/******************************************************************************
- *
- *      SkMacIrq() - Interrupt Service Routine for MAC
- *
- * Description: calls the Interrupt Service Routine dep. on board type
- *
- * Returns:
- *      nothing
- */
-void SkMacIrq(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port)           /* Port Index (MAC_1 + n) */
-{
-#ifdef GENESIS
-        if (pAC->GIni.GIGenesis) {
-                /* IRQ from XMAC */
-                SkXmIrq(pAC, IoC, Port);
-        }
-#endif /* GENESIS */
-        
-#ifdef YUKON
-        if (pAC->GIni.GIYukon) {
-                /* IRQ from GMAC */
-                SkGmIrq(pAC, IoC, Port);
-        }
-#endif /* YUKON */
-
-}       /* SkMacIrq */
-
-#endif /* !SK_DIAG */
-
-#ifdef GENESIS
-/******************************************************************************
- *
- *      SkXmUpdateStats() - Force the XMAC to output the current statistic
- *
- * Description:
- *      The XMAC holds its statistic internally. To obtain the current
- *      values a command must be sent so that the statistic data will
- *      be written to a predefined memory area on the adapter.
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkXmUpdateStats(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-unsigned int Port)      /* Port Index (MAC_1 + n) */
-{
-        SK_GEPORT       *pPrt;
-        SK_U16          StatReg;
-        int                     WaitIndex;
-
-        pPrt = &pAC->GIni.GP[Port];
-        WaitIndex = 0;
-
-        /* Send an update command to XMAC specified */
-        XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_SNP_TXC | XM_SC_SNP_RXC);
-
-        /*
-         * It is an auto-clearing register. If the command bits
-         * went to zero again, the statistics are transferred.
-         * Normally the command should be executed immediately.
-         * But just to be sure we execute a loop.
-         */
-        do {
-
-                XM_IN16(IoC, Port, XM_STAT_CMD, &StatReg);
-                
-                if (++WaitIndex > 10) {
-
-                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E021, SKERR_HWI_E021MSG);
-
-                        return(1);
-                }
-        } while ((StatReg & (XM_SC_SNP_TXC | XM_SC_SNP_RXC)) != 0);
-        
-        return(0);
-}       /* SkXmUpdateStats */
-
-
-/******************************************************************************
- *
- *      SkXmMacStatistic() - Get XMAC counter value
- *
- * Description:
- *      Gets the 32bit counter value. Except for the octet counters
- *      the lower 32bit are counted in hardware and the upper 32bit
- *      must be counted in software by monitoring counter overflow interrupts.
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkXmMacStatistic(
-SK_AC   *pAC,                   /* adapter context */
-SK_IOC  IoC,                    /* IO context */
-unsigned int Port,              /* Port Index (MAC_1 + n) */
-SK_U16  StatAddr,               /* MIB counter base address */
-SK_U32  SK_FAR *pVal)   /* ptr to return statistic value */
-{
-        if ((StatAddr < XM_TXF_OK) || (StatAddr > XM_RXF_MAX_SZ)) {
-                
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E022, SKERR_HWI_E022MSG);
-                
-                return(1);
-        }
-        
-        XM_IN32(IoC, Port, StatAddr, pVal);
-
-        return(0);
-}       /* SkXmMacStatistic */
-
-
-/******************************************************************************
- *
- *      SkXmResetCounter() - Clear MAC statistic counter
- *
- * Description:
- *      Force the XMAC to clear its statistic counter.
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkXmResetCounter(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-unsigned int Port)      /* Port Index (MAC_1 + n) */
-{
-        XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
-        /* Clear two times according to Errata #3 */
-        XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
-
-        return(0);
-}       /* SkXmResetCounter */
-
-
-/******************************************************************************
- *
- *      SkXmOverflowStatus() - Gets the status of counter overflow interrupt
- *
- * Description:
- *      Checks the source causing an counter overflow interrupt. On success the
- *      resulting counter overflow status is written to <pStatus>, whereas the
- *      upper dword stores the XMAC ReceiveCounterEvent register and the lower
- *      dword the XMAC TransmitCounterEvent register.
- *
- * Note:
- *      For XMAC the interrupt source is a self-clearing register, so the source
- *      must be checked only once. SIRQ module does another check to be sure
- *      that no interrupt get lost during process time.
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkXmOverflowStatus(
-SK_AC   *pAC,                           /* adapter context */
-SK_IOC  IoC,                            /* IO context */
-unsigned int Port,                      /* Port Index (MAC_1 + n) */
-SK_U16  IStatus,                        /* Interupt Status from MAC */
-SK_U64  SK_FAR *pStatus)        /* ptr for return overflow status value */
-{
-        SK_U64  Status; /* Overflow status */
-        SK_U32  RegVal;
-
-        Status = 0;
-
-        if ((IStatus & XM_IS_RXC_OV) != 0) {
-
-                XM_IN32(IoC, Port, XM_RX_CNT_EV, &RegVal);
-                Status |= (SK_U64)RegVal << 32;
-        }
-        
-        if ((IStatus & XM_IS_TXC_OV) != 0) {
-
-                XM_IN32(IoC, Port, XM_TX_CNT_EV, &RegVal);
-                Status |= (SK_U64)RegVal;
-        }
-
-        *pStatus = Status;
-
-        return(0);
-}       /* SkXmOverflowStatus */
-#endif /* GENESIS */
-
-
-#ifdef YUKON
-/******************************************************************************
- *
- *      SkGmUpdateStats() - Force the GMAC to output the current statistic
- *
- * Description:
- *      Empty function for GMAC. Statistic data is accessible in direct way.
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkGmUpdateStats(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-unsigned int Port)      /* Port Index (MAC_1 + n) */
-{
-        return(0);
-}
-
-
-/******************************************************************************
- *
- *      SkGmMacStatistic() - Get GMAC counter value
- *
- * Description:
- *      Gets the 32bit counter value. Except for the octet counters
- *      the lower 32bit are counted in hardware and the upper 32bit
- *      must be counted in software by monitoring counter overflow interrupts.
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkGmMacStatistic(
-SK_AC   *pAC,                   /* adapter context */
-SK_IOC  IoC,                    /* IO context */
-unsigned int Port,              /* Port Index (MAC_1 + n) */
-SK_U16  StatAddr,               /* MIB counter base address */
-SK_U32  SK_FAR *pVal)   /* ptr to return statistic value */
-{
-
-        if ((StatAddr < GM_RXF_UC_OK) || (StatAddr > GM_TXE_FIFO_UR)) {
-                
-                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E022, SKERR_HWI_E022MSG);
-                
-                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                        ("SkGmMacStat: wrong MIB counter 0x%04X\n", StatAddr));
-                return(1);
-        }
-                
-        GM_IN32(IoC, Port, StatAddr, pVal);
-
-        return(0);
-}       /* SkGmMacStatistic */
-
-
-/******************************************************************************
- *
- *      SkGmResetCounter() - Clear MAC statistic counter
- *
- * Description:
- *      Force GMAC to clear its statistic counter.
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkGmResetCounter(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-unsigned int Port)      /* Port Index (MAC_1 + n) */
-{
-        SK_U16  Reg;    /* Phy Address Register */
-        SK_U16  Word;
-        int             i;
-
-        GM_IN16(IoC, Port, GM_PHY_ADDR, &Reg);
-
-        /* set MIB Clear Counter Mode */
-        GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg | GM_PAR_MIB_CLR);
-        
-        /* read all MIB Counters with Clear Mode set */
-        for (i = 0; i < GM_MIB_CNT_SIZE; i++) {
-                /* the reset is performed only when the lower 16 bits are read */
-                GM_IN16(IoC, Port, GM_MIB_CNT_BASE + 8*i, &Word);
-        }
-        
-        /* clear MIB Clear Counter Mode */
-        GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg);
-        
-        return(0);
-}       /* SkGmResetCounter */
-
-
-/******************************************************************************
- *
- *      SkGmOverflowStatus() - Gets the status of counter overflow interrupt
- *
- * Description:
- *      Checks the source causing an counter overflow interrupt. On success the
- *      resulting counter overflow status is written to <pStatus>, whereas the
- *      the following bit coding is used:
- *      63:56 - unused
- *      55:48 - TxRx interrupt register bit7:0
- *      32:47 - Rx interrupt register
- *      31:24 - unused
- *      23:16 - TxRx interrupt register bit15:8
- *      15:0  - Tx interrupt register
- *
- * Returns:
- *      0:  success
- *      1:  something went wrong
- */
-int SkGmOverflowStatus(
-SK_AC   *pAC,                           /* adapter context */
-SK_IOC  IoC,                            /* IO context */
-unsigned int Port,                      /* Port Index (MAC_1 + n) */
-SK_U16  IStatus,                        /* Interupt Status from MAC */
-SK_U64  SK_FAR *pStatus)        /* ptr for return overflow status value */
-{
-        SK_U64  Status;         /* Overflow status */
-        SK_U16  RegVal;
-
-        Status = 0;
-
-        if ((IStatus & GM_IS_RX_CO_OV) != 0) {
-                /* this register is self-clearing after read */
-                GM_IN16(IoC, Port, GM_RX_IRQ_SRC, &RegVal);
-                Status |= (SK_U64)RegVal << 32;
-        }
-        
-        if ((IStatus & GM_IS_TX_CO_OV) != 0) {
-                /* this register is self-clearing after read */
-                GM_IN16(IoC, Port, GM_TX_IRQ_SRC, &RegVal);
-                Status |= (SK_U64)RegVal;
-        }
-        
-        /* this register is self-clearing after read */
-        GM_IN16(IoC, Port, GM_TR_IRQ_SRC, &RegVal);
-        /* Rx overflow interrupt register bits (LoByte)*/
-        Status |= (SK_U64)((SK_U8)RegVal) << 48;
-        /* Tx overflow interrupt register bits (HiByte)*/
-        Status |= (SK_U64)(RegVal >> 8) << 16;
-
-        *pStatus = Status;
-
-        return(0);
-}       /* SkGmOverflowStatus */
-
-
-#ifndef SK_SLIM
-/******************************************************************************
- *
- *      SkGmCableDiagStatus() - Starts / Gets status of cable diagnostic test
- *
- * Description:
- *  starts the cable diagnostic test if 'StartTest' is true
- *  gets the results if 'StartTest' is true
- *
- * NOTE:        this test is meaningful only when link is down
- *      
- * Returns:
- *      0:  success
- *      1:      no YUKON copper
- *      2:      test in progress
- */
-int SkGmCableDiagStatus(
-SK_AC   *pAC,           /* adapter context */
-SK_IOC  IoC,            /* IO context */
-int             Port,           /* Port Index (MAC_1 + n) */
-SK_BOOL StartTest)      /* flag for start / get result */
-{
-        int             i;
-        SK_U16  RegVal;
-        SK_GEPORT       *pPrt;
-
-        pPrt = &pAC->GIni.GP[Port];
-
-        if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
-                
-                return(1);
-        }
-
-        if (StartTest) {
-                /* only start the cable test */
-                if ((pPrt->PhyId1 & PHY_I1_REV_MSK) < 4) {
-                        /* apply TDR workaround from Marvell */
-                        SkGmPhyWrite(pAC, IoC, Port, 29, 0x001e);
-                        
-                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xcc00);
-                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc800);
-                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc400);
-                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc000);
-                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc100);
-                }
-
-                /* set address to 0 for MDI[0] */
-                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, 0);
-
-                /* Read Cable Diagnostic Reg */
-                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
-
-                /* start Cable Diagnostic Test */
-                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CABLE_DIAG,
-                        (SK_U16)(RegVal | PHY_M_CABD_ENA_TEST));
-        
-                return(0);
-        }
-        
-        /* Read Cable Diagnostic Reg */
-        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
-
-        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-                ("PHY Cable Diag.=0x%04X\n", RegVal));
-
-        if ((RegVal & PHY_M_CABD_ENA_TEST) != 0) {
-                /* test is running */
-                return(2);
-        }
-
-        /* get the test results */
-        for (i = 0; i < 4; i++)  {
-                /* set address to i for MDI[i] */
-                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, (SK_U16)i);
-
-                /* get Cable Diagnostic values */
-                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
-
-                pPrt->PMdiPairLen[i] = (SK_U8)(RegVal & PHY_M_CABD_DIST_MSK);
-
-                pPrt->PMdiPairSts[i] = (SK_U8)((RegVal & PHY_M_CABD_STAT_MSK) >> 13);
-        }
-
-        return(0);
-}       /* SkGmCableDiagStatus */
-#endif /* !SK_SLIM */
-#endif /* YUKON */
-
-/* End of file */
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 76dc8adc9441..6028bbb3b28a 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -401,18 +401,18 @@ static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
 /* int len ;             length of the frame including the FC */
 {
         int     i ;
-        u_int   *p ;
+        __le32  *p ;
 
         CHECK_NPP() ;
         MARW(off) ;             /* set memory address reg for writes */
 
-        p = (u_int *) mac ;
+        p = (__le32 *) mac ;
         for (i = (len + 3)/4 ; i ; i--) {
                 if (i == 1) {
                         /* last word, set the tag bit */
                         outpw(FM_A(FM_CMDREG2),FM_ISTTB) ;
                 }
-                write_mdr(smc,MDR_REVERSE(*p)) ;
+                write_mdr(smc,le32_to_cpu(*p)) ;
                 p++ ;
         }
 
@@ -444,7 +444,7 @@ static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
  */
 static void directed_beacon(struct s_smc *smc)
 {
-        SK_LOC_DECL(u_int,a[2]) ;
+        SK_LOC_DECL(__le32,a[2]) ;
 
         /*
          * set UNA in frame
@@ -458,9 +458,9 @@ static void directed_beacon(struct s_smc *smc)
         CHECK_NPP() ;
          /* set memory address reg for writes */
         MARW(smc->hw.fp.fifo.rbc_ram_start+DBEACON_FRAME_OFF+4) ;
-        write_mdr(smc,MDR_REVERSE(a[0])) ;
+        write_mdr(smc,le32_to_cpu(a[0])) ;
         outpw(FM_A(FM_CMDREG2),FM_ISTTB) ;      /* set the tag bit */
-        write_mdr(smc,MDR_REVERSE(a[1])) ;
+        write_mdr(smc,le32_to_cpu(a[1])) ;
 
         outpw(FM_A(FM_SABC),smc->hw.fp.fifo.rbc_ram_start + DBEACON_FRAME_OFF) ;
 }
diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/skfp/h/fplustm.h
index 98bbf654d12f..6d738e1e2393 100644
--- a/drivers/net/skfp/h/fplustm.h
+++ b/drivers/net/skfp/h/fplustm.h
@@ -50,12 +50,12 @@ struct err_st {
  *      Transmit Descriptor struct
  */
 struct s_smt_fp_txd {
-        u_int txd_tbctrl ;              /* transmit buffer control */
-        u_int txd_txdscr ;              /* transmit frame status word */
-        u_int txd_tbadr ;               /* physical tx buffer address */
-        u_int txd_ntdadr ;              /* physical pointer to the next TxD */
+        __le32 txd_tbctrl ;             /* transmit buffer control */
+        __le32 txd_txdscr ;             /* transmit frame status word */
+        __le32 txd_tbadr ;              /* physical tx buffer address */
+        __le32 txd_ntdadr ;             /* physical pointer to the next TxD */
 #ifdef  ENA_64BIT_SUP
-        u_int txd_tbadr_hi ;            /* physical tx buffer addr (high dword)*/
+        __le32 txd_tbadr_hi ;           /* physical tx buffer addr (high dword)*/
 #endif
         char far *txd_virt ;            /* virtual pointer to the data frag */
                                         /* virt pointer to the next TxD */
@@ -67,12 +67,12 @@ struct s_smt_fp_txd {
  *      Receive Descriptor struct
  */
 struct s_smt_fp_rxd {
-        u_int rxd_rbctrl ;              /* receive buffer control */
-        u_int rxd_rfsw ;                /* receive frame status word */
-        u_int rxd_rbadr ;               /* physical rx buffer address */
-        u_int rxd_nrdadr ;              /* physical pointer to the next RxD */
+        __le32 rxd_rbctrl ;             /* receive buffer control */
+        __le32 rxd_rfsw ;               /* receive frame status word */
+        __le32 rxd_rbadr ;              /* physical rx buffer address */
+        __le32 rxd_nrdadr ;             /* physical pointer to the next RxD */
 #ifdef  ENA_64BIT_SUP
-        u_int rxd_rbadr_hi ;            /* physical tx buffer addr (high dword)*/
+        __le32 rxd_rbadr_hi ;           /* physical tx buffer addr (high dword)*/
 #endif
         char far *rxd_virt ;            /* virtual pointer to the data frag */
                                         /* virt pointer to the next RxD */
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c
index 46e339315656..4218e97033c9 100644
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/skfp/hwmtm.c
@@ -208,7 +208,7 @@ SMbuf* smt_get_mbuf(struct s_smc *smc);
 #if     defined(NDIS_OS2) || defined(ODI2)
 #define CR_READ(var)    ((var) & 0xffff0000 | ((var) & 0xffff))
 #else
-#define CR_READ(var)    (u_long)(var)
+#define CR_READ(var)    (__le32)(var)
 #endif
 
 #define IMASK_SLOW      (IS_PLINT1 | IS_PLINT2 | IS_TIMINT | IS_TOKEN | \
@@ -343,16 +343,16 @@ static u_long init_descr_ring(struct s_smc *smc,
         for (i=count-1, d1=start; i ; i--) {
                 d2 = d1 ;
                 d1++ ;          /* descr is owned by the host */
-                d2->r.rxd_rbctrl = AIX_REVERSE(BMU_CHECK) ;
+                d2->r.rxd_rbctrl = cpu_to_le32(BMU_CHECK) ;
                 d2->r.rxd_next = &d1->r ;
                 phys = mac_drv_virt2phys(smc,(void *)d1) ;
-                d2->r.rxd_nrdadr = AIX_REVERSE(phys) ;
+                d2->r.rxd_nrdadr = cpu_to_le32(phys) ;
         }
         DB_GEN("descr ring ends at = %x ",(void *)d1,0,3) ;
-        d1->r.rxd_rbctrl = AIX_REVERSE(BMU_CHECK) ;
+        d1->r.rxd_rbctrl = cpu_to_le32(BMU_CHECK) ;
         d1->r.rxd_next = &start->r ;
         phys = mac_drv_virt2phys(smc,(void *)start) ;
-        d1->r.rxd_nrdadr = AIX_REVERSE(phys) ;
+        d1->r.rxd_nrdadr = cpu_to_le32(phys) ;
 
         for (i=count, d1=start; i ; i--) {
                 DRV_BUF_FLUSH(&d1->r,DDI_DMA_SYNC_FORDEV) ;
@@ -376,7 +376,7 @@ static void init_txd_ring(struct s_smc *smc)
         DB_GEN("Init async TxD ring, %d TxDs ",HWM_ASYNC_TXD_COUNT,0,3) ;
         (void)init_descr_ring(smc,(union s_fp_descr volatile *)ds,
                 HWM_ASYNC_TXD_COUNT) ;
-        phys = AIX_REVERSE(ds->txd_ntdadr) ;
+        phys = le32_to_cpu(ds->txd_ntdadr) ;
         ds++ ;
         queue->tx_curr_put = queue->tx_curr_get = ds ;
         ds-- ;
@@ -390,7 +390,7 @@ static void init_txd_ring(struct s_smc *smc)
         DB_GEN("Init sync TxD ring, %d TxDs ",HWM_SYNC_TXD_COUNT,0,3) ;
         (void)init_descr_ring(smc,(union s_fp_descr volatile *)ds,
                 HWM_SYNC_TXD_COUNT) ;
-        phys = AIX_REVERSE(ds->txd_ntdadr) ;
+        phys = le32_to_cpu(ds->txd_ntdadr) ;
         ds++ ;
         queue->tx_curr_put = queue->tx_curr_get = ds ;
         queue->tx_free = HWM_SYNC_TXD_COUNT ;
@@ -412,7 +412,7 @@ static void init_rxd_ring(struct s_smc *smc)
         DB_GEN("Init RxD ring, %d RxDs ",SMT_R1_RXD_COUNT,0,3) ;
         (void)init_descr_ring(smc,(union s_fp_descr volatile *)ds,
                 SMT_R1_RXD_COUNT) ;
-        phys = AIX_REVERSE(ds->rxd_nrdadr) ;
+        phys = le32_to_cpu(ds->rxd_nrdadr) ;
         ds++ ;
         queue->rx_curr_put = queue->rx_curr_get = ds ;
         queue->rx_free = SMT_R1_RXD_COUNT ;
@@ -607,12 +607,12 @@ static u_long repair_txd_ring(struct s_smc *smc, struct s_smt_tx_queue *queue)
         for (i = tx_used+queue->tx_free-1 ; i ; i-- ) {
                 t = t->txd_next ;
         }
-        phys = AIX_REVERSE(t->txd_ntdadr) ;
+        phys = le32_to_cpu(t->txd_ntdadr) ;
 
         t = queue->tx_curr_get ;
         while (tx_used) {
                 DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORCPU) ;
-                tbctrl = AIX_REVERSE(t->txd_tbctrl) ;
+                tbctrl = le32_to_cpu(t->txd_tbctrl) ;
 
                 if (tbctrl & BMU_OWN) {
                         if (tbctrl & BMU_STF) {
@@ -622,10 +622,10 @@ static u_long repair_txd_ring(struct s_smc *smc, struct s_smt_tx_queue *queue)
                                 /*
                                  * repair the descriptor
                                  */
-                                t->txd_tbctrl &= AIX_REVERSE(~BMU_OWN) ;
+                                t->txd_tbctrl &= ~cpu_to_le32(BMU_OWN) ;
                         }
                 }
-                phys = AIX_REVERSE(t->txd_ntdadr) ;
+                phys = le32_to_cpu(t->txd_ntdadr) ;
                 DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORDEV) ;
                 t = t->txd_next ;
                 tx_used-- ;
@@ -659,12 +659,12 @@ static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue)
         for (i = SMT_R1_RXD_COUNT-1 ; i ; i-- ) {
                 r = r->rxd_next ;
         }
-        phys = AIX_REVERSE(r->rxd_nrdadr) ;
+        phys = le32_to_cpu(r->rxd_nrdadr) ;
 
         r = queue->rx_curr_get ;
         while (rx_used) {
                 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
-                rbctrl = AIX_REVERSE(r->rxd_rbctrl) ;
+                rbctrl = le32_to_cpu(r->rxd_rbctrl) ;
 
                 if (rbctrl & BMU_OWN) {
                         if (rbctrl & BMU_STF) {
@@ -674,10 +674,10 @@ static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue)
                                 /*
                                  * repair the descriptor
                                  */
-                                r->rxd_rbctrl &= AIX_REVERSE(~BMU_OWN) ;
+                                r->rxd_rbctrl &= ~cpu_to_le32(BMU_OWN) ;
                         }
                 }
-                phys = AIX_REVERSE(r->rxd_nrdadr) ;
+                phys = le32_to_cpu(r->rxd_nrdadr) ;
                 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORDEV) ;
                 r = r->rxd_next ;
                 rx_used-- ;
@@ -1094,8 +1094,7 @@ void process_receive(struct s_smc *smc)
                 do {
                         DB_RX("Check RxD %x for OWN and EOF",(void *)r,0,5) ;
                         DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
-                        rbctrl = CR_READ(r->rxd_rbctrl) ;
-                        rbctrl = AIX_REVERSE(rbctrl) ;
+                        rbctrl = le32_to_cpu(CR_READ(r->rxd_rbctrl));
 
                         if (rbctrl & BMU_OWN) {
                                 NDD_TRACE("RHxE",r,rfsw,rbctrl) ;
@@ -1118,7 +1117,7 @@ void process_receive(struct s_smc *smc)
                                 smc->os.hwm.detec_count = 0 ;
                                 goto rx_end ;
                         }
-                        rfsw = AIX_REVERSE(r->rxd_rfsw) ;
+                        rfsw = le32_to_cpu(r->rxd_rfsw) ;
                         if ((rbctrl & BMU_STF) != ((rbctrl & BMU_ST_BUF) <<5)) {
                                 /*
                                  * The BMU_STF bit is deleted, 1 frame is
@@ -1151,7 +1150,7 @@ void process_receive(struct s_smc *smc)
                 /* may be next 2 DRV_BUF_FLUSH() can be skipped, because */
                 /* BMU_ST_BUF will not be changed by the ASIC */
                 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
-                while (rx_used && !(r->rxd_rbctrl & AIX_REVERSE(BMU_ST_BUF))) {
+                while (rx_used && !(r->rxd_rbctrl & cpu_to_le32(BMU_ST_BUF))) {
                         DB_RX("Check STF bit in %x",(void *)r,0,5) ;
                         r = r->rxd_next ;
                         DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
@@ -1171,7 +1170,7 @@ void process_receive(struct s_smc *smc)
                 /*
                  * ASIC Errata no. 7 (STF - Bit Bug)
                  */
-                rxd->rxd_rbctrl &= AIX_REVERSE(~BMU_STF) ;
+                rxd->rxd_rbctrl &= cpu_to_le32(~BMU_STF) ;
 
                 for (r=rxd, i=frag_count ; i ; r=r->rxd_next, i--){
                         DB_RX("dma_complete for RxD %x",(void *)r,0,5) ;
@@ -1287,7 +1286,7 @@ void process_receive(struct s_smc *smc)
                         hwm_cpy_rxd2mb(rxd,data,len) ;
 #else
                         for (r=rxd, i=used_frags ; i ; r=r->rxd_next, i--){
-                                n = AIX_REVERSE(r->rxd_rbctrl) & RD_LENGTH ;
+                                n = le32_to_cpu(r->rxd_rbctrl) & RD_LENGTH ;
                                 DB_RX("cp SMT frame to mb: len = %d",n,0,6) ;
                                 memcpy(data,r->rxd_virt,n) ;
                                 data += n ;
@@ -1426,14 +1425,14 @@ void hwm_rx_frag(struct s_smc *smc, char far *virt, u_long phys, int len,
                  int frame_status)
 {
         struct s_smt_fp_rxd volatile *r ;
-        u_int   rbctrl ;
+        __le32  rbctrl;
 
         NDD_TRACE("RHfB",virt,len,frame_status) ;
         DB_RX("hwm_rx_frag: len = %d, frame_status = %x\n",len,frame_status,2) ;
         r = smc->hw.fp.rx_q[QUEUE_R1].rx_curr_put ;
         r->rxd_virt = virt ;
-        r->rxd_rbadr = AIX_REVERSE(phys) ;
-        rbctrl = AIX_REVERSE( (((u_long)frame_status &
+        r->rxd_rbadr = cpu_to_le32(phys) ;
+        rbctrl = cpu_to_le32( (((__u32)frame_status &
                 (FIRST_FRAG|LAST_FRAG))<<26) |
                 (((u_long) frame_status & FIRST_FRAG) << 21) |
                 BMU_OWN | BMU_CHECK | BMU_EN_IRQ_EOF | len) ;
@@ -1444,7 +1443,7 @@ void hwm_rx_frag(struct s_smc *smc, char far *virt, u_long phys, int len,
         smc->hw.fp.rx_q[QUEUE_R1].rx_free-- ;
         smc->hw.fp.rx_q[QUEUE_R1].rx_used++ ;
         smc->hw.fp.rx_q[QUEUE_R1].rx_curr_put = r->rxd_next ;
-        NDD_TRACE("RHfE",r,AIX_REVERSE(r->rxd_rbadr),0) ;
+        NDD_TRACE("RHfE",r,le32_to_cpu(r->rxd_rbadr),0) ;
 }
 
 /*
@@ -1494,15 +1493,15 @@ void mac_drv_clear_rx_queue(struct s_smc *smc)
         while (queue->rx_used) {
                 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
                 DB_RX("switch OWN bit of RxD 0x%x ",r,0,5) ;
-                r->rxd_rbctrl &= AIX_REVERSE(~BMU_OWN) ;
+                r->rxd_rbctrl &= ~cpu_to_le32(BMU_OWN) ;
                 frag_count = 1 ;
                 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORDEV) ;
                 r = r->rxd_next ;
                 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
                 while (r != queue->rx_curr_put &&
-                        !(r->rxd_rbctrl & AIX_REVERSE(BMU_ST_BUF))) {
+                        !(r->rxd_rbctrl & cpu_to_le32(BMU_ST_BUF))) {
                         DB_RX("Check STF bit in %x",(void *)r,0,5) ;
-                        r->rxd_rbctrl &= AIX_REVERSE(~BMU_OWN) ;
+                        r->rxd_rbctrl &= ~cpu_to_le32(BMU_OWN) ;
                         DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORDEV) ;
                         r = r->rxd_next ;
                         DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
@@ -1640,7 +1639,7 @@ void hwm_tx_frag(struct s_smc *smc, char far *virt, u_long phys, int len,
 {
         struct s_smt_fp_txd volatile *t ;
         struct s_smt_tx_queue *queue ;
-        u_int   tbctrl ;
+        __le32  tbctrl ;
 
         queue = smc->os.hwm.tx_p ;
 
@@ -1657,9 +1656,9 @@ void hwm_tx_frag(struct s_smc *smc, char far *virt, u_long phys, int len,
                 /* '*t' is already defined */
                 DB_TX("LAN_TX: TxD = %x, virt = %x ",t,virt,3) ;
                 t->txd_virt = virt ;
-                t->txd_txdscr = AIX_REVERSE(smc->os.hwm.tx_descr) ;
-                t->txd_tbadr = AIX_REVERSE(phys) ;
-                tbctrl = AIX_REVERSE((((u_long)frame_status &
+                t->txd_txdscr = cpu_to_le32(smc->os.hwm.tx_descr) ;
+                t->txd_tbadr = cpu_to_le32(phys) ;
+                tbctrl = cpu_to_le32((((__u32)frame_status &
                         (FIRST_FRAG|LAST_FRAG|EN_IRQ_EOF))<< 26) |
                         BMU_OWN|BMU_CHECK |len) ;
                 t->txd_tbctrl = tbctrl ;
@@ -1826,7 +1825,7 @@ void smt_send_mbuf(struct s_smc *smc, SMbuf *mb, int fc)
         struct s_smt_tx_queue *queue ;
         struct s_smt_fp_txd volatile *t ;
         u_long  phys ;
-        u_int   tbctrl ;
+        __le32  tbctrl;
 
         NDD_TRACE("THSB",mb,fc,0) ;
         DB_TX("smt_send_mbuf: mb = 0x%x, fc = 0x%x",mb,fc,4) ;
@@ -1894,14 +1893,14 @@ void smt_send_mbuf(struct s_smc *smc, SMbuf *mb, int fc)
                         DB_TX("init TxD = 0x%x",(void *)t,0,5) ;
                         if (i == frag_count-1) {
                                 frame_status |= LAST_FRAG ;
-                                t->txd_txdscr = AIX_REVERSE(TX_DESCRIPTOR |
-                                        (((u_long)(mb->sm_len-1)&3) << 27)) ;
+                                t->txd_txdscr = cpu_to_le32(TX_DESCRIPTOR |
+                                        (((__u32)(mb->sm_len-1)&3) << 27)) ;
                         }
                         t->txd_virt = virt[i] ;
                         phys = dma_master(smc, (void far *)virt[i],
                                 frag_len[i], DMA_RD|SMT_BUF) ;
-                        t->txd_tbadr = AIX_REVERSE(phys) ;
-                        tbctrl = AIX_REVERSE((((u_long) frame_status &
+                        t->txd_tbadr = cpu_to_le32(phys) ;
+                        tbctrl = cpu_to_le32((((__u32)frame_status &
                                 (FIRST_FRAG|LAST_FRAG)) << 26) |
                                 BMU_OWN | BMU_CHECK | BMU_SMT_TX |frag_len[i]) ;
                         t->txd_tbctrl = tbctrl ;
@@ -1971,8 +1970,7 @@ static void mac_drv_clear_txd(struct s_smc *smc)
                         do {
                                 DRV_BUF_FLUSH(t1,DDI_DMA_SYNC_FORCPU) ;
                                 DB_TX("check OWN/EOF bit of TxD 0x%x",t1,0,5) ;
-                                tbctrl = CR_READ(t1->txd_tbctrl) ;
-                                tbctrl = AIX_REVERSE(tbctrl) ;
+                                tbctrl = le32_to_cpu(CR_READ(t1->txd_tbctrl));
 
                                 if (tbctrl & BMU_OWN || !queue->tx_used){
                                         DB_TX("End of TxDs queue %d",i,0,4) ;
@@ -1984,7 +1982,7 @@ static void mac_drv_clear_txd(struct s_smc *smc)
 
                         t1 = queue->tx_curr_get ;
                         for (n = frag_count; n; n--) {
-                                tbctrl = AIX_REVERSE(t1->txd_tbctrl) ;
+                                tbctrl = le32_to_cpu(t1->txd_tbctrl) ;
                                 dma_complete(smc,
                                         (union s_fp_descr volatile *) t1,
                                         (int) (DMA_RD |
@@ -2064,7 +2062,7 @@ void mac_drv_clear_tx_queue(struct s_smc *smc)
                 while (tx_used) {
                         DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORCPU) ;
                         DB_TX("switch OWN bit of TxD 0x%x ",t,0,5) ;
-                        t->txd_tbctrl &= AIX_REVERSE(~BMU_OWN) ;
+                        t->txd_tbctrl &= ~cpu_to_le32(BMU_OWN) ;
                         DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORDEV) ;
                         t = t->txd_next ;
                         tx_used-- ;
@@ -2086,10 +2084,10 @@ void mac_drv_clear_tx_queue(struct s_smc *smc)
                  * tx_curr_get and tx_curr_put to this position
                  */
                 if (i == QUEUE_S) {
-                        outpd(ADDR(B5_XS_DA),AIX_REVERSE(t->txd_ntdadr)) ;
+                        outpd(ADDR(B5_XS_DA),le32_to_cpu(t->txd_ntdadr)) ;
                 }
                 else {
-                        outpd(ADDR(B5_XA_DA),AIX_REVERSE(t->txd_ntdadr)) ;
+                        outpd(ADDR(B5_XA_DA),le32_to_cpu(t->txd_ntdadr)) ;
                 }
 
                 queue->tx_curr_put = queue->tx_curr_get->txd_next ;
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 7cf9b9f35dee..a2b092bb3626 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -495,7 +495,7 @@ static int skfp_open(struct net_device *dev)
 
         PRINTK(KERN_INFO "entering skfp_open\n");
         /* Register IRQ - support shared interrupts by passing device ptr */
-        err = request_irq(dev->irq, (void *) skfp_interrupt, IRQF_SHARED,
+        err = request_irq(dev->irq, skfp_interrupt, IRQF_SHARED,
                           dev->name, dev);
         if (err)
                 return err;
@@ -1644,7 +1644,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
                 // Get RIF length from Routing Control (RC) field.
                 cp = virt + FDDI_MAC_HDR_LEN;   // Point behind MAC header.
 
-                ri = ntohs(*((unsigned short *) cp));
+                ri = ntohs(*((__be16 *) cp));
                 RifLength = ri & FDDI_RCF_LEN_MASK;
                 if (len < (int) (FDDI_MAC_HDR_LEN + RifLength)) {
                         printk("fddi: Invalid RIF.\n");
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 63a54e29d563..600b92af3334 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -220,22 +220,22 @@ static void PRINT_PKT(u_char *buf, int length)
 
 
 /* this enables an interrupt in the interrupt mask register */
-#define SMC_ENABLE_INT(x) do {                                          \
+#define SMC_ENABLE_INT(lp, x) do {                                      \
         unsigned char mask;                                             \
         spin_lock_irq(&lp->lock);                                       \
-        mask = SMC_GET_INT_MASK();                                      \
+        mask = SMC_GET_INT_MASK(lp);                                    \
         mask |= (x);                                                    \
-        SMC_SET_INT_MASK(mask);                                         \
+        SMC_SET_INT_MASK(lp, mask);                                     \
         spin_unlock_irq(&lp->lock);                                     \
 } while (0)
 
 /* this disables an interrupt from the interrupt mask register */
-#define SMC_DISABLE_INT(x) do {                                         \
+#define SMC_DISABLE_INT(lp, x) do {                                     \
         unsigned char mask;                                             \
         spin_lock_irq(&lp->lock);                                       \
-        mask = SMC_GET_INT_MASK();                                      \
+        mask = SMC_GET_INT_MASK(lp);                                    \
         mask &= ~(x);                                                   \
-        SMC_SET_INT_MASK(mask);                                         \
+        SMC_SET_INT_MASK(lp, mask);                                     \
         spin_unlock_irq(&lp->lock);                                     \
 } while (0)
 
@@ -244,10 +244,10 @@ static void PRINT_PKT(u_char *buf, int length)
  * if at all, but let's avoid deadlocking the system if the hardware
  * decides to go south.
  */
-#define SMC_WAIT_MMU_BUSY() do {                                        \
-        if (unlikely(SMC_GET_MMU_CMD() & MC_BUSY)) {                    \
+#define SMC_WAIT_MMU_BUSY(lp) do {                                      \
+        if (unlikely(SMC_GET_MMU_CMD(lp) & MC_BUSY)) {          \
                 unsigned long timeout = jiffies + 2;                    \
-                while (SMC_GET_MMU_CMD() & MC_BUSY) {                   \
+                while (SMC_GET_MMU_CMD(lp) & MC_BUSY) {         \
                         if (time_after(jiffies, timeout)) {             \
                                 printk("%s: timeout %s line %d\n",      \
                                         dev->name, __FILE__, __LINE__); \
@@ -273,8 +273,8 @@ static void smc_reset(struct net_device *dev)
 
         /* Disable all interrupts, block TX tasklet */
         spin_lock_irq(&lp->lock);
-        SMC_SELECT_BANK(2);
-        SMC_SET_INT_MASK(0);
+        SMC_SELECT_BANK(lp, 2);
+        SMC_SET_INT_MASK(lp, 0);
         pending_skb = lp->pending_tx_skb;
         lp->pending_tx_skb = NULL;
         spin_unlock_irq(&lp->lock);
@@ -290,15 +290,15 @@ static void smc_reset(struct net_device *dev)
          * This resets the registers mostly to defaults, but doesn't
          * affect EEPROM.  That seems unnecessary
          */
-        SMC_SELECT_BANK(0);
-        SMC_SET_RCR(RCR_SOFTRST);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_RCR(lp, RCR_SOFTRST);
 
         /*
          * Setup the Configuration Register
          * This is necessary because the CONFIG_REG is not affected
          * by a soft reset
          */
-        SMC_SELECT_BANK(1);
+        SMC_SELECT_BANK(lp, 1);
 
         cfg = CONFIG_DEFAULT;
 
@@ -316,7 +316,7 @@ static void smc_reset(struct net_device *dev)
          */
         cfg |= CONFIG_EPH_POWER_EN;
 
-        SMC_SET_CONFIG(cfg);
+        SMC_SET_CONFIG(lp, cfg);
 
         /* this should pause enough for the chip to be happy */
         /*
@@ -329,12 +329,12 @@ static void smc_reset(struct net_device *dev)
         udelay(1);
 
         /* Disable transmit and receive functionality */
-        SMC_SELECT_BANK(0);
-        SMC_SET_RCR(RCR_CLEAR);
-        SMC_SET_TCR(TCR_CLEAR);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_RCR(lp, RCR_CLEAR);
+        SMC_SET_TCR(lp, TCR_CLEAR);
 
-        SMC_SELECT_BANK(1);
-        ctl = SMC_GET_CTL() | CTL_LE_ENABLE;
+        SMC_SELECT_BANK(lp, 1);
+        ctl = SMC_GET_CTL(lp) | CTL_LE_ENABLE;
 
         /*
          * Set the control register to automatically release successfully
@@ -345,12 +345,12 @@ static void smc_reset(struct net_device *dev)
                 ctl |= CTL_AUTO_RELEASE;
         else
                 ctl &= ~CTL_AUTO_RELEASE;
-        SMC_SET_CTL(ctl);
+        SMC_SET_CTL(lp, ctl);
 
         /* Reset the MMU */
-        SMC_SELECT_BANK(2);
-        SMC_SET_MMU_CMD(MC_RESET);
-        SMC_WAIT_MMU_BUSY();
+        SMC_SELECT_BANK(lp, 2);
+        SMC_SET_MMU_CMD(lp, MC_RESET);
+        SMC_WAIT_MMU_BUSY(lp);
 }
 
 /*
@@ -365,19 +365,19 @@ static void smc_enable(struct net_device *dev)
         DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
 
         /* see the header file for options in TCR/RCR DEFAULT */
-        SMC_SELECT_BANK(0);
-        SMC_SET_TCR(lp->tcr_cur_mode);
-        SMC_SET_RCR(lp->rcr_cur_mode);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_TCR(lp, lp->tcr_cur_mode);
+        SMC_SET_RCR(lp, lp->rcr_cur_mode);
 
-        SMC_SELECT_BANK(1);
-        SMC_SET_MAC_ADDR(dev->dev_addr);
+        SMC_SELECT_BANK(lp, 1);
+        SMC_SET_MAC_ADDR(lp, dev->dev_addr);
 
         /* now, enable interrupts */
         mask = IM_EPH_INT|IM_RX_OVRN_INT|IM_RCV_INT;
         if (lp->version >= (CHIP_91100 << 4))
                 mask |= IM_MDINT;
-        SMC_SELECT_BANK(2);
-        SMC_SET_INT_MASK(mask);
+        SMC_SELECT_BANK(lp, 2);
+        SMC_SET_INT_MASK(lp, mask);
 
         /*
          * From this point the register bank must _NOT_ be switched away
@@ -400,8 +400,8 @@ static void smc_shutdown(struct net_device *dev)
 
         /* no more interrupts for me */
         spin_lock_irq(&lp->lock);
-        SMC_SELECT_BANK(2);
-        SMC_SET_INT_MASK(0);
+        SMC_SELECT_BANK(lp, 2);
+        SMC_SET_INT_MASK(lp, 0);
         pending_skb = lp->pending_tx_skb;
         lp->pending_tx_skb = NULL;
         spin_unlock_irq(&lp->lock);
@@ -409,14 +409,14 @@ static void smc_shutdown(struct net_device *dev)
                 dev_kfree_skb(pending_skb);
 
         /* and tell the card to stay away from that nasty outside world */
-        SMC_SELECT_BANK(0);
-        SMC_SET_RCR(RCR_CLEAR);
-        SMC_SET_TCR(TCR_CLEAR);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_RCR(lp, RCR_CLEAR);
+        SMC_SET_TCR(lp, TCR_CLEAR);
 
 #ifdef POWER_DOWN
         /* finally, shut the chip down */
-        SMC_SELECT_BANK(1);
-        SMC_SET_CONFIG(SMC_GET_CONFIG() & ~CONFIG_EPH_POWER_EN);
+        SMC_SELECT_BANK(lp, 1);
+        SMC_SET_CONFIG(lp, SMC_GET_CONFIG(lp) & ~CONFIG_EPH_POWER_EN);
 #endif
 }
 
@@ -431,17 +431,17 @@ static inline void  smc_rcv(struct net_device *dev)
 
         DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
 
-        packet_number = SMC_GET_RXFIFO();
+        packet_number = SMC_GET_RXFIFO(lp);
         if (unlikely(packet_number & RXFIFO_REMPTY)) {
                 PRINTK("%s: smc_rcv with nothing on FIFO.\n", dev->name);
                 return;
         }
 
         /* read from start of packet */
-        SMC_SET_PTR(PTR_READ | PTR_RCV | PTR_AUTOINC);
+        SMC_SET_PTR(lp, PTR_READ | PTR_RCV | PTR_AUTOINC);
 
         /* First two words are status and packet length */
-        SMC_GET_PKT_HDR(status, packet_len);
+        SMC_GET_PKT_HDR(lp, status, packet_len);
         packet_len &= 0x07ff;  /* mask off top bits */
         DBG(2, "%s: RX PNR 0x%x STATUS 0x%04x LENGTH 0x%04x (%d)\n",
                 dev->name, packet_number, status,
@@ -460,8 +460,8 @@ static inline void  smc_rcv(struct net_device *dev)
                                         dev->name, packet_len, status);
                         status |= RS_TOOSHORT;
                 }
-                SMC_WAIT_MMU_BUSY();
-                SMC_SET_MMU_CMD(MC_RELEASE);
+                SMC_WAIT_MMU_BUSY(lp);
+                SMC_SET_MMU_CMD(lp, MC_RELEASE);
                 dev->stats.rx_errors++;
                 if (status & RS_ALGNERR)
                         dev->stats.rx_frame_errors++;
@@ -490,8 +490,8 @@ static inline void  smc_rcv(struct net_device *dev)
                 if (unlikely(skb == NULL)) {
                         printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
                                 dev->name);
-                        SMC_WAIT_MMU_BUSY();
-                        SMC_SET_MMU_CMD(MC_RELEASE);
+                        SMC_WAIT_MMU_BUSY(lp);
+                        SMC_SET_MMU_CMD(lp, MC_RELEASE);
                         dev->stats.rx_dropped++;
                         return;
                 }
@@ -510,10 +510,10 @@ static inline void  smc_rcv(struct net_device *dev)
                  */
                 data_len = packet_len - ((status & RS_ODDFRAME) ? 5 : 6);
                 data = skb_put(skb, data_len);
-                SMC_PULL_DATA(data, packet_len - 4);
+                SMC_PULL_DATA(lp, data, packet_len - 4);
 
-                SMC_WAIT_MMU_BUSY();
-                SMC_SET_MMU_CMD(MC_RELEASE);
+                SMC_WAIT_MMU_BUSY(lp);
+                SMC_SET_MMU_CMD(lp, MC_RELEASE);
 
                 PRINT_PKT(data, packet_len - 4);
 
@@ -591,7 +591,7 @@ static void smc_hardware_send_pkt(unsigned long data)
         }
         lp->pending_tx_skb = NULL;
 
-        packet_no = SMC_GET_AR();
+        packet_no = SMC_GET_AR(lp);
         if (unlikely(packet_no & AR_FAILED)) {
                 printk("%s: Memory allocation failed.\n", dev->name);
                 dev->stats.tx_errors++;
@@ -601,8 +601,8 @@ static void smc_hardware_send_pkt(unsigned long data)
         }
 
         /* point to the beginning of the packet */
-        SMC_SET_PN(packet_no);
-        SMC_SET_PTR(PTR_AUTOINC);
+        SMC_SET_PN(lp, packet_no);
+        SMC_SET_PTR(lp, PTR_AUTOINC);
 
         buf = skb->data;
         len = skb->len;
@@ -614,13 +614,13 @@ static void smc_hardware_send_pkt(unsigned long data)
          * Send the packet length (+6 for status words, length, and ctl.
          * The card will pad to 64 bytes with zeroes if packet is too small.
          */
-        SMC_PUT_PKT_HDR(0, len + 6);
+        SMC_PUT_PKT_HDR(lp, 0, len + 6);
 
         /* send the actual data */
-        SMC_PUSH_DATA(buf, len & ~1);
+        SMC_PUSH_DATA(lp, buf, len & ~1);
 
         /* Send final ctl word with the last byte if there is one */
-        SMC_outw(((len & 1) ? (0x2000 | buf[len-1]) : 0), ioaddr, DATA_REG);
+        SMC_outw(((len & 1) ? (0x2000 | buf[len-1]) : 0), ioaddr, DATA_REG(lp));
 
         /*
          * If THROTTLE_TX_PKTS is set, we stop the queue here. This will
@@ -634,14 +634,14 @@ static void smc_hardware_send_pkt(unsigned long data)
                 netif_stop_queue(dev);
 
         /* queue the packet for TX */
-        SMC_SET_MMU_CMD(MC_ENQUEUE);
+        SMC_SET_MMU_CMD(lp, MC_ENQUEUE);
         smc_special_unlock(&lp->lock);
 
         dev->trans_start = jiffies;
         dev->stats.tx_packets++;
         dev->stats.tx_bytes += len;
 
-        SMC_ENABLE_INT(IM_TX_INT | IM_TX_EMPTY_INT);
+        SMC_ENABLE_INT(lp, IM_TX_INT | IM_TX_EMPTY_INT);
 
 done:   if (!THROTTLE_TX_PKTS)
                 netif_wake_queue(dev);
@@ -688,7 +688,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         smc_special_lock(&lp->lock);
 
         /* now, try to allocate the memory */
-        SMC_SET_MMU_CMD(MC_ALLOC | numPages);
+        SMC_SET_MMU_CMD(lp, MC_ALLOC | numPages);
 
         /*
          * Poll the chip for a short amount of time in case the
@@ -696,9 +696,9 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
          */
         poll_count = MEMORY_WAIT_TIME;
         do {
-                status = SMC_GET_INT();
+                status = SMC_GET_INT(lp);
                 if (status & IM_ALLOC_INT) {
-                        SMC_ACK_INT(IM_ALLOC_INT);
+                        SMC_ACK_INT(lp, IM_ALLOC_INT);
                         break;
                 }
         } while (--poll_count);
@@ -710,7 +710,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 /* oh well, wait until the chip finds memory later */
                 netif_stop_queue(dev);
                 DBG(2, "%s: TX memory allocation deferred.\n", dev->name);
-                SMC_ENABLE_INT(IM_ALLOC_INT);
+                SMC_ENABLE_INT(lp, IM_ALLOC_INT);
         } else {
                 /*
                  * Allocation succeeded: push packet to the chip's own memory
@@ -736,19 +736,19 @@ static void smc_tx(struct net_device *dev)
         DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
 
         /* If the TX FIFO is empty then nothing to do */
-        packet_no = SMC_GET_TXFIFO();
+        packet_no = SMC_GET_TXFIFO(lp);
         if (unlikely(packet_no & TXFIFO_TEMPTY)) {
                 PRINTK("%s: smc_tx with nothing on FIFO.\n", dev->name);
                 return;
         }
 
         /* select packet to read from */
-        saved_packet = SMC_GET_PN();
-        SMC_SET_PN(packet_no);
+        saved_packet = SMC_GET_PN(lp);
+        SMC_SET_PN(lp, packet_no);
 
         /* read the first word (status word) from this packet */
-        SMC_SET_PTR(PTR_AUTOINC | PTR_READ);
-        SMC_GET_PKT_HDR(tx_status, pkt_len);
+        SMC_SET_PTR(lp, PTR_AUTOINC | PTR_READ);
+        SMC_GET_PKT_HDR(lp, tx_status, pkt_len);
         DBG(2, "%s: TX STATUS 0x%04x PNR 0x%02x\n",
                 dev->name, tx_status, packet_no);
 
@@ -771,17 +771,17 @@ static void smc_tx(struct net_device *dev)
         }
 
         /* kill the packet */
-        SMC_WAIT_MMU_BUSY();
-        SMC_SET_MMU_CMD(MC_FREEPKT);
+        SMC_WAIT_MMU_BUSY(lp);
+        SMC_SET_MMU_CMD(lp, MC_FREEPKT);
 
         /* Don't restore Packet Number Reg until busy bit is cleared */
-        SMC_WAIT_MMU_BUSY();
-        SMC_SET_PN(saved_packet);
+        SMC_WAIT_MMU_BUSY(lp);
+        SMC_SET_PN(lp, saved_packet);
 
         /* re-enable transmit */
-        SMC_SELECT_BANK(0);
-        SMC_SET_TCR(lp->tcr_cur_mode);
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_TCR(lp, lp->tcr_cur_mode);
+        SMC_SELECT_BANK(lp, 2);
 }
 
 
@@ -793,7 +793,7 @@ static void smc_mii_out(struct net_device *dev, unsigned int val, int bits)
         void __iomem *ioaddr = lp->base;
         unsigned int mii_reg, mask;
 
-        mii_reg = SMC_GET_MII() & ~(MII_MCLK | MII_MDOE | MII_MDO);
+        mii_reg = SMC_GET_MII(lp) & ~(MII_MCLK | MII_MDOE | MII_MDO);
         mii_reg |= MII_MDOE;
 
         for (mask = 1 << (bits - 1); mask; mask >>= 1) {
@@ -802,9 +802,9 @@ static void smc_mii_out(struct net_device *dev, unsigned int val, int bits)
                 else
                         mii_reg &= ~MII_MDO;
 
-                SMC_SET_MII(mii_reg);
+                SMC_SET_MII(lp, mii_reg);
                 udelay(MII_DELAY);
-                SMC_SET_MII(mii_reg | MII_MCLK);
+                SMC_SET_MII(lp, mii_reg | MII_MCLK);
                 udelay(MII_DELAY);
         }
 }
@@ -815,16 +815,16 @@ static unsigned int smc_mii_in(struct net_device *dev, int bits)
         void __iomem *ioaddr = lp->base;
         unsigned int mii_reg, mask, val;
 
-        mii_reg = SMC_GET_MII() & ~(MII_MCLK | MII_MDOE | MII_MDO);
-        SMC_SET_MII(mii_reg);
+        mii_reg = SMC_GET_MII(lp) & ~(MII_MCLK | MII_MDOE | MII_MDO);
+        SMC_SET_MII(lp, mii_reg);
 
         for (mask = 1 << (bits - 1), val = 0; mask; mask >>= 1) {
-                if (SMC_GET_MII() & MII_MDI)
+                if (SMC_GET_MII(lp) & MII_MDI)
                         val |= mask;
 
-                SMC_SET_MII(mii_reg);
+                SMC_SET_MII(lp, mii_reg);
                 udelay(MII_DELAY);
-                SMC_SET_MII(mii_reg | MII_MCLK);
+                SMC_SET_MII(lp, mii_reg | MII_MCLK);
                 udelay(MII_DELAY);
         }
 
@@ -840,7 +840,7 @@ static int smc_phy_read(struct net_device *dev, int phyaddr, int phyreg)
         void __iomem *ioaddr = lp->base;
         unsigned int phydata;
 
-        SMC_SELECT_BANK(3);
+        SMC_SELECT_BANK(lp, 3);
 
         /* Idle - 32 ones */
         smc_mii_out(dev, 0xffffffff, 32);
@@ -852,12 +852,12 @@ static int smc_phy_read(struct net_device *dev, int phyaddr, int phyreg)
         phydata = smc_mii_in(dev, 18);
 
         /* Return to idle state */
-        SMC_SET_MII(SMC_GET_MII() & ~(MII_MCLK|MII_MDOE|MII_MDO));
+        SMC_SET_MII(lp, SMC_GET_MII(lp) & ~(MII_MCLK|MII_MDOE|MII_MDO));
 
         DBG(3, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",
                 __FUNCTION__, phyaddr, phyreg, phydata);
 
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 2);
         return phydata;
 }
 
@@ -870,7 +870,7 @@ static void smc_phy_write(struct net_device *dev, int phyaddr, int phyreg,
         struct smc_local *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
 
-        SMC_SELECT_BANK(3);
+        SMC_SELECT_BANK(lp, 3);
 
         /* Idle - 32 ones */
         smc_mii_out(dev, 0xffffffff, 32);
@@ -879,12 +879,12 @@ static void smc_phy_write(struct net_device *dev, int phyaddr, int phyreg,
         smc_mii_out(dev, 5 << 28 | phyaddr << 23 | phyreg << 18 | 2 << 16 | phydata, 32);
 
         /* Return to idle state */
-        SMC_SET_MII(SMC_GET_MII() & ~(MII_MCLK|MII_MDOE|MII_MDO));
+        SMC_SET_MII(lp, SMC_GET_MII(lp) & ~(MII_MCLK|MII_MDOE|MII_MDO));
 
         DBG(3, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",
                 __FUNCTION__, phyaddr, phyreg, phydata);
 
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 2);
 }
 
 /*
@@ -957,9 +957,9 @@ static int smc_phy_fixed(struct net_device *dev)
         smc_phy_write(dev, phyaddr, MII_BMCR, bmcr);
 
         /* Re-Configure the Receive/Phy Control register */
-        SMC_SELECT_BANK(0);
-        SMC_SET_RPC(lp->rpc_cur_mode);
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_RPC(lp, lp->rpc_cur_mode);
+        SMC_SELECT_BANK(lp, 2);
 
         return 1;
 }
@@ -1050,8 +1050,8 @@ static void smc_phy_check_media(struct net_device *dev, int init)
                         lp->tcr_cur_mode &= ~TCR_SWFDUP;
                 }
 
-                SMC_SELECT_BANK(0);
-                SMC_SET_TCR(lp->tcr_cur_mode);
+                SMC_SELECT_BANK(lp, 0);
+                SMC_SET_TCR(lp, lp->tcr_cur_mode);
         }
 }
 
@@ -1100,8 +1100,8 @@ static void smc_phy_configure(struct work_struct *work)
                 PHY_INT_SPDDET | PHY_INT_DPLXDET);
 
         /* Configure the Receive/Phy Control register */
-        SMC_SELECT_BANK(0);
-        SMC_SET_RPC(lp->rpc_cur_mode);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_RPC(lp, lp->rpc_cur_mode);
 
         /* If the user requested no auto neg, then go set his request */
         if (lp->mii.force_media) {
@@ -1158,7 +1158,7 @@ static void smc_phy_configure(struct work_struct *work)
         smc_phy_check_media(dev, 1);
 
 smc_phy_configure_exit:
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 2);
         spin_unlock_irq(&lp->lock);
         lp->work_pending = 0;
 }
@@ -1200,9 +1200,9 @@ static void smc_10bt_check_media(struct net_device *dev, int init)
 
         old_carrier = netif_carrier_ok(dev) ? 1 : 0;
 
-        SMC_SELECT_BANK(0);
-        new_carrier = (SMC_GET_EPH_STATUS() & ES_LINK_OK) ? 1 : 0;
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 0);
+        new_carrier = (SMC_GET_EPH_STATUS(lp) & ES_LINK_OK) ? 1 : 0;
+        SMC_SELECT_BANK(lp, 2);
 
         if (init || (old_carrier != new_carrier)) {
                 if (!new_carrier) {
@@ -1224,11 +1224,11 @@ static void smc_eph_interrupt(struct net_device *dev)
 
         smc_10bt_check_media(dev, 0);
 
-        SMC_SELECT_BANK(1);
-        ctl = SMC_GET_CTL();
-        SMC_SET_CTL(ctl & ~CTL_LE_ENABLE);
-        SMC_SET_CTL(ctl);
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 1);
+        ctl = SMC_GET_CTL(lp);
+        SMC_SET_CTL(lp, ctl & ~CTL_LE_ENABLE);
+        SMC_SET_CTL(lp, ctl);
+        SMC_SELECT_BANK(lp, 2);
 }
 
 /*
@@ -1252,22 +1252,22 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
          * ISR. */
         SMC_INTERRUPT_PREAMBLE;
 
-        saved_pointer = SMC_GET_PTR();
-        mask = SMC_GET_INT_MASK();
-        SMC_SET_INT_MASK(0);
+        saved_pointer = SMC_GET_PTR(lp);
+        mask = SMC_GET_INT_MASK(lp);
+        SMC_SET_INT_MASK(lp, 0);
 
         /* set a timeout value, so I don't stay here forever */
         timeout = MAX_IRQ_LOOPS;
 
         do {
-                status = SMC_GET_INT();
+                status = SMC_GET_INT(lp);
 
                 DBG(2, "%s: INT 0x%02x MASK 0x%02x MEM 0x%04x FIFO 0x%04x\n",
                         dev->name, status, mask,
-                        ({ int meminfo; SMC_SELECT_BANK(0);
-                           meminfo = SMC_GET_MIR();
-                           SMC_SELECT_BANK(2); meminfo; }),
-                        SMC_GET_FIFO());
+                        ({ int meminfo; SMC_SELECT_BANK(lp, 0);
+                           meminfo = SMC_GET_MIR(lp);
+                           SMC_SELECT_BANK(lp, 2); meminfo; }),
+                        SMC_GET_FIFO(lp));
 
                 status &= mask;
                 if (!status)
@@ -1277,7 +1277,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
                         /* do this before RX as it will free memory quickly */
                         DBG(3, "%s: TX int\n", dev->name);
                         smc_tx(dev);
-                        SMC_ACK_INT(IM_TX_INT);
+                        SMC_ACK_INT(lp, IM_TX_INT);
                         if (THROTTLE_TX_PKTS)
                                 netif_wake_queue(dev);
                 } else if (status & IM_RCV_INT) {
@@ -1292,9 +1292,9 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
                         mask &= ~IM_TX_EMPTY_INT;
 
                         /* update stats */
-                        SMC_SELECT_BANK(0);
-                        card_stats = SMC_GET_COUNTER();
-                        SMC_SELECT_BANK(2);
+                        SMC_SELECT_BANK(lp, 0);
+                        card_stats = SMC_GET_COUNTER(lp);
+                        SMC_SELECT_BANK(lp, 2);
 
                         /* single collisions */
                         dev->stats.collisions += card_stats & 0xF;
@@ -1304,26 +1304,26 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
                         dev->stats.collisions += card_stats & 0xF;
                 } else if (status & IM_RX_OVRN_INT) {
                         DBG(1, "%s: RX overrun (EPH_ST 0x%04x)\n", dev->name,
-                               ({ int eph_st; SMC_SELECT_BANK(0);
-                                  eph_st = SMC_GET_EPH_STATUS();
-                                  SMC_SELECT_BANK(2); eph_st; }) );
-                        SMC_ACK_INT(IM_RX_OVRN_INT);
+                               ({ int eph_st; SMC_SELECT_BANK(lp, 0);
+                                  eph_st = SMC_GET_EPH_STATUS(lp);
+                                  SMC_SELECT_BANK(lp, 2); eph_st; }));
+                        SMC_ACK_INT(lp, IM_RX_OVRN_INT);
                         dev->stats.rx_errors++;
                         dev->stats.rx_fifo_errors++;
                 } else if (status & IM_EPH_INT) {
                         smc_eph_interrupt(dev);
                 } else if (status & IM_MDINT) {
-                        SMC_ACK_INT(IM_MDINT);
+                        SMC_ACK_INT(lp, IM_MDINT);
                         smc_phy_interrupt(dev);
                 } else if (status & IM_ERCV_INT) {
-                        SMC_ACK_INT(IM_ERCV_INT);
+                        SMC_ACK_INT(lp, IM_ERCV_INT);
                         PRINTK("%s: UNSUPPORTED: ERCV INTERRUPT \n", dev->name);
                 }
         } while (--timeout);
 
         /* restore register states */
-        SMC_SET_PTR(saved_pointer);
-        SMC_SET_INT_MASK(mask);
+        SMC_SET_PTR(lp, saved_pointer);
+        SMC_SET_INT_MASK(lp, mask);
         spin_unlock(&lp->lock);
 
 #ifndef CONFIG_NET_POLL_CONTROLLER
@@ -1368,13 +1368,13 @@ static void smc_timeout(struct net_device *dev)
         DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
 
         spin_lock_irq(&lp->lock);
-        status = SMC_GET_INT();
-        mask = SMC_GET_INT_MASK();
-        fifo = SMC_GET_FIFO();
-        SMC_SELECT_BANK(0);
-        eph_st = SMC_GET_EPH_STATUS();
-        meminfo = SMC_GET_MIR();
-        SMC_SELECT_BANK(2);
+        status = SMC_GET_INT(lp);
+        mask = SMC_GET_INT_MASK(lp);
+        fifo = SMC_GET_FIFO(lp);
+        SMC_SELECT_BANK(lp, 0);
+        eph_st = SMC_GET_EPH_STATUS(lp);
+        meminfo = SMC_GET_MIR(lp);
+        SMC_SELECT_BANK(lp, 2);
         spin_unlock_irq(&lp->lock);
         PRINTK( "%s: TX timeout (INT 0x%02x INTMASK 0x%02x "
                 "MEM 0x%04x FIFO 0x%04x EPH_ST 0x%04x)\n",
@@ -1494,13 +1494,13 @@ static void smc_set_multicast_list(struct net_device *dev)
         }
 
         spin_lock_irq(&lp->lock);
-        SMC_SELECT_BANK(0);
-        SMC_SET_RCR(lp->rcr_cur_mode);
+        SMC_SELECT_BANK(lp, 0);
+        SMC_SET_RCR(lp, lp->rcr_cur_mode);
         if (update_multicast) {
-                SMC_SELECT_BANK(3);
-                SMC_SET_MCAST(multicast_table);
+                SMC_SELECT_BANK(lp, 3);
+                SMC_SET_MCAST(lp, multicast_table);
         }
-        SMC_SELECT_BANK(2);
+        SMC_SELECT_BANK(lp, 2);
         spin_unlock_irq(&lp->lock);
 }
 
@@ -1704,8 +1704,9 @@ static const struct ethtool_ops smc_ethtool_ops = {
  * I just deleted auto_irq.c, since it was never built...
  *   --jgarzik
  */
-static int __init smc_findirq(void __iomem *ioaddr)
+static int __init smc_findirq(struct smc_local *lp)
 {
+        void __iomem *ioaddr = lp->base;
         int timeout = 20;
         unsigned long cookie;
 
@@ -1719,14 +1720,14 @@ static int __init smc_findirq(void __iomem *ioaddr)
          * when done.
          */
         /* enable ALLOCation interrupts ONLY */
-        SMC_SELECT_BANK(2);
-        SMC_SET_INT_MASK(IM_ALLOC_INT);
+        SMC_SELECT_BANK(lp, 2);
+        SMC_SET_INT_MASK(lp, IM_ALLOC_INT);
 
         /*
          * Allocate 512 bytes of memory.  Note that the chip was just
          * reset so all the memory is available
          */
-        SMC_SET_MMU_CMD(MC_ALLOC | 1);
+        SMC_SET_MMU_CMD(lp, MC_ALLOC | 1);
 
         /*
          * Wait until positive that the interrupt has been generated
@@ -1734,7 +1735,7 @@ static int __init smc_findirq(void __iomem *ioaddr)
         do {
                 int int_status;
                 udelay(10);
-                int_status = SMC_GET_INT();
+                int_status = SMC_GET_INT(lp);
                 if (int_status & IM_ALLOC_INT)
                         break;          /* got the interrupt */
         } while (--timeout);
@@ -1747,7 +1748,7 @@ static int __init smc_findirq(void __iomem *ioaddr)
          */
 
         /* and disable all interrupts again */
-        SMC_SET_INT_MASK(0);
+        SMC_SET_INT_MASK(lp, 0);
 
         /* and return what I found */
         return probe_irq_off(cookie);
@@ -1790,7 +1791,7 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
         DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);
 
         /* First, see if the high byte is 0x33 */
-        val = SMC_CURRENT_BANK();
+        val = SMC_CURRENT_BANK(lp);
         DBG(2, "%s: bank signature probe returned 0x%04x\n", CARDNAME, val);
         if ((val & 0xFF00) != 0x3300) {
                 if ((val & 0xFF) == 0x33) {
@@ -1806,8 +1807,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
          * The above MIGHT indicate a device, but I need to write to
          * further test this.
          */
-        SMC_SELECT_BANK(0);
-        val = SMC_CURRENT_BANK();
+        SMC_SELECT_BANK(lp, 0);
+        val = SMC_CURRENT_BANK(lp);
         if ((val & 0xFF00) != 0x3300) {
                 retval = -ENODEV;
                 goto err_out;
@@ -1819,8 +1820,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
          * register to bank 1, so I can access the base address
          * register
          */
-        SMC_SELECT_BANK(1);
-        val = SMC_GET_BASE();
+        SMC_SELECT_BANK(lp, 1);
+        val = SMC_GET_BASE(lp);
         val = ((val & 0x1F00) >> 3) << SMC_IO_SHIFT;
         if (((unsigned int)ioaddr & (0x3e0 << SMC_IO_SHIFT)) != val) {
                 printk("%s: IOADDR %p doesn't match configuration (%x).\n",
@@ -1832,8 +1833,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
          * recognize.  These might need to be added to later,
          * as future revisions could be added.
          */
-        SMC_SELECT_BANK(3);
-        revision_register = SMC_GET_REV();
+        SMC_SELECT_BANK(lp, 3);
+        revision_register = SMC_GET_REV(lp);
         DBG(2, "%s: revision = 0x%04x\n", CARDNAME, revision_register);
         version_string = chip_ids[ (revision_register >> 4) & 0xF];
         if (!version_string || (revision_register & 0xff00) != 0x3300) {
@@ -1857,8 +1858,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
         spin_lock_init(&lp->lock);
 
         /* Get the MAC address */
-        SMC_SELECT_BANK(1);
-        SMC_GET_MAC_ADDR(dev->dev_addr);
+        SMC_SELECT_BANK(lp, 1);
+        SMC_GET_MAC_ADDR(lp, dev->dev_addr);
 
         /* now, reset the chip, and put it into a known state */
         smc_reset(dev);
@@ -1883,7 +1884,7 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
 
                 trials = 3;
                 while (trials--) {
-                        dev->irq = smc_findirq(ioaddr);
+                        dev->irq = smc_findirq(lp);
                         if (dev->irq)
                                 break;
                         /* kick the card and try again */
@@ -1998,6 +1999,8 @@ err_out:
 
 static int smc_enable_device(struct platform_device *pdev)
 {
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct smc_local *lp = netdev_priv(ndev);
         unsigned long flags;
         unsigned char ecor, ecsr;
         void __iomem *addr;
@@ -2040,7 +2043,7 @@ static int smc_enable_device(struct platform_device *pdev)
          * Set the appropriate byte/word mode.
          */
         ecsr = readb(addr + (ECSR << SMC_IO_SHIFT)) & ~ECSR_IOIS8;
-        if (!SMC_CAN_USE_16BIT)
+        if (!SMC_16BIT(lp))
                 ecsr |= ECSR_IOIS8;
         writeb(ecsr, addr + (ECSR << SMC_IO_SHIFT));
         local_irq_restore(flags);
@@ -2125,10 +2128,11 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
  */
 static int smc_drv_probe(struct platform_device *pdev)
 {
+        struct smc91x_platdata *pd = pdev->dev.platform_data;
+        struct smc_local *lp;
         struct net_device *ndev;
         struct resource *res, *ires;
         unsigned int __iomem *addr;
-        unsigned long irq_flags = SMC_IRQ_FLAGS;
         int ret;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
@@ -2153,6 +2157,27 @@ static int smc_drv_probe(struct platform_device *pdev)
         }
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
+        /* get configuration from platform data, only allow use of
+         * bus width if both SMC_CAN_USE_xxx and SMC91X_USE_xxx are set.
+         */
+
+        lp = netdev_priv(ndev);
+        lp->cfg.irq_flags = SMC_IRQ_FLAGS;
+
+#ifdef SMC_DYNAMIC_BUS_CONFIG
+        if (pd)
+                memcpy(&lp->cfg, pd, sizeof(lp->cfg));
+        else {
+                lp->cfg.flags = SMC91X_USE_8BIT;
+                lp->cfg.flags |= SMC91X_USE_16BIT;
+                lp->cfg.flags |= SMC91X_USE_32BIT;
+        }
+
+        lp->cfg.flags &= ~(SMC_CAN_USE_8BIT ? 0 : SMC91X_USE_8BIT);
+        lp->cfg.flags &= ~(SMC_CAN_USE_16BIT ? 0 : SMC91X_USE_16BIT);
+        lp->cfg.flags &= ~(SMC_CAN_USE_32BIT ? 0 : SMC91X_USE_32BIT);
+#endif
+
         ndev->dma = (unsigned char)-1;
 
         ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
@@ -2163,7 +2188,7 @@ static int smc_drv_probe(struct platform_device *pdev)
 
         ndev->irq = ires->start;
         if (SMC_IRQ_FLAGS == -1)
-                irq_flags = ires->flags & IRQF_TRIGGER_MASK;
+                lp->cfg.irq_flags = ires->flags & IRQF_TRIGGER_MASK;
 
         ret = smc_request_attrib(pdev);
         if (ret)
@@ -2171,6 +2196,7 @@ static int smc_drv_probe(struct platform_device *pdev)
 #if defined(CONFIG_SA1100_ASSABET)
         NCR_0 |= NCR_ENET_OSC_EN;
 #endif
+        platform_set_drvdata(pdev, ndev);
         ret = smc_enable_device(pdev);
         if (ret)
                 goto out_release_attrib;
@@ -2189,8 +2215,7 @@ static int smc_drv_probe(struct platform_device *pdev)
         }
 #endif
 
-        platform_set_drvdata(pdev, ndev);
-        ret = smc_probe(ndev, addr, irq_flags);
+        ret = smc_probe(ndev, addr, lp->cfg.irq_flags);
         if (ret != 0)
                 goto out_iounmap;
 
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 51d4134b37b1..69e97a1cb1c4 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -34,6 +34,7 @@
 #ifndef _SMC91X_H_
 #define _SMC91X_H_
 
+#include <linux/smc91x.h>
 
 /*
  * Define your architecture specific bus configuration parameters here.
@@ -291,36 +292,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_insw(a, r, p, l)    insw((a) + (r), p, l)
 #define SMC_outsw(a, r, p, l)   outsw((a) + (r), p, l)
 
-#elif   defined(CONFIG_SUPERH)
-
-#ifdef CONFIG_SOLUTION_ENGINE
-#define SMC_IRQ_FLAGS           (0)
-#define SMC_CAN_USE_8BIT       0
-#define SMC_CAN_USE_16BIT      1
-#define SMC_CAN_USE_32BIT      0
-#define SMC_IO_SHIFT           0
-#define SMC_NOWAIT             1
-
-#define SMC_inw(a, r)          inw((a) + (r))
-#define SMC_outw(v, a, r)      outw(v, (a) + (r))
-#define SMC_insw(a, r, p, l)   insw((a) + (r), p, l)
-#define SMC_outsw(a, r, p, l)  outsw((a) + (r), p, l)
-
-#else /* BOARDS */
-
-#define SMC_CAN_USE_8BIT       1
-#define SMC_CAN_USE_16BIT      1
-#define SMC_CAN_USE_32BIT      0
-
-#define SMC_inb(a, r)          inb((a) + (r))
-#define SMC_inw(a, r)          inw((a) + (r))
-#define SMC_outb(v, a, r)      outb(v, (a) + (r))
-#define SMC_outw(v, a, r)      outw(v, (a) + (r))
-#define SMC_insw(a, r, p, l)   insw((a) + (r), p, l)
-#define SMC_outsw(a, r, p, l)  outsw((a) + (r), p, l)
-
-#endif  /* BOARDS */
-
 #elif   defined(CONFIG_M32R)
 
 #define SMC_CAN_USE_8BIT        0
@@ -475,12 +446,15 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 #define SMC_outb(v, a, r)       writeb(v, (a) + (r))
 #define SMC_outw(v, a, r)       writew(v, (a) + (r))
 #define SMC_outl(v, a, r)       writel(v, (a) + (r))
+#define SMC_insw(a, r, p, l)    readsw((a) + (r), p, l)
+#define SMC_outsw(a, r, p, l)   writesw((a) + (r), p, l)
 #define SMC_insl(a, r, p, l)    readsl((a) + (r), p, l)
 #define SMC_outsl(a, r, p, l)   writesl((a) + (r), p, l)
 
 #define RPC_LSA_DEFAULT         RPC_LED_100_10
 #define RPC_LSB_DEFAULT         RPC_LED_TX_RX
 
+#define SMC_DYNAMIC_BUS_CONFIG
 #endif
 
 
@@ -526,8 +500,19 @@ struct smc_local {
 #endif
         void __iomem *base;
         void __iomem *datacs;
+
+        struct smc91x_platdata cfg;
 };
 
+#ifdef SMC_DYNAMIC_BUS_CONFIG
+#define SMC_8BIT(p) (((p)->cfg.flags & SMC91X_USE_8BIT) && SMC_CAN_USE_8BIT)
+#define SMC_16BIT(p) (((p)->cfg.flags & SMC91X_USE_16BIT) && SMC_CAN_USE_16BIT)
+#define SMC_32BIT(p) (((p)->cfg.flags & SMC91X_USE_32BIT) && SMC_CAN_USE_32BIT)
+#else
+#define SMC_8BIT(p) SMC_CAN_USE_8BIT
+#define SMC_16BIT(p) SMC_CAN_USE_16BIT
+#define SMC_32BIT(p) SMC_CAN_USE_32BIT
+#endif
 
 #ifdef SMC_USE_PXA_DMA
 /*
@@ -720,7 +705,7 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Transmit Control Register
 /* BANK 0  */
-#define TCR_REG         SMC_REG(0x0000, 0)
+#define TCR_REG(lp)     SMC_REG(lp, 0x0000, 0)
 #define TCR_ENABLE      0x0001  // When 1 we can transmit
 #define TCR_LOOP        0x0002  // Controls output pin LBK
 #define TCR_FORCOL      0x0004  // When 1 will force a collision
@@ -739,7 +724,7 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // EPH Status Register
 /* BANK 0  */
-#define EPH_STATUS_REG  SMC_REG(0x0002, 0)
+#define EPH_STATUS_REG(lp)      SMC_REG(lp, 0x0002, 0)
 #define ES_TX_SUC       0x0001  // Last TX was successful
 #define ES_SNGL_COL     0x0002  // Single collision detected for last tx
 #define ES_MUL_COL      0x0004  // Multiple collisions detected for last tx
@@ -758,7 +743,7 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Receive Control Register
 /* BANK 0  */
-#define RCR_REG         SMC_REG(0x0004, 0)
+#define RCR_REG(lp)             SMC_REG(lp, 0x0004, 0)
 #define RCR_RX_ABORT    0x0001  // Set if a rx frame was aborted
 #define RCR_PRMS        0x0002  // Enable promiscuous mode
 #define RCR_ALMUL       0x0004  // When set accepts all multicast frames
@@ -775,17 +760,17 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Counter Register
 /* BANK 0  */
-#define COUNTER_REG     SMC_REG(0x0006, 0)
+#define COUNTER_REG(lp) SMC_REG(lp, 0x0006, 0)
 
 
 // Memory Information Register
 /* BANK 0  */
-#define MIR_REG         SMC_REG(0x0008, 0)
+#define MIR_REG(lp)             SMC_REG(lp, 0x0008, 0)
 
 
 // Receive/Phy Control Register
 /* BANK 0  */
-#define RPC_REG         SMC_REG(0x000A, 0)
+#define RPC_REG(lp)             SMC_REG(lp, 0x000A, 0)
 #define RPC_SPEED       0x2000  // When 1 PHY is in 100Mbps mode.
 #define RPC_DPLX        0x1000  // When 1 PHY is in Full-Duplex Mode
 #define RPC_ANEG        0x0800  // When 1 PHY is in Auto-Negotiate Mode
@@ -819,7 +804,7 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Configuration Reg
 /* BANK 1 */
-#define CONFIG_REG      SMC_REG(0x0000, 1)
+#define CONFIG_REG(lp)  SMC_REG(lp, 0x0000,     1)
 #define CONFIG_EXT_PHY  0x0200  // 1=external MII, 0=internal Phy
 #define CONFIG_GPCNTRL  0x0400  // Inverse value drives pin nCNTRL
 #define CONFIG_NO_WAIT  0x1000  // When 1 no extra wait states on ISA bus
@@ -831,24 +816,24 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Base Address Register
 /* BANK 1 */
-#define BASE_REG        SMC_REG(0x0002, 1)
+#define BASE_REG(lp)    SMC_REG(lp, 0x0002, 1)
 
 
 // Individual Address Registers
 /* BANK 1 */
-#define ADDR0_REG       SMC_REG(0x0004, 1)
-#define ADDR1_REG       SMC_REG(0x0006, 1)
-#define ADDR2_REG       SMC_REG(0x0008, 1)
+#define ADDR0_REG(lp)   SMC_REG(lp, 0x0004, 1)
+#define ADDR1_REG(lp)   SMC_REG(lp, 0x0006, 1)
+#define ADDR2_REG(lp)   SMC_REG(lp, 0x0008, 1)
 
 
 // General Purpose Register
 /* BANK 1 */
-#define GP_REG          SMC_REG(0x000A, 1)
+#define GP_REG(lp)              SMC_REG(lp, 0x000A, 1)
 
 
 // Control Register
 /* BANK 1 */
-#define CTL_REG         SMC_REG(0x000C, 1)
+#define CTL_REG(lp)             SMC_REG(lp, 0x000C, 1)
 #define CTL_RCV_BAD     0x4000 // When 1 bad CRC packets are received
 #define CTL_AUTO_RELEASE 0x0800 // When 1 tx pages are released automatically
 #define CTL_LE_ENABLE   0x0080 // When 1 enables Link Error interrupt
@@ -861,7 +846,7 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // MMU Command Register
 /* BANK 2 */
-#define MMU_CMD_REG     SMC_REG(0x0000, 2)
+#define MMU_CMD_REG(lp) SMC_REG(lp, 0x0000, 2)
 #define MC_BUSY         1       // When 1 the last release has not completed
 #define MC_NOP          (0<<5)  // No Op
 #define MC_ALLOC        (1<<5)  // OR with number of 256 byte packets
@@ -875,30 +860,30 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Packet Number Register
 /* BANK 2 */
-#define PN_REG          SMC_REG(0x0002, 2)
+#define PN_REG(lp)              SMC_REG(lp, 0x0002, 2)
 
 
 // Allocation Result Register
 /* BANK 2 */
-#define AR_REG          SMC_REG(0x0003, 2)
+#define AR_REG(lp)              SMC_REG(lp, 0x0003, 2)
 #define AR_FAILED       0x80    // Alocation Failed
 
 
 // TX FIFO Ports Register
 /* BANK 2 */
-#define TXFIFO_REG      SMC_REG(0x0004, 2)
+#define TXFIFO_REG(lp)  SMC_REG(lp, 0x0004, 2)
 #define TXFIFO_TEMPTY   0x80    // TX FIFO Empty
 
 // RX FIFO Ports Register
 /* BANK 2 */
-#define RXFIFO_REG      SMC_REG(0x0005, 2)
+#define RXFIFO_REG(lp)  SMC_REG(lp, 0x0005, 2)
 #define RXFIFO_REMPTY   0x80    // RX FIFO Empty
 
-#define FIFO_REG        SMC_REG(0x0004, 2)
+#define FIFO_REG(lp)    SMC_REG(lp, 0x0004, 2)
 
 // Pointer Register
 /* BANK 2 */
-#define PTR_REG         SMC_REG(0x0006, 2)
+#define PTR_REG(lp)             SMC_REG(lp, 0x0006, 2)
 #define PTR_RCV         0x8000 // 1=Receive area, 0=Transmit area
 #define PTR_AUTOINC     0x4000 // Auto increment the pointer on each access
 #define PTR_READ        0x2000 // When 1 the operation is a read
@@ -906,17 +891,17 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Data Register
 /* BANK 2 */
-#define DATA_REG        SMC_REG(0x0008, 2)
+#define DATA_REG(lp)    SMC_REG(lp, 0x0008, 2)
 
 
 // Interrupt Status/Acknowledge Register
 /* BANK 2 */
-#define INT_REG         SMC_REG(0x000C, 2)
+#define INT_REG(lp)             SMC_REG(lp, 0x000C, 2)
 
 
 // Interrupt Mask Register
 /* BANK 2 */
-#define IM_REG          SMC_REG(0x000D, 2)
+#define IM_REG(lp)              SMC_REG(lp, 0x000D, 2)
 #define IM_MDINT        0x80 // PHY MI Register 18 Interrupt
 #define IM_ERCV_INT     0x40 // Early Receive Interrupt
 #define IM_EPH_INT      0x20 // Set by Ethernet Protocol Handler section
@@ -929,15 +914,15 @@ smc_pxa_dma_irq(int dma, void *dummy)
 
 // Multicast Table Registers
 /* BANK 3 */
-#define MCAST_REG1      SMC_REG(0x0000, 3)
-#define MCAST_REG2      SMC_REG(0x0002, 3)
-#define MCAST_REG3      SMC_REG(0x0004, 3)
-#define MCAST_REG4      SMC_REG(0x0006, 3)
+#define MCAST_REG1(lp)  SMC_REG(lp, 0x0000, 3)
+#define MCAST_REG2(lp)  SMC_REG(lp, 0x0002, 3)
+#define MCAST_REG3(lp)  SMC_REG(lp, 0x0004, 3)
+#define MCAST_REG4(lp)  SMC_REG(lp, 0x0006, 3)
 
 
 // Management Interface Register (MII)
 /* BANK 3 */
-#define MII_REG         SMC_REG(0x0008, 3)
+#define MII_REG(lp)             SMC_REG(lp, 0x0008, 3)
 #define MII_MSK_CRS100  0x4000 // Disables CRS100 detection during tx half dup
 #define MII_MDOE        0x0008 // MII Output Enable
 #define MII_MCLK        0x0004 // MII Clock, pin MDCLK
@@ -948,20 +933,20 @@ smc_pxa_dma_irq(int dma, void *dummy)
 // Revision Register
 /* BANK 3 */
 /* ( hi: chip id   low: rev # ) */
-#define REV_REG         SMC_REG(0x000A, 3)
+#define REV_REG(lp)             SMC_REG(lp, 0x000A, 3)
 
 
 // Early RCV Register
 /* BANK 3 */
 /* this is NOT on SMC9192 */
-#define ERCV_REG        SMC_REG(0x000C, 3)
+#define ERCV_REG(lp)    SMC_REG(lp, 0x000C, 3)
 #define ERCV_RCV_DISCRD 0x0080 // When 1 discards a packet being received
 #define ERCV_THRESHOLD  0x001F // ERCV Threshold Mask
 
 
 // External Register
 /* BANK 7 */
-#define EXT_REG         SMC_REG(0x0000, 7)
+#define EXT_REG(lp)             SMC_REG(lp, 0x0000, 7)
 
 
 #define CHIP_9192       3
@@ -1085,9 +1070,9 @@ static const char * chip_ids[ 16 ] =  {
  */
 
 #if SMC_DEBUG > 0
-#define SMC_REG(reg, bank)                                              \
+#define SMC_REG(lp, reg, bank)                                  \
         ({                                                              \
-                int __b = SMC_CURRENT_BANK();                           \
+                int __b = SMC_CURRENT_BANK(lp);                 \
                 if (unlikely((__b & ~0xf0) != (0x3300 | bank))) {       \
                         printk( "%s: bank reg screwed (0x%04x)\n",      \
                                 CARDNAME, __b );                        \
@@ -1096,7 +1081,7 @@ static const char * chip_ids[ 16 ] =  {
                 reg<<SMC_IO_SHIFT;                                      \
         })
 #else
-#define SMC_REG(reg, bank)      (reg<<SMC_IO_SHIFT)
+#define SMC_REG(lp, reg, bank)  (reg<<SMC_IO_SHIFT)
 #endif
 
 /*
@@ -1108,212 +1093,215 @@ static const char * chip_ids[ 16 ] =  {
  *
  * Enforce it on any 32-bit capable setup for now.
  */
-#define SMC_MUST_ALIGN_WRITE    SMC_CAN_USE_32BIT
+#define SMC_MUST_ALIGN_WRITE(lp)        SMC_32BIT(lp)
 
-#define SMC_GET_PN()                                                    \
-        ( SMC_CAN_USE_8BIT      ? (SMC_inb(ioaddr, PN_REG))             \
-                                : (SMC_inw(ioaddr, PN_REG) & 0xFF) )
+#define SMC_GET_PN(lp)                                          \
+        (SMC_8BIT(lp)   ? (SMC_inb(ioaddr, PN_REG(lp))) \
+                                : (SMC_inw(ioaddr, PN_REG(lp)) & 0xFF))
 
-#define SMC_SET_PN(x)                                                   \
+#define SMC_SET_PN(lp, x)                                               \
         do {                                                            \
-                if (SMC_MUST_ALIGN_WRITE)                               \
-                        SMC_outl((x)<<16, ioaddr, SMC_REG(0, 2));       \
-                else if (SMC_CAN_USE_8BIT)                              \
-                        SMC_outb(x, ioaddr, PN_REG);                    \
+                if (SMC_MUST_ALIGN_WRITE(lp))                           \
+                        SMC_outl((x)<<16, ioaddr, SMC_REG(lp, 0, 2));   \
+                else if (SMC_8BIT(lp))                          \
+                        SMC_outb(x, ioaddr, PN_REG(lp));                \
                 else                                                    \
-                        SMC_outw(x, ioaddr, PN_REG);                    \
+                        SMC_outw(x, ioaddr, PN_REG(lp));                \
         } while (0)
 
-#define SMC_GET_AR()                                                    \
-        ( SMC_CAN_USE_8BIT      ? (SMC_inb(ioaddr, AR_REG))             \
-                                : (SMC_inw(ioaddr, PN_REG) >> 8) )
+#define SMC_GET_AR(lp)                                          \
+        (SMC_8BIT(lp)   ? (SMC_inb(ioaddr, AR_REG(lp))) \
+                                : (SMC_inw(ioaddr, PN_REG(lp)) >> 8))
 
-#define SMC_GET_TXFIFO()                                                \
-        ( SMC_CAN_USE_8BIT      ? (SMC_inb(ioaddr, TXFIFO_REG))         \
-                                : (SMC_inw(ioaddr, TXFIFO_REG) & 0xFF) )
+#define SMC_GET_TXFIFO(lp)                                              \
+        (SMC_8BIT(lp)   ? (SMC_inb(ioaddr, TXFIFO_REG(lp)))     \
+                                : (SMC_inw(ioaddr, TXFIFO_REG(lp)) & 0xFF))
 
-#define SMC_GET_RXFIFO()                                                \
-          ( SMC_CAN_USE_8BIT    ? (SMC_inb(ioaddr, RXFIFO_REG))         \
-                                : (SMC_inw(ioaddr, TXFIFO_REG) >> 8) )
+#define SMC_GET_RXFIFO(lp)                                              \
+        (SMC_8BIT(lp)   ? (SMC_inb(ioaddr, RXFIFO_REG(lp)))     \
+                                : (SMC_inw(ioaddr, TXFIFO_REG(lp)) >> 8))
 
-#define SMC_GET_INT()                                                   \
-        ( SMC_CAN_USE_8BIT      ? (SMC_inb(ioaddr, INT_REG))            \
-                                : (SMC_inw(ioaddr, INT_REG) & 0xFF) )
+#define SMC_GET_INT(lp)                                         \
+        (SMC_8BIT(lp)   ? (SMC_inb(ioaddr, INT_REG(lp)))        \
+                                : (SMC_inw(ioaddr, INT_REG(lp)) & 0xFF))
 
-#define SMC_ACK_INT(x)                                                  \
+#define SMC_ACK_INT(lp, x)                                              \
         do {                                                            \
-                if (SMC_CAN_USE_8BIT)                                   \
-                        SMC_outb(x, ioaddr, INT_REG);                   \
+                if (SMC_8BIT(lp))                                       \
+                        SMC_outb(x, ioaddr, INT_REG(lp));               \
                 else {                                                  \
                         unsigned long __flags;                          \
                         int __mask;                                     \
                         local_irq_save(__flags);                        \
-                        __mask = SMC_inw( ioaddr, INT_REG ) & ~0xff;    \
-                        SMC_outw( __mask | (x), ioaddr, INT_REG );      \
+                        __mask = SMC_inw(ioaddr, INT_REG(lp)) & ~0xff; \
+                        SMC_outw(__mask | (x), ioaddr, INT_REG(lp));    \
                         local_irq_restore(__flags);                     \
                 }                                                       \
         } while (0)
 
-#define SMC_GET_INT_MASK()                                              \
-        ( SMC_CAN_USE_8BIT      ? (SMC_inb(ioaddr, IM_REG))             \
-                                : (SMC_inw( ioaddr, INT_REG ) >> 8) )
+#define SMC_GET_INT_MASK(lp)                                            \
+        (SMC_8BIT(lp)   ? (SMC_inb(ioaddr, IM_REG(lp))) \
+                                : (SMC_inw(ioaddr, INT_REG(lp)) >> 8))
 
-#define SMC_SET_INT_MASK(x)                                             \
+#define SMC_SET_INT_MASK(lp, x)                                 \
         do {                                                            \
-                if (SMC_CAN_USE_8BIT)                                   \
-                        SMC_outb(x, ioaddr, IM_REG);                    \
+                if (SMC_8BIT(lp))                                       \
+                        SMC_outb(x, ioaddr, IM_REG(lp));                \
                 else                                                    \
-                        SMC_outw((x) << 8, ioaddr, INT_REG);            \
+                        SMC_outw((x) << 8, ioaddr, INT_REG(lp));        \
         } while (0)
 
-#define SMC_CURRENT_BANK()      SMC_inw(ioaddr, BANK_SELECT)
+#define SMC_CURRENT_BANK(lp)    SMC_inw(ioaddr, BANK_SELECT)
 
-#define SMC_SELECT_BANK(x)                                              \
+#define SMC_SELECT_BANK(lp, x)                                  \
         do {                                                            \
-                if (SMC_MUST_ALIGN_WRITE)                               \
+                if (SMC_MUST_ALIGN_WRITE(lp))                           \
                         SMC_outl((x)<<16, ioaddr, 12<<SMC_IO_SHIFT);    \
                 else                                                    \
                         SMC_outw(x, ioaddr, BANK_SELECT);               \
         } while (0)
 
-#define SMC_GET_BASE()          SMC_inw(ioaddr, BASE_REG)
+#define SMC_GET_BASE(lp)                SMC_inw(ioaddr, BASE_REG(lp))
 
-#define SMC_SET_BASE(x)         SMC_outw(x, ioaddr, BASE_REG)
+#define SMC_SET_BASE(lp, x)             SMC_outw(x, ioaddr, BASE_REG(lp))
 
-#define SMC_GET_CONFIG()        SMC_inw(ioaddr, CONFIG_REG)
+#define SMC_GET_CONFIG(lp)      SMC_inw(ioaddr, CONFIG_REG(lp))
 
-#define SMC_SET_CONFIG(x)       SMC_outw(x, ioaddr, CONFIG_REG)
+#define SMC_SET_CONFIG(lp, x)   SMC_outw(x, ioaddr, CONFIG_REG(lp))
 
-#define SMC_GET_COUNTER()       SMC_inw(ioaddr, COUNTER_REG)
+#define SMC_GET_COUNTER(lp)     SMC_inw(ioaddr, COUNTER_REG(lp))
 
-#define SMC_GET_CTL()           SMC_inw(ioaddr, CTL_REG)
+#define SMC_GET_CTL(lp)         SMC_inw(ioaddr, CTL_REG(lp))
 
-#define SMC_SET_CTL(x)          SMC_outw(x, ioaddr, CTL_REG)
+#define SMC_SET_CTL(lp, x)              SMC_outw(x, ioaddr, CTL_REG(lp))
 
-#define SMC_GET_MII()           SMC_inw(ioaddr, MII_REG)
+#define SMC_GET_MII(lp)         SMC_inw(ioaddr, MII_REG(lp))
 
-#define SMC_SET_MII(x)          SMC_outw(x, ioaddr, MII_REG)
+#define SMC_SET_MII(lp, x)              SMC_outw(x, ioaddr, MII_REG(lp))
 
-#define SMC_GET_MIR()           SMC_inw(ioaddr, MIR_REG)
+#define SMC_GET_MIR(lp)         SMC_inw(ioaddr, MIR_REG(lp))
 
-#define SMC_SET_MIR(x)          SMC_outw(x, ioaddr, MIR_REG)
+#define SMC_SET_MIR(lp, x)              SMC_outw(x, ioaddr, MIR_REG(lp))
 
-#define SMC_GET_MMU_CMD()       SMC_inw(ioaddr, MMU_CMD_REG)
+#define SMC_GET_MMU_CMD(lp)     SMC_inw(ioaddr, MMU_CMD_REG(lp))
 
-#define SMC_SET_MMU_CMD(x)      SMC_outw(x, ioaddr, MMU_CMD_REG)
+#define SMC_SET_MMU_CMD(lp, x)  SMC_outw(x, ioaddr, MMU_CMD_REG(lp))
 
-#define SMC_GET_FIFO()          SMC_inw(ioaddr, FIFO_REG)
+#define SMC_GET_FIFO(lp)                SMC_inw(ioaddr, FIFO_REG(lp))
 
-#define SMC_GET_PTR()           SMC_inw(ioaddr, PTR_REG)
+#define SMC_GET_PTR(lp)         SMC_inw(ioaddr, PTR_REG(lp))
 
-#define SMC_SET_PTR(x)                                                  \
+#define SMC_SET_PTR(lp, x)                                              \
         do {                                                            \
-                if (SMC_MUST_ALIGN_WRITE)                               \
-                        SMC_outl((x)<<16, ioaddr, SMC_REG(4, 2));       \
+                if (SMC_MUST_ALIGN_WRITE(lp))                           \
+                        SMC_outl((x)<<16, ioaddr, SMC_REG(lp, 4, 2));   \
                 else                                                    \
-                        SMC_outw(x, ioaddr, PTR_REG);                   \
+                        SMC_outw(x, ioaddr, PTR_REG(lp));               \
         } while (0)
 
-#define SMC_GET_EPH_STATUS()    SMC_inw(ioaddr, EPH_STATUS_REG)
+#define SMC_GET_EPH_STATUS(lp)  SMC_inw(ioaddr, EPH_STATUS_REG(lp))
 
-#define SMC_GET_RCR()           SMC_inw(ioaddr, RCR_REG)
+#define SMC_GET_RCR(lp)         SMC_inw(ioaddr, RCR_REG(lp))
 
-#define SMC_SET_RCR(x)          SMC_outw(x, ioaddr, RCR_REG)
+#define SMC_SET_RCR(lp, x)              SMC_outw(x, ioaddr, RCR_REG(lp))
 
-#define SMC_GET_REV()           SMC_inw(ioaddr, REV_REG)
+#define SMC_GET_REV(lp)         SMC_inw(ioaddr, REV_REG(lp))
 
-#define SMC_GET_RPC()           SMC_inw(ioaddr, RPC_REG)
+#define SMC_GET_RPC(lp)         SMC_inw(ioaddr, RPC_REG(lp))
 
-#define SMC_SET_RPC(x)                                                  \
+#define SMC_SET_RPC(lp, x)                                              \
         do {                                                            \
-                if (SMC_MUST_ALIGN_WRITE)                               \
-                        SMC_outl((x)<<16, ioaddr, SMC_REG(8, 0));       \
+                if (SMC_MUST_ALIGN_WRITE(lp))                           \
+                        SMC_outl((x)<<16, ioaddr, SMC_REG(lp, 8, 0));   \
                 else                                                    \
-                        SMC_outw(x, ioaddr, RPC_REG);                   \
+                        SMC_outw(x, ioaddr, RPC_REG(lp));               \
         } while (0)
 
-#define SMC_GET_TCR()           SMC_inw(ioaddr, TCR_REG)
+#define SMC_GET_TCR(lp)         SMC_inw(ioaddr, TCR_REG(lp))
 
-#define SMC_SET_TCR(x)          SMC_outw(x, ioaddr, TCR_REG)
+#define SMC_SET_TCR(lp, x)              SMC_outw(x, ioaddr, TCR_REG(lp))
 
 #ifndef SMC_GET_MAC_ADDR
-#define SMC_GET_MAC_ADDR(addr)                                          \
+#define SMC_GET_MAC_ADDR(lp, addr)                                      \
         do {                                                            \
                 unsigned int __v;                                       \
-                __v = SMC_inw( ioaddr, ADDR0_REG );                     \
+                __v = SMC_inw(ioaddr, ADDR0_REG(lp));                   \
                 addr[0] = __v; addr[1] = __v >> 8;                      \
-                __v = SMC_inw( ioaddr, ADDR1_REG );                     \
+                __v = SMC_inw(ioaddr, ADDR1_REG(lp));                   \
                 addr[2] = __v; addr[3] = __v >> 8;                      \
-                __v = SMC_inw( ioaddr, ADDR2_REG );                     \
+                __v = SMC_inw(ioaddr, ADDR2_REG(lp));                   \
                 addr[4] = __v; addr[5] = __v >> 8;                      \
         } while (0)
 #endif
 
-#define SMC_SET_MAC_ADDR(addr)                                          \
+#define SMC_SET_MAC_ADDR(lp, addr)                                      \
         do {                                                            \
-                SMC_outw( addr[0]|(addr[1] << 8), ioaddr, ADDR0_REG );  \
-                SMC_outw( addr[2]|(addr[3] << 8), ioaddr, ADDR1_REG );  \
-                SMC_outw( addr[4]|(addr[5] << 8), ioaddr, ADDR2_REG );  \
+                SMC_outw(addr[0]|(addr[1] << 8), ioaddr, ADDR0_REG(lp)); \
+                SMC_outw(addr[2]|(addr[3] << 8), ioaddr, ADDR1_REG(lp)); \
+                SMC_outw(addr[4]|(addr[5] << 8), ioaddr, ADDR2_REG(lp)); \
         } while (0)
 
-#define SMC_SET_MCAST(x)                                                \
+#define SMC_SET_MCAST(lp, x)                                            \
         do {                                                            \
                 const unsigned char *mt = (x);                          \
-                SMC_outw( mt[0] | (mt[1] << 8), ioaddr, MCAST_REG1 );   \
-                SMC_outw( mt[2] | (mt[3] << 8), ioaddr, MCAST_REG2 );   \
-                SMC_outw( mt[4] | (mt[5] << 8), ioaddr, MCAST_REG3 );   \
-                SMC_outw( mt[6] | (mt[7] << 8), ioaddr, MCAST_REG4 );   \
+                SMC_outw(mt[0] | (mt[1] << 8), ioaddr, MCAST_REG1(lp)); \
+                SMC_outw(mt[2] | (mt[3] << 8), ioaddr, MCAST_REG2(lp)); \
+                SMC_outw(mt[4] | (mt[5] << 8), ioaddr, MCAST_REG3(lp)); \
+                SMC_outw(mt[6] | (mt[7] << 8), ioaddr, MCAST_REG4(lp)); \
         } while (0)
 
-#define SMC_PUT_PKT_HDR(status, length)                                 \
+#define SMC_PUT_PKT_HDR(lp, status, length)                             \
         do {                                                            \
-                if (SMC_CAN_USE_32BIT)                                  \
-                        SMC_outl((status) | (length)<<16, ioaddr, DATA_REG); \
+                if (SMC_32BIT(lp))                                      \
+                        SMC_outl((status) | (length)<<16, ioaddr,       \
+                                 DATA_REG(lp));                 \
                 else {                                                  \
-                        SMC_outw(status, ioaddr, DATA_REG);             \
-                        SMC_outw(length, ioaddr, DATA_REG);             \
+                        SMC_outw(status, ioaddr, DATA_REG(lp)); \
+                        SMC_outw(length, ioaddr, DATA_REG(lp)); \
                 }                                                       \
         } while (0)
 
-#define SMC_GET_PKT_HDR(status, length)                                 \
+#define SMC_GET_PKT_HDR(lp, status, length)                             \
         do {                                                            \
-                if (SMC_CAN_USE_32BIT) {                                \
-                        unsigned int __val = SMC_inl(ioaddr, DATA_REG); \
+                if (SMC_32BIT(lp)) {                            \
+                        unsigned int __val = SMC_inl(ioaddr, DATA_REG(lp)); \
                         (status) = __val & 0xffff;                      \
                         (length) = __val >> 16;                         \
                 } else {                                                \
-                        (status) = SMC_inw(ioaddr, DATA_REG);           \
-                        (length) = SMC_inw(ioaddr, DATA_REG);           \
+                        (status) = SMC_inw(ioaddr, DATA_REG(lp));       \
+                        (length) = SMC_inw(ioaddr, DATA_REG(lp));       \
                 }                                                       \
         } while (0)
 
-#define SMC_PUSH_DATA(p, l)                                             \
+#define SMC_PUSH_DATA(lp, p, l)                                 \
         do {                                                            \
-                if (SMC_CAN_USE_32BIT) {                                \
+                if (SMC_32BIT(lp)) {                            \
                         void *__ptr = (p);                              \
                         int __len = (l);                                \
                         void __iomem *__ioaddr = ioaddr;                \
                         if (__len >= 2 && (unsigned long)__ptr & 2) {   \
                                 __len -= 2;                             \
-                                SMC_outw(*(u16 *)__ptr, ioaddr, DATA_REG); \
+                                SMC_outw(*(u16 *)__ptr, ioaddr,         \
+                                        DATA_REG(lp));          \
                                 __ptr += 2;                             \
                         }                                               \
                         if (SMC_CAN_USE_DATACS && lp->datacs)           \
                                 __ioaddr = lp->datacs;                  \
-                        SMC_outsl(__ioaddr, DATA_REG, __ptr, __len>>2); \
+                        SMC_outsl(__ioaddr, DATA_REG(lp), __ptr, __len>>2); \
                         if (__len & 2) {                                \
                                 __ptr += (__len & ~3);                  \
-                                SMC_outw(*((u16 *)__ptr), ioaddr, DATA_REG); \
+                                SMC_outw(*((u16 *)__ptr), ioaddr,       \
+                                         DATA_REG(lp));         \
                         }                                               \
-                } else if (SMC_CAN_USE_16BIT)                           \
-                        SMC_outsw(ioaddr, DATA_REG, p, (l) >> 1);       \
-                else if (SMC_CAN_USE_8BIT)                              \
-                        SMC_outsb(ioaddr, DATA_REG, p, l);              \
+                } else if (SMC_16BIT(lp))                               \
+                        SMC_outsw(ioaddr, DATA_REG(lp), p, (l) >> 1);   \
+                else if (SMC_8BIT(lp))                          \
+                        SMC_outsb(ioaddr, DATA_REG(lp), p, l);  \
         } while (0)
 
-#define SMC_PULL_DATA(p, l)                                             \
+#define SMC_PULL_DATA(lp, p, l)                                 \
         do {                                                            \
-                if (SMC_CAN_USE_32BIT) {                                \
+                if (SMC_32BIT(lp)) {                            \
                         void *__ptr = (p);                              \
                         int __len = (l);                                \
                         void __iomem *__ioaddr = ioaddr;                \
@@ -1333,16 +1321,17 @@ static const char * chip_ids[ 16 ] =  {
                                  */                                     \
                                 __ptr -= 2;                             \
                                 __len += 2;                             \
-                                SMC_SET_PTR(2|PTR_READ|PTR_RCV|PTR_AUTOINC); \
+                                SMC_SET_PTR(lp,                 \
+                                        2|PTR_READ|PTR_RCV|PTR_AUTOINC); \
                         }                                               \
                         if (SMC_CAN_USE_DATACS && lp->datacs)           \
                                 __ioaddr = lp->datacs;                  \
                         __len += 2;                                     \
-                        SMC_insl(__ioaddr, DATA_REG, __ptr, __len>>2);  \
-                } else if (SMC_CAN_USE_16BIT)                           \
-                        SMC_insw(ioaddr, DATA_REG, p, (l) >> 1);        \
-                else if (SMC_CAN_USE_8BIT)                              \
-                        SMC_insb(ioaddr, DATA_REG, p, l);               \
+                        SMC_insl(__ioaddr, DATA_REG(lp), __ptr, __len>>2); \
+                } else if (SMC_16BIT(lp))                               \
+                        SMC_insw(ioaddr, DATA_REG(lp), p, (l) >> 1);    \
+                else if (SMC_8BIT(lp))                          \
+                        SMC_insb(ioaddr, DATA_REG(lp), p, l);           \
         } while (0)
 
 #endif  /* _SMC91X_H_ */
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index bccae7e5c6ad..477671606273 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1399,6 +1399,8 @@ spider_net_link_reset(struct net_device *netdev)
         spider_net_write_reg(card, SPIDER_NET_GMACINTEN, 0);
 
         /* reset phy and setup aneg */
+        card->aneg_count = 0;
+        card->medium = BCM54XX_COPPER;
         spider_net_setup_aneg(card);
         mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER);
 
@@ -1413,18 +1415,12 @@ spider_net_link_reset(struct net_device *netdev)
  * found when an interrupt is presented
  */
 static void
-spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
+spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg,
+                            u32 error_reg1, u32 error_reg2)
 {
-        u32 error_reg1, error_reg2;
         u32 i;
         int show_error = 1;
 
-        error_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1STS);
-        error_reg2 = spider_net_read_reg(card, SPIDER_NET_GHIINT2STS);
-
-        error_reg1 &= SPIDER_NET_INT1_MASK_VALUE;
-        error_reg2 &= SPIDER_NET_INT2_MASK_VALUE;
-
         /* check GHIINT0STS ************************************/
         if (status_reg)
                 for (i = 0; i < 32; i++)
@@ -1654,12 +1650,15 @@ spider_net_interrupt(int irq, void *ptr)
 {
         struct net_device *netdev = ptr;
         struct spider_net_card *card = netdev_priv(netdev);
-        u32 status_reg;
+        u32 status_reg, error_reg1, error_reg2;
 
         status_reg = spider_net_read_reg(card, SPIDER_NET_GHIINT0STS);
-        status_reg &= SPIDER_NET_INT0_MASK_VALUE;
+        error_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1STS);
+        error_reg2 = spider_net_read_reg(card, SPIDER_NET_GHIINT2STS);
 
-        if (!status_reg)
+        if (!(status_reg & SPIDER_NET_INT0_MASK_VALUE) &&
+            !(error_reg1 & SPIDER_NET_INT1_MASK_VALUE) &&
+            !(error_reg2 & SPIDER_NET_INT2_MASK_VALUE))
                 return IRQ_NONE;
 
         if (status_reg & SPIDER_NET_RXINT ) {
@@ -1674,7 +1673,8 @@ spider_net_interrupt(int irq, void *ptr)
                 spider_net_link_reset(netdev);
 
         if (status_reg & SPIDER_NET_ERRINT )
-                spider_net_handle_error_irq(card, status_reg);
+                spider_net_handle_error_irq(card, status_reg,
+                                            error_reg1, error_reg2);
 
         /* clear interrupt sources */
         spider_net_write_reg(card, SPIDER_NET_GHIINT0STS, status_reg);
@@ -1982,6 +1982,8 @@ spider_net_open(struct net_device *netdev)
                 goto init_firmware_failed;
 
         /* start probing with copper */
+        card->aneg_count = 0;
+        card->medium = BCM54XX_COPPER;
         spider_net_setup_aneg(card);
         if (card->phy.def->phy_id)
                 mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER);
@@ -2043,7 +2045,8 @@ static void spider_net_link_phy(unsigned long data)
         /* if link didn't come up after SPIDER_NET_ANEG_TIMEOUT tries, setup phy again */
         if (card->aneg_count > SPIDER_NET_ANEG_TIMEOUT) {
 
-                pr_info("%s: link is down trying to bring it up\n", card->netdev->name);
+                pr_debug("%s: link is down trying to bring it up\n",
+                         card->netdev->name);
 
                 switch (card->medium) {
                 case BCM54XX_COPPER:
@@ -2094,9 +2097,10 @@ static void spider_net_link_phy(unsigned long data)
 
         card->aneg_count = 0;
 
-        pr_debug("Found %s with %i Mbps, %s-duplex %sautoneg.\n",
-                phy->def->name, phy->speed, phy->duplex==1 ? "Full" : "Half",
-                phy->autoneg==1 ? "" : "no ");
+        pr_info("%s: link up, %i Mbps, %s-duplex %sautoneg.\n",
+                card->netdev->name, phy->speed,
+                phy->duplex == 1 ? "Full" : "Half",
+                phy->autoneg == 1 ? "" : "no ");
 
         return;
 }
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index e1d05c0f47eb..05f74cbdd617 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -52,7 +52,7 @@ extern char spider_net_driver_name[];
 
 #define SPIDER_NET_TX_TIMER                     (HZ/5)
 #define SPIDER_NET_ANEG_TIMER                   (HZ)
-#define SPIDER_NET_ANEG_TIMEOUT                 2
+#define SPIDER_NET_ANEG_TIMEOUT                 5
 
 #define SPIDER_NET_RX_CSUM_DEFAULT              1
 
@@ -159,9 +159,8 @@ extern char spider_net_driver_name[];
 
 /** interrupt mask registers */
 #define SPIDER_NET_INT0_MASK_VALUE      0x3f7fe2c7
-#define SPIDER_NET_INT1_MASK_VALUE      0xffff7ff7
-/* no MAC aborts -> auto retransmission */
-#define SPIDER_NET_INT2_MASK_VALUE      0xffef7ff1
+#define SPIDER_NET_INT1_MASK_VALUE      0x0000fff2
+#define SPIDER_NET_INT2_MASK_VALUE      0x000003f1
 
 /* we rely on flagged descriptor interrupts */
 #define SPIDER_NET_FRAMENUM_VALUE       0x00000000
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 370d329d15d9..10e4e85da3fc 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -23,9 +23,9 @@
  */
 
 #ifdef TC35815_NAPI
-#define DRV_VERSION     "1.36-NAPI"
+#define DRV_VERSION     "1.37-NAPI"
 #else
-#define DRV_VERSION     "1.36"
+#define DRV_VERSION     "1.37"
 #endif
 static const char *version = "tc35815.c:v" DRV_VERSION "\n";
 #define MODNAME                 "tc35815"
@@ -47,8 +47,8 @@ static const char *version = "tc35815.c:v" DRV_VERSION "\n";
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
+#include <linux/phy.h>
+#include <linux/workqueue.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
@@ -60,16 +60,16 @@ static const char *version = "tc35815.c:v" DRV_VERSION "\n";
 #define WORKAROUND_100HALF_PROMISC
 /* #define TC35815_USE_PACKEDBUFFER */
 
-typedef enum {
+enum tc35815_chiptype {
         TC35815CF = 0,
         TC35815_NWU,
         TC35815_TX4939,
-} board_t;
+};
 
-/* indexed by board_t, above */
+/* indexed by tc35815_chiptype, above */
 static const struct {
         const char *name;
-} board_info[] __devinitdata = {
+} chip_info[] __devinitdata = {
         { "TOSHIBA TC35815CF 10/100BaseTX" },
         { "TOSHIBA TC35815 with Wake on LAN" },
         { "TOSHIBA TC35815/TX4939" },
@@ -81,209 +81,208 @@ static const struct pci_device_id tc35815_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939), .driver_data = TC35815_TX4939 },
         {0,}
 };
-MODULE_DEVICE_TABLE (pci, tc35815_pci_tbl);
+MODULE_DEVICE_TABLE(pci, tc35815_pci_tbl);
 
 /* see MODULE_PARM_DESC */
 static struct tc35815_options {
         int speed;
         int duplex;
-        int doforce;
 } options;
 
 /*
  * Registers
  */
 struct tc35815_regs {
-        volatile __u32 DMA_Ctl;         /* 0x00 */
-        volatile __u32 TxFrmPtr;
-        volatile __u32 TxThrsh;
-        volatile __u32 TxPollCtr;
-        volatile __u32 BLFrmPtr;
-        volatile __u32 RxFragSize;
-        volatile __u32 Int_En;
-        volatile __u32 FDA_Bas;
-        volatile __u32 FDA_Lim;         /* 0x20 */
-        volatile __u32 Int_Src;
-        volatile __u32 unused0[2];
-        volatile __u32 PauseCnt;
-        volatile __u32 RemPauCnt;
-        volatile __u32 TxCtlFrmStat;
-        volatile __u32 unused1;
-        volatile __u32 MAC_Ctl;         /* 0x40 */
-        volatile __u32 CAM_Ctl;
-        volatile __u32 Tx_Ctl;
-        volatile __u32 Tx_Stat;
-        volatile __u32 Rx_Ctl;
-        volatile __u32 Rx_Stat;
-        volatile __u32 MD_Data;
-        volatile __u32 MD_CA;
-        volatile __u32 CAM_Adr;         /* 0x60 */
-        volatile __u32 CAM_Data;
-        volatile __u32 CAM_Ena;
-        volatile __u32 PROM_Ctl;
-        volatile __u32 PROM_Data;
-        volatile __u32 Algn_Cnt;
-        volatile __u32 CRC_Cnt;
-        volatile __u32 Miss_Cnt;
+        __u32 DMA_Ctl;          /* 0x00 */
+        __u32 TxFrmPtr;
+        __u32 TxThrsh;
+        __u32 TxPollCtr;
+        __u32 BLFrmPtr;
+        __u32 RxFragSize;
+        __u32 Int_En;
+        __u32 FDA_Bas;
+        __u32 FDA_Lim;          /* 0x20 */
+        __u32 Int_Src;
+        __u32 unused0[2];
+        __u32 PauseCnt;
+        __u32 RemPauCnt;
+        __u32 TxCtlFrmStat;
+        __u32 unused1;
+        __u32 MAC_Ctl;          /* 0x40 */
+        __u32 CAM_Ctl;
+        __u32 Tx_Ctl;
+        __u32 Tx_Stat;
+        __u32 Rx_Ctl;
+        __u32 Rx_Stat;
+        __u32 MD_Data;
+        __u32 MD_CA;
+        __u32 CAM_Adr;          /* 0x60 */
+        __u32 CAM_Data;
+        __u32 CAM_Ena;
+        __u32 PROM_Ctl;
+        __u32 PROM_Data;
+        __u32 Algn_Cnt;
+        __u32 CRC_Cnt;
+        __u32 Miss_Cnt;
 };
 
 /*
  * Bit assignments
  */
 /* DMA_Ctl bit asign ------------------------------------------------------- */
-#define DMA_RxAlign            0x00c00000 /* 1:Reception Alignment           */
-#define DMA_RxAlign_1          0x00400000
-#define DMA_RxAlign_2          0x00800000
-#define DMA_RxAlign_3          0x00c00000
-#define DMA_M66EnStat          0x00080000 /* 1:66MHz Enable State            */
-#define DMA_IntMask            0x00040000 /* 1:Interupt mask                 */
-#define DMA_SWIntReq           0x00020000 /* 1:Software Interrupt request    */
-#define DMA_TxWakeUp           0x00010000 /* 1:Transmit Wake Up              */
-#define DMA_RxBigE             0x00008000 /* 1:Receive Big Endian            */
-#define DMA_TxBigE             0x00004000 /* 1:Transmit Big Endian           */
-#define DMA_TestMode           0x00002000 /* 1:Test Mode                     */
-#define DMA_PowrMgmnt          0x00001000 /* 1:Power Management              */
-#define DMA_DmBurst_Mask       0x000001fc /* DMA Burst size                  */
+#define DMA_RxAlign            0x00c00000 /* 1:Reception Alignment           */
+#define DMA_RxAlign_1          0x00400000
+#define DMA_RxAlign_2          0x00800000
+#define DMA_RxAlign_3          0x00c00000
+#define DMA_M66EnStat          0x00080000 /* 1:66MHz Enable State            */
+#define DMA_IntMask            0x00040000 /* 1:Interupt mask                 */
+#define DMA_SWIntReq           0x00020000 /* 1:Software Interrupt request    */
+#define DMA_TxWakeUp           0x00010000 /* 1:Transmit Wake Up              */
+#define DMA_RxBigE             0x00008000 /* 1:Receive Big Endian            */
+#define DMA_TxBigE             0x00004000 /* 1:Transmit Big Endian           */
+#define DMA_TestMode           0x00002000 /* 1:Test Mode                     */
+#define DMA_PowrMgmnt          0x00001000 /* 1:Power Management              */
+#define DMA_DmBurst_Mask       0x000001fc /* DMA Burst size                  */
 
 /* RxFragSize bit asign ---------------------------------------------------- */
-#define RxFrag_EnPack          0x00008000 /* 1:Enable Packing                */
-#define RxFrag_MinFragMask     0x00000ffc /* Minimum Fragment                */
+#define RxFrag_EnPack          0x00008000 /* 1:Enable Packing                */
+#define RxFrag_MinFragMask     0x00000ffc /* Minimum Fragment                */
 
 /* MAC_Ctl bit asign ------------------------------------------------------- */
-#define MAC_Link10             0x00008000 /* 1:Link Status 10Mbits           */
-#define MAC_EnMissRoll         0x00002000 /* 1:Enable Missed Roll            */
-#define MAC_MissRoll           0x00000400 /* 1:Missed Roll                   */
-#define MAC_Loop10             0x00000080 /* 1:Loop 10 Mbps                  */
-#define MAC_Conn_Auto          0x00000000 /*00:Connection mode (Automatic)   */
-#define MAC_Conn_10M           0x00000020 /*01:                (10Mbps endec)*/
-#define MAC_Conn_Mll           0x00000040 /*10:                (Mll clock)   */
-#define MAC_MacLoop            0x00000010 /* 1:MAC Loopback                  */
-#define MAC_FullDup            0x00000008 /* 1:Full Duplex 0:Half Duplex     */
-#define MAC_Reset              0x00000004 /* 1:Software Reset                */
-#define MAC_HaltImm            0x00000002 /* 1:Halt Immediate                */
-#define MAC_HaltReq            0x00000001 /* 1:Halt request                  */
+#define MAC_Link10             0x00008000 /* 1:Link Status 10Mbits           */
+#define MAC_EnMissRoll         0x00002000 /* 1:Enable Missed Roll            */
+#define MAC_MissRoll           0x00000400 /* 1:Missed Roll                   */
+#define MAC_Loop10             0x00000080 /* 1:Loop 10 Mbps                  */
+#define MAC_Conn_Auto          0x00000000 /*00:Connection mode (Automatic)   */
+#define MAC_Conn_10M           0x00000020 /*01:                (10Mbps endec)*/
+#define MAC_Conn_Mll           0x00000040 /*10:                (Mll clock)   */
+#define MAC_MacLoop            0x00000010 /* 1:MAC Loopback                  */
+#define MAC_FullDup            0x00000008 /* 1:Full Duplex 0:Half Duplex     */
+#define MAC_Reset              0x00000004 /* 1:Software Reset                */
+#define MAC_HaltImm            0x00000002 /* 1:Halt Immediate                */
+#define MAC_HaltReq            0x00000001 /* 1:Halt request                  */
 
 /* PROM_Ctl bit asign ------------------------------------------------------ */
-#define PROM_Busy              0x00008000 /* 1:Busy (Start Operation)        */
-#define PROM_Read              0x00004000 /*10:Read operation                */
-#define PROM_Write             0x00002000 /*01:Write operation               */
-#define PROM_Erase             0x00006000 /*11:Erase operation               */
-                                          /*00:Enable or Disable Writting,   */
-                                          /*      as specified in PROM_Addr. */
-#define PROM_Addr_Ena          0x00000030 /*11xxxx:PROM Write enable         */
-                                          /*00xxxx:           disable        */
+#define PROM_Busy              0x00008000 /* 1:Busy (Start Operation)        */
+#define PROM_Read              0x00004000 /*10:Read operation                */
+#define PROM_Write             0x00002000 /*01:Write operation               */
+#define PROM_Erase             0x00006000 /*11:Erase operation               */
+                                          /*00:Enable or Disable Writting,   */
+                                          /*      as specified in PROM_Addr. */
+#define PROM_Addr_Ena          0x00000030 /*11xxxx:PROM Write enable         */
+                                          /*00xxxx:           disable        */
 
 /* CAM_Ctl bit asign ------------------------------------------------------- */
-#define CAM_CompEn             0x00000010 /* 1:CAM Compare Enable            */
-#define CAM_NegCAM             0x00000008 /* 1:Reject packets CAM recognizes,*/
-                                          /*                    accept other */
-#define CAM_BroadAcc           0x00000004 /* 1:Broadcast assept              */
-#define CAM_GroupAcc           0x00000002 /* 1:Multicast assept              */
-#define CAM_StationAcc         0x00000001 /* 1:unicast accept                */
+#define CAM_CompEn             0x00000010 /* 1:CAM Compare Enable            */
+#define CAM_NegCAM             0x00000008 /* 1:Reject packets CAM recognizes,*/
+                                          /*                    accept other */
+#define CAM_BroadAcc           0x00000004 /* 1:Broadcast assept              */
+#define CAM_GroupAcc           0x00000002 /* 1:Multicast assept              */
+#define CAM_StationAcc         0x00000001 /* 1:unicast accept                */
 
 /* CAM_Ena bit asign ------------------------------------------------------- */
-#define CAM_ENTRY_MAX                  21   /* CAM Data entry max count      */
+#define CAM_ENTRY_MAX                  21   /* CAM Data entry max count      */
 #define CAM_Ena_Mask ((1<<CAM_ENTRY_MAX)-1) /* CAM Enable bits (Max 21bits)  */
-#define CAM_Ena_Bit(index)         (1<<(index))
+#define CAM_Ena_Bit(index)      (1 << (index))
 #define CAM_ENTRY_DESTINATION   0
 #define CAM_ENTRY_SOURCE        1
 #define CAM_ENTRY_MACCTL        20
 
 /* Tx_Ctl bit asign -------------------------------------------------------- */
-#define Tx_En                  0x00000001 /* 1:Transmit enable               */
-#define Tx_TxHalt              0x00000002 /* 1:Transmit Halt Request         */
-#define Tx_NoPad               0x00000004 /* 1:Suppress Padding              */
-#define Tx_NoCRC               0x00000008 /* 1:Suppress Padding              */
-#define Tx_FBack               0x00000010 /* 1:Fast Back-off                 */
-#define Tx_EnUnder             0x00000100 /* 1:Enable Underrun               */
-#define Tx_EnExDefer           0x00000200 /* 1:Enable Excessive Deferral     */
-#define Tx_EnLCarr             0x00000400 /* 1:Enable Lost Carrier           */
-#define Tx_EnExColl            0x00000800 /* 1:Enable Excessive Collision    */
-#define Tx_EnLateColl          0x00001000 /* 1:Enable Late Collision         */
-#define Tx_EnTxPar             0x00002000 /* 1:Enable Transmit Parity        */
-#define Tx_EnComp              0x00004000 /* 1:Enable Completion             */
+#define Tx_En                  0x00000001 /* 1:Transmit enable               */
+#define Tx_TxHalt              0x00000002 /* 1:Transmit Halt Request         */
+#define Tx_NoPad               0x00000004 /* 1:Suppress Padding              */
+#define Tx_NoCRC               0x00000008 /* 1:Suppress Padding              */
+#define Tx_FBack               0x00000010 /* 1:Fast Back-off                 */
+#define Tx_EnUnder             0x00000100 /* 1:Enable Underrun               */
+#define Tx_EnExDefer           0x00000200 /* 1:Enable Excessive Deferral     */
+#define Tx_EnLCarr             0x00000400 /* 1:Enable Lost Carrier           */
+#define Tx_EnExColl            0x00000800 /* 1:Enable Excessive Collision    */
+#define Tx_EnLateColl          0x00001000 /* 1:Enable Late Collision         */
+#define Tx_EnTxPar             0x00002000 /* 1:Enable Transmit Parity        */
+#define Tx_EnComp              0x00004000 /* 1:Enable Completion             */
 
 /* Tx_Stat bit asign ------------------------------------------------------- */
-#define Tx_TxColl_MASK         0x0000000F /* Tx Collision Count              */
-#define Tx_ExColl              0x00000010 /* Excessive Collision             */
-#define Tx_TXDefer             0x00000020 /* Transmit Defered                */
-#define Tx_Paused              0x00000040 /* Transmit Paused                 */
-#define Tx_IntTx               0x00000080 /* Interrupt on Tx                 */
-#define Tx_Under               0x00000100 /* Underrun                        */
-#define Tx_Defer               0x00000200 /* Deferral                        */
-#define Tx_NCarr               0x00000400 /* No Carrier                      */
-#define Tx_10Stat              0x00000800 /* 10Mbps Status                   */
-#define Tx_LateColl            0x00001000 /* Late Collision                  */
-#define Tx_TxPar               0x00002000 /* Tx Parity Error                 */
-#define Tx_Comp                0x00004000 /* Completion                      */
-#define Tx_Halted              0x00008000 /* Tx Halted                       */
-#define Tx_SQErr               0x00010000 /* Signal Quality Error(SQE)       */
+#define Tx_TxColl_MASK         0x0000000F /* Tx Collision Count              */
+#define Tx_ExColl              0x00000010 /* Excessive Collision             */
+#define Tx_TXDefer             0x00000020 /* Transmit Defered                */
+#define Tx_Paused              0x00000040 /* Transmit Paused                 */
+#define Tx_IntTx               0x00000080 /* Interrupt on Tx                 */
+#define Tx_Under               0x00000100 /* Underrun                        */
+#define Tx_Defer               0x00000200 /* Deferral                        */
+#define Tx_NCarr               0x00000400 /* No Carrier                      */
+#define Tx_10Stat              0x00000800 /* 10Mbps Status                   */
+#define Tx_LateColl            0x00001000 /* Late Collision                  */
+#define Tx_TxPar               0x00002000 /* Tx Parity Error                 */
+#define Tx_Comp                0x00004000 /* Completion                      */
+#define Tx_Halted              0x00008000 /* Tx Halted                       */
+#define Tx_SQErr               0x00010000 /* Signal Quality Error(SQE)       */
 
 /* Rx_Ctl bit asign -------------------------------------------------------- */
-#define Rx_EnGood              0x00004000 /* 1:Enable Good                   */
-#define Rx_EnRxPar             0x00002000 /* 1:Enable Receive Parity         */
-#define Rx_EnLongErr           0x00000800 /* 1:Enable Long Error             */
-#define Rx_EnOver              0x00000400 /* 1:Enable OverFlow               */
-#define Rx_EnCRCErr            0x00000200 /* 1:Enable CRC Error              */
-#define Rx_EnAlign             0x00000100 /* 1:Enable Alignment              */
-#define Rx_IgnoreCRC           0x00000040 /* 1:Ignore CRC Value              */
-#define Rx_StripCRC            0x00000010 /* 1:Strip CRC Value               */
-#define Rx_ShortEn             0x00000008 /* 1:Short Enable                  */
-#define Rx_LongEn              0x00000004 /* 1:Long Enable                   */
-#define Rx_RxHalt              0x00000002 /* 1:Receive Halt Request          */
-#define Rx_RxEn                0x00000001 /* 1:Receive Intrrupt Enable       */
+#define Rx_EnGood              0x00004000 /* 1:Enable Good                   */
+#define Rx_EnRxPar             0x00002000 /* 1:Enable Receive Parity         */
+#define Rx_EnLongErr           0x00000800 /* 1:Enable Long Error             */
+#define Rx_EnOver              0x00000400 /* 1:Enable OverFlow               */
+#define Rx_EnCRCErr            0x00000200 /* 1:Enable CRC Error              */
+#define Rx_EnAlign             0x00000100 /* 1:Enable Alignment              */
+#define Rx_IgnoreCRC           0x00000040 /* 1:Ignore CRC Value              */
+#define Rx_StripCRC            0x00000010 /* 1:Strip CRC Value               */
+#define Rx_ShortEn             0x00000008 /* 1:Short Enable                  */
+#define Rx_LongEn              0x00000004 /* 1:Long Enable                   */
+#define Rx_RxHalt              0x00000002 /* 1:Receive Halt Request          */
+#define Rx_RxEn                0x00000001 /* 1:Receive Intrrupt Enable       */
 
 /* Rx_Stat bit asign ------------------------------------------------------- */
-#define Rx_Halted              0x00008000 /* Rx Halted                       */
-#define Rx_Good                0x00004000 /* Rx Good                         */
-#define Rx_RxPar               0x00002000 /* Rx Parity Error                 */
-                            /* 0x00001000    not use                         */
-#define Rx_LongErr             0x00000800 /* Rx Long Error                   */
-#define Rx_Over                0x00000400 /* Rx Overflow                     */
-#define Rx_CRCErr              0x00000200 /* Rx CRC Error                    */
-#define Rx_Align               0x00000100 /* Rx Alignment Error              */
-#define Rx_10Stat              0x00000080 /* Rx 10Mbps Status                */
-#define Rx_IntRx               0x00000040 /* Rx Interrupt                    */
-#define Rx_CtlRecd             0x00000020 /* Rx Control Receive              */
-
-#define Rx_Stat_Mask           0x0000EFC0 /* Rx All Status Mask              */
+#define Rx_Halted              0x00008000 /* Rx Halted                       */
+#define Rx_Good                0x00004000 /* Rx Good                         */
+#define Rx_RxPar               0x00002000 /* Rx Parity Error                 */
+                            /* 0x00001000    not use                         */
+#define Rx_LongErr             0x00000800 /* Rx Long Error                   */
+#define Rx_Over                0x00000400 /* Rx Overflow                     */
+#define Rx_CRCErr              0x00000200 /* Rx CRC Error                    */
+#define Rx_Align               0x00000100 /* Rx Alignment Error              */
+#define Rx_10Stat              0x00000080 /* Rx 10Mbps Status                */
+#define Rx_IntRx               0x00000040 /* Rx Interrupt                    */
+#define Rx_CtlRecd             0x00000020 /* Rx Control Receive              */
+
+#define Rx_Stat_Mask           0x0000EFC0 /* Rx All Status Mask              */
 
 /* Int_En bit asign -------------------------------------------------------- */
-#define Int_NRAbtEn            0x00000800 /* 1:Non-recoverable Abort Enable  */
-#define Int_TxCtlCmpEn         0x00000400 /* 1:Transmit Control Complete Enable */
-#define Int_DmParErrEn         0x00000200 /* 1:DMA Parity Error Enable       */
-#define Int_DParDEn            0x00000100 /* 1:Data Parity Error Enable      */
-#define Int_EarNotEn           0x00000080 /* 1:Early Notify Enable           */
-#define Int_DParErrEn          0x00000040 /* 1:Detected Parity Error Enable  */
-#define Int_SSysErrEn          0x00000020 /* 1:Signalled System Error Enable */
-#define Int_RMasAbtEn          0x00000010 /* 1:Received Master Abort Enable  */
-#define Int_RTargAbtEn         0x00000008 /* 1:Received Target Abort Enable  */
-#define Int_STargAbtEn         0x00000004 /* 1:Signalled Target Abort Enable */
-#define Int_BLExEn             0x00000002 /* 1:Buffer List Exhausted Enable  */
-#define Int_FDAExEn            0x00000001 /* 1:Free Descriptor Area          */
-                                          /*               Exhausted Enable  */
+#define Int_NRAbtEn            0x00000800 /* 1:Non-recoverable Abort Enable  */
+#define Int_TxCtlCmpEn         0x00000400 /* 1:Transmit Ctl Complete Enable  */
+#define Int_DmParErrEn         0x00000200 /* 1:DMA Parity Error Enable       */
+#define Int_DParDEn            0x00000100 /* 1:Data Parity Error Enable      */
+#define Int_EarNotEn           0x00000080 /* 1:Early Notify Enable           */
+#define Int_DParErrEn          0x00000040 /* 1:Detected Parity Error Enable  */
+#define Int_SSysErrEn          0x00000020 /* 1:Signalled System Error Enable */
+#define Int_RMasAbtEn          0x00000010 /* 1:Received Master Abort Enable  */
+#define Int_RTargAbtEn         0x00000008 /* 1:Received Target Abort Enable  */
+#define Int_STargAbtEn         0x00000004 /* 1:Signalled Target Abort Enable */
+#define Int_BLExEn             0x00000002 /* 1:Buffer List Exhausted Enable  */
+#define Int_FDAExEn            0x00000001 /* 1:Free Descriptor Area          */
+                                          /*               Exhausted Enable  */
 
 /* Int_Src bit asign ------------------------------------------------------- */
-#define Int_NRabt              0x00004000 /* 1:Non Recoverable error         */
-#define Int_DmParErrStat       0x00002000 /* 1:DMA Parity Error & Clear      */
-#define Int_BLEx               0x00001000 /* 1:Buffer List Empty & Clear     */
-#define Int_FDAEx              0x00000800 /* 1:FDA Empty & Clear             */
-#define Int_IntNRAbt           0x00000400 /* 1:Non Recoverable Abort         */
-#define Int_IntCmp             0x00000200 /* 1:MAC control packet complete   */
-#define Int_IntExBD            0x00000100 /* 1:Interrupt Extra BD & Clear    */
-#define Int_DmParErr           0x00000080 /* 1:DMA Parity Error & Clear      */
-#define Int_IntEarNot          0x00000040 /* 1:Receive Data write & Clear    */
-#define Int_SWInt              0x00000020 /* 1:Software request & Clear      */
-#define Int_IntBLEx            0x00000010 /* 1:Buffer List Empty & Clear     */
-#define Int_IntFDAEx           0x00000008 /* 1:FDA Empty & Clear             */
-#define Int_IntPCI             0x00000004 /* 1:PCI controller & Clear        */
-#define Int_IntMacRx           0x00000002 /* 1:Rx controller & Clear         */
-#define Int_IntMacTx           0x00000001 /* 1:Tx controller & Clear         */
+#define Int_NRabt              0x00004000 /* 1:Non Recoverable error         */
+#define Int_DmParErrStat       0x00002000 /* 1:DMA Parity Error & Clear      */
+#define Int_BLEx               0x00001000 /* 1:Buffer List Empty & Clear     */
+#define Int_FDAEx              0x00000800 /* 1:FDA Empty & Clear             */
+#define Int_IntNRAbt           0x00000400 /* 1:Non Recoverable Abort         */
+#define Int_IntCmp             0x00000200 /* 1:MAC control packet complete   */
+#define Int_IntExBD            0x00000100 /* 1:Interrupt Extra BD & Clear    */
+#define Int_DmParErr           0x00000080 /* 1:DMA Parity Error & Clear      */
+#define Int_IntEarNot          0x00000040 /* 1:Receive Data write & Clear    */
+#define Int_SWInt              0x00000020 /* 1:Software request & Clear      */
+#define Int_IntBLEx            0x00000010 /* 1:Buffer List Empty & Clear     */
+#define Int_IntFDAEx           0x00000008 /* 1:FDA Empty & Clear             */
+#define Int_IntPCI             0x00000004 /* 1:PCI controller & Clear        */
+#define Int_IntMacRx           0x00000002 /* 1:Rx controller & Clear         */
+#define Int_IntMacTx           0x00000001 /* 1:Tx controller & Clear         */
 
 /* MD_CA bit asign --------------------------------------------------------- */
-#define MD_CA_PreSup           0x00001000 /* 1:Preamble Supress              */
-#define MD_CA_Busy             0x00000800 /* 1:Busy (Start Operation)        */
-#define MD_CA_Wr               0x00000400 /* 1:Write 0:Read                  */
+#define MD_CA_PreSup           0x00001000 /* 1:Preamble Supress              */
+#define MD_CA_Busy             0x00000800 /* 1:Busy (Start Operation)        */
+#define MD_CA_Wr               0x00000400 /* 1:Write 0:Read                  */
 
 
 /*
@@ -307,24 +306,24 @@ struct BDesc {
 #define FD_ALIGN        16
 
 /* Frame Descripter bit asign ---------------------------------------------- */
-#define FD_FDLength_MASK       0x0000FFFF /* Length MASK                     */
-#define FD_BDCnt_MASK          0x001F0000 /* BD count MASK in FD             */
-#define FD_FrmOpt_MASK         0x7C000000 /* Frame option MASK               */
+#define FD_FDLength_MASK       0x0000FFFF /* Length MASK                     */
+#define FD_BDCnt_MASK          0x001F0000 /* BD count MASK in FD             */
+#define FD_FrmOpt_MASK         0x7C000000 /* Frame option MASK               */
 #define FD_FrmOpt_BigEndian    0x40000000 /* Tx/Rx */
-#define FD_FrmOpt_IntTx        0x20000000 /* Tx only */
-#define FD_FrmOpt_NoCRC        0x10000000 /* Tx only */
+#define FD_FrmOpt_IntTx        0x20000000 /* Tx only */
+#define FD_FrmOpt_NoCRC        0x10000000 /* Tx only */
 #define FD_FrmOpt_NoPadding    0x08000000 /* Tx only */
 #define FD_FrmOpt_Packing      0x04000000 /* Rx only */
-#define FD_CownsFD             0x80000000 /* FD Controller owner bit         */
-#define FD_Next_EOL            0x00000001 /* FD EOL indicator                */
-#define FD_BDCnt_SHIFT         16
+#define FD_CownsFD             0x80000000 /* FD Controller owner bit         */
+#define FD_Next_EOL            0x00000001 /* FD EOL indicator                */
+#define FD_BDCnt_SHIFT         16
 
 /* Buffer Descripter bit asign --------------------------------------------- */
-#define BD_BuffLength_MASK     0x0000FFFF /* Recieve Data Size               */
-#define BD_RxBDID_MASK         0x00FF0000 /* BD ID Number MASK               */
-#define BD_RxBDSeqN_MASK       0x7F000000 /* Rx BD Sequence Number           */
-#define BD_CownsBD             0x80000000 /* BD Controller owner bit         */
-#define BD_RxBDID_SHIFT        16
+#define BD_BuffLength_MASK     0x0000FFFF /* Recieve Data Size               */
+#define BD_RxBDID_MASK         0x00FF0000 /* BD ID Number MASK               */
+#define BD_RxBDSeqN_MASK       0x7F000000 /* Rx BD Sequence Number           */
+#define BD_CownsBD             0x80000000 /* BD Controller owner bit         */
+#define BD_RxBDID_SHIFT        16
 #define BD_RxBDSeqN_SHIFT      24
 
 
@@ -348,13 +347,15 @@ struct BDesc {
         Int_STargAbtEn | \
         Int_BLExEn  | Int_FDAExEn) /* maybe 0xb7f*/
 #define DMA_CTL_CMD     DMA_BURST_SIZE
-#define HAVE_DMA_RXALIGN(lp)    likely((lp)->boardtype != TC35815CF)
+#define HAVE_DMA_RXALIGN(lp)    likely((lp)->chiptype != TC35815CF)
 
 /* Tuning parameters */
 #define DMA_BURST_SIZE  32
 #define TX_THRESHOLD    1024
-#define TX_THRESHOLD_MAX 1536       /* used threshold with packet max byte for low pci transfer ability.*/
-#define TX_THRESHOLD_KEEP_LIMIT 10  /* setting threshold max value when overrun error occured this count. */
+/* used threshold with packet max byte for low pci transfer ability.*/
+#define TX_THRESHOLD_MAX 1536
+/* setting threshold max value when overrun error occured this count. */
+#define TX_THRESHOLD_KEEP_LIMIT 10
 
 /* 16 + RX_BUF_NUM * 8 + RX_FD_NUM * 16 + TX_FD_NUM * 32 <= PAGE_SIZE*FD_PAGE_NUM */
 #ifdef TC35815_USE_PACKEDBUFFER
@@ -396,21 +397,12 @@ struct FrFD {
 };
 
 
-#define tc_readl(addr)  readl(addr)
-#define tc_writel(d, addr)      writel(d, addr)
+#define tc_readl(addr)  ioread32(addr)
+#define tc_writel(d, addr)      iowrite32(d, addr)
 
 #define TC35815_TX_TIMEOUT  msecs_to_jiffies(400)
 
-/* Timer state engine. */
-enum tc35815_timer_state {
-        arbwait  = 0,   /* Waiting for auto negotiation to complete.          */
-        lupwait  = 1,   /* Auto-neg complete, awaiting link-up status.        */
-        ltrywait = 2,   /* Forcing try of all modes, from fastest to slowest. */
-        asleep   = 3,   /* Time inactive.                                     */
-        lcheck   = 4,   /* Check link status.                                 */
-};
-
-/* Information that need to be kept for each board. */
+/* Information that need to be kept for each controller. */
 struct tc35815_local {
         struct pci_dev *pci_dev;
 
@@ -418,12 +410,11 @@ struct tc35815_local {
         struct napi_struct napi;
 
         /* statistics */
-        struct net_device_stats stats;
         struct {
                 int max_tx_qlen;
                 int tx_ints;
                 int rx_ints;
-                int tx_underrun;
+                int tx_underrun;
         } lstats;
 
         /* Tx control lock.  This protects the transmit buffer ring
@@ -433,12 +424,12 @@ struct tc35815_local {
          */
         spinlock_t lock;
 
-        int phy_addr;
-        int fullduplex;
-        unsigned short saved_lpa;
-        struct timer_list timer;
-        enum tc35815_timer_state timer_state; /* State of auto-neg timer. */
-        unsigned int timer_ticks;       /* Number of clicks at each state  */
+        struct mii_bus mii_bus;
+        struct phy_device *phy_dev;
+        int duplex;
+        int speed;
+        int link;
+        struct work_struct restart_work;
 
         /*
          * Transmitting: Batch Mode.
@@ -452,7 +443,7 @@ struct tc35815_local {
          *      RX_BUF_NUM BD in Free Buffer FD.
          *      One Free Buffer BD has ETH_FRAME_LEN data buffer.
          */
-        void * fd_buf;  /* for TxFD, RxFD, FrFD */
+        void *fd_buf;   /* for TxFD, RxFD, FrFD */
         dma_addr_t fd_buf_dma;
         struct TxFD *tfd_base;
         unsigned int tfd_start;
@@ -463,7 +454,7 @@ struct tc35815_local {
         struct FrFD *fbl_ptr;
 #ifdef TC35815_USE_PACKEDBUFFER
         unsigned char fbl_curid;
-        void * data_buf[RX_BUF_NUM];            /* packing */
+        void *data_buf[RX_BUF_NUM];             /* packing */
         dma_addr_t data_buf_dma[RX_BUF_NUM];
         struct {
                 struct sk_buff *skb;
@@ -476,10 +467,8 @@ struct tc35815_local {
                 dma_addr_t skb_dma;
         } tx_skbs[TX_FD_NUM], rx_skbs[RX_BUF_NUM];
 #endif
-        struct mii_if_info mii;
-        unsigned short mii_id[2];
         u32 msg_enable;
-        board_t boardtype;
+        enum tc35815_chiptype chiptype;
 };
 
 static inline dma_addr_t fd_virt_to_bus(struct tc35815_local *lp, void *virt)
@@ -506,13 +495,14 @@ static inline void *rxbuf_bus_to_virt(struct tc35815_local *lp, dma_addr_t bus)
 }
 
 #define TC35815_DMA_SYNC_ONDEMAND
-static void* alloc_rxbuf_page(struct pci_dev *hwdev, dma_addr_t *dma_handle)
+static void *alloc_rxbuf_page(struct pci_dev *hwdev, dma_addr_t *dma_handle)
 {
 #ifdef TC35815_DMA_SYNC_ONDEMAND
         void *buf;
         /* pci_map + pci_dma_sync will be more effective than
          * pci_alloc_consistent on some archs. */
-        if ((buf = (void *)__get_free_page(GFP_ATOMIC)) == NULL)
+        buf = (void *)__get_free_page(GFP_ATOMIC);
+        if (!buf)
                 return NULL;
         *dma_handle = pci_map_single(hwdev, buf, PAGE_SIZE,
                                      PCI_DMA_FROMDEVICE);
@@ -577,7 +567,7 @@ static void	tc35815_txdone(struct net_device *dev);
 static int      tc35815_close(struct net_device *dev);
 static struct   net_device_stats *tc35815_get_stats(struct net_device *dev);
 static void     tc35815_set_multicast_list(struct net_device *dev);
-static void     tc35815_tx_timeout(struct net_device *dev);
+static void     tc35815_tx_timeout(struct net_device *dev);
 static int      tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void     tc35815_poll_controller(struct net_device *dev);
@@ -585,21 +575,225 @@ static void	tc35815_poll_controller(struct net_device *dev);
 static const struct ethtool_ops tc35815_ethtool_ops;
 
 /* Example routines you must write ;->. */
-static void     tc35815_chip_reset(struct net_device *dev);
-static void     tc35815_chip_init(struct net_device *dev);
-static void     tc35815_find_phy(struct net_device *dev);
-static void     tc35815_phy_chip_init(struct net_device *dev);
+static void     tc35815_chip_reset(struct net_device *dev);
+static void     tc35815_chip_init(struct net_device *dev);
 
 #ifdef DEBUG
 static void     panic_queues(struct net_device *dev);
 #endif
 
-static void tc35815_timer(unsigned long data);
-static void tc35815_start_auto_negotiation(struct net_device *dev,
-                                           struct ethtool_cmd *ep);
-static int tc_mdio_read(struct net_device *dev, int phy_id, int location);
-static void tc_mdio_write(struct net_device *dev, int phy_id, int location,
-                          int val);
+static void tc35815_restart_work(struct work_struct *work);
+
+static int tc_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
+{
+        struct net_device *dev = bus->priv;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        unsigned long timeout = jiffies + 10;
+
+        tc_writel(MD_CA_Busy | (mii_id << 5) | (regnum & 0x1f), &tr->MD_CA);
+        while (tc_readl(&tr->MD_CA) & MD_CA_Busy) {
+                if (time_after(jiffies, timeout))
+                        return -EIO;
+                cpu_relax();
+        }
+        return tc_readl(&tr->MD_Data) & 0xffff;
+}
+
+static int tc_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 val)
+{
+        struct net_device *dev = bus->priv;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        unsigned long timeout = jiffies + 10;
+
+        tc_writel(val, &tr->MD_Data);
+        tc_writel(MD_CA_Busy | MD_CA_Wr | (mii_id << 5) | (regnum & 0x1f),
+                  &tr->MD_CA);
+        while (tc_readl(&tr->MD_CA) & MD_CA_Busy) {
+                if (time_after(jiffies, timeout))
+                        return -EIO;
+                cpu_relax();
+        }
+        return 0;
+}
+
+static void tc_handle_link_change(struct net_device *dev)
+{
+        struct tc35815_local *lp = netdev_priv(dev);
+        struct phy_device *phydev = lp->phy_dev;
+        unsigned long flags;
+        int status_change = 0;
+
+        spin_lock_irqsave(&lp->lock, flags);
+        if (phydev->link &&
+            (lp->speed != phydev->speed || lp->duplex != phydev->duplex)) {
+                struct tc35815_regs __iomem *tr =
+                        (struct tc35815_regs __iomem *)dev->base_addr;
+                u32 reg;
+
+                reg = tc_readl(&tr->MAC_Ctl);
+                reg |= MAC_HaltReq;
+                tc_writel(reg, &tr->MAC_Ctl);
+                if (phydev->duplex == DUPLEX_FULL)
+                        reg |= MAC_FullDup;
+                else
+                        reg &= ~MAC_FullDup;
+                tc_writel(reg, &tr->MAC_Ctl);
+                reg &= ~MAC_HaltReq;
+                tc_writel(reg, &tr->MAC_Ctl);
+
+                /*
+                 * TX4939 PCFG.SPEEDn bit will be changed on
+                 * NETDEV_CHANGE event.
+                 */
+
+#if !defined(NO_CHECK_CARRIER) && defined(WORKAROUND_LOSTCAR)
+                /*
+                 * WORKAROUND: enable LostCrS only if half duplex
+                 * operation.
+                 * (TX4939 does not have EnLCarr)
+                 */
+                if (phydev->duplex == DUPLEX_HALF &&
+                    lp->chiptype != TC35815_TX4939)
+                        tc_writel(tc_readl(&tr->Tx_Ctl) | Tx_EnLCarr,
+                                  &tr->Tx_Ctl);
+#endif
+
+                lp->speed = phydev->speed;
+                lp->duplex = phydev->duplex;
+                status_change = 1;
+        }
+
+        if (phydev->link != lp->link) {
+                if (phydev->link) {
+#ifdef WORKAROUND_100HALF_PROMISC
+                        /* delayed promiscuous enabling */
+                        if (dev->flags & IFF_PROMISC)
+                                tc35815_set_multicast_list(dev);
+#endif
+                        netif_schedule(dev);
+                } else {
+                        lp->speed = 0;
+                        lp->duplex = -1;
+                }
+                lp->link = phydev->link;
+
+                status_change = 1;
+        }
+        spin_unlock_irqrestore(&lp->lock, flags);
+
+        if (status_change && netif_msg_link(lp)) {
+                phy_print_status(phydev);
+#ifdef DEBUG
+                printk(KERN_DEBUG
+                       "%s: MII BMCR %04x BMSR %04x LPA %04x\n",
+                       dev->name,
+                       phy_read(phydev, MII_BMCR),
+                       phy_read(phydev, MII_BMSR),
+                       phy_read(phydev, MII_LPA));
+#endif
+        }
+}
+
+static int tc_mii_probe(struct net_device *dev)
+{
+        struct tc35815_local *lp = netdev_priv(dev);
+        struct phy_device *phydev = NULL;
+        int phy_addr;
+        u32 dropmask;
+
+        /* find the first phy */
+        for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
+                if (lp->mii_bus.phy_map[phy_addr]) {
+                        if (phydev) {
+                                printk(KERN_ERR "%s: multiple PHYs found\n",
+                                       dev->name);
+                                return -EINVAL;
+                        }
+                        phydev = lp->mii_bus.phy_map[phy_addr];
+                        break;
+                }
+        }
+
+        if (!phydev) {
+                printk(KERN_ERR "%s: no PHY found\n", dev->name);
+                return -ENODEV;
+        }
+
+        /* attach the mac to the phy */
+        phydev = phy_connect(dev, phydev->dev.bus_id,
+                             &tc_handle_link_change, 0,
+                             lp->chiptype == TC35815_TX4939 ?
+                             PHY_INTERFACE_MODE_RMII : PHY_INTERFACE_MODE_MII);
+        if (IS_ERR(phydev)) {
+                printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
+                return PTR_ERR(phydev);
+        }
+        printk(KERN_INFO "%s: attached PHY driver [%s] "
+                "(mii_bus:phy_addr=%s, id=%x)\n",
+                dev->name, phydev->drv->name, phydev->dev.bus_id,
+                phydev->phy_id);
+
+        /* mask with MAC supported features */
+        phydev->supported &= PHY_BASIC_FEATURES;
+        dropmask = 0;
+        if (options.speed == 10)
+                dropmask |= SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full;
+        else if (options.speed == 100)
+                dropmask |= SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full;
+        if (options.duplex == 1)
+                dropmask |= SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Full;
+        else if (options.duplex == 2)
+                dropmask |= SUPPORTED_10baseT_Half | SUPPORTED_100baseT_Half;
+        phydev->supported &= ~dropmask;
+        phydev->advertising = phydev->supported;
+
+        lp->link = 0;
+        lp->speed = 0;
+        lp->duplex = -1;
+        lp->phy_dev = phydev;
+
+        return 0;
+}
+
+static int tc_mii_init(struct net_device *dev)
+{
+        struct tc35815_local *lp = netdev_priv(dev);
+        int err;
+        int i;
+
+        lp->mii_bus.name = "tc35815_mii_bus";
+        lp->mii_bus.read = tc_mdio_read;
+        lp->mii_bus.write = tc_mdio_write;
+        snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "%x",
+                 (lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn);
+        lp->mii_bus.priv = dev;
+        lp->mii_bus.dev = &lp->pci_dev->dev;
+        lp->mii_bus.irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
+        if (!lp->mii_bus.irq) {
+                err = -ENOMEM;
+                goto err_out;
+        }
+
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                lp->mii_bus.irq[i] = PHY_POLL;
+
+        err = mdiobus_register(&lp->mii_bus);
+        if (err)
+                goto err_out_free_mdio_irq;
+        err = tc_mii_probe(dev);
+        if (err)
+                goto err_out_unregister_bus;
+        return 0;
+
+err_out_unregister_bus:
+        mdiobus_unregister(&lp->mii_bus);
+err_out_free_mdio_irq:
+        kfree(lp->mii_bus.irq);
+err_out:
+        return err;
+}
 
 #ifdef CONFIG_CPU_TX49XX
 /*
@@ -617,7 +811,7 @@ static int __devinit tc35815_mac_match(struct device *dev, void *data)
 
 static int __devinit tc35815_read_plat_dev_addr(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         struct device *pd = bus_find_device(&platform_bus_type, NULL,
                                             lp->pci_dev, tc35815_mac_match);
         if (pd) {
@@ -635,7 +829,7 @@ static int __devinit tc35815_read_plat_dev_addr(struct net_device *dev)
 }
 #endif
 
-static int __devinit tc35815_init_dev_addr (struct net_device *dev)
+static int __devinit tc35815_init_dev_addr(struct net_device *dev)
 {
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
@@ -657,21 +851,21 @@ static int __devinit tc35815_init_dev_addr (struct net_device *dev)
         return 0;
 }
 
-static int __devinit tc35815_init_one (struct pci_dev *pdev,
-                                       const struct pci_device_id *ent)
+static int __devinit tc35815_init_one(struct pci_dev *pdev,
+                                      const struct pci_device_id *ent)
 {
         void __iomem *ioaddr = NULL;
         struct net_device *dev;
         struct tc35815_local *lp;
         int rc;
-        unsigned long mmio_start, mmio_end, mmio_flags, mmio_len;
+        DECLARE_MAC_BUF(mac);
 
         static int printed_version;
         if (!printed_version++) {
                 printk(version);
                 dev_printk(KERN_DEBUG, &pdev->dev,
-                           "speed:%d duplex:%d doforce:%d\n",
-                           options.speed, options.duplex, options.doforce);
+                           "speed:%d duplex:%d\n",
+                           options.speed, options.duplex);
         }
 
         if (!pdev->irq) {
@@ -680,55 +874,24 @@ static int __devinit tc35815_init_one (struct pci_dev *pdev,
         }
 
         /* dev zeroed in alloc_etherdev */
-        dev = alloc_etherdev (sizeof (*lp));
+        dev = alloc_etherdev(sizeof(*lp));
         if (dev == NULL) {
                 dev_err(&pdev->dev, "unable to alloc new ethernet\n");
                 return -ENOMEM;
         }
         SET_NETDEV_DEV(dev, &pdev->dev);
-        lp = dev->priv;
+        lp = netdev_priv(dev);
         lp->dev = dev;
 
         /* enable device (incl. PCI PM wakeup), and bus-mastering */
-        rc = pci_enable_device (pdev);
+        rc = pcim_enable_device(pdev);
         if (rc)
                 goto err_out;
-
-        mmio_start = pci_resource_start (pdev, 1);
-        mmio_end = pci_resource_end (pdev, 1);
-        mmio_flags = pci_resource_flags (pdev, 1);
-        mmio_len = pci_resource_len (pdev, 1);
-
-        /* set this immediately, we need to know before
-         * we talk to the chip directly */
-
-        /* make sure PCI base addr 1 is MMIO */
-        if (!(mmio_flags & IORESOURCE_MEM)) {
-                dev_err(&pdev->dev, "region #1 not an MMIO resource, aborting\n");
-                rc = -ENODEV;
-                goto err_out;
-        }
-
-        /* check for weird/broken PCI region reporting */
-        if ((mmio_len < sizeof(struct tc35815_regs))) {
-                dev_err(&pdev->dev, "Invalid PCI region size(s), aborting\n");
-                rc = -ENODEV;
-                goto err_out;
-        }
-
-        rc = pci_request_regions (pdev, MODNAME);
+        rc = pcim_iomap_regions(pdev, 1 << 1, MODNAME);
         if (rc)
                 goto err_out;
-
-        pci_set_master (pdev);
-
-        /* ioremap MMIO region */
-        ioaddr = ioremap (mmio_start, mmio_len);
-        if (ioaddr == NULL) {
-                dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
-                rc = -EIO;
-                goto err_out_free_res;
-        }
+        pci_set_master(pdev);
+        ioaddr = pcim_iomap_table(pdev)[1];
 
         /* Initialize the device structure. */
         dev->open = tc35815_open;
@@ -748,11 +911,12 @@ static int __devinit tc35815_init_one (struct pci_dev *pdev,
 #endif
 
         dev->irq = pdev->irq;
-        dev->base_addr = (unsigned long) ioaddr;
+        dev->base_addr = (unsigned long)ioaddr;
 
+        INIT_WORK(&lp->restart_work, tc35815_restart_work);
         spin_lock_init(&lp->lock);
         lp->pci_dev = pdev;
-        lp->boardtype = ent->driver_data;
+        lp->chiptype = ent->driver_data;
 
         lp->msg_enable = NETIF_MSG_TX_ERR | NETIF_MSG_HW | NETIF_MSG_DRV | NETIF_MSG_LINK;
         pci_set_drvdata(pdev, dev);
@@ -766,68 +930,49 @@ static int __devinit tc35815_init_one (struct pci_dev *pdev,
                 random_ether_addr(dev->dev_addr);
         }
 
-        rc = register_netdev (dev);
+        rc = register_netdev(dev);
         if (rc)
-                goto err_out_unmap;
+                goto err_out;
 
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-        printk(KERN_INFO "%s: %s at 0x%lx, "
-                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
-                "IRQ %d\n",
+        printk(KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n",
                 dev->name,
-                board_info[ent->driver_data].name,
+                chip_info[ent->driver_data].name,
                 dev->base_addr,
-                dev->dev_addr[0], dev->dev_addr[1],
-                dev->dev_addr[2], dev->dev_addr[3],
-                dev->dev_addr[4], dev->dev_addr[5],
+                print_mac(mac, dev->dev_addr),
                 dev->irq);
 
-        setup_timer(&lp->timer, tc35815_timer, (unsigned long) dev);
-        lp->mii.dev = dev;
-        lp->mii.mdio_read = tc_mdio_read;
-        lp->mii.mdio_write = tc_mdio_write;
-        lp->mii.phy_id_mask = 0x1f;
-        lp->mii.reg_num_mask = 0x1f;
-        tc35815_find_phy(dev);
-        lp->mii.phy_id = lp->phy_addr;
-        lp->mii.full_duplex = 0;
-        lp->mii.force_media = 0;
+        rc = tc_mii_init(dev);
+        if (rc)
+                goto err_out_unregister;
 
         return 0;
 
-err_out_unmap:
-        iounmap(ioaddr);
-err_out_free_res:
-        pci_release_regions (pdev);
+err_out_unregister:
+        unregister_netdev(dev);
 err_out:
-        free_netdev (dev);
+        free_netdev(dev);
         return rc;
 }
 
 
-static void __devexit tc35815_remove_one (struct pci_dev *pdev)
+static void __devexit tc35815_remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata (pdev);
-        unsigned long mmio_addr;
-
-        mmio_addr = dev->base_addr;
-
-        unregister_netdev (dev);
-
-        if (mmio_addr) {
-                iounmap ((void __iomem *)mmio_addr);
-                pci_release_regions (pdev);
-        }
-
-        free_netdev (dev);
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct tc35815_local *lp = netdev_priv(dev);
 
-        pci_set_drvdata (pdev, NULL);
+        phy_disconnect(lp->phy_dev);
+        mdiobus_unregister(&lp->mii_bus);
+        kfree(lp->mii_bus.irq);
+        unregister_netdev(dev);
+        free_netdev(dev);
+        pci_set_drvdata(pdev, NULL);
 }
 
 static int
 tc35815_init_queues(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         int i;
         unsigned long fd_addr;
 
@@ -838,11 +983,17 @@ tc35815_init_queues(struct net_device *dev)
                        sizeof(struct TxFD) * TX_FD_NUM >
                        PAGE_SIZE * FD_PAGE_NUM);
 
-                if ((lp->fd_buf = pci_alloc_consistent(lp->pci_dev, PAGE_SIZE * FD_PAGE_NUM, &lp->fd_buf_dma)) == 0)
+                lp->fd_buf = pci_alloc_consistent(lp->pci_dev,
+                                                  PAGE_SIZE * FD_PAGE_NUM,
+                                                  &lp->fd_buf_dma);
+                if (!lp->fd_buf)
                         return -ENOMEM;
                 for (i = 0; i < RX_BUF_NUM; i++) {
 #ifdef TC35815_USE_PACKEDBUFFER
-                        if ((lp->data_buf[i] = alloc_rxbuf_page(lp->pci_dev, &lp->data_buf_dma[i])) == NULL) {
+                        lp->data_buf[i] =
+                                alloc_rxbuf_page(lp->pci_dev,
+                                                 &lp->data_buf_dma[i]);
+                        if (!lp->data_buf[i]) {
                                 while (--i >= 0) {
                                         free_rxbuf_page(lp->pci_dev,
                                                         lp->data_buf[i],
@@ -885,18 +1036,17 @@ tc35815_init_queues(struct net_device *dev)
 #endif
                 printk("\n");
         } else {
-                for (i = 0; i < FD_PAGE_NUM; i++) {
-                        clear_page((void *)((unsigned long)lp->fd_buf + i * PAGE_SIZE));
-                }
+                for (i = 0; i < FD_PAGE_NUM; i++)
+                        clear_page((void *)((unsigned long)lp->fd_buf +
+                                            i * PAGE_SIZE));
         }
         fd_addr = (unsigned long)lp->fd_buf;
 
         /* Free Descriptors (for Receive) */
         lp->rfd_base = (struct RxFD *)fd_addr;
         fd_addr += sizeof(struct RxFD) * RX_FD_NUM;
-        for (i = 0; i < RX_FD_NUM; i++) {
+        for (i = 0; i < RX_FD_NUM; i++)
                 lp->rfd_base[i].fd.FDCtl = cpu_to_le32(FD_CownsFD);
-        }
         lp->rfd_cur = lp->rfd_base;
         lp->rfd_limit = (struct RxFD *)fd_addr - (RX_FD_RESERVE + 1);
 
@@ -964,7 +1114,7 @@ tc35815_init_queues(struct net_device *dev)
 static void
 tc35815_clear_queues(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         int i;
 
         for (i = 0; i < TX_FD_NUM; i++) {
@@ -995,7 +1145,7 @@ tc35815_clear_queues(struct net_device *dev)
 static void
 tc35815_free_queues(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         int i;
 
         if (lp->tfd_base) {
@@ -1076,7 +1226,7 @@ dump_rxfd(struct RxFD *fd)
                le32_to_cpu(fd->fd.FDStat),
                le32_to_cpu(fd->fd.FDCtl));
         if (le32_to_cpu(fd->fd.FDCtl) & FD_CownsFD)
-            return 0;
+                return 0;
         printk("BD: ");
         for (i = 0; i < bd_count; i++)
                 printk(" %08x %08x",
@@ -1109,7 +1259,7 @@ dump_frfd(struct FrFD *fd)
 static void
 panic_queues(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         int i;
 
         printk("TxFD base %p, start %u, end %u\n",
@@ -1128,42 +1278,33 @@ panic_queues(struct net_device *dev)
 }
 #endif
 
-static void print_eth(char *add)
+static void print_eth(const u8 *add)
 {
-        int i;
+        DECLARE_MAC_BUF(mac);
 
-        printk("print_eth(%p)\n", add);
-        for (i = 0; i < 6; i++)
-                printk(" %2.2X", (unsigned char) add[i + 6]);
-        printk(" =>");
-        for (i = 0; i < 6; i++)
-                printk(" %2.2X", (unsigned char) add[i]);
-        printk(" : %2.2X%2.2X\n", (unsigned char) add[12], (unsigned char) add[13]);
+        printk(KERN_DEBUG "print_eth(%p)\n", add);
+        printk(KERN_DEBUG " %s =>", print_mac(mac, add + 6));
+        printk(KERN_CONT " %s : %02x%02x\n",
+                print_mac(mac, add), add[12], add[13]);
 }
 
 static int tc35815_tx_full(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         return ((lp->tfd_start + 1) % TX_FD_NUM == lp->tfd_end);
 }
 
 static void tc35815_restart(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        int do_phy_reset = 1;
-        del_timer(&lp->timer);          /* Kill if running      */
-
-        if (lp->mii_id[0] == 0x0016 && (lp->mii_id[1] & 0xfc00) == 0xf800) {
-                /* Resetting PHY cause problem on some chip... (SEEQ 80221) */
-                do_phy_reset = 0;
-        }
-        if (do_phy_reset) {
+        struct tc35815_local *lp = netdev_priv(dev);
+
+        if (lp->phy_dev) {
                 int timeout;
-                tc_mdio_write(dev, pid, MII_BMCR, BMCR_RESET);
+
+                phy_write(lp->phy_dev, MII_BMCR, BMCR_RESET);
                 timeout = 100;
                 while (--timeout) {
-                        if (!(tc_mdio_read(dev, pid, MII_BMCR) & BMCR_RESET))
+                        if (!(phy_read(lp->phy_dev, MII_BMCR) & BMCR_RESET))
                                 break;
                         udelay(1);
                 }
@@ -1171,16 +1312,40 @@ static void tc35815_restart(struct net_device *dev)
                         printk(KERN_ERR "%s: BMCR reset failed.\n", dev->name);
         }
 
+        spin_lock_irq(&lp->lock);
         tc35815_chip_reset(dev);
         tc35815_clear_queues(dev);
         tc35815_chip_init(dev);
         /* Reconfigure CAM again since tc35815_chip_init() initialize it. */
         tc35815_set_multicast_list(dev);
+        spin_unlock_irq(&lp->lock);
+
+        netif_wake_queue(dev);
+}
+
+static void tc35815_restart_work(struct work_struct *work)
+{
+        struct tc35815_local *lp =
+                container_of(work, struct tc35815_local, restart_work);
+        struct net_device *dev = lp->dev;
+
+        tc35815_restart(dev);
+}
+
+static void tc35815_schedule_restart(struct net_device *dev)
+{
+        struct tc35815_local *lp = netdev_priv(dev);
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+
+        /* disable interrupts */
+        tc_writel(0, &tr->Int_En);
+        tc_writel(tc_readl(&tr->DMA_Ctl) | DMA_IntMask, &tr->DMA_Ctl);
+        schedule_work(&lp->restart_work);
 }
 
 static void tc35815_tx_timeout(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
 
@@ -1188,28 +1353,12 @@ static void tc35815_tx_timeout(struct net_device *dev)
                dev->name, tc_readl(&tr->Tx_Stat));
 
         /* Try to restart the adaptor. */
-        spin_lock_irq(&lp->lock);
-        tc35815_restart(dev);
-        spin_unlock_irq(&lp->lock);
-
-        lp->stats.tx_errors++;
-
-        /* If we have space available to accept new transmit
-         * requests, wake up the queueing layer.  This would
-         * be the case if the chipset_init() call above just
-         * flushes out the tx queue and empties it.
-         *
-         * If instead, the tx queue is retained then the
-         * netif_wake_queue() call should be placed in the
-         * TX completion interrupt handler of the driver instead
-         * of here.
-         */
-        if (!tc35815_tx_full(dev))
-                netif_wake_queue(dev);
+        tc35815_schedule_restart(dev);
+        dev->stats.tx_errors++;
 }
 
 /*
- * Open/initialize the board. This is called (in the current kernel)
+ * Open/initialize the controller. This is called (in the current kernel)
  * sometime after booting when the 'ifconfig' program is run.
  *
  * This routine should set everything up anew at each open, even
@@ -1219,17 +1368,16 @@ static void tc35815_tx_timeout(struct net_device *dev)
 static int
 tc35815_open(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
 
         /*
          * This is used if the interrupt line can turned off (shared).
          * See 3c503.c for an example of selecting the IRQ at config-time.
          */
-        if (request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED, dev->name, dev)) {
+        if (request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED,
+                        dev->name, dev))
                 return -EAGAIN;
-        }
 
-        del_timer(&lp->timer);          /* Kill if running      */
         tc35815_chip_reset(dev);
 
         if (tc35815_init_queues(dev) != 0) {
@@ -1246,6 +1394,9 @@ tc35815_open(struct net_device *dev)
         tc35815_chip_init(dev);
         spin_unlock_irq(&lp->lock);
 
+        /* schedule a link state check */
+        phy_start(lp->phy_dev);
+
         /* We are now ready to accept transmit requeusts from
          * the queueing layer of the networking.
          */
@@ -1261,7 +1412,7 @@ tc35815_open(struct net_device *dev)
  */
 static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         struct TxFD *txfd;
         unsigned long flags;
 
@@ -1366,7 +1517,7 @@ static void tc35815_fatal_error_interrupt(struct net_device *dev, u32 status)
                 panic("%s: Too many fatal errors.", dev->name);
         printk(KERN_WARNING "%s: Resetting ...\n", dev->name);
         /* Try to restart the adaptor. */
-        tc35815_restart(dev);
+        tc35815_schedule_restart(dev);
 }
 
 #ifdef TC35815_NAPI
@@ -1375,7 +1526,7 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status, int limit)
 static int tc35815_do_interrupt(struct net_device *dev, u32 status)
 #endif
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
         int ret = -1;
@@ -1392,7 +1543,7 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status)
                 printk(KERN_WARNING
                        "%s: Free Descriptor Area Exhausted (%#x).\n",
                        dev->name, status);
-                lp->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 ret = 0;
         }
         if (status & Int_IntBLEx) {
@@ -1401,14 +1552,14 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status)
                 printk(KERN_WARNING
                        "%s: Buffer List Exhausted (%#x).\n",
                        dev->name, status);
-                lp->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 ret = 0;
         }
         if (status & Int_IntExBD) {
                 printk(KERN_WARNING
                        "%s: Excessive Buffer Descriptiors (%#x).\n",
                        dev->name, status);
-                lp->stats.rx_length_errors++;
+                dev->stats.rx_length_errors++;
                 ret = 0;
         }
 
@@ -1492,7 +1643,7 @@ static void
 tc35815_rx(struct net_device *dev)
 #endif
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         unsigned int fdctl;
         int i;
         int buf_free_count = 0;
@@ -1532,7 +1683,7 @@ tc35815_rx(struct net_device *dev)
                         if (skb == NULL) {
                                 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n",
                                        dev->name);
-                                lp->stats.rx_dropped++;
+                                dev->stats.rx_dropped++;
                                 break;
                         }
                         skb_reserve(skb, 2);   /* 16 bit alignment */
@@ -1602,10 +1753,10 @@ tc35815_rx(struct net_device *dev)
                         netif_rx(skb);
 #endif
                         dev->last_rx = jiffies;
-                        lp->stats.rx_packets++;
-                        lp->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += pkt_len;
                 } else {
-                        lp->stats.rx_errors++;
+                        dev->stats.rx_errors++;
                         printk(KERN_DEBUG "%s: Rx error (status %x)\n",
                                dev->name, status & Rx_Stat_Mask);
                         /* WORKAROUND: LongErr and CRCErr means Overflow. */
@@ -1613,10 +1764,14 @@ tc35815_rx(struct net_device *dev)
                                 status &= ~(Rx_LongErr|Rx_CRCErr);
                                 status |= Rx_Over;
                         }
-                        if (status & Rx_LongErr) lp->stats.rx_length_errors++;
-                        if (status & Rx_Over) lp->stats.rx_fifo_errors++;
-                        if (status & Rx_CRCErr) lp->stats.rx_crc_errors++;
-                        if (status & Rx_Align) lp->stats.rx_frame_errors++;
+                        if (status & Rx_LongErr)
+                                dev->stats.rx_length_errors++;
+                        if (status & Rx_Over)
+                                dev->stats.rx_fifo_errors++;
+                        if (status & Rx_CRCErr)
+                                dev->stats.rx_crc_errors++;
+                        if (status & Rx_Align)
+                                dev->stats.rx_frame_errors++;
                 }
 
                 if (bd_count > 0) {
@@ -1772,40 +1927,39 @@ static int tc35815_poll(struct napi_struct *napi, int budget)
 static void
 tc35815_check_tx_stat(struct net_device *dev, int status)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         const char *msg = NULL;
 
         /* count collisions */
         if (status & Tx_ExColl)
-                lp->stats.collisions += 16;
+                dev->stats.collisions += 16;
         if (status & Tx_TxColl_MASK)
-                lp->stats.collisions += status & Tx_TxColl_MASK;
+                dev->stats.collisions += status & Tx_TxColl_MASK;
 
 #ifndef NO_CHECK_CARRIER
         /* TX4939 does not have NCarr */
-        if (lp->boardtype == TC35815_TX4939)
+        if (lp->chiptype == TC35815_TX4939)
                 status &= ~Tx_NCarr;
 #ifdef WORKAROUND_LOSTCAR
         /* WORKAROUND: ignore LostCrS in full duplex operation */
-        if ((lp->timer_state != asleep && lp->timer_state != lcheck)
-            || lp->fullduplex)
+        if (!lp->link || lp->duplex == DUPLEX_FULL)
                 status &= ~Tx_NCarr;
 #endif
 #endif
 
         if (!(status & TX_STA_ERR)) {
                 /* no error. */
-                lp->stats.tx_packets++;
+                dev->stats.tx_packets++;
                 return;
         }
 
-        lp->stats.tx_errors++;
+        dev->stats.tx_errors++;
         if (status & Tx_ExColl) {
-                lp->stats.tx_aborted_errors++;
+                dev->stats.tx_aborted_errors++;
                 msg = "Excessive Collision.";
         }
         if (status & Tx_Under) {
-                lp->stats.tx_fifo_errors++;
+                dev->stats.tx_fifo_errors++;
                 msg = "Tx FIFO Underrun.";
                 if (lp->lstats.tx_underrun < TX_THRESHOLD_KEEP_LIMIT) {
                         lp->lstats.tx_underrun++;
@@ -1818,25 +1972,25 @@ tc35815_check_tx_stat(struct net_device *dev, int status)
                 }
         }
         if (status & Tx_Defer) {
-                lp->stats.tx_fifo_errors++;
+                dev->stats.tx_fifo_errors++;
                 msg = "Excessive Deferral.";
         }
 #ifndef NO_CHECK_CARRIER
         if (status & Tx_NCarr) {
-                lp->stats.tx_carrier_errors++;
+                dev->stats.tx_carrier_errors++;
                 msg = "Lost Carrier Sense.";
         }
 #endif
         if (status & Tx_LateColl) {
-                lp->stats.tx_aborted_errors++;
+                dev->stats.tx_aborted_errors++;
                 msg = "Late Collision.";
         }
         if (status & Tx_TxPar) {
-                lp->stats.tx_fifo_errors++;
+                dev->stats.tx_fifo_errors++;
                 msg = "Transmit Parity Error.";
         }
         if (status & Tx_SQErr) {
-                lp->stats.tx_heartbeat_errors++;
+                dev->stats.tx_heartbeat_errors++;
                 msg = "Signal Quality Error.";
         }
         if (msg && netif_msg_tx_err(lp))
@@ -1849,7 +2003,7 @@ tc35815_check_tx_stat(struct net_device *dev, int status)
 static void
 tc35815_txdone(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         struct TxFD *txfd;
         unsigned int fdctl;
 
@@ -1878,7 +2032,7 @@ tc35815_txdone(struct net_device *dev)
                 BUG_ON(lp->tx_skbs[lp->tfd_end].skb != skb);
 #endif
                 if (skb) {
-                        lp->stats.tx_bytes += skb->len;
+                        dev->stats.tx_bytes += skb->len;
                         pci_unmap_single(lp->pci_dev, lp->tx_skbs[lp->tfd_end].skb_dma, skb->len, PCI_DMA_TODEVICE);
                         lp->tx_skbs[lp->tfd_end].skb = NULL;
                         lp->tx_skbs[lp->tfd_end].skb_dma = 0;
@@ -1904,7 +2058,7 @@ tc35815_txdone(struct net_device *dev)
                                 struct tc35815_regs __iomem *tr =
                                         (struct tc35815_regs __iomem *)dev->base_addr;
                                 int head = (lp->tfd_start + TX_FD_NUM - 1) % TX_FD_NUM;
-                                struct TxFD* txhead = &lp->tfd_base[head];
+                                struct TxFD *txhead = &lp->tfd_base[head];
                                 int qlen = (lp->tfd_start + TX_FD_NUM
                                             - lp->tfd_end) % TX_FD_NUM;
 
@@ -1939,7 +2093,7 @@ tc35815_txdone(struct net_device *dev)
          * condition, and space has now been made available,
          * wake up the queue.
          */
-        if (netif_queue_stopped(dev) && ! tc35815_tx_full(dev))
+        if (netif_queue_stopped(dev) && !tc35815_tx_full(dev))
                 netif_wake_queue(dev);
 }
 
@@ -1947,16 +2101,17 @@ tc35815_txdone(struct net_device *dev)
 static int
 tc35815_close(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
 
         netif_stop_queue(dev);
 #ifdef TC35815_NAPI
         napi_disable(&lp->napi);
 #endif
+        if (lp->phy_dev)
+                phy_stop(lp->phy_dev);
+        cancel_work_sync(&lp->restart_work);
 
         /* Flush the Tx and disable Rx here. */
-
-        del_timer(&lp->timer);          /* Kill if running      */
         tc35815_chip_reset(dev);
         free_irq(dev->irq, dev);
 
@@ -1972,34 +2127,30 @@ tc35815_close(struct net_device *dev)
  */
 static struct net_device_stats *tc35815_get_stats(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
-        if (netif_running(dev)) {
+        if (netif_running(dev))
                 /* Update the statistics from the device registers. */
-                lp->stats.rx_missed_errors = tc_readl(&tr->Miss_Cnt);
-        }
+                dev->stats.rx_missed_errors = tc_readl(&tr->Miss_Cnt);
 
-        return &lp->stats;
+        return &dev->stats;
 }
 
 static void tc35815_set_cam_entry(struct net_device *dev, int index, unsigned char *addr)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
         int cam_index = index * 6;
         u32 cam_data;
         u32 saved_addr;
+        DECLARE_MAC_BUF(mac);
+
         saved_addr = tc_readl(&tr->CAM_Adr);
 
-        if (netif_msg_hw(lp)) {
-                int i;
-                printk(KERN_DEBUG "%s: CAM %d:", dev->name, index);
-                for (i = 0; i < 6; i++)
-                        printk(" %02x", addr[i]);
-                printk("\n");
-        }
+        if (netif_msg_hw(lp))
+                printk(KERN_DEBUG "%s: CAM %d: %s\n",
+                        dev->name, index, print_mac(mac, addr));
         if (index & 1) {
                 /* read modify write */
                 tc_writel(cam_index - 2, &tr->CAM_Adr);
@@ -2039,28 +2190,24 @@ tc35815_set_multicast_list(struct net_device *dev)
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
 
-        if (dev->flags&IFF_PROMISC)
-        {
+        if (dev->flags & IFF_PROMISC) {
 #ifdef WORKAROUND_100HALF_PROMISC
                 /* With some (all?) 100MHalf HUB, controller will hang
                  * if we enabled promiscuous mode before linkup... */
-                struct tc35815_local *lp = dev->priv;
-                int pid = lp->phy_addr;
-                if (!(tc_mdio_read(dev, pid, MII_BMSR) & BMSR_LSTATUS))
+                struct tc35815_local *lp = netdev_priv(dev);
+
+                if (!lp->link)
                         return;
 #endif
                 /* Enable promiscuous mode */
                 tc_writel(CAM_CompEn | CAM_BroadAcc | CAM_GroupAcc | CAM_StationAcc, &tr->CAM_Ctl);
-        }
-        else if((dev->flags&IFF_ALLMULTI) || dev->mc_count > CAM_ENTRY_MAX - 3)
-        {
+        } else if ((dev->flags & IFF_ALLMULTI) ||
+                  dev->mc_count > CAM_ENTRY_MAX - 3) {
                 /* CAM 0, 1, 20 are reserved. */
                 /* Disable promiscuous mode, use normal mode. */
                 tc_writel(CAM_CompEn | CAM_BroadAcc | CAM_GroupAcc, &tr->CAM_Ctl);
-        }
-        else if(dev->mc_count)
-        {
-                struct dev_mc_list* cur_addr = dev->mc_list;
+        } else if (dev->mc_count) {
+                struct dev_mc_list *cur_addr = dev->mc_list;
                 int i;
                 int ena_bits = CAM_Ena_Bit(CAM_ENTRY_SOURCE);
 
@@ -2075,8 +2222,7 @@ tc35815_set_multicast_list(struct net_device *dev)
                 }
                 tc_writel(ena_bits, &tr->CAM_Ena);
                 tc_writel(CAM_CompEn | CAM_BroadAcc, &tr->CAM_Ctl);
-        }
-        else {
+        } else {
                 tc_writel(CAM_Ena_Bit(CAM_ENTRY_SOURCE), &tr->CAM_Ena);
                 tc_writel(CAM_CompEn | CAM_BroadAcc, &tr->CAM_Ctl);
         }
@@ -2084,7 +2230,7 @@ tc35815_set_multicast_list(struct net_device *dev)
 
 static void tc35815_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         strcpy(info->driver, MODNAME);
         strcpy(info->version, DRV_VERSION);
         strcpy(info->bus_info, pci_name(lp->pci_dev));
@@ -2092,78 +2238,37 @@ static void tc35815_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *
 
 static int tc35815_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct tc35815_local *lp = dev->priv;
-        spin_lock_irq(&lp->lock);
-        mii_ethtool_gset(&lp->mii, cmd);
-        spin_unlock_irq(&lp->lock);
-        return 0;
-}
-
-static int tc35815_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-        struct tc35815_local *lp = dev->priv;
-        int rc;
-#if 1   /* use our negotiation method... */
-        /* Verify the settings we care about. */
-        if (cmd->autoneg != AUTONEG_ENABLE &&
-            cmd->autoneg != AUTONEG_DISABLE)
-                return -EINVAL;
-        if (cmd->autoneg == AUTONEG_DISABLE &&
-            ((cmd->speed != SPEED_100 &&
-              cmd->speed != SPEED_10) ||
-             (cmd->duplex != DUPLEX_HALF &&
-              cmd->duplex != DUPLEX_FULL)))
-                return -EINVAL;
+        struct tc35815_local *lp = netdev_priv(dev);
 
-        /* Ok, do it to it. */
-        spin_lock_irq(&lp->lock);
-        del_timer(&lp->timer);
-        tc35815_start_auto_negotiation(dev, cmd);
-        spin_unlock_irq(&lp->lock);
-        rc = 0;
-#else
-        spin_lock_irq(&lp->lock);
-        rc = mii_ethtool_sset(&lp->mii, cmd);
-        spin_unlock_irq(&lp->lock);
-#endif
-        return rc;
+        if (!lp->phy_dev)
+                return -ENODEV;
+        return phy_ethtool_gset(lp->phy_dev, cmd);
 }
 
-static int tc35815_nway_reset(struct net_device *dev)
+static int tc35815_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct tc35815_local *lp = dev->priv;
-        int rc;
-        spin_lock_irq(&lp->lock);
-        rc = mii_nway_restart(&lp->mii);
-        spin_unlock_irq(&lp->lock);
-        return rc;
-}
+        struct tc35815_local *lp = netdev_priv(dev);
 
-static u32 tc35815_get_link(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        int rc;
-        spin_lock_irq(&lp->lock);
-        rc = mii_link_ok(&lp->mii);
-        spin_unlock_irq(&lp->lock);
-        return rc;
+        if (!lp->phy_dev)
+                return -ENODEV;
+        return phy_ethtool_sset(lp->phy_dev, cmd);
 }
 
 static u32 tc35815_get_msglevel(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         return lp->msg_enable;
 }
 
 static void tc35815_set_msglevel(struct net_device *dev, u32 datum)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         lp->msg_enable = datum;
 }
 
 static int tc35815_get_sset_count(struct net_device *dev, int sset)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
 
         switch (sset) {
         case ETH_SS_STATS:
@@ -2175,7 +2280,7 @@ static int tc35815_get_sset_count(struct net_device *dev, int sset)
 
 static void tc35815_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         data[0] = lp->lstats.max_tx_qlen;
         data[1] = lp->lstats.tx_ints;
         data[2] = lp->lstats.rx_ints;
@@ -2200,8 +2305,7 @@ static const struct ethtool_ops tc35815_ethtool_ops = {
         .get_drvinfo            = tc35815_get_drvinfo,
         .get_settings           = tc35815_get_settings,
         .set_settings           = tc35815_set_settings,
-        .nway_reset             = tc35815_nway_reset,
-        .get_link               = tc35815_get_link,
+        .get_link               = ethtool_op_get_link,
         .get_msglevel           = tc35815_get_msglevel,
         .set_msglevel           = tc35815_set_msglevel,
         .get_strings            = tc35815_get_strings,
@@ -2211,611 +2315,13 @@ static const struct ethtool_ops tc35815_ethtool_ops = {
 
 static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-        struct tc35815_local *lp = dev->priv;
-        int rc;
+        struct tc35815_local *lp = netdev_priv(dev);
 
         if (!netif_running(dev))
                 return -EINVAL;
-
-        spin_lock_irq(&lp->lock);
-        rc = generic_mii_ioctl(&lp->mii, if_mii(rq), cmd, NULL);
-        spin_unlock_irq(&lp->lock);
-
-        return rc;
-}
-
-static int tc_mdio_read(struct net_device *dev, int phy_id, int location)
-{
-        struct tc35815_regs __iomem *tr =
-                (struct tc35815_regs __iomem *)dev->base_addr;
-        u32 data;
-        tc_writel(MD_CA_Busy | (phy_id << 5) | location, &tr->MD_CA);
-        while (tc_readl(&tr->MD_CA) & MD_CA_Busy)
-                ;
-        data = tc_readl(&tr->MD_Data);
-        return data & 0xffff;
-}
-
-static void tc_mdio_write(struct net_device *dev, int phy_id, int location,
-                          int val)
-{
-        struct tc35815_regs __iomem *tr =
-                (struct tc35815_regs __iomem *)dev->base_addr;
-        tc_writel(val, &tr->MD_Data);
-        tc_writel(MD_CA_Busy | MD_CA_Wr | (phy_id << 5) | location, &tr->MD_CA);
-        while (tc_readl(&tr->MD_CA) & MD_CA_Busy)
-                ;
-}
-
-/* Auto negotiation.  The scheme is very simple.  We have a timer routine
- * that keeps watching the auto negotiation process as it progresses.
- * The DP83840 is first told to start doing it's thing, we set up the time
- * and place the timer state machine in it's initial state.
- *
- * Here the timer peeks at the DP83840 status registers at each click to see
- * if the auto negotiation has completed, we assume here that the DP83840 PHY
- * will time out at some point and just tell us what (didn't) happen.  For
- * complete coverage we only allow so many of the ticks at this level to run,
- * when this has expired we print a warning message and try another strategy.
- * This "other" strategy is to force the interface into various speed/duplex
- * configurations and we stop when we see a link-up condition before the
- * maximum number of "peek" ticks have occurred.
- *
- * Once a valid link status has been detected we configure the BigMAC and
- * the rest of the Happy Meal to speak the most efficient protocol we could
- * get a clean link for.  The priority for link configurations, highest first
- * is:
- *                 100 Base-T Full Duplex
- *                 100 Base-T Half Duplex
- *                 10 Base-T Full Duplex
- *                 10 Base-T Half Duplex
- *
- * We start a new timer now, after a successful auto negotiation status has
- * been detected.  This timer just waits for the link-up bit to get set in
- * the BMCR of the DP83840.  When this occurs we print a kernel log message
- * describing the link type in use and the fact that it is up.
- *
- * If a fatal error of some sort is signalled and detected in the interrupt
- * service routine, and the chip is reset, or the link is ifconfig'd down
- * and then back up, this entire process repeats itself all over again.
- */
-/* Note: Above comments are come from sunhme driver. */
-
-static int tc35815_try_next_permutation(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        unsigned short bmcr;
-
-        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-
-        /* Downgrade from full to half duplex.  Only possible via ethtool.  */
-        if (bmcr & BMCR_FULLDPLX) {
-                bmcr &= ~BMCR_FULLDPLX;
-                printk(KERN_DEBUG "%s: try next permutation (BMCR %x)\n", dev->name, bmcr);
-                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
-                return 0;
-        }
-
-        /* Downgrade from 100 to 10. */
-        if (bmcr & BMCR_SPEED100) {
-                bmcr &= ~BMCR_SPEED100;
-                printk(KERN_DEBUG "%s: try next permutation (BMCR %x)\n", dev->name, bmcr);
-                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
-                return 0;
-        }
-
-        /* We've tried everything. */
-        return -1;
-}
-
-static void
-tc35815_display_link_mode(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        unsigned short lpa, bmcr;
-        char *speed = "", *duplex = "";
-
-        lpa = tc_mdio_read(dev, pid, MII_LPA);
-        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-        if (options.speed ? (bmcr & BMCR_SPEED100) : (lpa & (LPA_100HALF | LPA_100FULL)))
-                speed = "100Mb/s";
-        else
-                speed = "10Mb/s";
-        if (options.duplex ? (bmcr & BMCR_FULLDPLX) : (lpa & (LPA_100FULL | LPA_10FULL)))
-                duplex = "Full Duplex";
-        else
-                duplex = "Half Duplex";
-
-        if (netif_msg_link(lp))
-                printk(KERN_INFO "%s: Link is up at %s, %s.\n",
-                       dev->name, speed, duplex);
-        printk(KERN_DEBUG "%s: MII BMCR %04x BMSR %04x LPA %04x\n",
-               dev->name,
-               bmcr, tc_mdio_read(dev, pid, MII_BMSR), lpa);
-}
-
-static void tc35815_display_forced_link_mode(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        unsigned short bmcr;
-        char *speed = "", *duplex = "";
-
-        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-        if (bmcr & BMCR_SPEED100)
-                speed = "100Mb/s";
-        else
-                speed = "10Mb/s";
-        if (bmcr & BMCR_FULLDPLX)
-                duplex = "Full Duplex.\n";
-        else
-                duplex = "Half Duplex.\n";
-
-        if (netif_msg_link(lp))
-                printk(KERN_INFO "%s: Link has been forced up at %s, %s",
-                       dev->name, speed, duplex);
-}
-
-static void tc35815_set_link_modes(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs __iomem *tr =
-                (struct tc35815_regs __iomem *)dev->base_addr;
-        int pid = lp->phy_addr;
-        unsigned short bmcr, lpa;
-        int speed;
-
-        if (lp->timer_state == arbwait) {
-                lpa = tc_mdio_read(dev, pid, MII_LPA);
-                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-                printk(KERN_DEBUG "%s: MII BMCR %04x BMSR %04x LPA %04x\n",
-                       dev->name,
-                       bmcr, tc_mdio_read(dev, pid, MII_BMSR), lpa);
-                if (!(lpa & (LPA_10HALF | LPA_10FULL |
-                             LPA_100HALF | LPA_100FULL))) {
-                        /* fall back to 10HALF */
-                        printk(KERN_INFO "%s: bad ability %04x - falling back to 10HD.\n",
-                               dev->name, lpa);
-                        lpa = LPA_10HALF;
-                }
-                if (options.duplex ? (bmcr & BMCR_FULLDPLX) : (lpa & (LPA_100FULL | LPA_10FULL)))
-                        lp->fullduplex = 1;
-                else
-                        lp->fullduplex = 0;
-                if (options.speed ? (bmcr & BMCR_SPEED100) : (lpa & (LPA_100HALF | LPA_100FULL)))
-                        speed = 100;
-                else
-                        speed = 10;
-        } else {
-                /* Forcing a link mode. */
-                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-                if (bmcr & BMCR_FULLDPLX)
-                        lp->fullduplex = 1;
-                else
-                        lp->fullduplex = 0;
-                if (bmcr & BMCR_SPEED100)
-                        speed = 100;
-                else
-                        speed = 10;
-        }
-
-        tc_writel(tc_readl(&tr->MAC_Ctl) | MAC_HaltReq, &tr->MAC_Ctl);
-        if (lp->fullduplex) {
-                tc_writel(tc_readl(&tr->MAC_Ctl) | MAC_FullDup, &tr->MAC_Ctl);
-        } else {
-                tc_writel(tc_readl(&tr->MAC_Ctl) & ~MAC_FullDup, &tr->MAC_Ctl);
-        }
-        tc_writel(tc_readl(&tr->MAC_Ctl) & ~MAC_HaltReq, &tr->MAC_Ctl);
-
-        /* TX4939 PCFG.SPEEDn bit will be changed on NETDEV_CHANGE event. */
-
-#ifndef NO_CHECK_CARRIER
-        /* TX4939 does not have EnLCarr */
-        if (lp->boardtype != TC35815_TX4939) {
-#ifdef WORKAROUND_LOSTCAR
-                /* WORKAROUND: enable LostCrS only if half duplex operation */
-                if (!lp->fullduplex && lp->boardtype != TC35815_TX4939)
-                        tc_writel(tc_readl(&tr->Tx_Ctl) | Tx_EnLCarr, &tr->Tx_Ctl);
-#endif
-        }
-#endif
-        lp->mii.full_duplex = lp->fullduplex;
-}
-
-static void tc35815_timer(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        unsigned short bmsr, bmcr, lpa;
-        int restart_timer = 0;
-
-        spin_lock_irq(&lp->lock);
-
-        lp->timer_ticks++;
-        switch (lp->timer_state) {
-        case arbwait:
-                /*
-                 * Only allow for 5 ticks, thats 10 seconds and much too
-                 * long to wait for arbitration to complete.
-                 */
-                /* TC35815 need more times... */
-                if (lp->timer_ticks >= 10) {
-                        /* Enter force mode. */
-                        if (!options.doforce) {
-                                printk(KERN_NOTICE "%s: Auto-Negotiation unsuccessful,"
-                                       " cable probblem?\n", dev->name);
-                                /* Try to restart the adaptor. */
-                                tc35815_restart(dev);
-                                goto out;
-                        }
-                        printk(KERN_NOTICE "%s: Auto-Negotiation unsuccessful,"
-                               " trying force link mode\n", dev->name);
-                        printk(KERN_DEBUG "%s: BMCR %x BMSR %x\n", dev->name,
-                               tc_mdio_read(dev, pid, MII_BMCR),
-                               tc_mdio_read(dev, pid, MII_BMSR));
-                        bmcr = BMCR_SPEED100;
-                        tc_mdio_write(dev, pid, MII_BMCR, bmcr);
-
-                        /*
-                         * OK, seems we need do disable the transceiver
-                         * for the first tick to make sure we get an
-                         * accurate link state at the second tick.
-                         */
-
-                        lp->timer_state = ltrywait;
-                        lp->timer_ticks = 0;
-                        restart_timer = 1;
-                } else {
-                        /* Anything interesting happen? */
-                        bmsr = tc_mdio_read(dev, pid, MII_BMSR);
-                        if (bmsr & BMSR_ANEGCOMPLETE) {
-                                /* Just what we've been waiting for... */
-                                tc35815_set_link_modes(dev);
-
-                                /*
-                                 * Success, at least so far, advance our state
-                                 * engine.
-                                 */
-                                lp->timer_state = lupwait;
-                                restart_timer = 1;
-                        } else {
-                                restart_timer = 1;
-                        }
-                }
-                break;
-
-        case lupwait:
-                /*
-                 * Auto negotiation was successful and we are awaiting a
-                 * link up status.  I have decided to let this timer run
-                 * forever until some sort of error is signalled, reporting
-                 * a message to the user at 10 second intervals.
-                 */
-                bmsr = tc_mdio_read(dev, pid, MII_BMSR);
-                if (bmsr & BMSR_LSTATUS) {
-                        /*
-                         * Wheee, it's up, display the link mode in use and put
-                         * the timer to sleep.
-                         */
-                        tc35815_display_link_mode(dev);
-                        netif_carrier_on(dev);
-#ifdef WORKAROUND_100HALF_PROMISC
-                        /* delayed promiscuous enabling */
-                        if (dev->flags & IFF_PROMISC)
-                                tc35815_set_multicast_list(dev);
-#endif
-#if 1
-                        lp->saved_lpa = tc_mdio_read(dev, pid, MII_LPA);
-                        lp->timer_state = lcheck;
-                        restart_timer = 1;
-#else
-                        lp->timer_state = asleep;
-                        restart_timer = 0;
-#endif
-                } else {
-                        if (lp->timer_ticks >= 10) {
-                                printk(KERN_NOTICE "%s: Auto negotiation successful, link still "
-                                       "not completely up.\n", dev->name);
-                                lp->timer_ticks = 0;
-                                restart_timer = 1;
-                        } else {
-                                restart_timer = 1;
-                        }
-                }
-                break;
-
-        case ltrywait:
-                /*
-                 * Making the timeout here too long can make it take
-                 * annoyingly long to attempt all of the link mode
-                 * permutations, but then again this is essentially
-                 * error recovery code for the most part.
-                 */
-                bmsr = tc_mdio_read(dev, pid, MII_BMSR);
-                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-                if (lp->timer_ticks == 1) {
-                        /*
-                         * Re-enable transceiver, we'll re-enable the
-                         * transceiver next tick, then check link state
-                         * on the following tick.
-                         */
-                        restart_timer = 1;
-                        break;
-                }
-                if (lp->timer_ticks == 2) {
-                        restart_timer = 1;
-                        break;
-                }
-                if (bmsr & BMSR_LSTATUS) {
-                        /* Force mode selection success. */
-                        tc35815_display_forced_link_mode(dev);
-                        netif_carrier_on(dev);
-                        tc35815_set_link_modes(dev);
-#ifdef WORKAROUND_100HALF_PROMISC
-                        /* delayed promiscuous enabling */
-                        if (dev->flags & IFF_PROMISC)
-                                tc35815_set_multicast_list(dev);
-#endif
-#if 1
-                        lp->saved_lpa = tc_mdio_read(dev, pid, MII_LPA);
-                        lp->timer_state = lcheck;
-                        restart_timer = 1;
-#else
-                        lp->timer_state = asleep;
-                        restart_timer = 0;
-#endif
-                } else {
-                        if (lp->timer_ticks >= 4) { /* 6 seconds or so... */
-                                int ret;
-
-                                ret = tc35815_try_next_permutation(dev);
-                                if (ret == -1) {
-                                        /*
-                                         * Aieee, tried them all, reset the
-                                         * chip and try all over again.
-                                         */
-                                        printk(KERN_NOTICE "%s: Link down, "
-                                               "cable problem?\n",
-                                               dev->name);
-
-                                        /* Try to restart the adaptor. */
-                                        tc35815_restart(dev);
-                                        goto out;
-                                }
-                                lp->timer_ticks = 0;
-                                restart_timer = 1;
-                        } else {
-                                restart_timer = 1;
-                        }
-                }
-                break;
-
-        case lcheck:
-                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-                lpa = tc_mdio_read(dev, pid, MII_LPA);
-                if (bmcr & (BMCR_PDOWN | BMCR_ISOLATE | BMCR_RESET)) {
-                        printk(KERN_ERR "%s: PHY down? (BMCR %x)\n", dev->name,
-                               bmcr);
-                } else if ((lp->saved_lpa ^ lpa) &
-                           (LPA_100FULL|LPA_100HALF|LPA_10FULL|LPA_10HALF)) {
-                        printk(KERN_NOTICE "%s: link status changed"
-                               " (BMCR %x LPA %x->%x)\n", dev->name,
-                               bmcr, lp->saved_lpa, lpa);
-                } else {
-                        /* go on */
-                        restart_timer = 1;
-                        break;
-                }
-                /* Try to restart the adaptor. */
-                tc35815_restart(dev);
-                goto out;
-
-        case asleep:
-        default:
-                /* Can't happens.... */
-                printk(KERN_ERR "%s: Aieee, link timer is asleep but we got "
-                       "one anyways!\n", dev->name);
-                restart_timer = 0;
-                lp->timer_ticks = 0;
-                lp->timer_state = asleep; /* foo on you */
-                break;
-        }
-
-        if (restart_timer) {
-                lp->timer.expires = jiffies + msecs_to_jiffies(1200);
-                add_timer(&lp->timer);
-        }
-out:
-        spin_unlock_irq(&lp->lock);
-}
-
-static void tc35815_start_auto_negotiation(struct net_device *dev,
-                                           struct ethtool_cmd *ep)
-{
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        unsigned short bmsr, bmcr, advertize;
-        int timeout;
-
-        netif_carrier_off(dev);
-        bmsr = tc_mdio_read(dev, pid, MII_BMSR);
-        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-        advertize = tc_mdio_read(dev, pid, MII_ADVERTISE);
-
-        if (ep == NULL || ep->autoneg == AUTONEG_ENABLE) {
-                if (options.speed || options.duplex) {
-                        /* Advertise only specified configuration. */
-                        advertize &= ~(ADVERTISE_10HALF |
-                                       ADVERTISE_10FULL |
-                                       ADVERTISE_100HALF |
-                                       ADVERTISE_100FULL);
-                        if (options.speed != 10) {
-                                if (options.duplex != 1)
-                                        advertize |= ADVERTISE_100FULL;
-                                if (options.duplex != 2)
-                                        advertize |= ADVERTISE_100HALF;
-                        }
-                        if (options.speed != 100) {
-                                if (options.duplex != 1)
-                                        advertize |= ADVERTISE_10FULL;
-                                if (options.duplex != 2)
-                                        advertize |= ADVERTISE_10HALF;
-                        }
-                        if (options.speed == 100)
-                                bmcr |= BMCR_SPEED100;
-                        else if (options.speed == 10)
-                                bmcr &= ~BMCR_SPEED100;
-                        if (options.duplex == 2)
-                                bmcr |= BMCR_FULLDPLX;
-                        else if (options.duplex == 1)
-                                bmcr &= ~BMCR_FULLDPLX;
-                } else {
-                        /* Advertise everything we can support. */
-                        if (bmsr & BMSR_10HALF)
-                                advertize |= ADVERTISE_10HALF;
-                        else
-                                advertize &= ~ADVERTISE_10HALF;
-                        if (bmsr & BMSR_10FULL)
-                                advertize |= ADVERTISE_10FULL;
-                        else
-                                advertize &= ~ADVERTISE_10FULL;
-                        if (bmsr & BMSR_100HALF)
-                                advertize |= ADVERTISE_100HALF;
-                        else
-                                advertize &= ~ADVERTISE_100HALF;
-                        if (bmsr & BMSR_100FULL)
-                                advertize |= ADVERTISE_100FULL;
-                        else
-                                advertize &= ~ADVERTISE_100FULL;
-                }
-
-                tc_mdio_write(dev, pid, MII_ADVERTISE, advertize);
-
-                /* Enable Auto-Negotiation, this is usually on already... */
-                bmcr |= BMCR_ANENABLE;
-                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
-
-                /* Restart it to make sure it is going. */
-                bmcr |= BMCR_ANRESTART;
-                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
-                printk(KERN_DEBUG "%s: ADVERTISE %x BMCR %x\n", dev->name, advertize, bmcr);
-
-                /* BMCR_ANRESTART self clears when the process has begun. */
-                timeout = 64;  /* More than enough. */
-                while (--timeout) {
-                        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-                        if (!(bmcr & BMCR_ANRESTART))
-                                break; /* got it. */
-                        udelay(10);
-                }
-                if (!timeout) {
-                        printk(KERN_ERR "%s: TC35815 would not start auto "
-                               "negotiation BMCR=0x%04x\n",
-                               dev->name, bmcr);
-                        printk(KERN_NOTICE "%s: Performing force link "
-                               "detection.\n", dev->name);
-                        goto force_link;
-                } else {
-                        printk(KERN_DEBUG "%s: auto negotiation started.\n", dev->name);
-                        lp->timer_state = arbwait;
-                }
-        } else {
-force_link:
-                /* Force the link up, trying first a particular mode.
-                 * Either we are here at the request of ethtool or
-                 * because the Happy Meal would not start to autoneg.
-                 */
-
-                /* Disable auto-negotiation in BMCR, enable the duplex and
-                 * speed setting, init the timer state machine, and fire it off.
-                 */
-                if (ep == NULL || ep->autoneg == AUTONEG_ENABLE) {
-                        bmcr = BMCR_SPEED100;
-                } else {
-                        if (ep->speed == SPEED_100)
-                                bmcr = BMCR_SPEED100;
-                        else
-                                bmcr = 0;
-                        if (ep->duplex == DUPLEX_FULL)
-                                bmcr |= BMCR_FULLDPLX;
-                }
-                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
-
-                /* OK, seems we need do disable the transceiver for the first
-                 * tick to make sure we get an accurate link state at the
-                 * second tick.
-                 */
-                lp->timer_state = ltrywait;
-        }
-
-        del_timer(&lp->timer);
-        lp->timer_ticks = 0;
-        lp->timer.expires = jiffies + msecs_to_jiffies(1200);
-        add_timer(&lp->timer);
-}
-
-static void tc35815_find_phy(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        unsigned short id0;
-
-        /* find MII phy */
-        for (pid = 31; pid >= 0; pid--) {
-                id0 = tc_mdio_read(dev, pid, MII_BMSR);
-                if (id0 != 0xffff && id0 != 0x0000 &&
-                    (id0 & BMSR_RESV) != (0xffff & BMSR_RESV) /* paranoia? */
-                        ) {
-                        lp->phy_addr = pid;
-                        break;
-                }
-        }
-        if (pid < 0) {
-                printk(KERN_ERR "%s: No MII Phy found.\n",
-                       dev->name);
-                lp->phy_addr = pid = 0;
-        }
-
-        lp->mii_id[0] = tc_mdio_read(dev, pid, MII_PHYSID1);
-        lp->mii_id[1] = tc_mdio_read(dev, pid, MII_PHYSID2);
-        if (netif_msg_hw(lp))
-                printk(KERN_INFO "%s: PHY(%02x) ID %04x %04x\n", dev->name,
-                       pid, lp->mii_id[0], lp->mii_id[1]);
-}
-
-static void tc35815_phy_chip_init(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        int pid = lp->phy_addr;
-        unsigned short bmcr;
-        struct ethtool_cmd ecmd, *ep;
-
-        /* dis-isolate if needed. */
-        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
-        if (bmcr & BMCR_ISOLATE) {
-                int count = 32;
-                printk(KERN_DEBUG "%s: unisolating...", dev->name);
-                tc_mdio_write(dev, pid, MII_BMCR, bmcr & ~BMCR_ISOLATE);
-                while (--count) {
-                        if (!(tc_mdio_read(dev, pid, MII_BMCR) & BMCR_ISOLATE))
-                                break;
-                        udelay(20);
-                }
-                printk(" %s.\n", count ? "done" : "failed");
-        }
-
-        if (options.speed && options.duplex) {
-                ecmd.autoneg = AUTONEG_DISABLE;
-                ecmd.speed = options.speed == 10 ? SPEED_10 : SPEED_100;
-                ecmd.duplex = options.duplex == 1 ? DUPLEX_HALF : DUPLEX_FULL;
-                ep = &ecmd;
-        } else {
-                ep = NULL;
-        }
-        tc35815_start_auto_negotiation(dev, ep);
+        if (!lp->phy_dev)
+                return -ENODEV;
+        return phy_mii_ioctl(lp->phy_dev, if_mii(rq), cmd);
 }
 
 static void tc35815_chip_reset(struct net_device *dev)
@@ -2862,13 +2368,11 @@ static void tc35815_chip_reset(struct net_device *dev)
 
 static void tc35815_chip_init(struct net_device *dev)
 {
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
         unsigned long txctl = TX_CTL_CMD;
 
-        tc35815_phy_chip_init(dev);
-
         /* load station address to CAM */
         tc35815_set_cam_entry(dev, CAM_ENTRY_SOURCE, dev->dev_addr);
 
@@ -2905,12 +2409,11 @@ static void tc35815_chip_init(struct net_device *dev)
         /* start MAC transmitter */
 #ifndef NO_CHECK_CARRIER
         /* TX4939 does not have EnLCarr */
-        if (lp->boardtype == TC35815_TX4939)
+        if (lp->chiptype == TC35815_TX4939)
                 txctl &= ~Tx_EnLCarr;
 #ifdef WORKAROUND_LOSTCAR
         /* WORKAROUND: ignore LostCrS in full duplex operation */
-        if ((lp->timer_state != asleep && lp->timer_state != lcheck) ||
-            lp->fullduplex)
+        if (!lp->phy_dev || !lp->link || lp->duplex == DUPLEX_FULL)
                 txctl &= ~Tx_EnLCarr;
 #endif
 #endif /* !NO_CHECK_CARRIER */
@@ -2924,15 +2427,16 @@ static void tc35815_chip_init(struct net_device *dev)
 static int tc35815_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
-        struct tc35815_local *lp = dev->priv;
+        struct tc35815_local *lp = netdev_priv(dev);
         unsigned long flags;
 
         pci_save_state(pdev);
         if (!netif_running(dev))
                 return 0;
         netif_device_detach(dev);
+        if (lp->phy_dev)
+                phy_stop(lp->phy_dev);
         spin_lock_irqsave(&lp->lock, flags);
-        del_timer(&lp->timer);          /* Kill if running      */
         tc35815_chip_reset(dev);
         spin_unlock_irqrestore(&lp->lock, flags);
         pci_set_power_state(pdev, PCI_D3hot);
@@ -2942,16 +2446,15 @@ static int tc35815_suspend(struct pci_dev *pdev, pm_message_t state)
 static int tc35815_resume(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
-        struct tc35815_local *lp = dev->priv;
-        unsigned long flags;
+        struct tc35815_local *lp = netdev_priv(dev);
 
         pci_restore_state(pdev);
         if (!netif_running(dev))
                 return 0;
         pci_set_power_state(pdev, PCI_D0);
-        spin_lock_irqsave(&lp->lock, flags);
         tc35815_restart(dev);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        if (lp->phy_dev)
+                phy_start(lp->phy_dev);
         netif_device_attach(dev);
         return 0;
 }
@@ -2972,8 +2475,6 @@ module_param_named(speed, options.speed, int, 0);
 MODULE_PARM_DESC(speed, "0:auto, 10:10Mbps, 100:100Mbps");
 module_param_named(duplex, options.duplex, int, 0);
 MODULE_PARM_DESC(duplex, "0:auto, 1:half, 2:full");
-module_param_named(doforce, options.doforce, int, 0);
-MODULE_PARM_DESC(doforce, "try force link mode if auto-negotiation failed");
 
 static int __init tc35815_init_module(void)
 {
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 44a06f8b588f..45208a0e69a0 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -42,6 +42,7 @@
 
 #define XL_DEBUG 0
 
+#include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -408,7 +409,7 @@ static int xl_hw_reset(struct net_device *dev)
         t=jiffies;
         while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
                 schedule();             
-                if(jiffies-t > 40*HZ) {
+                if (time_after(jiffies, t + 40 * HZ)) {
                         printk(KERN_ERR "%s: 3COM 3C359 Velocity XL  card not responding to global reset.\n", dev->name);
                         return -ENODEV;
                 }
@@ -519,7 +520,7 @@ static int xl_hw_reset(struct net_device *dev)
         t=jiffies;
         while ( !(readw(xl_mmio + MMIO_INTSTATUS_AUTO) & INTSTAT_SRB) ) { 
                 schedule();             
-                if(jiffies-t > 15*HZ) {
+                if (time_after(jiffies, t + 15 * HZ)) {
                         printk(KERN_ERR "3COM 3C359 Velocity XL  card not responding.\n");
                         return -ENODEV; 
                 }
@@ -790,7 +791,7 @@ static int xl_open_hw(struct net_device *dev)
         t=jiffies;
         while (! (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_SRB)) { 
                 schedule();             
-                if(jiffies-t > 40*HZ) {
+                if (time_after(jiffies, t + 40 * HZ)) {
                         printk(KERN_ERR "3COM 3C359 Velocity XL  card not responding.\n");
                         break ; 
                 }
@@ -1003,7 +1004,7 @@ static void xl_reset(struct net_device *dev)
 
         t=jiffies;
         while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                if(jiffies-t > 40*HZ) {
+                if (time_after(jiffies, t + 40 * HZ)) {
                         printk(KERN_ERR "3COM 3C359 Velocity XL  card not responding.\n");
                         break ; 
                 }
@@ -1270,7 +1271,7 @@ static int xl_close(struct net_device *dev)
         t=jiffies;
         while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
                 schedule();             
-                if(jiffies-t > 10*HZ) {
+                if (time_after(jiffies, t + 10 * HZ)) {
                         printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-DNSTALL not responding.\n", dev->name);
                         break ; 
                 }
@@ -1279,7 +1280,7 @@ static int xl_close(struct net_device *dev)
         t=jiffies;
         while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
                 schedule();             
-                if(jiffies-t > 10*HZ) {
+                if (time_after(jiffies, t + 10 * HZ)) {
                         printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-DNDISABLE not responding.\n", dev->name);
                         break ;
                 }
@@ -1288,7 +1289,7 @@ static int xl_close(struct net_device *dev)
         t=jiffies;
         while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
                 schedule();             
-                if(jiffies-t > 10*HZ) {
+                if (time_after(jiffies, t + 10 * HZ)) {
                         printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-UPSTALL not responding.\n", dev->name);
                         break ; 
                 }
@@ -1305,7 +1306,7 @@ static int xl_close(struct net_device *dev)
         t=jiffies;
         while (!(readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_SRB)) { 
                 schedule();             
-                if(jiffies-t > 10*HZ) {
+                if (time_after(jiffies, t + 10 * HZ)) {
                         printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-CLOSENIC not responding.\n", dev->name);
                         break ; 
                 }
@@ -1334,7 +1335,7 @@ static int xl_close(struct net_device *dev)
         t=jiffies;
         while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
                 schedule();             
-                if(jiffies-t > 10*HZ) {
+                if (time_after(jiffies, t + 10 * HZ)) {
                         printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-UPRESET not responding.\n", dev->name);
                         break ; 
                 }
@@ -1343,7 +1344,7 @@ static int xl_close(struct net_device *dev)
         t=jiffies;
         while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
                 schedule();             
-                if(jiffies-t > 10*HZ) {
+                if (time_after(jiffies, t + 10 * HZ)) {
                         printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-DNRESET not responding.\n", dev->name);
                         break ; 
                 }
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 20ac1503021e..d913405bc393 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -141,7 +141,7 @@ config ULI526X
           be called uli526x.
           
 config PCMCIA_XIRCOM
-        tristate "Xircom CardBus support (new driver)"
+        tristate "Xircom CardBus support"
         depends on CARDBUS
         ---help---
           This driver is for the Digital "Tulip" Ethernet CardBus adapters.
@@ -152,17 +152,4 @@ config PCMCIA_XIRCOM
           To compile this driver as a module, choose M here. The module will
           be called xircom_cb.  If unsure, say N.
 
-config PCMCIA_XIRTULIP
-        tristate "Xircom Tulip-like CardBus support (old driver)"
-        depends on CARDBUS && BROKEN_ON_SMP
-        select CRC32
-        ---help---
-          This driver is for the Digital "Tulip" Ethernet CardBus adapters.
-          It should work with most DEC 21*4*-based chips/ethercards, as well
-          as with work-alike chips from Lite-On (PNIC) and Macronix (MXIC) and
-          ASIX.
-
-          To compile this driver as a module, choose M here. The module will
-          be called xircom_tulip_cb.  If unsure, say N.
-
 endif # NET_TULIP
diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile
index 451090d6fcca..200cbf7c815c 100644
--- a/drivers/net/tulip/Makefile
+++ b/drivers/net/tulip/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the Linux "Tulip" family network device drivers.
 #
 
-obj-$(CONFIG_PCMCIA_XIRTULIP)   += xircom_tulip_cb.o
 obj-$(CONFIG_PCMCIA_XIRCOM)     += xircom_cb.o
 obj-$(CONFIG_DM9102)            += dmfe.o
 obj-$(CONFIG_WINBOND_840)       += winbond-840.o
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 3f69f53d7768..908422f2f320 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -268,7 +268,12 @@ enum t21143_csr6_bits {
 #define RX_RING_SIZE    128
 #define MEDIA_MASK     31
 
-#define PKT_BUF_SZ              1536    /* Size of each temporary Rx buffer. */
+/* The receiver on the DC21143 rev 65 can fail to close the last
+ * receive descriptor in certain circumstances (see errata) when
+ * using MWI. This can only occur if the receive buffer ends on
+ * a cache line boundary, so the "+ 4" below ensures it doesn't.
+ */
+#define PKT_BUF_SZ      (1536 + 4)      /* Size of each temporary Rx buffer. */
 
 #define TULIP_MIN_CACHE_LINE    8       /* in units of 32-bit words */
 
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 82f404b76d81..fa1c1c329a2d 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1154,18 +1154,13 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
 
         tp->csr0 = csr0 = 0;
 
-        /* if we have any cache line size at all, we can do MRM */
-        csr0 |= MRM;
+        /* if we have any cache line size at all, we can do MRM and MWI */
+        csr0 |= MRM | MWI;
 
-        /* ...and barring hardware bugs, MWI */
-        if (!(tp->chip_id == DC21143 && tp->revision == 65))
-                csr0 |= MWI;
-
-        /* set or disable MWI in the standard PCI command bit.
-         * Check for the case where  mwi is desired but not available
+        /* Enable MWI in the standard PCI command bit.
+         * Check for the case where MWI is desired but not available
          */
-        if (csr0 & MWI) pci_try_set_mwi(pdev);
-        else            pci_clear_mwi(pdev);
+        pci_try_set_mwi(pdev);
 
         /* read result from hardware (in case bit refused to enable) */
         pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
@@ -1401,10 +1396,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 #ifdef CONFIG_TULIP_MWI
         if (!force_csr0 && (tp->flags & HAS_PCI_MWI))
                 tulip_mwi_config (pdev, dev);
-#else
-        /* MWI is broken for DC21143 rev 65... */
-        if (chip_idx == DC21143 && pdev->revision == 65)
-                tp->csr0 &= ~MWI;
 #endif
 
         /* Stop the chip's Tx and Rx processes. */
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 35d0cfcf8c47..50068194c163 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -107,8 +107,6 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT  (2*HZ)
 
-#define PKT_BUF_SZ              1536                    /* Size of each temporary Rx buffer.*/
-
 /* Include files, designed to support most kernel versions 2.0.0 and later. */
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -137,6 +135,9 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 
 #include "tulip.h"
 
+#undef PKT_BUF_SZ                       /* tulip.h also defines this */
+#define PKT_BUF_SZ              1536    /* Size of each temporary Rx buffer.*/
+
 /* These identify the driver base version and may not be removed. */
 static char version[] =
 KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " DRV_RELDATE "  Donald Becker <becker@scyld.com>\n"
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
deleted file mode 100644
index c3f8e303c6c7..000000000000
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ /dev/null
@@ -1,1726 +0,0 @@
-/* xircom_tulip_cb.c: A Xircom CBE-100 ethernet driver for Linux. */
-/*
-        Written/copyright 1994-1999 by Donald Becker.
-
-        This software may be used and distributed according to the terms
-        of the GNU General Public License, incorporated herein by reference.
-
-        The author may be reached as becker@scyld.com, or C/O
-        Scyld Computing Corporation
-        410 Severn Ave., Suite 210
-        Annapolis MD 21403
-
-*/
-
-#define DRV_NAME        "xircom_tulip_cb"
-#define DRV_VERSION     "0.92"
-#define DRV_RELDATE     "June 27, 2006"
-
-/* A few user-configurable values. */
-
-#define xircom_debug debug
-#ifdef XIRCOM_DEBUG
-static int xircom_debug = XIRCOM_DEBUG;
-#else
-static int xircom_debug = 1;
-#endif
-
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 25;
-
-#define MAX_UNITS 4
-/* Used to pass the full-duplex flag, etc. */
-static int full_duplex[MAX_UNITS];
-static int options[MAX_UNITS];
-static int mtu[MAX_UNITS];                      /* Jumbo MTU for interfaces. */
-
-/* Keep the ring sizes a power of two for efficiency.
-   Making the Tx ring too large decreases the effectiveness of channel
-   bonding and packet priority.
-   There are no ill effects from too-large receive rings. */
-#define TX_RING_SIZE    16
-#define RX_RING_SIZE    32
-
-/* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
-#ifdef __alpha__
-static int rx_copybreak = 1518;
-#else
-static int rx_copybreak = 100;
-#endif
-
-/*
-  Set the bus performance register.
-        Typical: Set 16 longword cache alignment, no burst limit.
-        Cache alignment bits 15:14           Burst length 13:8
-                0000    No alignment  0x00000000 unlimited              0800 8 longwords
-                4000    8  longwords            0100 1 longword         1000 16 longwords
-                8000    16 longwords            0200 2 longwords        2000 32 longwords
-                C000    32  longwords           0400 4 longwords
-        Warning: many older 486 systems are broken and require setting 0x00A04800
-           8 longword cache alignment, 8 longword burst.
-        ToDo: Non-Intel setting could be better.
-*/
-
-#if defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
-static int csr0 = 0x01A00000 | 0xE000;
-#elif defined(__powerpc__)
-static int csr0 = 0x01B00000 | 0x8000;
-#elif defined(CONFIG_SPARC)
-static int csr0 = 0x01B00080 | 0x8000;
-#elif defined(__i386__)
-static int csr0 = 0x01A00000 | 0x8000;
-#else
-#warning Processor architecture undefined!
-static int csr0 = 0x00A00000 | 0x4800;
-#endif
-
-/* Operational parameters that usually are not changed. */
-/* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT              (4 * HZ)
-#define PKT_BUF_SZ              1536                    /* Size of each temporary Rx buffer.*/
-#define PKT_SETUP_SZ            192                     /* Size of the setup frame */
-
-/* PCI registers */
-#define PCI_POWERMGMT   0x40
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/crc32.h>
-
-#include <asm/io.h>
-#include <asm/processor.h>      /* Processor type for cache alignment. */
-#include <asm/uaccess.h>
-
-
-/* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c derived from tulip.c:v0.91 4/14/99 becker@scyld.com\n"
-KERN_INFO " unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE "\n";
-
-MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
-MODULE_DESCRIPTION("Xircom CBE-100 ethernet driver");
-MODULE_LICENSE("GPL v2");
-MODULE_VERSION(DRV_VERSION);
-
-module_param(debug, int, 0);
-module_param(max_interrupt_work, int, 0);
-module_param(rx_copybreak, int, 0);
-module_param(csr0, int, 0);
-
-module_param_array(options, int, NULL, 0);
-module_param_array(full_duplex, int, NULL, 0);
-
-#define RUN_AT(x) (jiffies + (x))
-
-/*
-                                Theory of Operation
-
-I. Board Compatibility
-
-This device driver was forked from the driver for the DECchip "Tulip",
-Digital's single-chip ethernet controllers for PCI.  It supports Xircom's
-almost-Tulip-compatible CBE-100 CardBus adapters.
-
-II. Board-specific settings
-
-PCI bus devices are configured by the system at boot time, so no jumpers
-need to be set on the board.  The system BIOS preferably should assign the
-PCI INTA signal to an otherwise unused system IRQ line.
-
-III. Driver operation
-
-IIIa. Ring buffers
-
-The Xircom can use either ring buffers or lists of Tx and Rx descriptors.
-This driver uses statically allocated rings of Rx and Tx descriptors, set at
-compile time by RX/TX_RING_SIZE.  This version of the driver allocates skbuffs
-for the Rx ring buffers at open() time and passes the skb->data field to the
-Xircom as receive data buffers.  When an incoming frame is less than
-RX_COPYBREAK bytes long, a fresh skbuff is allocated and the frame is
-copied to the new skbuff.  When the incoming frame is larger, the skbuff is
-passed directly up the protocol stack and replaced by a newly allocated
-skbuff.
-
-The RX_COPYBREAK value is chosen to trade-off the memory wasted by
-using a full-sized skbuff for small frames vs. the copying costs of larger
-frames.  For small frames the copying cost is negligible (esp. considering
-that we are pre-loading the cache with immediately useful header
-information).  For large frames the copying cost is non-trivial, and the
-larger copy might flush the cache of useful data.  A subtle aspect of this
-choice is that the Xircom only receives into longword aligned buffers, thus
-the IP header at offset 14 isn't longword aligned for further processing.
-Copied frames are put into the new skbuff at an offset of "+2", thus copying
-has the beneficial effect of aligning the IP header and preloading the
-cache.
-
-IIIC. Synchronization
-The driver runs as two independent, single-threaded flows of control.  One
-is the send-packet routine, which enforces single-threaded use by the
-dev->tbusy flag.  The other thread is the interrupt handler, which is single
-threaded by the hardware and other software.
-
-The send packet thread has partial control over the Tx ring and 'dev->tbusy'
-flag.  It sets the tbusy flag whenever it's queuing a Tx packet. If the next
-queue slot is empty, it clears the tbusy flag when finished otherwise it sets
-the 'tp->tx_full' flag.
-
-The interrupt handler has exclusive control over the Rx ring and records stats
-from the Tx ring.  (The Tx-done interrupt can't be selectively turned off, so
-we can't avoid the interrupt overhead by having the Tx routine reap the Tx
-stats.)  After reaping the stats, it marks the queue entry as empty by setting
-the 'base' to zero.      Iff the 'tp->tx_full' flag is set, it clears both the
-tx_full and tbusy flags.
-
-IV. Notes
-
-IVb. References
-
-http://cesdis.gsfc.nasa.gov/linux/misc/NWay.html
-http://www.digital.com  (search for current 21*4* datasheets and "21X4 SROM")
-http://www.national.com/pf/DP/DP83840A.html
-
-IVc. Errata
-
-*/
-
-/* A full-duplex map for media types. */
-enum MediaIs {
-        MediaIsFD = 1, MediaAlwaysFD=2, MediaIsMII=4, MediaIsFx=8,
-        MediaIs100=16};
-static const char media_cap[] =
-{0,0,0,16,  3,19,16,24,  27,4,7,5, 0,20,23,20 };
-
-/* Offsets to the Command and Status Registers, "CSRs".  All accesses
-   must be longword instructions and quadword aligned. */
-enum xircom_offsets {
-        CSR0=0,    CSR1=0x08, CSR2=0x10, CSR3=0x18, CSR4=0x20, CSR5=0x28,
-        CSR6=0x30, CSR7=0x38, CSR8=0x40, CSR9=0x48, CSR10=0x50, CSR11=0x58,
-        CSR12=0x60, CSR13=0x68, CSR14=0x70, CSR15=0x78, CSR16=0x04, };
-
-/* The bits in the CSR5 status registers, mostly interrupt sources. */
-enum status_bits {
-        LinkChange=0x08000000,
-        NormalIntr=0x10000, NormalIntrMask=0x00014045,
-        AbnormalIntr=0x8000, AbnormalIntrMask=0x0a00a5a2,
-        ReservedIntrMask=0xe0001a18,
-        EarlyRxIntr=0x4000, BusErrorIntr=0x2000,
-        EarlyTxIntr=0x400, RxDied=0x100, RxNoBuf=0x80, RxIntr=0x40,
-        TxFIFOUnderflow=0x20, TxNoBuf=0x04, TxDied=0x02, TxIntr=0x01,
-};
-
-enum csr0_control_bits {
-        EnableMWI=0x01000000, EnableMRL=0x00800000,
-        EnableMRM=0x00200000, EqualBusPrio=0x02,
-        SoftwareReset=0x01,
-};
-
-enum csr6_control_bits {
-        ReceiveAllBit=0x40000000, AllMultiBit=0x80, PromiscBit=0x40,
-        HashFilterBit=0x01, FullDuplexBit=0x0200,
-        TxThresh10=0x400000, TxStoreForw=0x200000,
-        TxThreshMask=0xc000, TxThreshShift=14,
-        EnableTx=0x2000, EnableRx=0x02,
-        ReservedZeroMask=0x8d930134, ReservedOneMask=0x320c0000,
-        EnableTxRx=(EnableTx | EnableRx),
-};
-
-
-enum tbl_flag {
-        HAS_MII=1, HAS_ACPI=2,
-};
-static struct xircom_chip_table {
-        char *chip_name;
-        int valid_intrs;                        /* CSR7 interrupt enable settings */
-        int flags;
-} xircom_tbl[] = {
-  { "Xircom Cardbus Adapter",
-        LinkChange | NormalIntr | AbnormalIntr | BusErrorIntr |
-        RxDied | RxNoBuf | RxIntr | TxFIFOUnderflow | TxNoBuf | TxDied | TxIntr,
-        HAS_MII | HAS_ACPI, },
-  { NULL, },
-};
-/* This matches the table above. */
-enum chips {
-        X3201_3,
-};
-
-
-/* The Xircom Rx and Tx buffer descriptors. */
-struct xircom_rx_desc {
-        s32 status;
-        s32 length;
-        u32 buffer1, buffer2;
-};
-
-struct xircom_tx_desc {
-        s32 status;
-        s32 length;
-        u32 buffer1, buffer2;                           /* We use only buffer 1.  */
-};
-
-enum tx_desc0_status_bits {
-        Tx0DescOwned=0x80000000, Tx0DescError=0x8000, Tx0NoCarrier=0x0800,
-        Tx0LateColl=0x0200, Tx0ManyColl=0x0100, Tx0Underflow=0x02,
-};
-enum tx_desc1_status_bits {
-        Tx1ComplIntr=0x80000000, Tx1LastSeg=0x40000000, Tx1FirstSeg=0x20000000,
-        Tx1SetupPkt=0x08000000, Tx1DisableCRC=0x04000000, Tx1RingWrap=0x02000000,
-        Tx1ChainDesc=0x01000000, Tx1NoPad=0x800000, Tx1HashSetup=0x400000,
-        Tx1WholePkt=(Tx1FirstSeg | Tx1LastSeg),
-};
-enum rx_desc0_status_bits {
-        Rx0DescOwned=0x80000000, Rx0DescError=0x8000, Rx0NoSpace=0x4000,
-        Rx0Runt=0x0800, Rx0McastPkt=0x0400, Rx0FirstSeg=0x0200, Rx0LastSeg=0x0100,
-        Rx0HugeFrame=0x80, Rx0CRCError=0x02,
-        Rx0WholePkt=(Rx0FirstSeg | Rx0LastSeg),
-};
-enum rx_desc1_status_bits {
-        Rx1RingWrap=0x02000000, Rx1ChainDesc=0x01000000,
-};
-
-struct xircom_private {
-        struct xircom_rx_desc rx_ring[RX_RING_SIZE];
-        struct xircom_tx_desc tx_ring[TX_RING_SIZE];
-        /* The saved address of a sent-in-place packet/buffer, for skfree(). */
-        struct sk_buff* tx_skbuff[TX_RING_SIZE];
-
-        /* The X3201-3 requires 4-byte aligned tx bufs */
-        struct sk_buff* tx_aligned_skbuff[TX_RING_SIZE];
-
-        /* The addresses of receive-in-place skbuffs. */
-        struct sk_buff* rx_skbuff[RX_RING_SIZE];
-        u16 setup_frame[PKT_SETUP_SZ / sizeof(u16)];    /* Pseudo-Tx frame to init address table. */
-        int chip_id;
-        struct net_device_stats stats;
-        unsigned int cur_rx, cur_tx;            /* The next free ring entry */
-        unsigned int dirty_rx, dirty_tx;        /* The ring entries to be free()ed. */
-        unsigned int tx_full:1;                         /* The Tx queue is full. */
-        unsigned int speed100:1;
-        unsigned int full_duplex:1;                     /* Full-duplex operation requested. */
-        unsigned int autoneg:1;
-        unsigned int default_port:4;            /* Last dev->if_port value. */
-        unsigned int open:1;
-        unsigned int csr0;                                      /* CSR0 setting. */
-        unsigned int csr6;                                      /* Current CSR6 control settings. */
-        u16 to_advertise;                                       /* NWay capabilities advertised.  */
-        u16 advertising[4];
-        signed char phys[4], mii_cnt;           /* MII device addresses. */
-        int saved_if_port;
-        struct pci_dev *pdev;
-        spinlock_t lock;
-};
-
-static int mdio_read(struct net_device *dev, int phy_id, int location);
-static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
-static void xircom_up(struct net_device *dev);
-static void xircom_down(struct net_device *dev);
-static int xircom_open(struct net_device *dev);
-static void xircom_tx_timeout(struct net_device *dev);
-static void xircom_init_ring(struct net_device *dev);
-static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static int xircom_rx(struct net_device *dev);
-static void xircom_media_change(struct net_device *dev);
-static irqreturn_t xircom_interrupt(int irq, void *dev_instance);
-static int xircom_close(struct net_device *dev);
-static struct net_device_stats *xircom_get_stats(struct net_device *dev);
-static int xircom_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static void set_rx_mode(struct net_device *dev);
-static void check_duplex(struct net_device *dev);
-static const struct ethtool_ops ops;
-
-
-/* The Xircom cards are picky about when certain bits in CSR6 can be
-   manipulated.  Keith Owens <kaos@ocs.com.au>. */
-static void outl_CSR6(u32 newcsr6, long ioaddr)
-{
-        const int strict_bits =
-                TxThresh10 | TxStoreForw | TxThreshMask | EnableTxRx | FullDuplexBit;
-    int csr5, csr5_22_20, csr5_19_17, currcsr6, attempts = 200;
-    unsigned long flags;
-    save_flags(flags);
-    cli();
-        /* mask out the reserved bits that always read 0 on the Xircom cards */
-        newcsr6 &= ~ReservedZeroMask;
-        /* or in the reserved bits that always read 1 */
-        newcsr6 |= ReservedOneMask;
-    currcsr6 = inl(ioaddr + CSR6);
-    if (((newcsr6 & strict_bits) == (currcsr6 & strict_bits)) ||
-        ((currcsr6 & ~EnableTxRx) == 0)) {
-                outl(newcsr6, ioaddr + CSR6);   /* safe */
-                restore_flags(flags);
-                return;
-    }
-    /* make sure the transmitter and receiver are stopped first */
-    currcsr6 &= ~EnableTxRx;
-    while (1) {
-                csr5 = inl(ioaddr + CSR5);
-                if (csr5 == 0xffffffff)
-                        break;  /* cannot read csr5, card removed? */
-                csr5_22_20 = csr5 & 0x700000;
-                csr5_19_17 = csr5 & 0x0e0000;
-                if ((csr5_22_20 == 0 || csr5_22_20 == 0x600000) &&
-                        (csr5_19_17 == 0 || csr5_19_17 == 0x80000 || csr5_19_17 == 0xc0000))
-                        break;  /* both are stopped or suspended */
-                if (!--attempts) {
-                        printk(KERN_INFO DRV_NAME ": outl_CSR6 too many attempts,"
-                                   "csr5=0x%08x\n", csr5);
-                        outl(newcsr6, ioaddr + CSR6);  /* unsafe but do it anyway */
-                        restore_flags(flags);
-                        return;
-                }
-                outl(currcsr6, ioaddr + CSR6);
-                udelay(1);
-    }
-    /* now it is safe to change csr6 */
-    outl(newcsr6, ioaddr + CSR6);
-    restore_flags(flags);
-}
-
-
-static void __devinit read_mac_address(struct net_device *dev)
-{
-        long ioaddr = dev->base_addr;
-        int i, j;
-        unsigned char tuple, link, data_id, data_count;
-
-        /* Xircom has its address stored in the CIS;
-         * we access it through the boot rom interface for now
-         * this might not work, as the CIS is not parsed but I
-         * (danilo) use the offset I found on my card's CIS !!!
-         *
-         * Doug Ledford: I changed this routine around so that it
-         * walks the CIS memory space, parsing the config items, and
-         * finds the proper lan_node_id tuple and uses the data
-         * stored there.
-         */
-        outl(1 << 12, ioaddr + CSR9); /* enable boot rom access */
-        for (i = 0x100; i < 0x1f7; i += link+2) {
-                outl(i, ioaddr + CSR10);
-                tuple = inl(ioaddr + CSR9) & 0xff;
-                outl(i + 1, ioaddr + CSR10);
-                link = inl(ioaddr + CSR9) & 0xff;
-                outl(i + 2, ioaddr + CSR10);
-                data_id = inl(ioaddr + CSR9) & 0xff;
-                outl(i + 3, ioaddr + CSR10);
-                data_count = inl(ioaddr + CSR9) & 0xff;
-                if ( (tuple == 0x22) &&
-                         (data_id == 0x04) && (data_count == 0x06) ) {
-                        /*
-                         * This is it.  We have the data we want.
-                         */
-                        for (j = 0; j < 6; j++) {
-                                outl(i + j + 4, ioaddr + CSR10);
-                                dev->dev_addr[j] = inl(ioaddr + CSR9) & 0xff;
-                        }
-                        break;
-                } else if (link == 0) {
-                        break;
-                }
-        }
-}
-
-
-/*
- * locate the MII interfaces and initialize them.
- * we disable full-duplex modes here,
- * because we don't know how to handle them.
- */
-static void find_mii_transceivers(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        int phy, phy_idx;
-
-        if (media_cap[tp->default_port] & MediaIsMII) {
-                u16 media2advert[] = { 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200 };
-                tp->to_advertise = media2advert[tp->default_port - 9];
-        } else
-                tp->to_advertise =
-                        /*ADVERTISE_100BASE4 | ADVERTISE_100FULL |*/ ADVERTISE_100HALF |
-                        /*ADVERTISE_10FULL |*/ ADVERTISE_10HALF | ADVERTISE_CSMA;
-
-        /* Find the connected MII xcvrs.
-           Doing this in open() would allow detecting external xcvrs later,
-           but takes much time. */
-        for (phy = 0, phy_idx = 0; phy < 32 && phy_idx < sizeof(tp->phys); phy++) {
-                int mii_status = mdio_read(dev, phy, MII_BMSR);
-                if ((mii_status & (BMSR_100BASE4 | BMSR_100HALF | BMSR_10HALF)) == BMSR_100BASE4 ||
-                        ((mii_status & BMSR_100BASE4) == 0 &&
-                         (mii_status & (BMSR_100FULL | BMSR_100HALF | BMSR_10FULL | BMSR_10HALF)) != 0)) {
-                        int mii_reg0 = mdio_read(dev, phy, MII_BMCR);
-                        int mii_advert = mdio_read(dev, phy, MII_ADVERTISE);
-                        int reg4 = ((mii_status >> 6) & tp->to_advertise) | ADVERTISE_CSMA;
-                        tp->phys[phy_idx] = phy;
-                        tp->advertising[phy_idx++] = reg4;
-                        printk(KERN_INFO "%s:  MII transceiver #%d "
-                                   "config %4.4x status %4.4x advertising %4.4x.\n",
-                                   dev->name, phy, mii_reg0, mii_status, mii_advert);
-                }
-        }
-        tp->mii_cnt = phy_idx;
-        if (phy_idx == 0) {
-                printk(KERN_INFO "%s: ***WARNING***: No MII transceiver found!\n",
-                           dev->name);
-                tp->phys[0] = 0;
-        }
-}
-
-
-/*
- * To quote Arjan van de Ven:
- *   transceiver_voodoo() enables the external UTP plug thingy.
- *   it's called voodoo as I stole this code and cannot cross-reference
- *   it with the specification.
- * Actually it seems to go like this:
- * - GPIO2 enables the MII itself so we can talk to it. The MII gets reset
- *   so any prior MII settings are lost.
- * - GPIO0 enables the TP port so the MII can talk to the network.
- * - a software reset will reset both GPIO pins.
- * I also moved the software reset here, because doing it in xircom_up()
- * required enabling the GPIO pins each time, which reset the MII each time.
- * Thus we couldn't control the MII -- which sucks because we don't know
- * how to handle full-duplex modes so we *must* disable them.
- */
-static void transceiver_voodoo(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-
-        /* Reset the chip, holding bit 0 set at least 50 PCI cycles. */
-        outl(SoftwareReset, ioaddr + CSR0);
-        udelay(2);
-
-        /* Deassert reset. */
-        outl(tp->csr0, ioaddr + CSR0);
-
-        /* Reset the xcvr interface and turn on heartbeat. */
-        outl(0x0008, ioaddr + CSR15);
-        udelay(5);  /* The delays are Xircom-recommended to give the
-                                 * chipset time to reset the actual hardware
-                                 * on the PCMCIA card
-                                 */
-        outl(0xa8050000, ioaddr + CSR15);
-        udelay(5);
-        outl(0xa00f0000, ioaddr + CSR15);
-        udelay(5);
-
-        outl_CSR6(0, ioaddr);
-        //outl_CSR6(FullDuplexBit, ioaddr);
-}
-
-
-static int __devinit xircom_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
-{
-        struct net_device *dev;
-        struct xircom_private *tp;
-        static int board_idx = -1;
-        int chip_idx = id->driver_data;
-        long ioaddr;
-        int i;
-
-/* when built into the kernel, we only print version if device is found */
-#ifndef MODULE
-        static int printed_version;
-        if (!printed_version++)
-                printk(version);
-#endif
-
-        //printk(KERN_INFO "xircom_init_one(%s)\n", pci_name(pdev));
-
-        board_idx++;
-
-        if (pci_enable_device(pdev))
-                return -ENODEV;
-
-        pci_set_master(pdev);
-
-        ioaddr = pci_resource_start(pdev, 0);
-        dev = alloc_etherdev(sizeof(*tp));
-        if (!dev) {
-                printk (KERN_ERR DRV_NAME "%d: cannot alloc etherdev, aborting\n", board_idx);
-                return -ENOMEM;
-        }
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        dev->base_addr = ioaddr;
-        dev->irq = pdev->irq;
-
-        if (pci_request_regions(pdev, dev->name)) {
-                printk (KERN_ERR DRV_NAME " %d: cannot reserve PCI resources, aborting\n", board_idx);
-                goto err_out_free_netdev;
-        }
-
-        /* Bring the chip out of sleep mode.
-           Caution: Snooze mode does not work with some boards! */
-        if (xircom_tbl[chip_idx].flags & HAS_ACPI)
-                pci_write_config_dword(pdev, PCI_POWERMGMT, 0);
-
-        /* Stop the chip's Tx and Rx processes. */
-        outl_CSR6(inl(ioaddr + CSR6) & ~EnableTxRx, ioaddr);
-        /* Clear the missed-packet counter. */
-        (volatile int)inl(ioaddr + CSR8);
-
-        tp = netdev_priv(dev);
-
-        spin_lock_init(&tp->lock);
-        tp->pdev = pdev;
-        tp->chip_id = chip_idx;
-        /* BugFixes: The 21143-TD hangs with PCI Write-and-Invalidate cycles. */
-        /* XXX: is this necessary for Xircom? */
-        tp->csr0 = csr0 & ~EnableMWI;
-
-        pci_set_drvdata(pdev, dev);
-
-        /* The lower four bits are the media type. */
-        if (board_idx >= 0 && board_idx < MAX_UNITS) {
-                tp->default_port = options[board_idx] & 15;
-                if ((options[board_idx] & 0x90) || full_duplex[board_idx] > 0)
-                        tp->full_duplex = 1;
-                if (mtu[board_idx] > 0)
-                        dev->mtu = mtu[board_idx];
-        }
-        if (dev->mem_start)
-                tp->default_port = dev->mem_start;
-        if (tp->default_port) {
-                if (media_cap[tp->default_port] & MediaAlwaysFD)
-                        tp->full_duplex = 1;
-        }
-        if (tp->full_duplex)
-                tp->autoneg = 0;
-        else
-                tp->autoneg = 1;
-        tp->speed100 = 1;
-
-        /* The Xircom-specific entries in the device structure. */
-        dev->open = &xircom_open;
-        dev->hard_start_xmit = &xircom_start_xmit;
-        dev->stop = &xircom_close;
-        dev->get_stats = &xircom_get_stats;
-        dev->do_ioctl = &xircom_ioctl;
-#ifdef HAVE_MULTICAST
-        dev->set_multicast_list = &set_rx_mode;
-#endif
-        dev->tx_timeout = xircom_tx_timeout;
-        dev->watchdog_timeo = TX_TIMEOUT;
-        SET_ETHTOOL_OPS(dev, &ops);
-
-        transceiver_voodoo(dev);
-
-        read_mac_address(dev);
-
-        if (register_netdev(dev))
-                goto err_out_cleardev;
-
-        printk(KERN_INFO "%s: %s rev %d at %#3lx,",
-               dev->name, xircom_tbl[chip_idx].chip_name, pdev->revision, ioaddr);
-        for (i = 0; i < 6; i++)
-                printk("%c%2.2X", i ? ':' : ' ', dev->dev_addr[i]);
-        printk(", IRQ %d.\n", dev->irq);
-
-        if (xircom_tbl[chip_idx].flags & HAS_MII) {
-                find_mii_transceivers(dev);
-                check_duplex(dev);
-        }
-
-        return 0;
-
-err_out_cleardev:
-        pci_set_drvdata(pdev, NULL);
-        pci_release_regions(pdev);
-err_out_free_netdev:
-        free_netdev(dev);
-        return -ENODEV;
-}
-
-
-/* MII transceiver control section.
-   Read and write the MII registers using software-generated serial
-   MDIO protocol.  See the MII specifications or DP83840A data sheet
-   for details. */
-
-/* The maximum data clock rate is 2.5 Mhz.  The minimum timing is usually
-   met by back-to-back PCI I/O cycles, but we insert a delay to avoid
-   "overclocking" issues or future 66Mhz PCI. */
-#define mdio_delay() inl(mdio_addr)
-
-/* Read and write the MII registers using software-generated serial
-   MDIO protocol.  It is just different enough from the EEPROM protocol
-   to not share code.  The maxium data clock rate is 2.5 Mhz. */
-#define MDIO_SHIFT_CLK  0x10000
-#define MDIO_DATA_WRITE0 0x00000
-#define MDIO_DATA_WRITE1 0x20000
-#define MDIO_ENB                0x00000         /* Ignore the 0x02000 databook setting. */
-#define MDIO_ENB_IN             0x40000
-#define MDIO_DATA_READ  0x80000
-
-static int mdio_read(struct net_device *dev, int phy_id, int location)
-{
-        int i;
-        int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
-        int retval = 0;
-        long ioaddr = dev->base_addr;
-        long mdio_addr = ioaddr + CSR9;
-
-        /* Establish sync by sending at least 32 logic ones. */
-        for (i = 32; i >= 0; i--) {
-                outl(MDIO_ENB | MDIO_DATA_WRITE1, mdio_addr);
-                mdio_delay();
-                outl(MDIO_ENB | MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
-        }
-        /* Shift the read command bits out. */
-        for (i = 15; i >= 0; i--) {
-                int dataval = (read_cmd & (1 << i)) ? MDIO_DATA_WRITE1 : 0;
-
-                outl(MDIO_ENB | dataval, mdio_addr);
-                mdio_delay();
-                outl(MDIO_ENB | dataval | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
-        }
-        /* Read the two transition, 16 data, and wire-idle bits. */
-        for (i = 19; i > 0; i--) {
-                outl(MDIO_ENB_IN, mdio_addr);
-                mdio_delay();
-                retval = (retval << 1) | ((inl(mdio_addr) & MDIO_DATA_READ) ? 1 : 0);
-                outl(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
-        }
-        return (retval>>1) & 0xffff;
-}
-
-
-static void mdio_write(struct net_device *dev, int phy_id, int location, int value)
-{
-        int i;
-        int cmd = (0x5002 << 16) | (phy_id << 23) | (location << 18) | value;
-        long ioaddr = dev->base_addr;
-        long mdio_addr = ioaddr + CSR9;
-
-        /* Establish sync by sending 32 logic ones. */
-        for (i = 32; i >= 0; i--) {
-                outl(MDIO_ENB | MDIO_DATA_WRITE1, mdio_addr);
-                mdio_delay();
-                outl(MDIO_ENB | MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
-        }
-        /* Shift the command bits out. */
-        for (i = 31; i >= 0; i--) {
-                int dataval = (cmd & (1 << i)) ? MDIO_DATA_WRITE1 : 0;
-                outl(MDIO_ENB | dataval, mdio_addr);
-                mdio_delay();
-                outl(MDIO_ENB | dataval | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
-        }
-        /* Clear out extra bits. */
-        for (i = 2; i > 0; i--) {
-                outl(MDIO_ENB_IN, mdio_addr);
-                mdio_delay();
-                outl(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
-        }
-        return;
-}
-
-
-static void
-xircom_up(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-        int i;
-
-        xircom_init_ring(dev);
-        /* Clear the tx ring */
-        for (i = 0; i < TX_RING_SIZE; i++) {
-                tp->tx_skbuff[i] = NULL;
-                tp->tx_ring[i].status = 0;
-        }
-
-        if (xircom_debug > 1)
-                printk(KERN_DEBUG "%s: xircom_up() irq %d.\n", dev->name, dev->irq);
-
-        outl(virt_to_bus(tp->rx_ring), ioaddr + CSR3);
-        outl(virt_to_bus(tp->tx_ring), ioaddr + CSR4);
-
-        tp->saved_if_port = dev->if_port;
-        if (dev->if_port == 0)
-                dev->if_port = tp->default_port;
-
-        tp->csr6 = TxThresh10 /*| FullDuplexBit*/;                                              /* XXX: why 10 and not 100? */
-
-        set_rx_mode(dev);
-
-        /* Start the chip's Tx to process setup frame. */
-        outl_CSR6(tp->csr6, ioaddr);
-        outl_CSR6(tp->csr6 | EnableTx, ioaddr);
-
-        /* Acknowledge all outstanding interrupts sources */
-        outl(xircom_tbl[tp->chip_id].valid_intrs, ioaddr + CSR5);
-        /* Enable interrupts by setting the interrupt mask. */
-        outl(xircom_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7);
-        /* Enable Rx */
-        outl_CSR6(tp->csr6 | EnableTxRx, ioaddr);
-        /* Rx poll demand */
-        outl(0, ioaddr + CSR2);
-
-        /* Tell the net layer we're ready */
-        netif_start_queue (dev);
-
-        /* Check current media state */
-        xircom_media_change(dev);
-
-        if (xircom_debug > 2) {
-                printk(KERN_DEBUG "%s: Done xircom_up(), CSR0 %8.8x, CSR5 %8.8x CSR6 %8.8x.\n",
-                           dev->name, inl(ioaddr + CSR0), inl(ioaddr + CSR5),
-                           inl(ioaddr + CSR6));
-        }
-}
-
-
-static int
-xircom_open(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-
-        if (request_irq(dev->irq, &xircom_interrupt, IRQF_SHARED, dev->name, dev))
-                return -EAGAIN;
-
-        xircom_up(dev);
-        tp->open = 1;
-
-        return 0;
-}
-
-
-static void xircom_tx_timeout(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-
-        if (media_cap[dev->if_port] & MediaIsMII) {
-                /* Do nothing -- the media monitor should handle this. */
-                if (xircom_debug > 1)
-                        printk(KERN_WARNING "%s: Transmit timeout using MII device.\n",
-                                   dev->name);
-        }
-
-#if defined(way_too_many_messages)
-        if (xircom_debug > 3) {
-                int i;
-                for (i = 0; i < RX_RING_SIZE; i++) {
-                        u8 *buf = (u8 *)(tp->rx_ring[i].buffer1);
-                        int j;
-                        printk(KERN_DEBUG "%2d: %8.8x %8.8x %8.8x %8.8x  "
-                                   "%2.2x %2.2x %2.2x.\n",
-                                   i, (unsigned int)tp->rx_ring[i].status,
-                                   (unsigned int)tp->rx_ring[i].length,
-                                   (unsigned int)tp->rx_ring[i].buffer1,
-                                   (unsigned int)tp->rx_ring[i].buffer2,
-                                   buf[0], buf[1], buf[2]);
-                        for (j = 0; buf[j] != 0xee && j < 1600; j++)
-                                if (j < 100) printk(" %2.2x", buf[j]);
-                        printk(" j=%d.\n", j);
-                }
-                printk(KERN_DEBUG "  Rx ring %8.8x: ", (int)tp->rx_ring);
-                for (i = 0; i < RX_RING_SIZE; i++)
-                        printk(" %8.8x", (unsigned int)tp->rx_ring[i].status);
-                printk("\n" KERN_DEBUG "  Tx ring %8.8x: ", (int)tp->tx_ring);
-                for (i = 0; i < TX_RING_SIZE; i++)
-                        printk(" %8.8x", (unsigned int)tp->tx_ring[i].status);
-                printk("\n");
-        }
-#endif
-
-        /* Stop and restart the chip's Tx/Rx processes . */
-        outl_CSR6(tp->csr6 | EnableRx, ioaddr);
-        outl_CSR6(tp->csr6 | EnableTxRx, ioaddr);
-        /* Trigger an immediate transmit demand. */
-        outl(0, ioaddr + CSR1);
-
-        dev->trans_start = jiffies;
-        netif_wake_queue (dev);
-        tp->stats.tx_errors++;
-}
-
-
-/* Initialize the Rx and Tx rings, along with various 'dev' bits. */
-static void xircom_init_ring(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        int i;
-
-        tp->tx_full = 0;
-        tp->cur_rx = tp->cur_tx = 0;
-        tp->dirty_rx = tp->dirty_tx = 0;
-
-        for (i = 0; i < RX_RING_SIZE; i++) {
-                tp->rx_ring[i].status = 0;
-                tp->rx_ring[i].length = PKT_BUF_SZ;
-                tp->rx_ring[i].buffer2 = virt_to_bus(&tp->rx_ring[i+1]);
-                tp->rx_skbuff[i] = NULL;
-        }
-        /* Mark the last entry as wrapping the ring. */
-        tp->rx_ring[i-1].length = PKT_BUF_SZ | Rx1RingWrap;
-        tp->rx_ring[i-1].buffer2 = virt_to_bus(&tp->rx_ring[0]);
-
-        for (i = 0; i < RX_RING_SIZE; i++) {
-                /* Note the receive buffer must be longword aligned.
-                   dev_alloc_skb() provides 16 byte alignment.  But do *not*
-                   use skb_reserve() to align the IP header! */
-                struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
-                tp->rx_skbuff[i] = skb;
-                if (skb == NULL)
-                        break;
-                skb->dev = dev;                 /* Mark as being used by this device. */
-                tp->rx_ring[i].status = Rx0DescOwned;   /* Owned by Xircom chip */
-                tp->rx_ring[i].buffer1 = virt_to_bus(skb->data);
-        }
-        tp->dirty_rx = (unsigned int)(i - RX_RING_SIZE);
-
-        /* The Tx buffer descriptor is filled in as needed, but we
-           do need to clear the ownership bit. */
-        for (i = 0; i < TX_RING_SIZE; i++) {
-                tp->tx_skbuff[i] = NULL;
-                tp->tx_ring[i].status = 0;
-                tp->tx_ring[i].buffer2 = virt_to_bus(&tp->tx_ring[i+1]);
-                if (tp->chip_id == X3201_3)
-                        tp->tx_aligned_skbuff[i] = dev_alloc_skb(PKT_BUF_SZ);
-        }
-        tp->tx_ring[i-1].buffer2 = virt_to_bus(&tp->tx_ring[0]);
-}
-
-
-static int
-xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        int entry;
-        u32 flag;
-
-        /* Caution: the write order is important here, set the base address
-           with the "ownership" bits last. */
-
-        /* Calculate the next Tx descriptor entry. */
-        entry = tp->cur_tx % TX_RING_SIZE;
-
-        tp->tx_skbuff[entry] = skb;
-        if (tp->chip_id == X3201_3) {
-                skb_copy_from_linear_data(skb,
-                                          tp->tx_aligned_skbuff[entry]->data,
-                                          skb->len);
-                tp->tx_ring[entry].buffer1 = virt_to_bus(tp->tx_aligned_skbuff[entry]->data);
-        } else
-                tp->tx_ring[entry].buffer1 = virt_to_bus(skb->data);
-
-        if (tp->cur_tx - tp->dirty_tx < TX_RING_SIZE/2) {/* Typical path */
-                flag = Tx1WholePkt; /* No interrupt */
-        } else if (tp->cur_tx - tp->dirty_tx == TX_RING_SIZE/2) {
-                flag = Tx1WholePkt | Tx1ComplIntr; /* Tx-done intr. */
-        } else if (tp->cur_tx - tp->dirty_tx < TX_RING_SIZE - 2) {
-                flag = Tx1WholePkt; /* No Tx-done intr. */
-        } else {
-                /* Leave room for set_rx_mode() to fill entries. */
-                flag = Tx1WholePkt | Tx1ComplIntr; /* Tx-done intr. */
-                tp->tx_full = 1;
-        }
-        if (entry == TX_RING_SIZE - 1)
-                flag |= Tx1WholePkt | Tx1ComplIntr | Tx1RingWrap;
-
-        tp->tx_ring[entry].length = skb->len | flag;
-        tp->tx_ring[entry].status = Tx0DescOwned;       /* Pass ownership to the chip. */
-        tp->cur_tx++;
-        if (tp->tx_full)
-                netif_stop_queue (dev);
-        else
-                netif_wake_queue (dev);
-
-        /* Trigger an immediate transmit demand. */
-        outl(0, dev->base_addr + CSR1);
-
-        dev->trans_start = jiffies;
-
-        return 0;
-}
-
-
-static void xircom_media_change(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-        u16 reg0, reg1, reg4, reg5;
-        u32 csr6 = inl(ioaddr + CSR6), newcsr6;
-
-        /* reset status first */
-        mdio_read(dev, tp->phys[0], MII_BMCR);
-        mdio_read(dev, tp->phys[0], MII_BMSR);
-
-        reg0 = mdio_read(dev, tp->phys[0], MII_BMCR);
-        reg1 = mdio_read(dev, tp->phys[0], MII_BMSR);
-
-        if (reg1 & BMSR_LSTATUS) {
-                /* link is up */
-                if (reg0 & BMCR_ANENABLE) {
-                        /* autonegotiation is enabled */
-                        reg4 = mdio_read(dev, tp->phys[0], MII_ADVERTISE);
-                        reg5 = mdio_read(dev, tp->phys[0], MII_LPA);
-                        if (reg4 & ADVERTISE_100FULL && reg5 & LPA_100FULL) {
-                                tp->speed100 = 1;
-                                tp->full_duplex = 1;
-                        } else if (reg4 & ADVERTISE_100HALF && reg5 & LPA_100HALF) {
-                                tp->speed100 = 1;
-                                tp->full_duplex = 0;
-                        } else if (reg4 & ADVERTISE_10FULL && reg5 & LPA_10FULL) {
-                                tp->speed100 = 0;
-                                tp->full_duplex = 1;
-                        } else {
-                                tp->speed100 = 0;
-                                tp->full_duplex = 0;
-                        }
-                } else {
-                        /* autonegotiation is disabled */
-                        if (reg0 & BMCR_SPEED100)
-                                tp->speed100 = 1;
-                        else
-                                tp->speed100 = 0;
-                        if (reg0 & BMCR_FULLDPLX)
-                                tp->full_duplex = 1;
-                        else
-                                tp->full_duplex = 0;
-                }
-                printk(KERN_DEBUG "%s: Link is up, running at %sMbit %s-duplex\n",
-                       dev->name,
-                       tp->speed100 ? "100" : "10",
-                       tp->full_duplex ? "full" : "half");
-                netif_carrier_on(dev);
-                newcsr6 = csr6 & ~FullDuplexBit;
-                if (tp->full_duplex)
-                        newcsr6 |= FullDuplexBit;
-                if (newcsr6 != csr6)
-                        outl_CSR6(newcsr6, ioaddr + CSR6);
-        } else {
-                printk(KERN_DEBUG "%s: Link is down\n", dev->name);
-                netif_carrier_off(dev);
-        }
-}
-
-
-static void check_duplex(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        u16 reg0;
-
-        mdio_write(dev, tp->phys[0], MII_BMCR, BMCR_RESET);
-        udelay(500);
-        while (mdio_read(dev, tp->phys[0], MII_BMCR) & BMCR_RESET);
-
-        reg0 = mdio_read(dev, tp->phys[0], MII_BMCR);
-        mdio_write(dev, tp->phys[0], MII_ADVERTISE, tp->advertising[0]);
-
-        if (tp->autoneg) {
-                reg0 &= ~(BMCR_SPEED100 | BMCR_FULLDPLX);
-                reg0 |= BMCR_ANENABLE | BMCR_ANRESTART;
-        } else {
-                reg0 &= ~(BMCR_ANENABLE | BMCR_ANRESTART);
-                if (tp->speed100)
-                        reg0 |= BMCR_SPEED100;
-                if (tp->full_duplex)
-                        reg0 |= BMCR_FULLDPLX;
-                printk(KERN_DEBUG "%s: Link forced to %sMbit %s-duplex\n",
-                       dev->name,
-                       tp->speed100 ? "100" : "10",
-                       tp->full_duplex ? "full" : "half");
-        }
-        mdio_write(dev, tp->phys[0], MII_BMCR, reg0);
-}
-
-
-/* The interrupt handler does all of the Rx thread work and cleans up
-   after the Tx thread. */
-static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
-{
-        struct net_device *dev = dev_instance;
-        struct xircom_private *tp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-        int csr5, work_budget = max_interrupt_work;
-        int handled = 0;
-
-        spin_lock (&tp->lock);
-
-        do {
-                csr5 = inl(ioaddr + CSR5);
-                /* Acknowledge all of the current interrupt sources ASAP. */
-                outl(csr5 & 0x0001ffff, ioaddr + CSR5);
-
-                if (xircom_debug > 4)
-                        printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x.\n",
-                                   dev->name, csr5, inl(dev->base_addr + CSR5));
-
-                if (csr5 == 0xffffffff)
-                        break;  /* all bits set, assume PCMCIA card removed */
-
-                if ((csr5 & (NormalIntr|AbnormalIntr)) == 0)
-                        break;
-
-                handled = 1;
-
-                if (csr5 & (RxIntr | RxNoBuf))
-                        work_budget -= xircom_rx(dev);
-
-                if (csr5 & (TxNoBuf | TxDied | TxIntr)) {
-                        unsigned int dirty_tx;
-
-                        for (dirty_tx = tp->dirty_tx; tp->cur_tx - dirty_tx > 0;
-                                 dirty_tx++) {
-                                int entry = dirty_tx % TX_RING_SIZE;
-                                int status = tp->tx_ring[entry].status;
-
-                                if (status < 0)
-                                        break;                  /* It still hasn't been Txed */
-                                /* Check for Rx filter setup frames. */
-                                if (tp->tx_skbuff[entry] == NULL)
-                                  continue;
-
-                                if (status & Tx0DescError) {
-                                        /* There was an major error, log it. */
-#ifndef final_version
-                                        if (xircom_debug > 1)
-                                                printk(KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n",
-                                                           dev->name, status);
-#endif
-                                        tp->stats.tx_errors++;
-                                        if (status & Tx0ManyColl) {
-                                                tp->stats.tx_aborted_errors++;
-                                        }
-                                        if (status & Tx0NoCarrier) tp->stats.tx_carrier_errors++;
-                                        if (status & Tx0LateColl) tp->stats.tx_window_errors++;
-                                        if (status & Tx0Underflow) tp->stats.tx_fifo_errors++;
-                                } else {
-                                        tp->stats.tx_bytes += tp->tx_ring[entry].length & 0x7ff;
-                                        tp->stats.collisions += (status >> 3) & 15;
-                                        tp->stats.tx_packets++;
-                                }
-
-                                /* Free the original skb. */
-                                dev_kfree_skb_irq(tp->tx_skbuff[entry]);
-                                tp->tx_skbuff[entry] = NULL;
-                        }
-
-#ifndef final_version
-                        if (tp->cur_tx - dirty_tx > TX_RING_SIZE) {
-                                printk(KERN_ERR "%s: Out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
-                                           dev->name, dirty_tx, tp->cur_tx, tp->tx_full);
-                                dirty_tx += TX_RING_SIZE;
-                        }
-#endif
-
-                        if (tp->tx_full &&
-                            tp->cur_tx - dirty_tx  < TX_RING_SIZE - 2)
-                                /* The ring is no longer full */
-                                tp->tx_full = 0;
-
-                        if (tp->tx_full)
-                                netif_stop_queue (dev);
-                        else
-                                netif_wake_queue (dev);
-
-                        tp->dirty_tx = dirty_tx;
-                        if (csr5 & TxDied) {
-                                if (xircom_debug > 2)
-                                        printk(KERN_WARNING "%s: The transmitter stopped."
-                                                   "  CSR5 is %x, CSR6 %x, new CSR6 %x.\n",
-                                                   dev->name, csr5, inl(ioaddr + CSR6), tp->csr6);
-                                outl_CSR6(tp->csr6 | EnableRx, ioaddr);
-                                outl_CSR6(tp->csr6 | EnableTxRx, ioaddr);
-                        }
-                }
-
-                /* Log errors. */
-                if (csr5 & AbnormalIntr) {      /* Abnormal error summary bit. */
-                        if (csr5 & LinkChange)
-                                xircom_media_change(dev);
-                        if (csr5 & TxFIFOUnderflow) {
-                                if ((tp->csr6 & TxThreshMask) != TxThreshMask)
-                                        tp->csr6 += (1 << TxThreshShift);       /* Bump up the Tx threshold */
-                                else
-                                        tp->csr6 |= TxStoreForw;  /* Store-n-forward. */
-                                /* Restart the transmit process. */
-                                outl_CSR6(tp->csr6 | EnableRx, ioaddr);
-                                outl_CSR6(tp->csr6 | EnableTxRx, ioaddr);
-                        }
-                        if (csr5 & RxDied) {            /* Missed a Rx frame. */
-                                tp->stats.rx_errors++;
-                                tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff;
-                                outl_CSR6(tp->csr6 | EnableTxRx, ioaddr);
-                        }
-                        /* Clear all error sources, included undocumented ones! */
-                        outl(0x0800f7ba, ioaddr + CSR5);
-                }
-                if (--work_budget < 0) {
-                        if (xircom_debug > 1)
-                                printk(KERN_WARNING "%s: Too much work during an interrupt, "
-                                           "csr5=0x%8.8x.\n", dev->name, csr5);
-                        /* Acknowledge all interrupt sources. */
-                        outl(0x8001ffff, ioaddr + CSR5);
-                        break;
-                }
-        } while (1);
-
-        if (xircom_debug > 3)
-                printk(KERN_DEBUG "%s: exiting interrupt, csr5=%#4.4x.\n",
-                           dev->name, inl(ioaddr + CSR5));
-
-        spin_unlock (&tp->lock);
-        return IRQ_RETVAL(handled);
-}
-
-
-static int
-xircom_rx(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        int entry = tp->cur_rx % RX_RING_SIZE;
-        int rx_work_limit = tp->dirty_rx + RX_RING_SIZE - tp->cur_rx;
-        int work_done = 0;
-
-        if (xircom_debug > 4)
-                printk(KERN_DEBUG " In xircom_rx(), entry %d %8.8x.\n", entry,
-                           tp->rx_ring[entry].status);
-        /* If we own the next entry, it's a new packet. Send it up. */
-        while (tp->rx_ring[entry].status >= 0) {
-                s32 status = tp->rx_ring[entry].status;
-
-                if (xircom_debug > 5)
-                        printk(KERN_DEBUG " In xircom_rx(), entry %d %8.8x.\n", entry,
-                                   tp->rx_ring[entry].status);
-                if (--rx_work_limit < 0)
-                        break;
-                if ((status & 0x38008300) != 0x0300) {
-                        if ((status & 0x38000300) != 0x0300) {
-                                /* Ignore earlier buffers. */
-                                if ((status & 0xffff) != 0x7fff) {
-                                        if (xircom_debug > 1)
-                                                printk(KERN_WARNING "%s: Oversized Ethernet frame "
-                                                           "spanned multiple buffers, status %8.8x!\n",
-                                                           dev->name, status);
-                                        tp->stats.rx_length_errors++;
-                                }
-                        } else if (status & Rx0DescError) {
-                                /* There was a fatal error. */
-                                if (xircom_debug > 2)
-                                        printk(KERN_DEBUG "%s: Receive error, Rx status %8.8x.\n",
-                                                   dev->name, status);
-                                tp->stats.rx_errors++; /* end of a packet.*/
-                                if (status & (Rx0Runt | Rx0HugeFrame)) tp->stats.rx_length_errors++;
-                                if (status & Rx0CRCError) tp->stats.rx_crc_errors++;
-                        }
-                } else {
-                        /* Omit the four octet CRC from the length. */
-                        short pkt_len = ((status >> 16) & 0x7ff) - 4;
-                        struct sk_buff *skb;
-
-#ifndef final_version
-                        if (pkt_len > 1518) {
-                                printk(KERN_WARNING "%s: Bogus packet size of %d (%#x).\n",
-                                           dev->name, pkt_len, pkt_len);
-                                pkt_len = 1518;
-                                tp->stats.rx_length_errors++;
-                        }
-#endif
-                        /* Check if the packet is long enough to accept without copying
-                           to a minimally-sized skbuff. */
-                        if (pkt_len < rx_copybreak
-                                && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
-                                skb_reserve(skb, 2);    /* 16 byte align the IP header */
-#if ! defined(__alpha__)
-                                skb_copy_to_linear_data(skb, bus_to_virt(tp->rx_ring[entry].buffer1),
-                                                                 pkt_len);
-                                skb_put(skb, pkt_len);
-#else
-                                memcpy(skb_put(skb, pkt_len),
-                                           bus_to_virt(tp->rx_ring[entry].buffer1), pkt_len);
-#endif
-                                work_done++;
-                        } else {        /* Pass up the skb already on the Rx ring. */
-                                skb_put(skb = tp->rx_skbuff[entry], pkt_len);
-                                tp->rx_skbuff[entry] = NULL;
-                        }
-                        skb->protocol = eth_type_trans(skb, dev);
-                        netif_rx(skb);
-                        dev->last_rx = jiffies;
-                        tp->stats.rx_packets++;
-                        tp->stats.rx_bytes += pkt_len;
-                }
-                entry = (++tp->cur_rx) % RX_RING_SIZE;
-        }
-
-        /* Refill the Rx ring buffers. */
-        for (; tp->cur_rx - tp->dirty_rx > 0; tp->dirty_rx++) {
-                entry = tp->dirty_rx % RX_RING_SIZE;
-                if (tp->rx_skbuff[entry] == NULL) {
-                        struct sk_buff *skb;
-                        skb = tp->rx_skbuff[entry] = dev_alloc_skb(PKT_BUF_SZ);
-                        if (skb == NULL)
-                                break;
-                        skb->dev = dev;                 /* Mark as being used by this device. */
-                        tp->rx_ring[entry].buffer1 = virt_to_bus(skb->data);
-                        work_done++;
-                }
-                tp->rx_ring[entry].status = Rx0DescOwned;
-        }
-
-        return work_done;
-}
-
-
-static void
-xircom_down(struct net_device *dev)
-{
-        long ioaddr = dev->base_addr;
-        struct xircom_private *tp = netdev_priv(dev);
-
-        /* Disable interrupts by clearing the interrupt mask. */
-        outl(0, ioaddr + CSR7);
-        /* Stop the chip's Tx and Rx processes. */
-        outl_CSR6(inl(ioaddr + CSR6) & ~EnableTxRx, ioaddr);
-
-        if (inl(ioaddr + CSR6) != 0xffffffff)
-                tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff;
-
-        dev->if_port = tp->saved_if_port;
-}
-
-
-static int
-xircom_close(struct net_device *dev)
-{
-        long ioaddr = dev->base_addr;
-        struct xircom_private *tp = netdev_priv(dev);
-        int i;
-
-        if (xircom_debug > 1)
-                printk(KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n",
-                           dev->name, inl(ioaddr + CSR5));
-
-        netif_stop_queue(dev);
-
-        if (netif_device_present(dev))
-                xircom_down(dev);
-
-        free_irq(dev->irq, dev);
-
-        /* Free all the skbuffs in the Rx queue. */
-        for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = tp->rx_skbuff[i];
-                tp->rx_skbuff[i] = NULL;
-                tp->rx_ring[i].status = 0;              /* Not owned by Xircom chip. */
-                tp->rx_ring[i].length = 0;
-                tp->rx_ring[i].buffer1 = 0xBADF00D0; /* An invalid address. */
-                if (skb) {
-                        dev_kfree_skb(skb);
-                }
-        }
-        for (i = 0; i < TX_RING_SIZE; i++) {
-                if (tp->tx_skbuff[i])
-                        dev_kfree_skb(tp->tx_skbuff[i]);
-                tp->tx_skbuff[i] = NULL;
-        }
-
-        tp->open = 0;
-        return 0;
-}
-
-
-static struct net_device_stats *xircom_get_stats(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-
-        if (netif_device_present(dev))
-                tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff;
-
-        return &tp->stats;
-}
-
-static int xircom_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        ecmd->supported =
-                        SUPPORTED_10baseT_Half |
-                        SUPPORTED_10baseT_Full |
-                        SUPPORTED_100baseT_Half |
-                        SUPPORTED_100baseT_Full |
-                        SUPPORTED_Autoneg |
-                        SUPPORTED_MII;
-
-        ecmd->advertising = ADVERTISED_MII;
-        if (tp->advertising[0] & ADVERTISE_10HALF)
-                ecmd->advertising |= ADVERTISED_10baseT_Half;
-        if (tp->advertising[0] & ADVERTISE_10FULL)
-                ecmd->advertising |= ADVERTISED_10baseT_Full;
-        if (tp->advertising[0] & ADVERTISE_100HALF)
-                ecmd->advertising |= ADVERTISED_100baseT_Half;
-        if (tp->advertising[0] & ADVERTISE_100FULL)
-                ecmd->advertising |= ADVERTISED_100baseT_Full;
-        if (tp->autoneg) {
-                ecmd->advertising |= ADVERTISED_Autoneg;
-                ecmd->autoneg = AUTONEG_ENABLE;
-        } else
-                ecmd->autoneg = AUTONEG_DISABLE;
-
-        ecmd->port = PORT_MII;
-        ecmd->transceiver = XCVR_INTERNAL;
-        ecmd->phy_address = tp->phys[0];
-        ecmd->speed = tp->speed100 ? SPEED_100 : SPEED_10;
-        ecmd->duplex = tp->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
-        ecmd->maxtxpkt = TX_RING_SIZE / 2;
-        ecmd->maxrxpkt = 0;
-        return 0;
-}
-
-static int xircom_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        u16 autoneg, speed100, full_duplex;
-
-        autoneg = (ecmd->autoneg == AUTONEG_ENABLE);
-        speed100 = (ecmd->speed == SPEED_100);
-        full_duplex = (ecmd->duplex == DUPLEX_FULL);
-
-        tp->autoneg = autoneg;
-        if (speed100 != tp->speed100 ||
-            full_duplex != tp->full_duplex) {
-                tp->speed100 = speed100;
-                tp->full_duplex = full_duplex;
-                /* change advertising bits */
-                tp->advertising[0] &= ~(ADVERTISE_10HALF |
-                                     ADVERTISE_10FULL |
-                                     ADVERTISE_100HALF |
-                                     ADVERTISE_100FULL |
-                                     ADVERTISE_100BASE4);
-                if (speed100) {
-                        if (full_duplex)
-                                tp->advertising[0] |= ADVERTISE_100FULL;
-                        else
-                                tp->advertising[0] |= ADVERTISE_100HALF;
-                } else {
-                        if (full_duplex)
-                                tp->advertising[0] |= ADVERTISE_10FULL;
-                        else
-                                tp->advertising[0] |= ADVERTISE_10HALF;
-                }
-        }
-        check_duplex(dev);
-        return 0;
-}
-
-static void xircom_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        strcpy(info->driver, DRV_NAME);
-        strcpy(info->version, DRV_VERSION);
-        strcpy(info->bus_info, pci_name(tp->pdev));
-}
-
-static const struct ethtool_ops ops = {
-        .get_settings = xircom_get_settings,
-        .set_settings = xircom_set_settings,
-        .get_drvinfo = xircom_get_drvinfo,
-};
-
-/* Provide ioctl() calls to examine the MII xcvr state. */
-static int xircom_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        u16 *data = (u16 *)&rq->ifr_ifru;
-        int phy = tp->phys[0] & 0x1f;
-        unsigned long flags;
-
-        switch(cmd) {
-        /* Legacy mii-diag interface */
-        case SIOCGMIIPHY:               /* Get address of MII PHY in use. */
-                if (tp->mii_cnt)
-                        data[0] = phy;
-                else
-                        return -ENODEV;
-                return 0;
-        case SIOCGMIIREG:               /* Read MII PHY register. */
-                save_flags(flags);
-                cli();
-                data[3] = mdio_read(dev, data[0] & 0x1f, data[1] & 0x1f);
-                restore_flags(flags);
-                return 0;
-        case SIOCSMIIREG:               /* Write MII PHY register. */
-                if (!capable(CAP_NET_ADMIN))
-                        return -EPERM;
-                save_flags(flags);
-                cli();
-                if (data[0] == tp->phys[0]) {
-                        u16 value = data[2];
-                        switch (data[1]) {
-                        case 0:
-                                if (value & (BMCR_RESET | BMCR_ANENABLE))
-                                        /* Autonegotiation. */
-                                        tp->autoneg = 1;
-                                else {
-                                        tp->full_duplex = (value & BMCR_FULLDPLX) ? 1 : 0;
-                                        tp->autoneg = 0;
-                                }
-                                break;
-                        case 4:
-                                tp->advertising[0] = value;
-                                break;
-                        }
-                        check_duplex(dev);
-                }
-                mdio_write(dev, data[0] & 0x1f, data[1] & 0x1f, data[2]);
-                restore_flags(flags);
-                return 0;
-        default:
-                return -EOPNOTSUPP;
-        }
-
-        return -EOPNOTSUPP;
-}
-
-/* Set or clear the multicast filter for this adaptor.
-   Note that we only use exclusion around actually queueing the
-   new frame, not around filling tp->setup_frame.  This is non-deterministic
-   when re-entered but still correct. */
-static void set_rx_mode(struct net_device *dev)
-{
-        struct xircom_private *tp = netdev_priv(dev);
-        struct dev_mc_list *mclist;
-        long ioaddr = dev->base_addr;
-        int csr6 = inl(ioaddr + CSR6);
-        u16 *eaddrs, *setup_frm;
-        u32 tx_flags;
-        int i;
-
-        tp->csr6 &= ~(AllMultiBit | PromiscBit | HashFilterBit);
-        csr6 &= ~(AllMultiBit | PromiscBit | HashFilterBit);
-        if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
-                tp->csr6 |= PromiscBit;
-                csr6 |= PromiscBit;
-                goto out;
-        }
-
-        if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) {
-                /* Too many to filter well -- accept all multicasts. */
-                tp->csr6 |= AllMultiBit;
-                csr6 |= AllMultiBit;
-                goto out;
-        }
-
-        tx_flags = Tx1WholePkt | Tx1SetupPkt | PKT_SETUP_SZ;
-
-        /* Note that only the low-address shortword of setup_frame is valid! */
-        setup_frm = tp->setup_frame;
-        mclist = dev->mc_list;
-
-        /* Fill the first entry with our physical address. */
-        eaddrs = (u16 *)dev->dev_addr;
-        *setup_frm = cpu_to_le16(eaddrs[0]); setup_frm += 2;
-        *setup_frm = cpu_to_le16(eaddrs[1]); setup_frm += 2;
-        *setup_frm = cpu_to_le16(eaddrs[2]); setup_frm += 2;
-
-        if (dev->mc_count > 14) { /* Must use a multicast hash table. */
-                u32 *hash_table = (u32 *)(tp->setup_frame + 4 * 12);
-                u32 hash, hash2;
-
-                tx_flags |= Tx1HashSetup;
-                tp->csr6 |= HashFilterBit;
-                csr6 |= HashFilterBit;
-
-                /* Fill the unused 3 entries with the broadcast address.
-                   At least one entry *must* contain the broadcast address!!!*/
-                for (i = 0; i < 3; i++) {
-                        *setup_frm = 0xffff; setup_frm += 2;
-                        *setup_frm = 0xffff; setup_frm += 2;
-                        *setup_frm = 0xffff; setup_frm += 2;
-                }
-
-                /* Truly brain-damaged hash filter layout */
-                /* XXX: not sure if I should take the last or the first 9 bits */
-                for (i = 0; i < dev->mc_count; i++, mclist = mclist->next) {
-                        u32 *hptr;
-                        hash = ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x1ff;
-                        if (hash < 384) {
-                                hash2 = hash + ((hash >> 4) << 4) +
-                                        ((hash >> 5) << 5);
-                        } else {
-                                hash -= 384;
-                                hash2 = 64 + hash + (hash >> 4) * 80;
-                        }
-                        hptr = &hash_table[hash2 & ~0x1f];
-                        *hptr |= cpu_to_le32(1 << (hash2 & 0x1f));
-                }
-        } else {
-                /* We have <= 14 mcast addresses so we can use Xircom's
-                   wonderful 16-address perfect filter. */
-                for (i = 0; i < dev->mc_count; i++, mclist = mclist->next) {
-                        eaddrs = (u16 *)mclist->dmi_addr;
-                        *setup_frm = cpu_to_le16(eaddrs[0]); setup_frm += 2;
-                        *setup_frm = cpu_to_le16(eaddrs[1]); setup_frm += 2;
-                        *setup_frm = cpu_to_le16(eaddrs[2]); setup_frm += 2;
-                }
-                /* Fill the unused entries with the broadcast address.
-                   At least one entry *must* contain the broadcast address!!!*/
-                for (; i < 15; i++) {
-                        *setup_frm = 0xffff; setup_frm += 2;
-                        *setup_frm = 0xffff; setup_frm += 2;
-                        *setup_frm = 0xffff; setup_frm += 2;
-                }
-        }
-
-        /* Now add this frame to the Tx list. */
-        if (tp->cur_tx - tp->dirty_tx > TX_RING_SIZE - 2) {
-                /* Same setup recently queued, we need not add it. */
-                /* XXX: Huh? All it means is that the Tx list is full...*/
-        } else {
-                unsigned long flags;
-                unsigned int entry;
-                int dummy = -1;
-
-                save_flags(flags); cli();
-                entry = tp->cur_tx++ % TX_RING_SIZE;
-
-                if (entry != 0) {
-                        /* Avoid a chip errata by prefixing a dummy entry. */
-                        tp->tx_skbuff[entry] = NULL;
-                        tp->tx_ring[entry].length =
-                                (entry == TX_RING_SIZE - 1) ? Tx1RingWrap : 0;
-                        tp->tx_ring[entry].buffer1 = 0;
-                        /* race with chip, set Tx0DescOwned later */
-                        dummy = entry;
-                        entry = tp->cur_tx++ % TX_RING_SIZE;
-                }
-
-                tp->tx_skbuff[entry] = NULL;
-                /* Put the setup frame on the Tx list. */
-                if (entry == TX_RING_SIZE - 1)
-                        tx_flags |= Tx1RingWrap;                /* Wrap ring. */
-                tp->tx_ring[entry].length = tx_flags;
-                tp->tx_ring[entry].buffer1 = virt_to_bus(tp->setup_frame);
-                tp->tx_ring[entry].status = Tx0DescOwned;
-                if (tp->cur_tx - tp->dirty_tx >= TX_RING_SIZE - 2) {
-                        tp->tx_full = 1;
-                        netif_stop_queue (dev);
-                }
-                if (dummy >= 0)
-                        tp->tx_ring[dummy].status = Tx0DescOwned;
-                restore_flags(flags);
-                /* Trigger an immediate transmit demand. */
-                outl(0, ioaddr + CSR1);
-        }
-
-out:
-        outl_CSR6(csr6, ioaddr);
-}
-
-
-static struct pci_device_id xircom_pci_table[] = {
-  { 0x115D, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, X3201_3 },
-  {0},
-};
-MODULE_DEVICE_TABLE(pci, xircom_pci_table);
-
-
-#ifdef CONFIG_PM
-static int xircom_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        struct xircom_private *tp = netdev_priv(dev);
-        printk(KERN_INFO "xircom_suspend(%s)\n", dev->name);
-        if (tp->open)
-                xircom_down(dev);
-
-        pci_save_state(pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, 3);
-
-        return 0;
-}
-
-
-static int xircom_resume(struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        struct xircom_private *tp = netdev_priv(dev);
-        printk(KERN_INFO "xircom_resume(%s)\n", dev->name);
-
-        pci_set_power_state(pdev,0);
-        pci_enable_device(pdev);
-        pci_restore_state(pdev);
-
-        /* Bring the chip out of sleep mode.
-           Caution: Snooze mode does not work with some boards! */
-        if (xircom_tbl[tp->chip_id].flags & HAS_ACPI)
-                pci_write_config_dword(tp->pdev, PCI_POWERMGMT, 0);
-
-        transceiver_voodoo(dev);
-        if (xircom_tbl[tp->chip_id].flags & HAS_MII)
-                check_duplex(dev);
-
-        if (tp->open)
-                xircom_up(dev);
-        return 0;
-}
-#endif /* CONFIG_PM */
-
-
-static void __devexit xircom_remove_one(struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-
-        printk(KERN_INFO "xircom_remove_one(%s)\n", dev->name);
-        unregister_netdev(dev);
-        pci_release_regions(pdev);
-        free_netdev(dev);
-        pci_set_drvdata(pdev, NULL);
-}
-
-
-static struct pci_driver xircom_driver = {
-        .name           = DRV_NAME,
-        .id_table       = xircom_pci_table,
-        .probe          = xircom_init_one,
-        .remove         = __devexit_p(xircom_remove_one),
-#ifdef CONFIG_PM
-        .suspend        = xircom_suspend,
-        .resume         = xircom_resume
-#endif /* CONFIG_PM */
-};
-
-
-static int __init xircom_init(void)
-{
-/* when a module, this is printed whether or not devices are found in probe */
-#ifdef MODULE
-        printk(version);
-#endif
-        return pci_register_driver(&xircom_driver);
-}
-
-
-static void __exit xircom_exit(void)
-{
-        pci_unregister_driver(&xircom_driver);
-}
-
-module_init(xircom_init)
-module_exit(xircom_exit)
-
-/*
- * Local variables:
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 5b5d87585d91..d91856b19f6f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -62,7 +62,9 @@
 #include <linux/if_ether.h>
 #include <linux/if_tun.h>
 #include <linux/crc32.h>
+#include <linux/nsproxy.h>
 #include <net/net_namespace.h>
+#include <net/netns/generic.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -106,7 +108,11 @@ struct tun_struct {
 
 /* Network device part of the driver */
 
-static LIST_HEAD(tun_dev_list);
+static unsigned int tun_net_id;
+struct tun_net {
+        struct list_head dev_list;
+};
+
 static const struct ethtool_ops tun_ethtool_ops;
 
 /* Net device open. */
@@ -471,14 +477,15 @@ static void tun_setup(struct net_device *dev)
         dev->stop = tun_net_close;
         dev->ethtool_ops = &tun_ethtool_ops;
         dev->destructor = free_netdev;
+        dev->features |= NETIF_F_NETNS_LOCAL;
 }
 
-static struct tun_struct *tun_get_by_name(const char *name)
+static struct tun_struct *tun_get_by_name(struct tun_net *tn, const char *name)
 {
         struct tun_struct *tun;
 
         ASSERT_RTNL();
-        list_for_each_entry(tun, &tun_dev_list, list) {
+        list_for_each_entry(tun, &tn->dev_list, list) {
                 if (!strncmp(tun->dev->name, name, IFNAMSIZ))
                     return tun;
         }
@@ -486,13 +493,15 @@ static struct tun_struct *tun_get_by_name(const char *name)
         return NULL;
 }
 
-static int tun_set_iff(struct file *file, struct ifreq *ifr)
+static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 {
+        struct tun_net *tn;
         struct tun_struct *tun;
         struct net_device *dev;
         int err;
 
-        tun = tun_get_by_name(ifr->ifr_name);
+        tn = net_generic(net, tun_net_id);
+        tun = tun_get_by_name(tn, ifr->ifr_name);
         if (tun) {
                 if (tun->attached)
                         return -EBUSY;
@@ -505,7 +514,7 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
                      !capable(CAP_NET_ADMIN))
                         return -EPERM;
         }
-        else if (__dev_get_by_name(&init_net, ifr->ifr_name))
+        else if (__dev_get_by_name(net, ifr->ifr_name))
                 return -EINVAL;
         else {
                 char *name;
@@ -536,6 +545,7 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
                 if (!dev)
                         return -ENOMEM;
 
+                dev_net_set(dev, net);
                 tun = netdev_priv(dev);
                 tun->dev = dev;
                 tun->flags = flags;
@@ -558,7 +568,7 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
                 if (err < 0)
                         goto err_free_dev;
 
-                list_add(&tun->list, &tun_dev_list);
+                list_add(&tun->list, &tn->dev_list);
         }
 
         DBG(KERN_INFO "%s: tun_set_iff\n", tun->dev->name);
@@ -575,6 +585,7 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
 
         file->private_data = tun;
         tun->attached = 1;
+        get_net(dev_net(tun->dev));
 
         strcpy(ifr->ifr_name, tun->dev->name);
         return 0;
@@ -603,7 +614,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                 ifr.ifr_name[IFNAMSIZ-1] = '\0';
 
                 rtnl_lock();
-                err = tun_set_iff(file, &ifr);
+                err = tun_set_iff(current->nsproxy->net_ns, file, &ifr);
                 rtnl_unlock();
 
                 if (err)
@@ -790,6 +801,7 @@ static int tun_chr_close(struct inode *inode, struct file *file)
         /* Detach from net device */
         file->private_data = NULL;
         tun->attached = 0;
+        put_net(dev_net(tun->dev));
 
         /* Drop read queue */
         skb_queue_purge(&tun->readq);
@@ -909,32 +921,76 @@ static const struct ethtool_ops tun_ethtool_ops = {
         .set_rx_csum    = tun_set_rx_csum
 };
 
-static int __init tun_init(void)
+static int tun_init_net(struct net *net)
 {
-        int ret = 0;
+        struct tun_net *tn;
 
-        printk(KERN_INFO "tun: %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
-        printk(KERN_INFO "tun: %s\n", DRV_COPYRIGHT);
+        tn = kmalloc(sizeof(*tn), GFP_KERNEL);
+        if (tn == NULL)
+                return -ENOMEM;
 
-        ret = misc_register(&tun_miscdev);
-        if (ret)
-                printk(KERN_ERR "tun: Can't register misc device %d\n", TUN_MINOR);
-        return ret;
+        INIT_LIST_HEAD(&tn->dev_list);
+
+        if (net_assign_generic(net, tun_net_id, tn)) {
+                kfree(tn);
+                return -ENOMEM;
+        }
+
+        return 0;
 }
 
-static void tun_cleanup(void)
+static void tun_exit_net(struct net *net)
 {
+        struct tun_net *tn;
         struct tun_struct *tun, *nxt;
 
-        misc_deregister(&tun_miscdev);
+        tn = net_generic(net, tun_net_id);
 
         rtnl_lock();
-        list_for_each_entry_safe(tun, nxt, &tun_dev_list, list) {
+        list_for_each_entry_safe(tun, nxt, &tn->dev_list, list) {
                 DBG(KERN_INFO "%s cleaned up\n", tun->dev->name);
                 unregister_netdevice(tun->dev);
         }
         rtnl_unlock();
 
+        kfree(tn);
+}
+
+static struct pernet_operations tun_net_ops = {
+        .init = tun_init_net,
+        .exit = tun_exit_net,
+};
+
+static int __init tun_init(void)
+{
+        int ret = 0;
+
+        printk(KERN_INFO "tun: %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
+        printk(KERN_INFO "tun: %s\n", DRV_COPYRIGHT);
+
+        ret = register_pernet_gen_device(&tun_net_id, &tun_net_ops);
+        if (ret) {
+                printk(KERN_ERR "tun: Can't register pernet ops\n");
+                goto err_pernet;
+        }
+
+        ret = misc_register(&tun_miscdev);
+        if (ret) {
+                printk(KERN_ERR "tun: Can't register misc device %d\n", TUN_MINOR);
+                goto err_misc;
+        }
+        return 0;
+
+err_misc:
+        unregister_pernet_gen_device(tun_net_id, &tun_net_ops);
+err_pernet:
+        return ret;
+}
+
+static void tun_cleanup(void)
+{
+        misc_deregister(&tun_miscdev);
+        unregister_pernet_gen_device(tun_net_id, &tun_net_ops);
 }
 
 module_init(tun_init);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 0ee4c168e4c0..29a4d650e8a8 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3954,7 +3954,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 if (err)
                         return -1;
 
-                ug_info->mdio_bus = res.start;
+                snprintf(ug_info->mdio_bus, MII_BUS_ID_SIZE, "%x", res.start);
         }
 
         /* get the phy interface type, or default to MII */
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index 4fb95b3af948..9f8b7580a3a4 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -1156,7 +1156,7 @@ struct ucc_geth_info {
         u16 pausePeriod;
         u16 extensionField;
         u8 phy_address;
-        u32 mdio_bus;
+        char mdio_bus[MII_BUS_ID_SIZE];
         u8 weightfactor[NUM_TX_QUEUES];
         u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES];
         u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX];
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index c69e654d539f..e4d3f330bac3 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -157,7 +157,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
         if (err)
                 goto reg_map_fail;
 
-        new_bus->id = res.start;
+        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
         new_bus->irq = kmalloc(32 * sizeof(int), GFP_KERNEL);
 
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 01660f68943a..f7319d326912 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -155,7 +155,7 @@ static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
         dm_write_async_helper(dev, reg, value, 0, NULL);
 }
 
-static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, u16 *value)
+static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value)
 {
         int ret, i;
 
@@ -194,7 +194,7 @@ static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, u16 *value)
         return ret;
 }
 
-static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, u16 value)
+static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 value)
 {
         int ret, i;
 
@@ -249,7 +249,7 @@ static int dm9601_get_eeprom(struct net_device *net,
                              struct ethtool_eeprom *eeprom, u8 * data)
 {
         struct usbnet *dev = netdev_priv(net);
-        u16 *ebuf = (u16 *) data;
+        __le16 *ebuf = (__le16 *) data;
         int i;
 
         /* access is 16bit */
@@ -268,7 +268,7 @@ static int dm9601_mdio_read(struct net_device *netdev, int phy_id, int loc)
 {
         struct usbnet *dev = netdev_priv(netdev);
 
-        u16 res;
+        __le16 res;
 
         if (phy_id) {
                 devdbg(dev, "Only internal phy supported");
@@ -288,7 +288,7 @@ static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc,
                               int val)
 {
         struct usbnet *dev = netdev_priv(netdev);
-        u16 res = cpu_to_le16(val);
+        __le16 res = cpu_to_le16(val);
 
         if (phy_id) {
                 devdbg(dev, "Only internal phy supported");
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 369c731114b3..21a7785cb8b6 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -218,7 +218,7 @@ EXPORT_SYMBOL_GPL(rndis_command);
  * ActiveSync 4.1 Windows driver.
  */
 static int rndis_query(struct usbnet *dev, struct usb_interface *intf,
-                void *buf, u32 oid, u32 in_len,
+                void *buf, __le32 oid, u32 in_len,
                 void **reply, int *reply_len)
 {
         int retval;
@@ -283,7 +283,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
                 struct rndis_set_c      *set_c;
                 struct rndis_halt       *halt;
         } u;
-        u32                     tmp, phym_unspec, *phym;
+        u32                     tmp, phym_unspec;
+        __le32                  *phym;
         int                     reply_len;
         unsigned char           *bp;
 
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index e2ad98bee6e7..31cd817f33f9 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -375,7 +375,7 @@ static int veth_newlink(struct net_device *dev,
         else
                 snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d");
 
-        peer = rtnl_create_link(dev->nd_net, ifname, &veth_link_ops, tbp);
+        peer = rtnl_create_link(dev_net(dev), ifname, &veth_link_ops, tbp);
         if (IS_ERR(peer))
                 return PTR_ERR(peer);
 
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index cc0addb5640c..ed1afaf683a4 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -3460,21 +3460,22 @@ static int velocity_resume(struct pci_dev *pdev)
 static int velocity_netdev_event(struct notifier_block *nb, unsigned long notification, void *ptr)
 {
         struct in_ifaddr *ifa = (struct in_ifaddr *) ptr;
+        struct net_device *dev = ifa->ifa_dev->dev;
+        struct velocity_info *vptr;
+        unsigned long flags;
 
-        if (ifa) {
-                struct net_device *dev = ifa->ifa_dev->dev;
-                struct velocity_info *vptr;
-                unsigned long flags;
+        if (dev_net(dev) != &init_net)
+                return NOTIFY_DONE;
 
-                spin_lock_irqsave(&velocity_dev_list_lock, flags);
-                list_for_each_entry(vptr, &velocity_dev_list, list) {
-                        if (vptr->dev == dev) {
-                                velocity_get_ip(vptr);
-                                break;
-                        }
+        spin_lock_irqsave(&velocity_dev_list_lock, flags);
+        list_for_each_entry(vptr, &velocity_dev_list, list) {
+                if (vptr->dev == dev) {
+                        velocity_get_ip(vptr);
+                        break;
                 }
-                spin_unlock_irqrestore(&velocity_dev_list_lock, flags);
         }
+        spin_unlock_irqrestore(&velocity_dev_list_lock, flags);
+
         return NOTIFY_DONE;
 }
 
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 1d706eae3052..45ddfc9763cc 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -90,6 +90,7 @@
 #include <linux/ioport.h>
 #include <linux/netdevice.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 #include <linux/device.h>
 
 #undef COSA_SLOW_IO     /* for testing purposes only */
@@ -127,7 +128,8 @@ struct channel_data {
         int (*tx_done)(struct channel_data *channel, int size);
 
         /* Character device parts */
-        struct semaphore rsem, wsem;
+        struct mutex rlock;
+        struct semaphore wsem;
         char *rxdata;
         int rxsize;
         wait_queue_head_t txwaitq, rxwaitq;
@@ -807,7 +809,7 @@ static struct net_device_stats *cosa_net_stats(struct net_device *dev)
 
 static void chardev_channel_init(struct channel_data *chan)
 {
-        init_MUTEX(&chan->rsem);
+        mutex_init(&chan->rlock);
         init_MUTEX(&chan->wsem);
 }
 
@@ -825,12 +827,12 @@ static ssize_t cosa_read(struct file *file,
                         cosa->name, cosa->firmware_status);
                 return -EPERM;
         }
-        if (down_interruptible(&chan->rsem))
+        if (mutex_lock_interruptible(&chan->rlock))
                 return -ERESTARTSYS;
         
         if ((chan->rxdata = kmalloc(COSA_MTU, GFP_DMA|GFP_KERNEL)) == NULL) {
                 printk(KERN_INFO "%s: cosa_read() - OOM\n", cosa->name);
-                up(&chan->rsem);
+                mutex_unlock(&chan->rlock);
                 return -ENOMEM;
         }
 
@@ -848,7 +850,7 @@ static ssize_t cosa_read(struct file *file,
                         remove_wait_queue(&chan->rxwaitq, &wait);
                         current->state = TASK_RUNNING;
                         spin_unlock_irqrestore(&cosa->lock, flags);
-                        up(&chan->rsem);
+                        mutex_unlock(&chan->rlock);
                         return -ERESTARTSYS;
                 }
         }
@@ -857,7 +859,7 @@ static ssize_t cosa_read(struct file *file,
         kbuf = chan->rxdata;
         count = chan->rxsize;
         spin_unlock_irqrestore(&cosa->lock, flags);
-        up(&chan->rsem);
+        mutex_unlock(&chan->rlock);
 
         if (copy_to_user(buf, kbuf, count)) {
                 kfree(kbuf);
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 96b232446c0b..b14242768fad 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -517,7 +517,7 @@ static int dlci_dev_event(struct notifier_block *unused,
 {
         struct net_device *dev = (struct net_device *) ptr;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         if (event == NETDEV_UNREGISTER) {
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 39951d0c34d6..9a83c9d5b8cf 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -68,7 +68,7 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev,
 {
         struct hdlc_device *hdlc = dev_to_hdlc(dev);
 
-        if (dev->nd_net != &init_net) {
+        if (dev_net(dev) != &init_net) {
                 kfree_skb(skb);
                 return 0;
         }
@@ -105,7 +105,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,
         unsigned long flags;
         int on;
  
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         if (dev->get_stats != hdlc_get_stats)
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 824df3b5ea49..b5860b97a93e 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -91,7 +91,7 @@ static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
         int len, err;
         struct lapbethdev *lapbeth;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto drop;
 
         if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
@@ -393,7 +393,7 @@ static int lapbeth_device_event(struct notifier_block *this,
         struct lapbethdev *lapbeth;
         struct net_device *dev = ptr;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         if (!dev_is_ethdev(dev))
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 61e24b7a45a3..29b4b94e4947 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -1444,7 +1444,7 @@ static void sppp_print_bytes (u_char *p, u16 len)
 
 static int sppp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *p, struct net_device *orig_dev)
 {
-        if (dev->nd_net != &init_net) {
+        if (dev_net(dev) != &init_net) {
                 kfree_skb(skb);
                 return 0;
         }
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 714a6ca30ad2..fdf5aa8b8429 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -146,12 +146,15 @@ config IPW2100
           configure your card:
 
           <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
+
+          It is recommended that you compile this driver as a module (M)
+          rather than built-in (Y). This driver requires firmware at device
+          initialization time, and when built-in this typically happens
+          before the filesystem is accessible (hence firmware will be
+          unavailable and initialization will fail). If you do choose to build
+          this driver into your kernel image, you can avoid this problem by
+          including the firmware and a firmware loader in an initramfs.
  
-          If you want to compile the driver as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want),
-          say M here and read <file:Documentation/kbuild/modules.txt>.
-          The module will be called ipw2100.ko.
-        
 config IPW2100_MONITOR
         bool "Enable promiscuous mode"
         depends on IPW2100
@@ -201,11 +204,14 @@ config IPW2200
           configure your card:
 
           <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
- 
-          If you want to compile the driver as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want),
-          say M here and read <file:Documentation/kbuild/modules.txt>.
-          The module will be called ipw2200.ko.
+
+          It is recommended that you compile this driver as a module (M)
+          rather than built-in (Y). This driver requires firmware at device
+          initialization time, and when built-in this typically happens
+          before the filesystem is accessible (hence firmware will be
+          unavailable and initialization will fail). If you do choose to build
+          this driver into your kernel image, you can avoid this problem by
+          including the firmware and a firmware loader in an initramfs.
 
 config IPW2200_MONITOR
         bool "Enable promiscuous mode"
@@ -265,7 +271,6 @@ config LIBERTAS
         tristate "Marvell 8xxx Libertas WLAN driver support"
         depends on WLAN_80211
         select WIRELESS_EXT
-        select IEEE80211
         select FW_LOADER
         ---help---
           A library for Marvell Libertas 8xxx devices.
@@ -278,7 +283,7 @@ config LIBERTAS_USB
 
 config LIBERTAS_CS
         tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
-        depends on LIBERTAS && PCMCIA && EXPERIMENTAL
+        depends on LIBERTAS && PCMCIA
         select FW_LOADER
         ---help---
           A driver for Marvell Libertas 8385 CompactFlash devices.
@@ -668,90 +673,10 @@ config ADM8211
 
           Thanks to Infineon-ADMtek for their support of this driver.
 
-config P54_COMMON
-        tristate "Softmac Prism54 support"
-        depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
-        ---help---
-          This is common code for isl38xx based cards.
-          This module does nothing by itself - the USB/PCI frontends
-          also need to be enabled in order to support any devices.
-
-          These devices require softmac firmware which can be found at
-          http://prism54.org/
-
-          If you choose to build a module, it'll be called p54common.
-
-config P54_USB
-        tristate "Prism54 USB support"
-        depends on P54_COMMON && USB
-        select CRC32
-        ---help---
-          This driver is for USB isl38xx based wireless cards.
-          These are USB based adapters found in devices such as:
-
-          3COM 3CRWE254G72
-          SMC 2862W-G
-          Accton 802.11g WN4501 USB
-          Siemens Gigaset USB
-          Netgear WG121
-          Netgear WG111
-          Medion 40900, Roper Europe
-          Shuttle PN15, Airvast WM168g, IOGear GWU513
-          Linksys WUSB54G
-          Linksys WUSB54G Portable
-          DLink DWL-G120 Spinnaker
-          DLink DWL-G122
-          Belkin F5D7050 ver 1000
-          Cohiba Proto board
-          SMC 2862W-G version 2
-          U.S. Robotics U5 802.11g Adapter
-          FUJITSU E-5400 USB D1700
-          Sagem XG703A
-          DLink DWL-G120 Cohiba
-          Spinnaker Proto board
-          Linksys WUSB54AG
-          Inventel UR054G
-          Spinnaker DUT
-
-          These devices require softmac firmware which can be found at
-          http://prism54.org/
-
-          If you choose to build a module, it'll be called p54usb.
-
-config P54_PCI
-        tristate "Prism54 PCI support"
-        depends on P54_COMMON && PCI
-        ---help---
-          This driver is for PCI isl38xx based wireless cards.
-          This driver supports most devices that are supported by the
-          fullmac prism54 driver plus many devices which are not
-          supported by the fullmac driver/firmware.
-
-          This driver requires softmac firmware which can be found at
-          http://prism54.org/
-
-          If you choose to build a module, it'll be called p54pci.
-
-config ATH5K
-        tristate "Atheros 5xxx wireless cards support"
-        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
-        ---help---
-          This module adds support for wireless adapters based on
-          Atheros 5xxx chipset.
-
-          Currently the following chip versions are supported:
-
-          MAC: AR5211 AR5212
-          PHY: RF5111/2111 RF5112/2112 RF5413/2413
-
-          This driver uses the kernel's mac80211 subsystem.
-
-          If you choose to build a module, it'll be called ath5k. Say M if
-          unsure.
-
+source "drivers/net/wireless/p54/Kconfig"
+source "drivers/net/wireless/ath5k/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/bcm43xx/Kconfig"
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 091dfe2e574e..70092191fc53 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -35,7 +35,6 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
 obj-$(CONFIG_PRISM54)           += prism54/
 
 obj-$(CONFIG_HOSTAP)            += hostap/
-obj-$(CONFIG_BCM43XX)           += bcm43xx/
 obj-$(CONFIG_B43)               += b43/
 obj-$(CONFIG_B43LEGACY)         += b43legacy/
 obj-$(CONFIG_ZD1211RW)          += zd1211rw/
@@ -61,8 +60,6 @@ obj-$(CONFIG_IWL3945)	+= iwlwifi/
 obj-$(CONFIG_IWL4965)   += iwlwifi/
 obj-$(CONFIG_RT2X00)    += rt2x00/
 
-obj-$(CONFIG_P54_COMMON)        += p54common.o
-obj-$(CONFIG_P54_USB)           += p54usb.o
-obj-$(CONFIG_P54_PCI)           += p54pci.o
+obj-$(CONFIG_P54_COMMON)        += p54/
 
 obj-$(CONFIG_ATH5K)     += ath5k/
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 79796186713e..5c0d2b082750 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_id_table[] __devinitdata = {
         { 0 }
 };
 
+static struct ieee80211_rate adm8211_rates[] = {
+        { .bitrate = 10, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 55, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 110, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 220, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, /* XX ?? */
+};
+
+static const struct ieee80211_channel adm8211_channels[] = {
+        { .center_freq = 2412},
+        { .center_freq = 2417},
+        { .center_freq = 2422},
+        { .center_freq = 2427},
+        { .center_freq = 2432},
+        { .center_freq = 2437},
+        { .center_freq = 2442},
+        { .center_freq = 2447},
+        { .center_freq = 2452},
+        { .center_freq = 2457},
+        { .center_freq = 2462},
+        { .center_freq = 2467},
+        { .center_freq = 2472},
+        { .center_freq = 2484},
+};
+
+
 static void adm8211_eeprom_register_read(struct eeprom_93cx6 *eeprom)
 {
         struct adm8211_priv *priv = eeprom->data;
@@ -155,17 +181,17 @@ static int adm8211_read_eeprom(struct ieee80211_hw *dev)
         printk(KERN_DEBUG "%s (adm8211): Channel range: %d - %d\n",
                pci_name(priv->pdev), (int)chan_range.min, (int)chan_range.max);
 
-        priv->modes[0].num_channels = chan_range.max - chan_range.min + 1;
-        priv->modes[0].channels = priv->channels;
+        BUILD_BUG_ON(sizeof(priv->channels) != sizeof(adm8211_channels));
 
-        memcpy(priv->channels, adm8211_channels, sizeof(adm8211_channels));
+        memcpy(priv->channels, adm8211_channels, sizeof(priv->channels));
+        priv->band.channels = priv->channels;
+        priv->band.n_channels = ARRAY_SIZE(adm8211_channels);
+        priv->band.bitrates = adm8211_rates;
+        priv->band.n_bitrates = ARRAY_SIZE(adm8211_rates);
 
         for (i = 1; i <= ARRAY_SIZE(adm8211_channels); i++)
-                if (i >= chan_range.min && i <= chan_range.max)
-                        priv->channels[i - 1].flag =
-                                IEEE80211_CHAN_W_SCAN |
-                                IEEE80211_CHAN_W_ACTIVE_SCAN |
-                                IEEE80211_CHAN_W_IBSS;
+                if (i < chan_range.min || i > chan_range.max)
+                        priv->channels[i - 1].flags |= IEEE80211_CHAN_DISABLED;
 
         switch (priv->eeprom->specific_bbptype) {
         case ADM8211_BBP_RFMD3000:
@@ -347,7 +373,6 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
         unsigned int pktlen;
         struct sk_buff *skb, *newskb;
         unsigned int limit = priv->rx_ring_size;
-        static const u8 rate_tbl[] = {10, 20, 55, 110, 220};
         u8 rssi, rate;
 
         while (!(priv->rx_ring[entry].status & cpu_to_le32(RDES0_STATUS_OWN))) {
@@ -425,12 +450,10 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
                         else
                                 rx_status.ssi = 100 - rssi;
 
-                        if (rate <= 4)
-                                rx_status.rate = rate_tbl[rate];
+                        rx_status.rate_idx = rate;
 
-                        rx_status.channel = priv->channel;
-                        rx_status.freq = adm8211_channels[priv->channel - 1].freq;
-                        rx_status.phymode = MODE_IEEE80211B;
+                        rx_status.freq = adm8211_channels[priv->channel - 1].center_freq;
+                        rx_status.band = IEEE80211_BAND_2GHZ;
 
                         ieee80211_rx_irqsafe(dev, skb, &rx_status);
                 }
@@ -465,9 +488,6 @@ do {									   \
         if (stsr & ADM8211_STSR_TCI)
                 adm8211_interrupt_tci(dev);
 
-        /*ADM8211_INT(LinkOn);*/
-        /*ADM8211_INT(LinkOff);*/
-
         ADM8211_INT(PCF);
         ADM8211_INT(BCNTC);
         ADM8211_INT(GPINT);
@@ -477,7 +497,6 @@ do {									   \
         ADM8211_INT(SQL);
         ADM8211_INT(WEPTD);
         ADM8211_INT(ATIME);
-        /*ADM8211_INT(TBTT);*/
         ADM8211_INT(TEIS);
         ADM8211_INT(FBE);
         ADM8211_INT(REIS);
@@ -485,9 +504,6 @@ do {									   \
         ADM8211_INT(RPS);
         ADM8211_INT(RDU);
         ADM8211_INT(TUF);
-        /*ADM8211_INT(TRT);*/
-        /*ADM8211_INT(TLT);*/
-        /*ADM8211_INT(TDU);*/
         ADM8211_INT(TPS);
 
         return IRQ_HANDLED;
@@ -1054,7 +1070,7 @@ static int adm8211_set_rate(struct ieee80211_hw *dev)
         if (priv->pdev->revision != ADM8211_REV_BA) {
                 rate_buf[0] = ARRAY_SIZE(adm8211_rates);
                 for (i = 0; i < ARRAY_SIZE(adm8211_rates); i++)
-                        rate_buf[i + 1] = (adm8211_rates[i].rate / 5) | 0x80;
+                        rate_buf[i + 1] = (adm8211_rates[i].bitrate / 5) | 0x80;
         } else {
                 /* workaround for rev BA specific bug */
                 rate_buf[0] = 0x04;
@@ -1086,7 +1102,7 @@ static void adm8211_hw_init(struct ieee80211_hw *dev)
         u32 reg;
         u8 cline;
 
-        reg = le32_to_cpu(ADM8211_CSR_READ(PAR));
+        reg = ADM8211_CSR_READ(PAR);
         reg |= ADM8211_PAR_MRLE | ADM8211_PAR_MRME;
         reg &= ~(ADM8211_PAR_BAR | ADM8211_PAR_CAL);
 
@@ -1303,9 +1319,10 @@ static int adm8211_set_ssid(struct ieee80211_hw *dev, u8 *ssid, size_t ssid_len)
 static int adm8211_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)
 {
         struct adm8211_priv *priv = dev->priv;
+        int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
 
-        if (conf->channel != priv->channel) {
-                priv->channel = conf->channel;
+        if (channel != priv->channel) {
+                priv->channel = channel;
                 adm8211_rf_set_channel(dev, priv->channel);
         }
 
@@ -1678,13 +1695,9 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
         int plcp, dur, len, plcp_signal, short_preamble;
         struct ieee80211_hdr *hdr;
 
-        if (control->tx_rate < 0) {
-                short_preamble = 1;
-                plcp_signal = -control->tx_rate;
-        } else {
-                short_preamble = 0;
-                plcp_signal = control->tx_rate;
-        }
+        short_preamble = !!(control->tx_rate->flags &
+                                        IEEE80211_TXCTL_SHORT_PREAMBLE);
+        plcp_signal = control->tx_rate->bitrate;
 
         hdr = (struct ieee80211_hdr *)skb->data;
         fc = le16_to_cpu(hdr->frame_control) & ~IEEE80211_FCTL_PROTECTED;
@@ -1880,18 +1893,11 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
         SET_IEEE80211_PERM_ADDR(dev, perm_addr);
 
         dev->extra_tx_headroom = sizeof(struct adm8211_tx_hdr);
-        dev->flags = IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED;
-        /* IEEE80211_HW_RX_INCLUDES_FCS in promisc mode */
+        /* dev->flags = IEEE80211_HW_RX_INCLUDES_FCS in promisc mode */
 
         dev->channel_change_time = 1000;
         dev->max_rssi = 100;    /* FIXME: find better value */
 
-        priv->modes[0].mode = MODE_IEEE80211B;
-        /* channel info filled in by adm8211_read_eeprom */
-        memcpy(priv->rates, adm8211_rates, sizeof(adm8211_rates));
-        priv->modes[0].num_rates = ARRAY_SIZE(adm8211_rates);
-        priv->modes[0].rates = priv->rates;
-
         dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */
 
         priv->retry_limit = 3;
@@ -1917,14 +1923,9 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
                 goto err_free_desc;
         }
 
-        priv->channel = priv->modes[0].channels[0].chan;
+        priv->channel = 1;
 
-        err = ieee80211_register_hwmode(dev, &priv->modes[0]);
-        if (err) {
-                printk(KERN_ERR "%s (adm8211): Can't register hwmode\n",
-                       pci_name(pdev));
-                goto err_free_desc;
-        }
+        dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
 
         err = ieee80211_register_hw(dev);
         if (err) {
diff --git a/drivers/net/wireless/adm8211.h b/drivers/net/wireless/adm8211.h
index ef326fed42e4..8d7c564b3b04 100644
--- a/drivers/net/wireless/adm8211.h
+++ b/drivers/net/wireless/adm8211.h
@@ -534,61 +534,6 @@ struct adm8211_eeprom {
         u8      cis_data[0];            /* 0x80, 384 bytes */
 } __attribute__ ((packed));
 
-static const struct ieee80211_rate adm8211_rates[] = {
-        { .rate = 10,
-          .val = 10,
-          .val2 = -10,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 20,
-          .val = 20,
-          .val2 = -20,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 55,
-          .val = 55,
-          .val2 = -55,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 110,
-          .val = 110,
-          .val2 = -110,
-          .flags = IEEE80211_RATE_CCK_2 }
-};
-
-struct ieee80211_chan_range {
-        u8 min;
-        u8 max;
-};
-
-static const struct ieee80211_channel adm8211_channels[] = {
-        { .chan = 1,
-          .freq = 2412},
-        { .chan = 2,
-          .freq = 2417},
-        { .chan = 3,
-          .freq = 2422},
-        { .chan = 4,
-          .freq = 2427},
-        { .chan = 5,
-          .freq = 2432},
-        { .chan = 6,
-          .freq = 2437},
-        { .chan = 7,
-          .freq = 2442},
-        { .chan = 8,
-          .freq = 2447},
-        { .chan = 9,
-          .freq = 2452},
-        { .chan = 10,
-          .freq = 2457},
-        { .chan = 11,
-          .freq = 2462},
-        { .chan = 12,
-          .freq = 2467},
-        { .chan = 13,
-          .freq = 2472},
-        { .chan = 14,
-          .freq = 2484},
-};
-
 struct adm8211_priv {
         struct pci_dev *pdev;
         spinlock_t lock;
@@ -603,9 +548,8 @@ struct adm8211_priv {
         unsigned int cur_tx, dirty_tx, cur_rx;
 
         struct ieee80211_low_level_stats stats;
-        struct ieee80211_hw_mode modes[1];
-        struct ieee80211_channel channels[ARRAY_SIZE(adm8211_channels)];
-        struct ieee80211_rate rates[ARRAY_SIZE(adm8211_rates)];
+        struct ieee80211_supported_band band;
+        struct ieee80211_channel channels[14];
         int mode;
 
         int channel;
@@ -643,6 +587,11 @@ struct adm8211_priv {
         } transceiver_type;
 };
 
+struct ieee80211_chan_range {
+        u8 min;
+        u8 max;
+};
+
 static const struct ieee80211_chan_range cranges[] = {
         {1,  11},       /* FCC */
         {1,  11},       /* IC */
diff --git a/drivers/net/wireless/ath5k/Kconfig b/drivers/net/wireless/ath5k/Kconfig
new file mode 100644
index 000000000000..f1f2aea2eab4
--- /dev/null
+++ b/drivers/net/wireless/ath5k/Kconfig
@@ -0,0 +1,37 @@
+config ATH5K
+        tristate "Atheros 5xxx wireless cards support"
+        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+        ---help---
+          This module adds support for wireless adapters based on
+          Atheros 5xxx chipset.
+
+          Currently the following chip versions are supported:
+
+          MAC: AR5211 AR5212
+          PHY: RF5111/2111 RF5112/2112 RF5413/2413
+
+          This driver uses the kernel's mac80211 subsystem.
+
+          If you choose to build a module, it'll be called ath5k. Say M if
+          unsure.
+
+config ATH5K_DEBUG
+        bool "Atheros 5xxx debugging"
+        depends on ATH5K
+        ---help---
+          Atheros 5xxx debugging messages.
+
+          Say Y, if and you will get debug options for ath5k.
+          To use this, you need to mount debugfs:
+
+          mkdir /debug/
+          mount -t debugfs debug /debug/
+
+          You will get access to files under:
+          /debug/ath5k/phy0/
+
+          To enable debug, pass the debug level to the debug module
+          parameter. For example:
+
+          modprobe ath5k debug=0x00000400
+
diff --git a/drivers/net/wireless/ath5k/Makefile b/drivers/net/wireless/ath5k/Makefile
index 321641f99e13..564ecd0c5d4b 100644
--- a/drivers/net/wireless/ath5k/Makefile
+++ b/drivers/net/wireless/ath5k/Makefile
@@ -1,2 +1,6 @@
-ath5k-objs              = base.o hw.o regdom.o initvals.o phy.o debug.o
-obj-$(CONFIG_ATH5K)     += ath5k.o
+ath5k-y                         += base.o
+ath5k-y                         += hw.o
+ath5k-y                         += initvals.o
+ath5k-y                         += phy.o
+ath5k-$(CONFIG_ATH5K_DEBUG)     += debug.o
+obj-$(CONFIG_ATH5K)             += ath5k.o
diff --git a/drivers/net/wireless/ath5k/ath5k.h b/drivers/net/wireless/ath5k/ath5k.h
index 69dea3392612..ba35c30d203c 100644
--- a/drivers/net/wireless/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath5k/ath5k.h
@@ -30,7 +30,6 @@
 #include <net/mac80211.h>
 
 #include "hw.h"
-#include "regdom.h"
 
 /* PCI IDs */
 #define PCI_DEVICE_ID_ATHEROS_AR5210            0x0007 /* AR5210 */
@@ -141,7 +140,9 @@ enum ath5k_radio {
         AR5K_RF5110     = 0,
         AR5K_RF5111     = 1,
         AR5K_RF5112     = 2,
-        AR5K_RF5413     = 3,
+        AR5K_RF2413     = 3,
+        AR5K_RF5413     = 4,
+        AR5K_RF2425     = 5,
 };
 
 /*
@@ -169,12 +170,15 @@ struct ath5k_srev_name {
 #define AR5K_SREV_VER_AR5212    0x50
 #define AR5K_SREV_VER_AR5213    0x55
 #define AR5K_SREV_VER_AR5213A   0x59
-#define AR5K_SREV_VER_AR2424    0xa0
-#define AR5K_SREV_VER_AR5424    0xa3
+#define AR5K_SREV_VER_AR2413    0x78
+#define AR5K_SREV_VER_AR2414    0x79
+#define AR5K_SREV_VER_AR2424    0xa0 /* PCI-E */
+#define AR5K_SREV_VER_AR5424    0xa3 /* PCI-E */
 #define AR5K_SREV_VER_AR5413    0xa4
 #define AR5K_SREV_VER_AR5414    0xa5
-#define AR5K_SREV_VER_AR5416    0xc0    /* ? */
-#define AR5K_SREV_VER_AR5418    0xca
+#define AR5K_SREV_VER_AR5416    0xc0 /* PCI-E */
+#define AR5K_SREV_VER_AR5418    0xca /* PCI-E */
+#define AR5K_SREV_VER_AR2425    0xe2 /* PCI-E */
 
 #define AR5K_SREV_RAD_5110      0x00
 #define AR5K_SREV_RAD_5111      0x10
@@ -184,8 +188,9 @@ struct ath5k_srev_name {
 #define AR5K_SREV_RAD_5112A     0x35
 #define AR5K_SREV_RAD_2112      0x40
 #define AR5K_SREV_RAD_2112A     0x45
+#define AR5K_SREV_RAD_SC0       0x56    /* Found on 2413/2414 */
 #define AR5K_SREV_RAD_SC1       0x63    /* Found on 5413/5414 */
-#define AR5K_SREV_RAD_SC2       0xa2    /* Found on 2424/5424 */
+#define AR5K_SREV_RAD_SC2       0xa2    /* Found on 2424-5/5424 */
 #define AR5K_SREV_RAD_5133      0xc0    /* MIMO found on 5418 */
 
 /* IEEE defs */
@@ -251,26 +256,31 @@ struct ath5k_srev_name {
  */
 #define MODULATION_TURBO        0x00000080
 
-enum ath5k_vendor_mode {
-        MODE_ATHEROS_TURBO = NUM_IEEE80211_MODES+1,
-        MODE_ATHEROS_TURBOG
+enum ath5k_driver_mode {
+        AR5K_MODE_11A           =       0,
+        AR5K_MODE_11A_TURBO     =       1,
+        AR5K_MODE_11B           =       2,
+        AR5K_MODE_11G           =       3,
+        AR5K_MODE_11G_TURBO     =       4,
+        AR5K_MODE_XR            =       0,
+        AR5K_MODE_MAX           =       5
 };
 
-/* Number of supported mac80211 enum ieee80211_phymode modes by this driver */
-#define NUM_DRIVER_MODES        3
-
 /* adding this flag to rate_code enables short preamble, see ar5212_reg.h */
 #define AR5K_SET_SHORT_PREAMBLE 0x04
 
-#define HAS_SHPREAMBLE(_ix) (rt->rates[_ix].modulation == IEEE80211_RATE_CCK_2)
-#define SHPREAMBLE_FLAG(_ix) (HAS_SHPREAMBLE(_ix) ? AR5K_SET_SHORT_PREAMBLE : 0)
+#define HAS_SHPREAMBLE(_ix) \
+        (rt->rates[_ix].modulation == IEEE80211_RATE_SHORT_PREAMBLE)
+#define SHPREAMBLE_FLAG(_ix) \
+        (HAS_SHPREAMBLE(_ix) ? AR5K_SET_SHORT_PREAMBLE : 0)
+
 
 /****************\
   TX DEFINITIONS
 \****************/
 
 /*
- * Tx Descriptor
+ * TX Status
  */
 struct ath5k_tx_status {
         u16     ts_seqnum;
@@ -418,7 +428,7 @@ enum ath5k_dmasize {
 \****************/
 
 /*
- * Rx Descriptor
+ * RX Status
  */
 struct ath5k_rx_status {
         u16     rs_datalen;
@@ -440,16 +450,6 @@ struct ath5k_rx_status {
 #define AR5K_RXKEYIX_INVALID    ((u8) - 1)
 #define AR5K_TXKEYIX_INVALID    ((u32) - 1)
 
-struct ath5k_mib_stats {
-        u32     ackrcv_bad;
-        u32     rts_bad;
-        u32     rts_good;
-        u32     fcs_bad;
-        u32     beacons;
-};
-
-
-
 
 /**************************\
  BEACON TIMERS DEFINITIONS
@@ -492,29 +492,23 @@ struct ath5k_beacon_state {
 #define TSF_TO_TU(_tsf) (u32)((_tsf) >> 10)
 
 
-
 /********************\
   COMMON DEFINITIONS
 \********************/
 
 /*
- * Atheros descriptor
+ * Atheros hardware descriptor
+ * This is read and written to by the hardware
  */
 struct ath5k_desc {
-        u32     ds_link;
-        u32     ds_data;
-        u32     ds_ctl0;
-        u32     ds_ctl1;
-        u32     ds_hw[4];
+        u32     ds_link;        /* physical address of the next descriptor */
+        u32     ds_data;        /* physical address of data buffer (skb) */
 
         union {
-                struct ath5k_rx_status rx;
-                struct ath5k_tx_status tx;
-        } ds_us;
-
-#define ds_rxstat ds_us.rx
-#define ds_txstat ds_us.tx
-
+                struct ath5k_hw_5210_tx_desc    ds_tx5210;
+                struct ath5k_hw_5212_tx_desc    ds_tx5212;
+                struct ath5k_hw_all_rx_desc     ds_rx;
+        } ud;
 } __packed;
 
 #define AR5K_RXDESC_INTREQ      0x0020
@@ -560,8 +554,8 @@ struct ath5k_desc {
  * Used internaly in OpenHAL (ar5211.c/ar5212.c
  * for reset_tx_queue). Also see struct struct ieee80211_channel.
  */
-#define IS_CHAN_XR(_c)  ((_c.val & CHANNEL_XR) != 0)
-#define IS_CHAN_B(_c)   ((_c.val & CHANNEL_B) != 0)
+#define IS_CHAN_XR(_c)  ((_c.hw_value & CHANNEL_XR) != 0)
+#define IS_CHAN_B(_c)   ((_c.hw_value & CHANNEL_B) != 0)
 
 /*
  * The following structure will be used to map 2GHz channels to
@@ -584,7 +578,7 @@ struct ath5k_athchan_2ghz {
 
 /**
  * struct ath5k_rate - rate structure
- * @valid: is this a valid rate for the current mode
+ * @valid: is this a valid rate for rate control (remove)
  * @modulation: respective mac80211 modulation
  * @rate_kbps: rate in kbit/s
  * @rate_code: hardware rate value, used in &struct ath5k_desc, on RX on
@@ -643,47 +637,48 @@ struct ath5k_rate_table {
 
 /*
  * Rate tables...
+ * TODO: CLEAN THIS !!!
  */
 #define AR5K_RATES_11A { 8, {                                   \
         255, 255, 255, 255, 255, 255, 255, 255, 6, 4, 2, 0,     \
         7, 5, 3, 1, 255, 255, 255, 255, 255, 255, 255, 255,     \
         255, 255, 255, 255, 255, 255, 255, 255 }, {             \
-        { 1, IEEE80211_RATE_OFDM, 6000, 11, 140, 0 },           \
-        { 1, IEEE80211_RATE_OFDM, 9000, 15, 18, 0 },            \
-        { 1, IEEE80211_RATE_OFDM, 12000, 10, 152, 2 },          \
-        { 1, IEEE80211_RATE_OFDM, 18000, 14, 36, 2 },           \
-        { 1, IEEE80211_RATE_OFDM, 24000, 9, 176, 4 },           \
-        { 1, IEEE80211_RATE_OFDM, 36000, 13, 72, 4 },           \
-        { 1, IEEE80211_RATE_OFDM, 48000, 8, 96, 4 },            \
-        { 1, IEEE80211_RATE_OFDM, 54000, 12, 108, 4 } }         \
+        { 1, 0, 6000, 11, 140, 0 },             \
+        { 1, 0, 9000, 15, 18, 0 },              \
+        { 1, 0, 12000, 10, 152, 2 },            \
+        { 1, 0, 18000, 14, 36, 2 },             \
+        { 1, 0, 24000, 9, 176, 4 },             \
+        { 1, 0, 36000, 13, 72, 4 },             \
+        { 1, 0, 48000, 8, 96, 4 },              \
+        { 1, 0, 54000, 12, 108, 4 } }           \
 }
 
 #define AR5K_RATES_11B { 4, {                                           \
         255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,     \
         255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,     \
         3, 2, 1, 0, 255, 255, 255, 255 }, {                             \
-        { 1, IEEE80211_RATE_CCK, 1000, 27, 130, 0 },    \
-        { 1, IEEE80211_RATE_CCK_2, 2000, 26, 132, 1 },  \
-        { 1, IEEE80211_RATE_CCK_2, 5500, 25, 139, 1 },  \
-        { 1, IEEE80211_RATE_CCK_2, 11000, 24, 150, 1 } }        \
+        { 1, 0, 1000, 27, 130, 0 },     \
+        { 1, IEEE80211_RATE_SHORT_PREAMBLE, 2000, 26, 132, 1 }, \
+        { 1, IEEE80211_RATE_SHORT_PREAMBLE, 5500, 25, 139, 1 }, \
+        { 1, IEEE80211_RATE_SHORT_PREAMBLE, 11000, 24, 150, 1 } }       \
 }
 
 #define AR5K_RATES_11G { 12, {                                  \
         255, 255, 255, 255, 255, 255, 255, 255, 10, 8, 6, 4,    \
         11, 9, 7, 5, 255, 255, 255, 255, 255, 255, 255, 255,    \
         3, 2, 1, 0, 255, 255, 255, 255 }, {                     \
-        { 1, IEEE80211_RATE_CCK, 1000, 27, 2, 0 },              \
-        { 1, IEEE80211_RATE_CCK_2, 2000, 26, 4, 1 },            \
-        { 1, IEEE80211_RATE_CCK_2, 5500, 25, 11, 1 },           \
-        { 1, IEEE80211_RATE_CCK_2, 11000, 24, 22, 1 },  \
-        { 0, IEEE80211_RATE_OFDM, 6000, 11, 12, 4 },    \
-        { 0, IEEE80211_RATE_OFDM, 9000, 15, 18, 4 },    \
-        { 1, IEEE80211_RATE_OFDM, 12000, 10, 24, 6 },   \
-        { 1, IEEE80211_RATE_OFDM, 18000, 14, 36, 6 },   \
-        { 1, IEEE80211_RATE_OFDM, 24000, 9, 48, 8 },    \
-        { 1, IEEE80211_RATE_OFDM, 36000, 13, 72, 8 },   \
-        { 1, IEEE80211_RATE_OFDM, 48000, 8, 96, 8 },    \
-        { 1, IEEE80211_RATE_OFDM, 54000, 12, 108, 8 } } \
+        { 1, 0, 1000, 27, 2, 0 },               \
+        { 1, IEEE80211_RATE_SHORT_PREAMBLE, 2000, 26, 4, 1 },           \
+        { 1, IEEE80211_RATE_SHORT_PREAMBLE, 5500, 25, 11, 1 },          \
+        { 1, IEEE80211_RATE_SHORT_PREAMBLE, 11000, 24, 22, 1 }, \
+        { 0, 0, 6000, 11, 12, 4 },      \
+        { 0, 0, 9000, 15, 18, 4 },      \
+        { 1, 0, 12000, 10, 24, 6 },     \
+        { 1, 0, 18000, 14, 36, 6 },     \
+        { 1, 0, 24000, 9, 48, 8 },      \
+        { 1, 0, 36000, 13, 72, 8 },     \
+        { 1, 0, 48000, 8, 96, 8 },      \
+        { 1, 0, 54000, 12, 108, 8 } }   \
 }
 
 #define AR5K_RATES_TURBO { 8, {                                 \
@@ -708,14 +703,14 @@ struct ath5k_rate_table {
         { 1, MODULATION_XR, 1000, 2, 139, 1 },          \
         { 1, MODULATION_XR, 2000, 6, 150, 2 },          \
         { 1, MODULATION_XR, 3000, 1, 150, 3 },          \
-        { 1, IEEE80211_RATE_OFDM, 6000, 11, 140, 4 },   \
-        { 1, IEEE80211_RATE_OFDM, 9000, 15, 18, 4 },    \
-        { 1, IEEE80211_RATE_OFDM, 12000, 10, 152, 6 },  \
-        { 1, IEEE80211_RATE_OFDM, 18000, 14, 36, 6 },   \
-        { 1, IEEE80211_RATE_OFDM, 24000, 9, 176, 8 },   \
-        { 1, IEEE80211_RATE_OFDM, 36000, 13, 72, 8 },   \
-        { 1, IEEE80211_RATE_OFDM, 48000, 8, 96, 8 },    \
-        { 1, IEEE80211_RATE_OFDM, 54000, 12, 108, 8 } } \
+        { 1, 0, 6000, 11, 140, 4 },     \
+        { 1, 0, 9000, 15, 18, 4 },      \
+        { 1, 0, 12000, 10, 152, 6 },    \
+        { 1, 0, 18000, 14, 36, 6 },     \
+        { 1, 0, 24000, 9, 176, 8 },     \
+        { 1, 0, 36000, 13, 72, 8 },     \
+        { 1, 0, 48000, 8, 96, 8 },      \
+        { 1, 0, 54000, 12, 108, 8 } }   \
 }
 
 /*
@@ -890,12 +885,14 @@ enum ath5k_capability_type {
         AR5K_CAP_RFSILENT               = 20,   /* Supports RFsilent */
 };
 
+
+/* XXX: we *may* move cap_range stuff to struct wiphy */
 struct ath5k_capabilities {
         /*
          * Supported PHY modes
          * (ie. CHANNEL_A, CHANNEL_B, ...)
          */
-        DECLARE_BITMAP(cap_mode, NUM_DRIVER_MODES);
+        DECLARE_BITMAP(cap_mode, AR5K_MODE_MAX);
 
         /*
          * Frequency range (without regulation restrictions)
@@ -908,14 +905,6 @@ struct ath5k_capabilities {
         } cap_range;
 
         /*
-         * Active regulation domain settings
-         */
-        struct {
-                enum ath5k_regdom reg_current;
-                enum ath5k_regdom reg_hw;
-        } cap_regdomain;
-
-        /*
          * Values stored in the EEPROM (some of them...)
          */
         struct ath5k_eeprom_info        cap_eeprom;
@@ -963,6 +952,7 @@ struct ath5k_hw {
         u16                     ah_phy_revision;
         u16                     ah_radio_5ghz_revision;
         u16                     ah_radio_2ghz_revision;
+        u32                     ah_phy_spending;
 
         enum ath5k_version      ah_version;
         enum ath5k_radio        ah_radio;
@@ -1038,8 +1028,10 @@ struct ath5k_hw {
         int (*ah_setup_xtx_desc)(struct ath5k_hw *, struct ath5k_desc *,
                 unsigned int, unsigned int, unsigned int, unsigned int,
                 unsigned int, unsigned int);
-        int (*ah_proc_tx_desc)(struct ath5k_hw *, struct ath5k_desc *);
-        int (*ah_proc_rx_desc)(struct ath5k_hw *, struct ath5k_desc *);
+        int (*ah_proc_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,
+                struct ath5k_tx_status *);
+        int (*ah_proc_rx_desc)(struct ath5k_hw *, struct ath5k_desc *,
+                struct ath5k_rx_status *);
 };
 
 /*
@@ -1070,6 +1062,7 @@ extern int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase);
 extern bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah);
 extern int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask);
 extern enum ath5k_int ath5k_hw_set_intr(struct ath5k_hw *ah, enum ath5k_int new_mask);
+extern void ath5k_hw_update_mib_counters(struct ath5k_hw *ah, struct ieee80211_low_level_stats *stats);
 /* EEPROM access functions */
 extern int ath5k_hw_set_regdomain(struct ath5k_hw *ah, u16 regdomain);
 /* Protocol Control Unit Functions */
@@ -1098,7 +1091,6 @@ extern int ath5k_hw_set_beacon_timers(struct ath5k_hw *ah, const struct ath5k_be
 extern void ath5k_hw_reset_beacon(struct ath5k_hw *ah);
 extern int ath5k_hw_beaconq_finish(struct ath5k_hw *ah, unsigned long phys_addr);
 #endif
-extern void ath5k_hw_update_mib_counters(struct ath5k_hw *ah, struct ath5k_mib_stats *statistics);
 /* ACK bit rate */
 void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high);
 /* ACK/CTS Timeouts */
@@ -1129,8 +1121,6 @@ extern int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio);
 extern u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio);
 extern int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val);
 extern void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, u32 interrupt_level);
-/* Regulatory Domain/Channels Setup */
-extern u16 ath5k_get_regdomain(struct ath5k_hw *ah);
 /* Misc functions */
 extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
 
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index bef967ce34a6..e18305b781c9 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -80,7 +80,7 @@ MODULE_AUTHOR("Nick Kossifidis");
 MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards.");
 MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_VERSION("0.1.1 (EXPERIMENTAL)");
+MODULE_VERSION("0.5.0 (EXPERIMENTAL)");
 
 
 /* Known PCI ids */
@@ -118,12 +118,15 @@ static struct ath5k_srev_name srev_names[] = {
         { "5212",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5212 },
         { "5213",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5213 },
         { "5213A",      AR5K_VERSION_VER,       AR5K_SREV_VER_AR5213A },
+        { "2413",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2413 },
+        { "2414",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2414 },
         { "2424",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2424 },
         { "5424",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5424 },
         { "5413",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5413 },
         { "5414",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5414 },
         { "5416",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5416 },
         { "5418",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5418 },
+        { "2425",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2425 },
         { "xxxxx",      AR5K_VERSION_VER,       AR5K_SREV_UNKNOWN },
         { "5110",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5110 },
         { "5111",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5111 },
@@ -132,6 +135,7 @@ static struct ath5k_srev_name srev_names[] = {
         { "5112A",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_5112A },
         { "2112",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2112 },
         { "2112A",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_2112A },
+        { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC0 },
         { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC1 },
         { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC2 },
         { "5133",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5133 },
@@ -240,6 +244,8 @@ static int 	ath5k_chan_set(struct ath5k_softc *sc,
 static void     ath5k_setcurmode(struct ath5k_softc *sc,
                                 unsigned int mode);
 static void     ath5k_mode_setup(struct ath5k_softc *sc);
+static void     ath5k_set_total_hw_rates(struct ath5k_softc *sc);
+
 /* Descriptor setup */
 static int      ath5k_desc_alloc(struct ath5k_softc *sc,
                                 struct pci_dev *pdev);
@@ -278,7 +284,8 @@ static int 	ath5k_rx_start(struct ath5k_softc *sc);
 static void     ath5k_rx_stop(struct ath5k_softc *sc);
 static unsigned int ath5k_rx_decrypted(struct ath5k_softc *sc,
                                         struct ath5k_desc *ds,
-                                        struct sk_buff *skb);
+                                        struct sk_buff *skb,
+                                        struct ath5k_rx_status *rs);
 static void     ath5k_tasklet_rx(unsigned long data);
 /* Tx handling */
 static void     ath5k_tx_processq(struct ath5k_softc *sc,
@@ -511,35 +518,46 @@ ath5k_pci_probe(struct pci_dev *pdev,
                                         sc->ah->ah_mac_srev,
                                         sc->ah->ah_phy_revision);
 
-        if(!sc->ah->ah_single_chip){
+        if (!sc->ah->ah_single_chip) {
                 /* Single chip radio (!RF5111) */
-                if(sc->ah->ah_radio_5ghz_revision && !sc->ah->ah_radio_2ghz_revision) {
+                if (sc->ah->ah_radio_5ghz_revision &&
+                        !sc->ah->ah_radio_2ghz_revision) {
                         /* No 5GHz support -> report 2GHz radio */
-                        if(!test_bit(MODE_IEEE80211A, sc->ah->ah_capabilities.cap_mode)){
+                        if (!test_bit(AR5K_MODE_11A,
+                                sc->ah->ah_capabilities.cap_mode)) {
                                 ATH5K_INFO(sc, "RF%s 2GHz radio found (0x%x)\n",
-                                        ath5k_chip_name(AR5K_VERSION_RAD,sc->ah->ah_radio_5ghz_revision),
-                                                        sc->ah->ah_radio_5ghz_revision);
-                        /* No 2GHz support (5110 and some 5Ghz only cards) -> report 5Ghz radio */
-                        } else if(!test_bit(MODE_IEEE80211B, sc->ah->ah_capabilities.cap_mode)){
+                                        ath5k_chip_name(AR5K_VERSION_RAD,
+                                                sc->ah->ah_radio_5ghz_revision),
+                                                sc->ah->ah_radio_5ghz_revision);
+                        /* No 2GHz support (5110 and some
+                         * 5Ghz only cards) -> report 5Ghz radio */
+                        } else if (!test_bit(AR5K_MODE_11B,
+                                sc->ah->ah_capabilities.cap_mode)) {
                                 ATH5K_INFO(sc, "RF%s 5GHz radio found (0x%x)\n",
-                                        ath5k_chip_name(AR5K_VERSION_RAD,sc->ah->ah_radio_5ghz_revision),
-                                                        sc->ah->ah_radio_5ghz_revision);
+                                        ath5k_chip_name(AR5K_VERSION_RAD,
+                                                sc->ah->ah_radio_5ghz_revision),
+                                                sc->ah->ah_radio_5ghz_revision);
                         /* Multiband radio */
                         } else {
                                 ATH5K_INFO(sc, "RF%s multiband radio found"
                                         " (0x%x)\n",
-                                        ath5k_chip_name(AR5K_VERSION_RAD,sc->ah->ah_radio_5ghz_revision),
-                                                        sc->ah->ah_radio_5ghz_revision);
+                                        ath5k_chip_name(AR5K_VERSION_RAD,
+                                                sc->ah->ah_radio_5ghz_revision),
+                                                sc->ah->ah_radio_5ghz_revision);
                         }
                 }
-                /* Multi chip radio (RF5111 - RF2111) -> report both 2GHz/5GHz radios */
-                else if(sc->ah->ah_radio_5ghz_revision && sc->ah->ah_radio_2ghz_revision){
+                /* Multi chip radio (RF5111 - RF2111) ->
+                 * report both 2GHz/5GHz radios */
+                else if (sc->ah->ah_radio_5ghz_revision &&
+                                sc->ah->ah_radio_2ghz_revision){
                         ATH5K_INFO(sc, "RF%s 5GHz radio found (0x%x)\n",
-                                ath5k_chip_name(AR5K_VERSION_RAD,sc->ah->ah_radio_5ghz_revision),
-                                                sc->ah->ah_radio_5ghz_revision);
+                                ath5k_chip_name(AR5K_VERSION_RAD,
+                                        sc->ah->ah_radio_5ghz_revision),
+                                        sc->ah->ah_radio_5ghz_revision);
                         ATH5K_INFO(sc, "RF%s 2GHz radio found (0x%x)\n",
-                                ath5k_chip_name(AR5K_VERSION_RAD,sc->ah->ah_radio_2ghz_revision),
-                                                sc->ah->ah_radio_2ghz_revision);
+                                ath5k_chip_name(AR5K_VERSION_RAD,
+                                        sc->ah->ah_radio_2ghz_revision),
+                                        sc->ah->ah_radio_2ghz_revision);
                 }
         }
 
@@ -693,11 +711,14 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
                 goto err;
         }
 
+        /* Set *_rates so we can map hw rate index */
+        ath5k_set_total_hw_rates(sc);
+
         /* NB: setup here so ath5k_rate_update is happy */
-        if (test_bit(MODE_IEEE80211A, ah->ah_modes))
-                ath5k_setcurmode(sc, MODE_IEEE80211A);
+        if (test_bit(AR5K_MODE_11A, ah->ah_modes))
+                ath5k_setcurmode(sc, AR5K_MODE_11A);
         else
-                ath5k_setcurmode(sc, MODE_IEEE80211B);
+                ath5k_setcurmode(sc, AR5K_MODE_11B);
 
         /*
          * Allocate tx+rx descriptors and populate the lists.
@@ -837,12 +858,9 @@ ath5k_copy_rates(struct ieee80211_rate *rates,
                 return 0;
 
         for (i = 0, count = 0; i < rt->rate_count && max > 0; i++) {
-                if (!rt->rates[i].valid)
-                        continue;
-                rates->rate = rt->rates[i].rate_kbps / 100;
-                rates->val = rt->rates[i].rate_code;
-                rates->flags = rt->rates[i].modulation;
-                rates++;
+                rates[count].bitrate = rt->rates[i].rate_kbps / 100;
+                rates[count].hw_value = rt->rates[i].rate_code;
+                rates[count].flags = rt->rates[i].modulation;
                 count++;
                 max--;
         }
@@ -856,43 +874,22 @@ ath5k_copy_channels(struct ath5k_hw *ah,
                 unsigned int mode,
                 unsigned int max)
 {
-        static const struct { unsigned int mode, mask, chan; } map[] = {
-                [MODE_IEEE80211A] = { CHANNEL_OFDM, CHANNEL_OFDM | CHANNEL_TURBO, CHANNEL_A },
-                [MODE_ATHEROS_TURBO] = { CHANNEL_OFDM|CHANNEL_TURBO, CHANNEL_OFDM | CHANNEL_TURBO, CHANNEL_T },
-                [MODE_IEEE80211B] = { CHANNEL_CCK, CHANNEL_CCK, CHANNEL_B },
-                [MODE_IEEE80211G] = { CHANNEL_OFDM, CHANNEL_OFDM, CHANNEL_G },
-                [MODE_ATHEROS_TURBOG] = { CHANNEL_OFDM | CHANNEL_TURBO, CHANNEL_OFDM | CHANNEL_TURBO, CHANNEL_TG },
-        };
-        static const struct ath5k_regchannel chans_2ghz[] =
-                IEEE80211_CHANNELS_2GHZ;
-        static const struct ath5k_regchannel chans_5ghz[] =
-                IEEE80211_CHANNELS_5GHZ;
-        const struct ath5k_regchannel *chans;
-        enum ath5k_regdom dmn;
-        unsigned int i, count, size, chfreq, all, f, ch;
+        unsigned int i, count, size, chfreq, freq, ch;
 
         if (!test_bit(mode, ah->ah_modes))
                 return 0;
 
-        all = ah->ah_regdomain == DMN_DEFAULT || CHAN_DEBUG == 1;
-
         switch (mode) {
-        case MODE_IEEE80211A:
-        case MODE_ATHEROS_TURBO:
+        case AR5K_MODE_11A:
+        case AR5K_MODE_11A_TURBO:
                 /* 1..220, but 2GHz frequencies are filtered by check_channel */
-                size = all ? 220 : ARRAY_SIZE(chans_5ghz);
-                chans = chans_5ghz;
-                dmn = ath5k_regdom2flag(ah->ah_regdomain,
-                                IEEE80211_CHANNELS_5GHZ_MIN);
+                size = 220 ;
                 chfreq = CHANNEL_5GHZ;
                 break;
-        case MODE_IEEE80211B:
-        case MODE_IEEE80211G:
-        case MODE_ATHEROS_TURBOG:
-                size = all ? 26 : ARRAY_SIZE(chans_2ghz);
-                chans = chans_2ghz;
-                dmn = ath5k_regdom2flag(ah->ah_regdomain,
-                                IEEE80211_CHANNELS_2GHZ_MIN);
+        case AR5K_MODE_11B:
+        case AR5K_MODE_11G:
+        case AR5K_MODE_11G_TURBO:
+                size = 26;
                 chfreq = CHANNEL_2GHZ;
                 break;
         default:
@@ -901,25 +898,31 @@ ath5k_copy_channels(struct ath5k_hw *ah,
         }
 
         for (i = 0, count = 0; i < size && max > 0; i++) {
-                ch = all ? i + 1 : chans[i].chan;
-                f = ath5k_ieee2mhz(ch);
-                /* Check if channel is supported by the chipset */
-                if (!ath5k_channel_ok(ah, f, chfreq))
-                        continue;
+                ch = i + 1 ;
+                freq = ath5k_ieee2mhz(ch);
 
-                /* Match regulation domain */
-                if (!all && !(IEEE80211_DMN(chans[i].domain) &
-                                                        IEEE80211_DMN(dmn)))
+                /* Check if channel is supported by the chipset */
+                if (!ath5k_channel_ok(ah, freq, chfreq))
                         continue;
 
-                if (!all && (chans[i].mode & map[mode].mask) != map[mode].mode)
-                        continue;
+                /* Write channel info and increment counter */
+                channels[count].center_freq = freq;
+                channels[count].band = (chfreq == CHANNEL_2GHZ) ?
+                        IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+                switch (mode) {
+                case AR5K_MODE_11A:
+                case AR5K_MODE_11G:
+                        channels[count].hw_value = chfreq | CHANNEL_OFDM;
+                        break;
+                case AR5K_MODE_11A_TURBO:
+                case AR5K_MODE_11G_TURBO:
+                        channels[count].hw_value = chfreq |
+                                CHANNEL_OFDM | CHANNEL_TURBO;
+                        break;
+                case AR5K_MODE_11B:
+                        channels[count].hw_value = CHANNEL_B;
+                }
 
-                /* Write channel and increment counter */
-                channels->chan = ch;
-                channels->freq = f;
-                channels->val = map[mode].chan;
-                channels++;
                 count++;
                 max--;
         }
@@ -927,95 +930,78 @@ ath5k_copy_channels(struct ath5k_hw *ah,
         return count;
 }
 
-/* Only tries to register modes our EEPROM says it can support */
-#define REGISTER_MODE(m) do { \
-        ret = ath5k_register_mode(hw, m); \
-        if (ret) \
-                return ret; \
-} while (0) \
-
-static inline int
-ath5k_register_mode(struct ieee80211_hw *hw, u8 m)
-{
-        struct ath5k_softc *sc = hw->priv;
-        struct ieee80211_hw_mode *modes = sc->modes;
-        unsigned int i;
-        int ret;
-
-        if (!test_bit(m, sc->ah->ah_capabilities.cap_mode))
-                return 0;
-
-        for (i = 0; i < NUM_DRIVER_MODES; i++) {
-                if (modes[i].mode != m || !modes[i].num_channels)
-                        continue;
-                ret = ieee80211_register_hwmode(hw, &modes[i]);
-                if (ret) {
-                        ATH5K_ERR(sc, "can't register hwmode %u\n", m);
-                        return ret;
-                }
-                return 0;
-        }
-        BUG();
-}
-
 static int
 ath5k_getchannels(struct ieee80211_hw *hw)
 {
         struct ath5k_softc *sc = hw->priv;
         struct ath5k_hw *ah = sc->ah;
-        struct ieee80211_hw_mode *modes = sc->modes;
-        unsigned int i, max_r, max_c;
-        int ret;
+        struct ieee80211_supported_band *sbands = sc->sbands;
+        const struct ath5k_rate_table *hw_rates;
+        unsigned int max_r, max_c, count_r, count_c;
+        int mode2g = AR5K_MODE_11G;
 
-        BUILD_BUG_ON(ARRAY_SIZE(sc->modes) < 3);
-
-        /* The order here does not matter */
-        modes[0].mode = MODE_IEEE80211G;
-        modes[1].mode = MODE_IEEE80211B;
-        modes[2].mode = MODE_IEEE80211A;
+        BUILD_BUG_ON(ARRAY_SIZE(sc->sbands) < IEEE80211_NUM_BANDS);
 
         max_r = ARRAY_SIZE(sc->rates);
         max_c = ARRAY_SIZE(sc->channels);
+        count_r = count_c = 0;
 
-        for (i = 0; i < NUM_DRIVER_MODES; i++) {
-                struct ieee80211_hw_mode *mode = &modes[i];
-                const struct ath5k_rate_table *hw_rates;
+        /* 2GHz band */
+        if (!test_bit(AR5K_MODE_11G, sc->ah->ah_capabilities.cap_mode)) {
+                mode2g = AR5K_MODE_11B;
+                if (!test_bit(AR5K_MODE_11B,
+                        sc->ah->ah_capabilities.cap_mode))
+                        mode2g = -1;
+        }
 
-                if (i == 0) {
-                        modes[0].rates  = sc->rates;
-                        modes->channels = sc->channels;
-                } else {
-                        struct ieee80211_hw_mode *prev_mode = &modes[i-1];
-                        int prev_num_r  = prev_mode->num_rates;
-                        int prev_num_c  = prev_mode->num_channels;
-                        mode->rates     = &prev_mode->rates[prev_num_r];
-                        mode->channels  = &prev_mode->channels[prev_num_c];
-                }
+        if (mode2g > 0) {
+                struct ieee80211_supported_band *sband =
+                        &sbands[IEEE80211_BAND_2GHZ];
+
+                sband->bitrates = sc->rates;
+                sband->channels = sc->channels;
+
+                sband->band = IEEE80211_BAND_2GHZ;
+                sband->n_channels = ath5k_copy_channels(ah, sband->channels,
+                                        mode2g, max_c);
+
+                hw_rates = ath5k_hw_get_rate_table(ah, mode2g);
+                sband->n_bitrates = ath5k_copy_rates(sband->bitrates,
+                                        hw_rates, max_r);
+
+                count_c = sband->n_channels;
+                count_r = sband->n_bitrates;
+
+                hw->wiphy->bands[IEEE80211_BAND_2GHZ] = sband;
+
+                max_r -= count_r;
+                max_c -= count_c;
 
-                hw_rates = ath5k_hw_get_rate_table(ah, mode->mode);
-                mode->num_rates    = ath5k_copy_rates(mode->rates, hw_rates,
-                        max_r);
-                mode->num_channels = ath5k_copy_channels(ah, mode->channels,
-                        mode->mode, max_c);
-                max_r -= mode->num_rates;
-                max_c -= mode->num_channels;
         }
 
-        /* We try to register all modes this driver supports. We don't bother
-         * with MODE_IEEE80211B for AR5212 as MODE_IEEE80211G already accounts
-         * for that as per mac80211. Then, REGISTER_MODE() will will actually
-         * check the eeprom reading for more reliable capability information.
-         * Order matters here as per mac80211's latest preference. This will
-         * all hopefullly soon go away. */
+        /* 5GHz band */
 
-        REGISTER_MODE(MODE_IEEE80211G);
-        if (ah->ah_version != AR5K_AR5212)
-                REGISTER_MODE(MODE_IEEE80211B);
-        REGISTER_MODE(MODE_IEEE80211A);
+        if (test_bit(AR5K_MODE_11A, sc->ah->ah_capabilities.cap_mode)) {
+                struct ieee80211_supported_band *sband =
+                        &sbands[IEEE80211_BAND_5GHZ];
 
-        ath5k_debug_dump_modes(sc, modes);
+                sband->bitrates = &sc->rates[count_r];
+                sband->channels = &sc->channels[count_c];
 
-        return ret;
+                sband->band = IEEE80211_BAND_5GHZ;
+                sband->n_channels = ath5k_copy_channels(ah, sband->channels,
+                                        AR5K_MODE_11A, max_c);
+
+                hw_rates = ath5k_hw_get_rate_table(ah, AR5K_MODE_11A);
+                sband->n_bitrates = ath5k_copy_rates(sband->bitrates,
+                                        hw_rates, max_r);
+
+                hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;
+        }
+
+        ath5k_debug_dump_bands(sc);
+
+        return 0;
 }
 
 /*
@@ -1030,11 +1016,15 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
         struct ath5k_hw *ah = sc->ah;
         int ret;
 
-        ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "%u (%u MHz) -> %u (%u MHz)\n",
-                sc->curchan->chan, sc->curchan->freq,
-                chan->chan, chan->freq);
+        ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "(%u MHz) -> (%u MHz)\n",
+                sc->curchan->center_freq, chan->center_freq);
+
+        if (chan->center_freq != sc->curchan->center_freq ||
+                chan->hw_value != sc->curchan->hw_value) {
+
+                sc->curchan = chan;
+                sc->curband = &sc->sbands[chan->band];
 
-        if (chan->freq != sc->curchan->freq || chan->val != sc->curchan->val) {
                 /*
                  * To switch channels clear any pending DMA operations;
                  * wait long enough for the RX fifo to drain, reset the
@@ -1044,13 +1034,13 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
                 ath5k_hw_set_intr(ah, 0);       /* disable interrupts */
                 ath5k_txq_cleanup(sc);          /* clear pending tx frames */
                 ath5k_rx_stop(sc);              /* turn off frame recv */
-                ret = ath5k_hw_reset(ah, sc->opmode, chan, true);
+                ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, true);
                 if (ret) {
-                        ATH5K_ERR(sc, "%s: unable to reset channel %u "
-                                "(%u Mhz)\n", __func__, chan->chan, chan->freq);
+                        ATH5K_ERR(sc, "%s: unable to reset channel "
+                                "(%u Mhz)\n", __func__, chan->center_freq);
                         return ret;
                 }
-                sc->curchan = chan;
+
                 ath5k_hw_set_txpower_limit(sc->ah, 0);
 
                 /*
@@ -1081,6 +1071,9 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
         return 0;
 }
 
+/*
+ * TODO: CLEAN THIS !!!
+ */
 static void
 ath5k_setcurmode(struct ath5k_softc *sc, unsigned int mode)
 {
@@ -1121,10 +1114,6 @@ ath5k_setcurmode(struct ath5k_softc *sc, unsigned int mode)
                                 continue;
                         }
                         sc->hwmap[i].txflags = IEEE80211_RADIOTAP_F_DATAPAD;
-                        if (SHPREAMBLE_FLAG(ix) || rt->rates[ix].modulation ==
-                                        IEEE80211_RATE_OFDM)
-                                sc->hwmap[i].txflags |=
-                                                IEEE80211_RADIOTAP_F_SHORTPRE;
                         /* receive frames include FCS */
                         sc->hwmap[i].rxflags = sc->hwmap[i].txflags |
                                         IEEE80211_RADIOTAP_F_FCS;
@@ -1142,6 +1131,12 @@ ath5k_setcurmode(struct ath5k_softc *sc, unsigned int mode)
         }
 
         sc->curmode = mode;
+
+        if (mode == AR5K_MODE_11A) {
+                sc->curband = &sc->sbands[IEEE80211_BAND_5GHZ];
+        } else {
+                sc->curband = &sc->sbands[IEEE80211_BAND_2GHZ];
+        }
 }
 
 static void
@@ -1164,6 +1159,72 @@ ath5k_mode_setup(struct ath5k_softc *sc)
         ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "RX filter 0x%x\n", rfilt);
 }
 
+/*
+ * Match the hw provided rate index (through descriptors)
+ * to an index for sc->curband->bitrates, so it can be used
+ * by the stack.
+ *
+ * This one is a little bit tricky but i think i'm right
+ * about this...
+ *
+ * We have 4 rate tables in the following order:
+ * XR (4 rates)
+ * 802.11a (8 rates)
+ * 802.11b (4 rates)
+ * 802.11g (12 rates)
+ * that make the hw rate table.
+ *
+ * Lets take a 5211 for example that supports a and b modes only.
+ * First comes the 802.11a table and then 802.11b (total 12 rates).
+ * When hw returns eg. 11 it points to the last 802.11b rate (11Mbit),
+ * if it returns 2 it points to the second 802.11a rate etc.
+ *
+ * Same goes for 5212 who has xr/a/b/g support (total 28 rates).
+ * First comes the XR table, then 802.11a, 802.11b and 802.11g.
+ * When hw returns eg. 27 it points to the last 802.11g rate (54Mbits) etc
+ */
+static void
+ath5k_set_total_hw_rates(struct ath5k_softc *sc) {
+
+        struct ath5k_hw *ah = sc->ah;
+
+        if (test_bit(AR5K_MODE_11A, ah->ah_modes))
+                sc->a_rates = 8;
+
+        if (test_bit(AR5K_MODE_11B, ah->ah_modes))
+                sc->b_rates = 4;
+
+        if (test_bit(AR5K_MODE_11G, ah->ah_modes))
+                sc->g_rates = 12;
+
+        /* XXX: Need to see what what happens when
+                xr disable bits in eeprom are set */
+        if (ah->ah_version >= AR5K_AR5212)
+                sc->xr_rates = 4;
+
+}
+
+static inline int
+ath5k_hw_to_driver_rix(struct ath5k_softc *sc, int hw_rix) {
+
+        int mac80211_rix;
+
+        if(sc->curband->band == IEEE80211_BAND_2GHZ) {
+                /* We setup a g ratetable for both b/g modes */
+                mac80211_rix =
+                        hw_rix - sc->b_rates - sc->a_rates - sc->xr_rates;
+        } else {
+                mac80211_rix = hw_rix - sc->xr_rates;
+        }
+
+        /* Something went wrong, fallback to basic rate for this band */
+        if ((mac80211_rix >= sc->curband->n_bitrates) ||
+                (mac80211_rix <= 0 ))
+                mac80211_rix = 1;
+
+        return mac80211_rix;
+}
+
 
 
 
@@ -1268,7 +1329,8 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,
 
         ret = ah->ah_setup_tx_desc(ah, ds, pktlen,
                 ieee80211_get_hdrlen_from_skb(skb), AR5K_PKT_TYPE_NORMAL,
-                (ctl->power_level * 2), ctl->tx_rate, ctl->retry_limit, keyidx, 0, flags, 0, 0);
+                (sc->power_level * 2), ctl->tx_rate->hw_value,
+                ctl->retry_limit, keyidx, 0, flags, 0, 0);
         if (ret)
                 goto err_unmap;
 
@@ -1503,8 +1565,7 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq)
          */
         spin_lock_bh(&txq->lock);
         list_for_each_entry_safe(bf, bf0, &txq->q, list) {
-                ath5k_debug_printtxbuf(sc, bf, !sc->ah->ah_proc_tx_desc(sc->ah,
-                                        bf->desc));
+                ath5k_debug_printtxbuf(sc, bf);
 
                 ath5k_txbuf_free(sc, bf);
 
@@ -1629,20 +1690,20 @@ ath5k_rx_stop(struct ath5k_softc *sc)
 
 static unsigned int
 ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,
-                struct sk_buff *skb)
+                struct sk_buff *skb, struct ath5k_rx_status *rs)
 {
         struct ieee80211_hdr *hdr = (void *)skb->data;
         unsigned int keyix, hlen = ieee80211_get_hdrlen_from_skb(skb);
 
-        if (!(ds->ds_rxstat.rs_status & AR5K_RXERR_DECRYPT) &&
-                        ds->ds_rxstat.rs_keyix != AR5K_RXKEYIX_INVALID)
+        if (!(rs->rs_status & AR5K_RXERR_DECRYPT) &&
+                        rs->rs_keyix != AR5K_RXKEYIX_INVALID)
                 return RX_FLAG_DECRYPTED;
 
         /* Apparently when a default key is used to decrypt the packet
            the hw does not set the index used to decrypt.  In such cases
            get the index from the packet. */
         if ((le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_PROTECTED) &&
-                        !(ds->ds_rxstat.rs_status & AR5K_RXERR_DECRYPT) &&
+                        !(rs->rs_status & AR5K_RXERR_DECRYPT) &&
                         skb->len >= hlen + 4) {
                 keyix = skb->data[hlen + 3] >> 6;
 
@@ -1655,28 +1716,62 @@ ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,
 
 
 static void
-ath5k_check_ibss_hw_merge(struct ath5k_softc *sc, struct sk_buff *skb)
+ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb,
+                     struct ieee80211_rx_status *rxs)
 {
+        u64 tsf, bc_tstamp;
         u32 hw_tu;
         struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;
 
-        if ((mgmt->frame_control & IEEE80211_FCTL_FTYPE) ==
+        if ((le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_FTYPE) ==
                 IEEE80211_FTYPE_MGMT &&
-            (mgmt->frame_control & IEEE80211_FCTL_STYPE) ==
+            (le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE) ==
                 IEEE80211_STYPE_BEACON &&
-            mgmt->u.beacon.capab_info & WLAN_CAPABILITY_IBSS &&
+            le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS &&
             memcmp(mgmt->bssid, sc->ah->ah_bssid, ETH_ALEN) == 0) {
                 /*
-                 * Received an IBSS beacon with the same BSSID. Hardware might
-                 * have updated the TSF, check if we need to update timers.
+                 * Received an IBSS beacon with the same BSSID. Hardware *must*
+                 * have updated the local TSF. We have to work around various
+                 * hardware bugs, though...
                  */
-                hw_tu = TSF_TO_TU(ath5k_hw_get_tsf64(sc->ah));
-                if (hw_tu >= sc->nexttbtt) {
-                        ath5k_beacon_update_timers(sc,
-                                mgmt->u.beacon.timestamp);
+                tsf = ath5k_hw_get_tsf64(sc->ah);
+                bc_tstamp = le64_to_cpu(mgmt->u.beacon.timestamp);
+                hw_tu = TSF_TO_TU(tsf);
+
+                ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON,
+                        "beacon %llx mactime %llx (diff %lld) tsf now %llx\n",
+                        (unsigned long long)bc_tstamp,
+                        (unsigned long long)rxs->mactime,
+                        (unsigned long long)(rxs->mactime - bc_tstamp),
+                        (unsigned long long)tsf);
+
+                /*
+                 * Sometimes the HW will give us a wrong tstamp in the rx
+                 * status, causing the timestamp extension to go wrong.
+                 * (This seems to happen especially with beacon frames bigger
+                 * than 78 byte (incl. FCS))
+                 * But we know that the receive timestamp must be later than the
+                 * timestamp of the beacon since HW must have synced to that.
+                 *
+                 * NOTE: here we assume mactime to be after the frame was
+                 * received, not like mac80211 which defines it at the start.
+                 */
+                if (bc_tstamp > rxs->mactime) {
                         ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON,
-                                "detected HW merge from received beacon\n");
+                                "fixing mactime from %llx to %llx\n",
+                                (unsigned long long)rxs->mactime,
+                                (unsigned long long)tsf);
+                        rxs->mactime = tsf;
                 }
+
+                /*
+                 * Local TSF might have moved higher than our beacon timers,
+                 * in that case we have to update them to continue sending
+                 * beacons. This also takes care of synchronizing beacon sending
+                 * times with other stations.
+                 */
+                if (hw_tu >= sc->nexttbtt)
+                        ath5k_beacon_update_timers(sc, bc_tstamp);
         }
 }
 
@@ -1685,12 +1780,11 @@ static void
 ath5k_tasklet_rx(unsigned long data)
 {
         struct ieee80211_rx_status rxs = {};
+        struct ath5k_rx_status rs = {};
         struct sk_buff *skb;
         struct ath5k_softc *sc = (void *)data;
         struct ath5k_buf *bf;
         struct ath5k_desc *ds;
-        u16 len;
-        u8 stat;
         int ret;
         int hdrlen;
         int pad;
@@ -1713,7 +1807,7 @@ ath5k_tasklet_rx(unsigned long data)
                 if (unlikely(ds->ds_link == bf->daddr)) /* this is the end */
                         break;
 
-                ret = sc->ah->ah_proc_rx_desc(sc->ah, ds);
+                ret = sc->ah->ah_proc_rx_desc(sc->ah, ds, &rs);
                 if (unlikely(ret == -EINPROGRESS))
                         break;
                 else if (unlikely(ret)) {
@@ -1722,16 +1816,15 @@ ath5k_tasklet_rx(unsigned long data)
                         return;
                 }
 
-                if (unlikely(ds->ds_rxstat.rs_more)) {
+                if (unlikely(rs.rs_more)) {
                         ATH5K_WARN(sc, "unsupported jumbo\n");
                         goto next;
                 }
 
-                stat = ds->ds_rxstat.rs_status;
-                if (unlikely(stat)) {
-                        if (stat & AR5K_RXERR_PHY)
+                if (unlikely(rs.rs_status)) {
+                        if (rs.rs_status & AR5K_RXERR_PHY)
                                 goto next;
-                        if (stat & AR5K_RXERR_DECRYPT) {
+                        if (rs.rs_status & AR5K_RXERR_DECRYPT) {
                                 /*
                                  * Decrypt error.  If the error occurred
                                  * because there was no hardware key, then
@@ -1742,30 +1835,29 @@ ath5k_tasklet_rx(unsigned long data)
                                  *
                                  * XXX do key cache faulting
                                  */
-                                if (ds->ds_rxstat.rs_keyix ==
-                                                AR5K_RXKEYIX_INVALID &&
-                                                !(stat & AR5K_RXERR_CRC))
+                                if (rs.rs_keyix == AR5K_RXKEYIX_INVALID &&
+                                    !(rs.rs_status & AR5K_RXERR_CRC))
                                         goto accept;
                         }
-                        if (stat & AR5K_RXERR_MIC) {
+                        if (rs.rs_status & AR5K_RXERR_MIC) {
                                 rxs.flag |= RX_FLAG_MMIC_ERROR;
                                 goto accept;
                         }
 
                         /* let crypto-error packets fall through in MNTR */
-                        if ((stat & ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||
+                        if ((rs.rs_status &
+                                ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||
                                         sc->opmode != IEEE80211_IF_TYPE_MNTR)
                                 goto next;
                 }
 accept:
-                len = ds->ds_rxstat.rs_datalen;
-                pci_dma_sync_single_for_cpu(sc->pdev, bf->skbaddr, len,
-                                PCI_DMA_FROMDEVICE);
+                pci_dma_sync_single_for_cpu(sc->pdev, bf->skbaddr,
+                                rs.rs_datalen, PCI_DMA_FROMDEVICE);
                 pci_unmap_single(sc->pdev, bf->skbaddr, sc->rxbufsize,
                                 PCI_DMA_FROMDEVICE);
                 bf->skb = NULL;
 
-                skb_put(skb, len);
+                skb_put(skb, rs.rs_datalen);
 
                 /*
                  * the hardware adds a padding to 4 byte boundaries between
@@ -1787,13 +1879,23 @@ accept:
                  * 15bit only. that means TSF extension has to be done within
                  * 32768usec (about 32ms). it might be necessary to move this to
                  * the interrupt handler, like it is done in madwifi.
+                 *
+                 * Unfortunately we don't know when the hardware takes the rx
+                 * timestamp (beginning of phy frame, data frame, end of rx?).
+                 * The only thing we know is that it is hardware specific...
+                 * On AR5213 it seems the rx timestamp is at the end of the
+                 * frame, but i'm not sure.
+                 *
+                 * NOTE: mac80211 defines mactime at the beginning of the first
+                 * data symbol. Since we don't have any time references it's
+                 * impossible to comply to that. This affects IBSS merge only
+                 * right now, so it's not too bad...
                  */
-                rxs.mactime = ath5k_extend_tsf(sc->ah, ds->ds_rxstat.rs_tstamp);
+                rxs.mactime = ath5k_extend_tsf(sc->ah, rs.rs_tstamp);
                 rxs.flag |= RX_FLAG_TSFT;
 
-                rxs.freq = sc->curchan->freq;
-                rxs.channel = sc->curchan->chan;
-                rxs.phymode = sc->curmode;
+                rxs.freq = sc->curchan->center_freq;
+                rxs.band = sc->curband->band;
 
                 /*
                  * signal quality:
@@ -1803,25 +1905,25 @@ accept:
                 /* noise floor in dBm, from the last noise calibration */
                 rxs.noise = sc->ah->ah_noise_floor;
                 /* signal level in dBm */
-                rxs.ssi = rxs.noise + ds->ds_rxstat.rs_rssi;
+                rxs.ssi = rxs.noise + rs.rs_rssi;
                 /*
                  * "signal" is actually displayed as Link Quality by iwconfig
                  * we provide a percentage based on rssi (assuming max rssi 64)
                  */
-                rxs.signal = ds->ds_rxstat.rs_rssi * 100 / 64;
+                rxs.signal = rs.rs_rssi * 100 / 64;
 
-                rxs.antenna = ds->ds_rxstat.rs_antenna;
-                rxs.rate = ds->ds_rxstat.rs_rate;
-                rxs.flag |= ath5k_rx_decrypted(sc, ds, skb);
+                rxs.antenna = rs.rs_antenna;
+                rxs.rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);
+                rxs.flag |= ath5k_rx_decrypted(sc, ds, skb, &rs);
 
                 ath5k_debug_dump_skb(sc, skb, "RX  ", 0);
 
                 /* check beacons in IBSS mode */
                 if (sc->opmode == IEEE80211_IF_TYPE_IBSS)
-                        ath5k_check_ibss_hw_merge(sc, skb);
+                        ath5k_check_ibss_tsf(sc, skb, &rxs);
 
                 __ieee80211_rx(sc->hw, skb, &rxs);
-                sc->led_rxrate = ds->ds_rxstat.rs_rate;
+                sc->led_rxrate = rs.rs_rate;
                 ath5k_led_event(sc, ATH_LED_RX);
 next:
                 list_move_tail(&bf->list, &sc->rxbuf);
@@ -1840,6 +1942,7 @@ static void
 ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
 {
         struct ieee80211_tx_status txs = {};
+        struct ath5k_tx_status ts = {};
         struct ath5k_buf *bf, *bf0;
         struct ath5k_desc *ds;
         struct sk_buff *skb;
@@ -1852,7 +1955,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
                 /* TODO only one segment */
                 pci_dma_sync_single_for_cpu(sc->pdev, sc->desc_daddr,
                                 sc->desc_len, PCI_DMA_FROMDEVICE);
-                ret = sc->ah->ah_proc_tx_desc(sc->ah, ds);
+                ret = sc->ah->ah_proc_tx_desc(sc->ah, ds, &ts);
                 if (unlikely(ret == -EINPROGRESS))
                         break;
                 else if (unlikely(ret)) {
@@ -1867,17 +1970,16 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
                                 PCI_DMA_TODEVICE);
 
                 txs.control = bf->ctl;
-                txs.retry_count = ds->ds_txstat.ts_shortretry +
-                        ds->ds_txstat.ts_longretry / 6;
-                if (unlikely(ds->ds_txstat.ts_status)) {
+                txs.retry_count = ts.ts_shortretry + ts.ts_longretry / 6;
+                if (unlikely(ts.ts_status)) {
                         sc->ll_stats.dot11ACKFailureCount++;
-                        if (ds->ds_txstat.ts_status & AR5K_TXERR_XRETRY)
+                        if (ts.ts_status & AR5K_TXERR_XRETRY)
                                 txs.excessive_retries = 1;
-                        else if (ds->ds_txstat.ts_status & AR5K_TXERR_FILT)
+                        else if (ts.ts_status & AR5K_TXERR_FILT)
                                 txs.flags |= IEEE80211_TX_STATUS_TX_FILTERED;
                 } else {
                         txs.flags |= IEEE80211_TX_STATUS_ACK;
-                        txs.ack_signal = ds->ds_txstat.ts_rssi;
+                        txs.ack_signal = ts.ts_rssi;
                 }
 
                 ieee80211_tx_status(sc->hw, skb, &txs);
@@ -1958,8 +2060,9 @@ ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,
         ds->ds_data = bf->skbaddr;
         ret = ah->ah_setup_tx_desc(ah, ds, skb->len,
                         ieee80211_get_hdrlen_from_skb(skb),
-                        AR5K_PKT_TYPE_BEACON, (ctl->power_level * 2), ctl->tx_rate, 1,
-                        AR5K_TXKEYIX_INVALID, antenna, flags, 0, 0);
+                        AR5K_PKT_TYPE_BEACON, (sc->power_level * 2),
+                        ctl->tx_rate->hw_value, 1, AR5K_TXKEYIX_INVALID,
+                        antenna, flags, 0, 0);
         if (ret)
                 goto err_unmap;
 
@@ -2050,7 +2153,7 @@ ath5k_beacon_send(struct ath5k_softc *sc)
  * beacon timer registers.
  *
  * This is called in a variety of situations, e.g. when a beacon is received,
- * when a HW merge has been detected, but also when an new IBSS is created or
+ * when a TSF update has been detected, but also when an new IBSS is created or
  * when we otherwise know we have to update the timers, but we keep it in this
  * function to have it all together in one place.
  */
@@ -2150,7 +2253,7 @@ ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf)
  * another AP to associate with.
  *
  * In IBSS mode we use a self-linked tx descriptor if possible. We enable SWBA
- * interrupts to detect HW merges only.
+ * interrupts to detect TSF updates only.
  *
  * AP mode is missing.
  */
@@ -2170,7 +2273,7 @@ ath5k_beacon_config(struct ath5k_softc *sc)
                  * hardware send the beacons automatically. We have to load it
                  * only once here.
                  * We use the SWBA interrupt only to keep track of the beacon
-                 * timers in order to detect HW merges (automatic TSF updates).
+                 * timers in order to detect automatic TSF updates.
                  */
                 ath5k_beaconq_config(sc);
 
@@ -2211,7 +2314,8 @@ ath5k_init(struct ath5k_softc *sc)
          * be followed by initialization of the appropriate bits
          * and then setup of the interrupt mask.
          */
-        sc->curchan = sc->hw->conf.chan;
+        sc->curchan = sc->hw->conf.channel;
+        sc->curband = &sc->sbands[sc->curchan->band];
         ret = ath5k_hw_reset(sc->ah, sc->opmode, sc->curchan, false);
         if (ret) {
                 ATH5K_ERR(sc, "unable to reset hardware: %d\n", ret);
@@ -2238,7 +2342,8 @@ ath5k_init(struct ath5k_softc *sc)
          * Enable interrupts.
          */
         sc->imask = AR5K_INT_RX | AR5K_INT_TX | AR5K_INT_RXEOL |
-                AR5K_INT_RXORN | AR5K_INT_FATAL | AR5K_INT_GLOBAL;
+                AR5K_INT_RXORN | AR5K_INT_FATAL | AR5K_INT_GLOBAL |
+                AR5K_INT_MIB;
 
         ath5k_hw_set_intr(sc->ah, sc->imask);
         /* Set ack to be sent at low bit-rates */
@@ -2382,8 +2487,8 @@ ath5k_intr(int irq, void *dev_id)
                                 *
                                 * In IBSS mode we use this interrupt just to
                                 * keep track of the next TBTT (target beacon
-                                * transmission time) in order to detect hardware
-                                * merges (TSF updates).
+                                * transmission time) in order to detect wether
+                                * automatic TSF updates happened.
                                 */
                                 if (sc->opmode == IEEE80211_IF_TYPE_IBSS) {
                                          /* XXX: only if VEOL suppported */
@@ -2418,7 +2523,11 @@ ath5k_intr(int irq, void *dev_id)
                         if (status & AR5K_INT_BMISS) {
                         }
                         if (status & AR5K_INT_MIB) {
-                                /* TODO */
+                                /*
+                                 * These stats are also used for ANI i think
+                                 * so how about updating them more often ?
+                                 */
+                                ath5k_hw_update_mib_counters(ah, &sc->ll_stats);
                         }
                 }
         } while (ath5k_hw_is_intr_pending(ah) && counter-- > 0);
@@ -2448,7 +2557,8 @@ ath5k_calibrate(unsigned long data)
         struct ath5k_hw *ah = sc->ah;
 
         ATH5K_DBG(sc, ATH5K_DEBUG_CALIBRATE, "channel %u/%x\n",
-                sc->curchan->chan, sc->curchan->val);
+                ieee80211_frequency_to_channel(sc->curchan->center_freq),
+                sc->curchan->hw_value);
 
         if (ath5k_hw_get_rf_gain(ah) == AR5K_RFGAIN_NEED_CHANGE) {
                 /*
@@ -2460,7 +2570,8 @@ ath5k_calibrate(unsigned long data)
         }
         if (ath5k_hw_phy_calibrate(ah, sc->curchan))
                 ATH5K_ERR(sc, "calibration of channel %u failed\n",
-                                sc->curchan->chan);
+                        ieee80211_frequency_to_channel(
+                                sc->curchan->center_freq));
 
         mod_timer(&sc->calib_tim, round_jiffies(jiffies +
                         msecs_to_jiffies(ath5k_calinterval * 1000)));
@@ -2558,7 +2669,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
                 memmove(skb->data, skb->data+pad, hdrlen);
         }
 
-        sc->led_txrate = ctl->tx_rate;
+        sc->led_txrate = ctl->tx_rate->hw_value;
 
         spin_lock_irqsave(&sc->txbuflock, flags);
         if (list_empty(&sc->txbuf)) {
@@ -2597,11 +2708,6 @@ ath5k_reset(struct ieee80211_hw *hw)
         int ret;
 
         ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "resetting\n");
-        /*
-         * Convert to a hw channel description with the flags
-         * constrained to reflect the current operating mode.
-         */
-        sc->curchan = hw->conf.chan;
 
         ath5k_hw_set_intr(ah, 0);
         ath5k_txq_cleanup(sc);
@@ -2692,6 +2798,9 @@ end:
         mutex_unlock(&sc->lock);
 }
 
+/*
+ * TODO: Phy disable/diversity etc
+ */
 static int
 ath5k_config(struct ieee80211_hw *hw,
                         struct ieee80211_conf *conf)
@@ -2699,9 +2808,9 @@ ath5k_config(struct ieee80211_hw *hw,
         struct ath5k_softc *sc = hw->priv;
 
         sc->bintval = conf->beacon_int;
-        ath5k_setcurmode(sc, conf->phymode);
+        sc->power_level = conf->power_level;
 
-        return ath5k_chan_set(sc, conf->chan);
+        return ath5k_chan_set(sc, conf->channel);
 }
 
 static int
@@ -2869,7 +2978,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         switch(key->alg) {
         case ALG_WEP:
-                break;
+        /* XXX: fix hardware encryption, its not working. For now
+         * allow software encryption */
+                /* break; */
         case ALG_TKIP:
         case ALG_CCMP:
                 return -EOPNOTSUPP;
@@ -2909,6 +3020,10 @@ ath5k_get_stats(struct ieee80211_hw *hw,
                 struct ieee80211_low_level_stats *stats)
 {
         struct ath5k_softc *sc = hw->priv;
+        struct ath5k_hw *ah = sc->ah;
+
+        /* Force update */
+        ath5k_hw_update_mib_counters(ah, &sc->ll_stats);
 
         memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats));
 
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h
index 8287ae787f12..3a9755893018 100644
--- a/drivers/net/wireless/ath5k/base.h
+++ b/drivers/net/wireless/ath5k/base.h
@@ -83,7 +83,7 @@ struct ath5k_txq {
 #if CHAN_DEBUG
 #define ATH_CHAN_MAX    (26+26+26+200+200)
 #else
-#define ATH_CHAN_MAX    (14+14+14+252+20)       /* XXX what's the max? */
+#define ATH_CHAN_MAX    (14+14+14+252+20)
 #endif
 
 /* Software Carrier, keeps track of the driver state
@@ -95,15 +95,22 @@ struct ath5k_softc {
         struct ieee80211_tx_queue_stats tx_stats;
         struct ieee80211_low_level_stats ll_stats;
         struct ieee80211_hw     *hw;            /* IEEE 802.11 common */
-        struct ieee80211_hw_mode modes[NUM_DRIVER_MODES];
+        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
         struct ieee80211_channel channels[ATH_CHAN_MAX];
-        struct ieee80211_rate   rates[AR5K_MAX_RATES * NUM_DRIVER_MODES];
+        struct ieee80211_rate   rates[AR5K_MAX_RATES * IEEE80211_NUM_BANDS];
         enum ieee80211_if_types opmode;
         struct ath5k_hw         *ah;            /* Atheros HW */
 
-#if ATH5K_DEBUG
+        struct ieee80211_supported_band         *curband;
+
+        u8                      a_rates;
+        u8                      b_rates;
+        u8                      g_rates;
+        u8                      xr_rates;
+
+#ifdef CONFIG_ATH5K_DEBUG
         struct ath5k_dbg_info   debug;          /* debug info */
-#endif
+#endif /* CONFIG_ATH5K_DEBUG */
 
         struct ath5k_buf        *bufptr;        /* allocated buffer ptr */
         struct ath5k_desc       *desc;          /* TX/RX descriptors */
@@ -169,6 +176,7 @@ struct ath5k_softc {
         unsigned int            nexttbtt;       /* next beacon time in TU */
 
         struct timer_list       calib_tim;      /* calibration timer */
+        int                     power_level;    /* Requested tx power in dbm */
 };
 
 #define ath5k_hw_hasbssidmask(_ah) \
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c
index bb581ef6d1ef..41d5fa34b544 100644
--- a/drivers/net/wireless/ath5k/debug.c
+++ b/drivers/net/wireless/ath5k/debug.c
@@ -65,7 +65,7 @@ static unsigned int ath5k_debug;
 module_param_named(debug, ath5k_debug, uint, 0);
 
 
-#if ATH5K_DEBUG
+#ifdef CONFIG_ATH5K_DEBUG
 
 #include <linux/seq_file.h>
 #include "reg.h"
@@ -200,7 +200,8 @@ static ssize_t read_file_tsf(struct file *file, char __user *user_buf,
 {
         struct ath5k_softc *sc = file->private_data;
         char buf[100];
-        snprintf(buf, sizeof(buf), "0x%016llx\n", ath5k_hw_get_tsf64(sc->ah));
+        snprintf(buf, sizeof(buf), "0x%016llx\n",
+                 (unsigned long long)ath5k_hw_get_tsf64(sc->ah));
         return simple_read_from_buffer(user_buf, count, ppos, buf, 19);
 }
 
@@ -271,7 +272,8 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf,
 
         tsf = ath5k_hw_get_tsf64(sc->ah);
         len += snprintf(buf+len, sizeof(buf)-len,
-                "TSF\t\t0x%016llx\tTU: %08x\n", tsf, TSF_TO_TU(tsf));
+                "TSF\t\t0x%016llx\tTU: %08x\n",
+                (unsigned long long)tsf, TSF_TO_TU(tsf));
 
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
@@ -340,7 +342,7 @@ static struct {
         { ATH5K_DEBUG_LED,      "led",          "LED mamagement" },
         { ATH5K_DEBUG_DUMP_RX,  "dumprx",       "print received skb content" },
         { ATH5K_DEBUG_DUMP_TX,  "dumptx",       "print transmit skb content" },
-        { ATH5K_DEBUG_DUMPMODES, "dumpmodes",   "dump modes" },
+        { ATH5K_DEBUG_DUMPBANDS, "dumpbands",   "dump bands" },
         { ATH5K_DEBUG_TRACE,    "trace",        "trace function calls" },
         { ATH5K_DEBUG_ANY,      "all",          "show all debug levels" },
 };
@@ -452,43 +454,63 @@ ath5k_debug_finish_device(struct ath5k_softc *sc)
 /* functions used in other places */
 
 void
-ath5k_debug_dump_modes(struct ath5k_softc *sc, struct ieee80211_hw_mode *modes)
+ath5k_debug_dump_bands(struct ath5k_softc *sc)
 {
-        unsigned int m, i;
+        unsigned int b, i;
 
-        if (likely(!(sc->debug.level & ATH5K_DEBUG_DUMPMODES)))
+        if (likely(!(sc->debug.level & ATH5K_DEBUG_DUMPBANDS)))
                 return;
 
-        for (m = 0; m < NUM_DRIVER_MODES; m++) {
-                printk(KERN_DEBUG "Mode %u: channels %d, rates %d\n", m,
-                                modes[m].num_channels, modes[m].num_rates);
+        BUG_ON(!sc->sbands);
+
+        for (b = 0; b < IEEE80211_NUM_BANDS; b++) {
+                struct ieee80211_supported_band *band = &sc->sbands[b];
+                char bname[5];
+                switch (band->band) {
+                case IEEE80211_BAND_2GHZ:
+                        strcpy(bname, "2 GHz");
+                        break;
+                case IEEE80211_BAND_5GHZ:
+                        strcpy(bname, "5 GHz");
+                        break;
+                default:
+                        printk(KERN_DEBUG "Band not supported: %d\n",
+                                band->band);
+                        return;
+                }
+                printk(KERN_DEBUG "Band %s: channels %d, rates %d\n", bname,
+                                band->n_channels, band->n_bitrates);
                 printk(KERN_DEBUG " channels:\n");
-                for (i = 0; i < modes[m].num_channels; i++)
+                for (i = 0; i < band->n_channels; i++)
                         printk(KERN_DEBUG "  %3d %d %.4x %.4x\n",
-                                        modes[m].channels[i].chan,
-                                        modes[m].channels[i].freq,
-                                        modes[m].channels[i].val,
-                                        modes[m].channels[i].flag);
+                                        ieee80211_frequency_to_channel(
+                                                band->channels[i].center_freq),
+                                        band->channels[i].center_freq,
+                                        band->channels[i].hw_value,
+                                        band->channels[i].flags);
                 printk(KERN_DEBUG " rates:\n");
-                for (i = 0; i < modes[m].num_rates; i++)
+                for (i = 0; i < band->n_bitrates; i++)
                         printk(KERN_DEBUG "  %4d %.4x %.4x %.4x\n",
-                                        modes[m].rates[i].rate,
-                                        modes[m].rates[i].val,
-                                        modes[m].rates[i].flags,
-                                        modes[m].rates[i].val2);
+                                        band->bitrates[i].bitrate,
+                                        band->bitrates[i].hw_value,
+                                        band->bitrates[i].flags,
+                                        band->bitrates[i].hw_value_short);
         }
 }
 
 static inline void
-ath5k_debug_printrxbuf(struct ath5k_buf *bf, int done)
+ath5k_debug_printrxbuf(struct ath5k_buf *bf, int done,
+                       struct ath5k_rx_status *rs)
 {
         struct ath5k_desc *ds = bf->desc;
+        struct ath5k_hw_all_rx_desc *rd = &ds->ud.ds_rx;
 
         printk(KERN_DEBUG "R (%p %llx) %08x %08x %08x %08x %08x %08x %c\n",
                 ds, (unsigned long long)bf->daddr,
-                ds->ds_link, ds->ds_data, ds->ds_ctl0, ds->ds_ctl1,
-                ds->ds_hw[0], ds->ds_hw[1],
-                !done ? ' ' : (ds->ds_rxstat.rs_status == 0) ? '*' : '!');
+                ds->ds_link, ds->ds_data,
+                rd->rx_ctl.rx_control_0, rd->rx_ctl.rx_control_1,
+                rd->u.rx_stat.rx_status_0, rd->u.rx_stat.rx_status_0,
+                !done ? ' ' : (rs->rs_status == 0) ? '*' : '!');
 }
 
 void
@@ -496,6 +518,7 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)
 {
         struct ath5k_desc *ds;
         struct ath5k_buf *bf;
+        struct ath5k_rx_status rs = {};
         int status;
 
         if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))
@@ -507,9 +530,9 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)
         spin_lock_bh(&sc->rxbuflock);
         list_for_each_entry(bf, &sc->rxbuf, list) {
                 ds = bf->desc;
-                status = ah->ah_proc_rx_desc(ah, ds);
+                status = ah->ah_proc_rx_desc(ah, ds, &rs);
                 if (!status)
-                        ath5k_debug_printrxbuf(bf, status == 0);
+                        ath5k_debug_printrxbuf(bf, status == 0, &rs);
         }
         spin_unlock_bh(&sc->rxbuflock);
 }
@@ -533,19 +556,24 @@ ath5k_debug_dump_skb(struct ath5k_softc *sc,
 }
 
 void
-ath5k_debug_printtxbuf(struct ath5k_softc *sc,
-                        struct ath5k_buf *bf, int done)
+ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf)
 {
         struct ath5k_desc *ds = bf->desc;
+        struct ath5k_hw_5212_tx_desc *td = &ds->ud.ds_tx5212;
+        struct ath5k_tx_status ts = {};
+        int done;
 
         if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))
                 return;
 
+        done = sc->ah->ah_proc_tx_desc(sc->ah, bf->desc, &ts);
+
         printk(KERN_DEBUG "T (%p %llx) %08x %08x %08x %08x %08x %08x %08x "
                 "%08x %c\n", ds, (unsigned long long)bf->daddr, ds->ds_link,
-                ds->ds_data, ds->ds_ctl0, ds->ds_ctl1,
-                ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3],
-                !done ? ' ' : (ds->ds_txstat.ts_status == 0) ? '*' : '!');
+                ds->ds_data, td->tx_ctl.tx_control_0, td->tx_ctl.tx_control_1,
+                td->tx_ctl.tx_control_2, td->tx_ctl.tx_control_3,
+                td->tx_stat.tx_status_0, td->tx_stat.tx_status_1,
+                done ? ' ' : (ts.ts_status == 0) ? '*' : '!');
 }
 
-#endif /* if ATH5K_DEBUG */
+#endif /* ifdef CONFIG_ATH5K_DEBUG */
diff --git a/drivers/net/wireless/ath5k/debug.h b/drivers/net/wireless/ath5k/debug.h
index c4fd8c43df0c..2cf8d18b10e3 100644
--- a/drivers/net/wireless/ath5k/debug.h
+++ b/drivers/net/wireless/ath5k/debug.h
@@ -61,11 +61,6 @@
 #ifndef _ATH5K_DEBUG_H
 #define _ATH5K_DEBUG_H
 
-/* set this to 1 for debugging output */
-#ifndef ATH5K_DEBUG
-#define ATH5K_DEBUG     0
-#endif
-
 struct ath5k_softc;
 struct ath5k_hw;
 struct ieee80211_hw_mode;
@@ -96,7 +91,7 @@ struct ath5k_dbg_info {
  * @ATH5K_DEBUG_LED: led management
  * @ATH5K_DEBUG_DUMP_RX: print received skb content
  * @ATH5K_DEBUG_DUMP_TX: print transmit skb content
- * @ATH5K_DEBUG_DUMPMODES: dump modes
+ * @ATH5K_DEBUG_DUMPBANDS: dump bands
  * @ATH5K_DEBUG_TRACE: trace function calls
  * @ATH5K_DEBUG_ANY: show at any debug level
  *
@@ -118,12 +113,12 @@ enum ath5k_debug_level {
         ATH5K_DEBUG_LED         = 0x00000080,
         ATH5K_DEBUG_DUMP_RX     = 0x00000100,
         ATH5K_DEBUG_DUMP_TX     = 0x00000200,
-        ATH5K_DEBUG_DUMPMODES   = 0x00000400,
+        ATH5K_DEBUG_DUMPBANDS   = 0x00000400,
         ATH5K_DEBUG_TRACE       = 0x00001000,
         ATH5K_DEBUG_ANY         = 0xffffffff
 };
 
-#if ATH5K_DEBUG
+#ifdef CONFIG_ATH5K_DEBUG
 
 #define ATH5K_TRACE(_sc) do { \
         if (unlikely((_sc)->debug.level & ATH5K_DEBUG_TRACE)) \
@@ -158,20 +153,20 @@ void
 ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah);
 
 void
-ath5k_debug_dump_modes(struct ath5k_softc *sc,
-                        struct ieee80211_hw_mode *modes);
+ath5k_debug_dump_bands(struct ath5k_softc *sc);
 
 void
 ath5k_debug_dump_skb(struct ath5k_softc *sc,
                         struct sk_buff *skb, const char *prefix, int tx);
 
 void
-ath5k_debug_printtxbuf(struct ath5k_softc *sc,
-                        struct ath5k_buf *bf, int done);
+ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf);
 
 #else /* no debugging */
 
-#define ATH5K_TRACE(_sc) /* empty */
+#include <linux/compiler.h>
+
+#define ATH5K_TRACE(_sc) typecheck(struct ath5k_softc *, (_sc))
 
 static inline void __attribute__ ((format (printf, 3, 4)))
 ATH5K_DBG(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...) {}
@@ -196,17 +191,15 @@ static inline void
 ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah) {}
 
 static inline void
-ath5k_debug_dump_modes(struct ath5k_softc *sc,
-                        struct ieee80211_hw_mode *modes) {}
+ath5k_debug_dump_bands(struct ath5k_softc *sc) {}
 
 static inline void
 ath5k_debug_dump_skb(struct ath5k_softc *sc,
                         struct sk_buff *skb, const char *prefix, int tx) {}
 
 static inline void
-ath5k_debug_printtxbuf(struct ath5k_softc *sc,
-                        struct ath5k_buf *bf, int done) {}
+ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf) {}
 
-#endif /* if ATH5K_DEBUG */
+#endif /* ifdef CONFIG_ATH5K_DEBUG */
 
 #endif /* ifndef _ATH5K_DEBUG_H */
diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
index 01757436353d..87e782291a01 100644
--- a/drivers/net/wireless/ath5k/hw.c
+++ b/drivers/net/wireless/ath5k/hw.c
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2004-2007 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm@gmail.com>
  * Copyright (c) 2007 Matthew W. S. Bell  <mentor@madwifi.org>
@@ -48,14 +48,18 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *, struct ath5k_desc *,
 static int ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *, struct ath5k_desc *,
         unsigned int, unsigned int, unsigned int, unsigned int, unsigned int,
         unsigned int);
-static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *, struct ath5k_desc *);
+static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *, struct ath5k_desc *,
+                                         struct ath5k_tx_status *);
 static int ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *, struct ath5k_desc *,
         unsigned int, unsigned int, enum ath5k_pkt_type, unsigned int,
         unsigned int, unsigned int, unsigned int, unsigned int, unsigned int,
         unsigned int, unsigned int);
-static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *, struct ath5k_desc *);
-static int ath5k_hw_proc_new_rx_status(struct ath5k_hw *, struct ath5k_desc *);
-static int ath5k_hw_proc_old_rx_status(struct ath5k_hw *, struct ath5k_desc *);
+static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *, struct ath5k_desc *,
+                                         struct ath5k_tx_status *);
+static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *, struct ath5k_desc *,
+                                        struct ath5k_rx_status *);
+static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *, struct ath5k_desc *,
+                                        struct ath5k_rx_status *);
 static int ath5k_hw_get_capabilities(struct ath5k_hw *);
 
 static int ath5k_eeprom_init(struct ath5k_hw *);
@@ -81,12 +85,12 @@ static int ath5k_hw_disable_pspoll(struct ath5k_hw *);
 
 static inline unsigned int ath5k_hw_htoclock(unsigned int usec, bool turbo)
 {
-        return turbo == true ? (usec * 80) : (usec * 40);
+        return turbo ? (usec * 80) : (usec * 40);
 }
 
 static inline unsigned int ath5k_hw_clocktoh(unsigned int clock, bool turbo)
 {
-        return turbo == true ? (clock / 80) : (clock / 40);
+        return turbo ? (clock / 80) : (clock / 40);
 }
 
 /*
@@ -100,7 +104,7 @@ int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,
 
         for (i = AR5K_TUNE_REGISTER_TIMEOUT; i > 0; i--) {
                 data = ath5k_hw_reg_read(ah, reg);
-                if ((is_set == true) && (data & flag))
+                if (is_set && (data & flag))
                         break;
                 else if ((data & flag) == val)
                         break;
@@ -116,11 +120,69 @@ int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,
 \***************************************/
 
 /*
+ * Power On Self Test helper function
+ */
+static int ath5k_hw_post(struct ath5k_hw *ah)
+{
+
+        int i, c;
+        u16 cur_reg;
+        u16 regs[2] = {AR5K_STA_ID0, AR5K_PHY(8)};
+        u32 var_pattern;
+        u32 static_pattern[4] = {
+                0x55555555,     0xaaaaaaaa,
+                0x66666666,     0x99999999
+        };
+        u32 init_val;
+        u32 cur_val;
+
+        for (c = 0; c < 2; c++) {
+
+                cur_reg = regs[c];
+                init_val = ath5k_hw_reg_read(ah, cur_reg);
+
+                for (i = 0; i < 256; i++) {
+                        var_pattern = i << 16 | i;
+                        ath5k_hw_reg_write(ah, var_pattern, cur_reg);
+                        cur_val = ath5k_hw_reg_read(ah, cur_reg);
+
+                        if (cur_val != var_pattern) {
+                                ATH5K_ERR(ah->ah_sc, "POST Failed !!!\n");
+                                return -EAGAIN;
+                        }
+
+                        /* Found on ndiswrapper dumps */
+                        var_pattern = 0x0039080f;
+                        ath5k_hw_reg_write(ah, var_pattern, cur_reg);
+                }
+
+                for (i = 0; i < 4; i++) {
+                        var_pattern = static_pattern[i];
+                        ath5k_hw_reg_write(ah, var_pattern, cur_reg);
+                        cur_val = ath5k_hw_reg_read(ah, cur_reg);
+
+                        if (cur_val != var_pattern) {
+                                ATH5K_ERR(ah->ah_sc, "POST Failed !!!\n");
+                                return -EAGAIN;
+                        }
+
+                        /* Found on ndiswrapper dumps */
+                        var_pattern = 0x003b080f;
+                        ath5k_hw_reg_write(ah, var_pattern, cur_reg);
+                }
+        }
+
+        return 0;
+
+}
+
+/*
  * Check if the device is supported and initialize the needed structs
  */
 struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
 {
         struct ath5k_hw *ah;
+        struct pci_dev *pdev = sc->pdev;
         u8 mac[ETH_ALEN];
         int ret;
         u32 srev;
@@ -140,9 +202,6 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
          * HW information
          */
 
-        /* Get reg domain from eeprom */
-        ath5k_get_regdomain(ah);
-
         ah->ah_op_mode = IEEE80211_IF_TYPE_STA;
         ah->ah_radar.r_enabled = AR5K_TUNE_RADAR_ALERT;
         ah->ah_turbo = false;
@@ -177,9 +236,9 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
         }
 
         if (ah->ah_version == AR5K_AR5212)
-                ah->ah_proc_rx_desc = ath5k_hw_proc_new_rx_status;
+                ah->ah_proc_rx_desc = ath5k_hw_proc_5212_rx_status;
         else if (ah->ah_version <= AR5K_AR5211)
-                ah->ah_proc_rx_desc = ath5k_hw_proc_old_rx_status;
+                ah->ah_proc_rx_desc = ath5k_hw_proc_5210_rx_status;
 
         /* Bring device out of sleep and reset it's units */
         ret = ath5k_hw_nic_wakeup(ah, AR5K_INIT_MODE, true);
@@ -203,15 +262,19 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
                                 CHANNEL_2GHZ);
 
         /* Return on unsuported chips (unsupported eeprom etc) */
-        if(srev >= AR5K_SREV_VER_AR5416){
+        if ((srev >= AR5K_SREV_VER_AR5416) &&
+        (srev < AR5K_SREV_VER_AR2425)) {
                 ATH5K_ERR(sc, "Device not yet supported.\n");
                 ret = -ENODEV;
                 goto err_free;
+        } else if (srev == AR5K_SREV_VER_AR2425) {
+                ATH5K_WARN(sc, "Support for RF2425 is under development.\n");
         }
 
         /* Identify single chip solutions */
-        if((srev <= AR5K_SREV_VER_AR5414) &&
-        (srev >= AR5K_SREV_VER_AR2424)) {
+        if (((srev <= AR5K_SREV_VER_AR5414) &&
+        (srev >= AR5K_SREV_VER_AR2413)) ||
+        (srev == AR5K_SREV_VER_AR2425)) {
                 ah->ah_single_chip = true;
         } else {
                 ah->ah_single_chip = false;
@@ -226,15 +289,81 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
                 ah->ah_radio = AR5K_RF5110;
         } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_5112) {
                 ah->ah_radio = AR5K_RF5111;
-        } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_SC1) {
+                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5111;
+        } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_SC0) {
+
                 ah->ah_radio = AR5K_RF5112;
-        } else {
+
+                if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_5112A) {
+                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112;
+                } else {
+                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A;
+                }
+
+        } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_SC1) {
+                ah->ah_radio = AR5K_RF2413;
+                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A;
+        } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_SC2) {
+
                 ah->ah_radio = AR5K_RF5413;
+
+                if (ah->ah_mac_srev <= AR5K_SREV_VER_AR5424 &&
+                        ah->ah_mac_srev >= AR5K_SREV_VER_AR2424)
+                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5424;
+                else
+                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A;
+        /*
+         * Register returns 0x4 for radio revision
+         * so ath5k_hw_radio_revision doesn't parse the value
+         * correctly. For now we are based on mac's srev to
+         * identify RF2425 radio.
+         */
+        } else if (srev == AR5K_SREV_VER_AR2425) {
+                ah->ah_radio = AR5K_RF2425;
+                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112;
         }
 
         ah->ah_phy = AR5K_PHY(0);
 
         /*
+         * Identify AR5212-based PCI-E cards
+         * And write some initial settings.
+         *
+         * (doing a "strings" on ndis driver
+         * -ar5211.sys- reveals the following
+         * pci-e related functions:
+         *
+         * pcieClockReq
+         * pcieRxErrNotify
+         * pcieL1SKPEnable
+         * pcieAspm
+         * pcieDisableAspmOnRfWake
+         * pciePowerSaveEnable
+         *
+         * I guess these point to ClockReq but
+         * i'm not sure.)
+         */
+        if ((ah->ah_version == AR5K_AR5212) && (pdev->is_pcie)) {
+                ath5k_hw_reg_write(ah, 0x9248fc00, 0x4080);
+                ath5k_hw_reg_write(ah, 0x24924924, 0x4080);
+                ath5k_hw_reg_write(ah, 0x28000039, 0x4080);
+                ath5k_hw_reg_write(ah, 0x53160824, 0x4080);
+                ath5k_hw_reg_write(ah, 0xe5980579, 0x4080);
+                ath5k_hw_reg_write(ah, 0x001defff, 0x4080);
+                ath5k_hw_reg_write(ah, 0x1aaabe40, 0x4080);
+                ath5k_hw_reg_write(ah, 0xbe105554, 0x4080);
+                ath5k_hw_reg_write(ah, 0x000e3007, 0x4080);
+                ath5k_hw_reg_write(ah, 0x00000000, 0x4084);
+        }
+
+        /*
+         * POST
+         */
+        ret = ath5k_hw_post(ah);
+        if (ret)
+                goto err_free;
+
+        /*
          * Get card capabilities, values, ...
          */
 
@@ -280,7 +409,8 @@ err:
  */
 static int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)
 {
-        u32 turbo, mode, clock;
+        struct pci_dev *pdev = ah->ah_sc->pdev;
+        u32 turbo, mode, clock, bus_flags;
         int ret;
 
         turbo = 0;
@@ -357,10 +487,16 @@ static int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)
                                         AR5K_PHY_TURBO);
         }
 
-        /* ...reset chipset and PCI device */
-        if (ah->ah_single_chip == false && ath5k_hw_nic_reset(ah,
-                                AR5K_RESET_CTL_CHIP | AR5K_RESET_CTL_PCI)) {
-                ATH5K_ERR(ah->ah_sc, "failed to reset the MAC Chip + PCI\n");
+        /* reseting PCI on PCI-E cards results card to hang
+         * and always return 0xffff... so we ingore that flag
+         * for PCI-E cards */
+        bus_flags = (pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;
+
+        /* Reset chipset */
+        ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
+                AR5K_RESET_CTL_BASEBAND | bus_flags);
+        if (ret) {
+                ATH5K_ERR(ah->ah_sc, "failed to reset the MAC Chip\n");
                 return -EIO;
         }
 
@@ -405,15 +541,15 @@ const struct ath5k_rate_table *ath5k_hw_get_rate_table(struct ath5k_hw *ah,
 
         /* Get rate tables */
         switch (mode) {
-        case MODE_IEEE80211A:
+        case AR5K_MODE_11A:
                 return &ath5k_rt_11a;
-        case MODE_ATHEROS_TURBO:
+        case AR5K_MODE_11A_TURBO:
                 return &ath5k_rt_turbo;
-        case MODE_IEEE80211B:
+        case AR5K_MODE_11B:
                 return &ath5k_rt_11b;
-        case MODE_IEEE80211G:
+        case AR5K_MODE_11G:
                 return &ath5k_rt_11g;
-        case MODE_ATHEROS_TURBOG:
+        case AR5K_MODE_11G_TURBO:
                 return &ath5k_rt_xr;
         }
 
@@ -459,15 +595,15 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,
                 ds_coef_exp, ds_coef_man, clock;
 
         if (!(ah->ah_version == AR5K_AR5212) ||
-                !(channel->val & CHANNEL_OFDM))
+                !(channel->hw_value & CHANNEL_OFDM))
                 BUG();
 
         /* Seems there are two PLLs, one for baseband sampling and one
          * for tuning. Tuning basebands are 40 MHz or 80MHz when in
          * turbo. */
-        clock = channel->val & CHANNEL_TURBO ? 80 : 40;
+        clock = channel->hw_value & CHANNEL_TURBO ? 80 : 40;
         coef_scaled = ((5 * (clock << 24)) / 2) /
-        channel->freq;
+        channel->center_freq;
 
         for (coef_exp = 31; coef_exp > 0; coef_exp--)
                 if ((coef_scaled >> coef_exp) & 0x1)
@@ -494,8 +630,7 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,
  * ath5k_hw_write_rate_duration - set rate duration during hw resets
  *
  * @ah: the &struct ath5k_hw
- * @driver_mode: one of enum ieee80211_phymode or our one of our own
- *     vendor modes
+ * @mode: one of enum ath5k_driver_mode
  *
  * Write the rate duration table for the current mode upon hw reset. This
  * is a helper for ath5k_hw_reset(). It seems all this is doing is setting
@@ -506,19 +641,20 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,
  *
  */
 static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah,
-       unsigned int driver_mode)
+       unsigned int mode)
 {
         struct ath5k_softc *sc = ah->ah_sc;
         const struct ath5k_rate_table *rt;
+        struct ieee80211_rate srate = {};
         unsigned int i;
 
         /* Get rate table for the current operating mode */
-        rt = ath5k_hw_get_rate_table(ah,
-                driver_mode);
+        rt = ath5k_hw_get_rate_table(ah, mode);
 
         /* Write rate duration table */
         for (i = 0; i < rt->rate_count; i++) {
                 const struct ath5k_rate *rate, *control_rate;
+
                 u32 reg;
                 u16 tx_time;
 
@@ -528,14 +664,16 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah,
                 /* Set ACK timeout */
                 reg = AR5K_RATE_DUR(rate->rate_code);
 
+                srate.bitrate = control_rate->rate_kbps/100;
+
                 /* An ACK frame consists of 10 bytes. If you add the FCS,
                  * which ieee80211_generic_frame_duration() adds,
                  * its 14 bytes. Note we use the control rate and not the
                  * actual rate for this rate. See mac80211 tx.c
                  * ieee80211_duration() for a brief description of
                  * what rate we should choose to TX ACKs. */
-                tx_time = ieee80211_generic_frame_duration(sc->hw,
-                        sc->vif, 10, control_rate->rate_kbps/100);
+                tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc->hw,
+                                                        sc->vif, 10, &srate));
 
                 ath5k_hw_reg_write(ah, tx_time, reg);
 
@@ -568,8 +706,9 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
         struct ieee80211_channel *channel, bool change_channel)
 {
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
-        u32 data, s_seq, s_ant, s_led[3];
-        unsigned int i, mode, freq, ee_mode, ant[2], driver_mode = -1;
+        struct pci_dev *pdev = ah->ah_sc->pdev;
+        u32 data, s_seq, s_ant, s_led[3], dma_size;
+        unsigned int i, mode, freq, ee_mode, ant[2];
         int ret;
 
         ATH5K_TRACE(ah->ah_sc);
@@ -585,7 +724,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
          */
         /*DCU/Antenna selection not available on 5210*/
         if (ah->ah_version != AR5K_AR5210) {
-                if (change_channel == true) {
+                if (change_channel) {
                         /* Seq number for queue 0 -do this for all queues ? */
                         s_seq = ath5k_hw_reg_read(ah,
                                         AR5K_QUEUE_DFS_SEQNUM(0));
@@ -599,12 +738,12 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
         s_led[1] = ath5k_hw_reg_read(ah, AR5K_GPIOCR);
         s_led[2] = ath5k_hw_reg_read(ah, AR5K_GPIODO);
 
-        if (change_channel == true && ah->ah_rf_banks != NULL)
+        if (change_channel && ah->ah_rf_banks != NULL)
                 ath5k_hw_get_rf_gain(ah);
 
 
         /*Wakeup the device*/
-        ret = ath5k_hw_nic_wakeup(ah, channel->val, false);
+        ret = ath5k_hw_nic_wakeup(ah, channel->hw_value, false);
         if (ret)
                 return ret;
 
@@ -620,43 +759,40 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
         if (ah->ah_version != AR5K_AR5210) {
                 if (ah->ah_radio != AR5K_RF5111 &&
                         ah->ah_radio != AR5K_RF5112 &&
-                        ah->ah_radio != AR5K_RF5413) {
+                        ah->ah_radio != AR5K_RF5413 &&
+                        ah->ah_radio != AR5K_RF2413 &&
+                        ah->ah_radio != AR5K_RF2425) {
                         ATH5K_ERR(ah->ah_sc,
                                 "invalid phy radio: %u\n", ah->ah_radio);
                         return -EINVAL;
                 }
 
-                switch (channel->val & CHANNEL_MODES) {
+                switch (channel->hw_value & CHANNEL_MODES) {
                 case CHANNEL_A:
-                        mode = AR5K_INI_VAL_11A;
+                        mode = AR5K_MODE_11A;
                         freq = AR5K_INI_RFGAIN_5GHZ;
                         ee_mode = AR5K_EEPROM_MODE_11A;
-                        driver_mode = MODE_IEEE80211A;
                         break;
                 case CHANNEL_G:
-                        mode = AR5K_INI_VAL_11G;
+                        mode = AR5K_MODE_11G;
                         freq = AR5K_INI_RFGAIN_2GHZ;
                         ee_mode = AR5K_EEPROM_MODE_11G;
-                        driver_mode = MODE_IEEE80211G;
                         break;
                 case CHANNEL_B:
-                        mode = AR5K_INI_VAL_11B;
+                        mode = AR5K_MODE_11B;
                         freq = AR5K_INI_RFGAIN_2GHZ;
                         ee_mode = AR5K_EEPROM_MODE_11B;
-                        driver_mode = MODE_IEEE80211B;
                         break;
                 case CHANNEL_T:
-                        mode = AR5K_INI_VAL_11A_TURBO;
+                        mode = AR5K_MODE_11A_TURBO;
                         freq = AR5K_INI_RFGAIN_5GHZ;
                         ee_mode = AR5K_EEPROM_MODE_11A;
-                        driver_mode = MODE_ATHEROS_TURBO;
                         break;
                 /*Is this ok on 5211 too ?*/
                 case CHANNEL_TG:
-                        mode = AR5K_INI_VAL_11G_TURBO;
+                        mode = AR5K_MODE_11G_TURBO;
                         freq = AR5K_INI_RFGAIN_2GHZ;
                         ee_mode = AR5K_EEPROM_MODE_11G;
-                        driver_mode = MODE_ATHEROS_TURBOG;
                         break;
                 case CHANNEL_XR:
                         if (ah->ah_version == AR5K_AR5211) {
@@ -664,14 +800,13 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
                                         "XR mode not available on 5211");
                                 return -EINVAL;
                         }
-                        mode = AR5K_INI_VAL_XR;
+                        mode = AR5K_MODE_XR;
                         freq = AR5K_INI_RFGAIN_5GHZ;
                         ee_mode = AR5K_EEPROM_MODE_11A;
-                        driver_mode = MODE_IEEE80211A;
                         break;
                 default:
                         ATH5K_ERR(ah->ah_sc,
-                                "invalid channel: %d\n", channel->freq);
+                                "invalid channel: %d\n", channel->center_freq);
                         return -EINVAL;
                 }
 
@@ -701,15 +836,26 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
                 /*
                  * Write some more initial register settings
                  */
-                if (ah->ah_version > AR5K_AR5211){ /* found on 5213+ */
+                if (ah->ah_version == AR5K_AR5212) {
                         ath5k_hw_reg_write(ah, 0x0002a002, AR5K_PHY(11));
 
-                        if (channel->val == CHANNEL_G)
-                                ath5k_hw_reg_write(ah, 0x00f80d80, AR5K_PHY(83)); /* 0x00fc0ec0 */
+                        if (channel->hw_value == CHANNEL_G)
+                                if (ah->ah_mac_srev < AR5K_SREV_VER_AR2413)
+                                        ath5k_hw_reg_write(ah, 0x00f80d80,
+                                                AR5K_PHY(83));
+                                else if (ah->ah_mac_srev < AR5K_SREV_VER_AR2424)
+                                        ath5k_hw_reg_write(ah, 0x00380140,
+                                                AR5K_PHY(83));
+                                else if (ah->ah_mac_srev < AR5K_SREV_VER_AR2425)
+                                        ath5k_hw_reg_write(ah, 0x00fc0ec0,
+                                                AR5K_PHY(83));
+                                else /* 2425 */
+                                        ath5k_hw_reg_write(ah, 0x00fc0fc0,
+                                                AR5K_PHY(83));
                         else
-                                ath5k_hw_reg_write(ah, 0x00000000, AR5K_PHY(83));
+                                ath5k_hw_reg_write(ah, 0x00000000,
+                                        AR5K_PHY(83));
 
-                        ath5k_hw_reg_write(ah, 0x000001b5, 0xa228); /* 0x000009b5 */
                         ath5k_hw_reg_write(ah, 0x000009b5, 0xa228);
                         ath5k_hw_reg_write(ah, 0x0000000f, 0x8060);
                         ath5k_hw_reg_write(ah, 0x00000000, 0xa254);
@@ -722,7 +868,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
                                 AR5K_SREV_RAD_5112A) {
                         ath5k_hw_reg_write(ah, AR5K_PHY_CCKTXCTL_WORLD,
                                         AR5K_PHY_CCKTXCTL);
-                        if (channel->val & CHANNEL_5GHZ)
+                        if (channel->hw_value & CHANNEL_5GHZ)
                                 data = 0xffb81020;
                         else
                                 data = 0xffb80d20;
@@ -742,7 +888,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
                  * mac80211 are integrated */
                 if (ah->ah_version == AR5K_AR5212 &&
                         ah->ah_sc->vif != NULL)
-                        ath5k_hw_write_rate_duration(ah, driver_mode);
+                        ath5k_hw_write_rate_duration(ah, mode);
 
                 /*
                  * Write RF registers
@@ -758,7 +904,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
 
                 /* Write OFDM timings on 5212*/
                 if (ah->ah_version == AR5K_AR5212 &&
-                        channel->val & CHANNEL_OFDM) {
+                        channel->hw_value & CHANNEL_OFDM) {
                         ret = ath5k_hw_write_ofdm_timings(ah, channel);
                         if (ret)
                                 return ret;
@@ -767,7 +913,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
                 /*Enable/disable 802.11b mode on 5111
                 (enable 2111 frequency converter + CCK)*/
                 if (ah->ah_radio == AR5K_RF5111) {
-                        if (driver_mode == MODE_IEEE80211B)
+                        if (mode == AR5K_MODE_11B)
                                 AR5K_REG_ENABLE_BITS(ah, AR5K_TXCFG,
                                     AR5K_TXCFG_B_MODE);
                         else
@@ -885,13 +1031,24 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
 
         /*
          * Set Rx/Tx DMA Configuration
-         *(passing dma size not available on 5210)
+         *
+         * Set maximum DMA size (512) except for PCI-E cards since
+         * it causes rx overruns and tx errors (tested on 5424 but since
+         * rx overruns also occur on 5416/5418 with madwifi we set 128
+         * for all PCI-E cards to be safe).
+         *
+         * In dumps this is 128 for allchips.
+         *
+         * XXX: need to check 5210 for this
+         * TODO: Check out tx triger level, it's always 64 on dumps but I
+         * guess we can tweak it and see how it goes ;-)
          */
+        dma_size = (pdev->is_pcie) ? AR5K_DMASIZE_128B : AR5K_DMASIZE_512B;
         if (ah->ah_version != AR5K_AR5210) {
-                AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG, AR5K_TXCFG_SDMAMR,
-                                AR5K_DMASIZE_512B | AR5K_TXCFG_DMASIZE);
-                AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG, AR5K_RXCFG_SDMAMW,
-                                AR5K_DMASIZE_512B);
+                AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
+                        AR5K_TXCFG_SDMAMR, dma_size);
+                AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
+                        AR5K_RXCFG_SDMAMW, dma_size);
         }
 
         /*
@@ -905,7 +1062,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
         if (ah->ah_version != AR5K_AR5210) {
                 data = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &
                         AR5K_PHY_RX_DELAY_M;
-                data = (channel->val & CHANNEL_CCK) ?
+                data = (channel->hw_value & CHANNEL_CCK) ?
                         ((data << 2) / 22) : (data / 10);
 
                 udelay(100 + data);
@@ -922,11 +1079,11 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
         if (ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,
                         AR5K_PHY_AGCCTL_CAL, 0, false)) {
                 ATH5K_ERR(ah->ah_sc, "calibration timeout (%uMHz)\n",
-                        channel->freq);
+                        channel->center_freq);
                 return -EAGAIN;
         }
 
-        ret = ath5k_hw_noise_floor_calibration(ah, channel->freq);
+        ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
         if (ret)
                 return ret;
 
@@ -934,7 +1091,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
 
         /* A and G modes can use QAM modulation which requires enabling
          * I and Q calibration. Don't bother in B mode. */
-        if (!(driver_mode == MODE_IEEE80211B)) {
+        if (!(mode == AR5K_MODE_11B)) {
                 ah->ah_calibration = true;
                 AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,
                                 AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);
@@ -981,6 +1138,8 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
 
         /*
          * Set the 32MHz reference clock on 5212 phy clock sleep register
+         *
+         * TODO: Find out how to switch to external 32Khz clock to save power
          */
         if (ah->ah_version == AR5K_AR5212) {
                 ath5k_hw_reg_write(ah, AR5K_PHY_SCR_32MHZ, AR5K_PHY_SCR);
@@ -988,9 +1147,15 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
                 ath5k_hw_reg_write(ah, AR5K_PHY_SCAL_32MHZ, AR5K_PHY_SCAL);
                 ath5k_hw_reg_write(ah, AR5K_PHY_SCLOCK_32MHZ, AR5K_PHY_SCLOCK);
                 ath5k_hw_reg_write(ah, AR5K_PHY_SDELAY_32MHZ, AR5K_PHY_SDELAY);
-                ath5k_hw_reg_write(ah, ah->ah_radio == AR5K_RF5111 ?
-                        AR5K_PHY_SPENDING_RF5111 : AR5K_PHY_SPENDING_RF5112,
-                        AR5K_PHY_SPENDING);
+                ath5k_hw_reg_write(ah, ah->ah_phy_spending, AR5K_PHY_SPENDING);
+        }
+
+        if (ah->ah_version == AR5K_AR5212) {
+                ath5k_hw_reg_write(ah, 0x000100aa, 0x8118);
+                ath5k_hw_reg_write(ah, 0x00003210, 0x811c);
+                ath5k_hw_reg_write(ah, 0x00000052, 0x8108);
+                if (ah->ah_mac_srev >= AR5K_SREV_VER_AR2413)
+                        ath5k_hw_reg_write(ah, 0x00000004, 0x8120);
         }
 
         /*
@@ -1065,7 +1230,7 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
                 staid &= ~AR5K_STA_ID1_DEFAULT_ANTENNA;
                 /* fallthrough */
         case AR5K_PM_NETWORK_SLEEP:
-                if (set_chip == true)
+                if (set_chip)
                         ath5k_hw_reg_write(ah,
                                 AR5K_SLEEP_CTL_SLE | sleep_duration,
                                 AR5K_SLEEP_CTL);
@@ -1074,7 +1239,7 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
                 break;
 
         case AR5K_PM_FULL_SLEEP:
-                if (set_chip == true)
+                if (set_chip)
                         ath5k_hw_reg_write(ah, AR5K_SLEEP_CTL_SLE_SLP,
                                 AR5K_SLEEP_CTL);
 
@@ -1082,7 +1247,7 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
                 break;
 
         case AR5K_PM_AWAKE:
-                if (set_chip == false)
+                if (!set_chip)
                         goto commit;
 
                 ath5k_hw_reg_write(ah, AR5K_SLEEP_CTL_SLE_WAKE,
@@ -1389,7 +1554,7 @@ int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)
         trigger_level = AR5K_REG_MS(ath5k_hw_reg_read(ah, AR5K_TXCFG),
                         AR5K_TXCFG_TXFULL);
 
-        if (increase == false) {
+        if (!increase) {
                 if (--trigger_level < AR5K_TUNE_MIN_TX_FIFO_THRES)
                         goto done;
         } else
@@ -1592,9 +1757,10 @@ static int ath5k_hw_eeprom_read(struct ath5k_hw *ah, u32 offset, u16 *data)
 /*
  * Write to eeprom - currently disabled, use at your own risk
  */
+#if 0
 static int ath5k_hw_eeprom_write(struct ath5k_hw *ah, u32 offset, u16 data)
 {
-#if 0
+
         u32 status, timeout;
 
         ATH5K_TRACE(ah->ah_sc);
@@ -1636,10 +1802,11 @@ static int ath5k_hw_eeprom_write(struct ath5k_hw *ah, u32 offset, u16 data)
                 }
                 udelay(15);
         }
-#endif
+
         ATH5K_ERR(ah->ah_sc, "EEPROM Write is disabled!");
         return -EIO;
 }
+#endif
 
 /*
  * Translate binary channel representation in EEPROM to frequency
@@ -2045,50 +2212,6 @@ static int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
 }
 
 /*
- * Read/Write regulatory domain
- */
-static bool ath5k_eeprom_regulation_domain(struct ath5k_hw *ah, bool write,
-        enum ath5k_regdom *regdomain)
-{
-        u16 ee_regdomain;
-
-        /* Read current value */
-        if (write != true) {
-                ee_regdomain = ah->ah_capabilities.cap_eeprom.ee_regdomain;
-                *regdomain = ath5k_regdom_to_ieee(ee_regdomain);
-                return true;
-        }
-
-        ee_regdomain = ath5k_regdom_from_ieee(*regdomain);
-
-        /* Try to write a new value */
-        if (ah->ah_capabilities.cap_eeprom.ee_protect &
-                        AR5K_EEPROM_PROTECT_WR_128_191)
-                return false;
-        if (ath5k_hw_eeprom_write(ah, AR5K_EEPROM_REG_DOMAIN, ee_regdomain)!=0)
-                return false;
-
-        ah->ah_capabilities.cap_eeprom.ee_regdomain = ee_regdomain;
-
-        return true;
-}
-
-/*
- * Use the above to write a new regulatory domain
- */
-int ath5k_hw_set_regdomain(struct ath5k_hw *ah, u16 regdomain)
-{
-        enum ath5k_regdom ieee_regdomain;
-
-        ieee_regdomain = ath5k_regdom_to_ieee(regdomain);
-
-        if (ath5k_eeprom_regulation_domain(ah, true, &ieee_regdomain) == true)
-                return 0;
-
-        return -EIO;
-}
-
-/*
  * Fill the capabilities struct
  */
 static int ath5k_hw_get_capabilities(struct ath5k_hw *ah)
@@ -2110,8 +2233,8 @@ static int ath5k_hw_get_capabilities(struct ath5k_hw *ah)
                 ah->ah_capabilities.cap_range.range_2ghz_max = 0;
 
                 /* Set supported modes */
-                __set_bit(MODE_IEEE80211A, ah->ah_capabilities.cap_mode);
-                __set_bit(MODE_ATHEROS_TURBO, ah->ah_capabilities.cap_mode);
+                __set_bit(AR5K_MODE_11A, ah->ah_capabilities.cap_mode);
+                __set_bit(AR5K_MODE_11A_TURBO, ah->ah_capabilities.cap_mode);
         } else {
                 /*
                  * XXX The tranceiver supports frequencies from 4920 to 6100GHz
@@ -2133,12 +2256,12 @@ static int ath5k_hw_get_capabilities(struct ath5k_hw *ah)
                         ah->ah_capabilities.cap_range.range_5ghz_max = 6100;
 
                         /* Set supported modes */
-                        __set_bit(MODE_IEEE80211A,
+                        __set_bit(AR5K_MODE_11A,
                                         ah->ah_capabilities.cap_mode);
-                        __set_bit(MODE_ATHEROS_TURBO,
+                        __set_bit(AR5K_MODE_11A_TURBO,
                                         ah->ah_capabilities.cap_mode);
                         if (ah->ah_version == AR5K_AR5212)
-                                __set_bit(MODE_ATHEROS_TURBOG,
+                                __set_bit(AR5K_MODE_11G_TURBO,
                                                 ah->ah_capabilities.cap_mode);
                 }
 
@@ -2150,11 +2273,11 @@ static int ath5k_hw_get_capabilities(struct ath5k_hw *ah)
                         ah->ah_capabilities.cap_range.range_2ghz_max = 2732;
 
                         if (AR5K_EEPROM_HDR_11B(ee_header))
-                                __set_bit(MODE_IEEE80211B,
+                                __set_bit(AR5K_MODE_11B,
                                                 ah->ah_capabilities.cap_mode);
 
                         if (AR5K_EEPROM_HDR_11G(ee_header))
-                                __set_bit(MODE_IEEE80211G,
+                                __set_bit(AR5K_MODE_11G,
                                                 ah->ah_capabilities.cap_mode);
                 }
         }
@@ -2279,8 +2402,8 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc_id)
          * Set simple BSSID mask on 5212
          */
         if (ah->ah_version == AR5K_AR5212) {
-                ath5k_hw_reg_write(ah, 0xfffffff, AR5K_BSS_IDM0);
-                ath5k_hw_reg_write(ah, 0xfffffff, AR5K_BSS_IDM1);
+                ath5k_hw_reg_write(ah, 0xffffffff, AR5K_BSS_IDM0);
+                ath5k_hw_reg_write(ah, 0xffffffff, AR5K_BSS_IDM1);
         }
 
         /*
@@ -2425,6 +2548,8 @@ void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)
 {
         ATH5K_TRACE(ah->ah_sc);
         AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
+
+        /* TODO: ANI Support */
 }
 
 /*
@@ -2434,6 +2559,8 @@ void ath5k_hw_stop_pcu_recv(struct ath5k_hw *ah)
 {
         ATH5K_TRACE(ah->ah_sc);
         AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
+
+        /* TODO: ANI Support */
 }
 
 /*
@@ -2828,15 +2955,19 @@ int ath5k_hw_beaconq_finish(struct ath5k_hw *ah, unsigned long phys_addr)
  * Update mib counters (statistics)
  */
 void ath5k_hw_update_mib_counters(struct ath5k_hw *ah,
-                struct ath5k_mib_stats *statistics)
+                struct ieee80211_low_level_stats  *stats)
 {
         ATH5K_TRACE(ah->ah_sc);
+
         /* Read-And-Clear */
-        statistics->ackrcv_bad += ath5k_hw_reg_read(ah, AR5K_ACK_FAIL);
-        statistics->rts_bad += ath5k_hw_reg_read(ah, AR5K_RTS_FAIL);
-        statistics->rts_good += ath5k_hw_reg_read(ah, AR5K_RTS_OK);
-        statistics->fcs_bad += ath5k_hw_reg_read(ah, AR5K_FCS_FAIL);
-        statistics->beacons += ath5k_hw_reg_read(ah, AR5K_BEACON_CNT);
+        stats->dot11ACKFailureCount += ath5k_hw_reg_read(ah, AR5K_ACK_FAIL);
+        stats->dot11RTSFailureCount += ath5k_hw_reg_read(ah, AR5K_RTS_FAIL);
+        stats->dot11RTSSuccessCount += ath5k_hw_reg_read(ah, AR5K_RTS_OK);
+        stats->dot11FCSErrorCount += ath5k_hw_reg_read(ah, AR5K_FCS_FAIL);
+
+        /* XXX: Should we use this to track beacon count ?
+         * -we read it anyway to clear the register */
+        ath5k_hw_reg_read(ah, AR5K_BEACON_CNT);
 
         /* Reset profile count registers on 5212*/
         if (ah->ah_version == AR5K_AR5212) {
@@ -2937,8 +3068,16 @@ int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry)
         for (i = 0; i < AR5K_KEYCACHE_SIZE; i++)
                 ath5k_hw_reg_write(ah, 0, AR5K_KEYTABLE_OFF(entry, i));
 
-        /* Set NULL encryption on non-5210*/
-        if (ah->ah_version != AR5K_AR5210)
+        /*
+         * Set NULL encryption on AR5212+
+         *
+         * Note: AR5K_KEYTABLE_TYPE -> AR5K_KEYTABLE_OFF(entry, 5)
+         *       AR5K_KEYTABLE_TYPE_NULL -> 0x00000007
+         *
+         * Note2: Windows driver (ndiswrapper) sets this to
+         *        0x00000714 instead of 0x00000007
+         */
+        if (ah->ah_version > AR5K_AR5211)
                 ath5k_hw_reg_write(ah, AR5K_KEYTABLE_TYPE_NULL,
                                 AR5K_KEYTABLE_TYPE(entry));
 
@@ -3186,19 +3325,19 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
                         return 0;
 
                 /* Set Slot time */
-                ath5k_hw_reg_write(ah, ah->ah_turbo == true ?
+                ath5k_hw_reg_write(ah, ah->ah_turbo ?
                         AR5K_INIT_SLOT_TIME_TURBO : AR5K_INIT_SLOT_TIME,
                         AR5K_SLOT_TIME);
                 /* Set ACK_CTS timeout */
-                ath5k_hw_reg_write(ah, ah->ah_turbo == true ?
+                ath5k_hw_reg_write(ah, ah->ah_turbo ?
                         AR5K_INIT_ACK_CTS_TIMEOUT_TURBO :
                         AR5K_INIT_ACK_CTS_TIMEOUT, AR5K_SLOT_TIME);
                 /* Set Transmit Latency */
-                ath5k_hw_reg_write(ah, ah->ah_turbo == true ?
+                ath5k_hw_reg_write(ah, ah->ah_turbo ?
                         AR5K_INIT_TRANSMIT_LATENCY_TURBO :
                         AR5K_INIT_TRANSMIT_LATENCY, AR5K_USEC_5210);
                 /* Set IFS0 */
-                if (ah->ah_turbo == true)
+                if (ah->ah_turbo)
                          ath5k_hw_reg_write(ah, ((AR5K_INIT_SIFS_TURBO +
                                 (ah->ah_aifs + tq->tqi_aifs) *
                                 AR5K_INIT_SLOT_TIME_TURBO) <<
@@ -3211,16 +3350,16 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
                                 AR5K_INIT_SIFS, AR5K_IFS0);
 
                 /* Set IFS1 */
-                ath5k_hw_reg_write(ah, ah->ah_turbo == true ?
+                ath5k_hw_reg_write(ah, ah->ah_turbo ?
                         AR5K_INIT_PROTO_TIME_CNTRL_TURBO :
                         AR5K_INIT_PROTO_TIME_CNTRL, AR5K_IFS1);
                 /* Set PHY register 0x9844 (??) */
-                ath5k_hw_reg_write(ah, ah->ah_turbo == true ?
+                ath5k_hw_reg_write(ah, ah->ah_turbo ?
                         (ath5k_hw_reg_read(ah, AR5K_PHY(17)) & ~0x7F) | 0x38 :
                         (ath5k_hw_reg_read(ah, AR5K_PHY(17)) & ~0x7F) | 0x1C,
                         AR5K_PHY(17));
                 /* Set Frame Control Register */
-                ath5k_hw_reg_write(ah, ah->ah_turbo == true ?
+                ath5k_hw_reg_write(ah, ah->ah_turbo ?
                         (AR5K_PHY_FRAME_CTL_INI | AR5K_PHY_TURBO_MODE |
                         AR5K_PHY_TURBO_SHORT | 0x2020) :
                         (AR5K_PHY_FRAME_CTL_INI | 0x1020),
@@ -3259,7 +3398,7 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
         /*
          * Calculate and set retry limits
          */
-        if (ah->ah_software_retry == true) {
+        if (ah->ah_software_retry) {
                 /* XXX Need to test this */
                 retry_lg = ah->ah_limit_tx_retries;
                 retry_sh = retry_lg = retry_lg > AR5K_DCU_RETRY_LMT_SH_RETRY ?
@@ -3507,10 +3646,10 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         unsigned int rtscts_rate, unsigned int rtscts_duration)
 {
         u32 frame_type;
-        struct ath5k_hw_2w_tx_desc *tx_desc;
+        struct ath5k_hw_2w_tx_ctl *tx_ctl;
         unsigned int frame_len;
 
-        tx_desc = (struct ath5k_hw_2w_tx_desc *)&desc->ds_ctl0;
+        tx_ctl = &desc->ud.ds_tx5210.tx_ctl;
 
         /*
          * Validate input
@@ -3529,12 +3668,8 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                 return -EINVAL;
         }
 
-        /* Clear status descriptor */
-        memset(desc->ds_hw, 0, sizeof(struct ath5k_hw_tx_status));
-
-        /* Initialize control descriptor */
-        tx_desc->tx_control_0 = 0;
-        tx_desc->tx_control_1 = 0;
+        /* Clear descriptor */
+        memset(&desc->ud.ds_tx5210, 0, sizeof(struct ath5k_hw_5210_tx_desc));
 
         /* Setup control descriptor */
 
@@ -3546,7 +3681,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         if (frame_len & ~AR5K_2W_TX_DESC_CTL0_FRAME_LEN)
                 return -EINVAL;
 
-        tx_desc->tx_control_0 = frame_len & AR5K_2W_TX_DESC_CTL0_FRAME_LEN;
+        tx_ctl->tx_control_0 = frame_len & AR5K_2W_TX_DESC_CTL0_FRAME_LEN;
 
         /* Verify and set buffer length */
 
@@ -3557,7 +3692,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         if (pkt_len & ~AR5K_2W_TX_DESC_CTL1_BUF_LEN)
                 return -EINVAL;
 
-        tx_desc->tx_control_1 = pkt_len & AR5K_2W_TX_DESC_CTL1_BUF_LEN;
+        tx_ctl->tx_control_1 = pkt_len & AR5K_2W_TX_DESC_CTL1_BUF_LEN;
 
         /*
          * Verify and set header length
@@ -3566,7 +3701,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         if (ah->ah_version == AR5K_AR5210) {
                 if (hdr_len & ~AR5K_2W_TX_DESC_CTL0_HEADER_LEN)
                         return -EINVAL;
-                tx_desc->tx_control_0 |=
+                tx_ctl->tx_control_0 |=
                         AR5K_REG_SM(hdr_len, AR5K_2W_TX_DESC_CTL0_HEADER_LEN);
         }
 
@@ -3582,19 +3717,19 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                         frame_type = type /*<< 2 ?*/;
                 }
 
-                tx_desc->tx_control_0 |=
+                tx_ctl->tx_control_0 |=
                         AR5K_REG_SM(frame_type, AR5K_2W_TX_DESC_CTL0_FRAME_TYPE) |
                         AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE);
         } else {
-                tx_desc->tx_control_0 |=
+                tx_ctl->tx_control_0 |=
                         AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE) |
                         AR5K_REG_SM(antenna_mode, AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT);
-                tx_desc->tx_control_1 |=
+                tx_ctl->tx_control_1 |=
                         AR5K_REG_SM(type, AR5K_2W_TX_DESC_CTL1_FRAME_TYPE);
         }
 #define _TX_FLAGS(_c, _flag)                                            \
         if (flags & AR5K_TXDESC_##_flag)                                \
-                tx_desc->tx_control_##_c |=                             \
+                tx_ctl->tx_control_##_c |=                              \
                         AR5K_2W_TX_DESC_CTL##_c##_##_flag
 
         _TX_FLAGS(0, CLRDMASK);
@@ -3609,9 +3744,9 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
          * WEP crap
          */
         if (key_index != AR5K_TXKEYIX_INVALID) {
-                tx_desc->tx_control_0 |=
+                tx_ctl->tx_control_0 |=
                         AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
-                tx_desc->tx_control_1 |=
+                tx_ctl->tx_control_1 |=
                         AR5K_REG_SM(key_index,
                         AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);
         }
@@ -3621,7 +3756,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
          */
         if ((ah->ah_version == AR5K_AR5210) &&
                         (flags & (AR5K_TXDESC_RTSENA | AR5K_TXDESC_CTSENA)))
-                tx_desc->tx_control_1 |= rtscts_duration &
+                tx_ctl->tx_control_1 |= rtscts_duration &
                                 AR5K_2W_TX_DESC_CTL1_RTS_DURATION;
 
         return 0;
@@ -3637,13 +3772,11 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
         unsigned int antenna_mode, unsigned int flags, unsigned int rtscts_rate,
         unsigned int rtscts_duration)
 {
-        struct ath5k_hw_4w_tx_desc *tx_desc;
-        struct ath5k_hw_tx_status *tx_status;
+        struct ath5k_hw_4w_tx_ctl *tx_ctl;
         unsigned int frame_len;
 
         ATH5K_TRACE(ah->ah_sc);
-        tx_desc = (struct ath5k_hw_4w_tx_desc *)&desc->ds_ctl0;
-        tx_status = (struct ath5k_hw_tx_status *)&desc->ds_hw[2];
+        tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
 
         /*
          * Validate input
@@ -3662,14 +3795,8 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
                 return -EINVAL;
         }
 
-        /* Clear status descriptor */
-        memset(tx_status, 0, sizeof(struct ath5k_hw_tx_status));
-
-        /* Initialize control descriptor */
-        tx_desc->tx_control_0 = 0;
-        tx_desc->tx_control_1 = 0;
-        tx_desc->tx_control_2 = 0;
-        tx_desc->tx_control_3 = 0;
+        /* Clear descriptor */
+        memset(&desc->ud.ds_tx5212, 0, sizeof(struct ath5k_hw_5212_tx_desc));
 
         /* Setup control descriptor */
 
@@ -3681,7 +3808,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
         if (frame_len & ~AR5K_4W_TX_DESC_CTL0_FRAME_LEN)
                 return -EINVAL;
 
-        tx_desc->tx_control_0 = frame_len & AR5K_4W_TX_DESC_CTL0_FRAME_LEN;
+        tx_ctl->tx_control_0 = frame_len & AR5K_4W_TX_DESC_CTL0_FRAME_LEN;
 
         /* Verify and set buffer length */
 
@@ -3692,20 +3819,20 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
         if (pkt_len & ~AR5K_4W_TX_DESC_CTL1_BUF_LEN)
                 return -EINVAL;
 
-        tx_desc->tx_control_1 = pkt_len & AR5K_4W_TX_DESC_CTL1_BUF_LEN;
+        tx_ctl->tx_control_1 = pkt_len & AR5K_4W_TX_DESC_CTL1_BUF_LEN;
 
-        tx_desc->tx_control_0 |=
+        tx_ctl->tx_control_0 |=
                 AR5K_REG_SM(tx_power, AR5K_4W_TX_DESC_CTL0_XMIT_POWER) |
                 AR5K_REG_SM(antenna_mode, AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT);
-        tx_desc->tx_control_1 |= AR5K_REG_SM(type,
+        tx_ctl->tx_control_1 |= AR5K_REG_SM(type,
                                         AR5K_4W_TX_DESC_CTL1_FRAME_TYPE);
-        tx_desc->tx_control_2 = AR5K_REG_SM(tx_tries0 + AR5K_TUNE_HWTXTRIES,
+        tx_ctl->tx_control_2 = AR5K_REG_SM(tx_tries0 + AR5K_TUNE_HWTXTRIES,
                                         AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0);
-        tx_desc->tx_control_3 = tx_rate0 & AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;
+        tx_ctl->tx_control_3 = tx_rate0 & AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;
 
 #define _TX_FLAGS(_c, _flag)                    \
         if (flags & AR5K_TXDESC_##_flag)        \
-                tx_desc->tx_control_##_c |=     \
+                tx_ctl->tx_control_##_c |=      \
                         AR5K_4W_TX_DESC_CTL##_c##_##_flag
 
         _TX_FLAGS(0, CLRDMASK);
@@ -3721,8 +3848,8 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
          * WEP crap
          */
         if (key_index != AR5K_TXKEYIX_INVALID) {
-                tx_desc->tx_control_0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
-                tx_desc->tx_control_1 |= AR5K_REG_SM(key_index,
+                tx_ctl->tx_control_0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
+                tx_ctl->tx_control_1 |= AR5K_REG_SM(key_index,
                                 AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);
         }
 
@@ -3733,9 +3860,9 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
                 if ((flags & AR5K_TXDESC_RTSENA) &&
                                 (flags & AR5K_TXDESC_CTSENA))
                         return -EINVAL;
-                tx_desc->tx_control_2 |= rtscts_duration &
+                tx_ctl->tx_control_2 |= rtscts_duration &
                                 AR5K_4W_TX_DESC_CTL2_RTS_DURATION;
-                tx_desc->tx_control_3 |= AR5K_REG_SM(rtscts_rate,
+                tx_ctl->tx_control_3 |= AR5K_REG_SM(rtscts_rate,
                                 AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE);
         }
 
@@ -3750,7 +3877,7 @@ ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2, u_int tx_tries2,
         unsigned int tx_rate3, u_int tx_tries3)
 {
-        struct ath5k_hw_4w_tx_desc *tx_desc;
+        struct ath5k_hw_4w_tx_ctl *tx_ctl;
 
         /*
          * Rates can be 0 as long as the retry count is 0 too.
@@ -3767,14 +3894,14 @@ ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         }
 
         if (ah->ah_version == AR5K_AR5212) {
-                tx_desc = (struct ath5k_hw_4w_tx_desc *)&desc->ds_ctl0;
+                tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
 
 #define _XTX_TRIES(_n)                                                  \
         if (tx_tries##_n) {                                             \
-                tx_desc->tx_control_2 |=                                \
+                tx_ctl->tx_control_2 |=                         \
                     AR5K_REG_SM(tx_tries##_n,                           \
                     AR5K_4W_TX_DESC_CTL2_XMIT_TRIES##_n);               \
-                tx_desc->tx_control_3 |=                                \
+                tx_ctl->tx_control_3 |=                         \
                     AR5K_REG_SM(tx_rate##_n,                            \
                     AR5K_4W_TX_DESC_CTL3_XMIT_RATE##_n);                \
         }
@@ -3795,13 +3922,15 @@ ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
  * Proccess the tx status descriptor on 5210/5211
  */
 static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc)
+                struct ath5k_desc *desc, struct ath5k_tx_status *ts)
 {
+        struct ath5k_hw_2w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
-        struct ath5k_hw_2w_tx_desc *tx_desc;
 
-        tx_desc = (struct ath5k_hw_2w_tx_desc *)&desc->ds_ctl0;
-        tx_status = (struct ath5k_hw_tx_status *)&desc->ds_hw[0];
+        ATH5K_TRACE(ah->ah_sc);
+
+        tx_ctl = &desc->ud.ds_tx5210.tx_ctl;
+        tx_status = &desc->ud.ds_tx5210.tx_stat;
 
         /* No frame has been send or error */
         if (unlikely((tx_status->tx_status_1 & AR5K_DESC_TX_STATUS1_DONE) == 0))
@@ -3810,32 +3939,32 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
         /*
          * Get descriptor status
          */
-        desc->ds_us.tx.ts_tstamp = AR5K_REG_MS(tx_status->tx_status_0,
+        ts->ts_tstamp = AR5K_REG_MS(tx_status->tx_status_0,
                 AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP);
-        desc->ds_us.tx.ts_shortretry = AR5K_REG_MS(tx_status->tx_status_0,
+        ts->ts_shortretry = AR5K_REG_MS(tx_status->tx_status_0,
                 AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT);
-        desc->ds_us.tx.ts_longretry = AR5K_REG_MS(tx_status->tx_status_0,
+        ts->ts_longretry = AR5K_REG_MS(tx_status->tx_status_0,
                 AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT);
-        /*TODO: desc->ds_us.tx.ts_virtcol + test*/
-        desc->ds_us.tx.ts_seqnum = AR5K_REG_MS(tx_status->tx_status_1,
+        /*TODO: ts->ts_virtcol + test*/
+        ts->ts_seqnum = AR5K_REG_MS(tx_status->tx_status_1,
                 AR5K_DESC_TX_STATUS1_SEQ_NUM);
-        desc->ds_us.tx.ts_rssi = AR5K_REG_MS(tx_status->tx_status_1,
+        ts->ts_rssi = AR5K_REG_MS(tx_status->tx_status_1,
                 AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);
-        desc->ds_us.tx.ts_antenna = 1;
-        desc->ds_us.tx.ts_status = 0;
-        desc->ds_us.tx.ts_rate = AR5K_REG_MS(tx_desc->tx_control_0,
+        ts->ts_antenna = 1;
+        ts->ts_status = 0;
+        ts->ts_rate = AR5K_REG_MS(tx_ctl->tx_control_0,
                 AR5K_2W_TX_DESC_CTL0_XMIT_RATE);
 
         if ((tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK) == 0){
                 if (tx_status->tx_status_0 &
                                 AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES)
-                        desc->ds_us.tx.ts_status |= AR5K_TXERR_XRETRY;
+                        ts->ts_status |= AR5K_TXERR_XRETRY;
 
                 if (tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN)
-                        desc->ds_us.tx.ts_status |= AR5K_TXERR_FIFO;
+                        ts->ts_status |= AR5K_TXERR_FIFO;
 
                 if (tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FILTERED)
-                        desc->ds_us.tx.ts_status |= AR5K_TXERR_FILT;
+                        ts->ts_status |= AR5K_TXERR_FILT;
         }
 
         return 0;
@@ -3845,14 +3974,15 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
  * Proccess a tx descriptor on 5212
  */
 static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc)
+                struct ath5k_desc *desc, struct ath5k_tx_status *ts)
 {
+        struct ath5k_hw_4w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
-        struct ath5k_hw_4w_tx_desc *tx_desc;
 
         ATH5K_TRACE(ah->ah_sc);
-        tx_desc = (struct ath5k_hw_4w_tx_desc *)&desc->ds_ctl0;
-        tx_status = (struct ath5k_hw_tx_status *)&desc->ds_hw[2];
+
+        tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
+        tx_status = &desc->ud.ds_tx5212.tx_stat;
 
         /* No frame has been send or error */
         if (unlikely((tx_status->tx_status_1 & AR5K_DESC_TX_STATUS1_DONE) == 0))
@@ -3861,42 +3991,42 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
         /*
          * Get descriptor status
          */
-        desc->ds_us.tx.ts_tstamp = AR5K_REG_MS(tx_status->tx_status_0,
+        ts->ts_tstamp = AR5K_REG_MS(tx_status->tx_status_0,
                 AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP);
-        desc->ds_us.tx.ts_shortretry = AR5K_REG_MS(tx_status->tx_status_0,
+        ts->ts_shortretry = AR5K_REG_MS(tx_status->tx_status_0,
                 AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT);
-        desc->ds_us.tx.ts_longretry = AR5K_REG_MS(tx_status->tx_status_0,
+        ts->ts_longretry = AR5K_REG_MS(tx_status->tx_status_0,
                 AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT);
-        desc->ds_us.tx.ts_seqnum = AR5K_REG_MS(tx_status->tx_status_1,
+        ts->ts_seqnum = AR5K_REG_MS(tx_status->tx_status_1,
                 AR5K_DESC_TX_STATUS1_SEQ_NUM);
-        desc->ds_us.tx.ts_rssi = AR5K_REG_MS(tx_status->tx_status_1,
+        ts->ts_rssi = AR5K_REG_MS(tx_status->tx_status_1,
                 AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);
-        desc->ds_us.tx.ts_antenna = (tx_status->tx_status_1 &
+        ts->ts_antenna = (tx_status->tx_status_1 &
                 AR5K_DESC_TX_STATUS1_XMIT_ANTENNA) ? 2 : 1;
-        desc->ds_us.tx.ts_status = 0;
+        ts->ts_status = 0;
 
         switch (AR5K_REG_MS(tx_status->tx_status_1,
                         AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX)) {
         case 0:
-                desc->ds_us.tx.ts_rate = tx_desc->tx_control_3 &
+                ts->ts_rate = tx_ctl->tx_control_3 &
                         AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;
                 break;
         case 1:
-                desc->ds_us.tx.ts_rate = AR5K_REG_MS(tx_desc->tx_control_3,
+                ts->ts_rate = AR5K_REG_MS(tx_ctl->tx_control_3,
                         AR5K_4W_TX_DESC_CTL3_XMIT_RATE1);
-                desc->ds_us.tx.ts_longretry +=AR5K_REG_MS(tx_desc->tx_control_2,
+                ts->ts_longretry += AR5K_REG_MS(tx_ctl->tx_control_2,
                         AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1);
                 break;
         case 2:
-                desc->ds_us.tx.ts_rate = AR5K_REG_MS(tx_desc->tx_control_3,
+                ts->ts_rate = AR5K_REG_MS(tx_ctl->tx_control_3,
                         AR5K_4W_TX_DESC_CTL3_XMIT_RATE2);
-                desc->ds_us.tx.ts_longretry +=AR5K_REG_MS(tx_desc->tx_control_2,
+                ts->ts_longretry += AR5K_REG_MS(tx_ctl->tx_control_2,
                         AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2);
                 break;
         case 3:
-                desc->ds_us.tx.ts_rate = AR5K_REG_MS(tx_desc->tx_control_3,
+                ts->ts_rate = AR5K_REG_MS(tx_ctl->tx_control_3,
                         AR5K_4W_TX_DESC_CTL3_XMIT_RATE3);
-                desc->ds_us.tx.ts_longretry +=AR5K_REG_MS(tx_desc->tx_control_2,
+                ts->ts_longretry += AR5K_REG_MS(tx_ctl->tx_control_2,
                         AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3);
                 break;
         }
@@ -3904,13 +4034,13 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
         if ((tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK) == 0){
                 if (tx_status->tx_status_0 &
                                 AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES)
-                        desc->ds_us.tx.ts_status |= AR5K_TXERR_XRETRY;
+                        ts->ts_status |= AR5K_TXERR_XRETRY;
 
                 if (tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN)
-                        desc->ds_us.tx.ts_status |= AR5K_TXERR_FIFO;
+                        ts->ts_status |= AR5K_TXERR_FIFO;
 
                 if (tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FILTERED)
-                        desc->ds_us.tx.ts_status |= AR5K_TXERR_FILT;
+                        ts->ts_status |= AR5K_TXERR_FILT;
         }
 
         return 0;
@@ -3926,31 +4056,27 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
 int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                         u32 size, unsigned int flags)
 {
-        struct ath5k_rx_desc *rx_desc;
+        struct ath5k_hw_rx_ctl *rx_ctl;
 
         ATH5K_TRACE(ah->ah_sc);
-        rx_desc = (struct ath5k_rx_desc *)&desc->ds_ctl0;
+        rx_ctl = &desc->ud.ds_rx.rx_ctl;
 
         /*
-         *Clear ds_hw
+         * Clear the descriptor
          * If we don't clean the status descriptor,
          * while scanning we get too many results,
          * most of them virtual, after some secs
          * of scanning system hangs. M.F.
         */
-        memset(desc->ds_hw, 0, sizeof(desc->ds_hw));
-
-        /*Initialize rx descriptor*/
-        rx_desc->rx_control_0 = 0;
-        rx_desc->rx_control_1 = 0;
+        memset(&desc->ud.ds_rx, 0, sizeof(struct ath5k_hw_all_rx_desc));
 
         /* Setup descriptor */
-        rx_desc->rx_control_1 = size & AR5K_DESC_RX_CTL1_BUF_LEN;
-        if (unlikely(rx_desc->rx_control_1 != size))
+        rx_ctl->rx_control_1 = size & AR5K_DESC_RX_CTL1_BUF_LEN;
+        if (unlikely(rx_ctl->rx_control_1 != size))
                 return -EINVAL;
 
         if (flags & AR5K_RXDESC_INTREQ)
-                rx_desc->rx_control_1 |= AR5K_DESC_RX_CTL1_INTREQ;
+                rx_ctl->rx_control_1 |= AR5K_DESC_RX_CTL1_INTREQ;
 
         return 0;
 }
@@ -3958,67 +4084,68 @@ int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
 /*
  * Proccess the rx status descriptor on 5210/5211
  */
-static int ath5k_hw_proc_old_rx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc)
+static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
+                struct ath5k_desc *desc, struct ath5k_rx_status *rs)
 {
-        struct ath5k_hw_old_rx_status *rx_status;
+        struct ath5k_hw_rx_status *rx_status;
 
-        rx_status = (struct ath5k_hw_old_rx_status *)&desc->ds_hw[0];
+        rx_status = &desc->ud.ds_rx.u.rx_stat;
 
         /* No frame received / not ready */
-        if (unlikely((rx_status->rx_status_1 & AR5K_OLD_RX_DESC_STATUS1_DONE)
+        if (unlikely((rx_status->rx_status_1 & AR5K_5210_RX_DESC_STATUS1_DONE)
                                 == 0))
                 return -EINPROGRESS;
 
         /*
          * Frame receive status
          */
-        desc->ds_us.rx.rs_datalen = rx_status->rx_status_0 &
-                AR5K_OLD_RX_DESC_STATUS0_DATA_LEN;
-        desc->ds_us.rx.rs_rssi = AR5K_REG_MS(rx_status->rx_status_0,
-                AR5K_OLD_RX_DESC_STATUS0_RECEIVE_SIGNAL);
-        desc->ds_us.rx.rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
-                AR5K_OLD_RX_DESC_STATUS0_RECEIVE_RATE);
-        desc->ds_us.rx.rs_antenna = rx_status->rx_status_0 &
-                AR5K_OLD_RX_DESC_STATUS0_RECEIVE_ANTENNA;
-        desc->ds_us.rx.rs_more = rx_status->rx_status_0 &
-                AR5K_OLD_RX_DESC_STATUS0_MORE;
-        desc->ds_us.rx.rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
-                AR5K_OLD_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
-        desc->ds_us.rx.rs_status = 0;
+        rs->rs_datalen = rx_status->rx_status_0 &
+                AR5K_5210_RX_DESC_STATUS0_DATA_LEN;
+        rs->rs_rssi = AR5K_REG_MS(rx_status->rx_status_0,
+                AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL);
+        rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
+                AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE);
+        rs->rs_antenna = rx_status->rx_status_0 &
+                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA;
+        rs->rs_more = rx_status->rx_status_0 &
+                AR5K_5210_RX_DESC_STATUS0_MORE;
+        /* TODO: this timestamp is 13 bit, later on we assume 15 bit */
+        rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
+                AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
+        rs->rs_status = 0;
 
         /*
          * Key table status
          */
-        if (rx_status->rx_status_1 & AR5K_OLD_RX_DESC_STATUS1_KEY_INDEX_VALID)
-                desc->ds_us.rx.rs_keyix = AR5K_REG_MS(rx_status->rx_status_1,
-                        AR5K_OLD_RX_DESC_STATUS1_KEY_INDEX);
+        if (rx_status->rx_status_1 & AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID)
+                rs->rs_keyix = AR5K_REG_MS(rx_status->rx_status_1,
+                        AR5K_5210_RX_DESC_STATUS1_KEY_INDEX);
         else
-                desc->ds_us.rx.rs_keyix = AR5K_RXKEYIX_INVALID;
+                rs->rs_keyix = AR5K_RXKEYIX_INVALID;
 
         /*
          * Receive/descriptor errors
          */
-        if ((rx_status->rx_status_1 & AR5K_OLD_RX_DESC_STATUS1_FRAME_RECEIVE_OK)
-                        == 0) {
-                if (rx_status->rx_status_1 & AR5K_OLD_RX_DESC_STATUS1_CRC_ERROR)
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_CRC;
+        if ((rx_status->rx_status_1 &
+                        AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK) == 0) {
+                if (rx_status->rx_status_1 &
+                                AR5K_5210_RX_DESC_STATUS1_CRC_ERROR)
+                        rs->rs_status |= AR5K_RXERR_CRC;
 
                 if (rx_status->rx_status_1 &
-                                AR5K_OLD_RX_DESC_STATUS1_FIFO_OVERRUN)
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_FIFO;
+                                AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN)
+                        rs->rs_status |= AR5K_RXERR_FIFO;
 
                 if (rx_status->rx_status_1 &
-                                AR5K_OLD_RX_DESC_STATUS1_PHY_ERROR) {
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_PHY;
-                        desc->ds_us.rx.rs_phyerr =
-                                AR5K_REG_MS(rx_status->rx_status_1,
-                                        AR5K_OLD_RX_DESC_STATUS1_PHY_ERROR);
+                                AR5K_5210_RX_DESC_STATUS1_PHY_ERROR) {
+                        rs->rs_status |= AR5K_RXERR_PHY;
+                        rs->rs_phyerr = AR5K_REG_MS(rx_status->rx_status_1,
+                                           AR5K_5210_RX_DESC_STATUS1_PHY_ERROR);
                 }
 
                 if (rx_status->rx_status_1 &
-                                AR5K_OLD_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_DECRYPT;
+                                AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)
+                        rs->rs_status |= AR5K_RXERR_DECRYPT;
         }
 
         return 0;
@@ -4027,71 +4154,72 @@ static int ath5k_hw_proc_old_rx_status(struct ath5k_hw *ah,
 /*
  * Proccess the rx status descriptor on 5212
  */
-static int ath5k_hw_proc_new_rx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc)
+static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
+                struct ath5k_desc *desc, struct ath5k_rx_status *rs)
 {
-        struct ath5k_hw_new_rx_status *rx_status;
+        struct ath5k_hw_rx_status *rx_status;
         struct ath5k_hw_rx_error *rx_err;
 
         ATH5K_TRACE(ah->ah_sc);
-        rx_status = (struct ath5k_hw_new_rx_status *)&desc->ds_hw[0];
+        rx_status = &desc->ud.ds_rx.u.rx_stat;
 
         /* Overlay on error */
-        rx_err = (struct ath5k_hw_rx_error *)&desc->ds_hw[0];
+        rx_err = &desc->ud.ds_rx.u.rx_err;
 
         /* No frame received / not ready */
-        if (unlikely((rx_status->rx_status_1 & AR5K_NEW_RX_DESC_STATUS1_DONE)
+        if (unlikely((rx_status->rx_status_1 & AR5K_5212_RX_DESC_STATUS1_DONE)
                                 == 0))
                 return -EINPROGRESS;
 
         /*
          * Frame receive status
          */
-        desc->ds_us.rx.rs_datalen = rx_status->rx_status_0 &
-                AR5K_NEW_RX_DESC_STATUS0_DATA_LEN;
-        desc->ds_us.rx.rs_rssi = AR5K_REG_MS(rx_status->rx_status_0,
-                AR5K_NEW_RX_DESC_STATUS0_RECEIVE_SIGNAL);
-        desc->ds_us.rx.rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
-                AR5K_NEW_RX_DESC_STATUS0_RECEIVE_RATE);
-        desc->ds_us.rx.rs_antenna = rx_status->rx_status_0 &
-                AR5K_NEW_RX_DESC_STATUS0_RECEIVE_ANTENNA;
-        desc->ds_us.rx.rs_more = rx_status->rx_status_0 &
-                AR5K_NEW_RX_DESC_STATUS0_MORE;
-        desc->ds_us.rx.rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
-                AR5K_NEW_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
-        desc->ds_us.rx.rs_status = 0;
+        rs->rs_datalen = rx_status->rx_status_0 &
+                AR5K_5212_RX_DESC_STATUS0_DATA_LEN;
+        rs->rs_rssi = AR5K_REG_MS(rx_status->rx_status_0,
+                AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL);
+        rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
+                AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE);
+        rs->rs_antenna = rx_status->rx_status_0 &
+                AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA;
+        rs->rs_more = rx_status->rx_status_0 &
+                AR5K_5212_RX_DESC_STATUS0_MORE;
+        rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
+                AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
+        rs->rs_status = 0;
 
         /*
          * Key table status
          */
-        if (rx_status->rx_status_1 & AR5K_NEW_RX_DESC_STATUS1_KEY_INDEX_VALID)
-                desc->ds_us.rx.rs_keyix = AR5K_REG_MS(rx_status->rx_status_1,
-                                AR5K_NEW_RX_DESC_STATUS1_KEY_INDEX);
+        if (rx_status->rx_status_1 & AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID)
+                rs->rs_keyix = AR5K_REG_MS(rx_status->rx_status_1,
+                                AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);
         else
-                desc->ds_us.rx.rs_keyix = AR5K_RXKEYIX_INVALID;
+                rs->rs_keyix = AR5K_RXKEYIX_INVALID;
 
         /*
          * Receive/descriptor errors
          */
         if ((rx_status->rx_status_1 &
-                        AR5K_NEW_RX_DESC_STATUS1_FRAME_RECEIVE_OK) == 0) {
-                if (rx_status->rx_status_1 & AR5K_NEW_RX_DESC_STATUS1_CRC_ERROR)
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_CRC;
+                        AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK) == 0) {
+                if (rx_status->rx_status_1 &
+                                AR5K_5212_RX_DESC_STATUS1_CRC_ERROR)
+                        rs->rs_status |= AR5K_RXERR_CRC;
 
                 if (rx_status->rx_status_1 &
-                                AR5K_NEW_RX_DESC_STATUS1_PHY_ERROR) {
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_PHY;
-                        desc->ds_us.rx.rs_phyerr =
-                                AR5K_REG_MS(rx_err->rx_error_1,
-                                        AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE);
+                                AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) {
+                        rs->rs_status |= AR5K_RXERR_PHY;
+                        rs->rs_phyerr = AR5K_REG_MS(rx_err->rx_error_1,
+                                           AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE);
                 }
 
                 if (rx_status->rx_status_1 &
-                                AR5K_NEW_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_DECRYPT;
+                                AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)
+                        rs->rs_status |= AR5K_RXERR_DECRYPT;
 
-                if (rx_status->rx_status_1 & AR5K_NEW_RX_DESC_STATUS1_MIC_ERROR)
-                        desc->ds_us.rx.rs_status |= AR5K_RXERR_MIC;
+                if (rx_status->rx_status_1 &
+                                AR5K_5212_RX_DESC_STATUS1_MIC_ERROR)
+                        rs->rs_status |= AR5K_RXERR_MIC;
         }
 
         return 0;
@@ -4250,35 +4378,6 @@ void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,
 }
 
 
-/*********************************\
- Regulatory Domain/Channels Setup
-\*********************************/
-
-u16 ath5k_get_regdomain(struct ath5k_hw *ah)
-{
-        u16 regdomain;
-        enum ath5k_regdom ieee_regdomain;
-#ifdef COUNTRYCODE
-        u16 code;
-#endif
-
-        ath5k_eeprom_regulation_domain(ah, false, &ieee_regdomain);
-        ah->ah_capabilities.cap_regdomain.reg_hw = ieee_regdomain;
-
-#ifdef COUNTRYCODE
-        /*
-         * Get the regulation domain by country code. This will ignore
-         * the settings found in the EEPROM.
-         */
-        code = ieee80211_name2countrycode(COUNTRYCODE);
-        ieee_regdomain = ieee80211_countrycode2regdomain(code);
-#endif
-
-        regdomain = ath5k_regdom_from_ieee(ieee_regdomain);
-        ah->ah_capabilities.cap_regdomain.reg_current = regdomain;
-
-        return regdomain;
-}
 
 
 /****************\
diff --git a/drivers/net/wireless/ath5k/hw.h b/drivers/net/wireless/ath5k/hw.h
index d9a7c0973f53..64fca8dcb386 100644
--- a/drivers/net/wireless/ath5k/hw.h
+++ b/drivers/net/wireless/ath5k/hw.h
@@ -173,7 +173,10 @@ struct ath5k_eeprom_info {
  * (rX: reserved fields possibily used by future versions of the ar5k chipset)
  */
 
-struct ath5k_rx_desc {
+/*
+ * common hardware RX control descriptor
+ */
+struct ath5k_hw_rx_ctl {
         u32     rx_control_0; /* RX control word 0 */
 
 #define AR5K_DESC_RX_CTL0                       0x00000000
@@ -185,69 +188,63 @@ struct ath5k_rx_desc {
 } __packed;
 
 /*
- * 5210/5211 rx status descriptor
+ * common hardware RX status descriptor
+ * 5210/11 and 5212 differ only in the flags defined below
  */
-struct ath5k_hw_old_rx_status {
+struct ath5k_hw_rx_status {
         u32     rx_status_0; /* RX status word 0 */
-
-#define AR5K_OLD_RX_DESC_STATUS0_DATA_LEN               0x00000fff
-#define AR5K_OLD_RX_DESC_STATUS0_MORE                   0x00001000
-#define AR5K_OLD_RX_DESC_STATUS0_RECEIVE_RATE           0x00078000
-#define AR5K_OLD_RX_DESC_STATUS0_RECEIVE_RATE_S         15
-#define AR5K_OLD_RX_DESC_STATUS0_RECEIVE_SIGNAL         0x07f80000
-#define AR5K_OLD_RX_DESC_STATUS0_RECEIVE_SIGNAL_S       19
-#define AR5K_OLD_RX_DESC_STATUS0_RECEIVE_ANTENNA        0x38000000
-#define AR5K_OLD_RX_DESC_STATUS0_RECEIVE_ANTENNA_S      27
-
         u32     rx_status_1; /* RX status word 1 */
-
-#define AR5K_OLD_RX_DESC_STATUS1_DONE                   0x00000001
-#define AR5K_OLD_RX_DESC_STATUS1_FRAME_RECEIVE_OK       0x00000002
-#define AR5K_OLD_RX_DESC_STATUS1_CRC_ERROR              0x00000004
-#define AR5K_OLD_RX_DESC_STATUS1_FIFO_OVERRUN           0x00000008
-#define AR5K_OLD_RX_DESC_STATUS1_DECRYPT_CRC_ERROR      0x00000010
-#define AR5K_OLD_RX_DESC_STATUS1_PHY_ERROR              0x000000e0
-#define AR5K_OLD_RX_DESC_STATUS1_PHY_ERROR_S            5
-#define AR5K_OLD_RX_DESC_STATUS1_KEY_INDEX_VALID        0x00000100
-#define AR5K_OLD_RX_DESC_STATUS1_KEY_INDEX              0x00007e00
-#define AR5K_OLD_RX_DESC_STATUS1_KEY_INDEX_S            9
-#define AR5K_OLD_RX_DESC_STATUS1_RECEIVE_TIMESTAMP      0x0fff8000
-#define AR5K_OLD_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S    15
-#define AR5K_OLD_RX_DESC_STATUS1_KEY_CACHE_MISS         0x10000000
 } __packed;
 
+/* 5210/5211 */
+#define AR5K_5210_RX_DESC_STATUS0_DATA_LEN              0x00000fff
+#define AR5K_5210_RX_DESC_STATUS0_MORE                  0x00001000
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE          0x00078000
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE_S        15
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x07f80000
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL_S      19
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA       0x38000000
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA_S     27
+#define AR5K_5210_RX_DESC_STATUS1_DONE                  0x00000001
+#define AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002
+#define AR5K_5210_RX_DESC_STATUS1_CRC_ERROR             0x00000004
+#define AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN          0x00000008
+#define AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000010
+#define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR             0x000000e0
+#define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR_S           5
+#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100
+#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX             0x00007e00
+#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_S           9
+#define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x0fff8000
+#define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S   15
+#define AR5K_5210_RX_DESC_STATUS1_KEY_CACHE_MISS        0x10000000
+
+/* 5212 */
+#define AR5K_5212_RX_DESC_STATUS0_DATA_LEN              0x00000fff
+#define AR5K_5212_RX_DESC_STATUS0_MORE                  0x00001000
+#define AR5K_5212_RX_DESC_STATUS0_DECOMP_CRC_ERROR      0x00002000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE          0x000f8000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE_S        15
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x0ff00000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL_S      20
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA       0xf0000000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA_S     28
+#define AR5K_5212_RX_DESC_STATUS1_DONE                  0x00000001
+#define AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002
+#define AR5K_5212_RX_DESC_STATUS1_CRC_ERROR             0x00000004
+#define AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000008
+#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR             0x00000010
+#define AR5K_5212_RX_DESC_STATUS1_MIC_ERROR             0x00000020
+#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100
+#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX             0x0000fe00
+#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_S           9
+#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x7fff0000
+#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S   16
+#define AR5K_5212_RX_DESC_STATUS1_KEY_CACHE_MISS        0x80000000
+
 /*
- * 5212 rx status descriptor
+ * common hardware RX error descriptor
  */
-struct ath5k_hw_new_rx_status {
-        u32     rx_status_0; /* RX status word 0 */
-
-#define AR5K_NEW_RX_DESC_STATUS0_DATA_LEN               0x00000fff
-#define AR5K_NEW_RX_DESC_STATUS0_MORE                   0x00001000
-#define AR5K_NEW_RX_DESC_STATUS0_DECOMP_CRC_ERROR       0x00002000
-#define AR5K_NEW_RX_DESC_STATUS0_RECEIVE_RATE           0x000f8000
-#define AR5K_NEW_RX_DESC_STATUS0_RECEIVE_RATE_S         15
-#define AR5K_NEW_RX_DESC_STATUS0_RECEIVE_SIGNAL         0x0ff00000
-#define AR5K_NEW_RX_DESC_STATUS0_RECEIVE_SIGNAL_S       20
-#define AR5K_NEW_RX_DESC_STATUS0_RECEIVE_ANTENNA        0xf0000000
-#define AR5K_NEW_RX_DESC_STATUS0_RECEIVE_ANTENNA_S      28
-
-        u32     rx_status_1; /* RX status word 1 */
-
-#define AR5K_NEW_RX_DESC_STATUS1_DONE                   0x00000001
-#define AR5K_NEW_RX_DESC_STATUS1_FRAME_RECEIVE_OK       0x00000002
-#define AR5K_NEW_RX_DESC_STATUS1_CRC_ERROR              0x00000004
-#define AR5K_NEW_RX_DESC_STATUS1_DECRYPT_CRC_ERROR      0x00000008
-#define AR5K_NEW_RX_DESC_STATUS1_PHY_ERROR              0x00000010
-#define AR5K_NEW_RX_DESC_STATUS1_MIC_ERROR              0x00000020
-#define AR5K_NEW_RX_DESC_STATUS1_KEY_INDEX_VALID        0x00000100
-#define AR5K_NEW_RX_DESC_STATUS1_KEY_INDEX              0x0000fe00
-#define AR5K_NEW_RX_DESC_STATUS1_KEY_INDEX_S            9
-#define AR5K_NEW_RX_DESC_STATUS1_RECEIVE_TIMESTAMP      0x7fff0000
-#define AR5K_NEW_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S    16
-#define AR5K_NEW_RX_DESC_STATUS1_KEY_CACHE_MISS         0x80000000
-} __packed;
-
 struct ath5k_hw_rx_error {
         u32     rx_error_0; /* RX error word 0 */
 
@@ -268,7 +265,10 @@ struct ath5k_hw_rx_error {
 #define AR5K_DESC_RX_PHY_ERROR_SERVICE          0xc0
 #define AR5K_DESC_RX_PHY_ERROR_TRANSMITOVR      0xe0
 
-struct ath5k_hw_2w_tx_desc {
+/*
+ * 5210/5211 hardware 2-word TX control descriptor
+ */
+struct ath5k_hw_2w_tx_ctl {
         u32     tx_control_0; /* TX control word 0 */
 
 #define AR5K_2W_TX_DESC_CTL0_FRAME_LEN          0x00000fff
@@ -314,9 +314,9 @@ struct ath5k_hw_2w_tx_desc {
 #define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS     0x10
 
 /*
- * 5212 4-word tx control descriptor
+ * 5212 hardware 4-word TX control descriptor
  */
-struct ath5k_hw_4w_tx_desc {
+struct ath5k_hw_4w_tx_ctl {
         u32     tx_control_0; /* TX control word 0 */
 
 #define AR5K_4W_TX_DESC_CTL0_FRAME_LEN          0x00000fff
@@ -374,7 +374,7 @@ struct ath5k_hw_4w_tx_desc {
 } __packed;
 
 /*
- * Common tx status descriptor
+ * Common TX status descriptor
  */
 struct ath5k_hw_tx_status {
         u32     tx_status_0; /* TX status word 0 */
@@ -415,6 +415,34 @@ struct ath5k_hw_tx_status {
 
 
 /*
+ * 5210/5211 hardware TX descriptor
+ */
+struct ath5k_hw_5210_tx_desc {
+        struct ath5k_hw_2w_tx_ctl       tx_ctl;
+        struct ath5k_hw_tx_status       tx_stat;
+} __packed;
+
+/*
+ * 5212 hardware TX descriptor
+ */
+struct ath5k_hw_5212_tx_desc {
+        struct ath5k_hw_4w_tx_ctl       tx_ctl;
+        struct ath5k_hw_tx_status       tx_stat;
+} __packed;
+
+/*
+ * common hardware RX descriptor
+ */
+struct ath5k_hw_all_rx_desc {
+        struct ath5k_hw_rx_ctl                  rx_ctl;
+        union {
+                struct ath5k_hw_rx_status       rx_stat;
+                struct ath5k_hw_rx_error        rx_err;
+        } u;
+} __packed;
+
+
+/*
  * AR5K REGISTER ACCESS
  */
 
diff --git a/drivers/net/wireless/ath5k/initvals.c b/drivers/net/wireless/ath5k/initvals.c
index 2c22f1d4ee64..04c84e9da89d 100644
--- a/drivers/net/wireless/ath5k/initvals.c
+++ b/drivers/net/wireless/ath5k/initvals.c
@@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini[] = {
         { AR5K_PHY(644), 0x00806333 },
         { AR5K_PHY(645), 0x00106c10 },
         { AR5K_PHY(646), 0x009c4060 },
-        /*{ AR5K_PHY(647), 0x1483800a },*/ /* Old value */
         { AR5K_PHY(647), 0x1483800a },
+        /* { AR5K_PHY(648), 0x018830c6 },*/ /* 2413 */
         { AR5K_PHY(648), 0x01831061 },
         { AR5K_PHY(649), 0x00000400 },
         /*{ AR5K_PHY(650), 0x000001b5 },*/
@@ -1081,6 +1081,414 @@ static const struct ath5k_ini_mode rf5413_ini_mode_end[] = {
                 { 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0 } },
 };
 
+/* Initial mode-specific settings for RF2413/2414 (Written after ar5212_ini) */
+/* XXX: No dumps for turbog yet, so turbog is the same with g here with some
+ * minor tweaking based on dumps from other chips */
+static const struct ath5k_ini_mode rf2413_ini_mode_end[] = {
+        { AR5K_TXCFG,
+        /*            b         g           gTurbo */
+                { 0x00000015, 0x00000015, 0x00000015 } },
+        { AR5K_USEC_5211,
+                { 0x04e01395, 0x12e013ab, 0x098813cf } },
+        { AR5K_PHY(10),
+                { 0x05020000, 0x0a020001, 0x0a020001 } },
+        { AR5K_PHY(13),
+                { 0x00000e00, 0x00000e00, 0x00000e00 } },
+        { AR5K_PHY(14),
+                { 0x0000000a, 0x0000000a, 0x0000000a } },
+        { AR5K_PHY(18),
+                { 0x001a6a64, 0x001a6a64, 0x001a6a64 } },
+        { AR5K_PHY(20),
+                { 0x0de8b0da, 0x0c98b0da, 0x0c98b0da } },
+        { AR5K_PHY_SIG,
+                { 0x7ee80d2e, 0x7ec80d2e, 0x7ec80d2e } },
+        { AR5K_PHY_AGCCOARSE,
+                { 0x3137665e, 0x3139605e, 0x3139605e } },
+        { AR5K_PHY(27),
+                { 0x050cb081, 0x050cb081, 0x050cb081 } },
+        { AR5K_PHY_RX_DELAY,
+                { 0x0000044c, 0x00000898, 0x000007d0 } },
+        { AR5K_PHY_FRAME_CTL_5211,
+                { 0xf7b80d00, 0xf7b81000, 0xf7b81000 } },
+        { AR5K_PHY_CCKTXCTL,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { AR5K_PHY(642),
+                { 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+        { AR5K_PHY_GAIN_2GHZ,
+                { 0x0042c140, 0x0042c140, 0x0042c140 } },
+        { 0xa21c,
+                { 0x1863800a, 0x1883800a, 0x1883800a } },
+        { AR5K_DCU_FP,
+                { 0x000003e0, 0x000003e0, 0x000003e0 } },
+        { 0x8060,
+                { 0x0000000f, 0x0000000f, 0x0000000f } },
+        { 0x8118,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x811c,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x8120,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x8124,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x8128,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x812c,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x8130,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x8134,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x8138,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x813c,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0x8140,
+                { 0x800000a8, 0x800000a8, 0x800000a8 } },
+        { 0x8144,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { AR5K_PHY_AGC,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { AR5K_PHY(11),
+                { 0x0000a000, 0x0000a000, 0x0000a000 } },
+        { AR5K_PHY(15),
+                { 0x00200400, 0x00200400, 0x00200400 } },
+        { AR5K_PHY(19),
+                { 0x1284233c, 0x1284233c, 0x1284233c } },
+        { AR5K_PHY_SCR,
+                { 0x0000001f, 0x0000001f, 0x0000001f } },
+        { AR5K_PHY_SLMT,
+                { 0x00000080, 0x00000080, 0x00000080 } },
+        { AR5K_PHY_SCAL,
+                { 0x0000000e, 0x0000000e, 0x0000000e } },
+        { AR5K_PHY(86),
+                { 0x000000ff, 0x000000ff, 0x000000ff } },
+        { AR5K_PHY(96),
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { AR5K_PHY(97),
+                { 0x02800000, 0x02800000, 0x02800000 } },
+        { AR5K_PHY(104),
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { AR5K_PHY(120),
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { AR5K_PHY(121),
+                { 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa } },
+        { AR5K_PHY(122),
+                { 0x3c466478, 0x3c466478, 0x3c466478 } },
+        { AR5K_PHY(123),
+                { 0x000000aa, 0x000000aa, 0x000000aa } },
+        { AR5K_PHY_SCLOCK,
+                { 0x0000000c, 0x0000000c, 0x0000000c } },
+        { AR5K_PHY_SDELAY,
+                { 0x000000ff, 0x000000ff, 0x000000ff } },
+        { AR5K_PHY_SPENDING,
+                { 0x00000014, 0x00000014, 0x00000014 } },
+        { 0xa228,
+                { 0x000009b5, 0x000009b5, 0x000009b5 } },
+        { 0xa23c,
+                { 0x93c889af, 0x93c889af, 0x93c889af } },
+        { 0xa24c,
+                { 0x00000001, 0x00000001, 0x00000001 } },
+        { 0xa250,
+                { 0x0000a000, 0x0000a000, 0x0000a000 } },
+        { 0xa254,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0xa258,
+                { 0x0cc75380, 0x0cc75380, 0x0cc75380 } },
+        { 0xa25c,
+                { 0x0f0f0f01, 0x0f0f0f01, 0x0f0f0f01 } },
+        { 0xa260,
+                { 0x5f690f01, 0x5f690f01, 0x5f690f01 } },
+        { 0xa264,
+                { 0x00418a11, 0x00418a11, 0x00418a11 } },
+        { 0xa268,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0xa26c,
+                { 0x0c30c16a, 0x0c30c16a, 0x0c30c16a } },
+        { 0xa270,
+                { 0x00820820, 0x00820820, 0x00820820 } },
+        { 0xa274,
+                { 0x001b7caa, 0x001b7caa, 0x001b7caa } },
+        { 0xa278,
+                { 0x1ce739ce, 0x1ce739ce, 0x1ce739ce } },
+        { 0xa27c,
+                { 0x051701ce, 0x051701ce, 0x051701ce } },
+        { 0xa300,
+                { 0x18010000, 0x18010000, 0x18010000 } },
+        { 0xa304,
+                { 0x30032602, 0x30032602, 0x30032602 } },
+        { 0xa308,
+                { 0x48073e06, 0x48073e06, 0x48073e06 } },
+        { 0xa30c,
+                { 0x560b4c0a, 0x560b4c0a, 0x560b4c0a } },
+        { 0xa310,
+                { 0x641a600f, 0x641a600f, 0x641a600f } },
+        { 0xa314,
+                { 0x784f6e1b, 0x784f6e1b, 0x784f6e1b } },
+        { 0xa318,
+                { 0x868f7c5a, 0x868f7c5a, 0x868f7c5a } },
+        { 0xa31c,
+                { 0x8ecf865b, 0x8ecf865b, 0x8ecf865b } },
+        { 0xa320,
+                { 0x9d4f970f, 0x9d4f970f, 0x9d4f970f } },
+        { 0xa324,
+                { 0xa5cfa18f, 0xa5cfa18f, 0xa5cfa18f } },
+        { 0xa328,
+                { 0xb55faf1f, 0xb55faf1f, 0xb55faf1f } },
+        { 0xa32c,
+                { 0xbddfb99f, 0xbddfb99f, 0xbddfb99f } },
+        { 0xa330,
+                { 0xcd7fc73f, 0xcd7fc73f, 0xcd7fc73f } },
+        { 0xa334,
+                { 0xd5ffd1bf, 0xd5ffd1bf, 0xd5ffd1bf } },
+        { 0xa338,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0xa33c,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0xa340,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0xa344,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 0xa348,
+                { 0x3fffffff, 0x3fffffff, 0x3fffffff } },
+        { 0xa34c,
+                { 0x3fffffff, 0x3fffffff, 0x3fffffff } },
+        { 0xa350,
+                { 0x3fffffff, 0x3fffffff, 0x3fffffff } },
+        { 0xa354,
+                { 0x0003ffff, 0x0003ffff, 0x0003ffff } },
+        { 0xa358,
+                { 0x79a8aa1f, 0x79a8aa1f, 0x79a8aa1f } },
+        { 0xa35c,
+                { 0x066c420f, 0x066c420f, 0x066c420f } },
+        { 0xa360,
+                { 0x0f282207, 0x0f282207, 0x0f282207 } },
+        { 0xa364,
+                { 0x17601685, 0x17601685, 0x17601685 } },
+        { 0xa368,
+                { 0x1f801104, 0x1f801104, 0x1f801104 } },
+        { 0xa36c,
+                { 0x37a00c03, 0x37a00c03, 0x37a00c03 } },
+        { 0xa370,
+                { 0x3fc40883, 0x3fc40883, 0x3fc40883 } },
+        { 0xa374,
+                { 0x57c00803, 0x57c00803, 0x57c00803 } },
+        { 0xa378,
+                { 0x5fd80682, 0x5fd80682, 0x5fd80682 } },
+        { 0xa37c,
+                { 0x7fe00482, 0x7fe00482, 0x7fe00482 } },
+        { 0xa380,
+                { 0x7f3c7bba, 0x7f3c7bba, 0x7f3c7bba } },
+        { 0xa384,
+                { 0xf3307ff0, 0xf3307ff0, 0xf3307ff0 } },
+};
+
+/* Initial mode-specific settings for RF2425 (Written after ar5212_ini) */
+/* XXX: No dumps for turbog yet, so turbog is the same with g here with some
+ * minor tweaking based on dumps from other chips */
+static const struct ath5k_ini_mode rf2425_ini_mode_end[] = {
+        { AR5K_TXCFG,
+        /*             g        gTurbo */
+                { 0x00000015, 0x00000015 } },
+        { AR5K_USEC_5211,
+                { 0x12e013ab, 0x098813cf } },
+        { AR5K_PHY_TURBO,
+                { 0x00000000, 0x00000003 } },
+        { AR5K_PHY(10),
+                { 0x0a020001, 0x0a020001 } },
+        { AR5K_PHY(13),
+                { 0x00000e0e, 0x00000e0e } },
+        { AR5K_PHY(14),
+                { 0x0000000b, 0x0000000b } },
+        { AR5K_PHY(17),
+                { 0x13721422, 0x13721422 } },
+        { AR5K_PHY(18),
+                { 0x00199a65, 0x00199a65 } },
+        { AR5K_PHY(20),
+                { 0x0c98b0da, 0x0c98b0da } },
+        { AR5K_PHY_SIG,
+                { 0x7ec80d2e, 0x7ec80d2e } },
+        { AR5K_PHY_AGCCOARSE,
+                { 0x3139605e, 0x3139605e } },
+        { AR5K_PHY(27),
+                { 0x050cb081, 0x050cb081 } },
+        { AR5K_PHY_RX_DELAY,
+                { 0x00000898, 0x000007d0 } },
+        { AR5K_PHY_FRAME_CTL_5211,
+                { 0xf7b81000, 0xf7b81000 } },
+        { AR5K_PHY_CCKTXCTL,
+                { 0x00000000, 0x00000000 } },
+        { AR5K_PHY(642),
+                { 0xd03e6788, 0xd03e6788 } },
+        { AR5K_PHY_GAIN_2GHZ,
+                { 0x0052c140, 0x0052c140 } },
+        { 0xa21c,
+                { 0x1883800a, 0x1883800a } },
+        { 0xa324,
+                { 0xa7cfa7cf, 0xa7cfa7cf } },
+        { 0xa328,
+                { 0xa7cfa7cf, 0xa7cfa7cf } },
+        { 0xa32c,
+                { 0xa7cfa7cf, 0xa7cfa7cf } },
+        { 0xa330,
+                { 0xa7cfa7cf, 0xa7cfa7cf } },
+        { 0xa334,
+                { 0xa7cfa7cf, 0xa7cfa7cf } },
+        { AR5K_DCU_FP,
+                { 0x000003e0, 0x000003e0 } },
+        { 0x8060,
+                { 0x0000000f, 0x0000000f } },
+        { 0x809c,
+                { 0x00000000, 0x00000000 } },
+        { 0x80a0,
+                { 0x00000000, 0x00000000 } },
+        { 0x8118,
+                { 0x00000000, 0x00000000 } },
+        { 0x811c,
+                { 0x00000000, 0x00000000 } },
+        { 0x8120,
+                { 0x00000000, 0x00000000 } },
+        { 0x8124,
+                { 0x00000000, 0x00000000 } },
+        { 0x8128,
+                { 0x00000000, 0x00000000 } },
+        { 0x812c,
+                { 0x00000000, 0x00000000 } },
+        { 0x8130,
+                { 0x00000000, 0x00000000 } },
+        { 0x8134,
+                { 0x00000000, 0x00000000 } },
+        { 0x8138,
+                { 0x00000000, 0x00000000 } },
+        { 0x813c,
+                { 0x00000000, 0x00000000 } },
+        { 0x8140,
+                { 0x800003f9, 0x800003f9 } },
+        { 0x8144,
+                { 0x00000000, 0x00000000 } },
+        { AR5K_PHY_AGC,
+                { 0x00000000, 0x00000000 } },
+        { AR5K_PHY(11),
+                { 0x0000a000, 0x0000a000 } },
+        { AR5K_PHY(15),
+                { 0x00200400, 0x00200400 } },
+        { AR5K_PHY(19),
+                { 0x1284233c, 0x1284233c } },
+        { AR5K_PHY_SCR,
+                { 0x0000001f, 0x0000001f } },
+        { AR5K_PHY_SLMT,
+                { 0x00000080, 0x00000080 } },
+        { AR5K_PHY_SCAL,
+                { 0x0000000e, 0x0000000e } },
+        { AR5K_PHY(86),
+                { 0x00081fff, 0x00081fff } },
+        { AR5K_PHY(96),
+                { 0x00000000, 0x00000000 } },
+        { AR5K_PHY(97),
+                { 0x02800000, 0x02800000 } },
+        { AR5K_PHY(104),
+                { 0x00000000, 0x00000000 } },
+        { AR5K_PHY(119),
+                { 0xfebadbe8, 0xfebadbe8 } },
+        { AR5K_PHY(120),
+                { 0x00000000, 0x00000000 } },
+        { AR5K_PHY(121),
+                { 0xaaaaaaaa, 0xaaaaaaaa } },
+        { AR5K_PHY(122),
+                { 0x3c466478, 0x3c466478 } },
+        { AR5K_PHY(123),
+                { 0x000000aa, 0x000000aa } },
+        { AR5K_PHY_SCLOCK,
+                { 0x0000000c, 0x0000000c } },
+        { AR5K_PHY_SDELAY,
+                { 0x000000ff, 0x000000ff } },
+        { AR5K_PHY_SPENDING,
+                { 0x00000014, 0x00000014 } },
+        { 0xa228,
+                { 0x000009b5, 0x000009b5 } },
+        { AR5K_PHY_TXPOWER_RATE3,
+                { 0x20202020, 0x20202020 } },
+        { AR5K_PHY_TXPOWER_RATE4,
+                { 0x20202020, 0x20202020 } },
+        { 0xa23c,
+                { 0x93c889af, 0x93c889af } },
+        { 0xa24c,
+                { 0x00000001, 0x00000001 } },
+        { 0xa250,
+                { 0x0000a000, 0x0000a000 } },
+        { 0xa254,
+                { 0x00000000, 0x00000000 } },
+        { 0xa258,
+                { 0x0cc75380, 0x0cc75380 } },
+        { 0xa25c,
+                { 0x0f0f0f01, 0x0f0f0f01 } },
+        { 0xa260,
+                { 0x5f690f01, 0x5f690f01 } },
+        { 0xa264,
+                { 0x00418a11, 0x00418a11 } },
+        { 0xa268,
+                { 0x00000000, 0x00000000 } },
+        { 0xa26c,
+                { 0x0c30c166, 0x0c30c166 } },
+        { 0xa270,
+                { 0x00820820, 0x00820820 } },
+        { 0xa274,
+                { 0x081a3caa, 0x081a3caa } },
+        { 0xa278,
+                { 0x1ce739ce, 0x1ce739ce } },
+        { 0xa27c,
+                { 0x051701ce, 0x051701ce } },
+        { 0xa300,
+                { 0x16010000, 0x16010000 } },
+        { 0xa304,
+                { 0x2c032402, 0x2c032402 } },
+        { 0xa308,
+                { 0x48433e42, 0x48433e42 } },
+        { 0xa30c,
+                { 0x5a0f500b, 0x5a0f500b } },
+        { 0xa310,
+                { 0x6c4b624a, 0x6c4b624a } },
+        { 0xa314,
+                { 0x7e8b748a, 0x7e8b748a } },
+        { 0xa318,
+                { 0x96cf8ccb, 0x96cf8ccb } },
+        { 0xa31c,
+                { 0xa34f9d0f, 0xa34f9d0f } },
+        { 0xa320,
+                { 0xa7cfa58f, 0xa7cfa58f } },
+        { 0xa348,
+                { 0x3fffffff, 0x3fffffff } },
+        { 0xa34c,
+                { 0x3fffffff, 0x3fffffff } },
+        { 0xa350,
+                { 0x3fffffff, 0x3fffffff } },
+        { 0xa354,
+                { 0x0003ffff, 0x0003ffff } },
+        { 0xa358,
+                { 0x79a8aa1f, 0x79a8aa1f } },
+        { 0xa35c,
+                { 0x066c420f, 0x066c420f } },
+        { 0xa360,
+                { 0x0f282207, 0x0f282207 } },
+        { 0xa364,
+                { 0x17601685, 0x17601685 } },
+        { 0xa368,
+                { 0x1f801104, 0x1f801104 } },
+        { 0xa36c,
+                { 0x37a00c03, 0x37a00c03 } },
+        { 0xa370,
+                { 0x3fc40883, 0x3fc40883 } },
+        { 0xa374,
+                { 0x57c00803, 0x57c00803 } },
+        { 0xa378,
+                { 0x5fd80682, 0x5fd80682 } },
+        { 0xa37c,
+                { 0x7fe00482, 0x7fe00482 } },
+        { 0xa380,
+                { 0x7f3c7bba, 0x7f3c7bba } },
+        { 0xa384,
+                { 0xf3307ff0, 0xf3307ff0 } },
+};
+
 /*
  * Initial BaseBand Gain settings for RF5111/5112 (AR5210 comes with
  * RF5110 only so initial BB Gain settings are included in AR5K_AR5210_INI)
@@ -1290,35 +1698,92 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
 
                 /* Second set of mode-specific settings */
                 if (ah->ah_radio == AR5K_RF5111){
+
                         ath5k_hw_ini_mode_registers(ah,
                                         ARRAY_SIZE(ar5212_rf5111_ini_mode_end),
                                         ar5212_rf5111_ini_mode_end, mode);
+
                         /* Baseband gain table */
                         ath5k_hw_ini_registers(ah,
                                         ARRAY_SIZE(rf5111_ini_bbgain),
                                         rf5111_ini_bbgain, change_channel);
+
                 } else if (ah->ah_radio == AR5K_RF5112){
+
                         ath5k_hw_ini_mode_registers(ah,
                                         ARRAY_SIZE(ar5212_rf5112_ini_mode_end),
                                         ar5212_rf5112_ini_mode_end, mode);
-                        /* Baseband gain table */
+
                         ath5k_hw_ini_registers(ah,
                                         ARRAY_SIZE(rf5112_ini_bbgain),
                                         rf5112_ini_bbgain, change_channel);
+
                 } else if (ah->ah_radio == AR5K_RF5413){
+
                         ath5k_hw_ini_mode_registers(ah,
                                         ARRAY_SIZE(rf5413_ini_mode_end),
                                         rf5413_ini_mode_end, mode);
+
+                        ath5k_hw_ini_registers(ah,
+                                        ARRAY_SIZE(rf5112_ini_bbgain),
+                                        rf5112_ini_bbgain, change_channel);
+
+                } else if (ah->ah_radio == AR5K_RF2413) {
+
+                        if (mode < 2) {
+                                ATH5K_ERR(ah->ah_sc,
+                                        "unsupported channel mode: %d\n", mode);
+                                return -EINVAL;
+                        }
+                        mode = mode - 2;
+
+                        /* Override a setting from ar5212_ini */
+                        ath5k_hw_reg_write(ah, 0x018830c6, AR5K_PHY(648));
+
+                        ath5k_hw_ini_mode_registers(ah,
+                                        ARRAY_SIZE(rf2413_ini_mode_end),
+                                        rf2413_ini_mode_end, mode);
+
+                        /* Baseband gain table */
+                        ath5k_hw_ini_registers(ah,
+                                        ARRAY_SIZE(rf5112_ini_bbgain),
+                                        rf5112_ini_bbgain, change_channel);
+
+                } else if (ah->ah_radio == AR5K_RF2425) {
+
+                        if (mode < 2) {
+                                ATH5K_ERR(ah->ah_sc,
+                                        "unsupported channel mode: %d\n", mode);
+                                return -EINVAL;
+                        }
+
+                        /* Map b to g */
+                        if (mode == 2)
+                                mode = 0;
+                        else
+                                mode = mode - 3;
+
+                        /* Override a setting from ar5212_ini */
+                        ath5k_hw_reg_write(ah, 0x018830c6, AR5K_PHY(648));
+
+                        ath5k_hw_ini_mode_registers(ah,
+                                        ARRAY_SIZE(rf2425_ini_mode_end),
+                                        rf2425_ini_mode_end, mode);
+
                         /* Baseband gain table */
                         ath5k_hw_ini_registers(ah,
                                         ARRAY_SIZE(rf5112_ini_bbgain),
                                         rf5112_ini_bbgain, change_channel);
+
                 }
+
         /* For AR5211 */
         } else if (ah->ah_version == AR5K_AR5211) {
 
-                if(mode > 2){ /* AR5K_INI_VAL_11B */
-                        ATH5K_ERR(ah->ah_sc,"unsupported channel mode: %d\n", mode);
+                /* AR5K_MODE_11B */
+                if (mode > 2) {
+                        ATH5K_ERR(ah->ah_sc,
+                                "unsupported channel mode: %d\n", mode);
                         return -EINVAL;
                 }
 
diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c
index b95941797141..afd8689e5c03 100644
--- a/drivers/net/wireless/ath5k/phy.c
+++ b/drivers/net/wireless/ath5k/phy.c
@@ -666,6 +666,153 @@ static const struct ath5k_ini_rf rfregs_5413[] = {
             { 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e } },
 };
 
+/* RF2413/2414 mode-specific init registers */
+static const struct ath5k_ini_rf rfregs_2413[] = {
+        { 1, AR5K_RF_BUFFER_CONTROL_4,
+        /*         mode b      mode g     mode gTurbo */
+                { 0x00000020, 0x00000020, 0x00000020 } },
+        { 2, AR5K_RF_BUFFER_CONTROL_3,
+                { 0x02001408, 0x02001408, 0x02001408 } },
+        { 3, AR5K_RF_BUFFER_CONTROL_6,
+                { 0x00e020c0, 0x00e020c0, 0x00e020c0 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0xf0000000, 0xf0000000, 0xf0000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x03000000, 0x03000000, 0x03000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x40400000, 0x40400000, 0x40400000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x65050000, 0x65050000, 0x65050000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00420000, 0x00420000, 0x00420000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00b50000, 0x00b50000, 0x00b50000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00030000, 0x00030000, 0x00030000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00f70000, 0x00f70000, 0x00f70000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x009d0000, 0x009d0000, 0x009d0000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00220000, 0x00220000, 0x00220000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x04220000, 0x04220000, 0x04220000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00230018, 0x00230018, 0x00230018 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00280050, 0x00280050, 0x00280050 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x005000c3, 0x005000c3, 0x005000c3 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x0004007f, 0x0004007f, 0x0004007f } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000458, 0x00000458, 0x00000458 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x0000c000, 0x0000c000, 0x0000c000 } },
+        { 6, AR5K_RF_BUFFER_CONTROL_5,
+                { 0x00400230, 0x00400230, 0x00400230 } },
+        { 7, AR5K_RF_BUFFER,
+                { 0x00006400, 0x00006400, 0x00006400 } },
+        { 7, AR5K_RF_BUFFER,
+                { 0x00000800, 0x00000800, 0x00000800 } },
+        { 7, AR5K_RF_BUFFER_CONTROL_2,
+                { 0x0000000e, 0x0000000e, 0x0000000e } },
+};
+
+/* RF2425 mode-specific init registers */
+static const struct ath5k_ini_rf rfregs_2425[] = {
+        { 1, AR5K_RF_BUFFER_CONTROL_4,
+        /*         mode g     mode gTurbo */
+                { 0x00000020, 0x00000020 } },
+        { 2, AR5K_RF_BUFFER_CONTROL_3,
+                { 0x02001408, 0x02001408 } },
+        { 3, AR5K_RF_BUFFER_CONTROL_6,
+                { 0x00e020c0, 0x00e020c0 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x10000000, 0x10000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x002a0000, 0x002a0000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00100000, 0x00100000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00020000, 0x00020000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00730000, 0x00730000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00f80000, 0x00f80000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00e70000, 0x00e70000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00140000, 0x00140000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00910040, 0x00910040 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x0007001a, 0x0007001a } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00410000, 0x00410000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00810060, 0x00810060 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00020803, 0x00020803 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00000000, 0x00000000 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00001660, 0x00001660 } },
+        { 6, AR5K_RF_BUFFER,
+                { 0x00001688, 0x00001688 } },
+        { 6, AR5K_RF_BUFFER_CONTROL_1,
+                { 0x00000001, 0x00000001 } },
+        { 7, AR5K_RF_BUFFER,
+                { 0x00006400, 0x00006400 } },
+        { 7, AR5K_RF_BUFFER,
+                { 0x00000800, 0x00000800 } },
+        { 7, AR5K_RF_BUFFER_CONTROL_2,
+                { 0x0000000e, 0x0000000e } },
+};
 
 /* Initial RF Gain settings for RF5112 */
 static const struct ath5k_ini_rfgain rfgain_5112[] = {
@@ -805,6 +952,74 @@ static const struct ath5k_ini_rfgain rfgain_5413[] = {
         { AR5K_RF_GAIN(63),     { 0x000000f9, 0x000000f9 } },
 };
 
+/* Initial RF Gain settings for RF2413 */
+static const struct ath5k_ini_rfgain rfgain_2413[] = {
+        { AR5K_RF_GAIN(0), { 0x00000000 } },
+        { AR5K_RF_GAIN(1), { 0x00000040 } },
+        { AR5K_RF_GAIN(2), { 0x00000080 } },
+        { AR5K_RF_GAIN(3), { 0x00000181 } },
+        { AR5K_RF_GAIN(4), { 0x000001c1 } },
+        { AR5K_RF_GAIN(5), { 0x00000001 } },
+        { AR5K_RF_GAIN(6), { 0x00000041 } },
+        { AR5K_RF_GAIN(7), { 0x00000081 } },
+        { AR5K_RF_GAIN(8), { 0x00000168 } },
+        { AR5K_RF_GAIN(9), { 0x000001a8 } },
+        { AR5K_RF_GAIN(10), { 0x000001e8 } },
+        { AR5K_RF_GAIN(11), { 0x00000028 } },
+        { AR5K_RF_GAIN(12), { 0x00000068 } },
+        { AR5K_RF_GAIN(13), { 0x00000189 } },
+        { AR5K_RF_GAIN(14), { 0x000001c9 } },
+        { AR5K_RF_GAIN(15), { 0x00000009 } },
+        { AR5K_RF_GAIN(16), { 0x00000049 } },
+        { AR5K_RF_GAIN(17), { 0x00000089 } },
+        { AR5K_RF_GAIN(18), { 0x00000190 } },
+        { AR5K_RF_GAIN(19), { 0x000001d0 } },
+        { AR5K_RF_GAIN(20), { 0x00000010 } },
+        { AR5K_RF_GAIN(21), { 0x00000050 } },
+        { AR5K_RF_GAIN(22), { 0x00000090 } },
+        { AR5K_RF_GAIN(23), { 0x00000191 } },
+        { AR5K_RF_GAIN(24), { 0x000001d1 } },
+        { AR5K_RF_GAIN(25), { 0x00000011 } },
+        { AR5K_RF_GAIN(26), { 0x00000051 } },
+        { AR5K_RF_GAIN(27), { 0x00000091 } },
+        { AR5K_RF_GAIN(28), { 0x00000178 } },
+        { AR5K_RF_GAIN(29), { 0x000001b8 } },
+        { AR5K_RF_GAIN(30), { 0x000001f8 } },
+        { AR5K_RF_GAIN(31), { 0x00000038 } },
+        { AR5K_RF_GAIN(32), { 0x00000078 } },
+        { AR5K_RF_GAIN(33), { 0x00000199 } },
+        { AR5K_RF_GAIN(34), { 0x000001d9 } },
+        { AR5K_RF_GAIN(35), { 0x00000019 } },
+        { AR5K_RF_GAIN(36), { 0x00000059 } },
+        { AR5K_RF_GAIN(37), { 0x00000099 } },
+        { AR5K_RF_GAIN(38), { 0x000000d9 } },
+        { AR5K_RF_GAIN(39), { 0x000000f9 } },
+        { AR5K_RF_GAIN(40), { 0x000000f9 } },
+        { AR5K_RF_GAIN(41), { 0x000000f9 } },
+        { AR5K_RF_GAIN(42), { 0x000000f9 } },
+        { AR5K_RF_GAIN(43), { 0x000000f9 } },
+        { AR5K_RF_GAIN(44), { 0x000000f9 } },
+        { AR5K_RF_GAIN(45), { 0x000000f9 } },
+        { AR5K_RF_GAIN(46), { 0x000000f9 } },
+        { AR5K_RF_GAIN(47), { 0x000000f9 } },
+        { AR5K_RF_GAIN(48), { 0x000000f9 } },
+        { AR5K_RF_GAIN(49), { 0x000000f9 } },
+        { AR5K_RF_GAIN(50), { 0x000000f9 } },
+        { AR5K_RF_GAIN(51), { 0x000000f9 } },
+        { AR5K_RF_GAIN(52), { 0x000000f9 } },
+        { AR5K_RF_GAIN(53), { 0x000000f9 } },
+        { AR5K_RF_GAIN(54), { 0x000000f9 } },
+        { AR5K_RF_GAIN(55), { 0x000000f9 } },
+        { AR5K_RF_GAIN(56), { 0x000000f9 } },
+        { AR5K_RF_GAIN(57), { 0x000000f9 } },
+        { AR5K_RF_GAIN(58), { 0x000000f9 } },
+        { AR5K_RF_GAIN(59), { 0x000000f9 } },
+        { AR5K_RF_GAIN(60), { 0x000000f9 } },
+        { AR5K_RF_GAIN(61), { 0x000000f9 } },
+        { AR5K_RF_GAIN(62), { 0x000000f9 } },
+        { AR5K_RF_GAIN(63), { 0x000000f9 } },
+};
+
 static const struct ath5k_gain_opt rfgain_opt_5112 = {
         1,
         8,
@@ -844,14 +1059,14 @@ static unsigned int ath5k_hw_rfregs_op(u32 *rf, u32 offset, u32 reg, u32 bits,
         entry = ((first - 1) / 8) + offset;
         position = (first - 1) % 8;
 
-        if (set == true)
+        if (set)
                 data = ath5k_hw_bitswap(reg, bits);
 
         for (i = shift = 0, left = bits; left > 0; position = 0, entry++, i++) {
                 last = (position + left > 8) ? 8 : position + left;
                 mask = (((1 << last) - 1) ^ ((1 << position) - 1)) << (col * 8);
 
-                if (set == true) {
+                if (set) {
                         rf[entry] &= ~mask;
                         rf[entry] |= ((data << position) << (col * 8)) & mask;
                         data >>= (8 - position);
@@ -864,7 +1079,7 @@ static unsigned int ath5k_hw_rfregs_op(u32 *rf, u32 offset, u32 reg, u32 bits,
                 left -= 8 - position;
         }
 
-        data = set == true ? 1 : ath5k_hw_bitswap(data, bits);
+        data = set ? 1 : ath5k_hw_bitswap(data, bits);
 
         return data;
 }
@@ -955,7 +1170,6 @@ static s32 ath5k_hw_rfregs_gain_adjust(struct ath5k_hw *ah)
                 go = &rfgain_opt_5111;
                 break;
         case AR5K_RF5112:
-        case AR5K_RF5413: /* ??? */
                 go = &rfgain_opt_5112;
                 break;
         default:
@@ -1018,7 +1232,7 @@ static int ath5k_hw_rf5111_rfregs(struct ath5k_hw *ah,
         int obdb = -1, bank = -1;
         u32 ee_mode;
 
-        AR5K_ASSERT_ENTRY(mode, AR5K_INI_VAL_MAX);
+        AR5K_ASSERT_ENTRY(mode, AR5K_MODE_MAX);
 
         rf = ah->ah_rf_banks;
 
@@ -1038,8 +1252,8 @@ static int ath5k_hw_rf5111_rfregs(struct ath5k_hw *ah,
         }
 
         /* Modify bank 0 */
-        if (channel->val & CHANNEL_2GHZ) {
-                if (channel->val & CHANNEL_CCK)
+        if (channel->hw_value & CHANNEL_2GHZ) {
+                if (channel->hw_value & CHANNEL_CCK)
                         ee_mode = AR5K_EEPROM_MODE_11B;
                 else
                         ee_mode = AR5K_EEPROM_MODE_11G;
@@ -1058,10 +1272,10 @@ static int ath5k_hw_rf5111_rfregs(struct ath5k_hw *ah,
         } else {
                 /* For 11a, Turbo and XR */
                 ee_mode = AR5K_EEPROM_MODE_11A;
-                obdb =   channel->freq >= 5725 ? 3 :
-                        (channel->freq >= 5500 ? 2 :
-                        (channel->freq >= 5260 ? 1 :
-                         (channel->freq > 4000 ? 0 : -1)));
+                obdb =   channel->center_freq >= 5725 ? 3 :
+                        (channel->center_freq >= 5500 ? 2 :
+                        (channel->center_freq >= 5260 ? 1 :
+                         (channel->center_freq > 4000 ? 0 : -1)));
 
                 if (!ath5k_hw_rfregs_op(rf, ah->ah_offset[6],
                                 ee->ee_pwd_84, 1, 51, 3, true))
@@ -1119,12 +1333,12 @@ static int ath5k_hw_rf5112_rfregs(struct ath5k_hw *ah,
         int obdb = -1, bank = -1;
         u32 ee_mode;
 
-        AR5K_ASSERT_ENTRY(mode, AR5K_INI_VAL_MAX);
+        AR5K_ASSERT_ENTRY(mode, AR5K_MODE_MAX);
 
         rf = ah->ah_rf_banks;
 
         if (ah->ah_radio_5ghz_revision >= AR5K_SREV_RAD_2112A
-                && !test_bit(MODE_IEEE80211A, ah->ah_capabilities.cap_mode)){
+                && !test_bit(AR5K_MODE_11A, ah->ah_capabilities.cap_mode)) {
                 rf_ini = rfregs_2112a;
                 rf_size = ARRAY_SIZE(rfregs_5112a);
                 if (mode < 2) {
@@ -1156,8 +1370,8 @@ static int ath5k_hw_rf5112_rfregs(struct ath5k_hw *ah,
         }
 
         /* Modify bank 6 */
-        if (channel->val & CHANNEL_2GHZ) {
-                if (channel->val & CHANNEL_OFDM)
+        if (channel->hw_value & CHANNEL_2GHZ) {
+                if (channel->hw_value & CHANNEL_OFDM)
                         ee_mode = AR5K_EEPROM_MODE_11G;
                 else
                         ee_mode = AR5K_EEPROM_MODE_11B;
@@ -1173,10 +1387,13 @@ static int ath5k_hw_rf5112_rfregs(struct ath5k_hw *ah,
         } else {
                 /* For 11a, Turbo and XR */
                 ee_mode = AR5K_EEPROM_MODE_11A;
-                obdb = channel->freq >= 5725 ? 3 :
-                    (channel->freq >= 5500 ? 2 :
-                        (channel->freq >= 5260 ? 1 :
-                            (channel->freq > 4000 ? 0 : -1)));
+                obdb = channel->center_freq >= 5725 ? 3 :
+                    (channel->center_freq >= 5500 ? 2 :
+                        (channel->center_freq >= 5260 ? 1 :
+                            (channel->center_freq > 4000 ? 0 : -1)));
+
+                if (obdb == -1)
+                        return -EINVAL;
 
                 if (!ath5k_hw_rfregs_op(rf, ah->ah_offset[6],
                                 ee->ee_ob[ee_mode][obdb], 3, 279, 0, true))
@@ -1209,7 +1426,8 @@ static int ath5k_hw_rf5112_rfregs(struct ath5k_hw *ah,
 }
 
 /*
- * Initialize RF5413/5414
+ * Initialize RF5413/5414 and future chips
+ * (until we come up with a better solution)
  */
 static int ath5k_hw_rf5413_rfregs(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel, unsigned int mode)
@@ -1219,12 +1437,47 @@ static int ath5k_hw_rf5413_rfregs(struct ath5k_hw *ah,
         unsigned int rf_size, i;
         int bank = -1;
 
-        AR5K_ASSERT_ENTRY(mode, AR5K_INI_VAL_MAX);
+        AR5K_ASSERT_ENTRY(mode, AR5K_MODE_MAX);
 
         rf = ah->ah_rf_banks;
 
-        rf_ini = rfregs_5413;
-        rf_size = ARRAY_SIZE(rfregs_5413);
+        switch (ah->ah_radio) {
+        case AR5K_RF5413:
+                rf_ini = rfregs_5413;
+                rf_size = ARRAY_SIZE(rfregs_5413);
+                break;
+        case AR5K_RF2413:
+                rf_ini = rfregs_2413;
+                rf_size = ARRAY_SIZE(rfregs_2413);
+
+                if (mode < 2) {
+                        ATH5K_ERR(ah->ah_sc,
+                                "invalid channel mode: %i\n", mode);
+                        return -EINVAL;
+                }
+
+                mode = mode - 2;
+                break;
+        case AR5K_RF2425:
+                rf_ini = rfregs_2425;
+                rf_size = ARRAY_SIZE(rfregs_2425);
+
+                if (mode < 2) {
+                        ATH5K_ERR(ah->ah_sc,
+                                "invalid channel mode: %i\n", mode);
+                        return -EINVAL;
+                }
+
+                /* Map b to g */
+                if (mode == 2)
+                        mode = 0;
+                else
+                        mode = mode - 3;
+
+                break;
+        default:
+                return -EINVAL;
+        }
 
         /* Copy values to modify them */
         for (i = 0; i < rf_size; i++) {
@@ -1283,6 +1536,14 @@ int ath5k_hw_rfregs(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                 ah->ah_rf_banks_size = sizeof(rfregs_5413);
                 func = ath5k_hw_rf5413_rfregs;
                 break;
+        case AR5K_RF2413:
+                ah->ah_rf_banks_size = sizeof(rfregs_2413);
+                func = ath5k_hw_rf5413_rfregs;
+                break;
+        case AR5K_RF2425:
+                ah->ah_rf_banks_size = sizeof(rfregs_2425);
+                func = ath5k_hw_rf5413_rfregs;
+                break;
         default:
                 return -EINVAL;
         }
@@ -1321,6 +1582,16 @@ int ath5k_hw_rfgain(struct ath5k_hw *ah, unsigned int freq)
                 ath5k_rfg = rfgain_5413;
                 size = ARRAY_SIZE(rfgain_5413);
                 break;
+        case AR5K_RF2413:
+                ath5k_rfg = rfgain_2413;
+                size = ARRAY_SIZE(rfgain_2413);
+                freq = 0; /* only 2Ghz */
+                break;
+        case AR5K_RF2425:
+                ath5k_rfg = rfgain_2413;
+                size = ARRAY_SIZE(rfgain_2413);
+                freq = 0; /* only 2Ghz */
+                break;
         default:
                 return -EINVAL;
         }
@@ -1395,7 +1666,6 @@ int ath5k_hw_set_rfgain_opt(struct ath5k_hw *ah)
                 ah->ah_gain.g_active = 1;
                 break;
         case AR5K_RF5112:
-        case AR5K_RF5413: /* ??? */
                 ah->ah_gain.g_step_idx = rfgain_opt_5112.go_default;
                 ah->ah_gain.g_step =
                     &rfgain_opt_5112.go_step[ah->ah_gain.g_step_idx];
@@ -1445,9 +1715,10 @@ static u32 ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)
          * newer chipsets like the AR5212A who have a completely
          * different RF/PHY part.
          */
-        athchan = (ath5k_hw_bitswap((channel->chan - 24) / 2, 5) << 1) |
-                (1 << 6) | 0x1;
-
+        athchan = (ath5k_hw_bitswap(
+                        (ieee80211_frequency_to_channel(
+                                channel->center_freq) - 24) / 2, 5)
+                                << 1) | (1 << 6) | 0x1;
         return athchan;
 }
 
@@ -1506,7 +1777,8 @@ static int ath5k_hw_rf5111_channel(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         struct ath5k_athchan_2ghz ath5k_channel_2ghz;
-        unsigned int ath5k_channel = channel->chan;
+        unsigned int ath5k_channel =
+                ieee80211_frequency_to_channel(channel->center_freq);
         u32 data0, data1, clock;
         int ret;
 
@@ -1515,10 +1787,11 @@ static int ath5k_hw_rf5111_channel(struct ath5k_hw *ah,
          */
         data0 = data1 = 0;
 
-        if (channel->val & CHANNEL_2GHZ) {
+        if (channel->hw_value & CHANNEL_2GHZ) {
                 /* Map 2GHz channel to 5GHz Atheros channel ID */
-                ret = ath5k_hw_rf5111_chan2athchan(channel->chan,
-                                &ath5k_channel_2ghz);
+                ret = ath5k_hw_rf5111_chan2athchan(
+                        ieee80211_frequency_to_channel(channel->center_freq),
+                        &ath5k_channel_2ghz);
                 if (ret)
                         return ret;
 
@@ -1555,7 +1828,7 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,
         u16 c;
 
         data = data0 = data1 = data2 = 0;
-        c = channel->freq;
+        c = channel->center_freq;
 
         /*
          * Set the channel on the RF5112 or newer
@@ -1599,19 +1872,17 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,
 int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel)
 {
         int ret;
-
         /*
-         * Check bounds supported by the PHY
-         * (don't care about regulation restrictions at this point)
-         */
-        if ((channel->freq < ah->ah_capabilities.cap_range.range_2ghz_min ||
-            channel->freq > ah->ah_capabilities.cap_range.range_2ghz_max) &&
-            (channel->freq < ah->ah_capabilities.cap_range.range_5ghz_min ||
-            channel->freq > ah->ah_capabilities.cap_range.range_5ghz_max)) {
+         * Check bounds supported by the PHY (we don't care about regultory
+         * restrictions at this point). Note: hw_value already has the band
+         * (CHANNEL_2GHZ, or CHANNEL_5GHZ) so we inform ath5k_channel_ok()
+         * of the band by that */
+        if (!ath5k_channel_ok(ah, channel->center_freq, channel->hw_value)) {
                 ATH5K_ERR(ah->ah_sc,
-                        "channel out of supported range (%u MHz)\n",
-                        channel->freq);
-                return -EINVAL;
+                        "channel frequency (%u MHz) out of supported "
+                        "band range\n",
+                        channel->center_freq);
+                        return -EINVAL;
         }
 
         /*
@@ -1632,9 +1903,9 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel)
         if (ret)
                 return ret;
 
-        ah->ah_current_channel.freq = channel->freq;
-        ah->ah_current_channel.val = channel->val;
-        ah->ah_turbo = channel->val == CHANNEL_T ? true : false;
+        ah->ah_current_channel.center_freq = channel->center_freq;
+        ah->ah_current_channel.hw_value = channel->hw_value;
+        ah->ah_turbo = channel->hw_value == CHANNEL_T ? true : false;
 
         return 0;
 }
@@ -1797,11 +2068,11 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
 
         if (ret) {
                 ATH5K_ERR(ah->ah_sc, "calibration timeout (%uMHz)\n",
-                                channel->freq);
+                                channel->center_freq);
                 return ret;
         }
 
-        ret = ath5k_hw_noise_floor_calibration(ah, channel->freq);
+        ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
         if (ret)
                 return ret;
 
@@ -1825,7 +2096,7 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,
         s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd;
         ATH5K_TRACE(ah->ah_sc);
 
-        if (ah->ah_calibration == false ||
+        if (!ah->ah_calibration ||
                         ath5k_hw_reg_read(ah, AR5K_PHY_IQ) & AR5K_PHY_IQ_RUN)
                 goto done;
 
@@ -1848,10 +2119,10 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,
                 ((u32)q_coff) | ((u32)i_coff << AR5K_PHY_IQ_CORR_Q_I_COFF_S));
 
 done:
-        ath5k_hw_noise_floor_calibration(ah, channel->freq);
+        ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
         /* Request RF gain */
-        if (channel->val & CHANNEL_5GHZ) {
+        if (channel->hw_value & CHANNEL_5GHZ) {
                 ath5k_hw_reg_write(ah, AR5K_REG_SM(ah->ah_txpower.txp_max,
                         AR5K_PHY_PAPD_PROBE_TXPOWER) |
                         AR5K_PHY_PAPD_PROBE_TX_NEXT, AR5K_PHY_PAPD_PROBE);
@@ -2015,6 +2286,18 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                 return -EINVAL;
         }
 
+        /*
+         * RF2413 for some reason can't
+         * transmit anything if we call
+         * this funtion, so we skip it
+         * until we fix txpower.
+         *
+         * XXX: Assume same for RF2425
+         * to be safe.
+         */
+        if ((ah->ah_radio == AR5K_RF2413) || (ah->ah_radio == AR5K_RF2425))
+                return 0;
+
         /* Reset TX power values */
         memset(&ah->ah_txpower, 0, sizeof(ah->ah_txpower));
         ah->ah_txpower.txp_tpc = tpc;
@@ -2048,7 +2331,7 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                 AR5K_TXPOWER_CCK(13, 16) | AR5K_TXPOWER_CCK(12, 8) |
                 AR5K_TXPOWER_CCK(11, 0), AR5K_PHY_TXPOWER_RATE4);
 
-        if (ah->ah_txpower.txp_tpc == true)
+        if (ah->ah_txpower.txp_tpc)
                 ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX_TPC_ENABLE |
                         AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX);
         else
diff --git a/drivers/net/wireless/ath5k/reg.h b/drivers/net/wireless/ath5k/reg.h
index 2f41c8398602..30629b3e37c2 100644
--- a/drivers/net/wireless/ath5k/reg.h
+++ b/drivers/net/wireless/ath5k/reg.h
@@ -1923,7 +1923,9 @@ after DFS is enabled */
 #define AR5K_PHY_SDELAY_32MHZ           0x000000ff
 #define AR5K_PHY_SPENDING               0x99f8
 #define AR5K_PHY_SPENDING_RF5111        0x00000018
-#define AR5K_PHY_SPENDING_RF5112        0x00000014
+#define AR5K_PHY_SPENDING_RF5112        0x00000014 /* <- i 've only seen this on 2425 dumps ! */
+#define AR5K_PHY_SPENDING_RF5112A       0x0000000e /* but since i only have 5112A-based chips */
+#define AR5K_PHY_SPENDING_RF5424        0x00000012 /* to test it might be also for old 5112.  */
 
 /*
  * Misc PHY/radio registers [5110 - 5111]
diff --git a/drivers/net/wireless/ath5k/regdom.c b/drivers/net/wireless/ath5k/regdom.c
deleted file mode 100644
index e851957dacfd..000000000000
--- a/drivers/net/wireless/ath5k/regdom.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Basic regulation domain extensions for the IEEE 802.11 stack
- */
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-
-#include "regdom.h"
-
-static const struct ath5k_regdommap {
-        enum ath5k_regdom dmn;
-        enum ath5k_regdom dmn5;
-        enum ath5k_regdom dmn2;
-} r_map[] = {
-        { DMN_DEFAULT,          DMN_DEBUG,      DMN_DEBUG },
-        { DMN_NULL_WORLD,       DMN_NULL,       DMN_WORLD },
-        { DMN_NULL_ETSIB,       DMN_NULL,       DMN_ETSIB },
-        { DMN_NULL_ETSIC,       DMN_NULL,       DMN_ETSIC },
-        { DMN_FCC1_FCCA,        DMN_FCC1,       DMN_FCCA },
-        { DMN_FCC1_WORLD,       DMN_FCC1,       DMN_WORLD },
-        { DMN_FCC2_FCCA,        DMN_FCC2,       DMN_FCCA },
-        { DMN_FCC2_WORLD,       DMN_FCC2,       DMN_WORLD },
-        { DMN_FCC2_ETSIC,       DMN_FCC2,       DMN_ETSIC },
-        { DMN_FRANCE_NULL,      DMN_ETSI3,      DMN_ETSI3 },
-        { DMN_FCC3_FCCA,        DMN_FCC3,       DMN_WORLD },
-        { DMN_ETSI1_WORLD,      DMN_ETSI1,      DMN_WORLD },
-        { DMN_ETSI3_ETSIA,      DMN_ETSI3,      DMN_WORLD },
-        { DMN_ETSI2_WORLD,      DMN_ETSI2,      DMN_WORLD },
-        { DMN_ETSI3_WORLD,      DMN_ETSI3,      DMN_WORLD },
-        { DMN_ETSI4_WORLD,      DMN_ETSI4,      DMN_WORLD },
-        { DMN_ETSI4_ETSIC,      DMN_ETSI4,      DMN_ETSIC },
-        { DMN_ETSI5_WORLD,      DMN_ETSI5,      DMN_WORLD },
-        { DMN_ETSI6_WORLD,      DMN_ETSI6,      DMN_WORLD },
-        { DMN_ETSI_NULL,        DMN_ETSI1,      DMN_ETSI1 },
-        { DMN_MKK1_MKKA,        DMN_MKK1,       DMN_MKKA },
-        { DMN_MKK1_MKKB,        DMN_MKK1,       DMN_MKKA },
-        { DMN_APL4_WORLD,       DMN_APL4,       DMN_WORLD },
-        { DMN_MKK2_MKKA,        DMN_MKK2,       DMN_MKKA },
-        { DMN_APL_NULL,         DMN_APL1,       DMN_NULL },
-        { DMN_APL2_WORLD,       DMN_APL2,       DMN_WORLD },
-        { DMN_APL2_APLC,        DMN_APL2,       DMN_WORLD },
-        { DMN_APL3_WORLD,       DMN_APL3,       DMN_WORLD },
-        { DMN_MKK1_FCCA,        DMN_MKK1,       DMN_FCCA },
-        { DMN_APL2_APLD,        DMN_APL2,       DMN_APLD },
-        { DMN_MKK1_MKKA1,       DMN_MKK1,       DMN_MKKA },
-        { DMN_MKK1_MKKA2,       DMN_MKK1,       DMN_MKKA },
-        { DMN_APL1_WORLD,       DMN_APL1,       DMN_WORLD },
-        { DMN_APL1_FCCA,        DMN_APL1,       DMN_FCCA },
-        { DMN_APL1_APLA,        DMN_APL1,       DMN_WORLD },
-        { DMN_APL1_ETSIC,       DMN_APL1,       DMN_ETSIC },
-        { DMN_APL2_ETSIC,       DMN_APL2,       DMN_ETSIC },
-        { DMN_APL5_WORLD,       DMN_APL5,       DMN_WORLD },
-        { DMN_WOR0_WORLD,       DMN_WORLD,      DMN_WORLD },
-        { DMN_WOR1_WORLD,       DMN_WORLD,      DMN_WORLD },
-        { DMN_WOR2_WORLD,       DMN_WORLD,      DMN_WORLD },
-        { DMN_WOR3_WORLD,       DMN_WORLD,      DMN_WORLD },
-        { DMN_WOR4_WORLD,       DMN_WORLD,      DMN_WORLD },
-        { DMN_WOR5_ETSIC,       DMN_WORLD,      DMN_WORLD },
-        { DMN_WOR01_WORLD,      DMN_WORLD,      DMN_WORLD },
-        { DMN_WOR02_WORLD,      DMN_WORLD,      DMN_WORLD },
-        { DMN_EU1_WORLD,        DMN_ETSI1,      DMN_WORLD },
-        { DMN_WOR9_WORLD,       DMN_WORLD,      DMN_WORLD },
-        { DMN_WORA_WORLD,       DMN_WORLD,      DMN_WORLD },
-};
-
-enum ath5k_regdom ath5k_regdom2flag(enum ath5k_regdom dmn, u16 mhz)
-{
-        unsigned int i;
-
-        for (i = 0; i < ARRAY_SIZE(r_map); i++) {
-                if (r_map[i].dmn == dmn) {
-                        if (mhz >= 2000 && mhz <= 3000)
-                                return r_map[i].dmn2;
-                        if (mhz >= IEEE80211_CHANNELS_5GHZ_MIN &&
-                                        mhz <= IEEE80211_CHANNELS_5GHZ_MAX)
-                                return r_map[i].dmn5;
-                }
-        }
-
-        return DMN_DEBUG;
-}
-
-u16 ath5k_regdom_from_ieee(enum ath5k_regdom ieee)
-{
-        u32 regdomain = (u32)ieee;
-
-        /*
-         * Use the default regulation domain if the value is empty
-         * or not supported by the net80211 regulation code.
-         */
-        if (ath5k_regdom2flag(regdomain, IEEE80211_CHANNELS_5GHZ_MIN) ==
-                        DMN_DEBUG)
-                return (u16)AR5K_TUNE_REGDOMAIN;
-
-        /* It is supported, just return the value */
-        return regdomain;
-}
-
-enum ath5k_regdom ath5k_regdom_to_ieee(u16 regdomain)
-{
-        enum ath5k_regdom ieee = (enum ath5k_regdom)regdomain;
-
-        return ieee;
-}
-
diff --git a/drivers/net/wireless/ath5k/regdom.h b/drivers/net/wireless/ath5k/regdom.h
deleted file mode 100644
index f7d3c66e594e..000000000000
--- a/drivers/net/wireless/ath5k/regdom.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _IEEE80211_REGDOMAIN_H_
-#define _IEEE80211_REGDOMAIN_H_
-
-#include <linux/types.h>
-
-/* Default regulation domain if stored value EEPROM value is invalid */
-#define AR5K_TUNE_REGDOMAIN     DMN_FCC2_FCCA   /* Canada */
-#define AR5K_TUNE_CTRY          CTRY_DEFAULT
-
-
-enum ath5k_regdom {
-        DMN_DEFAULT             = 0x00,
-        DMN_NULL_WORLD          = 0x03,
-        DMN_NULL_ETSIB          = 0x07,
-        DMN_NULL_ETSIC          = 0x08,
-        DMN_FCC1_FCCA           = 0x10,
-        DMN_FCC1_WORLD          = 0x11,
-        DMN_FCC2_FCCA           = 0x20,
-        DMN_FCC2_WORLD          = 0x21,
-        DMN_FCC2_ETSIC          = 0x22,
-        DMN_FRANCE_NULL         = 0x31,
-        DMN_FCC3_FCCA           = 0x3A,
-        DMN_ETSI1_WORLD         = 0x37,
-        DMN_ETSI3_ETSIA         = 0x32,
-        DMN_ETSI2_WORLD         = 0x35,
-        DMN_ETSI3_WORLD         = 0x36,
-        DMN_ETSI4_WORLD         = 0x30,
-        DMN_ETSI4_ETSIC         = 0x38,
-        DMN_ETSI5_WORLD         = 0x39,
-        DMN_ETSI6_WORLD         = 0x34,
-        DMN_ETSI_NULL           = 0x33,
-        DMN_MKK1_MKKA           = 0x40,
-        DMN_MKK1_MKKB           = 0x41,
-        DMN_APL4_WORLD          = 0x42,
-        DMN_MKK2_MKKA           = 0x43,
-        DMN_APL_NULL            = 0x44,
-        DMN_APL2_WORLD          = 0x45,
-        DMN_APL2_APLC           = 0x46,
-        DMN_APL3_WORLD          = 0x47,
-        DMN_MKK1_FCCA           = 0x48,
-        DMN_APL2_APLD           = 0x49,
-        DMN_MKK1_MKKA1          = 0x4A,
-        DMN_MKK1_MKKA2          = 0x4B,
-        DMN_APL1_WORLD          = 0x52,
-        DMN_APL1_FCCA           = 0x53,
-        DMN_APL1_APLA           = 0x54,
-        DMN_APL1_ETSIC          = 0x55,
-        DMN_APL2_ETSIC          = 0x56,
-        DMN_APL5_WORLD          = 0x58,
-        DMN_WOR0_WORLD          = 0x60,
-        DMN_WOR1_WORLD          = 0x61,
-        DMN_WOR2_WORLD          = 0x62,
-        DMN_WOR3_WORLD          = 0x63,
-        DMN_WOR4_WORLD          = 0x64,
-        DMN_WOR5_ETSIC          = 0x65,
-        DMN_WOR01_WORLD         = 0x66,
-        DMN_WOR02_WORLD         = 0x67,
-        DMN_EU1_WORLD           = 0x68,
-        DMN_WOR9_WORLD          = 0x69,
-        DMN_WORA_WORLD          = 0x6A,
-
-        DMN_APL1                = 0xf0000001,
-        DMN_APL2                = 0xf0000002,
-        DMN_APL3                = 0xf0000004,
-        DMN_APL4                = 0xf0000008,
-        DMN_APL5                = 0xf0000010,
-        DMN_ETSI1               = 0xf0000020,
-        DMN_ETSI2               = 0xf0000040,
-        DMN_ETSI3               = 0xf0000080,
-        DMN_ETSI4               = 0xf0000100,
-        DMN_ETSI5               = 0xf0000200,
-        DMN_ETSI6               = 0xf0000400,
-        DMN_ETSIA               = 0xf0000800,
-        DMN_ETSIB               = 0xf0001000,
-        DMN_ETSIC               = 0xf0002000,
-        DMN_FCC1                = 0xf0004000,
-        DMN_FCC2                = 0xf0008000,
-        DMN_FCC3                = 0xf0010000,
-        DMN_FCCA                = 0xf0020000,
-        DMN_APLD                = 0xf0040000,
-        DMN_MKK1                = 0xf0080000,
-        DMN_MKK2                = 0xf0100000,
-        DMN_MKKA                = 0xf0200000,
-        DMN_NULL                = 0xf0400000,
-        DMN_WORLD               = 0xf0800000,
-        DMN_DEBUG               = 0xf1000000    /* used for debugging */
-};
-
-#define IEEE80211_DMN(_d)       ((_d) & ~0xf0000000)
-
-enum ath5k_countrycode {
-        CTRY_DEFAULT            = 0,   /* Default domain (NA) */
-        CTRY_ALBANIA            = 8,   /* Albania */
-        CTRY_ALGERIA            = 12,  /* Algeria */
-        CTRY_ARGENTINA          = 32,  /* Argentina */
-        CTRY_ARMENIA            = 51,  /* Armenia */
-        CTRY_AUSTRALIA          = 36,  /* Australia */
-        CTRY_AUSTRIA            = 40,  /* Austria */
-        CTRY_AZERBAIJAN         = 31,  /* Azerbaijan */
-        CTRY_BAHRAIN            = 48,  /* Bahrain */
-        CTRY_BELARUS            = 112, /* Belarus */
-        CTRY_BELGIUM            = 56,  /* Belgium */
-        CTRY_BELIZE             = 84,  /* Belize */
-        CTRY_BOLIVIA            = 68,  /* Bolivia */
-        CTRY_BRAZIL             = 76,  /* Brazil */
-        CTRY_BRUNEI_DARUSSALAM  = 96,  /* Brunei Darussalam */
-        CTRY_BULGARIA           = 100, /* Bulgaria */
-        CTRY_CANADA             = 124, /* Canada */
-        CTRY_CHILE              = 152, /* Chile */
-        CTRY_CHINA              = 156, /* People's Republic of China */
-        CTRY_COLOMBIA           = 170, /* Colombia */
-        CTRY_COSTA_RICA         = 188, /* Costa Rica */
-        CTRY_CROATIA            = 191, /* Croatia */
-        CTRY_CYPRUS             = 196, /* Cyprus */
-        CTRY_CZECH              = 203, /* Czech Republic */
-        CTRY_DENMARK            = 208, /* Denmark */
-        CTRY_DOMINICAN_REPUBLIC = 214, /* Dominican Republic */
-        CTRY_ECUADOR            = 218, /* Ecuador */
-        CTRY_EGYPT              = 818, /* Egypt */
-        CTRY_EL_SALVADOR        = 222, /* El Salvador */
-        CTRY_ESTONIA            = 233, /* Estonia */
-        CTRY_FAEROE_ISLANDS     = 234, /* Faeroe Islands */
-        CTRY_FINLAND            = 246, /* Finland */
-        CTRY_FRANCE             = 250, /* France */
-        CTRY_FRANCE2            = 255, /* France2 */
-        CTRY_GEORGIA            = 268, /* Georgia */
-        CTRY_GERMANY            = 276, /* Germany */
-        CTRY_GREECE             = 300, /* Greece */
-        CTRY_GUATEMALA          = 320, /* Guatemala */
-        CTRY_HONDURAS           = 340, /* Honduras */
-        CTRY_HONG_KONG          = 344, /* Hong Kong S.A.R., P.R.C. */
-        CTRY_HUNGARY            = 348, /* Hungary */
-        CTRY_ICELAND            = 352, /* Iceland */
-        CTRY_INDIA              = 356, /* India */
-        CTRY_INDONESIA          = 360, /* Indonesia */
-        CTRY_IRAN               = 364, /* Iran */
-        CTRY_IRAQ               = 368, /* Iraq */
-        CTRY_IRELAND            = 372, /* Ireland */
-        CTRY_ISRAEL             = 376, /* Israel */
-        CTRY_ITALY              = 380, /* Italy */
-        CTRY_JAMAICA            = 388, /* Jamaica */
-        CTRY_JAPAN              = 392, /* Japan */
-        CTRY_JAPAN1             = 393, /* Japan (JP1) */
-        CTRY_JAPAN2             = 394, /* Japan (JP0) */
-        CTRY_JAPAN3             = 395, /* Japan (JP1-1) */
-        CTRY_JAPAN4             = 396, /* Japan (JE1) */
-        CTRY_JAPAN5             = 397, /* Japan (JE2) */
-        CTRY_JORDAN             = 400, /* Jordan */
-        CTRY_KAZAKHSTAN         = 398, /* Kazakhstan */
-        CTRY_KENYA              = 404, /* Kenya */
-        CTRY_KOREA_NORTH        = 408, /* North Korea */
-        CTRY_KOREA_ROC          = 410, /* South Korea */
-        CTRY_KOREA_ROC2         = 411, /* South Korea */
-        CTRY_KUWAIT             = 414, /* Kuwait */
-        CTRY_LATVIA             = 428, /* Latvia */
-        CTRY_LEBANON            = 422, /* Lebanon */
-        CTRY_LIBYA              = 434, /* Libya */
-        CTRY_LIECHTENSTEIN      = 438, /* Liechtenstein */
-        CTRY_LITHUANIA          = 440, /* Lithuania */
-        CTRY_LUXEMBOURG         = 442, /* Luxembourg */
-        CTRY_MACAU              = 446, /* Macau */
-        CTRY_MACEDONIA          = 807, /* Republic of Macedonia */
-        CTRY_MALAYSIA           = 458, /* Malaysia */
-        CTRY_MEXICO             = 484, /* Mexico */
-        CTRY_MONACO             = 492, /* Principality of Monaco */
-        CTRY_MOROCCO            = 504, /* Morocco */
-        CTRY_NETHERLANDS        = 528, /* Netherlands */
-        CTRY_NEW_ZEALAND        = 554, /* New Zealand */
-        CTRY_NICARAGUA          = 558, /* Nicaragua */
-        CTRY_NORWAY             = 578, /* Norway */
-        CTRY_OMAN               = 512, /* Oman */
-        CTRY_PAKISTAN           = 586, /* Islamic Republic of Pakistan */
-        CTRY_PANAMA             = 591, /* Panama */
-        CTRY_PARAGUAY           = 600, /* Paraguay */
-        CTRY_PERU               = 604, /* Peru */
-        CTRY_PHILIPPINES        = 608, /* Republic of the Philippines */
-        CTRY_POLAND             = 616, /* Poland */
-        CTRY_PORTUGAL           = 620, /* Portugal */
-        CTRY_PUERTO_RICO        = 630, /* Puerto Rico */
-        CTRY_QATAR              = 634, /* Qatar */
-        CTRY_ROMANIA            = 642, /* Romania */
-        CTRY_RUSSIA             = 643, /* Russia */
-        CTRY_SAUDI_ARABIA       = 682, /* Saudi Arabia */
-        CTRY_SINGAPORE          = 702, /* Singapore */
-        CTRY_SLOVAKIA           = 703, /* Slovak Republic */
-        CTRY_SLOVENIA           = 705, /* Slovenia */
-        CTRY_SOUTH_AFRICA       = 710, /* South Africa */
-        CTRY_SPAIN              = 724, /* Spain */
-        CTRY_SRI_LANKA          = 728, /* Sri Lanka */
-        CTRY_SWEDEN             = 752, /* Sweden */
-        CTRY_SWITZERLAND        = 756, /* Switzerland */
-        CTRY_SYRIA              = 760, /* Syria */
-        CTRY_TAIWAN             = 158, /* Taiwan */
-        CTRY_THAILAND           = 764, /* Thailand */
-        CTRY_TRINIDAD_Y_TOBAGO  = 780, /* Trinidad y Tobago */
-        CTRY_TUNISIA            = 788, /* Tunisia */
-        CTRY_TURKEY             = 792, /* Turkey */
-        CTRY_UAE                = 784, /* U.A.E. */
-        CTRY_UKRAINE            = 804, /* Ukraine */
-        CTRY_UNITED_KINGDOM     = 826, /* United Kingdom */
-        CTRY_UNITED_STATES      = 840, /* United States */
-        CTRY_URUGUAY            = 858, /* Uruguay */
-        CTRY_UZBEKISTAN         = 860, /* Uzbekistan */
-        CTRY_VENEZUELA          = 862, /* Venezuela */
-        CTRY_VIET_NAM           = 704, /* Viet Nam */
-        CTRY_YEMEN              = 887, /* Yemen */
-        CTRY_ZIMBABWE           = 716, /* Zimbabwe */
-};
-
-#define IEEE80211_CHANNELS_2GHZ_MIN     2412    /* 2GHz channel 1 */
-#define IEEE80211_CHANNELS_2GHZ_MAX     2732    /* 2GHz channel 26 */
-#define IEEE80211_CHANNELS_5GHZ_MIN     5005    /* 5GHz channel 1 */
-#define IEEE80211_CHANNELS_5GHZ_MAX     6100    /* 5GHz channel 220 */
-
-struct ath5k_regchannel {
-        u16 chan;
-        enum ath5k_regdom domain;
-        u32 mode;
-};
-
-#define IEEE80211_CHANNELS_2GHZ {                                       \
-/*2412*/ {   1, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2417*/ {   2, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2422*/ {   3, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2427*/ {   4, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2432*/ {   5, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2437*/ {   6, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2442*/ {   7, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2447*/ {   8, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2452*/ {   9, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2457*/ {  10, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2462*/ {  11, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2467*/ {  12, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2472*/ {  13, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM },                   \
-                                                                        \
-/*2432*/ {   5, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2437*/ {   6, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO },    \
-/*2442*/ {   7, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM },                  \
-                                                                        \
-/*2412*/ {   1, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2417*/ {   2, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2422*/ {   3, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2427*/ {   4, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2432*/ {   5, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2437*/ {   6, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO },    \
-/*2442*/ {   7, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2447*/ {   8, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2452*/ {   9, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2457*/ {  10, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2462*/ {  11, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2467*/ {  12, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2472*/ {  13, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM },                  \
-                                                                        \
-/*2412*/ {   1, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2417*/ {   2, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2422*/ {   3, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2427*/ {   4, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2432*/ {   5, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2437*/ {   6, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO },     \
-/*2442*/ {   7, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2447*/ {   8, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2452*/ {   9, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2457*/ {  10, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2462*/ {  11, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-                                                                        \
-/*2412*/ {   1, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2417*/ {   2, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2422*/ {   3, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2427*/ {   4, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2432*/ {   5, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2437*/ {   6, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2442*/ {   7, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2447*/ {   8, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2452*/ {   9, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2457*/ {  10, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2462*/ {  11, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2467*/ {  12, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2472*/ {  13, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM },                   \
-/*2484*/ {  14, DMN_MKKA, CHANNEL_CCK },                                \
-                                                                        \
-/*2412*/ {   1, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2417*/ {   2, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2422*/ {   3, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2427*/ {   4, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2432*/ {   5, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2437*/ {   6, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO },    \
-/*2442*/ {   7, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2447*/ {   8, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2452*/ {   9, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2457*/ {  10, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2462*/ {  11, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2467*/ {  12, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-/*2472*/ {  13, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM },                  \
-}
-
-#define IEEE80211_CHANNELS_5GHZ {                       \
-/*5745*/ { 149, DMN_APL1, CHANNEL_OFDM },               \
-/*5765*/ { 153, DMN_APL1, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_APL1, CHANNEL_OFDM },               \
-/*5805*/ { 161, DMN_APL1, CHANNEL_OFDM },               \
-/*5825*/ { 165, DMN_APL1, CHANNEL_OFDM },               \
-                                                        \
-/*5745*/ { 149, DMN_APL2, CHANNEL_OFDM },               \
-/*5765*/ { 153, DMN_APL2, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_APL2, CHANNEL_OFDM },               \
-/*5805*/ { 161, DMN_APL2, CHANNEL_OFDM },               \
-                                                        \
-/*5280*/ {  56, DMN_APL3, CHANNEL_OFDM },               \
-/*5300*/ {  60, DMN_APL3, CHANNEL_OFDM },               \
-/*5320*/ {  64, DMN_APL3, CHANNEL_OFDM },               \
-/*5745*/ { 149, DMN_APL3, CHANNEL_OFDM },               \
-/*5765*/ { 153, DMN_APL3, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_APL3, CHANNEL_OFDM },               \
-/*5805*/ { 161, DMN_APL3, CHANNEL_OFDM },               \
-                                                        \
-/*5180*/ {  36, DMN_APL4, CHANNEL_OFDM },               \
-/*5200*/ {  40, DMN_APL4, CHANNEL_OFDM },               \
-/*5220*/ {  44, DMN_APL4, CHANNEL_OFDM },               \
-/*5240*/ {  48, DMN_APL4, CHANNEL_OFDM },               \
-/*5745*/ { 149, DMN_APL4, CHANNEL_OFDM },               \
-/*5765*/ { 153, DMN_APL4, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_APL4, CHANNEL_OFDM },               \
-/*5805*/ { 161, DMN_APL4, CHANNEL_OFDM },               \
-/*5825*/ { 165, DMN_APL4, CHANNEL_OFDM },               \
-                                                        \
-/*5745*/ { 149, DMN_APL5, CHANNEL_OFDM },               \
-/*5765*/ { 153, DMN_APL5, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_APL5, CHANNEL_OFDM },               \
-/*5805*/ { 161, DMN_APL5, CHANNEL_OFDM },               \
-/*5825*/ { 165, DMN_APL5, CHANNEL_OFDM },               \
-                                                        \
-/*5180*/ {  36, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5200*/ {  40, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5220*/ {  44, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5240*/ {  48, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5260*/ {  52, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5280*/ {  56, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5300*/ {  60, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5320*/ {  64, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5500*/ { 100, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5520*/ { 104, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5540*/ { 108, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5560*/ { 112, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5580*/ { 116, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5600*/ { 120, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5620*/ { 124, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5640*/ { 128, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5660*/ { 132, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5680*/ { 136, DMN_ETSI1, CHANNEL_OFDM },              \
-/*5700*/ { 140, DMN_ETSI1, CHANNEL_OFDM },              \
-                                                        \
-/*5180*/ {  36, DMN_ETSI2, CHANNEL_OFDM },              \
-/*5200*/ {  40, DMN_ETSI2, CHANNEL_OFDM },              \
-/*5220*/ {  44, DMN_ETSI2, CHANNEL_OFDM },              \
-/*5240*/ {  48, DMN_ETSI2, CHANNEL_OFDM },              \
-                                                        \
-/*5180*/ {  36, DMN_ETSI3, CHANNEL_OFDM },              \
-/*5200*/ {  40, DMN_ETSI3, CHANNEL_OFDM },              \
-/*5220*/ {  44, DMN_ETSI3, CHANNEL_OFDM },              \
-/*5240*/ {  48, DMN_ETSI3, CHANNEL_OFDM },              \
-/*5260*/ {  52, DMN_ETSI3, CHANNEL_OFDM },              \
-/*5280*/ {  56, DMN_ETSI3, CHANNEL_OFDM },              \
-/*5300*/ {  60, DMN_ETSI3, CHANNEL_OFDM },              \
-/*5320*/ {  64, DMN_ETSI3, CHANNEL_OFDM },              \
-                                                        \
-/*5180*/ {  36, DMN_ETSI4, CHANNEL_OFDM },              \
-/*5200*/ {  40, DMN_ETSI4, CHANNEL_OFDM },              \
-/*5220*/ {  44, DMN_ETSI4, CHANNEL_OFDM },              \
-/*5240*/ {  48, DMN_ETSI4, CHANNEL_OFDM },              \
-/*5260*/ {  52, DMN_ETSI4, CHANNEL_OFDM },              \
-/*5280*/ {  56, DMN_ETSI4, CHANNEL_OFDM },              \
-/*5300*/ {  60, DMN_ETSI4, CHANNEL_OFDM },              \
-/*5320*/ {  64, DMN_ETSI4, CHANNEL_OFDM },              \
-                                                        \
-/*5180*/ {  36, DMN_ETSI5, CHANNEL_OFDM },              \
-/*5200*/ {  40, DMN_ETSI5, CHANNEL_OFDM },              \
-/*5220*/ {  44, DMN_ETSI5, CHANNEL_OFDM },              \
-/*5240*/ {  48, DMN_ETSI5, CHANNEL_OFDM },              \
-                                                        \
-/*5180*/ {  36, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5200*/ {  40, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5220*/ {  44, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5240*/ {  48, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5260*/ {  52, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5280*/ {  56, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5500*/ { 100, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5520*/ { 104, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5540*/ { 108, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5560*/ { 112, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5580*/ { 116, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5600*/ { 120, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5620*/ { 124, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5640*/ { 128, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5660*/ { 132, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5680*/ { 136, DMN_ETSI6, CHANNEL_OFDM },              \
-/*5700*/ { 140, DMN_ETSI6, CHANNEL_OFDM },              \
-                                                        \
-/*5180*/ {  36, DMN_FCC1, CHANNEL_OFDM },               \
-/*5200*/ {  40, DMN_FCC1, CHANNEL_OFDM },               \
-/*5210*/ {  42, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5220*/ {  44, DMN_FCC1, CHANNEL_OFDM },               \
-/*5240*/ {  48, DMN_FCC1, CHANNEL_OFDM },               \
-/*5250*/ {  50, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5260*/ {  52, DMN_FCC1, CHANNEL_OFDM },               \
-/*5280*/ {  56, DMN_FCC1, CHANNEL_OFDM },               \
-/*5290*/ {  58, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5300*/ {  60, DMN_FCC1, CHANNEL_OFDM },               \
-/*5320*/ {  64, DMN_FCC1, CHANNEL_OFDM },               \
-/*5745*/ { 149, DMN_FCC1, CHANNEL_OFDM },               \
-/*5760*/ { 152, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5765*/ { 153, DMN_FCC1, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_FCC1, CHANNEL_OFDM },               \
-/*5800*/ { 160, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5805*/ { 161, DMN_FCC1, CHANNEL_OFDM },               \
-/*5825*/ { 165, DMN_FCC1, CHANNEL_OFDM },               \
-                                                        \
-/*5180*/ {  36, DMN_FCC2, CHANNEL_OFDM },               \
-/*5200*/ {  40, DMN_FCC2, CHANNEL_OFDM },               \
-/*5220*/ {  44, DMN_FCC2, CHANNEL_OFDM },               \
-/*5240*/ {  48, DMN_FCC2, CHANNEL_OFDM },               \
-/*5260*/ {  52, DMN_FCC2, CHANNEL_OFDM },               \
-/*5280*/ {  56, DMN_FCC2, CHANNEL_OFDM },               \
-/*5300*/ {  60, DMN_FCC2, CHANNEL_OFDM },               \
-/*5320*/ {  64, DMN_FCC2, CHANNEL_OFDM },               \
-/*5745*/ { 149, DMN_FCC2, CHANNEL_OFDM },               \
-/*5765*/ { 153, DMN_FCC2, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_FCC2, CHANNEL_OFDM },               \
-/*5805*/ { 161, DMN_FCC2, CHANNEL_OFDM },               \
-/*5825*/ { 165, DMN_FCC2, CHANNEL_OFDM },               \
-                                                        \
-/*5180*/ {  36, DMN_FCC3, CHANNEL_OFDM },               \
-/*5200*/ {  40, DMN_FCC3, CHANNEL_OFDM },               \
-/*5210*/ {  42, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5220*/ {  44, DMN_FCC3, CHANNEL_OFDM },               \
-/*5240*/ {  48, DMN_FCC3, CHANNEL_OFDM },               \
-/*5250*/ {  50, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5260*/ {  52, DMN_FCC3, CHANNEL_OFDM },               \
-/*5280*/ {  56, DMN_FCC3, CHANNEL_OFDM },               \
-/*5290*/ {  58, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5300*/ {  60, DMN_FCC3, CHANNEL_OFDM },               \
-/*5320*/ {  64, DMN_FCC3, CHANNEL_OFDM },               \
-/*5500*/ { 100, DMN_FCC3, CHANNEL_OFDM },               \
-/*5520*/ { 104, DMN_FCC3, CHANNEL_OFDM },               \
-/*5540*/ { 108, DMN_FCC3, CHANNEL_OFDM },               \
-/*5560*/ { 112, DMN_FCC3, CHANNEL_OFDM },               \
-/*5580*/ { 116, DMN_FCC3, CHANNEL_OFDM },               \
-/*5600*/ { 120, DMN_FCC3, CHANNEL_OFDM },               \
-/*5620*/ { 124, DMN_FCC3, CHANNEL_OFDM },               \
-/*5640*/ { 128, DMN_FCC3, CHANNEL_OFDM },               \
-/*5660*/ { 132, DMN_FCC3, CHANNEL_OFDM },               \
-/*5680*/ { 136, DMN_FCC3, CHANNEL_OFDM },               \
-/*5700*/ { 140, DMN_FCC3, CHANNEL_OFDM },               \
-/*5745*/ { 149, DMN_FCC3, CHANNEL_OFDM },               \
-/*5760*/ { 152, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5765*/ { 153, DMN_FCC3, CHANNEL_OFDM },               \
-/*5785*/ { 157, DMN_FCC3, CHANNEL_OFDM },               \
-/*5800*/ { 160, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \
-/*5805*/ { 161, DMN_FCC3, CHANNEL_OFDM },               \
-/*5825*/ { 165, DMN_FCC3, CHANNEL_OFDM },               \
-                                                        \
-/*5170*/ {  34, DMN_MKK1, CHANNEL_OFDM },               \
-/*5190*/ {  38, DMN_MKK1, CHANNEL_OFDM },               \
-/*5210*/ {  42, DMN_MKK1, CHANNEL_OFDM },               \
-/*5230*/ {  46, DMN_MKK1, CHANNEL_OFDM },               \
-                                                        \
-/*5040*/ {   8, DMN_MKK2, CHANNEL_OFDM },               \
-/*5060*/ {  12, DMN_MKK2, CHANNEL_OFDM },               \
-/*5080*/ {  16, DMN_MKK2, CHANNEL_OFDM },               \
-/*5170*/ {  34, DMN_MKK2, CHANNEL_OFDM },               \
-/*5190*/ {  38, DMN_MKK2, CHANNEL_OFDM },               \
-/*5210*/ {  42, DMN_MKK2, CHANNEL_OFDM },               \
-/*5230*/ {  46, DMN_MKK2, CHANNEL_OFDM },               \
-                                                        \
-/*5180*/ {  36, DMN_WORLD, CHANNEL_OFDM },              \
-/*5200*/ {  40, DMN_WORLD, CHANNEL_OFDM },              \
-/*5220*/ {  44, DMN_WORLD, CHANNEL_OFDM },              \
-/*5240*/ {  48, DMN_WORLD, CHANNEL_OFDM },              \
-}
-
-enum ath5k_regdom ath5k_regdom2flag(enum ath5k_regdom, u16);
-u16 ath5k_regdom_from_ieee(enum ath5k_regdom ieee);
-enum ath5k_regdom ath5k_regdom_to_ieee(u16 regdomain);
-
-#endif
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 63ec7a70ee76..ef2da4023d68 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -66,6 +66,7 @@
 #include <linux/device.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/jiffies.h>
 #include <net/ieee80211.h>
 #include "atmel.h"
 
@@ -516,7 +517,7 @@ struct atmel_private {
                 SITE_SURVEY_IN_PROGRESS,
                 SITE_SURVEY_COMPLETED
         } site_survey_state;
-        time_t last_survey;
+        unsigned long last_survey;
 
         int station_was_associated, station_is_associated;
         int fast_scan;
@@ -2283,7 +2284,7 @@ static int atmel_set_scan(struct net_device *dev,
                 return -EAGAIN;
 
         /* Timeout old surveys. */
-        if ((jiffies - priv->last_survey) > (20 * HZ))
+        if (time_after(jiffies, priv->last_survey + 20 * HZ))
                 priv->site_survey_state = SITE_SURVEY_IDLE;
         priv->last_survey = jiffies;
 
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 8bc4bc4c330e..f51b2d9b085b 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -62,6 +62,14 @@ config B43_PCMCIA
 
           If unsure, say N.
 
+# Data transfers to the device via PIO
+# This is only needed on PCMCIA devices. All others can do DMA properly.
+config B43_PIO
+        bool
+        depends on B43 && (B43_PCMCIA || B43_FORCE_PIO)
+        select SSB_BLOCKIO
+        default y
+
 config B43_NPHY
         bool "Pre IEEE 802.11n support (BROKEN)"
         depends on B43 && EXPERIMENTAL && BROKEN
@@ -94,3 +102,13 @@ config B43_DEBUG
 
           Say Y, if you want to find out why the driver does not
           work for you.
+
+config B43_FORCE_PIO
+        bool "Force usage of PIO instead of DMA"
+        depends on B43 && B43_DEBUG
+        ---help---
+          This will disable DMA and always enable PIO instead.
+
+          Say N!
+          This is only for debugging the PIO engine code. You do
+          _NOT_ want to enable this.
diff --git a/drivers/net/wireless/b43/Makefile b/drivers/net/wireless/b43/Makefile
index ac1329dba045..8c52b0b9862a 100644
--- a/drivers/net/wireless/b43/Makefile
+++ b/drivers/net/wireless/b43/Makefile
@@ -1,13 +1,14 @@
 b43-y                           += main.o
 b43-y                           += tables.o
-b43-y                           += tables_nphy.o
+b43-$(CONFIG_B43_NPHY)          += tables_nphy.o
 b43-y                           += phy.o
-b43-y                           += nphy.o
+b43-$(CONFIG_B43_NPHY)          += nphy.o
 b43-y                           += sysfs.o
 b43-y                           += xmit.o
 b43-y                           += lo.o
 b43-y                           += wa.o
 b43-y                           += dma.o
+b43-$(CONFIG_B43_PIO)           += pio.o
 b43-$(CONFIG_B43_RFKILL)        += rfkill.o
 b43-$(CONFIG_B43_LEDS)          += leds.o
 b43-$(CONFIG_B43_PCMCIA)        += pcmcia.o
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index f13346ba9dd2..eff2a158a411 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -75,6 +75,23 @@
 #define B43_MMIO_DMA64_BASE4            0x300
 #define B43_MMIO_DMA64_BASE5            0x340
 
+/* PIO on core rev < 11 */
+#define B43_MMIO_PIO_BASE0              0x300
+#define B43_MMIO_PIO_BASE1              0x310
+#define B43_MMIO_PIO_BASE2              0x320
+#define B43_MMIO_PIO_BASE3              0x330
+#define B43_MMIO_PIO_BASE4              0x340
+#define B43_MMIO_PIO_BASE5              0x350
+#define B43_MMIO_PIO_BASE6              0x360
+#define B43_MMIO_PIO_BASE7              0x370
+/* PIO on core rev >= 11 */
+#define B43_MMIO_PIO11_BASE0            0x200
+#define B43_MMIO_PIO11_BASE1            0x240
+#define B43_MMIO_PIO11_BASE2            0x280
+#define B43_MMIO_PIO11_BASE3            0x2C0
+#define B43_MMIO_PIO11_BASE4            0x300
+#define B43_MMIO_PIO11_BASE5            0x340
+
 #define B43_MMIO_PHY_VER                0x3E0
 #define B43_MMIO_PHY_RADIO              0x3E2
 #define B43_MMIO_PHY0                   0x3E6
@@ -94,11 +111,14 @@
 #define B43_MMIO_GPIO_MASK              0x49E
 #define B43_MMIO_TSF_CFP_START_LOW      0x604
 #define B43_MMIO_TSF_CFP_START_HIGH     0x606
+#define B43_MMIO_TSF_CFP_PRETBTT        0x612
 #define B43_MMIO_TSF_0                  0x632   /* core rev < 3 only */
 #define B43_MMIO_TSF_1                  0x634   /* core rev < 3 only */
 #define B43_MMIO_TSF_2                  0x636   /* core rev < 3 only */
 #define B43_MMIO_TSF_3                  0x638   /* core rev < 3 only */
 #define B43_MMIO_RNG                    0x65A
+#define B43_MMIO_IFSCTL                 0x688 /* Interframe space control */
+#define  B43_MMIO_IFSCTL_USE_EDCF       0x0004
 #define B43_MMIO_POWERUP_DELAY          0x6A8
 
 /* SPROM boardflags_lo values */
@@ -144,7 +164,8 @@ enum {
 #define B43_SHM_SH_PHYTYPE              0x0052  /* PHY type */
 #define B43_SHM_SH_ANTSWAP              0x005C  /* Antenna swap threshold */
 #define B43_SHM_SH_HOSTFLO              0x005E  /* Hostflags for ucode options (low) */
-#define B43_SHM_SH_HOSTFHI              0x0060  /* Hostflags for ucode options (high) */
+#define B43_SHM_SH_HOSTFMI              0x0060  /* Hostflags for ucode options (middle) */
+#define B43_SHM_SH_HOSTFHI              0x0062  /* Hostflags for ucode options (high) */
 #define B43_SHM_SH_RFATT                0x0064  /* Current radio attenuation value */
 #define B43_SHM_SH_RADAR                0x0066  /* Radar register */
 #define B43_SHM_SH_PHYTXNOI             0x006E  /* PHY noise directly after TX (lower 8bit only) */
@@ -232,31 +253,41 @@ enum {
 #define B43_MMIO_RADIO_HWENABLED_LO_MASK (1 << 4)
 
 /* HostFlags. See b43_hf_read/write() */
-#define B43_HF_ANTDIVHELP               0x00000001      /* ucode antenna div helper */
-#define B43_HF_SYMW                     0x00000002      /* G-PHY SYM workaround */
-#define B43_HF_RXPULLW                  0x00000004      /* RX pullup workaround */
-#define B43_HF_CCKBOOST                 0x00000008      /* 4dB CCK power boost (exclusive with OFDM boost) */
-#define B43_HF_BTCOEX                   0x00000010      /* Bluetooth coexistance */
-#define B43_HF_GDCW                     0x00000020      /* G-PHY DV canceller filter bw workaround */
-#define B43_HF_OFDMPABOOST              0x00000040      /* Enable PA gain boost for OFDM */
-#define B43_HF_ACPR                     0x00000080      /* Disable for Japan, channel 14 */
-#define B43_HF_EDCF                     0x00000100      /* on if WME and MAC suspended */
-#define B43_HF_TSSIRPSMW                0x00000200      /* TSSI reset PSM ucode workaround */
-#define B43_HF_DSCRQ                    0x00000400      /* Disable slow clock request in ucode */
-#define B43_HF_ACIW                     0x00000800      /* ACI workaround: shift bits by 2 on PHY CRS */
-#define B43_HF_2060W                    0x00001000      /* 2060 radio workaround */
-#define B43_HF_RADARW                   0x00002000      /* Radar workaround */
-#define B43_HF_USEDEFKEYS               0x00004000      /* Enable use of default keys */
-#define B43_HF_BT4PRIOCOEX              0x00010000      /* Bluetooth 2-priority coexistance */
-#define B43_HF_FWKUP                    0x00020000      /* Fast wake-up ucode */
-#define B43_HF_VCORECALC                0x00040000      /* Force VCO recalculation when powering up synthpu */
-#define B43_HF_PCISCW                   0x00080000      /* PCI slow clock workaround */
-#define B43_HF_4318TSSI                 0x00200000      /* 4318 TSSI */
-#define B43_HF_FBCMCFIFO                0x00400000      /* Flush bcast/mcast FIFO immediately */
-#define B43_HF_HWPCTL                   0x00800000      /* Enable hardwarre power control */
-#define B43_HF_BTCOEXALT                0x01000000      /* Bluetooth coexistance in alternate pins */
-#define B43_HF_TXBTCHECK                0x02000000      /* Bluetooth check during transmission */
-#define B43_HF_SKCFPUP                  0x04000000      /* Skip CFP update */
+#define B43_HF_ANTDIVHELP       0x000000000001ULL /* ucode antenna div helper */
+#define B43_HF_SYMW             0x000000000002ULL /* G-PHY SYM workaround */
+#define B43_HF_RXPULLW          0x000000000004ULL /* RX pullup workaround */
+#define B43_HF_CCKBOOST         0x000000000008ULL /* 4dB CCK power boost (exclusive with OFDM boost) */
+#define B43_HF_BTCOEX           0x000000000010ULL /* Bluetooth coexistance */
+#define B43_HF_GDCW             0x000000000020ULL /* G-PHY DC canceller filter bw workaround */
+#define B43_HF_OFDMPABOOST      0x000000000040ULL /* Enable PA gain boost for OFDM */
+#define B43_HF_ACPR             0x000000000080ULL /* Disable for Japan, channel 14 */
+#define B43_HF_EDCF             0x000000000100ULL /* on if WME and MAC suspended */
+#define B43_HF_TSSIRPSMW        0x000000000200ULL /* TSSI reset PSM ucode workaround */
+#define B43_HF_20IN40IQW        0x000000000200ULL /* 20 in 40 MHz I/Q workaround (rev >= 13 only) */
+#define B43_HF_DSCRQ            0x000000000400ULL /* Disable slow clock request in ucode */
+#define B43_HF_ACIW             0x000000000800ULL /* ACI workaround: shift bits by 2 on PHY CRS */
+#define B43_HF_2060W            0x000000001000ULL /* 2060 radio workaround */
+#define B43_HF_RADARW           0x000000002000ULL /* Radar workaround */
+#define B43_HF_USEDEFKEYS       0x000000004000ULL /* Enable use of default keys */
+#define B43_HF_AFTERBURNER      0x000000008000ULL /* Afterburner enabled */
+#define B43_HF_BT4PRIOCOEX      0x000000010000ULL /* Bluetooth 4-priority coexistance */
+#define B43_HF_FWKUP            0x000000020000ULL /* Fast wake-up ucode */
+#define B43_HF_VCORECALC        0x000000040000ULL /* Force VCO recalculation when powering up synthpu */
+#define B43_HF_PCISCW           0x000000080000ULL /* PCI slow clock workaround */
+#define B43_HF_4318TSSI         0x000000200000ULL /* 4318 TSSI */
+#define B43_HF_FBCMCFIFO        0x000000400000ULL /* Flush bcast/mcast FIFO immediately */
+#define B43_HF_HWPCTL           0x000000800000ULL /* Enable hardwarre power control */
+#define B43_HF_BTCOEXALT        0x000001000000ULL /* Bluetooth coexistance in alternate pins */
+#define B43_HF_TXBTCHECK        0x000002000000ULL /* Bluetooth check during transmission */
+#define B43_HF_SKCFPUP          0x000004000000ULL /* Skip CFP update */
+#define B43_HF_N40W             0x000008000000ULL /* N PHY 40 MHz workaround (rev >= 13 only) */
+#define B43_HF_ANTSEL           0x000020000000ULL /* Antenna selection (for testing antenna div.) */
+#define B43_HF_BT3COEXT         0x000020000000ULL /* Bluetooth 3-wire coexistence (rev >= 13 only) */
+#define B43_HF_BTCANT           0x000040000000ULL /* Bluetooth coexistence (antenna mode) (rev >= 13 only) */
+#define B43_HF_ANTSELEN         0x000100000000ULL /* Antenna selection enabled (rev >= 13 only) */
+#define B43_HF_ANTSELMODE       0x000200000000ULL /* Antenna selection mode (rev >= 13 only) */
+#define B43_HF_MLADVW           0x001000000000ULL /* N PHY ML ADV workaround (rev >= 13 only) */
+#define B43_HF_PR45960W         0x080000000000ULL /* PR 45960 workaround (rev >= 13 only) */
 
 /* MacFilter offsets. */
 #define B43_MACFILTER_SELF              0x0000
@@ -380,7 +411,6 @@ enum {
 
 #define B43_IRQ_ALL                     0xFFFFFFFF
 #define B43_IRQ_MASKTEMPLATE            (B43_IRQ_MAC_SUSPENDED | \
-                                         B43_IRQ_BEACON | \
                                          B43_IRQ_TBTT_INDI | \
                                          B43_IRQ_ATIM_END | \
                                          B43_IRQ_PMQ | \
@@ -429,7 +459,6 @@ enum {
 };
 
 struct b43_dmaring;
-struct b43_pioqueue;
 
 /* The firmware file header */
 #define B43_FW_TYPE_UCODE       'u'
@@ -458,20 +487,13 @@ struct b43_iv {
 } __attribute__((__packed__));
 
 
-#define B43_PHYMODE(phytype)            (1 << (phytype))
-#define B43_PHYMODE_A                   B43_PHYMODE(B43_PHYTYPE_A)
-#define B43_PHYMODE_B                   B43_PHYMODE(B43_PHYTYPE_B)
-#define B43_PHYMODE_G                   B43_PHYMODE(B43_PHYTYPE_G)
-
 struct b43_phy {
-        /* Possible PHYMODEs on this PHY */
-        u8 possible_phymodes;
+        /* Band support flags. */
+        bool supports_2ghz;
+        bool supports_5ghz;
+
         /* GMODE bit enabled? */
         bool gmode;
-        /* Possible ieee80211 subsystem hwmodes for this PHY.
-         * Which mode is selected, depends on thr GMODE enabled bit */
-#define B43_MAX_PHYHWMODES      2
-        struct ieee80211_hw_mode hwmodes[B43_MAX_PHYHWMODES];
 
         /* Analog Type */
         u8 analog;
@@ -583,15 +605,27 @@ struct b43_phy {
 
 /* Data structures for DMA transmission, per 80211 core. */
 struct b43_dma {
-        struct b43_dmaring *tx_ring0;
-        struct b43_dmaring *tx_ring1;
-        struct b43_dmaring *tx_ring2;
-        struct b43_dmaring *tx_ring3;
-        struct b43_dmaring *tx_ring4;
-        struct b43_dmaring *tx_ring5;
-
-        struct b43_dmaring *rx_ring0;
-        struct b43_dmaring *rx_ring3;   /* only available on core.rev < 5 */
+        struct b43_dmaring *tx_ring_AC_BK; /* Background */
+        struct b43_dmaring *tx_ring_AC_BE; /* Best Effort */
+        struct b43_dmaring *tx_ring_AC_VI; /* Video */
+        struct b43_dmaring *tx_ring_AC_VO; /* Voice */
+        struct b43_dmaring *tx_ring_mcast; /* Multicast */
+
+        struct b43_dmaring *rx_ring;
+};
+
+struct b43_pio_txqueue;
+struct b43_pio_rxqueue;
+
+/* Data structures for PIO transmission, per 80211 core. */
+struct b43_pio {
+        struct b43_pio_txqueue *tx_queue_AC_BK; /* Background */
+        struct b43_pio_txqueue *tx_queue_AC_BE; /* Best Effort */
+        struct b43_pio_txqueue *tx_queue_AC_VI; /* Video */
+        struct b43_pio_txqueue *tx_queue_AC_VO; /* Voice */
+        struct b43_pio_txqueue *tx_queue_mcast; /* Multicast */
+
+        struct b43_pio_rxqueue *rx_queue;
 };
 
 /* Context information for a noise calculation (Link Quality). */
@@ -617,6 +651,35 @@ struct b43_key {
         u8 algorithm;
 };
 
+/* SHM offsets to the QOS data structures for the 4 different queues. */
+#define B43_QOS_PARAMS(queue)   (B43_SHM_SH_EDCFQ + \
+                                 (B43_NR_QOSPARAMS * sizeof(u16) * (queue)))
+#define B43_QOS_BACKGROUND      B43_QOS_PARAMS(0)
+#define B43_QOS_BESTEFFORT      B43_QOS_PARAMS(1)
+#define B43_QOS_VIDEO           B43_QOS_PARAMS(2)
+#define B43_QOS_VOICE           B43_QOS_PARAMS(3)
+
+/* QOS parameter hardware data structure offsets. */
+#define B43_NR_QOSPARAMS        22
+enum {
+        B43_QOSPARAM_TXOP = 0,
+        B43_QOSPARAM_CWMIN,
+        B43_QOSPARAM_CWMAX,
+        B43_QOSPARAM_CWCUR,
+        B43_QOSPARAM_AIFS,
+        B43_QOSPARAM_BSLOTS,
+        B43_QOSPARAM_REGGAP,
+        B43_QOSPARAM_STATUS,
+};
+
+/* QOS parameters for a queue. */
+struct b43_qos_params {
+        /* The QOS parameters */
+        struct ieee80211_tx_queue_params p;
+        /* Does this need to get uploaded to hardware? */
+        bool need_hw_update;
+};
+
 struct b43_wldev;
 
 /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */
@@ -667,8 +730,16 @@ struct b43_wl {
         /* The beacon we are currently using (AP or IBSS mode).
          * This beacon stuff is protected by the irq_lock. */
         struct sk_buff *current_beacon;
+        struct ieee80211_tx_control beacon_txctl;
         bool beacon0_uploaded;
         bool beacon1_uploaded;
+        struct work_struct beacon_update_trigger;
+
+        /* The current QOS parameters for the 4 queues.
+         * This is protected by the irq_lock. */
+        struct b43_qos_params qos_params[4];
+        /* Workqueue for updating QOS parameters in hardware. */
+        struct work_struct qos_update_work;
 };
 
 /* In-memory representation of a cached microcode file. */
@@ -727,7 +798,6 @@ struct b43_wldev {
 
         bool bad_frames_preempt;        /* Use "Bad Frames Preemption" (default off) */
         bool dfq_valid;         /* Directed frame queue valid (IBSS PS mode, ATIM) */
-        bool short_preamble;    /* TRUE, if short preamble is enabled. */
         bool short_slot;        /* TRUE, if short slot timing is enabled. */
         bool radio_hw_enable;   /* saved state of radio hardware enabled state */
         bool suspend_in_progress;       /* TRUE, if we are in a suspend/resume cycle */
@@ -735,8 +805,15 @@ struct b43_wldev {
         /* PHY/Radio device. */
         struct b43_phy phy;
 
-        /* DMA engines. */
-        struct b43_dma dma;
+        union {
+                /* DMA engines. */
+                struct b43_dma dma;
+                /* PIO engines. */
+                struct b43_pio pio;
+        };
+        /* Use b43_using_pio_transfers() to check whether we are using
+         * DMA or PIO data transfers. */
+        bool __using_pio_transfers;
 
         /* Various statistics about the physical device. */
         struct b43_stats stats;
@@ -820,6 +897,22 @@ static inline void b43_write32(struct b43_wldev *dev, u16 offset, u32 value)
         ssb_write32(dev->dev, offset, value);
 }
 
+static inline bool b43_using_pio_transfers(struct b43_wldev *dev)
+{
+#ifdef CONFIG_B43_PIO
+        return dev->__using_pio_transfers;
+#else
+        return 0;
+#endif
+}
+
+#ifdef CONFIG_B43_FORCE_PIO
+# define B43_FORCE_PIO  1
+#else
+# define B43_FORCE_PIO  0
+#endif
+
+
 /* Message printing */
 void b43info(struct b43_wl *wl, const char *fmt, ...)
     __attribute__ ((format(printf, 2, 3)));
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 48e912487b16..21c886a9a1d9 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
+#include <asm/div64.h>
 
 
 /* 32bit DMA ops. */
@@ -291,52 +292,6 @@ static inline int request_slot(struct b43_dmaring *ring)
         return slot;
 }
 
-/* Mac80211-queue to b43-ring mapping */
-static struct b43_dmaring *priority_to_txring(struct b43_wldev *dev,
-                                              int queue_priority)
-{
-        struct b43_dmaring *ring;
-
-/*FIXME: For now we always run on TX-ring-1 */
-        return dev->dma.tx_ring1;
-
-        /* 0 = highest priority */
-        switch (queue_priority) {
-        default:
-                B43_WARN_ON(1);
-                /* fallthrough */
-        case 0:
-                ring = dev->dma.tx_ring3;
-                break;
-        case 1:
-                ring = dev->dma.tx_ring2;
-                break;
-        case 2:
-                ring = dev->dma.tx_ring1;
-                break;
-        case 3:
-                ring = dev->dma.tx_ring0;
-                break;
-        }
-
-        return ring;
-}
-
-/* b43-ring to mac80211-queue mapping */
-static inline int txring_to_priority(struct b43_dmaring *ring)
-{
-        static const u8 idx_to_prio[] = { 3, 2, 1, 0, };
-        unsigned int index;
-
-/*FIXME: have only one queue, for now */
-        return 0;
-
-        index = ring->index;
-        if (B43_WARN_ON(index >= ARRAY_SIZE(idx_to_prio)))
-                index = 0;
-        return idx_to_prio[index];
-}
-
 static u16 b43_dmacontroller_base(enum b43_dmatype type, int controller_idx)
 {
         static const u16 map64[] = {
@@ -596,7 +551,6 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
                                struct b43_dmadesc_meta *meta, gfp_t gfp_flags)
 {
         struct b43_rxhdr_fw4 *rxhdr;
-        struct b43_hwtxstatus *txstat;
         dma_addr_t dmaaddr;
         struct sk_buff *skb;
 
@@ -632,8 +586,6 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
 
         rxhdr = (struct b43_rxhdr_fw4 *)(skb->data);
         rxhdr->frame_len = 0;
-        txstat = (struct b43_hwtxstatus *)(skb->data);
-        txstat->cookie = 0;
 
         return 0;
 }
@@ -822,6 +774,18 @@ static u64 supported_dma_mask(struct b43_wldev *dev)
         return DMA_30BIT_MASK;
 }
 
+static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask)
+{
+        if (dmamask == DMA_30BIT_MASK)
+                return B43_DMA_30BIT;
+        if (dmamask == DMA_32BIT_MASK)
+                return B43_DMA_32BIT;
+        if (dmamask == DMA_64BIT_MASK)
+                return B43_DMA_64BIT;
+        B43_WARN_ON(1);
+        return B43_DMA_30BIT;
+}
+
 /* Main initialization function. */
 static
 struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
@@ -937,16 +901,52 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
         goto out;
 }
 
+#define divide(a, b)    ({      \
+        typeof(a) __a = a;      \
+        do_div(__a, b);         \
+        __a;                    \
+  })
+
+#define modulo(a, b)    ({      \
+        typeof(a) __a = a;      \
+        do_div(__a, b);         \
+  })
+
 /* Main cleanup function. */
-static void b43_destroy_dmaring(struct b43_dmaring *ring)
+static void b43_destroy_dmaring(struct b43_dmaring *ring,
+                                const char *ringname)
 {
         if (!ring)
                 return;
 
-        b43dbg(ring->dev->wl, "DMA-%u 0x%04X (%s) max used slots: %d/%d\n",
-               (unsigned int)(ring->type),
-               ring->mmio_base,
-               (ring->tx) ? "TX" : "RX", ring->max_used_slots, ring->nr_slots);
+#ifdef CONFIG_B43_DEBUG
+        {
+                /* Print some statistics. */
+                u64 failed_packets = ring->nr_failed_tx_packets;
+                u64 succeed_packets = ring->nr_succeed_tx_packets;
+                u64 nr_packets = failed_packets + succeed_packets;
+                u64 permille_failed = 0, average_tries = 0;
+
+                if (nr_packets)
+                        permille_failed = divide(failed_packets * 1000, nr_packets);
+                if (nr_packets)
+                        average_tries = divide(ring->nr_total_packet_tries * 100, nr_packets);
+
+                b43dbg(ring->dev->wl, "DMA-%u %s: "
+                       "Used slots %d/%d, Failed frames %llu/%llu = %llu.%01llu%%, "
+                       "Average tries %llu.%02llu\n",
+                       (unsigned int)(ring->type), ringname,
+                       ring->max_used_slots,
+                       ring->nr_slots,
+                       (unsigned long long)failed_packets,
+                       (unsigned long long)nr_packets,
+                       (unsigned long long)divide(permille_failed, 10),
+                       (unsigned long long)modulo(permille_failed, 10),
+                       (unsigned long long)divide(average_tries, 100),
+                       (unsigned long long)modulo(average_tries, 100));
+        }
+#endif /* DEBUG */
+
         /* Device IRQs are disabled prior entering this function,
          * so no need to take care of concurrency with rx handler stuff.
          */
@@ -959,51 +959,36 @@ static void b43_destroy_dmaring(struct b43_dmaring *ring)
         kfree(ring);
 }
 
+#define destroy_ring(dma, ring) do {                            \
+        b43_destroy_dmaring((dma)->ring, __stringify(ring));    \
+        (dma)->ring = NULL;                                     \
+    } while (0)
+
 void b43_dma_free(struct b43_wldev *dev)
 {
-        struct b43_dma *dma = &dev->dma;
+        struct b43_dma *dma;
 
-        b43_destroy_dmaring(dma->rx_ring3);
-        dma->rx_ring3 = NULL;
-        b43_destroy_dmaring(dma->rx_ring0);
-        dma->rx_ring0 = NULL;
-
-        b43_destroy_dmaring(dma->tx_ring5);
-        dma->tx_ring5 = NULL;
-        b43_destroy_dmaring(dma->tx_ring4);
-        dma->tx_ring4 = NULL;
-        b43_destroy_dmaring(dma->tx_ring3);
-        dma->tx_ring3 = NULL;
-        b43_destroy_dmaring(dma->tx_ring2);
-        dma->tx_ring2 = NULL;
-        b43_destroy_dmaring(dma->tx_ring1);
-        dma->tx_ring1 = NULL;
-        b43_destroy_dmaring(dma->tx_ring0);
-        dma->tx_ring0 = NULL;
+        if (b43_using_pio_transfers(dev))
+                return;
+        dma = &dev->dma;
+
+        destroy_ring(dma, rx_ring);
+        destroy_ring(dma, tx_ring_AC_BK);
+        destroy_ring(dma, tx_ring_AC_BE);
+        destroy_ring(dma, tx_ring_AC_VI);
+        destroy_ring(dma, tx_ring_AC_VO);
+        destroy_ring(dma, tx_ring_mcast);
 }
 
 int b43_dma_init(struct b43_wldev *dev)
 {
         struct b43_dma *dma = &dev->dma;
-        struct b43_dmaring *ring;
         int err;
         u64 dmamask;
         enum b43_dmatype type;
 
         dmamask = supported_dma_mask(dev);
-        switch (dmamask) {
-        default:
-                B43_WARN_ON(1);
-        case DMA_30BIT_MASK:
-                type = B43_DMA_30BIT;
-                break;
-        case DMA_32BIT_MASK:
-                type = B43_DMA_32BIT;
-                break;
-        case DMA_64BIT_MASK:
-                type = B43_DMA_64BIT;
-                break;
-        }
+        type = dma_mask_to_engine_type(dmamask);
         err = ssb_dma_set_mask(dev->dev, dmamask);
         if (err) {
                 b43err(dev->wl, "The machine/kernel does not support "
@@ -1015,83 +1000,57 @@ int b43_dma_init(struct b43_wldev *dev)
 
         err = -ENOMEM;
         /* setup TX DMA channels. */
-        ring = b43_setup_dmaring(dev, 0, 1, type);
-        if (!ring)
+        dma->tx_ring_AC_BK = b43_setup_dmaring(dev, 0, 1, type);
+        if (!dma->tx_ring_AC_BK)
                 goto out;
-        dma->tx_ring0 = ring;
 
-        ring = b43_setup_dmaring(dev, 1, 1, type);
-        if (!ring)
-                goto err_destroy_tx0;
-        dma->tx_ring1 = ring;
+        dma->tx_ring_AC_BE = b43_setup_dmaring(dev, 1, 1, type);
+        if (!dma->tx_ring_AC_BE)
+                goto err_destroy_bk;
 
-        ring = b43_setup_dmaring(dev, 2, 1, type);
-        if (!ring)
-                goto err_destroy_tx1;
-        dma->tx_ring2 = ring;
+        dma->tx_ring_AC_VI = b43_setup_dmaring(dev, 2, 1, type);
+        if (!dma->tx_ring_AC_VI)
+                goto err_destroy_be;
 
-        ring = b43_setup_dmaring(dev, 3, 1, type);
-        if (!ring)
-                goto err_destroy_tx2;
-        dma->tx_ring3 = ring;
+        dma->tx_ring_AC_VO = b43_setup_dmaring(dev, 3, 1, type);
+        if (!dma->tx_ring_AC_VO)
+                goto err_destroy_vi;
 
-        ring = b43_setup_dmaring(dev, 4, 1, type);
-        if (!ring)
-                goto err_destroy_tx3;
-        dma->tx_ring4 = ring;
+        dma->tx_ring_mcast = b43_setup_dmaring(dev, 4, 1, type);
+        if (!dma->tx_ring_mcast)
+                goto err_destroy_vo;
 
-        ring = b43_setup_dmaring(dev, 5, 1, type);
-        if (!ring)
-                goto err_destroy_tx4;
-        dma->tx_ring5 = ring;
+        /* setup RX DMA channel. */
+        dma->rx_ring = b43_setup_dmaring(dev, 0, 0, type);
+        if (!dma->rx_ring)
+                goto err_destroy_mcast;
 
-        /* setup RX DMA channels. */
-        ring = b43_setup_dmaring(dev, 0, 0, type);
-        if (!ring)
-                goto err_destroy_tx5;
-        dma->rx_ring0 = ring;
-
-        if (dev->dev->id.revision < 5) {
-                ring = b43_setup_dmaring(dev, 3, 0, type);
-                if (!ring)
-                        goto err_destroy_rx0;
-                dma->rx_ring3 = ring;
-        }
+        /* No support for the TX status DMA ring. */
+        B43_WARN_ON(dev->dev->id.revision < 5);
 
         b43dbg(dev->wl, "%u-bit DMA initialized\n",
                (unsigned int)type);
         err = 0;
-      out:
+out:
         return err;
 
-      err_destroy_rx0:
-        b43_destroy_dmaring(dma->rx_ring0);
-        dma->rx_ring0 = NULL;
-      err_destroy_tx5:
-        b43_destroy_dmaring(dma->tx_ring5);
-        dma->tx_ring5 = NULL;
-      err_destroy_tx4:
-        b43_destroy_dmaring(dma->tx_ring4);
-        dma->tx_ring4 = NULL;
-      err_destroy_tx3:
-        b43_destroy_dmaring(dma->tx_ring3);
-        dma->tx_ring3 = NULL;
-      err_destroy_tx2:
-        b43_destroy_dmaring(dma->tx_ring2);
-        dma->tx_ring2 = NULL;
-      err_destroy_tx1:
-        b43_destroy_dmaring(dma->tx_ring1);
-        dma->tx_ring1 = NULL;
-      err_destroy_tx0:
-        b43_destroy_dmaring(dma->tx_ring0);
-        dma->tx_ring0 = NULL;
-        goto out;
+err_destroy_mcast:
+        destroy_ring(dma, tx_ring_mcast);
+err_destroy_vo:
+        destroy_ring(dma, tx_ring_AC_VO);
+err_destroy_vi:
+        destroy_ring(dma, tx_ring_AC_VI);
+err_destroy_be:
+        destroy_ring(dma, tx_ring_AC_BE);
+err_destroy_bk:
+        destroy_ring(dma, tx_ring_AC_BK);
+        return err;
 }
 
 /* Generate a cookie for the TX header. */
 static u16 generate_cookie(struct b43_dmaring *ring, int slot)
 {
-        u16 cookie = 0x1000;
+        u16 cookie;
 
         /* Use the upper 4 bits of the cookie as
          * DMA controller ID and store the slot number
@@ -1101,30 +1060,9 @@ static u16 generate_cookie(struct b43_dmaring *ring, int slot)
          * It can also not be 0xFFFF because that is special
          * for multicast frames.
          */
-        switch (ring->index) {
-        case 0:
-                cookie = 0x1000;
-                break;
-        case 1:
-                cookie = 0x2000;
-                break;
-        case 2:
-                cookie = 0x3000;
-                break;
-        case 3:
-                cookie = 0x4000;
-                break;
-        case 4:
-                cookie = 0x5000;
-                break;
-        case 5:
-                cookie = 0x6000;
-                break;
-        default:
-                B43_WARN_ON(1);
-        }
+        cookie = (((u16)ring->index + 1) << 12);
         B43_WARN_ON(slot & ~0x0FFF);
-        cookie |= (u16) slot;
+        cookie |= (u16)slot;
 
         return cookie;
 }
@@ -1138,22 +1076,19 @@ struct b43_dmaring *parse_cookie(struct b43_wldev *dev, u16 cookie, int *slot)
 
         switch (cookie & 0xF000) {
         case 0x1000:
-                ring = dma->tx_ring0;
+                ring = dma->tx_ring_AC_BK;
                 break;
         case 0x2000:
-                ring = dma->tx_ring1;
+                ring = dma->tx_ring_AC_BE;
                 break;
         case 0x3000:
-                ring = dma->tx_ring2;
+                ring = dma->tx_ring_AC_VI;
                 break;
         case 0x4000:
-                ring = dma->tx_ring3;
+                ring = dma->tx_ring_AC_VO;
                 break;
         case 0x5000:
-                ring = dma->tx_ring4;
-                break;
-        case 0x6000:
-                ring = dma->tx_ring5;
+                ring = dma->tx_ring_mcast;
                 break;
         default:
                 B43_WARN_ON(1);
@@ -1180,7 +1115,6 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
         size_t hdrsize = b43_txhdr_size(ring->dev);
 
 #define SLOTS_PER_PACKET  2
-        B43_WARN_ON(skb_shinfo(skb)->nr_frags);
 
         old_top_slot = ring->current_slot;
         old_used_slots = ring->used_slots;
@@ -1285,6 +1219,37 @@ static inline int should_inject_overflow(struct b43_dmaring *ring)
         return 0;
 }
 
+/* Static mapping of mac80211's queues (priorities) to b43 DMA rings. */
+static struct b43_dmaring * select_ring_by_priority(struct b43_wldev *dev,
+                                                    u8 queue_prio)
+{
+        struct b43_dmaring *ring;
+
+        if (b43_modparam_qos) {
+                /* 0 = highest priority */
+                switch (queue_prio) {
+                default:
+                        B43_WARN_ON(1);
+                        /* fallthrough */
+                case 0:
+                        ring = dev->dma.tx_ring_AC_VO;
+                        break;
+                case 1:
+                        ring = dev->dma.tx_ring_AC_VI;
+                        break;
+                case 2:
+                        ring = dev->dma.tx_ring_AC_BE;
+                        break;
+                case 3:
+                        ring = dev->dma.tx_ring_AC_BK;
+                        break;
+                }
+        } else
+                ring = dev->dma.tx_ring_AC_BE;
+
+        return ring;
+}
+
 int b43_dma_tx(struct b43_wldev *dev,
                struct sk_buff *skb, struct ieee80211_tx_control *ctl)
 {
@@ -1293,21 +1258,16 @@ int b43_dma_tx(struct b43_wldev *dev,
         int err = 0;
         unsigned long flags;
 
-        if (unlikely(skb->len < 2 + 2 + 6)) {
-                /* Too short, this can't be a valid frame. */
-                return -EINVAL;
-        }
-
         hdr = (struct ieee80211_hdr *)skb->data;
         if (ctl->flags & IEEE80211_TXCTL_SEND_AFTER_DTIM) {
                 /* The multicast ring will be sent after the DTIM */
-                ring = dev->dma.tx_ring4;
+                ring = dev->dma.tx_ring_mcast;
                 /* Set the more-data bit. Ucode will clear it on
                  * the last frame for us. */
                 hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
         } else {
                 /* Decide by priority where to put this frame. */
-                ring = priority_to_txring(dev, ctl->queue);
+                ring = select_ring_by_priority(dev, ctl->queue);
         }
 
         spin_lock_irqsave(&ring->lock, flags);
@@ -1322,6 +1282,11 @@ int b43_dma_tx(struct b43_wldev *dev,
          * That would be a mac80211 bug. */
         B43_WARN_ON(ring->stopped);
 
+        /* Assign the queue number to the ring (if not already done before)
+         * so TX status handling can use it. The queue to ring mapping is
+         * static, so we don't need to store it per frame. */
+        ring->queue_prio = ctl->queue;
+
         err = dma_tx_fragment(ring, skb, ctl);
         if (unlikely(err == -ENOKEY)) {
                 /* Drop this packet, as we don't have the encryption key
@@ -1338,7 +1303,7 @@ int b43_dma_tx(struct b43_wldev *dev,
         if ((free_slots(ring) < SLOTS_PER_PACKET) ||
             should_inject_overflow(ring)) {
                 /* This TX ring is full. */
-                ieee80211_stop_queue(dev->wl->hw, txring_to_priority(ring));
+                ieee80211_stop_queue(dev->wl->hw, ctl->queue);
                 ring->stopped = 1;
                 if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {
                         b43dbg(dev->wl, "Stopped TX ring %d\n", ring->index);
@@ -1359,6 +1324,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
         struct b43_dmadesc_generic *desc;
         struct b43_dmadesc_meta *meta;
         int slot;
+        bool frame_succeed;
 
         ring = parse_cookie(dev, status->cookie, &slot);
         if (unlikely(!ring))
@@ -1385,18 +1351,15 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
                          * status of the transmission.
                          * Some fields of txstat are already filled in dma_tx().
                          */
-                        if (status->acked) {
-                                meta->txstat.flags |= IEEE80211_TX_STATUS_ACK;
-                        } else {
-                                if (!(meta->txstat.control.flags
-                                      & IEEE80211_TXCTL_NO_ACK))
-                                        meta->txstat.excessive_retries = 1;
-                        }
-                        if (status->frame_count == 0) {
-                                /* The frame was not transmitted at all. */
-                                meta->txstat.retry_count = 0;
-                        } else
-                                meta->txstat.retry_count = status->frame_count - 1;
+                        frame_succeed = b43_fill_txstatus_report(
+                                                &(meta->txstat), status);
+#ifdef CONFIG_B43_DEBUG
+                        if (frame_succeed)
+                                ring->nr_succeed_tx_packets++;
+                        else
+                                ring->nr_failed_tx_packets++;
+                        ring->nr_total_packet_tries += status->frame_count;
+#endif /* DEBUG */
                         ieee80211_tx_status_irqsafe(dev->wl->hw, meta->skb,
                                                     &(meta->txstat));
                         /* skb is freed by ieee80211_tx_status_irqsafe() */
@@ -1418,7 +1381,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
         dev->stats.last_tx = jiffies;
         if (ring->stopped) {
                 B43_WARN_ON(free_slots(ring) < SLOTS_PER_PACKET);
-                ieee80211_wake_queue(dev->wl->hw, txring_to_priority(ring));
+                ieee80211_wake_queue(dev->wl->hw, ring->queue_prio);
                 ring->stopped = 0;
                 if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {
                         b43dbg(dev->wl, "Woke up TX ring %d\n", ring->index);
@@ -1439,7 +1402,7 @@ void b43_dma_get_tx_stats(struct b43_wldev *dev,
 
         for (i = 0; i < nr_queues; i++) {
                 data = &(stats->data[i]);
-                ring = priority_to_txring(dev, i);
+                ring = select_ring_by_priority(dev, i);
 
                 spin_lock_irqsave(&ring->lock, flags);
                 data->len = ring->used_slots / SLOTS_PER_PACKET;
@@ -1465,25 +1428,6 @@ static void dma_rx(struct b43_dmaring *ring, int *slot)
         sync_descbuffer_for_cpu(ring, meta->dmaaddr, ring->rx_buffersize);
         skb = meta->skb;
 
-        if (ring->index == 3) {
-                /* We received an xmit status. */
-                struct b43_hwtxstatus *hw = (struct b43_hwtxstatus *)skb->data;
-                int i = 0;
-
-                while (hw->cookie == 0) {
-                        if (i > 100)
-                                break;
-                        i++;
-                        udelay(2);
-                        barrier();
-                }
-                b43_handle_hwtxstatus(ring->dev, hw);
-                /* recycle the descriptor buffer. */
-                sync_descbuffer_for_device(ring, meta->dmaaddr,
-                                           ring->rx_buffersize);
-
-                return;
-        }
         rxhdr = (struct b43_rxhdr_fw4 *)skb->data;
         len = le16_to_cpu(rxhdr->frame_len);
         if (len == 0) {
@@ -1540,7 +1484,7 @@ static void dma_rx(struct b43_dmaring *ring, int *slot)
         skb_pull(skb, ring->frameoffset);
 
         b43_rx(ring->dev, skb, rxhdr);
-      drop:
+drop:
         return;
 }
 
@@ -1586,21 +1530,55 @@ static void b43_dma_tx_resume_ring(struct b43_dmaring *ring)
 void b43_dma_tx_suspend(struct b43_wldev *dev)
 {
         b43_power_saving_ctl_bits(dev, B43_PS_AWAKE);
-        b43_dma_tx_suspend_ring(dev->dma.tx_ring0);
-        b43_dma_tx_suspend_ring(dev->dma.tx_ring1);
-        b43_dma_tx_suspend_ring(dev->dma.tx_ring2);
-        b43_dma_tx_suspend_ring(dev->dma.tx_ring3);
-        b43_dma_tx_suspend_ring(dev->dma.tx_ring4);
-        b43_dma_tx_suspend_ring(dev->dma.tx_ring5);
+        b43_dma_tx_suspend_ring(dev->dma.tx_ring_AC_BK);
+        b43_dma_tx_suspend_ring(dev->dma.tx_ring_AC_BE);
+        b43_dma_tx_suspend_ring(dev->dma.tx_ring_AC_VI);
+        b43_dma_tx_suspend_ring(dev->dma.tx_ring_AC_VO);
+        b43_dma_tx_suspend_ring(dev->dma.tx_ring_mcast);
 }
 
 void b43_dma_tx_resume(struct b43_wldev *dev)
 {
-        b43_dma_tx_resume_ring(dev->dma.tx_ring5);
-        b43_dma_tx_resume_ring(dev->dma.tx_ring4);
-        b43_dma_tx_resume_ring(dev->dma.tx_ring3);
-        b43_dma_tx_resume_ring(dev->dma.tx_ring2);
-        b43_dma_tx_resume_ring(dev->dma.tx_ring1);
-        b43_dma_tx_resume_ring(dev->dma.tx_ring0);
+        b43_dma_tx_resume_ring(dev->dma.tx_ring_mcast);
+        b43_dma_tx_resume_ring(dev->dma.tx_ring_AC_VO);
+        b43_dma_tx_resume_ring(dev->dma.tx_ring_AC_VI);
+        b43_dma_tx_resume_ring(dev->dma.tx_ring_AC_BE);
+        b43_dma_tx_resume_ring(dev->dma.tx_ring_AC_BK);
         b43_power_saving_ctl_bits(dev, 0);
 }
+
+#ifdef CONFIG_B43_PIO
+static void direct_fifo_rx(struct b43_wldev *dev, enum b43_dmatype type,
+                           u16 mmio_base, bool enable)
+{
+        u32 ctl;
+
+        if (type == B43_DMA_64BIT) {
+                ctl = b43_read32(dev, mmio_base + B43_DMA64_RXCTL);
+                ctl &= ~B43_DMA64_RXDIRECTFIFO;
+                if (enable)
+                        ctl |= B43_DMA64_RXDIRECTFIFO;
+                b43_write32(dev, mmio_base + B43_DMA64_RXCTL, ctl);
+        } else {
+                ctl = b43_read32(dev, mmio_base + B43_DMA32_RXCTL);
+                ctl &= ~B43_DMA32_RXDIRECTFIFO;
+                if (enable)
+                        ctl |= B43_DMA32_RXDIRECTFIFO;
+                b43_write32(dev, mmio_base + B43_DMA32_RXCTL, ctl);
+        }
+}
+
+/* Enable/Disable Direct FIFO Receive Mode (PIO) on a RX engine.
+ * This is called from PIO code, so DMA structures are not available. */
+void b43_dma_direct_fifo_rx(struct b43_wldev *dev,
+                            unsigned int engine_index, bool enable)
+{
+        enum b43_dmatype type;
+        u16 mmio_base;
+
+        type = dma_mask_to_engine_type(supported_dma_mask(dev));
+
+        mmio_base = b43_dmacontroller_base(type, engine_index);
+        direct_fifo_rx(dev, type, mmio_base, enable);
+}
+#endif /* CONFIG_B43_PIO */
diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h
index c0d6b69e6501..20acf885dba5 100644
--- a/drivers/net/wireless/b43/dma.h
+++ b/drivers/net/wireless/b43/dma.h
@@ -245,6 +245,9 @@ struct b43_dmaring {
         enum b43_dmatype type;
         /* Boolean. Is this ring stopped at ieee80211 level? */
         bool stopped;
+        /* The QOS priority assigned to this ring. Only used for TX rings.
+         * This is the mac80211 "queue" value. */
+        u8 queue_prio;
         /* Lock, only used for TX. */
         spinlock_t lock;
         struct b43_wldev *dev;
@@ -253,7 +256,13 @@ struct b43_dmaring {
         int max_used_slots;
         /* Last time we injected a ring overflow. */
         unsigned long last_injected_overflow;
-#endif                          /* CONFIG_B43_DEBUG */
+        /* Statistics: Number of successfully transmitted packets */
+        u64 nr_succeed_tx_packets;
+        /* Statistics: Number of failed TX packets */
+        u64 nr_failed_tx_packets;
+        /* Statistics: Total number of TX plus all retries. */
+        u64 nr_total_packet_tries;
+#endif /* CONFIG_B43_DEBUG */
 };
 
 static inline u32 b43_dma_read(struct b43_dmaring *ring, u16 offset)
@@ -282,4 +291,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
 
 void b43_dma_rx(struct b43_dmaring *ring);
 
+void b43_dma_direct_fifo_rx(struct b43_wldev *dev,
+                            unsigned int engine_index, bool enable);
+
 #endif /* B43_DMA_H_ */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c73a75b24cd6..cf5c046c9fa8 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -46,7 +46,9 @@
 #include "main.h"
 #include "debugfs.h"
 #include "phy.h"
+#include "nphy.h"
 #include "dma.h"
+#include "pio.h"
 #include "sysfs.h"
 #include "xmit.h"
 #include "lo.h"
@@ -78,6 +80,11 @@ static int modparam_nohwcrypt;
 module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
 
+int b43_modparam_qos = 1;
+module_param_named(qos, b43_modparam_qos, int, 0444);
+MODULE_PARM_DESC(qos, "Enable QOS support (default on)");
+
+
 static const struct ssb_device_id b43_ssb_tbl[] = {
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 5),
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 6),
@@ -96,25 +103,29 @@ MODULE_DEVICE_TABLE(ssb, b43_ssb_tbl);
  * data in there. This data is the same for all devices, so we don't
  * get concurrency issues */
 #define RATETAB_ENT(_rateid, _flags) \
-        {                                                       \
-                .rate   = B43_RATE_TO_BASE100KBPS(_rateid),     \
-                .val    = (_rateid),                            \
-                .val2   = (_rateid),                            \
-                .flags  = (_flags),                             \
+        {                                                               \
+                .bitrate        = B43_RATE_TO_BASE100KBPS(_rateid),     \
+                .hw_value       = (_rateid),                            \
+                .flags          = (_flags),                             \
         }
+
+/*
+ * NOTE: When changing this, sync with xmit.c's
+ *       b43_plcp_get_bitrate_idx_* functions!
+ */
 static struct ieee80211_rate __b43_ratetable[] = {
-        RATETAB_ENT(B43_CCK_RATE_1MB, IEEE80211_RATE_CCK),
-        RATETAB_ENT(B43_CCK_RATE_2MB, IEEE80211_RATE_CCK_2),
-        RATETAB_ENT(B43_CCK_RATE_5MB, IEEE80211_RATE_CCK_2),
-        RATETAB_ENT(B43_CCK_RATE_11MB, IEEE80211_RATE_CCK_2),
-        RATETAB_ENT(B43_OFDM_RATE_6MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43_OFDM_RATE_9MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43_OFDM_RATE_12MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43_OFDM_RATE_18MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43_OFDM_RATE_24MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43_OFDM_RATE_36MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43_OFDM_RATE_48MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43_OFDM_RATE_54MB, IEEE80211_RATE_OFDM),
+        RATETAB_ENT(B43_CCK_RATE_1MB, 0),
+        RATETAB_ENT(B43_CCK_RATE_2MB, IEEE80211_RATE_SHORT_PREAMBLE),
+        RATETAB_ENT(B43_CCK_RATE_5MB, IEEE80211_RATE_SHORT_PREAMBLE),
+        RATETAB_ENT(B43_CCK_RATE_11MB, IEEE80211_RATE_SHORT_PREAMBLE),
+        RATETAB_ENT(B43_OFDM_RATE_6MB, 0),
+        RATETAB_ENT(B43_OFDM_RATE_9MB, 0),
+        RATETAB_ENT(B43_OFDM_RATE_12MB, 0),
+        RATETAB_ENT(B43_OFDM_RATE_18MB, 0),
+        RATETAB_ENT(B43_OFDM_RATE_24MB, 0),
+        RATETAB_ENT(B43_OFDM_RATE_36MB, 0),
+        RATETAB_ENT(B43_OFDM_RATE_48MB, 0),
+        RATETAB_ENT(B43_OFDM_RATE_54MB, 0),
 };
 
 #define b43_a_ratetable         (__b43_ratetable + 4)
@@ -124,53 +135,144 @@ static struct ieee80211_rate __b43_ratetable[] = {
 #define b43_g_ratetable         (__b43_ratetable + 0)
 #define b43_g_ratetable_size    12
 
-#define CHANTAB_ENT(_chanid, _freq) \
-        {                                                       \
-                .chan   = (_chanid),                            \
-                .freq   = (_freq),                              \
-                .val    = (_chanid),                            \
-                .flag   = IEEE80211_CHAN_W_SCAN |               \
-                          IEEE80211_CHAN_W_ACTIVE_SCAN |        \
-                          IEEE80211_CHAN_W_IBSS,                \
-                .power_level    = 0xFF,                         \
-                .antenna_max    = 0xFF,                         \
-        }
+#define CHAN4G(_channel, _freq, _flags) {                       \
+        .band                   = IEEE80211_BAND_2GHZ,          \
+        .center_freq            = (_freq),                      \
+        .hw_value               = (_channel),                   \
+        .flags                  = (_flags),                     \
+        .max_antenna_gain       = 0,                            \
+        .max_power              = 30,                           \
+}
 static struct ieee80211_channel b43_2ghz_chantable[] = {
-        CHANTAB_ENT(1, 2412),
-        CHANTAB_ENT(2, 2417),
-        CHANTAB_ENT(3, 2422),
-        CHANTAB_ENT(4, 2427),
-        CHANTAB_ENT(5, 2432),
-        CHANTAB_ENT(6, 2437),
-        CHANTAB_ENT(7, 2442),
-        CHANTAB_ENT(8, 2447),
-        CHANTAB_ENT(9, 2452),
-        CHANTAB_ENT(10, 2457),
-        CHANTAB_ENT(11, 2462),
-        CHANTAB_ENT(12, 2467),
-        CHANTAB_ENT(13, 2472),
-        CHANTAB_ENT(14, 2484),
+        CHAN4G(1, 2412, 0),
+        CHAN4G(2, 2417, 0),
+        CHAN4G(3, 2422, 0),
+        CHAN4G(4, 2427, 0),
+        CHAN4G(5, 2432, 0),
+        CHAN4G(6, 2437, 0),
+        CHAN4G(7, 2442, 0),
+        CHAN4G(8, 2447, 0),
+        CHAN4G(9, 2452, 0),
+        CHAN4G(10, 2457, 0),
+        CHAN4G(11, 2462, 0),
+        CHAN4G(12, 2467, 0),
+        CHAN4G(13, 2472, 0),
+        CHAN4G(14, 2484, 0),
 };
-#define b43_2ghz_chantable_size ARRAY_SIZE(b43_2ghz_chantable)
-
-#if 0
-static struct ieee80211_channel b43_5ghz_chantable[] = {
-        CHANTAB_ENT(36, 5180),
-        CHANTAB_ENT(40, 5200),
-        CHANTAB_ENT(44, 5220),
-        CHANTAB_ENT(48, 5240),
-        CHANTAB_ENT(52, 5260),
-        CHANTAB_ENT(56, 5280),
-        CHANTAB_ENT(60, 5300),
-        CHANTAB_ENT(64, 5320),
-        CHANTAB_ENT(149, 5745),
-        CHANTAB_ENT(153, 5765),
-        CHANTAB_ENT(157, 5785),
-        CHANTAB_ENT(161, 5805),
-        CHANTAB_ENT(165, 5825),
+#undef CHAN4G
+
+#define CHAN5G(_channel, _flags) {                              \
+        .band                   = IEEE80211_BAND_5GHZ,          \
+        .center_freq            = 5000 + (5 * (_channel)),      \
+        .hw_value               = (_channel),                   \
+        .flags                  = (_flags),                     \
+        .max_antenna_gain       = 0,                            \
+        .max_power              = 30,                           \
+}
+static struct ieee80211_channel b43_5ghz_nphy_chantable[] = {
+        CHAN5G(32, 0),          CHAN5G(34, 0),
+        CHAN5G(36, 0),          CHAN5G(38, 0),
+        CHAN5G(40, 0),          CHAN5G(42, 0),
+        CHAN5G(44, 0),          CHAN5G(46, 0),
+        CHAN5G(48, 0),          CHAN5G(50, 0),
+        CHAN5G(52, 0),          CHAN5G(54, 0),
+        CHAN5G(56, 0),          CHAN5G(58, 0),
+        CHAN5G(60, 0),          CHAN5G(62, 0),
+        CHAN5G(64, 0),          CHAN5G(66, 0),
+        CHAN5G(68, 0),          CHAN5G(70, 0),
+        CHAN5G(72, 0),          CHAN5G(74, 0),
+        CHAN5G(76, 0),          CHAN5G(78, 0),
+        CHAN5G(80, 0),          CHAN5G(82, 0),
+        CHAN5G(84, 0),          CHAN5G(86, 0),
+        CHAN5G(88, 0),          CHAN5G(90, 0),
+        CHAN5G(92, 0),          CHAN5G(94, 0),
+        CHAN5G(96, 0),          CHAN5G(98, 0),
+        CHAN5G(100, 0),         CHAN5G(102, 0),
+        CHAN5G(104, 0),         CHAN5G(106, 0),
+        CHAN5G(108, 0),         CHAN5G(110, 0),
+        CHAN5G(112, 0),         CHAN5G(114, 0),
+        CHAN5G(116, 0),         CHAN5G(118, 0),
+        CHAN5G(120, 0),         CHAN5G(122, 0),
+        CHAN5G(124, 0),         CHAN5G(126, 0),
+        CHAN5G(128, 0),         CHAN5G(130, 0),
+        CHAN5G(132, 0),         CHAN5G(134, 0),
+        CHAN5G(136, 0),         CHAN5G(138, 0),
+        CHAN5G(140, 0),         CHAN5G(142, 0),
+        CHAN5G(144, 0),         CHAN5G(145, 0),
+        CHAN5G(146, 0),         CHAN5G(147, 0),
+        CHAN5G(148, 0),         CHAN5G(149, 0),
+        CHAN5G(150, 0),         CHAN5G(151, 0),
+        CHAN5G(152, 0),         CHAN5G(153, 0),
+        CHAN5G(154, 0),         CHAN5G(155, 0),
+        CHAN5G(156, 0),         CHAN5G(157, 0),
+        CHAN5G(158, 0),         CHAN5G(159, 0),
+        CHAN5G(160, 0),         CHAN5G(161, 0),
+        CHAN5G(162, 0),         CHAN5G(163, 0),
+        CHAN5G(164, 0),         CHAN5G(165, 0),
+        CHAN5G(166, 0),         CHAN5G(168, 0),
+        CHAN5G(170, 0),         CHAN5G(172, 0),
+        CHAN5G(174, 0),         CHAN5G(176, 0),
+        CHAN5G(178, 0),         CHAN5G(180, 0),
+        CHAN5G(182, 0),         CHAN5G(184, 0),
+        CHAN5G(186, 0),         CHAN5G(188, 0),
+        CHAN5G(190, 0),         CHAN5G(192, 0),
+        CHAN5G(194, 0),         CHAN5G(196, 0),
+        CHAN5G(198, 0),         CHAN5G(200, 0),
+        CHAN5G(202, 0),         CHAN5G(204, 0),
+        CHAN5G(206, 0),         CHAN5G(208, 0),
+        CHAN5G(210, 0),         CHAN5G(212, 0),
+        CHAN5G(214, 0),         CHAN5G(216, 0),
+        CHAN5G(218, 0),         CHAN5G(220, 0),
+        CHAN5G(222, 0),         CHAN5G(224, 0),
+        CHAN5G(226, 0),         CHAN5G(228, 0),
+};
+
+static struct ieee80211_channel b43_5ghz_aphy_chantable[] = {
+        CHAN5G(34, 0),          CHAN5G(36, 0),
+        CHAN5G(38, 0),          CHAN5G(40, 0),
+        CHAN5G(42, 0),          CHAN5G(44, 0),
+        CHAN5G(46, 0),          CHAN5G(48, 0),
+        CHAN5G(52, 0),          CHAN5G(56, 0),
+        CHAN5G(60, 0),          CHAN5G(64, 0),
+        CHAN5G(100, 0),         CHAN5G(104, 0),
+        CHAN5G(108, 0),         CHAN5G(112, 0),
+        CHAN5G(116, 0),         CHAN5G(120, 0),
+        CHAN5G(124, 0),         CHAN5G(128, 0),
+        CHAN5G(132, 0),         CHAN5G(136, 0),
+        CHAN5G(140, 0),         CHAN5G(149, 0),
+        CHAN5G(153, 0),         CHAN5G(157, 0),
+        CHAN5G(161, 0),         CHAN5G(165, 0),
+        CHAN5G(184, 0),         CHAN5G(188, 0),
+        CHAN5G(192, 0),         CHAN5G(196, 0),
+        CHAN5G(200, 0),         CHAN5G(204, 0),
+        CHAN5G(208, 0),         CHAN5G(212, 0),
+        CHAN5G(216, 0),
+};
+#undef CHAN5G
+
+static struct ieee80211_supported_band b43_band_5GHz_nphy = {
+        .band           = IEEE80211_BAND_5GHZ,
+        .channels       = b43_5ghz_nphy_chantable,
+        .n_channels     = ARRAY_SIZE(b43_5ghz_nphy_chantable),
+        .bitrates       = b43_a_ratetable,
+        .n_bitrates     = b43_a_ratetable_size,
+};
+
+static struct ieee80211_supported_band b43_band_5GHz_aphy = {
+        .band           = IEEE80211_BAND_5GHZ,
+        .channels       = b43_5ghz_aphy_chantable,
+        .n_channels     = ARRAY_SIZE(b43_5ghz_aphy_chantable),
+        .bitrates       = b43_a_ratetable,
+        .n_bitrates     = b43_a_ratetable_size,
+};
+
+static struct ieee80211_supported_band b43_band_2GHz = {
+        .band           = IEEE80211_BAND_2GHZ,
+        .channels       = b43_2ghz_chantable,
+        .n_channels     = ARRAY_SIZE(b43_2ghz_chantable),
+        .bitrates       = b43_g_ratetable,
+        .n_bitrates     = b43_g_ratetable_size,
 };
-#define b43_5ghz_chantable_size ARRAY_SIZE(b43_5ghz_chantable)
-#endif
 
 static void b43_wireless_core_exit(struct b43_wldev *dev);
 static int b43_wireless_core_init(struct b43_wldev *dev);
@@ -370,24 +472,30 @@ out:
 }
 
 /* Read HostFlags */
-u32 b43_hf_read(struct b43_wldev * dev)
+u64 b43_hf_read(struct b43_wldev * dev)
 {
-        u32 ret;
+        u64 ret;
 
         ret = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFHI);
         ret <<= 16;
+        ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFMI);
+        ret <<= 16;
         ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO);
 
         return ret;
 }
 
 /* Write HostFlags */
-void b43_hf_write(struct b43_wldev *dev, u32 value)
+void b43_hf_write(struct b43_wldev *dev, u64 value)
 {
-        b43_shm_write16(dev, B43_SHM_SHARED,
-                        B43_SHM_SH_HOSTFLO, (value & 0x0000FFFF));
-        b43_shm_write16(dev, B43_SHM_SHARED,
-                        B43_SHM_SH_HOSTFHI, ((value & 0xFFFF0000) >> 16));
+        u16 lo, mi, hi;
+
+        lo = (value & 0x00000000FFFFULL);
+        mi = (value & 0x0000FFFF0000ULL) >> 16;
+        hi = (value & 0xFFFF00000000ULL) >> 32;
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO, lo);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFMI, mi);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFHI, hi);
 }
 
 void b43_tsf_read(struct b43_wldev *dev, u64 * tsf)
@@ -912,7 +1020,18 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
 /* Turn the Analog ON/OFF */
 static void b43_switch_analog(struct b43_wldev *dev, int on)
 {
-        b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);
+        switch (dev->phy.type) {
+        case B43_PHYTYPE_A:
+        case B43_PHYTYPE_G:
+                b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);
+                break;
+        case B43_PHYTYPE_N:
+                b43_phy_write(dev, B43_NPHY_AFECTL_OVER,
+                              on ? 0 : 0x7FFF);
+                break;
+        default:
+                B43_WARN_ON(1);
+        }
 }
 
 void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags)
@@ -1162,22 +1281,107 @@ static void b43_write_template_common(struct b43_wldev *dev,
                         size + sizeof(struct b43_plcp_hdr6));
 }
 
+/* Check if the use of the antenna that ieee80211 told us to
+ * use is possible. This will fall back to DEFAULT.
+ * "antenna_nr" is the antenna identifier we got from ieee80211. */
+u8 b43_ieee80211_antenna_sanitize(struct b43_wldev *dev,
+                                  u8 antenna_nr)
+{
+        u8 antenna_mask;
+
+        if (antenna_nr == 0) {
+                /* Zero means "use default antenna". That's always OK. */
+                return 0;
+        }
+
+        /* Get the mask of available antennas. */
+        if (dev->phy.gmode)
+                antenna_mask = dev->dev->bus->sprom.ant_available_bg;
+        else
+                antenna_mask = dev->dev->bus->sprom.ant_available_a;
+
+        if (!(antenna_mask & (1 << (antenna_nr - 1)))) {
+                /* This antenna is not available. Fall back to default. */
+                return 0;
+        }
+
+        return antenna_nr;
+}
+
+static int b43_antenna_from_ieee80211(struct b43_wldev *dev, u8 antenna)
+{
+        antenna = b43_ieee80211_antenna_sanitize(dev, antenna);
+        switch (antenna) {
+        case 0:         /* default/diversity */
+                return B43_ANTENNA_DEFAULT;
+        case 1:         /* Antenna 0 */
+                return B43_ANTENNA0;
+        case 2:         /* Antenna 1 */
+                return B43_ANTENNA1;
+        case 3:         /* Antenna 2 */
+                return B43_ANTENNA2;
+        case 4:         /* Antenna 3 */
+                return B43_ANTENNA3;
+        default:
+                return B43_ANTENNA_DEFAULT;
+        }
+}
+
+/* Convert a b43 antenna number value to the PHY TX control value. */
+static u16 b43_antenna_to_phyctl(int antenna)
+{
+        switch (antenna) {
+        case B43_ANTENNA0:
+                return B43_TXH_PHY_ANT0;
+        case B43_ANTENNA1:
+                return B43_TXH_PHY_ANT1;
+        case B43_ANTENNA2:
+                return B43_TXH_PHY_ANT2;
+        case B43_ANTENNA3:
+                return B43_TXH_PHY_ANT3;
+        case B43_ANTENNA_AUTO:
+                return B43_TXH_PHY_ANT01AUTO;
+        }
+        B43_WARN_ON(1);
+        return 0;
+}
+
 static void b43_write_beacon_template(struct b43_wldev *dev,
                                       u16 ram_offset,
-                                      u16 shm_size_offset, u8 rate)
+                                      u16 shm_size_offset)
 {
         unsigned int i, len, variable_len;
         const struct ieee80211_mgmt *bcn;
         const u8 *ie;
         bool tim_found = 0;
+        unsigned int rate;
+        u16 ctl;
+        int antenna;
 
         bcn = (const struct ieee80211_mgmt *)(dev->wl->current_beacon->data);
         len = min((size_t) dev->wl->current_beacon->len,
                   0x200 - sizeof(struct b43_plcp_hdr6));
+        rate = dev->wl->beacon_txctl.tx_rate->hw_value;
 
         b43_write_template_common(dev, (const u8 *)bcn,
                                   len, ram_offset, shm_size_offset, rate);
 
+        /* Write the PHY TX control parameters. */
+        antenna = b43_antenna_from_ieee80211(dev,
+                        dev->wl->beacon_txctl.antenna_sel_tx);
+        antenna = b43_antenna_to_phyctl(antenna);
+        ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
+        /* We can't send beacons with short preamble. Would get PHY errors. */
+        ctl &= ~B43_TXH_PHY_SHORTPRMBL;
+        ctl &= ~B43_TXH_PHY_ANT;
+        ctl &= ~B43_TXH_PHY_ENC;
+        ctl |= antenna;
+        if (b43_is_cck_rate(rate))
+                ctl |= B43_TXH_PHY_ENC_CCK;
+        else
+                ctl |= B43_TXH_PHY_ENC_OFDM;
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL, ctl);
+
         /* Find the position of the TIM and the DTIM_period value
          * and write them to SHM. */
         ie = bcn->u.beacon.variable;
@@ -1218,21 +1422,23 @@ static void b43_write_beacon_template(struct b43_wldev *dev,
                 b43warn(dev->wl, "Did not find a valid TIM IE in "
                         "the beacon template packet. AP or IBSS operation "
                         "may be broken.\n");
-        }
+        } else
+                b43dbg(dev->wl, "Updated beacon template\n");
 }
 
 static void b43_write_probe_resp_plcp(struct b43_wldev *dev,
-                                      u16 shm_offset, u16 size, u8 rate)
+                                      u16 shm_offset, u16 size,
+                                      struct ieee80211_rate *rate)
 {
         struct b43_plcp_hdr4 plcp;
         u32 tmp;
         __le16 dur;
 
         plcp.data = 0;
-        b43_generate_plcp_hdr(&plcp, size + FCS_LEN, rate);
+        b43_generate_plcp_hdr(&plcp, size + FCS_LEN, rate->hw_value);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
                                                dev->wl->vif, size,
-                                               B43_RATE_TO_BASE100KBPS(rate));
+                                               rate);
         /* Write PLCP in two parts and timing for packet transfer */
         tmp = le32_to_cpu(plcp.data);
         b43_shm_write16(dev, B43_SHM_SHARED, shm_offset, tmp & 0xFFFF);
@@ -1247,7 +1453,8 @@ static void b43_write_probe_resp_plcp(struct b43_wldev *dev,
  * 3) Stripping TIM
  */
 static const u8 * b43_generate_probe_resp(struct b43_wldev *dev,
-                                          u16 *dest_size, u8 rate)
+                                          u16 *dest_size,
+                                          struct ieee80211_rate *rate)
 {
         const u8 *src_data;
         u8 *dest_data;
@@ -1292,7 +1499,7 @@ static const u8 * b43_generate_probe_resp(struct b43_wldev *dev,
                                          IEEE80211_STYPE_PROBE_RESP);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
                                                dev->wl->vif, *dest_size,
-                                               B43_RATE_TO_BASE100KBPS(rate));
+                                               rate);
         hdr->duration_id = dur;
 
         return dest_data;
@@ -1300,7 +1507,8 @@ static const u8 * b43_generate_probe_resp(struct b43_wldev *dev,
 
 static void b43_write_probe_resp_template(struct b43_wldev *dev,
                                           u16 ram_offset,
-                                          u16 shm_size_offset, u8 rate)
+                                          u16 shm_size_offset,
+                                          struct ieee80211_rate *rate)
 {
         const u8 *probe_resp_data;
         u16 size;
@@ -1313,20 +1521,89 @@ static void b43_write_probe_resp_template(struct b43_wldev *dev,
         /* Looks like PLCP headers plus packet timings are stored for
          * all possible basic rates
          */
-        b43_write_probe_resp_plcp(dev, 0x31A, size, B43_CCK_RATE_1MB);
-        b43_write_probe_resp_plcp(dev, 0x32C, size, B43_CCK_RATE_2MB);
-        b43_write_probe_resp_plcp(dev, 0x33E, size, B43_CCK_RATE_5MB);
-        b43_write_probe_resp_plcp(dev, 0x350, size, B43_CCK_RATE_11MB);
+        b43_write_probe_resp_plcp(dev, 0x31A, size, &b43_b_ratetable[0]);
+        b43_write_probe_resp_plcp(dev, 0x32C, size, &b43_b_ratetable[1]);
+        b43_write_probe_resp_plcp(dev, 0x33E, size, &b43_b_ratetable[2]);
+        b43_write_probe_resp_plcp(dev, 0x350, size, &b43_b_ratetable[3]);
 
         size = min((size_t) size, 0x200 - sizeof(struct b43_plcp_hdr6));
         b43_write_template_common(dev, probe_resp_data,
-                                  size, ram_offset, shm_size_offset, rate);
+                                  size, ram_offset, shm_size_offset,
+                                  rate->hw_value);
         kfree(probe_resp_data);
 }
 
+static void handle_irq_beacon(struct b43_wldev *dev)
+{
+        struct b43_wl *wl = dev->wl;
+        u32 cmd, beacon0_valid, beacon1_valid;
+
+        if (!b43_is_mode(wl, IEEE80211_IF_TYPE_AP))
+                return;
+
+        /* This is the bottom half of the asynchronous beacon update. */
+
+        /* Ignore interrupt in the future. */
+        dev->irq_savedstate &= ~B43_IRQ_BEACON;
+
+        cmd = b43_read32(dev, B43_MMIO_MACCMD);
+        beacon0_valid = (cmd & B43_MACCMD_BEACON0_VALID);
+        beacon1_valid = (cmd & B43_MACCMD_BEACON1_VALID);
+
+        /* Schedule interrupt manually, if busy. */
+        if (beacon0_valid && beacon1_valid) {
+                b43_write32(dev, B43_MMIO_GEN_IRQ_REASON, B43_IRQ_BEACON);
+                dev->irq_savedstate |= B43_IRQ_BEACON;
+                return;
+        }
+
+        if (!beacon0_valid) {
+                if (!wl->beacon0_uploaded) {
+                        b43_write_beacon_template(dev, 0x68, 0x18);
+                        b43_write_probe_resp_template(dev, 0x268, 0x4A,
+                                                      &__b43_ratetable[3]);
+                        wl->beacon0_uploaded = 1;
+                }
+                cmd = b43_read32(dev, B43_MMIO_MACCMD);
+                cmd |= B43_MACCMD_BEACON0_VALID;
+                b43_write32(dev, B43_MMIO_MACCMD, cmd);
+        } else if (!beacon1_valid) {
+                if (!wl->beacon1_uploaded) {
+                        b43_write_beacon_template(dev, 0x468, 0x1A);
+                        wl->beacon1_uploaded = 1;
+                }
+                cmd = b43_read32(dev, B43_MMIO_MACCMD);
+                cmd |= B43_MACCMD_BEACON1_VALID;
+                b43_write32(dev, B43_MMIO_MACCMD, cmd);
+        }
+}
+
+static void b43_beacon_update_trigger_work(struct work_struct *work)
+{
+        struct b43_wl *wl = container_of(work, struct b43_wl,
+                                         beacon_update_trigger);
+        struct b43_wldev *dev;
+
+        mutex_lock(&wl->mutex);
+        dev = wl->current_dev;
+        if (likely(dev && (b43_status(dev) >= B43_STAT_INITIALIZED))) {
+                spin_lock_irq(&wl->irq_lock);
+                /* update beacon right away or defer to irq */
+                dev->irq_savedstate = b43_read32(dev, B43_MMIO_GEN_IRQ_MASK);
+                handle_irq_beacon(dev);
+                /* The handler might have updated the IRQ mask. */
+                b43_write32(dev, B43_MMIO_GEN_IRQ_MASK,
+                            dev->irq_savedstate);
+                mmiowb();
+                spin_unlock_irq(&wl->irq_lock);
+        }
+        mutex_unlock(&wl->mutex);
+}
+
 /* Asynchronously update the packet templates in template RAM.
  * Locking: Requires wl->irq_lock to be locked. */
-static void b43_update_templates(struct b43_wl *wl, struct sk_buff *beacon)
+static void b43_update_templates(struct b43_wl *wl, struct sk_buff *beacon,
+                                 const struct ieee80211_tx_control *txctl)
 {
         /* This is the top half of the ansynchronous beacon update.
          * The bottom half is the beacon IRQ.
@@ -1337,8 +1614,10 @@ static void b43_update_templates(struct b43_wl *wl, struct sk_buff *beacon)
         if (wl->current_beacon)
                 dev_kfree_skb_any(wl->current_beacon);
         wl->current_beacon = beacon;
+        memcpy(&wl->beacon_txctl, txctl, sizeof(wl->beacon_txctl));
         wl->beacon0_uploaded = 0;
         wl->beacon1_uploaded = 0;
+        queue_work(wl->hw->workqueue, &wl->beacon_update_trigger);
 }
 
 static void b43_set_ssid(struct b43_wldev *dev, const u8 * ssid, u8 ssid_len)
@@ -1364,44 +1643,14 @@ static void b43_set_beacon_int(struct b43_wldev *dev, u16 beacon_int)
 {
         b43_time_lock(dev);
         if (dev->dev->id.revision >= 3) {
-                b43_write32(dev, 0x188, (beacon_int << 16));
+                b43_write32(dev, B43_MMIO_TSF_CFP_REP, (beacon_int << 16));
+                b43_write32(dev, B43_MMIO_TSF_CFP_START, (beacon_int << 10));
         } else {
                 b43_write16(dev, 0x606, (beacon_int >> 6));
                 b43_write16(dev, 0x610, beacon_int);
         }
         b43_time_unlock(dev);
-}
-
-static void handle_irq_beacon(struct b43_wldev *dev)
-{
-        struct b43_wl *wl = dev->wl;
-        u32 cmd;
-
-        if (!b43_is_mode(wl, IEEE80211_IF_TYPE_AP))
-                return;
-
-        /* This is the bottom half of the asynchronous beacon update. */
-
-        cmd = b43_read32(dev, B43_MMIO_MACCMD);
-        if (!(cmd & B43_MACCMD_BEACON0_VALID)) {
-                if (!wl->beacon0_uploaded) {
-                        b43_write_beacon_template(dev, 0x68, 0x18,
-                                                  B43_CCK_RATE_1MB);
-                        b43_write_probe_resp_template(dev, 0x268, 0x4A,
-                                                      B43_CCK_RATE_11MB);
-                        wl->beacon0_uploaded = 1;
-                }
-                cmd |= B43_MACCMD_BEACON0_VALID;
-        }
-        if (!(cmd & B43_MACCMD_BEACON1_VALID)) {
-                if (!wl->beacon1_uploaded) {
-                        b43_write_beacon_template(dev, 0x468, 0x1A,
-                                                  B43_CCK_RATE_1MB);
-                        wl->beacon1_uploaded = 1;
-                }
-                cmd |= B43_MACCMD_BEACON1_VALID;
-        }
-        b43_write32(dev, B43_MMIO_MACCMD, cmd);
+        b43dbg(dev->wl, "Set beacon interval to %u\n", beacon_int);
 }
 
 static void handle_irq_ucode_debug(struct b43_wldev *dev)
@@ -1483,12 +1732,15 @@ static void b43_interrupt_tasklet(struct b43_wldev *dev)
                 handle_irq_noise(dev);
 
         /* Check the DMA reason registers for received data. */
-        if (dma_reason[0] & B43_DMAIRQ_RX_DONE)
-                b43_dma_rx(dev->dma.rx_ring0);
-        if (dma_reason[3] & B43_DMAIRQ_RX_DONE)
-                b43_dma_rx(dev->dma.rx_ring3);
+        if (dma_reason[0] & B43_DMAIRQ_RX_DONE) {
+                if (b43_using_pio_transfers(dev))
+                        b43_pio_rx(dev->pio.rx_queue);
+                else
+                        b43_dma_rx(dev->dma.rx_ring);
+        }
         B43_WARN_ON(dma_reason[1] & B43_DMAIRQ_RX_DONE);
         B43_WARN_ON(dma_reason[2] & B43_DMAIRQ_RX_DONE);
+        B43_WARN_ON(dma_reason[3] & B43_DMAIRQ_RX_DONE);
         B43_WARN_ON(dma_reason[4] & B43_DMAIRQ_RX_DONE);
         B43_WARN_ON(dma_reason[5] & B43_DMAIRQ_RX_DONE);
 
@@ -2045,7 +2297,7 @@ static void b43_gpio_cleanup(struct b43_wldev *dev)
 }
 
 /* http://bcm-specs.sipsolutions.net/EnableMac */
-void b43_mac_enable(struct b43_wldev *dev)
+static void b43_mac_enable(struct b43_wldev *dev)
 {
         dev->mac_suspended--;
         B43_WARN_ON(dev->mac_suspended < 0);
@@ -2068,7 +2320,7 @@ void b43_mac_enable(struct b43_wldev *dev)
 }
 
 /* http://bcm-specs.sipsolutions.net/SuspendMAC */
-void b43_mac_suspend(struct b43_wldev *dev)
+static void b43_mac_suspend(struct b43_wldev *dev)
 {
         int i;
         u32 tmp;
@@ -2091,6 +2343,13 @@ void b43_mac_suspend(struct b43_wldev *dev)
                             & ~B43_MACCTL_ENABLED);
                 /* force pci to flush the write */
                 b43_read32(dev, B43_MMIO_MACCTL);
+                for (i = 35; i; i--) {
+                        tmp = b43_read32(dev, B43_MMIO_GEN_IRQ_REASON);
+                        if (tmp & B43_IRQ_MAC_SUSPENDED)
+                                goto out;
+                        udelay(10);
+                }
+                /* Hm, it seems this will take some time. Use msleep(). */
                 for (i = 40; i; i--) {
                         tmp = b43_read32(dev, B43_MMIO_GEN_IRQ_REASON);
                         if (tmp & B43_IRQ_MAC_SUSPENDED)
@@ -2196,38 +2455,28 @@ static void b43_rate_memory_init(struct b43_wldev *dev)
         }
 }
 
+/* Set the default values for the PHY TX Control Words. */
+static void b43_set_phytxctl_defaults(struct b43_wldev *dev)
+{
+        u16 ctl = 0;
+
+        ctl |= B43_TXH_PHY_ENC_CCK;
+        ctl |= B43_TXH_PHY_ANT01AUTO;
+        ctl |= B43_TXH_PHY_TXPWR;
+
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL, ctl);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_ACKCTSPHYCTL, ctl);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_PRPHYCTL, ctl);
+}
+
 /* Set the TX-Antenna for management frames sent by firmware. */
 static void b43_mgmtframe_txantenna(struct b43_wldev *dev, int antenna)
 {
-        u16 ant = 0;
+        u16 ant;
         u16 tmp;
 
-        switch (antenna) {
-        case B43_ANTENNA0:
-                ant |= B43_TXH_PHY_ANT0;
-                break;
-        case B43_ANTENNA1:
-                ant |= B43_TXH_PHY_ANT1;
-                break;
-        case B43_ANTENNA2:
-                ant |= B43_TXH_PHY_ANT2;
-                break;
-        case B43_ANTENNA3:
-                ant |= B43_TXH_PHY_ANT3;
-                break;
-        case B43_ANTENNA_AUTO:
-                ant |= B43_TXH_PHY_ANT01AUTO;
-                break;
-        default:
-                B43_WARN_ON(1);
-        }
-
-        /* FIXME We also need to set the other flags of the PHY control field somewhere. */
+        ant = b43_antenna_to_phyctl(antenna);
 
-        /* For Beacons */
-        tmp = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
-        tmp = (tmp & ~B43_TXH_PHY_ANT) | ant;
-        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL, tmp);
         /* For ACK/CTS */
         tmp = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_ACKCTSPHYCTL);
         tmp = (tmp & ~B43_TXH_PHY_ANT) | ant;
@@ -2589,22 +2838,199 @@ static int b43_op_tx(struct ieee80211_hw *hw,
         struct b43_wldev *dev = wl->current_dev;
         int err = -ENODEV;
 
+        if (unlikely(skb->len < 2 + 2 + 6)) {
+                /* Too short, this can't be a valid frame. */
+                return -EINVAL;
+        }
+        B43_WARN_ON(skb_shinfo(skb)->nr_frags);
+
         if (unlikely(!dev))
                 goto out;
         if (unlikely(b43_status(dev) < B43_STAT_STARTED))
                 goto out;
-        /* DMA-TX is done without a global lock. */
-        err = b43_dma_tx(dev, skb, ctl);
+        /* TX is done without a global lock. */
+        if (b43_using_pio_transfers(dev))
+                err = b43_pio_tx(dev, skb, ctl);
+        else
+                err = b43_dma_tx(dev, skb, ctl);
 out:
         if (unlikely(err))
                 return NETDEV_TX_BUSY;
         return NETDEV_TX_OK;
 }
 
+/* Locking: wl->irq_lock */
+static void b43_qos_params_upload(struct b43_wldev *dev,
+                                  const struct ieee80211_tx_queue_params *p,
+                                  u16 shm_offset)
+{
+        u16 params[B43_NR_QOSPARAMS];
+        int cw_min, cw_max, aifs, bslots, tmp;
+        unsigned int i;
+
+        const u16 aCWmin = 0x0001;
+        const u16 aCWmax = 0x03FF;
+
+        /* Calculate the default values for the parameters, if needed. */
+        switch (shm_offset) {
+        case B43_QOS_VOICE:
+                aifs = (p->aifs == -1) ? 2 : p->aifs;
+                cw_min = (p->cw_min == 0) ? ((aCWmin + 1) / 4 - 1) : p->cw_min;
+                cw_max = (p->cw_max == 0) ? ((aCWmin + 1) / 2 - 1) : p->cw_max;
+                break;
+        case B43_QOS_VIDEO:
+                aifs = (p->aifs == -1) ? 2 : p->aifs;
+                cw_min = (p->cw_min == 0) ? ((aCWmin + 1) / 2 - 1) : p->cw_min;
+                cw_max = (p->cw_max == 0) ? aCWmin : p->cw_max;
+                break;
+        case B43_QOS_BESTEFFORT:
+                aifs = (p->aifs == -1) ? 3 : p->aifs;
+                cw_min = (p->cw_min == 0) ? aCWmin : p->cw_min;
+                cw_max = (p->cw_max == 0) ? aCWmax : p->cw_max;
+                break;
+        case B43_QOS_BACKGROUND:
+                aifs = (p->aifs == -1) ? 7 : p->aifs;
+                cw_min = (p->cw_min == 0) ? aCWmin : p->cw_min;
+                cw_max = (p->cw_max == 0) ? aCWmax : p->cw_max;
+                break;
+        default:
+                B43_WARN_ON(1);
+                return;
+        }
+        if (cw_min <= 0)
+                cw_min = aCWmin;
+        if (cw_max <= 0)
+                cw_max = aCWmin;
+        bslots = b43_read16(dev, B43_MMIO_RNG) % cw_min;
+
+        memset(&params, 0, sizeof(params));
+
+        params[B43_QOSPARAM_TXOP] = p->txop * 32;
+        params[B43_QOSPARAM_CWMIN] = cw_min;
+        params[B43_QOSPARAM_CWMAX] = cw_max;
+        params[B43_QOSPARAM_CWCUR] = cw_min;
+        params[B43_QOSPARAM_AIFS] = aifs;
+        params[B43_QOSPARAM_BSLOTS] = bslots;
+        params[B43_QOSPARAM_REGGAP] = bslots + aifs;
+
+        for (i = 0; i < ARRAY_SIZE(params); i++) {
+                if (i == B43_QOSPARAM_STATUS) {
+                        tmp = b43_shm_read16(dev, B43_SHM_SHARED,
+                                             shm_offset + (i * 2));
+                        /* Mark the parameters as updated. */
+                        tmp |= 0x100;
+                        b43_shm_write16(dev, B43_SHM_SHARED,
+                                        shm_offset + (i * 2),
+                                        tmp);
+                } else {
+                        b43_shm_write16(dev, B43_SHM_SHARED,
+                                        shm_offset + (i * 2),
+                                        params[i]);
+                }
+        }
+}
+
+/* Update the QOS parameters in hardware. */
+static void b43_qos_update(struct b43_wldev *dev)
+{
+        struct b43_wl *wl = dev->wl;
+        struct b43_qos_params *params;
+        unsigned long flags;
+        unsigned int i;
+
+        /* Mapping of mac80211 queues to b43 SHM offsets. */
+        static const u16 qos_shm_offsets[] = {
+                [0] = B43_QOS_VOICE,
+                [1] = B43_QOS_VIDEO,
+                [2] = B43_QOS_BESTEFFORT,
+                [3] = B43_QOS_BACKGROUND,
+        };
+        BUILD_BUG_ON(ARRAY_SIZE(qos_shm_offsets) != ARRAY_SIZE(wl->qos_params));
+
+        b43_mac_suspend(dev);
+        spin_lock_irqsave(&wl->irq_lock, flags);
+
+        for (i = 0; i < ARRAY_SIZE(wl->qos_params); i++) {
+                params = &(wl->qos_params[i]);
+                if (params->need_hw_update) {
+                        b43_qos_params_upload(dev, &(params->p),
+                                              qos_shm_offsets[i]);
+                        params->need_hw_update = 0;
+                }
+        }
+
+        spin_unlock_irqrestore(&wl->irq_lock, flags);
+        b43_mac_enable(dev);
+}
+
+static void b43_qos_clear(struct b43_wl *wl)
+{
+        struct b43_qos_params *params;
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(wl->qos_params); i++) {
+                params = &(wl->qos_params[i]);
+
+                memset(&(params->p), 0, sizeof(params->p));
+                params->p.aifs = -1;
+                params->need_hw_update = 1;
+        }
+}
+
+/* Initialize the core's QOS capabilities */
+static void b43_qos_init(struct b43_wldev *dev)
+{
+        struct b43_wl *wl = dev->wl;
+        unsigned int i;
+
+        /* Upload the current QOS parameters. */
+        for (i = 0; i < ARRAY_SIZE(wl->qos_params); i++)
+                wl->qos_params[i].need_hw_update = 1;
+        b43_qos_update(dev);
+
+        /* Enable QOS support. */
+        b43_hf_write(dev, b43_hf_read(dev) | B43_HF_EDCF);
+        b43_write16(dev, B43_MMIO_IFSCTL,
+                    b43_read16(dev, B43_MMIO_IFSCTL)
+                    | B43_MMIO_IFSCTL_USE_EDCF);
+}
+
+static void b43_qos_update_work(struct work_struct *work)
+{
+        struct b43_wl *wl = container_of(work, struct b43_wl, qos_update_work);
+        struct b43_wldev *dev;
+
+        mutex_lock(&wl->mutex);
+        dev = wl->current_dev;
+        if (likely(dev && (b43_status(dev) >= B43_STAT_INITIALIZED)))
+                b43_qos_update(dev);
+        mutex_unlock(&wl->mutex);
+}
+
 static int b43_op_conf_tx(struct ieee80211_hw *hw,
-                          int queue,
+                          int _queue,
                           const struct ieee80211_tx_queue_params *params)
 {
+        struct b43_wl *wl = hw_to_b43_wl(hw);
+        unsigned long flags;
+        unsigned int queue = (unsigned int)_queue;
+        struct b43_qos_params *p;
+
+        if (queue >= ARRAY_SIZE(wl->qos_params)) {
+                /* Queue not available or don't support setting
+                 * params on this queue. Return success to not
+                 * confuse mac80211. */
+                return 0;
+        }
+
+        spin_lock_irqsave(&wl->irq_lock, flags);
+        p = &(wl->qos_params[queue]);
+        memcpy(&(p->p), params, sizeof(p->p));
+        p->need_hw_update = 1;
+        spin_unlock_irqrestore(&wl->irq_lock, flags);
+
+        queue_work(hw->workqueue, &wl->qos_update_work);
+
         return 0;
 }
 
@@ -2620,7 +3046,10 @@ static int b43_op_get_tx_stats(struct ieee80211_hw *hw,
                 goto out;
         spin_lock_irqsave(&wl->irq_lock, flags);
         if (likely(b43_status(dev) >= B43_STAT_STARTED)) {
-                b43_dma_get_tx_stats(dev, stats);
+                if (b43_using_pio_transfers(dev))
+                        b43_pio_get_tx_stats(dev, stats);
+                else
+                        b43_dma_get_tx_stats(dev, stats);
                 err = 0;
         }
         spin_unlock_irqrestore(&wl->irq_lock, flags);
@@ -2641,45 +3070,6 @@ static int b43_op_get_stats(struct ieee80211_hw *hw,
         return 0;
 }
 
-static const char *phymode_to_string(unsigned int phymode)
-{
-        switch (phymode) {
-        case B43_PHYMODE_A:
-                return "A";
-        case B43_PHYMODE_B:
-                return "B";
-        case B43_PHYMODE_G:
-                return "G";
-        default:
-                B43_WARN_ON(1);
-        }
-        return "";
-}
-
-static int find_wldev_for_phymode(struct b43_wl *wl,
-                                  unsigned int phymode,
-                                  struct b43_wldev **dev, bool * gmode)
-{
-        struct b43_wldev *d;
-
-        list_for_each_entry(d, &wl->devlist, list) {
-                if (d->phy.possible_phymodes & phymode) {
-                        /* Ok, this device supports the PHY-mode.
-                         * Now figure out how the gmode bit has to be
-                         * set to support it. */
-                        if (phymode == B43_PHYMODE_A)
-                                *gmode = 0;
-                        else
-                                *gmode = 1;
-                        *dev = d;
-
-                        return 0;
-                }
-        }
-
-        return -ESRCH;
-}
-
 static void b43_put_phy_into_reset(struct b43_wldev *dev)
 {
         struct ssb_device *sdev = dev->dev;
@@ -2699,28 +3089,64 @@ static void b43_put_phy_into_reset(struct b43_wldev *dev)
         msleep(1);
 }
 
+static const char * band_to_string(enum ieee80211_band band)
+{
+        switch (band) {
+        case IEEE80211_BAND_5GHZ:
+                return "5";
+        case IEEE80211_BAND_2GHZ:
+                return "2.4";
+        default:
+                break;
+        }
+        B43_WARN_ON(1);
+        return "";
+}
+
 /* Expects wl->mutex locked */
-static int b43_switch_phymode(struct b43_wl *wl, unsigned int new_mode)
+static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan)
 {
-        struct b43_wldev *up_dev;
+        struct b43_wldev *up_dev = NULL;
         struct b43_wldev *down_dev;
+        struct b43_wldev *d;
         int err;
-        bool gmode = 0;
+        bool gmode;
         int prev_status;
 
-        err = find_wldev_for_phymode(wl, new_mode, &up_dev, &gmode);
-        if (err) {
-                b43err(wl, "Could not find a device for %s-PHY mode\n",
-                       phymode_to_string(new_mode));
-                return err;
+        /* Find a device and PHY which supports the band. */
+        list_for_each_entry(d, &wl->devlist, list) {
+                switch (chan->band) {
+                case IEEE80211_BAND_5GHZ:
+                        if (d->phy.supports_5ghz) {
+                                up_dev = d;
+                                gmode = 0;
+                        }
+                        break;
+                case IEEE80211_BAND_2GHZ:
+                        if (d->phy.supports_2ghz) {
+                                up_dev = d;
+                                gmode = 1;
+                        }
+                        break;
+                default:
+                        B43_WARN_ON(1);
+                        return -EINVAL;
+                }
+                if (up_dev)
+                        break;
+        }
+        if (!up_dev) {
+                b43err(wl, "Could not find a device for %s-GHz band operation\n",
+                       band_to_string(chan->band));
+                return -ENODEV;
         }
         if ((up_dev == wl->current_dev) &&
             (!!wl->current_dev->phy.gmode == !!gmode)) {
                 /* This device is already running. */
                 return 0;
         }
-        b43dbg(wl, "Reconfiguring PHYmode to %s-PHY\n",
-               phymode_to_string(new_mode));
+        b43dbg(wl, "Switching to %s-GHz band\n",
+               band_to_string(chan->band));
         down_dev = wl->current_dev;
 
         prev_status = b43_status(down_dev);
@@ -2742,8 +3168,8 @@ static int b43_switch_phymode(struct b43_wl *wl, unsigned int new_mode)
                 err = b43_wireless_core_init(up_dev);
                 if (err) {
                         b43err(wl, "Fatal: Could not initialize device for "
-                               "newly selected %s-PHY mode\n",
-                               phymode_to_string(new_mode));
+                               "selected %s-GHz band\n",
+                               band_to_string(chan->band));
                         goto init_failure;
                 }
         }
@@ -2751,8 +3177,8 @@ static int b43_switch_phymode(struct b43_wl *wl, unsigned int new_mode)
                 err = b43_wireless_core_start(up_dev);
                 if (err) {
                         b43err(wl, "Fatal: Coult not start device for "
-                               "newly selected %s-PHY mode\n",
-                               phymode_to_string(new_mode));
+                               "selected %s-GHz band\n",
+                               band_to_string(chan->band));
                         b43_wireless_core_exit(up_dev);
                         goto init_failure;
                 }
@@ -2762,86 +3188,26 @@ static int b43_switch_phymode(struct b43_wl *wl, unsigned int new_mode)
         wl->current_dev = up_dev;
 
         return 0;
-      init_failure:
+init_failure:
         /* Whoops, failed to init the new core. No core is operating now. */
         wl->current_dev = NULL;
         return err;
 }
 
-/* Check if the use of the antenna that ieee80211 told us to
- * use is possible. This will fall back to DEFAULT.
- * "antenna_nr" is the antenna identifier we got from ieee80211. */
-u8 b43_ieee80211_antenna_sanitize(struct b43_wldev *dev,
-                                  u8 antenna_nr)
-{
-        u8 antenna_mask;
-
-        if (antenna_nr == 0) {
-                /* Zero means "use default antenna". That's always OK. */
-                return 0;
-        }
-
-        /* Get the mask of available antennas. */
-        if (dev->phy.gmode)
-                antenna_mask = dev->dev->bus->sprom.ant_available_bg;
-        else
-                antenna_mask = dev->dev->bus->sprom.ant_available_a;
-
-        if (!(antenna_mask & (1 << (antenna_nr - 1)))) {
-                /* This antenna is not available. Fall back to default. */
-                return 0;
-        }
-
-        return antenna_nr;
-}
-
-static int b43_antenna_from_ieee80211(struct b43_wldev *dev, u8 antenna)
-{
-        antenna = b43_ieee80211_antenna_sanitize(dev, antenna);
-        switch (antenna) {
-        case 0:         /* default/diversity */
-                return B43_ANTENNA_DEFAULT;
-        case 1:         /* Antenna 0 */
-                return B43_ANTENNA0;
-        case 2:         /* Antenna 1 */
-                return B43_ANTENNA1;
-        case 3:         /* Antenna 2 */
-                return B43_ANTENNA2;
-        case 4:         /* Antenna 3 */
-                return B43_ANTENNA3;
-        default:
-                return B43_ANTENNA_DEFAULT;
-        }
-}
-
 static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
 {
         struct b43_wl *wl = hw_to_b43_wl(hw);
         struct b43_wldev *dev;
         struct b43_phy *phy;
         unsigned long flags;
-        unsigned int new_phymode = 0xFFFF;
         int antenna;
         int err = 0;
         u32 savedirqs;
 
         mutex_lock(&wl->mutex);
 
-        /* Switch the PHY mode (if necessary). */
-        switch (conf->phymode) {
-        case MODE_IEEE80211A:
-                new_phymode = B43_PHYMODE_A;
-                break;
-        case MODE_IEEE80211B:
-                new_phymode = B43_PHYMODE_B;
-                break;
-        case MODE_IEEE80211G:
-                new_phymode = B43_PHYMODE_G;
-                break;
-        default:
-                B43_WARN_ON(1);
-        }
-        err = b43_switch_phymode(wl, new_phymode);
+        /* Switch the band (if necessary). This might change the active core. */
+        err = b43_switch_band(wl, conf->channel);
         if (err)
                 goto out_unlock_mutex;
         dev = wl->current_dev;
@@ -2861,8 +3227,8 @@ static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
 
         /* Switch to the requested channel.
          * The firmware takes care of races with the TX handler. */
-        if (conf->channel_val != phy->channel)
-                b43_radio_selectchannel(dev, conf->channel_val, 0);
+        if (conf->channel->hw_value != phy->channel)
+                b43_radio_selectchannel(dev, conf->channel->hw_value, 0);
 
         /* Enable/Disable ShortSlot timing. */
         if ((!!(conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME)) !=
@@ -3075,8 +3441,10 @@ static int b43_op_config_interface(struct ieee80211_hw *hw,
                 if (b43_is_mode(wl, IEEE80211_IF_TYPE_AP)) {
                         B43_WARN_ON(conf->type != IEEE80211_IF_TYPE_AP);
                         b43_set_ssid(dev, conf->ssid, conf->ssid_len);
-                        if (conf->beacon)
-                                b43_update_templates(wl, conf->beacon);
+                        if (conf->beacon) {
+                                b43_update_templates(wl, conf->beacon,
+                                                     conf->beacon_control);
+                        }
                 }
                 b43_write_mac_bssid_templates(dev);
         }
@@ -3106,6 +3474,7 @@ static void b43_wireless_core_stop(struct b43_wldev *dev)
 
         b43_set_status(dev, B43_STAT_INITIALIZED);
 
+        b43_pio_stop(dev);
         mutex_unlock(&wl->mutex);
         /* Must unlock as it would otherwise deadlock. No races here.
          * Cancel the possibly running self-rearming periodic work. */
@@ -3400,6 +3769,41 @@ static void b43_set_retry_limits(struct b43_wldev *dev,
                         long_retry);
 }
 
+static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)
+{
+        u16 pu_delay;
+
+        /* The time value is in microseconds. */
+        if (dev->phy.type == B43_PHYTYPE_A)
+                pu_delay = 3700;
+        else
+                pu_delay = 1050;
+        if (b43_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS) || idle)
+                pu_delay = 500;
+        if ((dev->phy.radio_ver == 0x2050) && (dev->phy.radio_rev == 8))
+                pu_delay = max(pu_delay, (u16)2400);
+
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_SPUWKUP, pu_delay);
+}
+
+/* Set the TSF CFP pre-TargetBeaconTransmissionTime. */
+static void b43_set_pretbtt(struct b43_wldev *dev)
+{
+        u16 pretbtt;
+
+        /* The time value is in microseconds. */
+        if (b43_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS)) {
+                pretbtt = 2;
+        } else {
+                if (dev->phy.type == B43_PHYTYPE_A)
+                        pretbtt = 120;
+                else
+                        pretbtt = 250;
+        }
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_PRETBTT, pretbtt);
+        b43_write16(dev, B43_MMIO_TSF_CFP_PRETBTT, pretbtt);
+}
+
 /* Shutdown a wireless core */
 /* Locking: wl->mutex */
 static void b43_wireless_core_exit(struct b43_wldev *dev)
@@ -3423,6 +3827,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
                 b43_rng_exit(dev->wl, false);
         }
         b43_dma_free(dev);
+        b43_pio_free(dev);
         b43_chip_exit(dev);
         b43_radio_turn_off(dev, 1);
         b43_switch_analog(dev, 0);
@@ -3510,6 +3915,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
         b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_PRMAXTIME, 1);
 
         b43_rate_memory_init(dev);
+        b43_set_phytxctl_defaults(dev);
 
         /* Minimum Contention Window */
         if (phy->type == B43_PHYTYPE_B) {
@@ -3520,18 +3926,17 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
         /* Maximum Contention Window */
         b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MAXCONT, 0x3FF);
 
-        err = b43_dma_init(dev);
+        if ((dev->dev->bus->bustype == SSB_BUSTYPE_PCMCIA) || B43_FORCE_PIO) {
+                dev->__using_pio_transfers = 1;
+                err = b43_pio_init(dev);
+        } else {
+                dev->__using_pio_transfers = 0;
+                err = b43_dma_init(dev);
+        }
         if (err)
                 goto err_chip_exit;
         b43_qos_init(dev);
-
-//FIXME
-#if 1
-        b43_write16(dev, 0x0612, 0x0050);
-        b43_shm_write16(dev, B43_SHM_SHARED, 0x0416, 0x0050);
-        b43_shm_write16(dev, B43_SHM_SHARED, 0x0414, 0x01F4);
-#endif
-
+        b43_set_synth_pu_delay(dev, 1);
         b43_bluetooth_coext_enable(dev);
 
         ssb_bus_powerup(bus, 1);        /* Enable dynamic PCTL */
@@ -3591,6 +3996,8 @@ static int b43_op_add_interface(struct ieee80211_hw *hw,
 
         spin_lock_irqsave(&wl->irq_lock, flags);
         b43_adjust_opmode(dev);
+        b43_set_pretbtt(dev);
+        b43_set_synth_pu_delay(dev, 0);
         b43_upload_card_macaddress(dev);
         spin_unlock_irqrestore(&wl->irq_lock, flags);
 
@@ -3642,6 +4049,7 @@ static int b43_op_start(struct ieee80211_hw *hw)
         memset(wl->mac_addr, 0, ETH_ALEN);
         wl->filter_flags = 0;
         wl->radiotap_enabled = 0;
+        b43_qos_clear(wl);
 
         /* First register RFkill.
          * LEDs that are registered later depend on it. */
@@ -3683,6 +4091,8 @@ static void b43_op_stop(struct ieee80211_hw *hw)
         struct b43_wldev *dev = wl->current_dev;
 
         b43_rfkill_exit(dev);
+        cancel_work_sync(&(wl->qos_update_work));
+        cancel_work_sync(&(wl->beacon_update_trigger));
 
         mutex_lock(&wl->mutex);
         if (b43_status(dev) >= B43_STAT_STARTED)
@@ -3716,16 +4126,17 @@ static int b43_op_beacon_set_tim(struct ieee80211_hw *hw, int aid, int set)
         struct b43_wl *wl = hw_to_b43_wl(hw);
         struct sk_buff *beacon;
         unsigned long flags;
+        struct ieee80211_tx_control txctl;
 
         /* We could modify the existing beacon and set the aid bit in
          * the TIM field, but that would probably require resizing and
          * moving of data within the beacon template.
          * Simply request a new beacon and let mac80211 do the hard work. */
-        beacon = ieee80211_beacon_get(hw, wl->vif, NULL);
+        beacon = ieee80211_beacon_get(hw, wl->vif, &txctl);
         if (unlikely(!beacon))
                 return -ENOMEM;
         spin_lock_irqsave(&wl->irq_lock, flags);
-        b43_update_templates(wl, beacon);
+        b43_update_templates(wl, beacon, &txctl);
         spin_unlock_irqrestore(&wl->irq_lock, flags);
 
         return 0;
@@ -3739,12 +4150,22 @@ static int b43_op_ibss_beacon_update(struct ieee80211_hw *hw,
         unsigned long flags;
 
         spin_lock_irqsave(&wl->irq_lock, flags);
-        b43_update_templates(wl, beacon);
+        b43_update_templates(wl, beacon, ctl);
         spin_unlock_irqrestore(&wl->irq_lock, flags);
 
         return 0;
 }
 
+static void b43_op_sta_notify(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif,
+                              enum sta_notify_cmd notify_cmd,
+                              const u8 *addr)
+{
+        struct b43_wl *wl = hw_to_b43_wl(hw);
+
+        B43_WARN_ON(!vif || wl->vif != vif);
+}
+
 static const struct ieee80211_ops b43_hw_ops = {
         .tx                     = b43_op_tx,
         .conf_tx                = b43_op_conf_tx,
@@ -3761,6 +4182,7 @@ static const struct ieee80211_ops b43_hw_ops = {
         .set_retry_limit        = b43_op_set_retry_limit,
         .set_tim                = b43_op_beacon_set_tim,
         .beacon_update          = b43_op_ibss_beacon_update,
+        .sta_notify             = b43_op_sta_notify,
 };
 
 /* Hard-reset the chip. Do not call this directly.
@@ -3804,31 +4226,23 @@ static void b43_chip_reset(struct work_struct *work)
                 b43info(wl, "Controller restarted\n");
 }
 
-static int b43_setup_modes(struct b43_wldev *dev,
+static int b43_setup_bands(struct b43_wldev *dev,
                            bool have_2ghz_phy, bool have_5ghz_phy)
 {
         struct ieee80211_hw *hw = dev->wl->hw;
-        struct ieee80211_hw_mode *mode;
-        struct b43_phy *phy = &dev->phy;
-        int err;
 
-        /* XXX: This function will go away soon, when mac80211
-         *      band stuff is rewritten. So this is just a hack.
-         *      For now we always claim GPHY mode, as there is no
-         *      support for NPHY and APHY in the device, yet.
-         *      This assumption is OK, as any B, N or A PHY will already
-         *      have died a horrible sanity check death earlier. */
-
-        mode = &phy->hwmodes[0];
-        mode->mode = MODE_IEEE80211G;
-        mode->num_channels = b43_2ghz_chantable_size;
-        mode->channels = b43_2ghz_chantable;
-        mode->num_rates = b43_g_ratetable_size;
-        mode->rates = b43_g_ratetable;
-        err = ieee80211_register_hwmode(hw, mode);
-        if (err)
-                return err;
-        phy->possible_phymodes |= B43_PHYMODE_G;
+        if (have_2ghz_phy)
+                hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &b43_band_2GHz;
+        if (dev->phy.type == B43_PHYTYPE_N) {
+                if (have_5ghz_phy)
+                        hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &b43_band_5GHz_nphy;
+        } else {
+                if (have_5ghz_phy)
+                        hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &b43_band_5GHz_aphy;
+        }
+
+        dev->phy.supports_2ghz = have_2ghz_phy;
+        dev->phy.supports_5ghz = have_5ghz_phy;
 
         return 0;
 }
@@ -3910,7 +4324,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
         err = b43_validate_chipaccess(dev);
         if (err)
                 goto err_powerdown;
-        err = b43_setup_modes(dev, have_2ghz_phy, have_5ghz_phy);
+        err = b43_setup_bands(dev, have_2ghz_phy, have_5ghz_phy);
         if (err)
                 goto err_powerdown;
 
@@ -4040,7 +4454,7 @@ static int b43_wireless_init(struct ssb_device *dev)
         hw->max_signal = 100;
         hw->max_rssi = -110;
         hw->max_noise = -110;
-        hw->queues = 1;         /* FIXME: hardware has more queues */
+        hw->queues = b43_modparam_qos ? 4 : 1;
         SET_IEEE80211_DEV(hw, dev->dev);
         if (is_valid_ether_addr(sprom->et1mac))
                 SET_IEEE80211_PERM_ADDR(hw, sprom->et1mac);
@@ -4056,6 +4470,8 @@ static int b43_wireless_init(struct ssb_device *dev)
         spin_lock_init(&wl->shm_lock);
         mutex_init(&wl->mutex);
         INIT_LIST_HEAD(&wl->devlist);
+        INIT_WORK(&wl->qos_update_work, b43_qos_update_work);
+        INIT_WORK(&wl->beacon_update_trigger, b43_beacon_update_trigger_work);
 
         ssb_set_devtypedata(dev, wl);
         b43info(wl, "Broadcom %04X WLAN found\n", dev->bus->chip_id);
diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h
index 2d52d9de9305..5230aeca78bf 100644
--- a/drivers/net/wireless/b43/main.h
+++ b/drivers/net/wireless/b43/main.h
@@ -38,6 +38,10 @@
 /* Magic helper macro to pad structures. Ignore those above. It's magic. */
 #define PAD_BYTES(nr_bytes)             P4D_BYTES( __LINE__ , (nr_bytes))
 
+
+extern int b43_modparam_qos;
+
+
 /* Lightweight function to convert a frequency (in Mhz) to a channel number. */
 static inline u8 b43_freq_to_channel_5ghz(int freq)
 {
@@ -95,16 +99,13 @@ u16 b43_shm_read16(struct b43_wldev *dev, u16 routing, u16 offset);
 void b43_shm_write32(struct b43_wldev *dev, u16 routing, u16 offset, u32 value);
 void b43_shm_write16(struct b43_wldev *dev, u16 routing, u16 offset, u16 value);
 
-u32 b43_hf_read(struct b43_wldev *dev);
-void b43_hf_write(struct b43_wldev *dev, u32 value);
+u64 b43_hf_read(struct b43_wldev *dev);
+void b43_hf_write(struct b43_wldev *dev, u64 value);
 
 void b43_dummy_transmission(struct b43_wldev *dev);
 
 void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags);
 
-void b43_mac_suspend(struct b43_wldev *dev);
-void b43_mac_enable(struct b43_wldev *dev);
-
 void b43_controller_restart(struct b43_wldev *dev, const char *reason);
 
 #define B43_PS_ENABLED  (1 << 0)        /* Force enable hardware power saving */
diff --git a/drivers/net/wireless/b43/nphy.c b/drivers/net/wireless/b43/nphy.c
index 705131ef4bfa..8695eb223476 100644
--- a/drivers/net/wireless/b43/nphy.c
+++ b/drivers/net/wireless/b43/nphy.c
@@ -240,7 +240,6 @@ static void b43_nphy_workarounds(struct b43_wldev *dev)
 
         b43_phy_set(dev, B43_NPHY_IQFLIP,
                     B43_NPHY_IQFLIP_ADC1 | B43_NPHY_IQFLIP_ADC2);
-        //FIXME the following condition is different in the specs.
         if (1 /* FIXME band is 2.4GHz */) {
                 b43_phy_set(dev, B43_NPHY_CLASSCTL,
                             B43_NPHY_CLASSCTL_CCKEN);
diff --git a/drivers/net/wireless/b43/nphy.h b/drivers/net/wireless/b43/nphy.h
index 5d95118b8193..faf46b9cbf1b 100644
--- a/drivers/net/wireless/b43/nphy.h
+++ b/drivers/net/wireless/b43/nphy.h
@@ -919,6 +919,10 @@
 
 struct b43_wldev;
 
+
+#ifdef CONFIG_B43_NPHY
+/* N-PHY support enabled */
+
 int b43_phy_initn(struct b43_wldev *dev);
 
 void b43_nphy_radio_turn_on(struct b43_wldev *dev);
@@ -929,4 +933,40 @@ int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel);
 void b43_nphy_xmitpower(struct b43_wldev *dev);
 void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna);
 
+
+#else /* CONFIG_B43_NPHY */
+/* N-PHY support disabled */
+
+
+static inline
+int b43_phy_initn(struct b43_wldev *dev)
+{
+        return -EOPNOTSUPP;
+}
+
+static inline
+void b43_nphy_radio_turn_on(struct b43_wldev *dev)
+{
+}
+static inline
+void b43_nphy_radio_turn_off(struct b43_wldev *dev)
+{
+}
+
+static inline
+int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel)
+{
+        return -ENOSYS;
+}
+
+static inline
+void b43_nphy_xmitpower(struct b43_wldev *dev)
+{
+}
+static inline
+void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)
+{
+}
+
+#endif /* CONFIG_B43_NPHY */
 #endif /* B43_NPHY_H_ */
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 371e4a119511..b8aa16307f79 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -43,14 +43,16 @@ MODULE_DEVICE_TABLE(pcmcia, b43_pcmcia_tbl);
 #ifdef CONFIG_PM
 static int b43_pcmcia_suspend(struct pcmcia_device *dev)
 {
-        //TODO
-        return 0;
+        struct ssb_bus *ssb = dev->priv;
+
+        return ssb_bus_suspend(ssb);
 }
 
 static int b43_pcmcia_resume(struct pcmcia_device *dev)
 {
-        //TODO
-        return 0;
+        struct ssb_bus *ssb = dev->priv;
+
+        return ssb_bus_resume(ssb);
 }
 #else /* CONFIG_PM */
 # define b43_pcmcia_suspend             NULL
diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
new file mode 100644
index 000000000000..fcacafb04346
--- /dev/null
+++ b/drivers/net/wireless/b43/pio.c
@@ -0,0 +1,842 @@
+/*
+
+  Broadcom B43 wireless driver
+
+  PIO data transfer
+
+  Copyright (c) 2005-2008 Michael Buesch <mb@bu3sch.de>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "b43.h"
+#include "pio.h"
+#include "dma.h"
+#include "main.h"
+#include "xmit.h"
+
+#include <linux/delay.h>
+
+
+static void b43_pio_rx_work(struct work_struct *work);
+
+
+static u16 generate_cookie(struct b43_pio_txqueue *q,
+                           struct b43_pio_txpacket *pack)
+{
+        u16 cookie;
+
+        /* Use the upper 4 bits of the cookie as
+         * PIO controller ID and store the packet index number
+         * in the lower 12 bits.
+         * Note that the cookie must never be 0, as this
+         * is a special value used in RX path.
+         * It can also not be 0xFFFF because that is special
+         * for multicast frames.
+         */
+        cookie = (((u16)q->index + 1) << 12);
+        cookie |= pack->index;
+
+        return cookie;
+}
+
+static
+struct b43_pio_txqueue * parse_cookie(struct b43_wldev *dev,
+                                      u16 cookie,
+                                      struct b43_pio_txpacket **pack)
+{
+        struct b43_pio *pio = &dev->pio;
+        struct b43_pio_txqueue *q = NULL;
+        unsigned int pack_index;
+
+        switch (cookie & 0xF000) {
+        case 0x1000:
+                q = pio->tx_queue_AC_BK;
+                break;
+        case 0x2000:
+                q = pio->tx_queue_AC_BE;
+                break;
+        case 0x3000:
+                q = pio->tx_queue_AC_VI;
+                break;
+        case 0x4000:
+                q = pio->tx_queue_AC_VO;
+                break;
+        case 0x5000:
+                q = pio->tx_queue_mcast;
+                break;
+        }
+        if (B43_WARN_ON(!q))
+                return NULL;
+        pack_index = (cookie & 0x0FFF);
+        if (B43_WARN_ON(pack_index >= ARRAY_SIZE(q->packets)))
+                return NULL;
+        *pack = &q->packets[pack_index];
+
+        return q;
+}
+
+static u16 index_to_pioqueue_base(struct b43_wldev *dev,
+                                  unsigned int index)
+{
+        static const u16 bases[] = {
+                B43_MMIO_PIO_BASE0,
+                B43_MMIO_PIO_BASE1,
+                B43_MMIO_PIO_BASE2,
+                B43_MMIO_PIO_BASE3,
+                B43_MMIO_PIO_BASE4,
+                B43_MMIO_PIO_BASE5,
+                B43_MMIO_PIO_BASE6,
+                B43_MMIO_PIO_BASE7,
+        };
+        static const u16 bases_rev11[] = {
+                B43_MMIO_PIO11_BASE0,
+                B43_MMIO_PIO11_BASE1,
+                B43_MMIO_PIO11_BASE2,
+                B43_MMIO_PIO11_BASE3,
+                B43_MMIO_PIO11_BASE4,
+                B43_MMIO_PIO11_BASE5,
+        };
+
+        if (dev->dev->id.revision >= 11) {
+                B43_WARN_ON(index >= ARRAY_SIZE(bases_rev11));
+                return bases_rev11[index];
+        }
+        B43_WARN_ON(index >= ARRAY_SIZE(bases));
+        return bases[index];
+}
+
+static u16 pio_txqueue_offset(struct b43_wldev *dev)
+{
+        if (dev->dev->id.revision >= 11)
+                return 0x18;
+        return 0;
+}
+
+static u16 pio_rxqueue_offset(struct b43_wldev *dev)
+{
+        if (dev->dev->id.revision >= 11)
+                return 0x38;
+        return 8;
+}
+
+static struct b43_pio_txqueue * b43_setup_pioqueue_tx(struct b43_wldev *dev,
+                                                      unsigned int index)
+{
+        struct b43_pio_txqueue *q;
+        struct b43_pio_txpacket *p;
+        unsigned int i;
+
+        q = kzalloc(sizeof(*q), GFP_KERNEL);
+        if (!q)
+                return NULL;
+        spin_lock_init(&q->lock);
+        q->dev = dev;
+        q->rev = dev->dev->id.revision;
+        q->mmio_base = index_to_pioqueue_base(dev, index) +
+                       pio_txqueue_offset(dev);
+        q->index = index;
+
+        q->free_packet_slots = B43_PIO_MAX_NR_TXPACKETS;
+        if (q->rev >= 8) {
+                q->buffer_size = 1920; //FIXME this constant is wrong.
+        } else {
+                q->buffer_size = b43_piotx_read16(q, B43_PIO_TXQBUFSIZE);
+                q->buffer_size -= 80;
+        }
+
+        INIT_LIST_HEAD(&q->packets_list);
+        for (i = 0; i < ARRAY_SIZE(q->packets); i++) {
+                p = &(q->packets[i]);
+                INIT_LIST_HEAD(&p->list);
+                p->index = i;
+                p->queue = q;
+                list_add(&p->list, &q->packets_list);
+        }
+
+        return q;
+}
+
+static struct b43_pio_rxqueue * b43_setup_pioqueue_rx(struct b43_wldev *dev,
+                                                      unsigned int index)
+{
+        struct b43_pio_rxqueue *q;
+
+        q = kzalloc(sizeof(*q), GFP_KERNEL);
+        if (!q)
+                return NULL;
+        spin_lock_init(&q->lock);
+        q->dev = dev;
+        q->rev = dev->dev->id.revision;
+        q->mmio_base = index_to_pioqueue_base(dev, index) +
+                       pio_rxqueue_offset(dev);
+        INIT_WORK(&q->rx_work, b43_pio_rx_work);
+
+        /* Enable Direct FIFO RX (PIO) on the engine. */
+        b43_dma_direct_fifo_rx(dev, index, 1);
+
+        return q;
+}
+
+static void b43_pio_cancel_tx_packets(struct b43_pio_txqueue *q)
+{
+        struct b43_pio_txpacket *pack;
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(q->packets); i++) {
+                pack = &(q->packets[i]);
+                if (pack->skb) {
+                        dev_kfree_skb_any(pack->skb);
+                        pack->skb = NULL;
+                }
+        }
+}
+
+static void b43_destroy_pioqueue_tx(struct b43_pio_txqueue *q,
+                                    const char *name)
+{
+        if (!q)
+                return;
+        b43_pio_cancel_tx_packets(q);
+        kfree(q);
+}
+
+static void b43_destroy_pioqueue_rx(struct b43_pio_rxqueue *q,
+                                    const char *name)
+{
+        if (!q)
+                return;
+        kfree(q);
+}
+
+#define destroy_queue_tx(pio, queue) do {                               \
+        b43_destroy_pioqueue_tx((pio)->queue, __stringify(queue));      \
+        (pio)->queue = NULL;                                            \
+  } while (0)
+
+#define destroy_queue_rx(pio, queue) do {                               \
+        b43_destroy_pioqueue_rx((pio)->queue, __stringify(queue));      \
+        (pio)->queue = NULL;                                            \
+  } while (0)
+
+void b43_pio_free(struct b43_wldev *dev)
+{
+        struct b43_pio *pio;
+
+        if (!b43_using_pio_transfers(dev))
+                return;
+        pio = &dev->pio;
+
+        destroy_queue_rx(pio, rx_queue);
+        destroy_queue_tx(pio, tx_queue_mcast);
+        destroy_queue_tx(pio, tx_queue_AC_VO);
+        destroy_queue_tx(pio, tx_queue_AC_VI);
+        destroy_queue_tx(pio, tx_queue_AC_BE);
+        destroy_queue_tx(pio, tx_queue_AC_BK);
+}
+
+void b43_pio_stop(struct b43_wldev *dev)
+{
+        if (!b43_using_pio_transfers(dev))
+                return;
+        cancel_work_sync(&dev->pio.rx_queue->rx_work);
+}
+
+int b43_pio_init(struct b43_wldev *dev)
+{
+        struct b43_pio *pio = &dev->pio;
+        int err = -ENOMEM;
+
+        b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
+                    & ~B43_MACCTL_BE);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_RXPADOFF, 0);
+
+        pio->tx_queue_AC_BK = b43_setup_pioqueue_tx(dev, 0);
+        if (!pio->tx_queue_AC_BK)
+                goto out;
+
+        pio->tx_queue_AC_BE = b43_setup_pioqueue_tx(dev, 1);
+        if (!pio->tx_queue_AC_BE)
+                goto err_destroy_bk;
+
+        pio->tx_queue_AC_VI = b43_setup_pioqueue_tx(dev, 2);
+        if (!pio->tx_queue_AC_VI)
+                goto err_destroy_be;
+
+        pio->tx_queue_AC_VO = b43_setup_pioqueue_tx(dev, 3);
+        if (!pio->tx_queue_AC_VO)
+                goto err_destroy_vi;
+
+        pio->tx_queue_mcast = b43_setup_pioqueue_tx(dev, 4);
+        if (!pio->tx_queue_mcast)
+                goto err_destroy_vo;
+
+        pio->rx_queue = b43_setup_pioqueue_rx(dev, 0);
+        if (!pio->rx_queue)
+                goto err_destroy_mcast;
+
+        b43dbg(dev->wl, "PIO initialized\n");
+        err = 0;
+out:
+        return err;
+
+err_destroy_mcast:
+        destroy_queue_tx(pio, tx_queue_mcast);
+err_destroy_vo:
+        destroy_queue_tx(pio, tx_queue_AC_VO);
+err_destroy_vi:
+        destroy_queue_tx(pio, tx_queue_AC_VI);
+err_destroy_be:
+        destroy_queue_tx(pio, tx_queue_AC_BE);
+err_destroy_bk:
+        destroy_queue_tx(pio, tx_queue_AC_BK);
+        return err;
+}
+
+/* Static mapping of mac80211's queues (priorities) to b43 PIO queues. */
+static struct b43_pio_txqueue * select_queue_by_priority(struct b43_wldev *dev,
+                                                         u8 queue_prio)
+{
+        struct b43_pio_txqueue *q;
+
+        if (b43_modparam_qos) {
+                /* 0 = highest priority */
+                switch (queue_prio) {
+                default:
+                        B43_WARN_ON(1);
+                        /* fallthrough */
+                case 0:
+                        q = dev->pio.tx_queue_AC_VO;
+                        break;
+                case 1:
+                        q = dev->pio.tx_queue_AC_VI;
+                        break;
+                case 2:
+                        q = dev->pio.tx_queue_AC_BE;
+                        break;
+                case 3:
+                        q = dev->pio.tx_queue_AC_BK;
+                        break;
+                }
+        } else
+                q = dev->pio.tx_queue_AC_BE;
+
+        return q;
+}
+
+static u16 tx_write_2byte_queue(struct b43_pio_txqueue *q,
+                                u16 ctl,
+                                const void *_data,
+                                unsigned int data_len)
+{
+        struct b43_wldev *dev = q->dev;
+        const u8 *data = _data;
+
+        ctl |= B43_PIO_TXCTL_WRITELO | B43_PIO_TXCTL_WRITEHI;
+        b43_piotx_write16(q, B43_PIO_TXCTL, ctl);
+
+        ssb_block_write(dev->dev, data, (data_len & ~1),
+                        q->mmio_base + B43_PIO_TXDATA,
+                        sizeof(u16));
+        if (data_len & 1) {
+                /* Write the last byte. */
+                ctl &= ~B43_PIO_TXCTL_WRITEHI;
+                b43_piotx_write16(q, B43_PIO_TXCTL, ctl);
+                b43_piotx_write16(q, B43_PIO_TXDATA, data[data_len - 1]);
+        }
+
+        return ctl;
+}
+
+static void pio_tx_frame_2byte_queue(struct b43_pio_txpacket *pack,
+                                     const u8 *hdr, unsigned int hdrlen)
+{
+        struct b43_pio_txqueue *q = pack->queue;
+        const char *frame = pack->skb->data;
+        unsigned int frame_len = pack->skb->len;
+        u16 ctl;
+
+        ctl = b43_piotx_read16(q, B43_PIO_TXCTL);
+        ctl |= B43_PIO_TXCTL_FREADY;
+        ctl &= ~B43_PIO_TXCTL_EOF;
+
+        /* Transfer the header data. */
+        ctl = tx_write_2byte_queue(q, ctl, hdr, hdrlen);
+        /* Transfer the frame data. */
+        ctl = tx_write_2byte_queue(q, ctl, frame, frame_len);
+
+        ctl |= B43_PIO_TXCTL_EOF;
+        b43_piotx_write16(q, B43_PIO_TXCTL, ctl);
+}
+
+static u32 tx_write_4byte_queue(struct b43_pio_txqueue *q,
+                                u32 ctl,
+                                const void *_data,
+                                unsigned int data_len)
+{
+        struct b43_wldev *dev = q->dev;
+        const u8 *data = _data;
+
+        ctl |= B43_PIO8_TXCTL_0_7 | B43_PIO8_TXCTL_8_15 |
+               B43_PIO8_TXCTL_16_23 | B43_PIO8_TXCTL_24_31;
+        b43_piotx_write32(q, B43_PIO8_TXCTL, ctl);
+
+        ssb_block_write(dev->dev, data, (data_len & ~3),
+                        q->mmio_base + B43_PIO8_TXDATA,
+                        sizeof(u32));
+        if (data_len & 3) {
+                u32 value = 0;
+
+                /* Write the last few bytes. */
+                ctl &= ~(B43_PIO8_TXCTL_8_15 | B43_PIO8_TXCTL_16_23 |
+                         B43_PIO8_TXCTL_24_31);
+                data = &(data[data_len - 1]);
+                switch (data_len & 3) {
+                case 3:
+                        ctl |= B43_PIO8_TXCTL_16_23;
+                        value |= (u32)(*data) << 16;
+                        data--;
+                case 2:
+                        ctl |= B43_PIO8_TXCTL_8_15;
+                        value |= (u32)(*data) << 8;
+                        data--;
+                case 1:
+                        value |= (u32)(*data);
+                }
+                b43_piotx_write32(q, B43_PIO8_TXCTL, ctl);
+                b43_piotx_write32(q, B43_PIO8_TXDATA, value);
+        }
+
+        return ctl;
+}
+
+static void pio_tx_frame_4byte_queue(struct b43_pio_txpacket *pack,
+                                     const u8 *hdr, unsigned int hdrlen)
+{
+        struct b43_pio_txqueue *q = pack->queue;
+        const char *frame = pack->skb->data;
+        unsigned int frame_len = pack->skb->len;
+        u32 ctl;
+
+        ctl = b43_piotx_read32(q, B43_PIO8_TXCTL);
+        ctl |= B43_PIO8_TXCTL_FREADY;
+        ctl &= ~B43_PIO8_TXCTL_EOF;
+
+        /* Transfer the header data. */
+        ctl = tx_write_4byte_queue(q, ctl, hdr, hdrlen);
+        /* Transfer the frame data. */
+        ctl = tx_write_4byte_queue(q, ctl, frame, frame_len);
+
+        ctl |= B43_PIO8_TXCTL_EOF;
+        b43_piotx_write32(q, B43_PIO_TXCTL, ctl);
+}
+
+static int pio_tx_frame(struct b43_pio_txqueue *q,
+                        struct sk_buff *skb,
+                        struct ieee80211_tx_control *ctl)
+{
+        struct b43_pio_txpacket *pack;
+        struct b43_txhdr txhdr;
+        u16 cookie;
+        int err;
+        unsigned int hdrlen;
+
+        B43_WARN_ON(list_empty(&q->packets_list));
+        pack = list_entry(q->packets_list.next,
+                          struct b43_pio_txpacket, list);
+        memset(&pack->txstat, 0, sizeof(pack->txstat));
+        memcpy(&pack->txstat.control, ctl, sizeof(*ctl));
+
+        cookie = generate_cookie(q, pack);
+        hdrlen = b43_txhdr_size(q->dev);
+        err = b43_generate_txhdr(q->dev, (u8 *)&txhdr, skb->data,
+                                 skb->len, ctl, cookie);
+        if (err)
+                return err;
+
+        if (ctl->flags & IEEE80211_TXCTL_SEND_AFTER_DTIM) {
+                /* Tell the firmware about the cookie of the last
+                 * mcast frame, so it can clear the more-data bit in it. */
+                b43_shm_write16(q->dev, B43_SHM_SHARED,
+                                B43_SHM_SH_MCASTCOOKIE, cookie);
+        }
+
+        pack->skb = skb;
+        if (q->rev >= 8)
+                pio_tx_frame_4byte_queue(pack, (const u8 *)&txhdr, hdrlen);
+        else
+                pio_tx_frame_2byte_queue(pack, (const u8 *)&txhdr, hdrlen);
+
+        /* Remove it from the list of available packet slots.
+         * It will be put back when we receive the status report. */
+        list_del(&pack->list);
+
+        /* Update the queue statistics. */
+        q->buffer_used += roundup(skb->len + hdrlen, 4);
+        q->free_packet_slots -= 1;
+
+        return 0;
+}
+
+int b43_pio_tx(struct b43_wldev *dev,
+               struct sk_buff *skb, struct ieee80211_tx_control *ctl)
+{
+        struct b43_pio_txqueue *q;
+        struct ieee80211_hdr *hdr;
+        unsigned long flags;
+        unsigned int hdrlen, total_len;
+        int err = 0;
+
+        hdr = (struct ieee80211_hdr *)skb->data;
+        if (ctl->flags & IEEE80211_TXCTL_SEND_AFTER_DTIM) {
+                /* The multicast queue will be sent after the DTIM. */
+                q = dev->pio.tx_queue_mcast;
+                /* Set the frame More-Data bit. Ucode will clear it
+                 * for us on the last frame. */
+                hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+        } else {
+                /* Decide by priority where to put this frame. */
+                q = select_queue_by_priority(dev, ctl->queue);
+        }
+
+        spin_lock_irqsave(&q->lock, flags);
+
+        hdrlen = b43_txhdr_size(dev);
+        total_len = roundup(skb->len + hdrlen, 4);
+
+        if (unlikely(total_len > q->buffer_size)) {
+                err = -ENOBUFS;
+                b43dbg(dev->wl, "PIO: TX packet longer than queue.\n");
+                goto out_unlock;
+        }
+        if (unlikely(q->free_packet_slots == 0)) {
+                err = -ENOBUFS;
+                b43warn(dev->wl, "PIO: TX packet overflow.\n");
+                goto out_unlock;
+        }
+        B43_WARN_ON(q->buffer_used > q->buffer_size);
+
+        if (total_len > (q->buffer_size - q->buffer_used)) {
+                /* Not enough memory on the queue. */
+                err = -EBUSY;
+                ieee80211_stop_queue(dev->wl->hw, ctl->queue);
+                q->stopped = 1;
+                goto out_unlock;
+        }
+
+        /* Assign the queue number to the ring (if not already done before)
+         * so TX status handling can use it. The mac80211-queue to b43-queue
+         * mapping is static, so we don't need to store it per frame. */
+        q->queue_prio = ctl->queue;
+
+        err = pio_tx_frame(q, skb, ctl);
+        if (unlikely(err == -ENOKEY)) {
+                /* Drop this packet, as we don't have the encryption key
+                 * anymore and must not transmit it unencrypted. */
+                dev_kfree_skb_any(skb);
+                err = 0;
+                goto out_unlock;
+        }
+        if (unlikely(err)) {
+                b43err(dev->wl, "PIO transmission failure\n");
+                goto out_unlock;
+        }
+        q->nr_tx_packets++;
+
+        B43_WARN_ON(q->buffer_used > q->buffer_size);
+        if (((q->buffer_size - q->buffer_used) < roundup(2 + 2 + 6, 4)) ||
+            (q->free_packet_slots == 0)) {
+                /* The queue is full. */
+                ieee80211_stop_queue(dev->wl->hw, ctl->queue);
+                q->stopped = 1;
+        }
+
+out_unlock:
+        spin_unlock_irqrestore(&q->lock, flags);
+
+        return err;
+}
+
+/* Called with IRQs disabled. */
+void b43_pio_handle_txstatus(struct b43_wldev *dev,
+                             const struct b43_txstatus *status)
+{
+        struct b43_pio_txqueue *q;
+        struct b43_pio_txpacket *pack = NULL;
+        unsigned int total_len;
+
+        q = parse_cookie(dev, status->cookie, &pack);
+        if (unlikely(!q))
+                return;
+        B43_WARN_ON(!pack);
+
+        spin_lock(&q->lock); /* IRQs are already disabled. */
+
+        b43_fill_txstatus_report(&(pack->txstat), status);
+
+        total_len = pack->skb->len + b43_txhdr_size(dev);
+        total_len = roundup(total_len, 4);
+        q->buffer_used -= total_len;
+        q->free_packet_slots += 1;
+
+        ieee80211_tx_status_irqsafe(dev->wl->hw, pack->skb,
+                                    &(pack->txstat));
+        pack->skb = NULL;
+        list_add(&pack->list, &q->packets_list);
+
+        if (q->stopped) {
+                ieee80211_wake_queue(dev->wl->hw, q->queue_prio);
+                q->stopped = 0;
+        }
+
+        spin_unlock(&q->lock);
+}
+
+void b43_pio_get_tx_stats(struct b43_wldev *dev,
+                          struct ieee80211_tx_queue_stats *stats)
+{
+        const int nr_queues = dev->wl->hw->queues;
+        struct b43_pio_txqueue *q;
+        struct ieee80211_tx_queue_stats_data *data;
+        unsigned long flags;
+        int i;
+
+        for (i = 0; i < nr_queues; i++) {
+                data = &(stats->data[i]);
+                q = select_queue_by_priority(dev, i);
+
+                spin_lock_irqsave(&q->lock, flags);
+                data->len = B43_PIO_MAX_NR_TXPACKETS - q->free_packet_slots;
+                data->limit = B43_PIO_MAX_NR_TXPACKETS;
+                data->count = q->nr_tx_packets;
+                spin_unlock_irqrestore(&q->lock, flags);
+        }
+}
+
+/* Returns whether we should fetch another frame. */
+static bool pio_rx_frame(struct b43_pio_rxqueue *q)
+{
+        struct b43_wldev *dev = q->dev;
+        struct b43_rxhdr_fw4 rxhdr;
+        u16 len;
+        u32 macstat;
+        unsigned int i, padding;
+        struct sk_buff *skb;
+        const char *err_msg = NULL;
+
+        memset(&rxhdr, 0, sizeof(rxhdr));
+
+        /* Check if we have data and wait for it to get ready. */
+        if (q->rev >= 8) {
+                u32 ctl;
+
+                ctl = b43_piorx_read32(q, B43_PIO8_RXCTL);
+                if (!(ctl & B43_PIO8_RXCTL_FRAMERDY))
+                        return 0;
+                b43_piorx_write32(q, B43_PIO8_RXCTL,
+                                  B43_PIO8_RXCTL_FRAMERDY);
+                for (i = 0; i < 10; i++) {
+                        ctl = b43_piorx_read32(q, B43_PIO8_RXCTL);
+                        if (ctl & B43_PIO8_RXCTL_DATARDY)
+                                goto data_ready;
+                        udelay(10);
+                }
+        } else {
+                u16 ctl;
+
+                ctl = b43_piorx_read16(q, B43_PIO_RXCTL);
+                if (!(ctl & B43_PIO_RXCTL_FRAMERDY))
+                        return 0;
+                b43_piorx_write16(q, B43_PIO_RXCTL,
+                                  B43_PIO_RXCTL_FRAMERDY);
+                for (i = 0; i < 10; i++) {
+                        ctl = b43_piorx_read16(q, B43_PIO_RXCTL);
+                        if (ctl & B43_PIO_RXCTL_DATARDY)
+                                goto data_ready;
+                        udelay(10);
+                }
+        }
+        b43dbg(q->dev->wl, "PIO RX timed out\n");
+        return 1;
+data_ready:
+
+        /* Get the preamble (RX header) */
+        if (q->rev >= 8) {
+                ssb_block_read(dev->dev, &rxhdr, sizeof(rxhdr),
+                               q->mmio_base + B43_PIO8_RXDATA,
+                               sizeof(u32));
+        } else {
+                ssb_block_read(dev->dev, &rxhdr, sizeof(rxhdr),
+                               q->mmio_base + B43_PIO_RXDATA,
+                               sizeof(u16));
+        }
+        /* Sanity checks. */
+        len = le16_to_cpu(rxhdr.frame_len);
+        if (unlikely(len > 0x700)) {
+                err_msg = "len > 0x700";
+                goto rx_error;
+        }
+        if (unlikely(len == 0)) {
+                err_msg = "len == 0";
+                goto rx_error;
+        }
+
+        macstat = le32_to_cpu(rxhdr.mac_status);
+        if (macstat & B43_RX_MAC_FCSERR) {
+                if (!(q->dev->wl->filter_flags & FIF_FCSFAIL)) {
+                        /* Drop frames with failed FCS. */
+                        err_msg = "Frame FCS error";
+                        goto rx_error;
+                }
+        }
+
+        /* We always pad 2 bytes, as that's what upstream code expects
+         * due to the RX-header being 30 bytes. In case the frame is
+         * unaligned, we pad another 2 bytes. */
+        padding = (macstat & B43_RX_MAC_PADDING) ? 2 : 0;
+        skb = dev_alloc_skb(len + padding + 2);
+        if (unlikely(!skb)) {
+                err_msg = "Out of memory";
+                goto rx_error;
+        }
+        skb_reserve(skb, 2);
+        skb_put(skb, len + padding);
+        if (q->rev >= 8) {
+                ssb_block_read(dev->dev, skb->data + padding, (len & ~3),
+                               q->mmio_base + B43_PIO8_RXDATA,
+                               sizeof(u32));
+                if (len & 3) {
+                        u32 value;
+                        char *data;
+
+                        /* Read the last few bytes. */
+                        value = b43_piorx_read32(q, B43_PIO8_RXDATA);
+                        data = &(skb->data[len + padding - 1]);
+                        switch (len & 3) {
+                        case 3:
+                                *data = (value >> 16);
+                                data--;
+                        case 2:
+                                *data = (value >> 8);
+                                data--;
+                        case 1:
+                                *data = value;
+                        }
+                }
+        } else {
+                ssb_block_read(dev->dev, skb->data + padding, (len & ~1),
+                               q->mmio_base + B43_PIO_RXDATA,
+                               sizeof(u16));
+                if (len & 1) {
+                        u16 value;
+
+                        /* Read the last byte. */
+                        value = b43_piorx_read16(q, B43_PIO_RXDATA);
+                        skb->data[len + padding - 1] = value;
+                }
+        }
+
+        b43_rx(q->dev, skb, &rxhdr);
+
+        return 1;
+
+rx_error:
+        if (err_msg)
+                b43dbg(q->dev->wl, "PIO RX error: %s\n", err_msg);
+        b43_piorx_write16(q, B43_PIO_RXCTL, B43_PIO_RXCTL_DATARDY);
+        return 1;
+}
+
+/* RX workqueue. We can sleep, yay! */
+static void b43_pio_rx_work(struct work_struct *work)
+{
+        struct b43_pio_rxqueue *q = container_of(work, struct b43_pio_rxqueue,
+                                                 rx_work);
+        unsigned int budget = 50;
+        bool stop;
+
+        do {
+                spin_lock_irq(&q->lock);
+                stop = (pio_rx_frame(q) == 0);
+                spin_unlock_irq(&q->lock);
+                cond_resched();
+                if (stop)
+                        break;
+        } while (--budget);
+}
+
+/* Called with IRQs disabled. */
+void b43_pio_rx(struct b43_pio_rxqueue *q)
+{
+        /* Due to latency issues we must run the RX path in
+         * a workqueue to be able to schedule between packets. */
+        queue_work(q->dev->wl->hw->workqueue, &q->rx_work);
+}
+
+static void b43_pio_tx_suspend_queue(struct b43_pio_txqueue *q)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&q->lock, flags);
+        if (q->rev >= 8) {
+                b43_piotx_write32(q, B43_PIO8_TXCTL,
+                                  b43_piotx_read32(q, B43_PIO8_TXCTL)
+                                  | B43_PIO8_TXCTL_SUSPREQ);
+        } else {
+                b43_piotx_write16(q, B43_PIO_TXCTL,
+                                  b43_piotx_read16(q, B43_PIO_TXCTL)
+                                  | B43_PIO_TXCTL_SUSPREQ);
+        }
+        spin_unlock_irqrestore(&q->lock, flags);
+}
+
+static void b43_pio_tx_resume_queue(struct b43_pio_txqueue *q)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&q->lock, flags);
+        if (q->rev >= 8) {
+                b43_piotx_write32(q, B43_PIO8_TXCTL,
+                                  b43_piotx_read32(q, B43_PIO8_TXCTL)
+                                  & ~B43_PIO8_TXCTL_SUSPREQ);
+        } else {
+                b43_piotx_write16(q, B43_PIO_TXCTL,
+                                  b43_piotx_read16(q, B43_PIO_TXCTL)
+                                  & ~B43_PIO_TXCTL_SUSPREQ);
+        }
+        spin_unlock_irqrestore(&q->lock, flags);
+}
+
+void b43_pio_tx_suspend(struct b43_wldev *dev)
+{
+        b43_power_saving_ctl_bits(dev, B43_PS_AWAKE);
+        b43_pio_tx_suspend_queue(dev->pio.tx_queue_AC_BK);
+        b43_pio_tx_suspend_queue(dev->pio.tx_queue_AC_BE);
+        b43_pio_tx_suspend_queue(dev->pio.tx_queue_AC_VI);
+        b43_pio_tx_suspend_queue(dev->pio.tx_queue_AC_VO);
+        b43_pio_tx_suspend_queue(dev->pio.tx_queue_mcast);
+}
+
+void b43_pio_tx_resume(struct b43_wldev *dev)
+{
+        b43_pio_tx_resume_queue(dev->pio.tx_queue_mcast);
+        b43_pio_tx_resume_queue(dev->pio.tx_queue_AC_VO);
+        b43_pio_tx_resume_queue(dev->pio.tx_queue_AC_VI);
+        b43_pio_tx_resume_queue(dev->pio.tx_queue_AC_BE);
+        b43_pio_tx_resume_queue(dev->pio.tx_queue_AC_BK);
+        b43_power_saving_ctl_bits(dev, 0);
+}
diff --git a/drivers/net/wireless/b43/pio.h b/drivers/net/wireless/b43/pio.h
new file mode 100644
index 000000000000..e2ec676cc9e4
--- /dev/null
+++ b/drivers/net/wireless/b43/pio.h
@@ -0,0 +1,220 @@
+#ifndef B43_PIO_H_
+#define B43_PIO_H_
+
+#include "b43.h"
+
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/list.h>
+#include <linux/skbuff.h>
+
+
+/*** Registers for PIO queues up to revision 7. ***/
+/* TX queue. */
+#define B43_PIO_TXCTL                   0x00
+#define  B43_PIO_TXCTL_WRITELO          0x0001
+#define  B43_PIO_TXCTL_WRITEHI          0x0002
+#define  B43_PIO_TXCTL_EOF              0x0004
+#define  B43_PIO_TXCTL_FREADY           0x0008
+#define  B43_PIO_TXCTL_FLUSHREQ         0x0020
+#define  B43_PIO_TXCTL_FLUSHPEND        0x0040
+#define  B43_PIO_TXCTL_SUSPREQ          0x0080
+#define  B43_PIO_TXCTL_QSUSP            0x0100
+#define  B43_PIO_TXCTL_COMMCNT          0xFC00
+#define  B43_PIO_TXCTL_COMMCNT_SHIFT    10
+#define B43_PIO_TXDATA                  0x02
+#define B43_PIO_TXQBUFSIZE              0x04
+/* RX queue. */
+#define B43_PIO_RXCTL                   0x00
+#define  B43_PIO_RXCTL_FRAMERDY         0x0001
+#define  B43_PIO_RXCTL_DATARDY          0x0002
+#define B43_PIO_RXDATA                  0x02
+
+/*** Registers for PIO queues revision 8 and later. ***/
+/* TX queue */
+#define B43_PIO8_TXCTL                  0x00
+#define  B43_PIO8_TXCTL_0_7             0x00000001
+#define  B43_PIO8_TXCTL_8_15            0x00000002
+#define  B43_PIO8_TXCTL_16_23           0x00000004
+#define  B43_PIO8_TXCTL_24_31           0x00000008
+#define  B43_PIO8_TXCTL_EOF             0x00000010
+#define  B43_PIO8_TXCTL_FREADY          0x00000080
+#define  B43_PIO8_TXCTL_SUSPREQ         0x00000100
+#define  B43_PIO8_TXCTL_QSUSP           0x00000200
+#define  B43_PIO8_TXCTL_FLUSHREQ        0x00000400
+#define  B43_PIO8_TXCTL_FLUSHPEND       0x00000800
+#define B43_PIO8_TXDATA                 0x04
+/* RX queue */
+#define B43_PIO8_RXCTL                  0x00
+#define  B43_PIO8_RXCTL_FRAMERDY        0x00000001
+#define  B43_PIO8_RXCTL_DATARDY         0x00000002
+#define B43_PIO8_RXDATA                 0x04
+
+
+/* The maximum number of TX-packets the HW can handle. */
+#define B43_PIO_MAX_NR_TXPACKETS        32
+
+
+#ifdef CONFIG_B43_PIO
+
+struct b43_pio_txpacket {
+        /* Pointer to the TX queue we belong to. */
+        struct b43_pio_txqueue *queue;
+        /* The TX data packet. */
+        struct sk_buff *skb;
+        /* The status meta data. */
+        struct ieee80211_tx_status txstat;
+        /* Index in the (struct b43_pio_txqueue)->packets array. */
+        u8 index;
+
+        struct list_head list;
+};
+
+struct b43_pio_txqueue {
+        struct b43_wldev *dev;
+        spinlock_t lock;
+        u16 mmio_base;
+
+        /* The device queue buffer size in bytes. */
+        u16 buffer_size;
+        /* The number of used bytes in the device queue buffer. */
+        u16 buffer_used;
+        /* The number of packets that can still get queued.
+         * This is decremented on queueing a packet and incremented
+         * after receiving the transmit status. */
+        u16 free_packet_slots;
+
+        /* True, if the mac80211 queue was stopped due to overflow at TX. */
+        bool stopped;
+        /* Our b43 queue index number */
+        u8 index;
+        /* The mac80211 QoS queue priority. */
+        u8 queue_prio;
+
+        /* Buffer for TX packet meta data. */
+        struct b43_pio_txpacket packets[B43_PIO_MAX_NR_TXPACKETS];
+        struct list_head packets_list;
+
+        /* Total number of transmitted packets. */
+        unsigned int nr_tx_packets;
+
+        /* Shortcut to the 802.11 core revision. This is to
+         * avoid horrible pointer dereferencing in the fastpaths. */
+        u8 rev;
+};
+
+struct b43_pio_rxqueue {
+        struct b43_wldev *dev;
+        spinlock_t lock;
+        u16 mmio_base;
+
+        /* Work to reduce latency issues on RX. */
+        struct work_struct rx_work;
+
+        /* Shortcut to the 802.11 core revision. This is to
+         * avoid horrible pointer dereferencing in the fastpaths. */
+        u8 rev;
+};
+
+
+static inline u16 b43_piotx_read16(struct b43_pio_txqueue *q, u16 offset)
+{
+        return b43_read16(q->dev, q->mmio_base + offset);
+}
+
+static inline u32 b43_piotx_read32(struct b43_pio_txqueue *q, u16 offset)
+{
+        return b43_read32(q->dev, q->mmio_base + offset);
+}
+
+static inline void b43_piotx_write16(struct b43_pio_txqueue *q,
+                                     u16 offset, u16 value)
+{
+        b43_write16(q->dev, q->mmio_base + offset, value);
+}
+
+static inline void b43_piotx_write32(struct b43_pio_txqueue *q,
+                                     u16 offset, u32 value)
+{
+        b43_write32(q->dev, q->mmio_base + offset, value);
+}
+
+
+static inline u16 b43_piorx_read16(struct b43_pio_rxqueue *q, u16 offset)
+{
+        return b43_read16(q->dev, q->mmio_base + offset);
+}
+
+static inline u32 b43_piorx_read32(struct b43_pio_rxqueue *q, u16 offset)
+{
+        return b43_read32(q->dev, q->mmio_base + offset);
+}
+
+static inline void b43_piorx_write16(struct b43_pio_rxqueue *q,
+                                     u16 offset, u16 value)
+{
+        b43_write16(q->dev, q->mmio_base + offset, value);
+}
+
+static inline void b43_piorx_write32(struct b43_pio_rxqueue *q,
+                                     u16 offset, u32 value)
+{
+        b43_write32(q->dev, q->mmio_base + offset, value);
+}
+
+
+int b43_pio_init(struct b43_wldev *dev);
+void b43_pio_stop(struct b43_wldev *dev);
+void b43_pio_free(struct b43_wldev *dev);
+
+int b43_pio_tx(struct b43_wldev *dev,
+               struct sk_buff *skb, struct ieee80211_tx_control *ctl);
+void b43_pio_handle_txstatus(struct b43_wldev *dev,
+                             const struct b43_txstatus *status);
+void b43_pio_get_tx_stats(struct b43_wldev *dev,
+                          struct ieee80211_tx_queue_stats *stats);
+void b43_pio_rx(struct b43_pio_rxqueue *q);
+
+void b43_pio_tx_suspend(struct b43_wldev *dev);
+void b43_pio_tx_resume(struct b43_wldev *dev);
+
+
+#else /* CONFIG_B43_PIO */
+
+
+static inline int b43_pio_init(struct b43_wldev *dev)
+{
+        return 0;
+}
+static inline void b43_pio_free(struct b43_wldev *dev)
+{
+}
+static inline void b43_pio_stop(struct b43_wldev *dev)
+{
+}
+static inline int b43_pio_tx(struct b43_wldev *dev,
+                             struct sk_buff *skb,
+                             struct ieee80211_tx_control *ctl)
+{
+        return 0;
+}
+static inline void b43_pio_handle_txstatus(struct b43_wldev *dev,
+                                           const struct b43_txstatus *status)
+{
+}
+static inline void b43_pio_get_tx_stats(struct b43_wldev *dev,
+                                        struct ieee80211_tx_queue_stats *stats)
+{
+}
+static inline void b43_pio_rx(struct b43_pio_rxqueue *q)
+{
+}
+static inline void b43_pio_tx_suspend(struct b43_wldev *dev)
+{
+}
+static inline void b43_pio_tx_resume(struct b43_wldev *dev)
+{
+}
+
+#endif /* CONFIG_B43_PIO */
+#endif /* B43_PIO_H_ */
diff --git a/drivers/net/wireless/b43/sysfs.c b/drivers/net/wireless/b43/sysfs.c
index f4faff6a7d6c..275095b8cbe7 100644
--- a/drivers/net/wireless/b43/sysfs.c
+++ b/drivers/net/wireless/b43/sysfs.c
@@ -47,29 +47,6 @@ static int get_integer(const char *buf, size_t count)
         return ret;
 }
 
-static int get_boolean(const char *buf, size_t count)
-{
-        if (count != 0) {
-                if (buf[0] == '1')
-                        return 1;
-                if (buf[0] == '0')
-                        return 0;
-                if (count >= 4 && memcmp(buf, "true", 4) == 0)
-                        return 1;
-                if (count >= 5 && memcmp(buf, "false", 5) == 0)
-                        return 0;
-                if (count >= 3 && memcmp(buf, "yes", 3) == 0)
-                        return 1;
-                if (count >= 2 && memcmp(buf, "no", 2) == 0)
-                        return 0;
-                if (count >= 2 && memcmp(buf, "on", 2) == 0)
-                        return 1;
-                if (count >= 3 && memcmp(buf, "off", 3) == 0)
-                        return 0;
-        }
-        return -EINVAL;
-}
-
 static ssize_t b43_attr_interfmode_show(struct device *dev,
                                         struct device_attribute *attr,
                                         char *buf)
@@ -155,82 +132,18 @@ static ssize_t b43_attr_interfmode_store(struct device *dev,
 static DEVICE_ATTR(interference, 0644,
                    b43_attr_interfmode_show, b43_attr_interfmode_store);
 
-static ssize_t b43_attr_preamble_show(struct device *dev,
-                                      struct device_attribute *attr, char *buf)
-{
-        struct b43_wldev *wldev = dev_to_b43_wldev(dev);
-        ssize_t count;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        mutex_lock(&wldev->wl->mutex);
-
-        if (wldev->short_preamble)
-                count =
-                    snprintf(buf, PAGE_SIZE, "1 (Short Preamble enabled)\n");
-        else
-                count =
-                    snprintf(buf, PAGE_SIZE, "0 (Short Preamble disabled)\n");
-
-        mutex_unlock(&wldev->wl->mutex);
-
-        return count;
-}
-
-static ssize_t b43_attr_preamble_store(struct device *dev,
-                                       struct device_attribute *attr,
-                                       const char *buf, size_t count)
-{
-        struct b43_wldev *wldev = dev_to_b43_wldev(dev);
-        unsigned long flags;
-        int value;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        value = get_boolean(buf, count);
-        if (value < 0)
-                return value;
-        mutex_lock(&wldev->wl->mutex);
-        spin_lock_irqsave(&wldev->wl->irq_lock, flags);
-
-        wldev->short_preamble = !!value;
-
-        spin_unlock_irqrestore(&wldev->wl->irq_lock, flags);
-        mutex_unlock(&wldev->wl->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(shortpreamble, 0644,
-                   b43_attr_preamble_show, b43_attr_preamble_store);
-
 int b43_sysfs_register(struct b43_wldev *wldev)
 {
         struct device *dev = wldev->dev->dev;
-        int err;
 
         B43_WARN_ON(b43_status(wldev) != B43_STAT_INITIALIZED);
 
-        err = device_create_file(dev, &dev_attr_interference);
-        if (err)
-                goto out;
-        err = device_create_file(dev, &dev_attr_shortpreamble);
-        if (err)
-                goto err_remove_interfmode;
-
-      out:
-        return err;
-      err_remove_interfmode:
-        device_remove_file(dev, &dev_attr_interference);
-        goto out;
+        return device_create_file(dev, &dev_attr_interference);
 }
 
 void b43_sysfs_unregister(struct b43_wldev *wldev)
 {
         struct device *dev = wldev->dev->dev;
 
-        device_remove_file(dev, &dev_attr_shortpreamble);
         device_remove_file(dev, &dev_attr_interference);
 }
diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c
index e632125cb772..daa94211f838 100644
--- a/drivers/net/wireless/b43/wa.c
+++ b/drivers/net/wireless/b43/wa.c
@@ -204,42 +204,43 @@ static void b43_wa_rt(struct b43_wldev *dev) /* Rotor table */
                 b43_ofdmtab_write32(dev, B43_OFDMTAB_ROTOR, i, b43_tab_rotor[i]);
 }
 
+static void b43_write_null_nst(struct b43_wldev *dev)
+{
+        int i;
+
+        for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
+                b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE, i, 0);
+}
+
+static void b43_write_nst(struct b43_wldev *dev, const u16 *nst)
+{
+        int i;
+
+        for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
+                b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE, i, nst[i]);
+}
+
 static void b43_wa_nst(struct b43_wldev *dev) /* Noise scale table */
 {
         struct b43_phy *phy = &dev->phy;
-        int i;
 
         if (phy->type == B43_PHYTYPE_A) {
                 if (phy->rev <= 1)
-                        for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
-                                b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE,
-                                                        i, 0);
+                        b43_write_null_nst(dev);
                 else if (phy->rev == 2)
-                        for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
-                                b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE,
-                                                        i, b43_tab_noisescalea2[i]);
+                        b43_write_nst(dev, b43_tab_noisescalea2);
                 else if (phy->rev == 3)
-                        for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
-                                b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE,
-                                                        i, b43_tab_noisescalea3[i]);
+                        b43_write_nst(dev, b43_tab_noisescalea3);
                 else
-                        for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
-                                b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE,
-                                                        i, b43_tab_noisescaleg3[i]);
+                        b43_write_nst(dev, b43_tab_noisescaleg3);
         } else {
                 if (phy->rev >= 6) {
                         if (b43_phy_read(dev, B43_PHY_ENCORE) & B43_PHY_ENCORE_EN)
-                                for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
-                                        b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE,
-                                                i, b43_tab_noisescaleg3[i]);
+                                b43_write_nst(dev, b43_tab_noisescaleg3);
                         else
-                                for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
-                                        b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE,
-                                                i, b43_tab_noisescaleg2[i]);
+                                b43_write_nst(dev, b43_tab_noisescaleg2);
                 } else {
-                        for (i = 0; i < B43_TAB_NOISESCALE_SIZE; i++)
-                                b43_ofdmtab_write16(dev, B43_OFDMTAB_NOISESCALE,
-                                                        i, b43_tab_noisescaleg1[i]);
+                        b43_write_nst(dev, b43_tab_noisescaleg1);
                 }
         }
 }
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 7caa26eb4105..19aefbfb2c93 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -30,48 +30,51 @@
 #include "xmit.h"
 #include "phy.h"
 #include "dma.h"
+#include "pio.h"
 
 
-/* Extract the bitrate out of a CCK PLCP header. */
-static u8 b43_plcp_get_bitrate_cck(struct b43_plcp_hdr6 *plcp)
+/* Extract the bitrate index out of a CCK PLCP header. */
+static int b43_plcp_get_bitrate_idx_cck(struct b43_plcp_hdr6 *plcp)
 {
         switch (plcp->raw[0]) {
         case 0x0A:
-                return B43_CCK_RATE_1MB;
+                return 0;
         case 0x14:
-                return B43_CCK_RATE_2MB;
+                return 1;
         case 0x37:
-                return B43_CCK_RATE_5MB;
+                return 2;
         case 0x6E:
-                return B43_CCK_RATE_11MB;
+                return 3;
         }
         B43_WARN_ON(1);
-        return 0;
+        return -1;
 }
 
-/* Extract the bitrate out of an OFDM PLCP header. */
-static u8 b43_plcp_get_bitrate_ofdm(struct b43_plcp_hdr6 *plcp)
+/* Extract the bitrate index out of an OFDM PLCP header. */
+static u8 b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool aphy)
 {
+        int base = aphy ? 0 : 4;
+
         switch (plcp->raw[0] & 0xF) {
         case 0xB:
-                return B43_OFDM_RATE_6MB;
+                return base + 0;
         case 0xF:
-                return B43_OFDM_RATE_9MB;
+                return base + 1;
         case 0xA:
-                return B43_OFDM_RATE_12MB;
+                return base + 2;
         case 0xE:
-                return B43_OFDM_RATE_18MB;
+                return base + 3;
         case 0x9:
-                return B43_OFDM_RATE_24MB;
+                return base + 4;
         case 0xD:
-                return B43_OFDM_RATE_36MB;
+                return base + 5;
         case 0x8:
-                return B43_OFDM_RATE_48MB;
+                return base + 6;
         case 0xC:
-                return B43_OFDM_RATE_54MB;
+                return base + 7;
         }
         B43_WARN_ON(1);
-        return 0;
+        return -1;
 }
 
 u8 b43_plcp_get_ratecode_cck(const u8 bitrate)
@@ -191,6 +194,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,
             (const struct ieee80211_hdr *)fragment_data;
         int use_encryption = (!(txctl->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT));
         u16 fctl = le16_to_cpu(wlhdr->frame_control);
+        struct ieee80211_rate *fbrate;
         u8 rate, rate_fb;
         int rate_ofdm, rate_fb_ofdm;
         unsigned int plcp_fragment_len;
@@ -200,9 +204,11 @@ int b43_generate_txhdr(struct b43_wldev *dev,
 
         memset(txhdr, 0, sizeof(*txhdr));
 
-        rate = txctl->tx_rate;
+        WARN_ON(!txctl->tx_rate);
+        rate = txctl->tx_rate ? txctl->tx_rate->hw_value : B43_CCK_RATE_1MB;
         rate_ofdm = b43_is_ofdm_rate(rate);
-        rate_fb = (txctl->alt_retry_rate == -1) ? rate : txctl->alt_retry_rate;
+        fbrate = txctl->alt_retry_rate ? : txctl->tx_rate;
+        rate_fb = fbrate->hw_value;
         rate_fb_ofdm = b43_is_ofdm_rate(rate_fb);
 
         if (rate_ofdm)
@@ -221,11 +227,10 @@ int b43_generate_txhdr(struct b43_wldev *dev,
                  * use the original dur_id field. */
                 txhdr->dur_fb = wlhdr->duration_id;
         } else {
-                int fbrate_base100kbps = B43_RATE_TO_BASE100KBPS(rate_fb);
                 txhdr->dur_fb = ieee80211_generic_frame_duration(dev->wl->hw,
                                                                  txctl->vif,
                                                                  fragment_len,
-                                                                 fbrate_base100kbps);
+                                                                 fbrate);
         }
 
         plcp_fragment_len = fragment_len + FCS_LEN;
@@ -287,7 +292,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,
                 phy_ctl |= B43_TXH_PHY_ENC_OFDM;
         else
                 phy_ctl |= B43_TXH_PHY_ENC_CCK;
-        if (dev->short_preamble)
+        if (txctl->flags & IEEE80211_TXCTL_SHORT_PREAMBLE)
                 phy_ctl |= B43_TXH_PHY_SHORTPRMBL;
 
         switch (b43_ieee80211_antenna_sanitize(dev, txctl->antenna_sel_tx)) {
@@ -332,7 +337,8 @@ int b43_generate_txhdr(struct b43_wldev *dev,
                 int rts_rate_ofdm, rts_rate_fb_ofdm;
                 struct b43_plcp_hdr6 *plcp;
 
-                rts_rate = txctl->rts_cts_rate;
+                WARN_ON(!txctl->rts_cts_rate);
+                rts_rate = txctl->rts_cts_rate ? txctl->rts_cts_rate->hw_value : B43_CCK_RATE_1MB;
                 rts_rate_ofdm = b43_is_ofdm_rate(rts_rate);
                 rts_rate_fb = b43_calc_fallback_rate(rts_rate);
                 rts_rate_fb_ofdm = b43_is_ofdm_rate(rts_rate_fb);
@@ -506,7 +512,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
         u16 phystat0, phystat3, chanstat, mactime;
         u32 macstat;
         u16 chanid;
-        u8 jssi;
+        u16 phytype;
         int padding;
 
         memset(&status, 0, sizeof(status));
@@ -514,10 +520,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
         /* Get metadata about the frame from the header. */
         phystat0 = le16_to_cpu(rxhdr->phy_status0);
         phystat3 = le16_to_cpu(rxhdr->phy_status3);
-        jssi = rxhdr->jssi;
         macstat = le32_to_cpu(rxhdr->mac_status);
         mactime = le16_to_cpu(rxhdr->mac_time);
         chanstat = le16_to_cpu(rxhdr->channel);
+        phytype = chanstat & B43_RX_CHAN_PHYTYPE;
 
         if (macstat & B43_RX_MAC_FCSERR)
                 dev->wl->ieee_stats.dot11FCSErrorCount++;
@@ -567,26 +573,40 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
                 }
         }
 
-        status.ssi = b43_rssi_postprocess(dev, jssi,
-                                          (phystat0 & B43_RX_PHYST0_OFDM),
-                                          (phystat0 & B43_RX_PHYST0_GAINCTL),
-                                          (phystat3 & B43_RX_PHYST3_TRSTATE));
+        /* Link quality statistics */
         status.noise = dev->stats.link_noise;
-        /* the next line looks wrong, but is what mac80211 wants */
-        status.signal = (jssi * 100) / B43_RX_MAX_SSI;
+        if ((chanstat & B43_RX_CHAN_PHYTYPE) == B43_PHYTYPE_N) {
+//              s8 rssi = max(rxhdr->power0, rxhdr->power1);
+                //TODO: Find out what the rssi value is (dBm or percentage?)
+                //      and also find out what the maximum possible value is.
+                //      Fill status.ssi and status.signal fields.
+        } else {
+                status.ssi = b43_rssi_postprocess(dev, rxhdr->jssi,
+                                                  (phystat0 & B43_RX_PHYST0_OFDM),
+                                                  (phystat0 & B43_RX_PHYST0_GAINCTL),
+                                                  (phystat3 & B43_RX_PHYST3_TRSTATE));
+                /* the next line looks wrong, but is what mac80211 wants */
+                status.signal = (rxhdr->jssi * 100) / B43_RX_MAX_SSI;
+        }
+
         if (phystat0 & B43_RX_PHYST0_OFDM)
-                status.rate = b43_plcp_get_bitrate_ofdm(plcp);
+                status.rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp,
+                                                phytype == B43_PHYTYPE_A);
         else
-                status.rate = b43_plcp_get_bitrate_cck(plcp);
+                status.rate_idx = b43_plcp_get_bitrate_idx_cck(plcp);
         status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT);
 
         /*
-         * If monitors are present get full 64-bit timestamp. This
-         * code assumes we get to process the packet within 16 bits
-         * of timestamp, i.e. about 65 milliseconds after the PHY
-         * received the first symbol.
+         * All frames on monitor interfaces and beacons always need a full
+         * 64-bit timestamp. Monitor interfaces need it for diagnostic
+         * purposes and beacons for IBSS merging.
+         * This code assumes we get to process the packet within 16 bits
+         * of timestamp, i.e. about 65 milliseconds after the PHY received
+         * the first symbol.
          */
-        if (dev->wl->radiotap_enabled) {
+        if (((fctl & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE))
+            == (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) ||
+            dev->wl->radiotap_enabled) {
                 u16 low_mactime_now;
 
                 b43_tsf_read(dev, &status.mactime);
@@ -601,29 +621,28 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
         chanid = (chanstat & B43_RX_CHAN_ID) >> B43_RX_CHAN_ID_SHIFT;
         switch (chanstat & B43_RX_CHAN_PHYTYPE) {
         case B43_PHYTYPE_A:
-                status.phymode = MODE_IEEE80211A;
+                status.band = IEEE80211_BAND_5GHZ;
                 B43_WARN_ON(1);
                 /* FIXME: We don't really know which value the "chanid" contains.
                  *        So the following assignment might be wrong. */
-                status.channel = chanid;
-                status.freq = b43_channel_to_freq_5ghz(status.channel);
+                status.freq = b43_channel_to_freq_5ghz(chanid);
                 break;
         case B43_PHYTYPE_G:
-                status.phymode = MODE_IEEE80211G;
+                status.band = IEEE80211_BAND_2GHZ;
                 /* chanid is the radio channel cookie value as used
                  * to tune the radio. */
                 status.freq = chanid + 2400;
-                status.channel = b43_freq_to_channel_2ghz(status.freq);
                 break;
         case B43_PHYTYPE_N:
-                status.phymode = 0xDEAD /*FIXME MODE_IEEE80211N*/;
                 /* chanid is the SHM channel cookie. Which is the plain
                  * channel number in b43. */
-                status.channel = chanid;
-                if (chanstat & B43_RX_CHAN_5GHZ)
-                        status.freq = b43_freq_to_channel_5ghz(status.freq);
-                else
-                        status.freq = b43_freq_to_channel_2ghz(status.freq);
+                if (chanstat & B43_RX_CHAN_5GHZ) {
+                        status.band = IEEE80211_BAND_5GHZ;
+                        status.freq = b43_freq_to_channel_5ghz(chanid);
+                } else {
+                        status.band = IEEE80211_BAND_2GHZ;
+                        status.freq = b43_freq_to_channel_2ghz(chanid);
+                }
                 break;
         default:
                 B43_WARN_ON(1);
@@ -657,67 +676,54 @@ void b43_handle_txstatus(struct b43_wldev *dev,
                         dev->wl->ieee_stats.dot11RTSSuccessCount++;
         }
 
-        b43_dma_handle_txstatus(dev, status);
+        if (b43_using_pio_transfers(dev))
+                b43_pio_handle_txstatus(dev, status);
+        else
+                b43_dma_handle_txstatus(dev, status);
 }
 
-/* Handle TX status report as received through DMA/PIO queues */
-void b43_handle_hwtxstatus(struct b43_wldev *dev,
-                           const struct b43_hwtxstatus *hw)
+/* Fill out the mac80211 TXstatus report based on the b43-specific
+ * txstatus report data. This returns a boolean whether the frame was
+ * successfully transmitted. */
+bool b43_fill_txstatus_report(struct ieee80211_tx_status *report,
+                              const struct b43_txstatus *status)
 {
-        struct b43_txstatus status;
-        u8 tmp;
-
-        status.cookie = le16_to_cpu(hw->cookie);
-        status.seq = le16_to_cpu(hw->seq);
-        status.phy_stat = hw->phy_stat;
-        tmp = hw->count;
-        status.frame_count = (tmp >> 4);
-        status.rts_count = (tmp & 0x0F);
-        tmp = hw->flags;
-        status.supp_reason = ((tmp & 0x1C) >> 2);
-        status.pm_indicated = !!(tmp & 0x80);
-        status.intermediate = !!(tmp & 0x40);
-        status.for_ampdu = !!(tmp & 0x20);
-        status.acked = !!(tmp & 0x02);
-
-        b43_handle_txstatus(dev, &status);
+        bool frame_success = 1;
+
+        if (status->acked) {
+                /* The frame was ACKed. */
+                report->flags |= IEEE80211_TX_STATUS_ACK;
+        } else {
+                /* The frame was not ACKed... */
+                if (!(report->control.flags & IEEE80211_TXCTL_NO_ACK)) {
+                        /* ...but we expected an ACK. */
+                        frame_success = 0;
+                        report->excessive_retries = 1;
+                }
+        }
+        if (status->frame_count == 0) {
+                /* The frame was not transmitted at all. */
+                report->retry_count = 0;
+        } else
+                report->retry_count = status->frame_count - 1;
+
+        return frame_success;
 }
 
 /* Stop any TX operation on the device (suspend the hardware queues) */
 void b43_tx_suspend(struct b43_wldev *dev)
 {
-        b43_dma_tx_suspend(dev);
+        if (b43_using_pio_transfers(dev))
+                b43_pio_tx_suspend(dev);
+        else
+                b43_dma_tx_suspend(dev);
 }
 
 /* Resume any TX operation on the device (resume the hardware queues) */
 void b43_tx_resume(struct b43_wldev *dev)
 {
-        b43_dma_tx_resume(dev);
-}
-
-#if 0
-static void upload_qos_parms(struct b43_wldev *dev,
-                             const u16 * parms, u16 offset)
-{
-        int i;
-
-        for (i = 0; i < B43_NR_QOSPARMS; i++) {
-                b43_shm_write16(dev, B43_SHM_SHARED,
-                                offset + (i * 2), parms[i]);
-        }
-}
-#endif
-
-/* Initialize the QoS parameters */
-void b43_qos_init(struct b43_wldev *dev)
-{
-        /* FIXME: This function must probably be called from the mac80211
-         * config callback. */
-        return;
-
-        b43_hf_write(dev, b43_hf_read(dev) | B43_HF_EDCF);
-        //FIXME kill magic
-        b43_write16(dev, 0x688, b43_read16(dev, 0x688) | 0x4);
-
-        /*TODO: We might need some stack support here to get the values. */
+        if (b43_using_pio_transfers(dev))
+                b43_pio_tx_resume(dev);
+        else
+                b43_dma_tx_resume(dev);
 }
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h
index 41765039552b..b05f44e0d626 100644
--- a/drivers/net/wireless/b43/xmit.h
+++ b/drivers/net/wireless/b43/xmit.h
@@ -207,25 +207,24 @@ enum {
         B43_TXST_SUPP_ABNACK,   /* Afterburner NACK */
 };
 
-/* Transmit Status as received through DMA/PIO on old chips */
-struct b43_hwtxstatus {
-        PAD_BYTES(4);
-        __le16 cookie;
-        u8 flags;
-        u8 count;
-         PAD_BYTES(2);
-        __le16 seq;
-        u8 phy_stat;
-         PAD_BYTES(1);
-} __attribute__ ((__packed__));
-
 /* Receive header for v4 firmware. */
 struct b43_rxhdr_fw4 {
         __le16 frame_len;       /* Frame length */
          PAD_BYTES(2);
         __le16 phy_status0;     /* PHY RX Status 0 */
-        __u8 jssi;              /* PHY RX Status 1: JSSI */
-        __u8 sig_qual;          /* PHY RX Status 1: Signal Quality */
+        union {
+                /* RSSI for A/B/G-PHYs */
+                struct {
+                        __u8 jssi;      /* PHY RX Status 1: JSSI */
+                        __u8 sig_qual;  /* PHY RX Status 1: Signal Quality */
+                } __attribute__ ((__packed__));
+
+                /* RSSI for N-PHYs */
+                struct {
+                        __s8 power0;    /* PHY RX Status 1: Power 0 */
+                        __s8 power1;    /* PHY RX Status 1: Power 1 */
+                } __attribute__ ((__packed__));
+        } __attribute__ ((__packed__));
         __le16 phy_status2;     /* PHY RX Status 2 */
         __le16 phy_status3;     /* PHY RX Status 3 */
         __le32 mac_status;      /* MAC RX status */
@@ -295,25 +294,12 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr);
 
 void b43_handle_txstatus(struct b43_wldev *dev,
                          const struct b43_txstatus *status);
-
-void b43_handle_hwtxstatus(struct b43_wldev *dev,
-                           const struct b43_hwtxstatus *hw);
+bool b43_fill_txstatus_report(struct ieee80211_tx_status *report,
+                              const struct b43_txstatus *status);
 
 void b43_tx_suspend(struct b43_wldev *dev);
 void b43_tx_resume(struct b43_wldev *dev);
 
-#define B43_NR_QOSPARMS         22
-enum {
-        B43_QOSPARM_TXOP = 0,
-        B43_QOSPARM_CWMIN,
-        B43_QOSPARM_CWMAX,
-        B43_QOSPARM_CWCUR,
-        B43_QOSPARM_AIFS,
-        B43_QOSPARM_BSLOTS,
-        B43_QOSPARM_REGGAP,
-        B43_QOSPARM_STATUS,
-};
-void b43_qos_init(struct b43_wldev *dev);
 
 /* Helper functions for converting the key-table index from "firmware-format"
  * to "raw-format" and back. The firmware API changed for this at some revision.
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index 93d45b71799a..ded3cd31b3df 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -97,6 +97,7 @@
 #define B43legacy_MMIO_RADIO_HWENABLED_LO       0x49A
 #define B43legacy_MMIO_GPIO_CONTROL     0x49C
 #define B43legacy_MMIO_GPIO_MASK                0x49E
+#define B43legacy_MMIO_TSF_CFP_PRETBTT  0x612
 #define B43legacy_MMIO_TSF_0            0x632 /* core rev < 3 only */
 #define B43legacy_MMIO_TSF_1            0x634 /* core rev < 3 only */
 #define B43legacy_MMIO_TSF_2            0x636 /* core rev < 3 only */
@@ -130,19 +131,27 @@
 #define B43legacy_SHM_SH_HOSTFHI        0x0060 /* Hostflags ucode opts (high) */
 /* SHM_SHARED crypto engine */
 #define B43legacy_SHM_SH_KEYIDXBLOCK    0x05D4 /* Key index/algorithm block */
-/* SHM_SHARED beacon variables */
+/* SHM_SHARED beacon/AP variables */
+#define B43legacy_SHM_SH_DTIMP          0x0012 /* DTIM period */
+#define B43legacy_SHM_SH_BTL0           0x0018 /* Beacon template length 0 */
+#define B43legacy_SHM_SH_BTL1           0x001A /* Beacon template length 1 */
+#define B43legacy_SHM_SH_BTSFOFF        0x001C /* Beacon TSF offset */
+#define B43legacy_SHM_SH_TIMPOS         0x001E /* TIM position in beacon */
 #define B43legacy_SHM_SH_BEACPHYCTL     0x0054 /* Beacon PHY TX control word */
 /* SHM_SHARED ACK/CTS control */
 #define B43legacy_SHM_SH_ACKCTSPHYCTL   0x0022 /* ACK/CTS PHY control word */
 /* SHM_SHARED probe response variables */
-#define B43legacy_SHM_SH_PRPHYCTL       0x0188 /* Probe Resp PHY TX control */
+#define B43legacy_SHM_SH_PRTLEN         0x004A /* Probe Response template length */
 #define B43legacy_SHM_SH_PRMAXTIME      0x0074 /* Probe Response max time */
+#define B43legacy_SHM_SH_PRPHYCTL       0x0188 /* Probe Resp PHY TX control */
 /* SHM_SHARED rate tables */
 /* SHM_SHARED microcode soft registers */
 #define B43legacy_SHM_SH_UCODEREV       0x0000 /* Microcode revision */
 #define B43legacy_SHM_SH_UCODEPATCH     0x0002 /* Microcode patchlevel */
 #define B43legacy_SHM_SH_UCODEDATE      0x0004 /* Microcode date */
 #define B43legacy_SHM_SH_UCODETIME      0x0006 /* Microcode time */
+#define B43legacy_SHM_SH_SPUWKUP        0x0094 /* pre-wakeup for synth PU in us */
+#define B43legacy_SHM_SH_PRETBTT        0x0096 /* pre-TBTT in us */
 
 #define B43legacy_UCODEFLAGS_OFFSET     0x005E
 
@@ -199,6 +208,13 @@
 #define B43legacy_MACCTL_TBTTHOLD       0x10000000 /* TBTT Hold */
 #define B43legacy_MACCTL_GMODE          0x80000000 /* G Mode */
 
+/* MAC Command bitfield */
+#define B43legacy_MACCMD_BEACON0_VALID  0x00000001 /* Beacon 0 in template RAM is busy/valid */
+#define B43legacy_MACCMD_BEACON1_VALID  0x00000002 /* Beacon 1 in template RAM is busy/valid */
+#define B43legacy_MACCMD_DFQ_VALID      0x00000004 /* Directed frame queue valid (IBSS PS mode, ATIM) */
+#define B43legacy_MACCMD_CCA            0x00000008 /* Clear channel assessment */
+#define B43legacy_MACCMD_BGNOISE        0x00000010 /* Background noise */
+
 /* 802.11 core specific TM State Low flags */
 #define B43legacy_TMSLOW_GMODE          0x20000000 /* G Mode Enable */
 #define B43legacy_TMSLOW_PLLREFSEL      0x00200000 /* PLL Freq Ref Select */
@@ -317,15 +333,7 @@ enum {
 # undef assert
 #endif
 #ifdef CONFIG_B43LEGACY_DEBUG
-# define B43legacy_WARN_ON(expr)                                        \
-        do {                                                            \
-                if (unlikely((expr))) {                                 \
-                        printk(KERN_INFO PFX "Test (%s) failed at:"     \
-                                              " %s:%d:%s()\n",          \
-                                              #expr, __FILE__,          \
-                                              __LINE__, __FUNCTION__);  \
-                }                                                       \
-        } while (0)
+# define B43legacy_WARN_ON(x)   WARN_ON(x)
 # define B43legacy_BUG_ON(expr)                                         \
         do {                                                            \
                 if (unlikely((expr))) {                                 \
@@ -336,7 +344,9 @@ enum {
         } while (0)
 # define B43legacy_DEBUG        1
 #else
-# define B43legacy_WARN_ON(x)   do { /* nothing */ } while (0)
+/* This will evaluate the argument even if debugging is disabled. */
+static inline bool __b43legacy_warn_on_dummy(bool x) { return x; }
+# define B43legacy_WARN_ON(x)   __b43legacy_warn_on_dummy(unlikely(!!(x)))
 # define B43legacy_BUG_ON(x)    do { /* nothing */ } while (0)
 # define B43legacy_DEBUG        0
 #endif
@@ -392,10 +402,6 @@ struct b43legacy_phy {
         u8 possible_phymodes;
         /* GMODE bit enabled in MACCTL? */
         bool gmode;
-        /* Possible ieee80211 subsystem hwmodes for this PHY.
-         * Which mode is selected, depends on thr GMODE enabled bit */
-#define B43legacy_MAX_PHYHWMODES        2
-        struct ieee80211_hw_mode hwmodes[B43legacy_MAX_PHYHWMODES];
 
         /* Analog Type */
         u8 analog;
@@ -598,6 +604,12 @@ struct b43legacy_wl {
         u8 nr_devs;
 
         bool radiotap_enabled;
+
+        /* The beacon we are currently using (AP or IBSS mode).
+         * This beacon stuff is protected by the irq_lock. */
+        struct sk_buff *current_beacon;
+        bool beacon0_uploaded;
+        bool beacon1_uploaded;
 };
 
 /* Pointers to the firmware data and meta information about it. */
@@ -649,7 +661,7 @@ struct b43legacy_wldev {
 
         bool __using_pio;       /* Using pio rather than dma. */
         bool bad_frames_preempt;/* Use "Bad Frames Preemption". */
-        bool reg124_set_0x4;    /* Variable to keep track of IRQ. */
+        bool dfq_valid;         /* Directed frame queue valid (IBSS PS mode, ATIM). */
         bool short_preamble;    /* TRUE if using short preamble. */
         bool short_slot;        /* TRUE if using short slot timing. */
         bool radio_hw_enable;   /* State of radio hardware enable bit. */
@@ -696,9 +708,6 @@ struct b43legacy_wldev {
         u8 max_nr_keys;
         struct b43legacy_key key[58];
 
-        /* Cached beacon template while uploading the template. */
-        struct sk_buff *cached_beacon;
-
         /* Firmware data */
         struct b43legacy_firmware fw;
 
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 0f7a6e7bd96a..ef829ee8ffd4 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -95,28 +95,29 @@ MODULE_DEVICE_TABLE(ssb, b43legacy_ssb_tbl);
  * data in there. This data is the same for all devices, so we don't
  * get concurrency issues */
 #define RATETAB_ENT(_rateid, _flags) \
-        {                                                       \
-                .rate   = B43legacy_RATE_TO_100KBPS(_rateid),   \
-                .val    = (_rateid),                            \
-                .val2   = (_rateid),                            \
-                .flags  = (_flags),                             \
+        {                                                               \
+                .bitrate        = B43legacy_RATE_TO_100KBPS(_rateid),   \
+                .hw_value       = (_rateid),                            \
+                .flags          = (_flags),                             \
         }
+/*
+ * NOTE: When changing this, sync with xmit.c's
+ *       b43legacy_plcp_get_bitrate_idx_* functions!
+ */
 static struct ieee80211_rate __b43legacy_ratetable[] = {
-        RATETAB_ENT(B43legacy_CCK_RATE_1MB, IEEE80211_RATE_CCK),
-        RATETAB_ENT(B43legacy_CCK_RATE_2MB, IEEE80211_RATE_CCK_2),
-        RATETAB_ENT(B43legacy_CCK_RATE_5MB, IEEE80211_RATE_CCK_2),
-        RATETAB_ENT(B43legacy_CCK_RATE_11MB, IEEE80211_RATE_CCK_2),
-        RATETAB_ENT(B43legacy_OFDM_RATE_6MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43legacy_OFDM_RATE_9MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43legacy_OFDM_RATE_12MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43legacy_OFDM_RATE_18MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43legacy_OFDM_RATE_24MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43legacy_OFDM_RATE_36MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43legacy_OFDM_RATE_48MB, IEEE80211_RATE_OFDM),
-        RATETAB_ENT(B43legacy_OFDM_RATE_54MB, IEEE80211_RATE_OFDM),
+        RATETAB_ENT(B43legacy_CCK_RATE_1MB, 0),
+        RATETAB_ENT(B43legacy_CCK_RATE_2MB, IEEE80211_RATE_SHORT_PREAMBLE),
+        RATETAB_ENT(B43legacy_CCK_RATE_5MB, IEEE80211_RATE_SHORT_PREAMBLE),
+        RATETAB_ENT(B43legacy_CCK_RATE_11MB, IEEE80211_RATE_SHORT_PREAMBLE),
+        RATETAB_ENT(B43legacy_OFDM_RATE_6MB, 0),
+        RATETAB_ENT(B43legacy_OFDM_RATE_9MB, 0),
+        RATETAB_ENT(B43legacy_OFDM_RATE_12MB, 0),
+        RATETAB_ENT(B43legacy_OFDM_RATE_18MB, 0),
+        RATETAB_ENT(B43legacy_OFDM_RATE_24MB, 0),
+        RATETAB_ENT(B43legacy_OFDM_RATE_36MB, 0),
+        RATETAB_ENT(B43legacy_OFDM_RATE_48MB, 0),
+        RATETAB_ENT(B43legacy_OFDM_RATE_54MB, 0),
 };
-#define b43legacy_a_ratetable           (__b43legacy_ratetable + 4)
-#define b43legacy_a_ratetable_size      8
 #define b43legacy_b_ratetable           (__b43legacy_ratetable + 0)
 #define b43legacy_b_ratetable_size      4
 #define b43legacy_g_ratetable           (__b43legacy_ratetable + 0)
@@ -124,14 +125,8 @@ static struct ieee80211_rate __b43legacy_ratetable[] = {
 
 #define CHANTAB_ENT(_chanid, _freq) \
         {                                                       \
-                .chan   = (_chanid),                            \
-                .freq   = (_freq),                              \
-                .val    = (_chanid),                            \
-                .flag   = IEEE80211_CHAN_W_SCAN |               \
-                          IEEE80211_CHAN_W_ACTIVE_SCAN |        \
-                          IEEE80211_CHAN_W_IBSS,                \
-                .power_level    = 0x0A,                         \
-                .antenna_max    = 0xFF,                         \
+                .center_freq    = (_freq),                      \
+                .hw_value       = (_chanid),                    \
         }
 static struct ieee80211_channel b43legacy_bg_chantable[] = {
         CHANTAB_ENT(1, 2412),
@@ -149,7 +144,20 @@ static struct ieee80211_channel b43legacy_bg_chantable[] = {
         CHANTAB_ENT(13, 2472),
         CHANTAB_ENT(14, 2484),
 };
-#define b43legacy_bg_chantable_size     ARRAY_SIZE(b43legacy_bg_chantable)
+
+static struct ieee80211_supported_band b43legacy_band_2GHz_BPHY = {
+        .channels = b43legacy_bg_chantable,
+        .n_channels = ARRAY_SIZE(b43legacy_bg_chantable),
+        .bitrates = b43legacy_b_ratetable,
+        .n_bitrates = b43legacy_b_ratetable_size,
+};
+
+static struct ieee80211_supported_band b43legacy_band_2GHz_GPHY = {
+        .channels = b43legacy_bg_chantable,
+        .n_channels = ARRAY_SIZE(b43legacy_bg_chantable),
+        .bitrates = b43legacy_g_ratetable,
+        .n_bitrates = b43legacy_g_ratetable_size,
+};
 
 static void b43legacy_wireless_core_exit(struct b43legacy_wldev *dev);
 static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev);
@@ -797,9 +805,8 @@ static void b43legacy_generate_noise_sample(struct b43legacy_wldev *dev)
 {
         b43legacy_jssi_write(dev, 0x7F7F7F7F);
         b43legacy_write32(dev, B43legacy_MMIO_MACCMD,
-                          b43legacy_read32(dev,
-                          B43legacy_MMIO_MACCMD)
-                          | (1 << 4));
+                          b43legacy_read32(dev, B43legacy_MMIO_MACCMD)
+                          | B43legacy_MACCMD_BGNOISE);
         B43legacy_WARN_ON(dev->noisecalc.channel_at_start !=
                             dev->phy.channel);
 }
@@ -888,18 +895,18 @@ static void handle_irq_tbtt_indication(struct b43legacy_wldev *dev)
                 if (1/*FIXME: the last PSpoll frame was sent successfully */)
                         b43legacy_power_saving_ctl_bits(dev, -1, -1);
         }
-        dev->reg124_set_0x4 = 0;
         if (b43legacy_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS))
-                dev->reg124_set_0x4 = 1;
+                dev->dfq_valid = 1;
 }
 
 static void handle_irq_atim_end(struct b43legacy_wldev *dev)
 {
-        if (!dev->reg124_set_0x4) /*FIXME rename this variable*/
-                return;
-        b43legacy_write32(dev, B43legacy_MMIO_MACCMD,
-                          b43legacy_read32(dev, B43legacy_MMIO_MACCMD)
-                          | 0x4);
+        if (dev->dfq_valid) {
+                b43legacy_write32(dev, B43legacy_MMIO_MACCMD,
+                                  b43legacy_read32(dev, B43legacy_MMIO_MACCMD)
+                                  | B43legacy_MACCMD_DFQ_VALID);
+                dev->dfq_valid = 0;
+        }
 }
 
 static void handle_irq_pmq(struct b43legacy_wldev *dev)
@@ -955,32 +962,77 @@ static void b43legacy_write_beacon_template(struct b43legacy_wldev *dev,
                                             u16 ram_offset,
                                             u16 shm_size_offset, u8 rate)
 {
-        int len;
-        const u8 *data;
 
-        B43legacy_WARN_ON(!dev->cached_beacon);
-        len = min((size_t)dev->cached_beacon->len,
+        unsigned int i, len, variable_len;
+        const struct ieee80211_mgmt *bcn;
+        const u8 *ie;
+        bool tim_found = 0;
+
+        bcn = (const struct ieee80211_mgmt *)(dev->wl->current_beacon->data);
+        len = min((size_t)dev->wl->current_beacon->len,
                   0x200 - sizeof(struct b43legacy_plcp_hdr6));
-        data = (const u8 *)(dev->cached_beacon->data);
-        b43legacy_write_template_common(dev, data,
-                                        len, ram_offset,
+
+        b43legacy_write_template_common(dev, (const u8 *)bcn, len, ram_offset,
                                         shm_size_offset, rate);
+
+        /* Find the position of the TIM and the DTIM_period value
+         * and write them to SHM. */
+        ie = bcn->u.beacon.variable;
+        variable_len = len - offsetof(struct ieee80211_mgmt, u.beacon.variable);
+        for (i = 0; i < variable_len - 2; ) {
+                uint8_t ie_id, ie_len;
+
+                ie_id = ie[i];
+                ie_len = ie[i + 1];
+                if (ie_id == 5) {
+                        u16 tim_position;
+                        u16 dtim_period;
+                        /* This is the TIM Information Element */
+
+                        /* Check whether the ie_len is in the beacon data range. */
+                        if (variable_len < ie_len + 2 + i)
+                                break;
+                        /* A valid TIM is at least 4 bytes long. */
+                        if (ie_len < 4)
+                                break;
+                        tim_found = 1;
+
+                        tim_position = sizeof(struct b43legacy_plcp_hdr6);
+                        tim_position += offsetof(struct ieee80211_mgmt,
+                                                 u.beacon.variable);
+                        tim_position += i;
+
+                        dtim_period = ie[i + 3];
+
+                        b43legacy_shm_write16(dev, B43legacy_SHM_SHARED,
+                                        B43legacy_SHM_SH_TIMPOS, tim_position);
+                        b43legacy_shm_write16(dev, B43legacy_SHM_SHARED,
+                                        B43legacy_SHM_SH_DTIMP, dtim_period);
+                        break;
+                }
+                i += ie_len + 2;
+        }
+        if (!tim_found) {
+                b43legacywarn(dev->wl, "Did not find a valid TIM IE in the "
+                              "beacon template packet. AP or IBSS operation "
+                              "may be broken.\n");
+        }
 }
 
 static void b43legacy_write_probe_resp_plcp(struct b43legacy_wldev *dev,
                                             u16 shm_offset, u16 size,
-                                            u8 rate)
+                                            struct ieee80211_rate *rate)
 {
         struct b43legacy_plcp_hdr4 plcp;
         u32 tmp;
         __le16 dur;
 
         plcp.data = 0;
-        b43legacy_generate_plcp_hdr(&plcp, size + FCS_LEN, rate);
+        b43legacy_generate_plcp_hdr(&plcp, size + FCS_LEN, rate->bitrate);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
                                                dev->wl->vif,
                                                size,
-                                               B43legacy_RATE_TO_100KBPS(rate));
+                                               rate);
         /* Write PLCP in two parts and timing for packet transfer */
         tmp = le32_to_cpu(plcp.data);
         b43legacy_shm_write16(dev, B43legacy_SHM_SHARED, shm_offset,
@@ -997,45 +1049,44 @@ static void b43legacy_write_probe_resp_plcp(struct b43legacy_wldev *dev,
  * 2) Patching duration field
  * 3) Stripping TIM
  */
-static u8 *b43legacy_generate_probe_resp(struct b43legacy_wldev *dev,
-                                         u16 *dest_size, u8 rate)
+static const u8 *b43legacy_generate_probe_resp(struct b43legacy_wldev *dev,
+                                               u16 *dest_size,
+                                               struct ieee80211_rate *rate)
 {
         const u8 *src_data;
         u8 *dest_data;
-        u16 src_size;
-        u16 elem_size;
-        u16 src_pos;
-        u16 dest_pos;
+        u16 src_size, elem_size, src_pos, dest_pos;
         __le16 dur;
         struct ieee80211_hdr *hdr;
+        size_t ie_start;
+
+        src_size = dev->wl->current_beacon->len;
+        src_data = (const u8 *)dev->wl->current_beacon->data;
 
-        B43legacy_WARN_ON(!dev->cached_beacon);
-        src_size = dev->cached_beacon->len;
-        src_data = (const u8 *)dev->cached_beacon->data;
+        /* Get the start offset of the variable IEs in the packet. */
+        ie_start = offsetof(struct ieee80211_mgmt, u.probe_resp.variable);
+        B43legacy_WARN_ON(ie_start != offsetof(struct ieee80211_mgmt,
+                                               u.beacon.variable));
 
-        if (unlikely(src_size < 0x24)) {
-                b43legacydbg(dev->wl, "b43legacy_generate_probe_resp: "
-                       "invalid beacon\n");
+        if (B43legacy_WARN_ON(src_size < ie_start))
                 return NULL;
-        }
 
         dest_data = kmalloc(src_size, GFP_ATOMIC);
         if (unlikely(!dest_data))
                 return NULL;
 
-        /* 0x24 is offset of first variable-len Information-Element
-         * in beacon frame.
-         */
-        memcpy(dest_data, src_data, 0x24);
-        src_pos = 0x24;
-        dest_pos = 0x24;
-        for (; src_pos < src_size - 2; src_pos += elem_size) {
+        /* Copy the static data and all Information Elements, except the TIM. */
+        memcpy(dest_data, src_data, ie_start);
+        src_pos = ie_start;
+        dest_pos = ie_start;
+        for ( ; src_pos < src_size - 2; src_pos += elem_size) {
                 elem_size = src_data[src_pos + 1] + 2;
-                if (src_data[src_pos] != 0x05) { /* TIM */
-                        memcpy(dest_data + dest_pos, src_data + src_pos,
-                               elem_size);
-                        dest_pos += elem_size;
+                if (src_data[src_pos] == 5) {
+                        /* This is the TIM. */
+                        continue;
                 }
+                memcpy(dest_data + dest_pos, src_data + src_pos, elem_size);
+                dest_pos += elem_size;
         }
         *dest_size = dest_pos;
         hdr = (struct ieee80211_hdr *)dest_data;
@@ -1046,7 +1097,7 @@ static u8 *b43legacy_generate_probe_resp(struct b43legacy_wldev *dev,
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
                                                dev->wl->vif,
                                                *dest_size,
-                                               B43legacy_RATE_TO_100KBPS(rate));
+                                               rate);
         hdr->duration_id = dur;
 
         return dest_data;
@@ -1054,13 +1105,13 @@ static u8 *b43legacy_generate_probe_resp(struct b43legacy_wldev *dev,
 
 static void b43legacy_write_probe_resp_template(struct b43legacy_wldev *dev,
                                                 u16 ram_offset,
-                                                u16 shm_size_offset, u8 rate)
+                                                u16 shm_size_offset,
+                                                struct ieee80211_rate *rate)
 {
-        u8 *probe_resp_data;
+        const u8 *probe_resp_data;
         u16 size;
 
-        B43legacy_WARN_ON(!dev->cached_beacon);
-        size = dev->cached_beacon->len;
+        size = dev->wl->current_beacon->len;
         probe_resp_data = b43legacy_generate_probe_resp(dev, &size, rate);
         if (unlikely(!probe_resp_data))
                 return;
@@ -1069,59 +1120,37 @@ static void b43legacy_write_probe_resp_template(struct b43legacy_wldev *dev,
          * all possible basic rates
          */
         b43legacy_write_probe_resp_plcp(dev, 0x31A, size,
-                                        B43legacy_CCK_RATE_1MB);
+                                        &b43legacy_b_ratetable[0]);
         b43legacy_write_probe_resp_plcp(dev, 0x32C, size,
-                                        B43legacy_CCK_RATE_2MB);
+                                        &b43legacy_b_ratetable[1]);
         b43legacy_write_probe_resp_plcp(dev, 0x33E, size,
-                                        B43legacy_CCK_RATE_5MB);
+                                        &b43legacy_b_ratetable[2]);
         b43legacy_write_probe_resp_plcp(dev, 0x350, size,
-                                        B43legacy_CCK_RATE_11MB);
+                                        &b43legacy_b_ratetable[3]);
 
         size = min((size_t)size,
                    0x200 - sizeof(struct b43legacy_plcp_hdr6));
         b43legacy_write_template_common(dev, probe_resp_data,
                                         size, ram_offset,
-                                        shm_size_offset, rate);
+                                        shm_size_offset, rate->bitrate);
         kfree(probe_resp_data);
 }
 
-static int b43legacy_refresh_cached_beacon(struct b43legacy_wldev *dev,
-                                           struct sk_buff *beacon)
+/* Asynchronously update the packet templates in template RAM.
+ * Locking: Requires wl->irq_lock to be locked. */
+static void b43legacy_update_templates(struct b43legacy_wl *wl,
+                                       struct sk_buff *beacon)
 {
-        if (dev->cached_beacon)
-                kfree_skb(dev->cached_beacon);
-        dev->cached_beacon = beacon;
+        /* This is the top half of the ansynchronous beacon update. The bottom
+         * half is the beacon IRQ. Beacon update must be asynchronous to avoid
+         * sending an invalid beacon. This can happen for example, if the
+         * firmware transmits a beacon while we are updating it. */
 
-        return 0;
-}
-
-static void b43legacy_update_templates(struct b43legacy_wldev *dev)
-{
-        u32 status;
-
-        B43legacy_WARN_ON(!dev->cached_beacon);
-
-        b43legacy_write_beacon_template(dev, 0x68, 0x18,
-                                        B43legacy_CCK_RATE_1MB);
-        b43legacy_write_beacon_template(dev, 0x468, 0x1A,
-                                        B43legacy_CCK_RATE_1MB);
-        b43legacy_write_probe_resp_template(dev, 0x268, 0x4A,
-                                            B43legacy_CCK_RATE_11MB);
-
-        status = b43legacy_read32(dev, B43legacy_MMIO_MACCMD);
-        status |= 0x03;
-        b43legacy_write32(dev, B43legacy_MMIO_MACCMD, status);
-}
-
-static void b43legacy_refresh_templates(struct b43legacy_wldev *dev,
-                                        struct sk_buff *beacon)
-{
-        int err;
-
-        err = b43legacy_refresh_cached_beacon(dev, beacon);
-        if (unlikely(err))
-                return;
-        b43legacy_update_templates(dev);
+        if (wl->current_beacon)
+                dev_kfree_skb_any(wl->current_beacon);
+        wl->current_beacon = beacon;
+        wl->beacon0_uploaded = 0;
+        wl->beacon1_uploaded = 0;
 }
 
 static void b43legacy_set_ssid(struct b43legacy_wldev *dev,
@@ -1162,38 +1191,37 @@ static void b43legacy_set_beacon_int(struct b43legacy_wldev *dev,
 
 static void handle_irq_beacon(struct b43legacy_wldev *dev)
 {
-        u32 status;
+        struct b43legacy_wl *wl = dev->wl;
+        u32 cmd;
 
-        if (!b43legacy_is_mode(dev->wl, IEEE80211_IF_TYPE_AP))
+        if (!b43legacy_is_mode(wl, IEEE80211_IF_TYPE_AP))
                 return;
 
-        dev->irq_savedstate &= ~B43legacy_IRQ_BEACON;
-        status = b43legacy_read32(dev, B43legacy_MMIO_MACCMD);
-
-        if (!dev->cached_beacon || ((status & 0x1) && (status & 0x2))) {
-                /* ACK beacon IRQ. */
-                b43legacy_write32(dev, B43legacy_MMIO_GEN_IRQ_REASON,
-                                  B43legacy_IRQ_BEACON);
-                dev->irq_savedstate |= B43legacy_IRQ_BEACON;
-                if (dev->cached_beacon)
-                        kfree_skb(dev->cached_beacon);
-                dev->cached_beacon = NULL;
-                return;
-        }
-        if (!(status & 0x1)) {
-                b43legacy_write_beacon_template(dev, 0x68, 0x18,
-                                                B43legacy_CCK_RATE_1MB);
-                status |= 0x1;
-                b43legacy_write32(dev, B43legacy_MMIO_MACCMD,
-                                  status);
-        }
-        if (!(status & 0x2)) {
-                b43legacy_write_beacon_template(dev, 0x468, 0x1A,
-                                                B43legacy_CCK_RATE_1MB);
-                status |= 0x2;
-                b43legacy_write32(dev, B43legacy_MMIO_MACCMD,
-                                  status);
+        /* This is the bottom half of the asynchronous beacon update. */
+
+        cmd = b43legacy_read32(dev, B43legacy_MMIO_MACCMD);
+        if (!(cmd & B43legacy_MACCMD_BEACON0_VALID)) {
+                if (!wl->beacon0_uploaded) {
+                        b43legacy_write_beacon_template(dev, 0x68,
+                                                        B43legacy_SHM_SH_BTL0,
+                                                        B43legacy_CCK_RATE_1MB);
+                        b43legacy_write_probe_resp_template(dev, 0x268,
+                                                            B43legacy_SHM_SH_PRTLEN,
+                                                            &__b43legacy_ratetable[3]);
+                        wl->beacon0_uploaded = 1;
+                }
+                cmd |= B43legacy_MACCMD_BEACON0_VALID;
+        }
+        if (!(cmd & B43legacy_MACCMD_BEACON1_VALID)) {
+                if (!wl->beacon1_uploaded) {
+                        b43legacy_write_beacon_template(dev, 0x468,
+                                                        B43legacy_SHM_SH_BTL1,
+                                                        B43legacy_CCK_RATE_1MB);
+                        wl->beacon1_uploaded = 1;
+                }
+                cmd |= B43legacy_MACCMD_BEACON1_VALID;
         }
+        b43legacy_write32(dev, B43legacy_MMIO_MACCMD, cmd);
 }
 
 static void handle_irq_ucode_debug(struct b43legacy_wldev *dev)
@@ -2552,14 +2580,16 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
         antenna_rx = b43legacy_antenna_from_ieee80211(conf->antenna_sel_rx);
 
         mutex_lock(&wl->mutex);
+        dev = wl->current_dev;
+        phy = &dev->phy;
 
         /* Switch the PHY mode (if necessary). */
-        switch (conf->phymode) {
-        case MODE_IEEE80211B:
-                new_phymode = B43legacy_PHYMODE_B;
-                break;
-        case MODE_IEEE80211G:
-                new_phymode = B43legacy_PHYMODE_G;
+        switch (conf->channel->band) {
+        case IEEE80211_BAND_2GHZ:
+                if (phy->type == B43legacy_PHYTYPE_B)
+                        new_phymode = B43legacy_PHYMODE_B;
+                else
+                        new_phymode = B43legacy_PHYMODE_G;
                 break;
         default:
                 B43legacy_WARN_ON(1);
@@ -2567,8 +2597,6 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
         err = b43legacy_switch_phymode(wl, new_phymode);
         if (err)
                 goto out_unlock_mutex;
-        dev = wl->current_dev;
-        phy = &dev->phy;
 
         /* Disable IRQs while reconfiguring the device.
          * This makes it possible to drop the spinlock throughout
@@ -2584,8 +2612,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
 
         /* Switch to the requested channel.
          * The firmware takes care of races with the TX handler. */
-        if (conf->channel_val != phy->channel)
-                b43legacy_radio_selectchannel(dev, conf->channel_val, 0);
+        if (conf->channel->hw_value != phy->channel)
+                b43legacy_radio_selectchannel(dev, conf->channel->hw_value, 0);
 
         /* Enable/Disable ShortSlot timing. */
         if ((!!(conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME))
@@ -2702,7 +2730,7 @@ static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
                         B43legacy_WARN_ON(conf->type != IEEE80211_IF_TYPE_AP);
                         b43legacy_set_ssid(dev, conf->ssid, conf->ssid_len);
                         if (conf->beacon)
-                                b43legacy_refresh_templates(dev, conf->beacon);
+                                b43legacy_update_templates(wl, conf->beacon);
                 }
                 b43legacy_write_mac_bssid_templates(dev);
         }
@@ -2920,7 +2948,7 @@ static void setup_struct_phy_for_init(struct b43legacy_wldev *dev,
 static void setup_struct_wldev_for_init(struct b43legacy_wldev *dev)
 {
         /* Flags */
-        dev->reg124_set_0x4 = 0;
+        dev->dfq_valid = 0;
 
         /* Stats */
         memset(&dev->stats, 0, sizeof(dev->stats));
@@ -2979,6 +3007,34 @@ static void b43legacy_set_retry_limits(struct b43legacy_wldev *dev,
         b43legacy_shm_write16(dev, B43legacy_SHM_WIRELESS, 0x0007, long_retry);
 }
 
+static void b43legacy_set_synth_pu_delay(struct b43legacy_wldev *dev,
+                                          bool idle) {
+        u16 pu_delay = 1050;
+
+        if (b43legacy_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS) || idle)
+                pu_delay = 500;
+        if ((dev->phy.radio_ver == 0x2050) && (dev->phy.radio_rev == 8))
+                pu_delay = max(pu_delay, (u16)2400);
+
+        b43legacy_shm_write16(dev, B43legacy_SHM_SHARED,
+                              B43legacy_SHM_SH_SPUWKUP, pu_delay);
+}
+
+/* Set the TSF CFP pre-TargetBeaconTransmissionTime. */
+static void b43legacy_set_pretbtt(struct b43legacy_wldev *dev)
+{
+        u16 pretbtt;
+
+        /* The time value is in microseconds. */
+        if (b43legacy_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS))
+                pretbtt = 2;
+        else
+                pretbtt = 250;
+        b43legacy_shm_write16(dev, B43legacy_SHM_SHARED,
+                              B43legacy_SHM_SH_PRETBTT, pretbtt);
+        b43legacy_write16(dev, B43legacy_MMIO_TSF_CFP_PRETBTT, pretbtt);
+}
+
 /* Shutdown a wireless core */
 /* Locking: wl->mutex */
 static void b43legacy_wireless_core_exit(struct b43legacy_wldev *dev)
@@ -3015,6 +3071,11 @@ static void b43legacy_wireless_core_exit(struct b43legacy_wldev *dev)
                 kfree(phy->tssi2dbm);
         kfree(phy->lo_control);
         phy->lo_control = NULL;
+        if (dev->wl->current_beacon) {
+                dev_kfree_skb_any(dev->wl->current_beacon);
+                dev->wl->current_beacon = NULL;
+        }
+
         ssb_device_disable(dev->dev, 0);
         ssb_bus_may_powerdown(dev->dev->bus);
 }
@@ -3160,9 +3221,7 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev)
         if (err)
                 goto err_chip_exit;
 
-        b43legacy_write16(dev, 0x0612, 0x0050);
-        b43legacy_shm_write16(dev, B43legacy_SHM_SHARED, 0x0416, 0x0050);
-        b43legacy_shm_write16(dev, B43legacy_SHM_SHARED, 0x0414, 0x01F4);
+        b43legacy_set_synth_pu_delay(dev, 1);
 
         ssb_bus_powerup(bus, 1); /* Enable dynamic PCTL */
         b43legacy_upload_card_macaddress(dev);
@@ -3218,6 +3277,8 @@ static int b43legacy_op_add_interface(struct ieee80211_hw *hw,
 
         spin_lock_irqsave(&wl->irq_lock, flags);
         b43legacy_adjust_opmode(dev);
+        b43legacy_set_pretbtt(dev);
+        b43legacy_set_synth_pu_delay(dev, 0);
         b43legacy_upload_card_macaddress(dev);
         spin_unlock_irqrestore(&wl->irq_lock, flags);
 
@@ -3339,6 +3400,41 @@ out_unlock:
         return err;
 }
 
+static int b43legacy_op_beacon_set_tim(struct ieee80211_hw *hw,
+                                       int aid, int set)
+{
+        struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
+        struct sk_buff *beacon;
+        unsigned long flags;
+
+        /* We could modify the existing beacon and set the aid bit in the TIM
+         * field, but that would probably require resizing and moving of data
+         * within the beacon template. Simply request a new beacon and let
+         * mac80211 do the hard work. */
+        beacon = ieee80211_beacon_get(hw, wl->vif, NULL);
+        if (unlikely(!beacon))
+                return -ENOMEM;
+        spin_lock_irqsave(&wl->irq_lock, flags);
+        b43legacy_update_templates(wl, beacon);
+        spin_unlock_irqrestore(&wl->irq_lock, flags);
+
+        return 0;
+}
+
+static int b43legacy_op_ibss_beacon_update(struct ieee80211_hw *hw,
+                                           struct sk_buff *beacon,
+                                           struct ieee80211_tx_control *ctl)
+{
+        struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
+        unsigned long flags;
+
+        spin_lock_irqsave(&wl->irq_lock, flags);
+        b43legacy_update_templates(wl, beacon);
+        spin_unlock_irqrestore(&wl->irq_lock, flags);
+
+        return 0;
+}
+
 static const struct ieee80211_ops b43legacy_hw_ops = {
         .tx                     = b43legacy_op_tx,
         .conf_tx                = b43legacy_op_conf_tx,
@@ -3352,6 +3448,8 @@ static const struct ieee80211_ops b43legacy_hw_ops = {
         .start                  = b43legacy_op_start,
         .stop                   = b43legacy_op_stop,
         .set_retry_limit        = b43legacy_op_set_retry_limit,
+        .set_tim                = b43legacy_op_beacon_set_tim,
+        .beacon_update          = b43legacy_op_ibss_beacon_update,
 };
 
 /* Hard-reset the chip. Do not call this directly.
@@ -3400,48 +3498,19 @@ static int b43legacy_setup_modes(struct b43legacy_wldev *dev,
                                  int have_gphy)
 {
         struct ieee80211_hw *hw = dev->wl->hw;
-        struct ieee80211_hw_mode *mode;
         struct b43legacy_phy *phy = &dev->phy;
-        int cnt = 0;
-        int err;
 
         phy->possible_phymodes = 0;
-        for (; 1; cnt++) {
-                if (have_bphy) {
-                        B43legacy_WARN_ON(cnt >= B43legacy_MAX_PHYHWMODES);
-                        mode = &phy->hwmodes[cnt];
-
-                        mode->mode = MODE_IEEE80211B;
-                        mode->num_channels = b43legacy_bg_chantable_size;
-                        mode->channels = b43legacy_bg_chantable;
-                        mode->num_rates = b43legacy_b_ratetable_size;
-                        mode->rates = b43legacy_b_ratetable;
-                        err = ieee80211_register_hwmode(hw, mode);
-                        if (err)
-                                return err;
-
-                        phy->possible_phymodes |= B43legacy_PHYMODE_B;
-                        have_bphy = 0;
-                        continue;
-                }
-                if (have_gphy) {
-                        B43legacy_WARN_ON(cnt >= B43legacy_MAX_PHYHWMODES);
-                        mode = &phy->hwmodes[cnt];
-
-                        mode->mode = MODE_IEEE80211G;
-                        mode->num_channels = b43legacy_bg_chantable_size;
-                        mode->channels = b43legacy_bg_chantable;
-                        mode->num_rates = b43legacy_g_ratetable_size;
-                        mode->rates = b43legacy_g_ratetable;
-                        err = ieee80211_register_hwmode(hw, mode);
-                        if (err)
-                                return err;
-
-                        phy->possible_phymodes |= B43legacy_PHYMODE_G;
-                        have_gphy = 0;
-                        continue;
-                }
-                break;
+        if (have_bphy) {
+                hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+                        &b43legacy_band_2GHz_BPHY;
+                phy->possible_phymodes |= B43legacy_PHYMODE_B;
+        }
+
+        if (have_gphy) {
+                hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+                        &b43legacy_band_2GHz_GPHY;
+                phy->possible_phymodes |= B43legacy_PHYMODE_G;
         }
 
         return 0;
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index d84408a82db9..dcad2491a606 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -37,45 +37,48 @@
 
 
 /* Extract the bitrate out of a CCK PLCP header. */
-static u8 b43legacy_plcp_get_bitrate_cck(struct b43legacy_plcp_hdr6 *plcp)
+static u8 b43legacy_plcp_get_bitrate_idx_cck(struct b43legacy_plcp_hdr6 *plcp)
 {
         switch (plcp->raw[0]) {
         case 0x0A:
-                return B43legacy_CCK_RATE_1MB;
+                return 0;
         case 0x14:
-                return B43legacy_CCK_RATE_2MB;
+                return 1;
         case 0x37:
-                return B43legacy_CCK_RATE_5MB;
+                return 2;
         case 0x6E:
-                return B43legacy_CCK_RATE_11MB;
+                return 3;
         }
         B43legacy_BUG_ON(1);
-        return 0;
+        return -1;
 }
 
 /* Extract the bitrate out of an OFDM PLCP header. */
-static u8 b43legacy_plcp_get_bitrate_ofdm(struct b43legacy_plcp_hdr6 *plcp)
+static u8 b43legacy_plcp_get_bitrate_idx_ofdm(struct b43legacy_plcp_hdr6 *plcp,
+                                              bool aphy)
 {
+        int base = aphy ? 0 : 4;
+
         switch (plcp->raw[0] & 0xF) {
         case 0xB:
-                return B43legacy_OFDM_RATE_6MB;
+                return base + 0;
         case 0xF:
-                return B43legacy_OFDM_RATE_9MB;
+                return base + 1;
         case 0xA:
-                return B43legacy_OFDM_RATE_12MB;
+                return base + 2;
         case 0xE:
-                return B43legacy_OFDM_RATE_18MB;
+                return base + 3;
         case 0x9:
-                return B43legacy_OFDM_RATE_24MB;
+                return base + 4;
         case 0xD:
-                return B43legacy_OFDM_RATE_36MB;
+                return base + 5;
         case 0x8:
-                return B43legacy_OFDM_RATE_48MB;
+                return base + 6;
         case 0xC:
-                return B43legacy_OFDM_RATE_54MB;
+                return base + 7;
         }
         B43legacy_BUG_ON(1);
-        return 0;
+        return -1;
 }
 
 u8 b43legacy_plcp_get_ratecode_cck(const u8 bitrate)
@@ -192,7 +195,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
         int use_encryption = (!(txctl->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT));
         u16 fctl;
         u8 rate;
-        u8 rate_fb;
+        struct ieee80211_rate *rate_fb;
         int rate_ofdm;
         int rate_fb_ofdm;
         unsigned int plcp_fragment_len;
@@ -204,16 +207,16 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
 
         memset(txhdr, 0, sizeof(*txhdr));
 
-        rate = txctl->tx_rate;
+        rate = txctl->tx_rate->hw_value;
         rate_ofdm = b43legacy_is_ofdm_rate(rate);
-        rate_fb = (txctl->alt_retry_rate == -1) ? rate : txctl->alt_retry_rate;
-        rate_fb_ofdm = b43legacy_is_ofdm_rate(rate_fb);
+        rate_fb = txctl->alt_retry_rate ? : txctl->tx_rate;
+        rate_fb_ofdm = b43legacy_is_ofdm_rate(rate_fb->hw_value);
 
         txhdr->mac_frame_ctl = wlhdr->frame_control;
         memcpy(txhdr->tx_receiver, wlhdr->addr1, 6);
 
         /* Calculate duration for fallback rate */
-        if ((rate_fb == rate) ||
+        if ((rate_fb->hw_value == rate) ||
             (wlhdr->duration_id & cpu_to_le16(0x8000)) ||
             (wlhdr->duration_id == cpu_to_le16(0))) {
                 /* If the fallback rate equals the normal rate or the
@@ -221,11 +224,10 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                  * use the original dur_id field. */
                 txhdr->dur_fb = wlhdr->duration_id;
         } else {
-                int fbrate_base100kbps = B43legacy_RATE_TO_100KBPS(rate_fb);
                 txhdr->dur_fb = ieee80211_generic_frame_duration(dev->wl->hw,
                                                          txctl->vif,
                                                          fragment_len,
-                                                         fbrate_base100kbps);
+                                                         rate_fb);
         }
 
         plcp_fragment_len = fragment_len + FCS_LEN;
@@ -266,7 +268,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                                     rate);
         b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
                                     (&txhdr->plcp_fb), plcp_fragment_len,
-                                    rate_fb);
+                                    rate_fb->hw_value);
 
         /* PHY TX Control word */
         if (rate_ofdm)
@@ -310,7 +312,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                 int rts_rate_ofdm;
                 int rts_rate_fb_ofdm;
 
-                rts_rate = txctl->rts_cts_rate;
+                rts_rate = txctl->rts_cts_rate->hw_value;
                 rts_rate_ofdm = b43legacy_is_ofdm_rate(rts_rate);
                 rts_rate_fb = b43legacy_calc_fallback_rate(rts_rate);
                 rts_rate_fb_ofdm = b43legacy_is_ofdm_rate(rts_rate_fb);
@@ -536,19 +538,24 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
                                       (phystat3 & B43legacy_RX_PHYST3_TRSTATE));
         status.noise = dev->stats.link_noise;
         status.signal = (jssi * 100) / B43legacy_RX_MAX_SSI;
+        /* change to support A PHY */
         if (phystat0 & B43legacy_RX_PHYST0_OFDM)
-                status.rate = b43legacy_plcp_get_bitrate_ofdm(plcp);
+                status.rate_idx = b43legacy_plcp_get_bitrate_idx_ofdm(plcp, false);
         else
-                status.rate = b43legacy_plcp_get_bitrate_cck(plcp);
+                status.rate_idx = b43legacy_plcp_get_bitrate_idx_cck(plcp);
         status.antenna = !!(phystat0 & B43legacy_RX_PHYST0_ANT);
 
         /*
-         * If monitors are present get full 64-bit timestamp. This
-         * code assumes we get to process the packet within 16 bits
-         * of timestamp, i.e. about 65 milliseconds after the PHY
-         * received the first symbol.
+         * All frames on monitor interfaces and beacons always need a full
+         * 64-bit timestamp. Monitor interfaces need it for diagnostic
+         * purposes and beacons for IBSS merging.
+         * This code assumes we get to process the packet within 16 bits
+         * of timestamp, i.e. about 65 milliseconds after the PHY received
+         * the first symbol.
          */
-        if (dev->wl->radiotap_enabled) {
+        if (((fctl & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE))
+            == (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) ||
+            dev->wl->radiotap_enabled) {
                 u16 low_mactime_now;
 
                 b43legacy_tsf_read(dev, &status.mactime);
@@ -564,14 +571,9 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
                   B43legacy_RX_CHAN_ID_SHIFT;
         switch (chanstat & B43legacy_RX_CHAN_PHYTYPE) {
         case B43legacy_PHYTYPE_B:
-                status.phymode = MODE_IEEE80211B;
-                status.freq = chanid + 2400;
-                status.channel = b43legacy_freq_to_channel_bg(chanid + 2400);
-                break;
         case B43legacy_PHYTYPE_G:
-                status.phymode = MODE_IEEE80211G;
+                status.band = IEEE80211_BAND_2GHZ;
                 status.freq = chanid + 2400;
-                status.channel = b43legacy_freq_to_channel_bg(chanid + 2400);
                 break;
         default:
                 b43legacywarn(dev->wl, "Unexpected value for chanstat (0x%X)\n",
diff --git a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig
deleted file mode 100644
index afb8f4305c24..000000000000
--- a/drivers/net/wireless/bcm43xx/Kconfig
+++ /dev/null
@@ -1,70 +0,0 @@
-config BCM43XX
-        tristate "Broadcom BCM43xx wireless support (DEPRECATED)"
-        depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && (!SSB_B43_PCI_BRIDGE || SSB != y) && EXPERIMENTAL
-        select WIRELESS_EXT
-        select FW_LOADER
-        select HW_RANDOM
-        ---help---
-          This is an experimental driver for the Broadcom 43xx wireless
-          chip, found in the Apple Airport Extreme and various other
-          devices.  This driver is deprecated and will be removed
-          from the kernel in the near future.  It has been replaced
-          by the b43 and b43legacy drivers.
-
-config BCM43XX_DEBUG
-        bool "Broadcom BCM43xx debugging (RECOMMENDED)"
-        depends on BCM43XX
-        default y
-        ---help---
-          Broadcom 43xx debugging messages.
-          Say Y, because the driver is still very experimental and
-          this will help you get it running.
-
-config BCM43XX_DMA
-        bool
-        depends on BCM43XX
-
-config BCM43XX_PIO
-        bool
-        depends on BCM43XX
-
-choice
-        prompt "BCM43xx data transfer mode"
-        depends on BCM43XX
-        default BCM43XX_DMA_AND_PIO_MODE
-
-config BCM43XX_DMA_AND_PIO_MODE
-        bool "DMA + PIO"
-        select BCM43XX_DMA
-        select BCM43XX_PIO
-        ---help---
-          Include both, Direct Memory Access (DMA) and Programmed I/O (PIO)
-          data transfer modes.
-          The actually used mode is selectable through the module
-          parameter "pio". If the module parameter is pio=0, DMA is used.
-          Otherwise PIO is used. DMA is default.
-
-          If unsure, choose this option.
-
-config BCM43XX_DMA_MODE
-        bool "DMA (Direct Memory Access) only"
-        select BCM43XX_DMA
-        ---help---
-          Only include Direct Memory Access (DMA).
-          This reduces the size of the driver module, by omitting the PIO code.
-
-config BCM43XX_PIO_MODE
-        bool "PIO (Programmed I/O) only"
-        select BCM43XX_PIO
-        ---help---
-          Only include Programmed I/O (PIO).
-          This reduces the size of the driver module, by omitting the DMA code.
-          Please note that PIO transfers are slow (compared to DMA).
-
-          Also note that not all devices of the 43xx series support PIO.
-          The 4306 (Apple Airport Extreme and others) supports PIO, while
-          the 4318 is known to _not_ support PIO.
-
-          Only use PIO, if DMA does not work for you.
-
-endchoice
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
deleted file mode 100644
index bb5220c629d2..000000000000
--- a/drivers/net/wireless/bcm43xx/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-obj-$(CONFIG_BCM43XX) += bcm43xx.o
-bcm43xx-obj-$(CONFIG_BCM43XX_DEBUG) += bcm43xx_debugfs.o
-
-bcm43xx-obj-$(CONFIG_BCM43XX_DMA) += bcm43xx_dma.o
-bcm43xx-obj-$(CONFIG_BCM43XX_PIO) += bcm43xx_pio.o
-
-bcm43xx-objs := bcm43xx_main.o bcm43xx_ilt.o \
-                bcm43xx_radio.o bcm43xx_phy.o \
-                bcm43xx_power.o bcm43xx_wx.o \
-                bcm43xx_leds.o bcm43xx_ethtool.o \
-                bcm43xx_xmit.o bcm43xx_sysfs.o \
-                $(bcm43xx-obj-y)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
deleted file mode 100644
index 2ebd2edf5862..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ /dev/null
@@ -1,997 +0,0 @@
-#ifndef BCM43xx_H_
-#define BCM43xx_H_
-
-#include <linux/hw_random.h>
-#include <linux/version.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/interrupt.h>
-#include <linux/stringify.h>
-#include <linux/pci.h>
-#include <net/ieee80211.h>
-#include <net/ieee80211softmac.h>
-#include <asm/atomic.h>
-#include <asm/io.h>
-
-
-#include "bcm43xx_debugfs.h"
-#include "bcm43xx_leds.h"
-
-
-#define PFX                             KBUILD_MODNAME ": "
-
-#define BCM43xx_SWITCH_CORE_MAX_RETRIES 50
-#define BCM43xx_IRQWAIT_MAX_RETRIES     100
-
-#define BCM43xx_IO_SIZE                 8192
-
-/* Active Core PCI Configuration Register. */
-#define BCM43xx_PCICFG_ACTIVE_CORE      0x80
-/* SPROM control register. */
-#define BCM43xx_PCICFG_SPROMCTL         0x88
-/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */
-#define BCM43xx_PCICFG_ICR              0x94
-
-/* MMIO offsets */
-#define BCM43xx_MMIO_DMA0_REASON        0x20
-#define BCM43xx_MMIO_DMA0_IRQ_MASK      0x24
-#define BCM43xx_MMIO_DMA1_REASON        0x28
-#define BCM43xx_MMIO_DMA1_IRQ_MASK      0x2C
-#define BCM43xx_MMIO_DMA2_REASON        0x30
-#define BCM43xx_MMIO_DMA2_IRQ_MASK      0x34
-#define BCM43xx_MMIO_DMA3_REASON        0x38
-#define BCM43xx_MMIO_DMA3_IRQ_MASK      0x3C
-#define BCM43xx_MMIO_DMA4_REASON        0x40
-#define BCM43xx_MMIO_DMA4_IRQ_MASK      0x44
-#define BCM43xx_MMIO_DMA5_REASON        0x48
-#define BCM43xx_MMIO_DMA5_IRQ_MASK      0x4C
-#define BCM43xx_MMIO_STATUS_BITFIELD    0x120
-#define BCM43xx_MMIO_STATUS2_BITFIELD   0x124
-#define BCM43xx_MMIO_GEN_IRQ_REASON     0x128
-#define BCM43xx_MMIO_GEN_IRQ_MASK       0x12C
-#define BCM43xx_MMIO_RAM_CONTROL        0x130
-#define BCM43xx_MMIO_RAM_DATA           0x134
-#define BCM43xx_MMIO_PS_STATUS          0x140
-#define BCM43xx_MMIO_RADIO_HWENABLED_HI 0x158
-#define BCM43xx_MMIO_SHM_CONTROL        0x160
-#define BCM43xx_MMIO_SHM_DATA           0x164
-#define BCM43xx_MMIO_SHM_DATA_UNALIGNED 0x166
-#define BCM43xx_MMIO_XMITSTAT_0         0x170
-#define BCM43xx_MMIO_XMITSTAT_1         0x174
-#define BCM43xx_MMIO_REV3PLUS_TSF_LOW   0x180 /* core rev >= 3 only */
-#define BCM43xx_MMIO_REV3PLUS_TSF_HIGH  0x184 /* core rev >= 3 only */
-
-/* 32-bit DMA */
-#define BCM43xx_MMIO_DMA32_BASE0        0x200
-#define BCM43xx_MMIO_DMA32_BASE1        0x220
-#define BCM43xx_MMIO_DMA32_BASE2        0x240
-#define BCM43xx_MMIO_DMA32_BASE3        0x260
-#define BCM43xx_MMIO_DMA32_BASE4        0x280
-#define BCM43xx_MMIO_DMA32_BASE5        0x2A0
-/* 64-bit DMA */
-#define BCM43xx_MMIO_DMA64_BASE0        0x200
-#define BCM43xx_MMIO_DMA64_BASE1        0x240
-#define BCM43xx_MMIO_DMA64_BASE2        0x280
-#define BCM43xx_MMIO_DMA64_BASE3        0x2C0
-#define BCM43xx_MMIO_DMA64_BASE4        0x300
-#define BCM43xx_MMIO_DMA64_BASE5        0x340
-/* PIO */
-#define BCM43xx_MMIO_PIO1_BASE          0x300
-#define BCM43xx_MMIO_PIO2_BASE          0x310
-#define BCM43xx_MMIO_PIO3_BASE          0x320
-#define BCM43xx_MMIO_PIO4_BASE          0x330
-
-#define BCM43xx_MMIO_PHY_VER            0x3E0
-#define BCM43xx_MMIO_PHY_RADIO          0x3E2
-#define BCM43xx_MMIO_ANTENNA            0x3E8
-#define BCM43xx_MMIO_CHANNEL            0x3F0
-#define BCM43xx_MMIO_CHANNEL_EXT        0x3F4
-#define BCM43xx_MMIO_RADIO_CONTROL      0x3F6
-#define BCM43xx_MMIO_RADIO_DATA_HIGH    0x3F8
-#define BCM43xx_MMIO_RADIO_DATA_LOW     0x3FA
-#define BCM43xx_MMIO_PHY_CONTROL        0x3FC
-#define BCM43xx_MMIO_PHY_DATA           0x3FE
-#define BCM43xx_MMIO_MACFILTER_CONTROL  0x420
-#define BCM43xx_MMIO_MACFILTER_DATA     0x422
-#define BCM43xx_MMIO_RADIO_HWENABLED_LO 0x49A
-#define BCM43xx_MMIO_GPIO_CONTROL       0x49C
-#define BCM43xx_MMIO_GPIO_MASK          0x49E
-#define BCM43xx_MMIO_TSF_0              0x632 /* core rev < 3 only */
-#define BCM43xx_MMIO_TSF_1              0x634 /* core rev < 3 only */
-#define BCM43xx_MMIO_TSF_2              0x636 /* core rev < 3 only */
-#define BCM43xx_MMIO_TSF_3              0x638 /* core rev < 3 only */
-#define BCM43xx_MMIO_RNG                0x65A
-#define BCM43xx_MMIO_POWERUP_DELAY      0x6A8
-
-/* SPROM offsets. */
-#define BCM43xx_SPROM_BASE              0x1000
-#define BCM43xx_SPROM_BOARDFLAGS2       0x1c
-#define BCM43xx_SPROM_IL0MACADDR        0x24
-#define BCM43xx_SPROM_ET0MACADDR        0x27
-#define BCM43xx_SPROM_ET1MACADDR        0x2a
-#define BCM43xx_SPROM_ETHPHY            0x2d
-#define BCM43xx_SPROM_BOARDREV          0x2e
-#define BCM43xx_SPROM_PA0B0             0x2f
-#define BCM43xx_SPROM_PA0B1             0x30
-#define BCM43xx_SPROM_PA0B2             0x31
-#define BCM43xx_SPROM_WL0GPIO0          0x32
-#define BCM43xx_SPROM_WL0GPIO2          0x33
-#define BCM43xx_SPROM_MAXPWR            0x34
-#define BCM43xx_SPROM_PA1B0             0x35
-#define BCM43xx_SPROM_PA1B1             0x36
-#define BCM43xx_SPROM_PA1B2             0x37
-#define BCM43xx_SPROM_IDL_TSSI_TGT      0x38
-#define BCM43xx_SPROM_BOARDFLAGS        0x39
-#define BCM43xx_SPROM_ANTENNA_GAIN      0x3a
-#define BCM43xx_SPROM_VERSION           0x3f
-
-/* BCM43xx_SPROM_BOARDFLAGS values */
-#define BCM43xx_BFL_BTCOEXIST           0x0001 /* implements Bluetooth coexistance */
-#define BCM43xx_BFL_PACTRL              0x0002 /* GPIO 9 controlling the PA */
-#define BCM43xx_BFL_AIRLINEMODE         0x0004 /* implements GPIO 13 radio disable indication */
-#define BCM43xx_BFL_RSSI                0x0008 /* software calculates nrssi slope. */
-#define BCM43xx_BFL_ENETSPI             0x0010 /* has ephy roboswitch spi */
-#define BCM43xx_BFL_XTAL_NOSLOW         0x0020 /* no slow clock available */
-#define BCM43xx_BFL_CCKHIPWR            0x0040 /* can do high power CCK transmission */
-#define BCM43xx_BFL_ENETADM             0x0080 /* has ADMtek switch */
-#define BCM43xx_BFL_ENETVLAN            0x0100 /* can do vlan */
-#define BCM43xx_BFL_AFTERBURNER         0x0200 /* supports Afterburner mode */
-#define BCM43xx_BFL_NOPCI               0x0400 /* leaves PCI floating */
-#define BCM43xx_BFL_FEM                 0x0800 /* supports the Front End Module */
-#define BCM43xx_BFL_EXTLNA              0x1000 /* has an external LNA */
-#define BCM43xx_BFL_HGPA                0x2000 /* had high gain PA */
-#define BCM43xx_BFL_BTCMOD              0x4000 /* BFL_BTCOEXIST is given in alternate GPIOs */
-#define BCM43xx_BFL_ALTIQ               0x8000 /* alternate I/Q settings */
-
-/* GPIO register offset, in both ChipCommon and PCI core. */
-#define BCM43xx_GPIO_CONTROL            0x6c
-
-/* SHM Routing */
-#define BCM43xx_SHM_SHARED              0x0001
-#define BCM43xx_SHM_WIRELESS            0x0002
-#define BCM43xx_SHM_PCM                 0x0003
-#define BCM43xx_SHM_HWMAC               0x0004
-#define BCM43xx_SHM_UCODE               0x0300
-
-/* MacFilter offsets. */
-#define BCM43xx_MACFILTER_SELF          0x0000
-#define BCM43xx_MACFILTER_ASSOC         0x0003
-
-/* Chipcommon registers. */
-#define BCM43xx_CHIPCOMMON_CAPABILITIES         0x04
-#define BCM43xx_CHIPCOMMON_CTL                  0x28
-#define BCM43xx_CHIPCOMMON_PLLONDELAY           0xB0
-#define BCM43xx_CHIPCOMMON_FREFSELDELAY         0xB4
-#define BCM43xx_CHIPCOMMON_SLOWCLKCTL           0xB8
-#define BCM43xx_CHIPCOMMON_SYSCLKCTL            0xC0
-
-/* PCI core specific registers. */
-#define BCM43xx_PCICORE_BCAST_ADDR      0x50
-#define BCM43xx_PCICORE_BCAST_DATA      0x54
-#define BCM43xx_PCICORE_SBTOPCI2        0x108
-
-/* SBTOPCI2 values. */
-#define BCM43xx_SBTOPCI2_PREFETCH       0x4
-#define BCM43xx_SBTOPCI2_BURST          0x8
-#define BCM43xx_SBTOPCI2_MEMREAD_MULTI  0x20
-
-/* PCI-E core registers. */
-#define BCM43xx_PCIECORE_REG_ADDR      0x0130
-#define BCM43xx_PCIECORE_REG_DATA      0x0134
-#define BCM43xx_PCIECORE_MDIO_CTL      0x0128
-#define BCM43xx_PCIECORE_MDIO_DATA     0x012C
-
-/* PCI-E registers. */
-#define BCM43xx_PCIE_TLP_WORKAROUND    0x0004
-#define BCM43xx_PCIE_DLLP_LINKCTL      0x0100
-
-/* PCI-E MDIO bits. */
-#define BCM43xx_PCIE_MDIO_ST   0x40000000
-#define BCM43xx_PCIE_MDIO_WT   0x10000000
-#define BCM43xx_PCIE_MDIO_DEV  22
-#define BCM43xx_PCIE_MDIO_REG  18
-#define BCM43xx_PCIE_MDIO_TA   0x00020000
-#define BCM43xx_PCIE_MDIO_TC   0x0100
-
-/* MDIO devices. */
-#define BCM43xx_MDIO_SERDES_RX  0x1F
-
-/* SERDES RX registers. */
-#define BCM43xx_SERDES_RXTIMER  0x2
-#define BCM43xx_SERDES_CDR      0x6
-#define BCM43xx_SERDES_CDR_BW   0x7
-
-/* Chipcommon capabilities. */
-#define BCM43xx_CAPABILITIES_PCTL               0x00040000
-#define BCM43xx_CAPABILITIES_PLLMASK            0x00030000
-#define BCM43xx_CAPABILITIES_PLLSHIFT           16
-#define BCM43xx_CAPABILITIES_FLASHMASK          0x00000700
-#define BCM43xx_CAPABILITIES_FLASHSHIFT         8
-#define BCM43xx_CAPABILITIES_EXTBUSPRESENT      0x00000040
-#define BCM43xx_CAPABILITIES_UARTGPIO           0x00000020
-#define BCM43xx_CAPABILITIES_UARTCLOCKMASK      0x00000018
-#define BCM43xx_CAPABILITIES_UARTCLOCKSHIFT     3
-#define BCM43xx_CAPABILITIES_MIPSBIGENDIAN      0x00000004
-#define BCM43xx_CAPABILITIES_NRUARTSMASK        0x00000003
-
-/* PowerControl */
-#define BCM43xx_PCTL_IN                 0xB0
-#define BCM43xx_PCTL_OUT                0xB4
-#define BCM43xx_PCTL_OUTENABLE          0xB8
-#define BCM43xx_PCTL_XTAL_POWERUP       0x40
-#define BCM43xx_PCTL_PLL_POWERDOWN      0x80
-
-/* PowerControl Clock Modes */
-#define BCM43xx_PCTL_CLK_FAST           0x00
-#define BCM43xx_PCTL_CLK_SLOW           0x01
-#define BCM43xx_PCTL_CLK_DYNAMIC        0x02
-
-#define BCM43xx_PCTL_FORCE_SLOW         0x0800
-#define BCM43xx_PCTL_FORCE_PLL          0x1000
-#define BCM43xx_PCTL_DYN_XTAL           0x2000
-
-/* COREIDs */
-#define BCM43xx_COREID_CHIPCOMMON       0x800
-#define BCM43xx_COREID_ILINE20          0x801
-#define BCM43xx_COREID_SDRAM            0x803
-#define BCM43xx_COREID_PCI              0x804
-#define BCM43xx_COREID_MIPS             0x805
-#define BCM43xx_COREID_ETHERNET         0x806
-#define BCM43xx_COREID_V90              0x807
-#define BCM43xx_COREID_USB11_HOSTDEV    0x80a
-#define BCM43xx_COREID_IPSEC            0x80b
-#define BCM43xx_COREID_PCMCIA           0x80d
-#define BCM43xx_COREID_EXT_IF           0x80f
-#define BCM43xx_COREID_80211            0x812
-#define BCM43xx_COREID_MIPS_3302        0x816
-#define BCM43xx_COREID_USB11_HOST       0x817
-#define BCM43xx_COREID_USB11_DEV        0x818
-#define BCM43xx_COREID_USB20_HOST       0x819
-#define BCM43xx_COREID_USB20_DEV        0x81a
-#define BCM43xx_COREID_SDIO_HOST        0x81b
-#define BCM43xx_COREID_PCIE             0x820
-
-/* Core Information Registers */
-#define BCM43xx_CIR_BASE                0xf00
-#define BCM43xx_CIR_SBTPSFLAG           (BCM43xx_CIR_BASE + 0x18)
-#define BCM43xx_CIR_SBIMSTATE           (BCM43xx_CIR_BASE + 0x90)
-#define BCM43xx_CIR_SBINTVEC            (BCM43xx_CIR_BASE + 0x94)
-#define BCM43xx_CIR_SBTMSTATELOW        (BCM43xx_CIR_BASE + 0x98)
-#define BCM43xx_CIR_SBTMSTATEHIGH       (BCM43xx_CIR_BASE + 0x9c)
-#define BCM43xx_CIR_SBIMCONFIGLOW       (BCM43xx_CIR_BASE + 0xa8)
-#define BCM43xx_CIR_SB_ID_HI            (BCM43xx_CIR_BASE + 0xfc)
-
-/* Mask to get the Backplane Flag Number from SBTPSFLAG. */
-#define BCM43xx_BACKPLANE_FLAG_NR_MASK  0x3f
-
-/* SBIMCONFIGLOW values/masks. */
-#define BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK         0x00000007
-#define BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT        0
-#define BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK         0x00000070
-#define BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT        4
-#define BCM43xx_SBIMCONFIGLOW_CONNID_MASK               0x00ff0000
-#define BCM43xx_SBIMCONFIGLOW_CONNID_SHIFT              16
-
-/* sbtmstatelow state flags */
-#define BCM43xx_SBTMSTATELOW_RESET              0x01
-#define BCM43xx_SBTMSTATELOW_REJECT             0x02
-#define BCM43xx_SBTMSTATELOW_CLOCK              0x10000
-#define BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK   0x20000
-#define BCM43xx_SBTMSTATELOW_G_MODE_ENABLE      0x20000000
-
-/* sbtmstatehigh state flags */
-#define BCM43xx_SBTMSTATEHIGH_SERROR            0x00000001
-#define BCM43xx_SBTMSTATEHIGH_BUSY              0x00000004
-#define BCM43xx_SBTMSTATEHIGH_TIMEOUT           0x00000020
-#define BCM43xx_SBTMSTATEHIGH_G_PHY_AVAIL       0x00010000
-#define BCM43xx_SBTMSTATEHIGH_A_PHY_AVAIL       0x00020000
-#define BCM43xx_SBTMSTATEHIGH_COREFLAGS         0x1FFF0000
-#define BCM43xx_SBTMSTATEHIGH_DMA64BIT          0x10000000
-#define BCM43xx_SBTMSTATEHIGH_GATEDCLK          0x20000000
-#define BCM43xx_SBTMSTATEHIGH_BISTFAILED        0x40000000
-#define BCM43xx_SBTMSTATEHIGH_BISTCOMPLETE      0x80000000
-
-/* sbimstate flags */
-#define BCM43xx_SBIMSTATE_IB_ERROR              0x20000
-#define BCM43xx_SBIMSTATE_TIMEOUT               0x40000
-
-/* PHYVersioning */
-#define BCM43xx_PHYTYPE_A               0x00
-#define BCM43xx_PHYTYPE_B               0x01
-#define BCM43xx_PHYTYPE_G               0x02
-
-/* PHYRegisters */
-#define BCM43xx_PHY_ILT_A_CTRL          0x0072
-#define BCM43xx_PHY_ILT_A_DATA1         0x0073
-#define BCM43xx_PHY_ILT_A_DATA2         0x0074
-#define BCM43xx_PHY_G_LO_CONTROL        0x0810
-#define BCM43xx_PHY_ILT_G_CTRL          0x0472
-#define BCM43xx_PHY_ILT_G_DATA1         0x0473
-#define BCM43xx_PHY_ILT_G_DATA2         0x0474
-#define BCM43xx_PHY_A_PCTL              0x007B
-#define BCM43xx_PHY_G_PCTL              0x0029
-#define BCM43xx_PHY_A_CRS               0x0029
-#define BCM43xx_PHY_RADIO_BITFIELD      0x0401
-#define BCM43xx_PHY_G_CRS               0x0429
-#define BCM43xx_PHY_NRSSILT_CTRL        0x0803
-#define BCM43xx_PHY_NRSSILT_DATA        0x0804
-
-/* RadioRegisters */
-#define BCM43xx_RADIOCTL_ID             0x01
-
-/* StatusBitField */
-#define BCM43xx_SBF_MAC_ENABLED         0x00000001
-#define BCM43xx_SBF_2                   0x00000002 /*FIXME: fix name*/
-#define BCM43xx_SBF_CORE_READY          0x00000004
-#define BCM43xx_SBF_400                 0x00000400 /*FIXME: fix name*/
-#define BCM43xx_SBF_4000                0x00004000 /*FIXME: fix name*/
-#define BCM43xx_SBF_8000                0x00008000 /*FIXME: fix name*/
-#define BCM43xx_SBF_XFER_REG_BYTESWAP   0x00010000
-#define BCM43xx_SBF_MODE_NOTADHOC       0x00020000
-#define BCM43xx_SBF_MODE_AP             0x00040000
-#define BCM43xx_SBF_RADIOREG_LOCK       0x00080000
-#define BCM43xx_SBF_MODE_MONITOR        0x00400000
-#define BCM43xx_SBF_MODE_PROMISC        0x01000000
-#define BCM43xx_SBF_PS1                 0x02000000
-#define BCM43xx_SBF_PS2                 0x04000000
-#define BCM43xx_SBF_NO_SSID_BCAST       0x08000000
-#define BCM43xx_SBF_TIME_UPDATE         0x10000000
-#define BCM43xx_SBF_MODE_G              0x80000000
-
-/* Microcode */
-#define BCM43xx_UCODE_REVISION          0x0000
-#define BCM43xx_UCODE_PATCHLEVEL        0x0002
-#define BCM43xx_UCODE_DATE              0x0004
-#define BCM43xx_UCODE_TIME              0x0006
-#define BCM43xx_UCODE_STATUS            0x0040
-
-/* MicrocodeFlagsBitfield (addr + lo-word values?)*/
-#define BCM43xx_UCODEFLAGS_OFFSET       0x005E
-
-#define BCM43xx_UCODEFLAG_AUTODIV       0x0001
-#define BCM43xx_UCODEFLAG_UNKBGPHY      0x0002
-#define BCM43xx_UCODEFLAG_UNKBPHY       0x0004
-#define BCM43xx_UCODEFLAG_UNKGPHY       0x0020
-#define BCM43xx_UCODEFLAG_UNKPACTRL     0x0040
-#define BCM43xx_UCODEFLAG_JAPAN         0x0080
-
-/* Hardware Radio Enable masks */
-#define BCM43xx_MMIO_RADIO_HWENABLED_HI_MASK (1 << 16)
-#define BCM43xx_MMIO_RADIO_HWENABLED_LO_MASK (1 << 4)
-
-/* Generic-Interrupt reasons. */
-#define BCM43xx_IRQ_READY               (1 << 0)
-#define BCM43xx_IRQ_BEACON              (1 << 1)
-#define BCM43xx_IRQ_PS                  (1 << 2)
-#define BCM43xx_IRQ_REG124              (1 << 5)
-#define BCM43xx_IRQ_PMQ                 (1 << 6)
-#define BCM43xx_IRQ_PIO_WORKAROUND      (1 << 8)
-#define BCM43xx_IRQ_XMIT_ERROR          (1 << 11)
-#define BCM43xx_IRQ_RX                  (1 << 15)
-#define BCM43xx_IRQ_SCAN                (1 << 16)
-#define BCM43xx_IRQ_NOISE               (1 << 18)
-#define BCM43xx_IRQ_XMIT_STATUS         (1 << 29)
-
-#define BCM43xx_IRQ_ALL                 0xffffffff
-#define BCM43xx_IRQ_INITIAL             (BCM43xx_IRQ_PS |               \
-                                         BCM43xx_IRQ_REG124 |           \
-                                         BCM43xx_IRQ_PMQ |              \
-                                         BCM43xx_IRQ_XMIT_ERROR |       \
-                                         BCM43xx_IRQ_RX |               \
-                                         BCM43xx_IRQ_SCAN |             \
-                                         BCM43xx_IRQ_NOISE |            \
-                                         BCM43xx_IRQ_XMIT_STATUS)
-                                         
-
-/* Initial default iw_mode */
-#define BCM43xx_INITIAL_IWMODE                  IW_MODE_INFRA
-
-/* Bus type PCI. */
-#define BCM43xx_BUSTYPE_PCI     0
-/* Bus type Silicone Backplane Bus. */
-#define BCM43xx_BUSTYPE_SB      1
-/* Bus type PCMCIA. */
-#define BCM43xx_BUSTYPE_PCMCIA  2
-
-/* Threshold values. */
-#define BCM43xx_MIN_RTS_THRESHOLD               1U
-#define BCM43xx_MAX_RTS_THRESHOLD               2304U
-#define BCM43xx_DEFAULT_RTS_THRESHOLD           BCM43xx_MAX_RTS_THRESHOLD
-
-#define BCM43xx_DEFAULT_SHORT_RETRY_LIMIT       7
-#define BCM43xx_DEFAULT_LONG_RETRY_LIMIT        4
-
-/* FIXME: the next line is a guess as to what the maximum RSSI value might be */
-#define RX_RSSI_MAX                             60
-
-/* Max size of a security key */
-#define BCM43xx_SEC_KEYSIZE                     16
-/* Security algorithms. */
-enum {
-        BCM43xx_SEC_ALGO_NONE = 0, /* unencrypted, as of TX header. */
-        BCM43xx_SEC_ALGO_WEP,
-        BCM43xx_SEC_ALGO_UNKNOWN,
-        BCM43xx_SEC_ALGO_AES,
-        BCM43xx_SEC_ALGO_WEP104,
-        BCM43xx_SEC_ALGO_TKIP,
-};
-
-#ifdef assert
-# undef assert
-#endif
-#ifdef CONFIG_BCM43XX_DEBUG
-#define assert(expr) \
-        do {                                                                    \
-                if (unlikely(!(expr))) {                                        \
-                printk(KERN_ERR PFX "ASSERTION FAILED (%s) at: %s:%d:%s()\n",   \
-                        #expr, __FILE__, __LINE__, __FUNCTION__);               \
-                }                                                               \
-        } while (0)
-#else
-#define assert(expr)    do { /* nothing */ } while (0)
-#endif
-
-/* rate limited printk(). */
-#ifdef printkl
-# undef printkl
-#endif
-#define printkl(f, x...)  do { if (printk_ratelimit()) printk(f ,##x); } while (0)
-/* rate limited printk() for debugging */
-#ifdef dprintkl
-# undef dprintkl
-#endif
-#ifdef CONFIG_BCM43XX_DEBUG
-# define dprintkl               printkl
-#else
-# define dprintkl(f, x...)      do { /* nothing */ } while (0)
-#endif
-
-/* Helper macro for if branches.
- * An if branch marked with this macro is only taken in DEBUG mode.
- * Example:
- *      if (DEBUG_ONLY(foo == bar)) {
- *              do something
- *      }
- *      In DEBUG mode, the branch will be taken if (foo == bar).
- *      In non-DEBUG mode, the branch will never be taken.
- */
-#ifdef DEBUG_ONLY
-# undef DEBUG_ONLY
-#endif
-#ifdef CONFIG_BCM43XX_DEBUG
-# define DEBUG_ONLY(x)  (x)
-#else
-# define DEBUG_ONLY(x)  0
-#endif
-
-/* debugging printk() */
-#ifdef dprintk
-# undef dprintk
-#endif
-#ifdef CONFIG_BCM43XX_DEBUG
-# define dprintk(f, x...)  do { printk(f ,##x); } while (0)
-#else
-# define dprintk(f, x...)  do { /* nothing */ } while (0)
-#endif
-
-
-struct net_device;
-struct pci_dev;
-struct bcm43xx_dmaring;
-struct bcm43xx_pioqueue;
-
-struct bcm43xx_initval {
-        __be16 offset;
-        __be16 size;
-        __be32 value;
-} __attribute__((__packed__));
-
-/* Values for bcm430x_sprominfo.locale */
-enum {
-        BCM43xx_LOCALE_WORLD = 0,
-        BCM43xx_LOCALE_THAILAND,
-        BCM43xx_LOCALE_ISRAEL,
-        BCM43xx_LOCALE_JORDAN,
-        BCM43xx_LOCALE_CHINA,
-        BCM43xx_LOCALE_JAPAN,
-        BCM43xx_LOCALE_USA_CANADA_ANZ,
-        BCM43xx_LOCALE_EUROPE,
-        BCM43xx_LOCALE_USA_LOW,
-        BCM43xx_LOCALE_JAPAN_HIGH,
-        BCM43xx_LOCALE_ALL,
-        BCM43xx_LOCALE_NONE,
-};
-
-#define BCM43xx_SPROM_SIZE      64 /* in 16-bit words. */
-struct bcm43xx_sprominfo {
-        u16 boardflags2;
-        u8 il0macaddr[6];
-        u8 et0macaddr[6];
-        u8 et1macaddr[6];
-        u8 et0phyaddr:5;
-        u8 et1phyaddr:5;
-        u8 boardrev;
-        u8 locale:4;
-        u8 antennas_aphy:2;
-        u8 antennas_bgphy:2;
-        u16 pa0b0;
-        u16 pa0b1;
-        u16 pa0b2;
-        u8 wl0gpio0;
-        u8 wl0gpio1;
-        u8 wl0gpio2;
-        u8 wl0gpio3;
-        u8 maxpower_aphy;
-        u8 maxpower_bgphy;
-        u16 pa1b0;
-        u16 pa1b1;
-        u16 pa1b2;
-        u8 idle_tssi_tgt_aphy;
-        u8 idle_tssi_tgt_bgphy;
-        u16 boardflags;
-        u16 antennagain_aphy;
-        u16 antennagain_bgphy;
-};
-
-/* Value pair to measure the LocalOscillator. */
-struct bcm43xx_lopair {
-        s8 low;
-        s8 high;
-        u8 used:1;
-};
-#define BCM43xx_LO_COUNT        (14*4)
-
-struct bcm43xx_phyinfo {
-        /* Hardware Data */
-        u8 analog;
-        u8 type;
-        u8 rev;
-        u16 antenna_diversity;
-        u16 savedpctlreg;
-        u16 minlowsig[2];
-        u16 minlowsigpos[2];
-        u8 connected:1,
-           calibrated:1,
-           is_locked:1, /* used in bcm43xx_phy_{un}lock() */
-           dyn_tssi_tbl:1; /* used in bcm43xx_phy_init_tssi2dbm_table() */
-        /* LO Measurement Data.
-         * Use bcm43xx_get_lopair() to get a value.
-         */
-        struct bcm43xx_lopair *_lo_pairs;
-
-        /* TSSI to dBm table in use */
-        const s8 *tssi2dbm;
-        /* idle TSSI value */
-        s8 idle_tssi;
-
-        /* Values from bcm43xx_calc_loopback_gain() */
-        u16 loopback_gain[2];
-
-        /* PHY lock for core.rev < 3
-         * This lock is only used by bcm43xx_phy_{un}lock()
-         */
-        spinlock_t lock;
-
-        /* Firmware. */
-        const struct firmware *ucode;
-        const struct firmware *pcm;
-        const struct firmware *initvals0;
-        const struct firmware *initvals1;
-};
-
-
-struct bcm43xx_radioinfo {
-        u16 manufact;
-        u16 version;
-        u8 revision;
-
-        /* Desired TX power in dBm Q5.2 */
-        u16 txpower_desired;
-        /* TX Power control values. */
-        union {
-                /* B/G PHY */
-                struct {
-                        u16 baseband_atten;
-                        u16 radio_atten;
-                        u16 txctl1;
-                        u16 txctl2;
-                };
-                /* A PHY */
-                struct {
-                        u16 txpwr_offset;
-                };
-        };
-
-        /* Current Interference Mitigation mode */
-        int interfmode;
-        /* Stack of saved values from the Interference Mitigation code.
-         * Each value in the stack is layed out as follows:
-         * bit 0-11:  offset
-         * bit 12-15: register ID
-         * bit 16-32: value
-         * register ID is: 0x1 PHY, 0x2 Radio, 0x3 ILT
-         */
-#define BCM43xx_INTERFSTACK_SIZE        26
-        u32 interfstack[BCM43xx_INTERFSTACK_SIZE];
-
-        /* Saved values from the NRSSI Slope calculation */
-        s16 nrssi[2];
-        s32 nrssislope;
-        /* In memory nrssi lookup table. */
-        s8 nrssi_lt[64];
-
-        /* current channel */
-        u8 channel;
-        u8 initial_channel;
-
-        u16 lofcal;
-
-        u16 initval;
-
-        u8 enabled:1;
-        /* ACI (adjacent channel interference) flags. */
-        u8 aci_enable:1,
-           aci_wlan_automatic:1,
-           aci_hw_rssi:1;
-};
-
-/* Data structures for DMA transmission, per 80211 core. */
-struct bcm43xx_dma {
-        struct bcm43xx_dmaring *tx_ring0;
-        struct bcm43xx_dmaring *tx_ring1;
-        struct bcm43xx_dmaring *tx_ring2;
-        struct bcm43xx_dmaring *tx_ring3;
-        struct bcm43xx_dmaring *tx_ring4;
-        struct bcm43xx_dmaring *tx_ring5;
-
-        struct bcm43xx_dmaring *rx_ring0;
-        struct bcm43xx_dmaring *rx_ring3; /* only available on core.rev < 5 */
-};
-
-/* Data structures for PIO transmission, per 80211 core. */
-struct bcm43xx_pio {
-        struct bcm43xx_pioqueue *queue0;
-        struct bcm43xx_pioqueue *queue1;
-        struct bcm43xx_pioqueue *queue2;
-        struct bcm43xx_pioqueue *queue3;
-};
-
-#define BCM43xx_MAX_80211_CORES         2
-
-/* Generic information about a core. */
-struct bcm43xx_coreinfo {
-        u8 available:1,
-           enabled:1,
-           initialized:1;
-        /** core_rev revision number */
-        u8 rev;
-        /** Index number for _switch_core() */
-        u8 index;
-        /** core_id ID number */
-        u16 id;
-        /** Core-specific data. */
-        void *priv;
-};
-
-/* Additional information for each 80211 core. */
-struct bcm43xx_coreinfo_80211 {
-        /* PHY device. */
-        struct bcm43xx_phyinfo phy;
-        /* Radio device. */
-        struct bcm43xx_radioinfo radio;
-        union {
-                /* DMA context. */
-                struct bcm43xx_dma dma;
-                /* PIO context. */
-                struct bcm43xx_pio pio;
-        };
-};
-
-/* Context information for a noise calculation (Link Quality). */
-struct bcm43xx_noise_calculation {
-        struct bcm43xx_coreinfo *core_at_start;
-        u8 channel_at_start;
-        u8 calculation_running:1;
-        u8 nr_samples;
-        s8 samples[8][4];
-};
-
-struct bcm43xx_stats {
-        u8 noise;
-        struct iw_statistics wstats;
-        /* Store the last TX/RX times here for updating the leds. */
-        unsigned long last_tx;
-        unsigned long last_rx;
-};
-
-struct bcm43xx_key {
-        u8 enabled:1;
-        u8 algorithm;
-};
-
-/* Driver initialization status. */
-enum {
-        BCM43xx_STAT_UNINIT,            /* Uninitialized. */
-        BCM43xx_STAT_INITIALIZING,      /* init_board() in progress. */
-        BCM43xx_STAT_INITIALIZED,       /* Fully operational. */
-        BCM43xx_STAT_SHUTTINGDOWN,      /* free_board() in progress. */
-        BCM43xx_STAT_RESTARTING,        /* controller_restart() called. */
-};
-#define bcm43xx_status(bcm)             atomic_read(&(bcm)->init_status)
-#define bcm43xx_set_status(bcm, stat)   do {                    \
-                atomic_set(&(bcm)->init_status, (stat));        \
-                smp_wmb();                                      \
-                                        } while (0)
-
-/*    *** THEORY OF LOCKING ***
- *
- * We have two different locks in the bcm43xx driver.
- * => bcm->mutex:    General sleeping mutex. Protects struct bcm43xx_private
- *                   and the device registers. This mutex does _not_ protect
- *                   against concurrency from the IRQ handler.
- * => bcm->irq_lock: IRQ spinlock. Protects against IRQ handler concurrency.
- *
- * Please note that, if you only take the irq_lock, you are not protected
- * against concurrency from the periodic work handlers.
- * Most times you want to take _both_ locks.
- */
-
-struct bcm43xx_private {
-        struct ieee80211_device *ieee;
-        struct ieee80211softmac_device *softmac;
-
-        struct net_device *net_dev;
-        struct pci_dev *pci_dev;
-        unsigned int irq;
-
-        void __iomem *mmio_addr;
-
-        spinlock_t irq_lock;
-        struct mutex mutex;
-
-        /* Driver initialization status BCM43xx_STAT_*** */
-        atomic_t init_status;
-
-        u16 was_initialized:1,          /* for PCI suspend/resume. */
-            __using_pio:1,              /* Internal, use bcm43xx_using_pio(). */
-            bad_frames_preempt:1,       /* Use "Bad Frames Preemption" (default off) */
-            reg124_set_0x4:1,           /* Some variable to keep track of IRQ stuff. */
-            short_preamble:1,           /* TRUE, if short preamble is enabled. */
-            firmware_norelease:1,       /* Do not release the firmware. Used on suspend. */
-            radio_hw_enable:1;          /* TRUE if radio is hardware enabled */
-
-        struct bcm43xx_stats stats;
-
-        /* Bus type we are connected to.
-         * This is currently always BCM43xx_BUSTYPE_PCI
-         */
-        u8 bustype;
-        u64 dma_mask;
-
-        u16 board_vendor;
-        u16 board_type;
-        u16 board_revision;
-
-        u16 chip_id;
-        u8 chip_rev;
-        u8 chip_package;
-
-        struct bcm43xx_sprominfo sprom;
-#define BCM43xx_NR_LEDS         4
-        struct bcm43xx_led leds[BCM43xx_NR_LEDS];
-        spinlock_t leds_lock;
-
-        /* The currently active core. */
-        struct bcm43xx_coreinfo *current_core;
-        struct bcm43xx_coreinfo *active_80211_core;
-        /* coreinfo structs for all possible cores follow.
-         * Note that a core might not exist.
-         * So check the coreinfo flags before using it.
-         */
-        struct bcm43xx_coreinfo core_chipcommon;
-        struct bcm43xx_coreinfo core_pci;
-        struct bcm43xx_coreinfo core_80211[ BCM43xx_MAX_80211_CORES ];
-        /* Additional information, specific to the 80211 cores. */
-        struct bcm43xx_coreinfo_80211 core_80211_ext[ BCM43xx_MAX_80211_CORES ];
-        /* Number of available 80211 cores. */
-        int nr_80211_available;
-
-        u32 chipcommon_capabilities;
-
-        /* Reason code of the last interrupt. */
-        u32 irq_reason;
-        u32 dma_reason[6];
-        /* saved irq enable/disable state bitfield. */
-        u32 irq_savedstate;
-        /* Link Quality calculation context. */
-        struct bcm43xx_noise_calculation noisecalc;
-        /* if > 0 MAC is suspended. if == 0 MAC is enabled. */
-        int mac_suspended;
-
-        /* Threshold values. */
-        //TODO: The RTS thr has to be _used_. Currently, it is only set via WX.
-        u32 rts_threshold;
-
-        /* Interrupt Service Routine tasklet (bottom-half) */
-        struct tasklet_struct isr_tasklet;
-
-        /* Periodic tasks */
-        struct delayed_work periodic_work;
-        unsigned int periodic_state;
-
-        struct work_struct restart_work;
-
-        /* Informational stuff. */
-        char nick[IW_ESSID_MAX_SIZE + 1];
-
-        /* encryption/decryption */
-        u16 security_offset;
-        struct bcm43xx_key key[54];
-        u8 default_key_idx;
-
-        /* Random Number Generator. */
-        struct hwrng rng;
-        char rng_name[20 + 1];
-
-        /* Debugging stuff follows. */
-#ifdef CONFIG_BCM43XX_DEBUG
-        struct bcm43xx_dfsentry *dfsentry;
-#endif
-};
-
-
-static inline
-struct bcm43xx_private * bcm43xx_priv(struct net_device *dev)
-{
-        return ieee80211softmac_priv(dev);
-}
-
-struct device;
-
-static inline
-struct bcm43xx_private * dev_to_bcm(struct device *dev)
-{
-        struct net_device *net_dev;
-        struct bcm43xx_private *bcm;
-
-        net_dev = dev_get_drvdata(dev);
-        bcm = bcm43xx_priv(net_dev);
-
-        return bcm;
-}
-
-
-/* Helper function, which returns a boolean.
- * TRUE, if PIO is used; FALSE, if DMA is used.
- */
-#if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO)
-static inline
-int bcm43xx_using_pio(struct bcm43xx_private *bcm)
-{
-        return bcm->__using_pio;
-}
-#elif defined(CONFIG_BCM43XX_DMA)
-static inline
-int bcm43xx_using_pio(struct bcm43xx_private *bcm)
-{
-        return 0;
-}
-#elif defined(CONFIG_BCM43XX_PIO)
-static inline
-int bcm43xx_using_pio(struct bcm43xx_private *bcm)
-{
-        return 1;
-}
-#else
-# error "Using neither DMA nor PIO? Confused..."
-#endif
-
-/* Helper functions to access data structures private to the 80211 cores.
- * Note that we _must_ have an 80211 core mapped when calling
- * any of these functions.
- */
-static inline
-struct bcm43xx_coreinfo_80211 *
-bcm43xx_current_80211_priv(struct bcm43xx_private *bcm)
-{
-        assert(bcm->current_core->id == BCM43xx_COREID_80211);
-        return bcm->current_core->priv;
-}
-static inline
-struct bcm43xx_pio * bcm43xx_current_pio(struct bcm43xx_private *bcm)
-{
-        assert(bcm43xx_using_pio(bcm));
-        return &(bcm43xx_current_80211_priv(bcm)->pio);
-}
-static inline
-struct bcm43xx_dma * bcm43xx_current_dma(struct bcm43xx_private *bcm)
-{
-        assert(!bcm43xx_using_pio(bcm));
-        return &(bcm43xx_current_80211_priv(bcm)->dma);
-}
-static inline
-struct bcm43xx_phyinfo * bcm43xx_current_phy(struct bcm43xx_private *bcm)
-{
-        return &(bcm43xx_current_80211_priv(bcm)->phy);
-}
-static inline
-struct bcm43xx_radioinfo * bcm43xx_current_radio(struct bcm43xx_private *bcm)
-{
-        return &(bcm43xx_current_80211_priv(bcm)->radio);
-}
-
-
-static inline
-struct bcm43xx_lopair * bcm43xx_get_lopair(struct bcm43xx_phyinfo *phy,
-                                           u16 radio_attenuation,
-                                           u16 baseband_attenuation)
-{
-        return phy->_lo_pairs + (radio_attenuation + 14 * (baseband_attenuation / 2));
-}
-
-
-static inline
-u16 bcm43xx_read16(struct bcm43xx_private *bcm, u16 offset)
-{
-        return ioread16(bcm->mmio_addr + offset);
-}
-
-static inline
-void bcm43xx_write16(struct bcm43xx_private *bcm, u16 offset, u16 value)
-{
-        iowrite16(value, bcm->mmio_addr + offset);
-}
-
-static inline
-u32 bcm43xx_read32(struct bcm43xx_private *bcm, u16 offset)
-{
-        return ioread32(bcm->mmio_addr + offset);
-}
-
-static inline
-void bcm43xx_write32(struct bcm43xx_private *bcm, u16 offset, u32 value)
-{
-        iowrite32(value, bcm->mmio_addr + offset);
-}
-
-static inline
-int bcm43xx_pci_read_config16(struct bcm43xx_private *bcm, int offset, u16 *value)
-{
-        return pci_read_config_word(bcm->pci_dev, offset, value);
-}
-
-static inline
-int bcm43xx_pci_read_config32(struct bcm43xx_private *bcm, int offset, u32 *value)
-{
-        return pci_read_config_dword(bcm->pci_dev, offset, value);
-}
-
-static inline
-int bcm43xx_pci_write_config16(struct bcm43xx_private *bcm, int offset, u16 value)
-{
-        return pci_write_config_word(bcm->pci_dev, offset, value);
-}
-
-static inline
-int bcm43xx_pci_write_config32(struct bcm43xx_private *bcm, int offset, u32 value)
-{
-        return pci_write_config_dword(bcm->pci_dev, offset, value);
-}
-
-/** Limit a value between two limits */
-#ifdef limit_value
-# undef limit_value
-#endif
-#define limit_value(value, min, max)  \
-        ({                                              \
-                typeof(value) __value = (value);        \
-                typeof(value) __min = (min);            \
-                typeof(value) __max = (max);            \
-                if (__value < __min)                    \
-                        __value = __min;                \
-                else if (__value > __max)               \
-                        __value = __max;                \
-                __value;                                \
-        })
-
-#endif /* BCM43xx_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
deleted file mode 100644
index 76e9dd843faa..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  debugfs driver debugging code
-
-  Copyright (c) 2005 Michael Buesch <mbuesch@freenet.de>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-
-
-#include <linux/fs.h>
-#include <linux/debugfs.h>
-#include <linux/slab.h>
-#include <linux/netdevice.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-
-#include "bcm43xx.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_debugfs.h"
-#include "bcm43xx_dma.h"
-#include "bcm43xx_pio.h"
-#include "bcm43xx_xmit.h"
-
-#define REALLY_BIG_BUFFER_SIZE  (1024*256)
-
-static struct bcm43xx_debugfs fs;
-static char really_big_buffer[REALLY_BIG_BUFFER_SIZE];
-static DECLARE_MUTEX(big_buffer_sem);
-
-
-static ssize_t write_file_dummy(struct file *file, const char __user *buf,
-                                size_t count, loff_t *ppos)
-{
-        return count;
-}
-
-static int open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
-#define fappend(fmt, x...)      pos += snprintf(buf + pos, len - pos, fmt , ##x)
-
-static ssize_t devinfo_read_file(struct file *file, char __user *userbuf,
-                                 size_t count, loff_t *ppos)
-{
-        const size_t len = REALLY_BIG_BUFFER_SIZE;
-
-        struct bcm43xx_private *bcm = file->private_data;
-        char *buf = really_big_buffer;
-        size_t pos = 0;
-        ssize_t res;
-        struct net_device *net_dev;
-        struct pci_dev *pci_dev;
-        unsigned long flags;
-        u16 tmp16;
-        int i;
-
-        down(&big_buffer_sem);
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
-                fappend("Board not initialized.\n");
-                goto out;
-        }
-        net_dev = bcm->net_dev;
-        pci_dev = bcm->pci_dev;
-
-        /* This is where the information is written to the "devinfo" file */
-        fappend("*** %s devinfo ***\n", net_dev->name);
-        fappend("vendor:           0x%04x   device:           0x%04x\n",
-                pci_dev->vendor, pci_dev->device);
-        fappend("subsystem_vendor: 0x%04x   subsystem_device: 0x%04x\n",
-                pci_dev->subsystem_vendor, pci_dev->subsystem_device);
-        fappend("IRQ: %d\n", bcm->irq);
-        fappend("mmio_addr: 0x%p\n", bcm->mmio_addr);
-        fappend("chip_id: 0x%04x   chip_rev: 0x%02x\n", bcm->chip_id, bcm->chip_rev);
-        if ((bcm->core_80211[0].rev >= 3) && (bcm43xx_read32(bcm, 0x0158) & (1 << 16)))
-                fappend("Radio disabled by hardware!\n");
-        if ((bcm->core_80211[0].rev < 3) && !(bcm43xx_read16(bcm, 0x049A) & (1 << 4)))
-                fappend("Radio disabled by hardware!\n");
-        fappend("board_vendor: 0x%04x   board_type: 0x%04x\n", bcm->board_vendor,
-                bcm->board_type);
-
-        fappend("\nCores:\n");
-#define fappend_core(name, info) fappend("core \"" name "\" %s, %s, id: 0x%04x, "       \
-                                         "rev: 0x%02x, index: 0x%02x\n",                \
-                                         (info).available                               \
-                                                ? "available" : "nonavailable",         \
-                                         (info).enabled                                 \
-                                                ? "enabled" : "disabled",               \
-                                         (info).id, (info).rev, (info).index)
-        fappend_core("CHIPCOMMON", bcm->core_chipcommon);
-        fappend_core("PCI", bcm->core_pci);
-        fappend_core("first 80211", bcm->core_80211[0]);
-        fappend_core("second 80211", bcm->core_80211[1]);
-#undef fappend_core
-        tmp16 = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
-        fappend("LEDs: ");
-        for (i = 0; i < BCM43xx_NR_LEDS; i++)
-                fappend("%d ", !!(tmp16 & (1 << i)));
-        fappend("\n");
-
-out:
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
-        up(&big_buffer_sem);
-        return res;
-}
-
-static ssize_t drvinfo_read_file(struct file *file, char __user *userbuf,
-                                 size_t count, loff_t *ppos)
-{
-        const size_t len = REALLY_BIG_BUFFER_SIZE;
-
-        char *buf = really_big_buffer;
-        size_t pos = 0;
-        ssize_t res;
-
-        down(&big_buffer_sem);
-
-        /* This is where the information is written to the "driver" file */
-        fappend(KBUILD_MODNAME " driver\n");
-        fappend("Compiled at: %s %s\n", __DATE__, __TIME__);
-
-        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
-        up(&big_buffer_sem);
-        return res;
-}
-
-static ssize_t spromdump_read_file(struct file *file, char __user *userbuf,
-                                 size_t count, loff_t *ppos)
-{
-        const size_t len = REALLY_BIG_BUFFER_SIZE;
-
-        struct bcm43xx_private *bcm = file->private_data;
-        char *buf = really_big_buffer;
-        size_t pos = 0;
-        ssize_t res;
-        unsigned long flags;
-
-        down(&big_buffer_sem);
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
-                fappend("Board not initialized.\n");
-                goto out;
-        }
-
-        /* This is where the information is written to the "sprom_dump" file */
-        fappend("boardflags: 0x%04x\n", bcm->sprom.boardflags);
-
-out:
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
-        up(&big_buffer_sem);
-        return res;
-}
-
-static ssize_t tsf_read_file(struct file *file, char __user *userbuf,
-                             size_t count, loff_t *ppos)
-{
-        const size_t len = REALLY_BIG_BUFFER_SIZE;
-
-        struct bcm43xx_private *bcm = file->private_data;
-        char *buf = really_big_buffer;
-        size_t pos = 0;
-        ssize_t res;
-        unsigned long flags;
-        u64 tsf;
-
-        down(&big_buffer_sem);
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
-                fappend("Board not initialized.\n");
-                goto out;
-        }
-        bcm43xx_tsf_read(bcm, &tsf);
-        fappend("0x%08x%08x\n",
-                (unsigned int)((tsf & 0xFFFFFFFF00000000ULL) >> 32),
-                (unsigned int)(tsf & 0xFFFFFFFFULL));
-
-out:
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
-        up(&big_buffer_sem);
-        return res;
-}
-
-static ssize_t tsf_write_file(struct file *file, const char __user *user_buf,
-                              size_t count, loff_t *ppos)
-{
-        struct bcm43xx_private *bcm = file->private_data;
-        char *buf = really_big_buffer;
-        ssize_t buf_size;
-        ssize_t res;
-        unsigned long flags;
-        unsigned long long tsf;
-
-        buf_size = min(count, sizeof (really_big_buffer) - 1);
-        down(&big_buffer_sem);
-        if (copy_from_user(buf, user_buf, buf_size)) {
-                res = -EFAULT;
-                goto out_up;
-        }
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
-                printk(KERN_INFO PFX "debugfs: Board not initialized.\n");
-                res = -EFAULT;
-                goto out_unlock;
-        }
-        if (sscanf(buf, "%lli", &tsf) != 1) {
-                printk(KERN_INFO PFX "debugfs: invalid values for \"tsf\"\n");
-                res = -EINVAL;
-                goto out_unlock;
-        }
-        bcm43xx_tsf_write(bcm, tsf);
-        mmiowb();
-        res = buf_size;
-        
-out_unlock:
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-out_up:
-        up(&big_buffer_sem);
-        return res;
-}
-
-static ssize_t txstat_read_file(struct file *file, char __user *userbuf,
-                                size_t count, loff_t *ppos)
-{
-        const size_t len = REALLY_BIG_BUFFER_SIZE;
-
-        struct bcm43xx_private *bcm = file->private_data;
-        char *buf = really_big_buffer;
-        size_t pos = 0;
-        ssize_t res;
-        unsigned long flags;
-        struct bcm43xx_dfsentry *e;
-        struct bcm43xx_xmitstatus *status;
-        int i, cnt, j = 0;
-
-        down(&big_buffer_sem);
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-
-        fappend("Last %d logged xmitstatus blobs (Latest first):\n\n",
-                BCM43xx_NR_LOGGED_XMITSTATUS);
-        e = bcm->dfsentry;
-        if (e->xmitstatus_printing == 0) {
-                /* At the beginning, make a copy of all data to avoid
-                 * concurrency, as this function is called multiple
-                 * times for big logs. Without copying, the data might
-                 * change between reads. This would result in total trash.
-                 */
-                e->xmitstatus_printing = 1;
-                e->saved_xmitstatus_ptr = e->xmitstatus_ptr;
-                e->saved_xmitstatus_cnt = e->xmitstatus_cnt;
-                memcpy(e->xmitstatus_print_buffer, e->xmitstatus_buffer,
-                       BCM43xx_NR_LOGGED_XMITSTATUS * sizeof(*(e->xmitstatus_buffer)));
-        }
-        i = e->saved_xmitstatus_ptr - 1;
-        if (i < 0)
-                i = BCM43xx_NR_LOGGED_XMITSTATUS - 1;
-        cnt = e->saved_xmitstatus_cnt;
-        while (cnt) {
-                status = e->xmitstatus_print_buffer + i;
-                fappend("0x%02x:   cookie: 0x%04x,  flags: 0x%02x,  "
-                        "cnt1: 0x%02x,  cnt2: 0x%02x,  seq: 0x%04x,  "
-                        "unk: 0x%04x\n", j,
-                        status->cookie, status->flags,
-                        status->cnt1, status->cnt2, status->seq,
-                        status->unknown);
-                j++;
-                cnt--;
-                i--;
-                if (i < 0)
-                        i = BCM43xx_NR_LOGGED_XMITSTATUS - 1;
-        }
-
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (*ppos == pos) {
-                /* Done. Drop the copied data. */
-                e->xmitstatus_printing = 0;
-        }
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-        up(&big_buffer_sem);
-        return res;
-}
-
-static ssize_t restart_write_file(struct file *file, const char __user *user_buf,
-                                  size_t count, loff_t *ppos)
-{
-        struct bcm43xx_private *bcm = file->private_data;
-        char *buf = really_big_buffer;
-        ssize_t buf_size;
-        ssize_t res;
-        unsigned long flags;
-
-        buf_size = min(count, sizeof (really_big_buffer) - 1);
-        down(&big_buffer_sem);
-        if (copy_from_user(buf, user_buf, buf_size)) {
-                res = -EFAULT;
-                goto out_up;
-        }
-        mutex_lock(&(bcm)->mutex);
-        spin_lock_irqsave(&(bcm)->irq_lock, flags);
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
-                printk(KERN_INFO PFX "debugfs: Board not initialized.\n");
-                res = -EFAULT;
-                goto out_unlock;
-        }
-        if (count > 0 && buf[0] == '1') {
-                bcm43xx_controller_restart(bcm, "manually restarted");
-                res = count;
-        } else
-                res = -EINVAL;
-
-out_unlock:
-        spin_unlock_irqrestore(&(bcm)->irq_lock, flags);
-        mutex_unlock(&(bcm)->mutex);
-out_up:
-        up(&big_buffer_sem);
-        return res;
-}
-
-#undef fappend
-
-
-static const struct file_operations devinfo_fops = {
-        .read = devinfo_read_file,
-        .write = write_file_dummy,
-        .open = open_file_generic,
-};
-
-static const struct file_operations spromdump_fops = {
-        .read = spromdump_read_file,
-        .write = write_file_dummy,
-        .open = open_file_generic,
-};
-
-static const struct file_operations drvinfo_fops = {
-        .read = drvinfo_read_file,
-        .write = write_file_dummy,
-        .open = open_file_generic,
-};
-
-static const struct file_operations tsf_fops = {
-        .read = tsf_read_file,
-        .write = tsf_write_file,
-        .open = open_file_generic,
-};
-
-static const struct file_operations txstat_fops = {
-        .read = txstat_read_file,
-        .write = write_file_dummy,
-        .open = open_file_generic,
-};
-
-static const struct file_operations restart_fops = {
-        .write = restart_write_file,
-        .open = open_file_generic,
-};
-
-
-void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_dfsentry *e;
-        char devdir[IFNAMSIZ];
-
-        assert(bcm);
-        e = kzalloc(sizeof(*e), GFP_KERNEL);
-        if (!e) {
-                printk(KERN_ERR PFX "out of memory\n");
-                return;
-        }
-        e->bcm = bcm;
-        e->xmitstatus_buffer = kzalloc(BCM43xx_NR_LOGGED_XMITSTATUS
-                                       * sizeof(*(e->xmitstatus_buffer)),
-                                       GFP_KERNEL);
-        if (!e->xmitstatus_buffer) {
-                printk(KERN_ERR PFX "out of memory\n");
-                kfree(e);
-                return;
-        }
-        e->xmitstatus_print_buffer = kzalloc(BCM43xx_NR_LOGGED_XMITSTATUS
-                                             * sizeof(*(e->xmitstatus_buffer)),
-                                             GFP_KERNEL);
-        if (!e->xmitstatus_print_buffer) {
-                printk(KERN_ERR PFX "out of memory\n");
-                kfree(e);
-                return;
-        }
-
-
-        bcm->dfsentry = e;
-
-        strncpy(devdir, bcm->net_dev->name, ARRAY_SIZE(devdir));
-        e->subdir = debugfs_create_dir(devdir, fs.root);
-        e->dentry_devinfo = debugfs_create_file("devinfo", 0444, e->subdir,
-                                                bcm, &devinfo_fops);
-        if (!e->dentry_devinfo)
-                printk(KERN_ERR PFX "debugfs: creating \"devinfo\" for \"%s\" failed!\n", devdir);
-        e->dentry_spromdump = debugfs_create_file("sprom_dump", 0444, e->subdir,
-                                                  bcm, &spromdump_fops);
-        if (!e->dentry_spromdump)
-                printk(KERN_ERR PFX "debugfs: creating \"sprom_dump\" for \"%s\" failed!\n", devdir);
-        e->dentry_tsf = debugfs_create_file("tsf", 0666, e->subdir,
-                                            bcm, &tsf_fops);
-        if (!e->dentry_tsf)
-                printk(KERN_ERR PFX "debugfs: creating \"tsf\" for \"%s\" failed!\n", devdir);
-        e->dentry_txstat = debugfs_create_file("tx_status", 0444, e->subdir,
-                                                bcm, &txstat_fops);
-        if (!e->dentry_txstat)
-                printk(KERN_ERR PFX "debugfs: creating \"tx_status\" for \"%s\" failed!\n", devdir);
-        e->dentry_restart = debugfs_create_file("restart", 0222, e->subdir,
-                                                bcm, &restart_fops);
-        if (!e->dentry_restart)
-                printk(KERN_ERR PFX "debugfs: creating \"restart\" for \"%s\" failed!\n", devdir);
-}
-
-void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_dfsentry *e;
-
-        if (!bcm)
-                return;
-
-        e = bcm->dfsentry;
-        assert(e);
-        debugfs_remove(e->dentry_spromdump);
-        debugfs_remove(e->dentry_devinfo);
-        debugfs_remove(e->dentry_tsf);
-        debugfs_remove(e->dentry_txstat);
-        debugfs_remove(e->dentry_restart);
-        debugfs_remove(e->subdir);
-        kfree(e->xmitstatus_buffer);
-        kfree(e->xmitstatus_print_buffer);
-        kfree(e);
-}
-
-void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
-                                struct bcm43xx_xmitstatus *status)
-{
-        struct bcm43xx_dfsentry *e;
-        struct bcm43xx_xmitstatus *savedstatus;
-
-        /* This is protected by bcm->_lock */
-        e = bcm->dfsentry;
-        assert(e);
-        savedstatus = e->xmitstatus_buffer + e->xmitstatus_ptr;
-        memcpy(savedstatus, status, sizeof(*status));
-        e->xmitstatus_ptr++;
-        if (e->xmitstatus_ptr >= BCM43xx_NR_LOGGED_XMITSTATUS)
-                e->xmitstatus_ptr = 0;
-        if (e->xmitstatus_cnt < BCM43xx_NR_LOGGED_XMITSTATUS)
-                e->xmitstatus_cnt++;
-}
-
-void bcm43xx_debugfs_init(void)
-{
-        memset(&fs, 0, sizeof(fs));
-        fs.root = debugfs_create_dir(KBUILD_MODNAME, NULL);
-        if (!fs.root)
-                printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "\" subdir failed!\n");
-        fs.dentry_driverinfo = debugfs_create_file("driver", 0444, fs.root, NULL, &drvinfo_fops);
-        if (!fs.dentry_driverinfo)
-                printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "/driver\" failed!\n");
-}
-
-void bcm43xx_debugfs_exit(void)
-{
-        debugfs_remove(fs.dentry_driverinfo);
-        debugfs_remove(fs.root);
-}
-
-void bcm43xx_printk_dump(const char *data,
-                         size_t size,
-                         const char *description)
-{
-        size_t i;
-        char c;
-
-        printk(KERN_INFO PFX "Data dump (%s, %zd bytes):",
-               description, size);
-        for (i = 0; i < size; i++) {
-                c = data[i];
-                if (i % 8 == 0)
-                        printk("\n" KERN_INFO PFX "0x%08zx:  0x%02x, ", i, c & 0xff);
-                else
-                        printk("0x%02x, ", c & 0xff);
-        }
-        printk("\n");
-}
-
-void bcm43xx_printk_bitdump(const unsigned char *data,
-                            size_t bytes, int msb_to_lsb,
-                            const char *description)
-{
-        size_t i;
-        int j;
-        const unsigned char *d;
-
-        printk(KERN_INFO PFX "*** Bitdump (%s, %zd bytes, %s) ***",
-               description, bytes, msb_to_lsb ? "MSB to LSB" : "LSB to MSB");
-        for (i = 0; i < bytes; i++) {
-                d = data + i;
-                if (i % 8 == 0)
-                        printk("\n" KERN_INFO PFX "0x%08zx:  ", i);
-                if (msb_to_lsb) {
-                        for (j = 7; j >= 0; j--) {
-                                if (*d & (1 << j))
-                                        printk("1");
-                                else
-                                        printk("0");
-                        }
-                } else {
-                        for (j = 0; j < 8; j++) {
-                                if (*d & (1 << j))
-                                        printk("1");
-                                else
-                                        printk("0");
-                        }
-                }
-                printk(" ");
-        }
-        printk("\n");
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h
deleted file mode 100644
index a40d1af35545..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef BCM43xx_DEBUGFS_H_
-#define BCM43xx_DEBUGFS_H_
-
-struct bcm43xx_private;
-struct bcm43xx_xmitstatus;
-
-#ifdef CONFIG_BCM43XX_DEBUG
-
-#include <linux/list.h>
-#include <asm/semaphore.h>
-
-struct dentry;
-
-/* limited by the size of the "really_big_buffer" */
-#define BCM43xx_NR_LOGGED_XMITSTATUS    100
-
-struct bcm43xx_dfsentry {
-        struct dentry *subdir;
-        struct dentry *dentry_devinfo;
-        struct dentry *dentry_spromdump;
-        struct dentry *dentry_tsf;
-        struct dentry *dentry_txstat;
-        struct dentry *dentry_restart;
-
-        struct bcm43xx_private *bcm;
-
-        /* saved xmitstatus. */
-        struct bcm43xx_xmitstatus *xmitstatus_buffer;
-        int xmitstatus_ptr;
-        int xmitstatus_cnt;
-        /* We need a seperate buffer while printing to avoid
-         * concurrency issues. (New xmitstatus can arrive
-         * while we are printing).
-         */
-        struct bcm43xx_xmitstatus *xmitstatus_print_buffer;
-        int saved_xmitstatus_ptr;
-        int saved_xmitstatus_cnt;
-        int xmitstatus_printing;
-};
-
-struct bcm43xx_debugfs {
-        struct dentry *root;
-        struct dentry *dentry_driverinfo;
-};
-
-void bcm43xx_debugfs_init(void);
-void bcm43xx_debugfs_exit(void);
-void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm);
-void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm);
-void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
-                                struct bcm43xx_xmitstatus *status);
-
-/* Debug helper: Dump binary data through printk. */
-void bcm43xx_printk_dump(const char *data,
-                         size_t size,
-                         const char *description);
-/* Debug helper: Dump bitwise binary data through printk. */
-void bcm43xx_printk_bitdump(const unsigned char *data,
-                            size_t bytes, int msb_to_lsb,
-                            const char *description);
-#define bcm43xx_printk_bitdumpt(pointer, msb_to_lsb, description) \
-        do {                                                                    \
-                bcm43xx_printk_bitdump((const unsigned char *)(pointer),        \
-                                       sizeof(*(pointer)),                      \
-                                       (msb_to_lsb),                            \
-                                       (description));                          \
-        } while (0)
-
-#else /* CONFIG_BCM43XX_DEBUG*/
-
-static inline
-void bcm43xx_debugfs_init(void) { }
-static inline
-void bcm43xx_debugfs_exit(void) { }
-static inline
-void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm) { }
-static inline
-void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm) { }
-static inline
-void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
-                                struct bcm43xx_xmitstatus *status) { }
-
-static inline
-void bcm43xx_printk_dump(const char *data,
-                         size_t size,
-                         const char *description)
-{
-}
-static inline
-void bcm43xx_printk_bitdump(const unsigned char *data,
-                            size_t bytes, int msb_to_lsb,
-                            const char *description)
-{
-}
-#define bcm43xx_printk_bitdumpt(pointer, msb_to_lsb, description)  do { /* nothing */ } while (0)
-
-#endif /* CONFIG_BCM43XX_DEBUG*/
-
-/* Ugly helper macros to make incomplete code more verbose on runtime */
-#ifdef TODO
-# undef TODO
-#endif
-#define TODO()  \
-        do {                                                                            \
-                printk(KERN_INFO PFX "TODO: Incomplete code in %s() at %s:%d\n",        \
-                       __FUNCTION__, __FILE__, __LINE__);                               \
-        } while (0)
-
-#ifdef FIXME
-# undef FIXME
-#endif
-#define FIXME()  \
-        do {                                                                            \
-                printk(KERN_INFO PFX "FIXME: Possibly broken code in %s() at %s:%d\n",  \
-                       __FUNCTION__, __FILE__, __LINE__);                               \
-        } while (0)
-
-#endif /* BCM43xx_DEBUGFS_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
deleted file mode 100644
index 1f7731fcfbd5..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ /dev/null
@@ -1,1263 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  DMA ringbuffer and descriptor allocation/management
-
-  Copyright (c) 2005, 2006 Michael Buesch <mbuesch@freenet.de>
-
-  Some code in this file is derived from the b44.c driver
-  Copyright (C) 2002 David S. Miller
-  Copyright (C) Pekka Pietikainen
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include "bcm43xx.h"
-#include "bcm43xx_dma.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_debugfs.h"
-#include "bcm43xx_power.h"
-#include "bcm43xx_xmit.h"
-
-#include <linux/dma-mapping.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-
-
-static inline int free_slots(struct bcm43xx_dmaring *ring)
-{
-        return (ring->nr_slots - ring->used_slots);
-}
-
-static inline int next_slot(struct bcm43xx_dmaring *ring, int slot)
-{
-        assert(slot >= -1 && slot <= ring->nr_slots - 1);
-        if (slot == ring->nr_slots - 1)
-                return 0;
-        return slot + 1;
-}
-
-static inline int prev_slot(struct bcm43xx_dmaring *ring, int slot)
-{
-        assert(slot >= 0 && slot <= ring->nr_slots - 1);
-        if (slot == 0)
-                return ring->nr_slots - 1;
-        return slot - 1;
-}
-
-/* Request a slot for usage. */
-static inline
-int request_slot(struct bcm43xx_dmaring *ring)
-{
-        int slot;
-
-        assert(ring->tx);
-        assert(!ring->suspended);
-        assert(free_slots(ring) != 0);
-
-        slot = next_slot(ring, ring->current_slot);
-        ring->current_slot = slot;
-        ring->used_slots++;
-
-        /* Check the number of available slots and suspend TX,
-         * if we are running low on free slots.
-         */
-        if (unlikely(free_slots(ring) < ring->suspend_mark)) {
-                netif_stop_queue(ring->bcm->net_dev);
-                ring->suspended = 1;
-        }
-#ifdef CONFIG_BCM43XX_DEBUG
-        if (ring->used_slots > ring->max_used_slots)
-                ring->max_used_slots = ring->used_slots;
-#endif /* CONFIG_BCM43XX_DEBUG*/
-
-        return slot;
-}
-
-/* Return a slot to the free slots. */
-static inline
-void return_slot(struct bcm43xx_dmaring *ring, int slot)
-{
-        assert(ring->tx);
-
-        ring->used_slots--;
-
-        /* Check if TX is suspended and check if we have
-         * enough free slots to resume it again.
-         */
-        if (unlikely(ring->suspended)) {
-                if (free_slots(ring) >= ring->resume_mark) {
-                        ring->suspended = 0;
-                        netif_wake_queue(ring->bcm->net_dev);
-                }
-        }
-}
-
-u16 bcm43xx_dmacontroller_base(int dma64bit, int controller_idx)
-{
-        static const u16 map64[] = {
-                BCM43xx_MMIO_DMA64_BASE0,
-                BCM43xx_MMIO_DMA64_BASE1,
-                BCM43xx_MMIO_DMA64_BASE2,
-                BCM43xx_MMIO_DMA64_BASE3,
-                BCM43xx_MMIO_DMA64_BASE4,
-                BCM43xx_MMIO_DMA64_BASE5,
-        };
-        static const u16 map32[] = {
-                BCM43xx_MMIO_DMA32_BASE0,
-                BCM43xx_MMIO_DMA32_BASE1,
-                BCM43xx_MMIO_DMA32_BASE2,
-                BCM43xx_MMIO_DMA32_BASE3,
-                BCM43xx_MMIO_DMA32_BASE4,
-                BCM43xx_MMIO_DMA32_BASE5,
-        };
-
-        if (dma64bit) {
-                assert(controller_idx >= 0 &&
-                       controller_idx < ARRAY_SIZE(map64));
-                return map64[controller_idx];
-        }
-        assert(controller_idx >= 0 &&
-               controller_idx < ARRAY_SIZE(map32));
-        return map32[controller_idx];
-}
-
-static inline
-dma_addr_t map_descbuffer(struct bcm43xx_dmaring *ring,
-                          unsigned char *buf,
-                          size_t len,
-                          int tx)
-{
-        dma_addr_t dmaaddr;
-        int direction = PCI_DMA_FROMDEVICE;
-
-        if (tx)
-                direction = PCI_DMA_TODEVICE;
-
-        dmaaddr = pci_map_single(ring->bcm->pci_dev,
-                                         buf, len,
-                                         direction);
-
-        return dmaaddr;
-}
-
-static inline
-void unmap_descbuffer(struct bcm43xx_dmaring *ring,
-                      dma_addr_t addr,
-                      size_t len,
-                      int tx)
-{
-        if (tx) {
-                pci_unmap_single(ring->bcm->pci_dev,
-                                 addr, len,
-                                 PCI_DMA_TODEVICE);
-        } else {
-                pci_unmap_single(ring->bcm->pci_dev,
-                                 addr, len,
-                                 PCI_DMA_FROMDEVICE);
-        }
-}
-
-static inline
-void sync_descbuffer_for_cpu(struct bcm43xx_dmaring *ring,
-                             dma_addr_t addr,
-                             size_t len)
-{
-        assert(!ring->tx);
-
-        pci_dma_sync_single_for_cpu(ring->bcm->pci_dev,
-                                    addr, len, PCI_DMA_FROMDEVICE);
-}
-
-static inline
-void sync_descbuffer_for_device(struct bcm43xx_dmaring *ring,
-                                dma_addr_t addr,
-                                size_t len)
-{
-        assert(!ring->tx);
-
-        pci_dma_sync_single_for_cpu(ring->bcm->pci_dev,
-                                    addr, len, PCI_DMA_TODEVICE);
-}
-
-/* Unmap and free a descriptor buffer. */
-static inline
-void free_descriptor_buffer(struct bcm43xx_dmaring *ring,
-                            struct bcm43xx_dmadesc_meta *meta,
-                            int irq_context)
-{
-        assert(meta->skb);
-        if (irq_context)
-                dev_kfree_skb_irq(meta->skb);
-        else
-                dev_kfree_skb(meta->skb);
-        meta->skb = NULL;
-}
-
-static int alloc_ringmemory(struct bcm43xx_dmaring *ring)
-{
-        ring->descbase = pci_alloc_consistent(ring->bcm->pci_dev, BCM43xx_DMA_RINGMEMSIZE,
-                                            &(ring->dmabase));
-        if (!ring->descbase) {
-                /* Allocation may have failed due to pci_alloc_consistent
-                   insisting on use of GFP_DMA, which is more restrictive
-                   than necessary...  */
-                struct dma_desc *rx_ring;
-                dma_addr_t rx_ring_dma;
-
-                rx_ring = kzalloc(BCM43xx_DMA_RINGMEMSIZE, GFP_KERNEL);
-                if (!rx_ring)
-                        goto out_err;
-
-                rx_ring_dma = pci_map_single(ring->bcm->pci_dev, rx_ring,
-                                             BCM43xx_DMA_RINGMEMSIZE,
-                                             PCI_DMA_BIDIRECTIONAL);
-
-                if (pci_dma_mapping_error(rx_ring_dma) ||
-                    rx_ring_dma + BCM43xx_DMA_RINGMEMSIZE > ring->bcm->dma_mask) {
-                        /* Sigh... */
-                        if (!pci_dma_mapping_error(rx_ring_dma))
-                                pci_unmap_single(ring->bcm->pci_dev,
-                                                 rx_ring_dma, BCM43xx_DMA_RINGMEMSIZE,
-                                                 PCI_DMA_BIDIRECTIONAL);
-                        rx_ring_dma = pci_map_single(ring->bcm->pci_dev,
-                                                 rx_ring, BCM43xx_DMA_RINGMEMSIZE,
-                                                 PCI_DMA_BIDIRECTIONAL);
-                        if (pci_dma_mapping_error(rx_ring_dma) ||
-                            rx_ring_dma + BCM43xx_DMA_RINGMEMSIZE > ring->bcm->dma_mask) {
-                                assert(0);
-                                if (!pci_dma_mapping_error(rx_ring_dma))
-                                        pci_unmap_single(ring->bcm->pci_dev,
-                                                         rx_ring_dma, BCM43xx_DMA_RINGMEMSIZE,
-                                                         PCI_DMA_BIDIRECTIONAL);
-                                goto out_err;
-                        }
-                }
-
-                ring->descbase = rx_ring;
-                ring->dmabase = rx_ring_dma;
-        }
-        memset(ring->descbase, 0, BCM43xx_DMA_RINGMEMSIZE);
-
-        return 0;
-out_err:
-        printk(KERN_ERR PFX "DMA ringmemory allocation failed\n");
-        return -ENOMEM;
-}
-
-static void free_ringmemory(struct bcm43xx_dmaring *ring)
-{
-        struct device *dev = &(ring->bcm->pci_dev->dev);
-
-        dma_free_coherent(dev, BCM43xx_DMA_RINGMEMSIZE,
-                          ring->descbase, ring->dmabase);
-}
-
-/* Reset the RX DMA channel */
-int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
-                                   u16 mmio_base, int dma64)
-{
-        int i;
-        u32 value;
-        u16 offset;
-
-        offset = dma64 ? BCM43xx_DMA64_RXCTL : BCM43xx_DMA32_RXCTL;
-        bcm43xx_write32(bcm, mmio_base + offset, 0);
-        for (i = 0; i < 1000; i++) {
-                offset = dma64 ? BCM43xx_DMA64_RXSTATUS : BCM43xx_DMA32_RXSTATUS;
-                value = bcm43xx_read32(bcm, mmio_base + offset);
-                if (dma64) {
-                        value &= BCM43xx_DMA64_RXSTAT;
-                        if (value == BCM43xx_DMA64_RXSTAT_DISABLED) {
-                                i = -1;
-                                break;
-                        }
-                } else {
-                        value &= BCM43xx_DMA32_RXSTATE;
-                        if (value == BCM43xx_DMA32_RXSTAT_DISABLED) {
-                                i = -1;
-                                break;
-                        }
-                }
-                udelay(10);
-        }
-        if (i != -1) {
-                printk(KERN_ERR PFX "Error: Wait on DMA RX status timed out.\n");
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-/* Reset the RX DMA channel */
-int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
-                                   u16 mmio_base, int dma64)
-{
-        int i;
-        u32 value;
-        u16 offset;
-
-        for (i = 0; i < 1000; i++) {
-                offset = dma64 ? BCM43xx_DMA64_TXSTATUS : BCM43xx_DMA32_TXSTATUS;
-                value = bcm43xx_read32(bcm, mmio_base + offset);
-                if (dma64) {
-                        value &= BCM43xx_DMA64_TXSTAT;
-                        if (value == BCM43xx_DMA64_TXSTAT_DISABLED ||
-                            value == BCM43xx_DMA64_TXSTAT_IDLEWAIT ||
-                            value == BCM43xx_DMA64_TXSTAT_STOPPED)
-                                break;
-                } else {
-                        value &= BCM43xx_DMA32_TXSTATE;
-                        if (value == BCM43xx_DMA32_TXSTAT_DISABLED ||
-                            value == BCM43xx_DMA32_TXSTAT_IDLEWAIT ||
-                            value == BCM43xx_DMA32_TXSTAT_STOPPED)
-                                break;
-                }
-                udelay(10);
-        }
-        offset = dma64 ? BCM43xx_DMA64_TXCTL : BCM43xx_DMA32_TXCTL;
-        bcm43xx_write32(bcm, mmio_base + offset, 0);
-        for (i = 0; i < 1000; i++) {
-                offset = dma64 ? BCM43xx_DMA64_TXSTATUS : BCM43xx_DMA32_TXSTATUS;
-                value = bcm43xx_read32(bcm, mmio_base + offset);
-                if (dma64) {
-                        value &= BCM43xx_DMA64_TXSTAT;
-                        if (value == BCM43xx_DMA64_TXSTAT_DISABLED) {
-                                i = -1;
-                                break;
-                        }
-                } else {
-                        value &= BCM43xx_DMA32_TXSTATE;
-                        if (value == BCM43xx_DMA32_TXSTAT_DISABLED) {
-                                i = -1;
-                                break;
-                        }
-                }
-                udelay(10);
-        }
-        if (i != -1) {
-                printk(KERN_ERR PFX "Error: Wait on DMA TX status timed out.\n");
-                return -ENODEV;
-        }
-        /* ensure the reset is completed. */
-        udelay(300);
-
-        return 0;
-}
-
-static void fill_descriptor(struct bcm43xx_dmaring *ring,
-                            struct bcm43xx_dmadesc_generic *desc,
-                            dma_addr_t dmaaddr,
-                            u16 bufsize,
-                            int start, int end, int irq)
-{
-        int slot;
-
-        slot = bcm43xx_dma_desc2idx(ring, desc);
-        assert(slot >= 0 && slot < ring->nr_slots);
-
-        if (ring->dma64) {
-                u32 ctl0 = 0, ctl1 = 0;
-                u32 addrlo, addrhi;
-                u32 addrext;
-
-                addrlo = (u32)(dmaaddr & 0xFFFFFFFF);
-                addrhi = (((u64)dmaaddr >> 32) & ~BCM43xx_DMA64_ROUTING);
-                addrext = (((u64)dmaaddr >> 32) >> BCM43xx_DMA64_ROUTING_SHIFT);
-                addrhi |= ring->routing;
-                if (slot == ring->nr_slots - 1)
-                        ctl0 |= BCM43xx_DMA64_DCTL0_DTABLEEND;
-                if (start)
-                        ctl0 |= BCM43xx_DMA64_DCTL0_FRAMESTART;
-                if (end)
-                        ctl0 |= BCM43xx_DMA64_DCTL0_FRAMEEND;
-                if (irq)
-                        ctl0 |= BCM43xx_DMA64_DCTL0_IRQ;
-                ctl1 |= (bufsize - ring->frameoffset)
-                        & BCM43xx_DMA64_DCTL1_BYTECNT;
-                ctl1 |= (addrext << BCM43xx_DMA64_DCTL1_ADDREXT_SHIFT)
-                        & BCM43xx_DMA64_DCTL1_ADDREXT_MASK;
-
-                desc->dma64.control0 = cpu_to_le32(ctl0);
-                desc->dma64.control1 = cpu_to_le32(ctl1);
-                desc->dma64.address_low = cpu_to_le32(addrlo);
-                desc->dma64.address_high = cpu_to_le32(addrhi);
-        } else {
-                u32 ctl;
-                u32 addr;
-                u32 addrext;
-
-                addr = (u32)(dmaaddr & ~BCM43xx_DMA32_ROUTING);
-                addrext = (u32)(dmaaddr & BCM43xx_DMA32_ROUTING)
-                           >> BCM43xx_DMA32_ROUTING_SHIFT;
-                addr |= ring->routing;
-                ctl = (bufsize - ring->frameoffset)
-                      & BCM43xx_DMA32_DCTL_BYTECNT;
-                if (slot == ring->nr_slots - 1)
-                        ctl |= BCM43xx_DMA32_DCTL_DTABLEEND;
-                if (start)
-                        ctl |= BCM43xx_DMA32_DCTL_FRAMESTART;
-                if (end)
-                        ctl |= BCM43xx_DMA32_DCTL_FRAMEEND;
-                if (irq)
-                        ctl |= BCM43xx_DMA32_DCTL_IRQ;
-                ctl |= (addrext << BCM43xx_DMA32_DCTL_ADDREXT_SHIFT)
-                       & BCM43xx_DMA32_DCTL_ADDREXT_MASK;
-
-                desc->dma32.control = cpu_to_le32(ctl);
-                desc->dma32.address = cpu_to_le32(addr);
-        }
-}
-
-static int setup_rx_descbuffer(struct bcm43xx_dmaring *ring,
-                               struct bcm43xx_dmadesc_generic *desc,
-                               struct bcm43xx_dmadesc_meta *meta,
-                               gfp_t gfp_flags)
-{
-        struct bcm43xx_rxhdr *rxhdr;
-        struct bcm43xx_hwxmitstatus *xmitstat;
-        dma_addr_t dmaaddr;
-        struct sk_buff *skb;
-
-        assert(!ring->tx);
-
-        skb = __dev_alloc_skb(ring->rx_buffersize, gfp_flags);
-        if (unlikely(!skb))
-                return -ENOMEM;
-        dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0);
-        /* This hardware bug work-around adapted from the b44 driver.
-           The chip may be unable to do PCI DMA to/from anything above 1GB */
-        if (pci_dma_mapping_error(dmaaddr) ||
-            dmaaddr + ring->rx_buffersize > ring->bcm->dma_mask) {
-                /* This one has 30-bit addressing... */
-                if (!pci_dma_mapping_error(dmaaddr))
-                        pci_unmap_single(ring->bcm->pci_dev,
-                                         dmaaddr, ring->rx_buffersize,
-                                         PCI_DMA_FROMDEVICE);
-                dev_kfree_skb_any(skb);
-                skb = __dev_alloc_skb(ring->rx_buffersize,GFP_DMA);
-                if (skb == NULL)
-                        return -ENOMEM;
-                dmaaddr = pci_map_single(ring->bcm->pci_dev,
-                                         skb->data, ring->rx_buffersize,
-                                         PCI_DMA_FROMDEVICE);
-                if (pci_dma_mapping_error(dmaaddr) ||
-                    dmaaddr + ring->rx_buffersize > ring->bcm->dma_mask) {
-                        assert(0);
-                        dev_kfree_skb_any(skb);
-                        return -ENOMEM;
-                }
-        }
-        meta->skb = skb;
-        meta->dmaaddr = dmaaddr;
-        skb->dev = ring->bcm->net_dev;
-
-        fill_descriptor(ring, desc, dmaaddr,
-                        ring->rx_buffersize, 0, 0, 0);
-
-        rxhdr = (struct bcm43xx_rxhdr *)(skb->data);
-        rxhdr->frame_length = 0;
-        rxhdr->flags1 = 0;
-        xmitstat = (struct bcm43xx_hwxmitstatus *)(skb->data);
-        xmitstat->cookie = 0;
-
-        return 0;
-}
-
-/* Allocate the initial descbuffers.
- * This is used for an RX ring only.
- */
-static int alloc_initial_descbuffers(struct bcm43xx_dmaring *ring)
-{
-        int i, err = -ENOMEM;
-        struct bcm43xx_dmadesc_generic *desc;
-        struct bcm43xx_dmadesc_meta *meta;
-
-        for (i = 0; i < ring->nr_slots; i++) {
-                desc = bcm43xx_dma_idx2desc(ring, i, &meta);
-
-                err = setup_rx_descbuffer(ring, desc, meta, GFP_KERNEL);
-                if (err)
-                        goto err_unwind;
-        }
-        mb();
-        ring->used_slots = ring->nr_slots;
-        err = 0;
-out:
-        return err;
-
-err_unwind:
-        for (i--; i >= 0; i--) {
-                desc = bcm43xx_dma_idx2desc(ring, i, &meta);
-
-                unmap_descbuffer(ring, meta->dmaaddr, ring->rx_buffersize, 0);
-                dev_kfree_skb(meta->skb);
-        }
-        goto out;
-}
-
-/* Do initial setup of the DMA controller.
- * Reset the controller, write the ring busaddress
- * and switch the "enable" bit on.
- */
-static int dmacontroller_setup(struct bcm43xx_dmaring *ring)
-{
-        int err = 0;
-        u32 value;
-        u32 addrext;
-
-        if (ring->tx) {
-                if (ring->dma64) {
-                        u64 ringbase = (u64)(ring->dmabase);
-
-                        addrext = ((ringbase >> 32) >> BCM43xx_DMA64_ROUTING_SHIFT);
-                        value = BCM43xx_DMA64_TXENABLE;
-                        value |= (addrext << BCM43xx_DMA64_TXADDREXT_SHIFT)
-                                & BCM43xx_DMA64_TXADDREXT_MASK;
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_TXCTL, value);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_TXRINGLO,
-                                        (ringbase & 0xFFFFFFFF));
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_TXRINGHI,
-                                        ((ringbase >> 32) & ~BCM43xx_DMA64_ROUTING)
-                                        | ring->routing);
-                } else {
-                        u32 ringbase = (u32)(ring->dmabase);
-
-                        addrext = (ringbase >> BCM43xx_DMA32_ROUTING_SHIFT);
-                        value = BCM43xx_DMA32_TXENABLE;
-                        value |= (addrext << BCM43xx_DMA32_TXADDREXT_SHIFT)
-                                & BCM43xx_DMA32_TXADDREXT_MASK;
-                        bcm43xx_dma_write(ring, BCM43xx_DMA32_TXCTL, value);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA32_TXRING,
-                                        (ringbase & ~BCM43xx_DMA32_ROUTING)
-                                        | ring->routing);
-                }
-        } else {
-                err = alloc_initial_descbuffers(ring);
-                if (err)
-                        goto out;
-                if (ring->dma64) {
-                        u64 ringbase = (u64)(ring->dmabase);
-
-                        addrext = ((ringbase >> 32) >> BCM43xx_DMA64_ROUTING_SHIFT);
-                        value = (ring->frameoffset << BCM43xx_DMA64_RXFROFF_SHIFT);
-                        value |= BCM43xx_DMA64_RXENABLE;
-                        value |= (addrext << BCM43xx_DMA64_RXADDREXT_SHIFT)
-                                & BCM43xx_DMA64_RXADDREXT_MASK;
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_RXCTL, value);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_RXRINGLO,
-                                        (ringbase & 0xFFFFFFFF));
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_RXRINGHI,
-                                        ((ringbase >> 32) & ~BCM43xx_DMA64_ROUTING)
-                                        | ring->routing);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_RXINDEX, 200);
-                } else {
-                        u32 ringbase = (u32)(ring->dmabase);
-
-                        addrext = (ringbase >> BCM43xx_DMA32_ROUTING_SHIFT);
-                        value = (ring->frameoffset << BCM43xx_DMA32_RXFROFF_SHIFT);
-                        value |= BCM43xx_DMA32_RXENABLE;
-                        value |= (addrext << BCM43xx_DMA32_RXADDREXT_SHIFT)
-                                & BCM43xx_DMA32_RXADDREXT_MASK;
-                        bcm43xx_dma_write(ring, BCM43xx_DMA32_RXCTL, value);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA32_RXRING,
-                                        (ringbase & ~BCM43xx_DMA32_ROUTING)
-                                        | ring->routing);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA32_RXINDEX, 200);
-                }
-        }
-
-out:
-        return err;
-}
-
-/* Shutdown the DMA controller. */
-static void dmacontroller_cleanup(struct bcm43xx_dmaring *ring)
-{
-        if (ring->tx) {
-                bcm43xx_dmacontroller_tx_reset(ring->bcm, ring->mmio_base, ring->dma64);
-                if (ring->dma64) {
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_TXRINGLO, 0);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_TXRINGHI, 0);
-                } else
-                        bcm43xx_dma_write(ring, BCM43xx_DMA32_TXRING, 0);
-        } else {
-                bcm43xx_dmacontroller_rx_reset(ring->bcm, ring->mmio_base, ring->dma64);
-                if (ring->dma64) {
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_RXRINGLO, 0);
-                        bcm43xx_dma_write(ring, BCM43xx_DMA64_RXRINGHI, 0);
-                } else
-                        bcm43xx_dma_write(ring, BCM43xx_DMA32_RXRING, 0);
-        }
-}
-
-static void free_all_descbuffers(struct bcm43xx_dmaring *ring)
-{
-        struct bcm43xx_dmadesc_generic *desc;
-        struct bcm43xx_dmadesc_meta *meta;
-        int i;
-
-        if (!ring->used_slots)
-                return;
-        for (i = 0; i < ring->nr_slots; i++) {
-                desc = bcm43xx_dma_idx2desc(ring, i, &meta);
-
-                if (!meta->skb) {
-                        assert(ring->tx);
-                        continue;
-                }
-                if (ring->tx) {
-                        unmap_descbuffer(ring, meta->dmaaddr,
-                                        meta->skb->len, 1);
-                } else {
-                        unmap_descbuffer(ring, meta->dmaaddr,
-                                        ring->rx_buffersize, 0);
-                }
-                free_descriptor_buffer(ring, meta, 0);
-        }
-}
-
-/* Main initialization function. */
-static
-struct bcm43xx_dmaring * bcm43xx_setup_dmaring(struct bcm43xx_private *bcm,
-                                               int controller_index,
-                                               int for_tx,
-                                               int dma64)
-{
-        struct bcm43xx_dmaring *ring;
-        int err;
-        int nr_slots;
-
-        ring = kzalloc(sizeof(*ring), GFP_KERNEL);
-        if (!ring)
-                goto out;
-
-        nr_slots = BCM43xx_RXRING_SLOTS;
-        if (for_tx)
-                nr_slots = BCM43xx_TXRING_SLOTS;
-
-        ring->meta = kcalloc(nr_slots, sizeof(struct bcm43xx_dmadesc_meta),
-                             GFP_KERNEL);
-        if (!ring->meta)
-                goto err_kfree_ring;
-
-        ring->routing = BCM43xx_DMA32_CLIENTTRANS;
-        if (dma64)
-                ring->routing = BCM43xx_DMA64_CLIENTTRANS;
-
-        ring->bcm = bcm;
-        ring->nr_slots = nr_slots;
-        ring->suspend_mark = ring->nr_slots * BCM43xx_TXSUSPEND_PERCENT / 100;
-        ring->resume_mark = ring->nr_slots * BCM43xx_TXRESUME_PERCENT / 100;
-        assert(ring->suspend_mark < ring->resume_mark);
-        ring->mmio_base = bcm43xx_dmacontroller_base(dma64, controller_index);
-        ring->index = controller_index;
-        ring->dma64 = !!dma64;
-        if (for_tx) {
-                ring->tx = 1;
-                ring->current_slot = -1;
-        } else {
-                if (ring->index == 0) {
-                        ring->rx_buffersize = BCM43xx_DMA0_RX_BUFFERSIZE;
-                        ring->frameoffset = BCM43xx_DMA0_RX_FRAMEOFFSET;
-                } else if (ring->index == 3) {
-                        ring->rx_buffersize = BCM43xx_DMA3_RX_BUFFERSIZE;
-                        ring->frameoffset = BCM43xx_DMA3_RX_FRAMEOFFSET;
-                } else
-                        assert(0);
-        }
-
-        err = alloc_ringmemory(ring);
-        if (err)
-                goto err_kfree_meta;
-        err = dmacontroller_setup(ring);
-        if (err)
-                goto err_free_ringmemory;
-        return ring;
-
-out:
-        printk(KERN_ERR PFX "Error in bcm43xx_setup_dmaring\n");
-        return ring;
-
-err_free_ringmemory:
-        free_ringmemory(ring);
-err_kfree_meta:
-        kfree(ring->meta);
-err_kfree_ring:
-        kfree(ring);
-        ring = NULL;
-        goto out;
-}
-
-/* Main cleanup function. */
-static void bcm43xx_destroy_dmaring(struct bcm43xx_dmaring *ring)
-{
-        if (!ring)
-                return;
-
-        dprintk(KERN_INFO PFX "DMA-%s 0x%04X (%s) max used slots: %d/%d\n",
-                (ring->dma64) ? "64" : "32",
-                ring->mmio_base,
-                (ring->tx) ? "TX" : "RX",
-                ring->max_used_slots, ring->nr_slots);
-        /* Device IRQs are disabled prior entering this function,
-         * so no need to take care of concurrency with rx handler stuff.
-         */
-        dmacontroller_cleanup(ring);
-        free_all_descbuffers(ring);
-        free_ringmemory(ring);
-
-        kfree(ring->meta);
-        kfree(ring);
-}
-
-void bcm43xx_dma_free(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_dma *dma;
-
-        if (bcm43xx_using_pio(bcm))
-                return;
-        dma = bcm43xx_current_dma(bcm);
-
-        bcm43xx_destroy_dmaring(dma->rx_ring3);
-        dma->rx_ring3 = NULL;
-        bcm43xx_destroy_dmaring(dma->rx_ring0);
-        dma->rx_ring0 = NULL;
-
-        bcm43xx_destroy_dmaring(dma->tx_ring5);
-        dma->tx_ring5 = NULL;
-        bcm43xx_destroy_dmaring(dma->tx_ring4);
-        dma->tx_ring4 = NULL;
-        bcm43xx_destroy_dmaring(dma->tx_ring3);
-        dma->tx_ring3 = NULL;
-        bcm43xx_destroy_dmaring(dma->tx_ring2);
-        dma->tx_ring2 = NULL;
-        bcm43xx_destroy_dmaring(dma->tx_ring1);
-        dma->tx_ring1 = NULL;
-        bcm43xx_destroy_dmaring(dma->tx_ring0);
-        dma->tx_ring0 = NULL;
-}
-
-int bcm43xx_dma_init(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_dma *dma = bcm43xx_current_dma(bcm);
-        struct bcm43xx_dmaring *ring;
-        int err = -ENOMEM;
-        int dma64 = 0;
-
-        bcm->dma_mask = bcm43xx_get_supported_dma_mask(bcm);
-        if (bcm->dma_mask == DMA_64BIT_MASK)
-                dma64 = 1;
-        err = pci_set_dma_mask(bcm->pci_dev, bcm->dma_mask);
-        if (err)
-                goto no_dma;
-        err = pci_set_consistent_dma_mask(bcm->pci_dev, bcm->dma_mask);
-        if (err)
-                goto no_dma;
-
-        /* setup TX DMA channels. */
-        ring = bcm43xx_setup_dmaring(bcm, 0, 1, dma64);
-        if (!ring)
-                goto out;
-        dma->tx_ring0 = ring;
-
-        ring = bcm43xx_setup_dmaring(bcm, 1, 1, dma64);
-        if (!ring)
-                goto err_destroy_tx0;
-        dma->tx_ring1 = ring;
-
-        ring = bcm43xx_setup_dmaring(bcm, 2, 1, dma64);
-        if (!ring)
-                goto err_destroy_tx1;
-        dma->tx_ring2 = ring;
-
-        ring = bcm43xx_setup_dmaring(bcm, 3, 1, dma64);
-        if (!ring)
-                goto err_destroy_tx2;
-        dma->tx_ring3 = ring;
-
-        ring = bcm43xx_setup_dmaring(bcm, 4, 1, dma64);
-        if (!ring)
-                goto err_destroy_tx3;
-        dma->tx_ring4 = ring;
-
-        ring = bcm43xx_setup_dmaring(bcm, 5, 1, dma64);
-        if (!ring)
-                goto err_destroy_tx4;
-        dma->tx_ring5 = ring;
-
-        /* setup RX DMA channels. */
-        ring = bcm43xx_setup_dmaring(bcm, 0, 0, dma64);
-        if (!ring)
-                goto err_destroy_tx5;
-        dma->rx_ring0 = ring;
-
-        if (bcm->current_core->rev < 5) {
-                ring = bcm43xx_setup_dmaring(bcm, 3, 0, dma64);
-                if (!ring)
-                        goto err_destroy_rx0;
-                dma->rx_ring3 = ring;
-        }
-
-        dprintk(KERN_INFO PFX "%d-bit DMA initialized\n",
-                (bcm->dma_mask == DMA_64BIT_MASK) ? 64 :
-                (bcm->dma_mask == DMA_32BIT_MASK) ? 32 : 30);
-        err = 0;
-out:
-        return err;
-
-err_destroy_rx0:
-        bcm43xx_destroy_dmaring(dma->rx_ring0);
-        dma->rx_ring0 = NULL;
-err_destroy_tx5:
-        bcm43xx_destroy_dmaring(dma->tx_ring5);
-        dma->tx_ring5 = NULL;
-err_destroy_tx4:
-        bcm43xx_destroy_dmaring(dma->tx_ring4);
-        dma->tx_ring4 = NULL;
-err_destroy_tx3:
-        bcm43xx_destroy_dmaring(dma->tx_ring3);
-        dma->tx_ring3 = NULL;
-err_destroy_tx2:
-        bcm43xx_destroy_dmaring(dma->tx_ring2);
-        dma->tx_ring2 = NULL;
-err_destroy_tx1:
-        bcm43xx_destroy_dmaring(dma->tx_ring1);
-        dma->tx_ring1 = NULL;
-err_destroy_tx0:
-        bcm43xx_destroy_dmaring(dma->tx_ring0);
-        dma->tx_ring0 = NULL;
-no_dma:
-#ifdef CONFIG_BCM43XX_PIO
-        printk(KERN_WARNING PFX "DMA not supported on this device."
-                                " Falling back to PIO.\n");
-        bcm->__using_pio = 1;
-        return -ENOSYS;
-#else
-        printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. "
-                            "Please recompile the driver with PIO support.\n");
-        return -ENODEV;
-#endif /* CONFIG_BCM43XX_PIO */
-}
-
-/* Generate a cookie for the TX header. */
-static u16 generate_cookie(struct bcm43xx_dmaring *ring,
-                           int slot)
-{
-        u16 cookie = 0x1000;
-
-        /* Use the upper 4 bits of the cookie as
-         * DMA controller ID and store the slot number
-         * in the lower 12 bits.
-         * Note that the cookie must never be 0, as this
-         * is a special value used in RX path.
-         */
-        switch (ring->index) {
-        case 0:
-                cookie = 0xA000;
-                break;
-        case 1:
-                cookie = 0xB000;
-                break;
-        case 2:
-                cookie = 0xC000;
-                break;
-        case 3:
-                cookie = 0xD000;
-                break;
-        case 4:
-                cookie = 0xE000;
-                break;
-        case 5:
-                cookie = 0xF000;
-                break;
-        }
-        assert(((u16)slot & 0xF000) == 0x0000);
-        cookie |= (u16)slot;
-
-        return cookie;
-}
-
-/* Inspect a cookie and find out to which controller/slot it belongs. */
-static
-struct bcm43xx_dmaring * parse_cookie(struct bcm43xx_private *bcm,
-                                      u16 cookie, int *slot)
-{
-        struct bcm43xx_dma *dma = bcm43xx_current_dma(bcm);
-        struct bcm43xx_dmaring *ring = NULL;
-
-        switch (cookie & 0xF000) {
-        case 0xA000:
-                ring = dma->tx_ring0;
-                break;
-        case 0xB000:
-                ring = dma->tx_ring1;
-                break;
-        case 0xC000:
-                ring = dma->tx_ring2;
-                break;
-        case 0xD000:
-                ring = dma->tx_ring3;
-                break;
-        case 0xE000:
-                ring = dma->tx_ring4;
-                break;
-        case 0xF000:
-                ring = dma->tx_ring5;
-                break;
-        default:
-                assert(0);
-        }
-        *slot = (cookie & 0x0FFF);
-        assert(*slot >= 0 && *slot < ring->nr_slots);
-
-        return ring;
-}
-
-static void dmacontroller_poke_tx(struct bcm43xx_dmaring *ring,
-                                  int slot)
-{
-        u16 offset;
-        int descsize;
-
-        /* Everything is ready to start. Buffers are DMA mapped and
-         * associated with slots.
-         * "slot" is the last slot of the new frame we want to transmit.
-         * Close your seat belts now, please.
-         */
-        wmb();
-        slot = next_slot(ring, slot);
-        offset = (ring->dma64) ? BCM43xx_DMA64_TXINDEX : BCM43xx_DMA32_TXINDEX;
-        descsize = (ring->dma64) ? sizeof(struct bcm43xx_dmadesc64)
-                : sizeof(struct bcm43xx_dmadesc32);
-        bcm43xx_dma_write(ring, offset,
-                        (u32)(slot * descsize));
-}
-
-static void dma_tx_fragment(struct bcm43xx_dmaring *ring,
-                            struct sk_buff *skb,
-                            u8 cur_frag)
-{
-        int slot;
-        struct bcm43xx_dmadesc_generic *desc;
-        struct bcm43xx_dmadesc_meta *meta;
-        dma_addr_t dmaaddr;
-        struct sk_buff *bounce_skb;
-
-        assert(skb_shinfo(skb)->nr_frags == 0);
-
-        slot = request_slot(ring);
-        desc = bcm43xx_dma_idx2desc(ring, slot, &meta);
-
-        /* Add a device specific TX header. */
-        assert(skb_headroom(skb) >= sizeof(struct bcm43xx_txhdr));
-        /* Reserve enough headroom for the device tx header. */
-        __skb_push(skb, sizeof(struct bcm43xx_txhdr));
-        /* Now calculate and add the tx header.
-         * The tx header includes the PLCP header.
-         */
-        bcm43xx_generate_txhdr(ring->bcm,
-                               (struct bcm43xx_txhdr *)skb->data,
-                               skb->data + sizeof(struct bcm43xx_txhdr),
-                               skb->len - sizeof(struct bcm43xx_txhdr),
-                               (cur_frag == 0),
-                               generate_cookie(ring, slot));
-        dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
-        if (dma_mapping_error(dmaaddr) || dmaaddr + skb->len > ring->bcm->dma_mask) {
-                /* chip cannot handle DMA to/from > 1GB, use bounce buffer (copied from b44 driver) */
-                if (!dma_mapping_error(dmaaddr))
-                        unmap_descbuffer(ring, dmaaddr, skb->len, 1);
-                bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC|GFP_DMA);
-                if (!bounce_skb)
-                        return;
-                dmaaddr = map_descbuffer(ring, bounce_skb->data, bounce_skb->len, 1);
-                if (dma_mapping_error(dmaaddr) || dmaaddr + skb->len > ring->bcm->dma_mask) {
-                        if (!dma_mapping_error(dmaaddr))
-                                unmap_descbuffer(ring, dmaaddr, skb->len, 1);
-                        dev_kfree_skb_any(bounce_skb);
-                        assert(0);
-                        return;
-                }
-                skb_copy_from_linear_data(skb, skb_put(bounce_skb, skb->len),
-                                          skb->len);
-                dev_kfree_skb_any(skb);
-                skb = bounce_skb;
-        }
-
-        meta->skb = skb;
-        meta->dmaaddr = dmaaddr;
-
-        fill_descriptor(ring, desc, dmaaddr,
-                        skb->len, 1, 1, 1);
-
-        /* Now transfer the whole frame. */
-        dmacontroller_poke_tx(ring, slot);
-}
-
-int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
-                   struct ieee80211_txb *txb)
-{
-        /* We just received a packet from the kernel network subsystem.
-         * Add headers and DMA map the memory. Poke
-         * the device to send the stuff.
-         * Note that this is called from atomic context.
-         */
-        struct bcm43xx_dmaring *ring = bcm43xx_current_dma(bcm)->tx_ring1;
-        u8 i;
-        struct sk_buff *skb;
-
-        assert(ring->tx);
-        if (unlikely(free_slots(ring) < txb->nr_frags)) {
-                /* The queue should be stopped,
-                 * if we are low on free slots.
-                 * If this ever triggers, we have to lower the suspend_mark.
-                 */
-                dprintkl(KERN_ERR PFX "Out of DMA descriptor slots!\n");
-                return -ENOMEM;
-        }
-
-        for (i = 0; i < txb->nr_frags; i++) {
-                skb = txb->fragments[i];
-                /* Take skb from ieee80211_txb_free */
-                txb->fragments[i] = NULL;
-                dma_tx_fragment(ring, skb, i);
-        }
-        ieee80211_txb_free(txb);
-
-        return 0;
-}
-
-void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
-                                   struct bcm43xx_xmitstatus *status)
-{
-        struct bcm43xx_dmaring *ring;
-        struct bcm43xx_dmadesc_generic *desc;
-        struct bcm43xx_dmadesc_meta *meta;
-        int is_last_fragment;
-        int slot;
-        u32 tmp;
-
-        ring = parse_cookie(bcm, status->cookie, &slot);
-        assert(ring);
-        assert(ring->tx);
-        while (1) {
-                assert(slot >= 0 && slot < ring->nr_slots);
-                desc = bcm43xx_dma_idx2desc(ring, slot, &meta);
-
-                if (ring->dma64) {
-                        tmp = le32_to_cpu(desc->dma64.control0);
-                        is_last_fragment = !!(tmp & BCM43xx_DMA64_DCTL0_FRAMEEND);
-                } else {
-                        tmp = le32_to_cpu(desc->dma32.control);
-                        is_last_fragment = !!(tmp & BCM43xx_DMA32_DCTL_FRAMEEND);
-                }
-                unmap_descbuffer(ring, meta->dmaaddr, meta->skb->len, 1);
-                free_descriptor_buffer(ring, meta, 1);
-                /* Everything belonging to the slot is unmapped
-                 * and freed, so we can return it.
-                 */
-                return_slot(ring, slot);
-
-                if (is_last_fragment)
-                        break;
-                slot = next_slot(ring, slot);
-        }
-        bcm->stats.last_tx = jiffies;
-}
-
-static void dma_rx(struct bcm43xx_dmaring *ring,
-                   int *slot)
-{
-        struct bcm43xx_dmadesc_generic *desc;
-        struct bcm43xx_dmadesc_meta *meta;
-        struct bcm43xx_rxhdr *rxhdr;
-        struct sk_buff *skb;
-        u16 len;
-        int err;
-        dma_addr_t dmaaddr;
-
-        desc = bcm43xx_dma_idx2desc(ring, *slot, &meta);
-
-        sync_descbuffer_for_cpu(ring, meta->dmaaddr, ring->rx_buffersize);
-        skb = meta->skb;
-
-        if (ring->index == 3) {
-                /* We received an xmit status. */
-                struct bcm43xx_hwxmitstatus *hw = (struct bcm43xx_hwxmitstatus *)skb->data;
-                struct bcm43xx_xmitstatus stat;
-                int i = 0;
-
-                stat.cookie = le16_to_cpu(hw->cookie);
-                while (stat.cookie == 0) {
-                        if (unlikely(++i >= 10000)) {
-                                assert(0);
-                                break;
-                        }
-                        udelay(2);
-                        barrier();
-                        stat.cookie = le16_to_cpu(hw->cookie);
-                }
-                stat.flags = hw->flags;
-                stat.cnt1 = hw->cnt1;
-                stat.cnt2 = hw->cnt2;
-                stat.seq = le16_to_cpu(hw->seq);
-                stat.unknown = le16_to_cpu(hw->unknown);
-
-                bcm43xx_debugfs_log_txstat(ring->bcm, &stat);
-                bcm43xx_dma_handle_xmitstatus(ring->bcm, &stat);
-                /* recycle the descriptor buffer. */
-                sync_descbuffer_for_device(ring, meta->dmaaddr, ring->rx_buffersize);
-
-                return;
-        }
-        rxhdr = (struct bcm43xx_rxhdr *)skb->data;
-        len = le16_to_cpu(rxhdr->frame_length);
-        if (len == 0) {
-                int i = 0;
-
-                do {
-                        udelay(2);
-                        barrier();
-                        len = le16_to_cpu(rxhdr->frame_length);
-                } while (len == 0 && i++ < 5);
-                if (unlikely(len == 0)) {
-                        /* recycle the descriptor buffer. */
-                        sync_descbuffer_for_device(ring, meta->dmaaddr,
-                                                   ring->rx_buffersize);
-                        goto drop;
-                }
-        }
-        if (unlikely(len > ring->rx_buffersize)) {
-                /* The data did not fit into one descriptor buffer
-                 * and is split over multiple buffers.
-                 * This should never happen, as we try to allocate buffers
-                 * big enough. So simply ignore this packet.
-                 */
-                int cnt = 0;
-                s32 tmp = len;
-
-                while (1) {
-                        desc = bcm43xx_dma_idx2desc(ring, *slot, &meta);
-                        /* recycle the descriptor buffer. */
-                        sync_descbuffer_for_device(ring, meta->dmaaddr,
-                                                   ring->rx_buffersize);
-                        *slot = next_slot(ring, *slot);
-                        cnt++;
-                        tmp -= ring->rx_buffersize;
-                        if (tmp <= 0)
-                                break;
-                }
-                printkl(KERN_ERR PFX "DMA RX buffer too small "
-                        "(len: %u, buffer: %u, nr-dropped: %d)\n",
-                        len, ring->rx_buffersize, cnt);
-                goto drop;
-        }
-        len -= IEEE80211_FCS_LEN;
-
-        dmaaddr = meta->dmaaddr;
-        err = setup_rx_descbuffer(ring, desc, meta, GFP_ATOMIC);
-        if (unlikely(err)) {
-                dprintkl(KERN_ERR PFX "DMA RX: setup_rx_descbuffer() failed\n");
-                sync_descbuffer_for_device(ring, dmaaddr,
-                                           ring->rx_buffersize);
-                goto drop;
-        }
-
-        unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0);
-        skb_put(skb, len + ring->frameoffset);
-        skb_pull(skb, ring->frameoffset);
-
-        err = bcm43xx_rx(ring->bcm, skb, rxhdr);
-        if (err) {
-                dev_kfree_skb_irq(skb);
-                goto drop;
-        }
-
-drop:
-        return;
-}
-
-void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
-{
-        u32 status;
-        u16 descptr;
-        int slot, current_slot;
-#ifdef CONFIG_BCM43XX_DEBUG
-        int used_slots = 0;
-#endif
-
-        assert(!ring->tx);
-        if (ring->dma64) {
-                status = bcm43xx_dma_read(ring, BCM43xx_DMA64_RXSTATUS);
-                descptr = (status & BCM43xx_DMA64_RXSTATDPTR);
-                current_slot = descptr / sizeof(struct bcm43xx_dmadesc64);
-        } else {
-                status = bcm43xx_dma_read(ring, BCM43xx_DMA32_RXSTATUS);
-                descptr = (status & BCM43xx_DMA32_RXDPTR);
-                current_slot = descptr / sizeof(struct bcm43xx_dmadesc32);
-        }
-        assert(current_slot >= 0 && current_slot < ring->nr_slots);
-
-        slot = ring->current_slot;
-        for ( ; slot != current_slot; slot = next_slot(ring, slot)) {
-                dma_rx(ring, &slot);
-#ifdef CONFIG_BCM43XX_DEBUG
-                if (++used_slots > ring->max_used_slots)
-                        ring->max_used_slots = used_slots;
-#endif
-        }
-        if (ring->dma64) {
-                bcm43xx_dma_write(ring, BCM43xx_DMA64_RXINDEX,
-                                (u32)(slot * sizeof(struct bcm43xx_dmadesc64)));
-        } else {
-                bcm43xx_dma_write(ring, BCM43xx_DMA32_RXINDEX,
-                                (u32)(slot * sizeof(struct bcm43xx_dmadesc32)));
-        }
-        ring->current_slot = slot;
-}
-
-void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring)
-{
-        assert(ring->tx);
-        bcm43xx_power_saving_ctl_bits(ring->bcm, -1, 1);
-        if (ring->dma64) {
-                bcm43xx_dma_write(ring, BCM43xx_DMA64_TXCTL,
-                                bcm43xx_dma_read(ring, BCM43xx_DMA64_TXCTL)
-                                | BCM43xx_DMA64_TXSUSPEND);
-        } else {
-                bcm43xx_dma_write(ring, BCM43xx_DMA32_TXCTL,
-                                bcm43xx_dma_read(ring, BCM43xx_DMA32_TXCTL)
-                                | BCM43xx_DMA32_TXSUSPEND);
-        }
-}
-
-void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring)
-{
-        assert(ring->tx);
-        if (ring->dma64) {
-                bcm43xx_dma_write(ring, BCM43xx_DMA64_TXCTL,
-                                bcm43xx_dma_read(ring, BCM43xx_DMA64_TXCTL)
-                                & ~BCM43xx_DMA64_TXSUSPEND);
-        } else {
-                bcm43xx_dma_write(ring, BCM43xx_DMA32_TXCTL,
-                                bcm43xx_dma_read(ring, BCM43xx_DMA32_TXCTL)
-                                & ~BCM43xx_DMA32_TXSUSPEND);
-        }
-        bcm43xx_power_saving_ctl_bits(ring->bcm, -1, -1);
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
deleted file mode 100644
index d1105e569a41..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
+++ /dev/null
@@ -1,386 +0,0 @@
-#ifndef BCM43xx_DMA_H_
-#define BCM43xx_DMA_H_
-
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/workqueue.h>
-#include <linux/dma-mapping.h>
-#include <linux/linkage.h>
-#include <asm/atomic.h>
-
-
-/* DMA-Interrupt reasons. */
-#define BCM43xx_DMAIRQ_FATALMASK        ((1 << 10) | (1 << 11) | (1 << 12) \
-                                         | (1 << 14) | (1 << 15))
-#define BCM43xx_DMAIRQ_NONFATALMASK     (1 << 13)
-#define BCM43xx_DMAIRQ_RX_DONE          (1 << 16)
-
-
-/*** 32-bit DMA Engine. ***/
-
-/* 32-bit DMA controller registers. */
-#define BCM43xx_DMA32_TXCTL                             0x00
-#define         BCM43xx_DMA32_TXENABLE                  0x00000001
-#define         BCM43xx_DMA32_TXSUSPEND                 0x00000002
-#define         BCM43xx_DMA32_TXLOOPBACK                0x00000004
-#define         BCM43xx_DMA32_TXFLUSH                   0x00000010
-#define         BCM43xx_DMA32_TXADDREXT_MASK            0x00030000
-#define         BCM43xx_DMA32_TXADDREXT_SHIFT           16
-#define BCM43xx_DMA32_TXRING                            0x04
-#define BCM43xx_DMA32_TXINDEX                           0x08
-#define BCM43xx_DMA32_TXSTATUS                          0x0C
-#define         BCM43xx_DMA32_TXDPTR                    0x00000FFF
-#define         BCM43xx_DMA32_TXSTATE                   0x0000F000
-#define                 BCM43xx_DMA32_TXSTAT_DISABLED   0x00000000
-#define                 BCM43xx_DMA32_TXSTAT_ACTIVE     0x00001000
-#define                 BCM43xx_DMA32_TXSTAT_IDLEWAIT   0x00002000
-#define                 BCM43xx_DMA32_TXSTAT_STOPPED    0x00003000
-#define                 BCM43xx_DMA32_TXSTAT_SUSP       0x00004000
-#define         BCM43xx_DMA32_TXERROR                   0x000F0000
-#define                 BCM43xx_DMA32_TXERR_NOERR       0x00000000
-#define                 BCM43xx_DMA32_TXERR_PROT        0x00010000
-#define                 BCM43xx_DMA32_TXERR_UNDERRUN    0x00020000
-#define                 BCM43xx_DMA32_TXERR_BUFREAD     0x00030000
-#define                 BCM43xx_DMA32_TXERR_DESCREAD    0x00040000
-#define         BCM43xx_DMA32_TXACTIVE                  0xFFF00000
-#define BCM43xx_DMA32_RXCTL                             0x10
-#define         BCM43xx_DMA32_RXENABLE                  0x00000001
-#define         BCM43xx_DMA32_RXFROFF_MASK              0x000000FE
-#define         BCM43xx_DMA32_RXFROFF_SHIFT             1
-#define         BCM43xx_DMA32_RXDIRECTFIFO              0x00000100
-#define         BCM43xx_DMA32_RXADDREXT_MASK            0x00030000
-#define         BCM43xx_DMA32_RXADDREXT_SHIFT           16
-#define BCM43xx_DMA32_RXRING                            0x14
-#define BCM43xx_DMA32_RXINDEX                           0x18
-#define BCM43xx_DMA32_RXSTATUS                          0x1C
-#define         BCM43xx_DMA32_RXDPTR                    0x00000FFF
-#define         BCM43xx_DMA32_RXSTATE                   0x0000F000
-#define                 BCM43xx_DMA32_RXSTAT_DISABLED   0x00000000
-#define                 BCM43xx_DMA32_RXSTAT_ACTIVE     0x00001000
-#define                 BCM43xx_DMA32_RXSTAT_IDLEWAIT   0x00002000
-#define                 BCM43xx_DMA32_RXSTAT_STOPPED    0x00003000
-#define         BCM43xx_DMA32_RXERROR                   0x000F0000
-#define                 BCM43xx_DMA32_RXERR_NOERR       0x00000000
-#define                 BCM43xx_DMA32_RXERR_PROT        0x00010000
-#define                 BCM43xx_DMA32_RXERR_OVERFLOW    0x00020000
-#define                 BCM43xx_DMA32_RXERR_BUFWRITE    0x00030000
-#define                 BCM43xx_DMA32_RXERR_DESCREAD    0x00040000
-#define         BCM43xx_DMA32_RXACTIVE                  0xFFF00000
-
-/* 32-bit DMA descriptor. */
-struct bcm43xx_dmadesc32 {
-        __le32 control;
-        __le32 address;
-} __attribute__((__packed__));
-#define BCM43xx_DMA32_DCTL_BYTECNT              0x00001FFF
-#define BCM43xx_DMA32_DCTL_ADDREXT_MASK         0x00030000
-#define BCM43xx_DMA32_DCTL_ADDREXT_SHIFT        16
-#define BCM43xx_DMA32_DCTL_DTABLEEND            0x10000000
-#define BCM43xx_DMA32_DCTL_IRQ                  0x20000000
-#define BCM43xx_DMA32_DCTL_FRAMEEND             0x40000000
-#define BCM43xx_DMA32_DCTL_FRAMESTART           0x80000000
-
-/* Address field Routing value. */
-#define BCM43xx_DMA32_ROUTING                   0xC0000000
-#define BCM43xx_DMA32_ROUTING_SHIFT             30
-#define         BCM43xx_DMA32_NOTRANS           0x00000000
-#define         BCM43xx_DMA32_CLIENTTRANS       0x40000000
-
-
-
-/*** 64-bit DMA Engine. ***/
-
-/* 64-bit DMA controller registers. */
-#define BCM43xx_DMA64_TXCTL                             0x00
-#define         BCM43xx_DMA64_TXENABLE                  0x00000001
-#define         BCM43xx_DMA64_TXSUSPEND                 0x00000002
-#define         BCM43xx_DMA64_TXLOOPBACK                0x00000004
-#define         BCM43xx_DMA64_TXFLUSH                   0x00000010
-#define         BCM43xx_DMA64_TXADDREXT_MASK            0x00030000
-#define         BCM43xx_DMA64_TXADDREXT_SHIFT           16
-#define BCM43xx_DMA64_TXINDEX                           0x04
-#define BCM43xx_DMA64_TXRINGLO                          0x08
-#define BCM43xx_DMA64_TXRINGHI                          0x0C
-#define BCM43xx_DMA64_TXSTATUS                          0x10
-#define         BCM43xx_DMA64_TXSTATDPTR                0x00001FFF
-#define         BCM43xx_DMA64_TXSTAT                    0xF0000000
-#define                 BCM43xx_DMA64_TXSTAT_DISABLED   0x00000000
-#define                 BCM43xx_DMA64_TXSTAT_ACTIVE     0x10000000
-#define                 BCM43xx_DMA64_TXSTAT_IDLEWAIT   0x20000000
-#define                 BCM43xx_DMA64_TXSTAT_STOPPED    0x30000000
-#define                 BCM43xx_DMA64_TXSTAT_SUSP       0x40000000
-#define BCM43xx_DMA64_TXERROR                           0x14
-#define         BCM43xx_DMA64_TXERRDPTR                 0x0001FFFF
-#define         BCM43xx_DMA64_TXERR                     0xF0000000
-#define                 BCM43xx_DMA64_TXERR_NOERR       0x00000000
-#define                 BCM43xx_DMA64_TXERR_PROT        0x10000000
-#define                 BCM43xx_DMA64_TXERR_UNDERRUN    0x20000000
-#define                 BCM43xx_DMA64_TXERR_TRANSFER    0x30000000
-#define                 BCM43xx_DMA64_TXERR_DESCREAD    0x40000000
-#define                 BCM43xx_DMA64_TXERR_CORE        0x50000000
-#define BCM43xx_DMA64_RXCTL                             0x20
-#define         BCM43xx_DMA64_RXENABLE                  0x00000001
-#define         BCM43xx_DMA64_RXFROFF_MASK              0x000000FE
-#define         BCM43xx_DMA64_RXFROFF_SHIFT             1
-#define         BCM43xx_DMA64_RXDIRECTFIFO              0x00000100
-#define         BCM43xx_DMA64_RXADDREXT_MASK            0x00030000
-#define         BCM43xx_DMA64_RXADDREXT_SHIFT           16
-#define BCM43xx_DMA64_RXINDEX                           0x24
-#define BCM43xx_DMA64_RXRINGLO                          0x28
-#define BCM43xx_DMA64_RXRINGHI                          0x2C
-#define BCM43xx_DMA64_RXSTATUS                          0x30
-#define         BCM43xx_DMA64_RXSTATDPTR                0x00001FFF
-#define         BCM43xx_DMA64_RXSTAT                    0xF0000000
-#define                 BCM43xx_DMA64_RXSTAT_DISABLED   0x00000000
-#define                 BCM43xx_DMA64_RXSTAT_ACTIVE     0x10000000
-#define                 BCM43xx_DMA64_RXSTAT_IDLEWAIT   0x20000000
-#define                 BCM43xx_DMA64_RXSTAT_STOPPED    0x30000000
-#define                 BCM43xx_DMA64_RXSTAT_SUSP       0x40000000
-#define BCM43xx_DMA64_RXERROR                           0x34
-#define         BCM43xx_DMA64_RXERRDPTR                 0x0001FFFF
-#define         BCM43xx_DMA64_RXERR                     0xF0000000
-#define                 BCM43xx_DMA64_RXERR_NOERR       0x00000000
-#define                 BCM43xx_DMA64_RXERR_PROT        0x10000000
-#define                 BCM43xx_DMA64_RXERR_UNDERRUN    0x20000000
-#define                 BCM43xx_DMA64_RXERR_TRANSFER    0x30000000
-#define                 BCM43xx_DMA64_RXERR_DESCREAD    0x40000000
-#define                 BCM43xx_DMA64_RXERR_CORE        0x50000000
-
-/* 64-bit DMA descriptor. */
-struct bcm43xx_dmadesc64 {
-        __le32 control0;
-        __le32 control1;
-        __le32 address_low;
-        __le32 address_high;
-} __attribute__((__packed__));
-#define BCM43xx_DMA64_DCTL0_DTABLEEND           0x10000000
-#define BCM43xx_DMA64_DCTL0_IRQ                 0x20000000
-#define BCM43xx_DMA64_DCTL0_FRAMEEND            0x40000000
-#define BCM43xx_DMA64_DCTL0_FRAMESTART          0x80000000
-#define BCM43xx_DMA64_DCTL1_BYTECNT             0x00001FFF
-#define BCM43xx_DMA64_DCTL1_ADDREXT_MASK        0x00030000
-#define BCM43xx_DMA64_DCTL1_ADDREXT_SHIFT       16
-
-/* Address field Routing value. */
-#define BCM43xx_DMA64_ROUTING                   0xC0000000
-#define BCM43xx_DMA64_ROUTING_SHIFT             30
-#define         BCM43xx_DMA64_NOTRANS           0x00000000
-#define         BCM43xx_DMA64_CLIENTTRANS       0x80000000
-
-
-
-struct bcm43xx_dmadesc_generic {
-        union {
-                struct bcm43xx_dmadesc32 dma32;
-                struct bcm43xx_dmadesc64 dma64;
-        } __attribute__((__packed__));
-} __attribute__((__packed__));
-
-
-/* Misc DMA constants */
-#define BCM43xx_DMA_RINGMEMSIZE         PAGE_SIZE
-#define BCM43xx_DMA0_RX_FRAMEOFFSET     30
-#define BCM43xx_DMA3_RX_FRAMEOFFSET     0
-
-
-/* DMA engine tuning knobs */
-#define BCM43xx_TXRING_SLOTS            512
-#define BCM43xx_RXRING_SLOTS            64
-#define BCM43xx_DMA0_RX_BUFFERSIZE      (2304 + 100)
-#define BCM43xx_DMA3_RX_BUFFERSIZE      16
-/* Suspend the tx queue, if less than this percent slots are free. */
-#define BCM43xx_TXSUSPEND_PERCENT       20
-/* Resume the tx queue, if more than this percent slots are free. */
-#define BCM43xx_TXRESUME_PERCENT        50
-
-
-
-#ifdef CONFIG_BCM43XX_DMA
-
-
-struct sk_buff;
-struct bcm43xx_private;
-struct bcm43xx_xmitstatus;
-
-
-struct bcm43xx_dmadesc_meta {
-        /* The kernel DMA-able buffer. */
-        struct sk_buff *skb;
-        /* DMA base bus-address of the descriptor buffer. */
-        dma_addr_t dmaaddr;
-};
-
-struct bcm43xx_dmaring {
-        /* Kernel virtual base address of the ring memory. */
-        void *descbase;
-        /* Meta data about all descriptors. */
-        struct bcm43xx_dmadesc_meta *meta;
-        /* DMA Routing value. */
-        u32 routing;
-        /* (Unadjusted) DMA base bus-address of the ring memory. */
-        dma_addr_t dmabase;
-        /* Number of descriptor slots in the ring. */
-        int nr_slots;
-        /* Number of used descriptor slots. */
-        int used_slots;
-        /* Currently used slot in the ring. */
-        int current_slot;
-        /* Marks to suspend/resume the queue. */
-        int suspend_mark;
-        int resume_mark;
-        /* Frameoffset in octets. */
-        u32 frameoffset;
-        /* Descriptor buffer size. */
-        u16 rx_buffersize;
-        /* The MMIO base register of the DMA controller. */
-        u16 mmio_base;
-        /* DMA controller index number (0-5). */
-        int index;
-        /* Boolean. Is this a TX ring? */
-        u8 tx;
-        /* Boolean. 64bit DMA if true, 32bit DMA otherwise. */
-        u8 dma64;
-        /* Boolean. Are transfers suspended on this ring? */
-        u8 suspended;
-        struct bcm43xx_private *bcm;
-#ifdef CONFIG_BCM43XX_DEBUG
-        /* Maximum number of used slots. */
-        int max_used_slots;
-#endif /* CONFIG_BCM43XX_DEBUG*/
-};
-
-
-static inline
-int bcm43xx_dma_desc2idx(struct bcm43xx_dmaring *ring,
-                         struct bcm43xx_dmadesc_generic *desc)
-{
-        if (ring->dma64) {
-                struct bcm43xx_dmadesc64 *dd64 = ring->descbase;
-                return (int)(&(desc->dma64) - dd64);
-        } else {
-                struct bcm43xx_dmadesc32 *dd32 = ring->descbase;
-                return (int)(&(desc->dma32) - dd32);
-        }
-}
-
-static inline
-struct bcm43xx_dmadesc_generic * bcm43xx_dma_idx2desc(struct bcm43xx_dmaring *ring,
-                                                      int slot,
-                                                      struct bcm43xx_dmadesc_meta **meta)
-{
-        *meta = &(ring->meta[slot]);
-        if (ring->dma64) {
-                struct bcm43xx_dmadesc64 *dd64 = ring->descbase;
-                return (struct bcm43xx_dmadesc_generic *)(&(dd64[slot]));
-        } else {
-                struct bcm43xx_dmadesc32 *dd32 = ring->descbase;
-                return (struct bcm43xx_dmadesc_generic *)(&(dd32[slot]));
-        }
-}
-
-static inline
-u32 bcm43xx_dma_read(struct bcm43xx_dmaring *ring,
-                     u16 offset)
-{
-        return bcm43xx_read32(ring->bcm, ring->mmio_base + offset);
-}
-
-static inline
-void bcm43xx_dma_write(struct bcm43xx_dmaring *ring,
-                       u16 offset, u32 value)
-{
-        bcm43xx_write32(ring->bcm, ring->mmio_base + offset, value);
-}
-
-
-int bcm43xx_dma_init(struct bcm43xx_private *bcm);
-void bcm43xx_dma_free(struct bcm43xx_private *bcm);
-
-int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base,
-                                   int dma64);
-int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base,
-                                   int dma64);
-
-u16 bcm43xx_dmacontroller_base(int dma64bit, int dmacontroller_idx);
-
-void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring);
-void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring);
-
-void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
-                                   struct bcm43xx_xmitstatus *status);
-
-int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
-                   struct ieee80211_txb *txb);
-void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring);
-
-/* Helper function that returns the dma mask for this device. */
-static inline
-u64 bcm43xx_get_supported_dma_mask(struct bcm43xx_private *bcm)
-{
-        int dma64 = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH) &
-                                   BCM43xx_SBTMSTATEHIGH_DMA64BIT;
-        u16 mmio_base = bcm43xx_dmacontroller_base(dma64, 0);
-        u32 mask = BCM43xx_DMA32_TXADDREXT_MASK;
-
-        if (dma64)
-                return DMA_64BIT_MASK;
-        bcm43xx_write32(bcm, mmio_base + BCM43xx_DMA32_TXCTL, mask);
-        if (bcm43xx_read32(bcm, mmio_base + BCM43xx_DMA32_TXCTL) & mask)
-                return DMA_32BIT_MASK;
-        return DMA_30BIT_MASK;
-}
-
-#else /* CONFIG_BCM43XX_DMA */
-
-
-static inline
-int bcm43xx_dma_init(struct bcm43xx_private *bcm)
-{
-        return 0;
-}
-static inline
-void bcm43xx_dma_free(struct bcm43xx_private *bcm)
-{
-}
-static inline
-int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base,
-                                   int dma64)
-{
-        return 0;
-}
-static inline
-int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base,
-                                   int dma64)
-{
-        return 0;
-}
-static inline
-int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
-                   struct ieee80211_txb *txb)
-{
-        return 0;
-}
-static inline
-void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
-                                   struct bcm43xx_xmitstatus *status)
-{
-}
-static inline
-void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
-{
-}
-static inline
-void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring)
-{
-}
-static inline
-void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring)
-{
-}
-
-#endif /* CONFIG_BCM43XX_DMA */
-#endif /* BCM43xx_DMA_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
deleted file mode 100644
index d2df6a0100a1..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  ethtool support
-
-  Copyright (c) 2006 Jason Lunz <lunz@falooley.org>
-
-  Some code in this file is derived from the 8139too.c driver
-  Copyright (C) 2002 Jeff Garzik
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include "bcm43xx.h"
-#include "bcm43xx_ethtool.h"
-
-#include <linux/netdevice.h>
-#include <linux/pci.h>
-#include <linux/string.h>
-#include <linux/utsname.h>
-
-
-static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(dev);
-
-        strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-        strncpy(info->version, utsname()->release, sizeof(info->version));
-        strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
-}
-
-const struct ethtool_ops bcm43xx_ethtool_ops = {
-        .get_drvinfo = bcm43xx_get_drvinfo,
-        .get_link = ethtool_op_get_link,
-};
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
deleted file mode 100644
index 6f8d42d3cdf5..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef BCM43xx_ETHTOOL_H_
-#define BCM43xx_ETHTOOL_H_
-
-#include <linux/ethtool.h>
-
-extern const struct ethtool_ops bcm43xx_ethtool_ops;
-
-#endif /* BCM43xx_ETHTOOL_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c
deleted file mode 100644
index f2b8dbac55a4..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include "bcm43xx.h"
-#include "bcm43xx_ilt.h"
-#include "bcm43xx_phy.h"
-
-
-/**** Initial Internal Lookup Tables ****/
-
-const u32 bcm43xx_ilt_rotor[BCM43xx_ILT_ROTOR_SIZE] = {
-        0xFEB93FFD, 0xFEC63FFD, /* 0 */
-        0xFED23FFD, 0xFEDF3FFD,
-        0xFEEC3FFE, 0xFEF83FFE,
-        0xFF053FFE, 0xFF113FFE,
-        0xFF1E3FFE, 0xFF2A3FFF, /* 8 */
-        0xFF373FFF, 0xFF443FFF,
-        0xFF503FFF, 0xFF5D3FFF,
-        0xFF693FFF, 0xFF763FFF,
-        0xFF824000, 0xFF8F4000, /* 16 */
-        0xFF9B4000, 0xFFA84000,
-        0xFFB54000, 0xFFC14000,
-        0xFFCE4000, 0xFFDA4000,
-        0xFFE74000, 0xFFF34000, /* 24 */
-        0x00004000, 0x000D4000,
-        0x00194000, 0x00264000,
-        0x00324000, 0x003F4000,
-        0x004B4000, 0x00584000, /* 32 */
-        0x00654000, 0x00714000,
-        0x007E4000, 0x008A3FFF,
-        0x00973FFF, 0x00A33FFF,
-        0x00B03FFF, 0x00BC3FFF, /* 40 */
-        0x00C93FFF, 0x00D63FFF,
-        0x00E23FFE, 0x00EF3FFE,
-        0x00FB3FFE, 0x01083FFE,
-        0x01143FFE, 0x01213FFD, /* 48 */
-        0x012E3FFD, 0x013A3FFD,
-        0x01473FFD,
-};
-
-const u32 bcm43xx_ilt_retard[BCM43xx_ILT_RETARD_SIZE] = {
-        0xDB93CB87, 0xD666CF64, /* 0 */
-        0xD1FDD358, 0xCDA6D826,
-        0xCA38DD9F, 0xC729E2B4,
-        0xC469E88E, 0xC26AEE2B,
-        0xC0DEF46C, 0xC073FA62, /* 8 */
-        0xC01D00D5, 0xC0760743,
-        0xC1560D1E, 0xC2E51369,
-        0xC4ED18FF, 0xC7AC1ED7,
-        0xCB2823B2, 0xCEFA28D9, /* 16 */
-        0xD2F62D3F, 0xD7BB3197,
-        0xDCE53568, 0xE1FE3875,
-        0xE7D13B35, 0xED663D35,
-        0xF39B3EC4, 0xF98E3FA7, /* 24 */
-        0x00004000, 0x06723FA7,
-        0x0C653EC4, 0x129A3D35,
-        0x182F3B35, 0x1E023875,
-        0x231B3568, 0x28453197, /* 32 */
-        0x2D0A2D3F, 0x310628D9,
-        0x34D823B2, 0x38541ED7,
-        0x3B1318FF, 0x3D1B1369,
-        0x3EAA0D1E, 0x3F8A0743, /* 40 */
-        0x3FE300D5, 0x3F8DFA62,
-        0x3F22F46C, 0x3D96EE2B,
-        0x3B97E88E, 0x38D7E2B4,
-        0x35C8DD9F, 0x325AD826, /* 48 */
-        0x2E03D358, 0x299ACF64,
-        0x246DCB87,
-};
-
-const u16 bcm43xx_ilt_finefreqa[BCM43xx_ILT_FINEFREQA_SIZE] = {
-        0x0082, 0x0082, 0x0102, 0x0182, /* 0 */
-        0x0202, 0x0282, 0x0302, 0x0382,
-        0x0402, 0x0482, 0x0502, 0x0582,
-        0x05E2, 0x0662, 0x06E2, 0x0762,
-        0x07E2, 0x0842, 0x08C2, 0x0942, /* 16 */
-        0x09C2, 0x0A22, 0x0AA2, 0x0B02,
-        0x0B82, 0x0BE2, 0x0C62, 0x0CC2,
-        0x0D42, 0x0DA2, 0x0E02, 0x0E62,
-        0x0EE2, 0x0F42, 0x0FA2, 0x1002, /* 32 */
-        0x1062, 0x10C2, 0x1122, 0x1182,
-        0x11E2, 0x1242, 0x12A2, 0x12E2,
-        0x1342, 0x13A2, 0x1402, 0x1442,
-        0x14A2, 0x14E2, 0x1542, 0x1582, /* 48 */
-        0x15E2, 0x1622, 0x1662, 0x16C1,
-        0x1701, 0x1741, 0x1781, 0x17E1,
-        0x1821, 0x1861, 0x18A1, 0x18E1,
-        0x1921, 0x1961, 0x19A1, 0x19E1, /* 64 */
-        0x1A21, 0x1A61, 0x1AA1, 0x1AC1,
-        0x1B01, 0x1B41, 0x1B81, 0x1BA1,
-        0x1BE1, 0x1C21, 0x1C41, 0x1C81,
-        0x1CA1, 0x1CE1, 0x1D01, 0x1D41, /* 80 */
-        0x1D61, 0x1DA1, 0x1DC1, 0x1E01,
-        0x1E21, 0x1E61, 0x1E81, 0x1EA1,
-        0x1EE1, 0x1F01, 0x1F21, 0x1F41,
-        0x1F81, 0x1FA1, 0x1FC1, 0x1FE1, /* 96 */
-        0x2001, 0x2041, 0x2061, 0x2081,
-        0x20A1, 0x20C1, 0x20E1, 0x2101,
-        0x2121, 0x2141, 0x2161, 0x2181,
-        0x21A1, 0x21C1, 0x21E1, 0x2201, /* 112 */
-        0x2221, 0x2241, 0x2261, 0x2281,
-        0x22A1, 0x22C1, 0x22C1, 0x22E1,
-        0x2301, 0x2321, 0x2341, 0x2361,
-        0x2361, 0x2381, 0x23A1, 0x23C1, /* 128 */
-        0x23E1, 0x23E1, 0x2401, 0x2421,
-        0x2441, 0x2441, 0x2461, 0x2481,
-        0x2481, 0x24A1, 0x24C1, 0x24C1,
-        0x24E1, 0x2501, 0x2501, 0x2521, /* 144 */
-        0x2541, 0x2541, 0x2561, 0x2561,
-        0x2581, 0x25A1, 0x25A1, 0x25C1,
-        0x25C1, 0x25E1, 0x2601, 0x2601,
-        0x2621, 0x2621, 0x2641, 0x2641, /* 160 */
-        0x2661, 0x2661, 0x2681, 0x2681,
-        0x26A1, 0x26A1, 0x26C1, 0x26C1,
-        0x26E1, 0x26E1, 0x2701, 0x2701,
-        0x2721, 0x2721, 0x2740, 0x2740, /* 176 */
-        0x2760, 0x2760, 0x2780, 0x2780,
-        0x2780, 0x27A0, 0x27A0, 0x27C0,
-        0x27C0, 0x27E0, 0x27E0, 0x27E0,
-        0x2800, 0x2800, 0x2820, 0x2820, /* 192 */
-        0x2820, 0x2840, 0x2840, 0x2840,
-        0x2860, 0x2860, 0x2880, 0x2880,
-        0x2880, 0x28A0, 0x28A0, 0x28A0,
-        0x28C0, 0x28C0, 0x28C0, 0x28E0, /* 208 */
-        0x28E0, 0x28E0, 0x2900, 0x2900,
-        0x2900, 0x2920, 0x2920, 0x2920,
-        0x2940, 0x2940, 0x2940, 0x2960,
-        0x2960, 0x2960, 0x2960, 0x2980, /* 224 */
-        0x2980, 0x2980, 0x29A0, 0x29A0,
-        0x29A0, 0x29A0, 0x29C0, 0x29C0,
-        0x29C0, 0x29E0, 0x29E0, 0x29E0,
-        0x29E0, 0x2A00, 0x2A00, 0x2A00, /* 240 */
-        0x2A00, 0x2A20, 0x2A20, 0x2A20,
-        0x2A20, 0x2A40, 0x2A40, 0x2A40,
-        0x2A40, 0x2A60, 0x2A60, 0x2A60,
-};
-
-const u16 bcm43xx_ilt_finefreqg[BCM43xx_ILT_FINEFREQG_SIZE] = {
-        0x0089, 0x02E9, 0x0409, 0x04E9, /* 0 */
-        0x05A9, 0x0669, 0x0709, 0x0789,
-        0x0829, 0x08A9, 0x0929, 0x0989,
-        0x0A09, 0x0A69, 0x0AC9, 0x0B29,
-        0x0BA9, 0x0BE9, 0x0C49, 0x0CA9, /* 16 */
-        0x0D09, 0x0D69, 0x0DA9, 0x0E09,
-        0x0E69, 0x0EA9, 0x0F09, 0x0F49,
-        0x0FA9, 0x0FE9, 0x1029, 0x1089,
-        0x10C9, 0x1109, 0x1169, 0x11A9, /* 32 */
-        0x11E9, 0x1229, 0x1289, 0x12C9,
-        0x1309, 0x1349, 0x1389, 0x13C9,
-        0x1409, 0x1449, 0x14A9, 0x14E9,
-        0x1529, 0x1569, 0x15A9, 0x15E9, /* 48 */
-        0x1629, 0x1669, 0x16A9, 0x16E8,
-        0x1728, 0x1768, 0x17A8, 0x17E8,
-        0x1828, 0x1868, 0x18A8, 0x18E8,
-        0x1928, 0x1968, 0x19A8, 0x19E8, /* 64 */
-        0x1A28, 0x1A68, 0x1AA8, 0x1AE8,
-        0x1B28, 0x1B68, 0x1BA8, 0x1BE8,
-        0x1C28, 0x1C68, 0x1CA8, 0x1CE8,
-        0x1D28, 0x1D68, 0x1DC8, 0x1E08, /* 80 */
-        0x1E48, 0x1E88, 0x1EC8, 0x1F08,
-        0x1F48, 0x1F88, 0x1FE8, 0x2028,
-        0x2068, 0x20A8, 0x2108, 0x2148,
-        0x2188, 0x21C8, 0x2228, 0x2268, /* 96 */
-        0x22C8, 0x2308, 0x2348, 0x23A8,
-        0x23E8, 0x2448, 0x24A8, 0x24E8,
-        0x2548, 0x25A8, 0x2608, 0x2668,
-        0x26C8, 0x2728, 0x2787, 0x27E7, /* 112 */
-        0x2847, 0x28C7, 0x2947, 0x29A7,
-        0x2A27, 0x2AC7, 0x2B47, 0x2BE7,
-        0x2CA7, 0x2D67, 0x2E47, 0x2F67,
-        0x3247, 0x3526, 0x3646, 0x3726, /* 128 */
-        0x3806, 0x38A6, 0x3946, 0x39E6,
-        0x3A66, 0x3AE6, 0x3B66, 0x3BC6,
-        0x3C45, 0x3CA5, 0x3D05, 0x3D85,
-        0x3DE5, 0x3E45, 0x3EA5, 0x3EE5, /* 144 */
-        0x3F45, 0x3FA5, 0x4005, 0x4045,
-        0x40A5, 0x40E5, 0x4145, 0x4185,
-        0x41E5, 0x4225, 0x4265, 0x42C5,
-        0x4305, 0x4345, 0x43A5, 0x43E5, /* 160 */
-        0x4424, 0x4464, 0x44C4, 0x4504,
-        0x4544, 0x4584, 0x45C4, 0x4604,
-        0x4644, 0x46A4, 0x46E4, 0x4724,
-        0x4764, 0x47A4, 0x47E4, 0x4824, /* 176 */
-        0x4864, 0x48A4, 0x48E4, 0x4924,
-        0x4964, 0x49A4, 0x49E4, 0x4A24,
-        0x4A64, 0x4AA4, 0x4AE4, 0x4B23,
-        0x4B63, 0x4BA3, 0x4BE3, 0x4C23, /* 192 */
-        0x4C63, 0x4CA3, 0x4CE3, 0x4D23,
-        0x4D63, 0x4DA3, 0x4DE3, 0x4E23,
-        0x4E63, 0x4EA3, 0x4EE3, 0x4F23,
-        0x4F63, 0x4FC3, 0x5003, 0x5043, /* 208 */
-        0x5083, 0x50C3, 0x5103, 0x5143,
-        0x5183, 0x51E2, 0x5222, 0x5262,
-        0x52A2, 0x52E2, 0x5342, 0x5382,
-        0x53C2, 0x5402, 0x5462, 0x54A2, /* 224 */
-        0x5502, 0x5542, 0x55A2, 0x55E2,
-        0x5642, 0x5682, 0x56E2, 0x5722,
-        0x5782, 0x57E1, 0x5841, 0x58A1,
-        0x5901, 0x5961, 0x59C1, 0x5A21, /* 240 */
-        0x5AA1, 0x5B01, 0x5B81, 0x5BE1,
-        0x5C61, 0x5D01, 0x5D80, 0x5E20,
-        0x5EE0, 0x5FA0, 0x6080, 0x61C0,
-};
-
-const u16 bcm43xx_ilt_noisea2[BCM43xx_ILT_NOISEA2_SIZE] = {
-        0x0001, 0x0001, 0x0001, 0xFFFE,
-        0xFFFE, 0x3FFF, 0x1000, 0x0393,
-};
-
-const u16 bcm43xx_ilt_noisea3[BCM43xx_ILT_NOISEA3_SIZE] = {
-        0x4C4C, 0x4C4C, 0x4C4C, 0x2D36,
-        0x4C4C, 0x4C4C, 0x4C4C, 0x2D36,
-};
-
-const u16 bcm43xx_ilt_noiseg1[BCM43xx_ILT_NOISEG1_SIZE] = {
-        0x013C, 0x01F5, 0x031A, 0x0631,
-        0x0001, 0x0001, 0x0001, 0x0001,
-};
-
-const u16 bcm43xx_ilt_noiseg2[BCM43xx_ILT_NOISEG2_SIZE] = {
-        0x5484, 0x3C40, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000,
-};
-
-const u16 bcm43xx_ilt_noisescaleg1[BCM43xx_ILT_NOISESCALEG_SIZE] = {
-        0x6C77, 0x5162, 0x3B40, 0x3335, /* 0 */
-        0x2F2D, 0x2A2A, 0x2527, 0x1F21,
-        0x1A1D, 0x1719, 0x1616, 0x1414,
-        0x1414, 0x1400, 0x1414, 0x1614,
-        0x1716, 0x1A19, 0x1F1D, 0x2521, /* 16 */
-        0x2A27, 0x2F2A, 0x332D, 0x3B35,
-        0x5140, 0x6C62, 0x0077,
-};
-
-const u16 bcm43xx_ilt_noisescaleg2[BCM43xx_ILT_NOISESCALEG_SIZE] = {
-        0xD8DD, 0xCBD4, 0xBCC0, 0XB6B7, /* 0 */
-        0xB2B0, 0xADAD, 0xA7A9, 0x9FA1,
-        0x969B, 0x9195, 0x8F8F, 0x8A8A,
-        0x8A8A, 0x8A00, 0x8A8A, 0x8F8A,
-        0x918F, 0x9695, 0x9F9B, 0xA7A1, /* 16 */
-        0xADA9, 0xB2AD, 0xB6B0, 0xBCB7,
-        0xCBC0, 0xD8D4, 0x00DD,
-};
-
-const u16 bcm43xx_ilt_noisescaleg3[BCM43xx_ILT_NOISESCALEG_SIZE] = {
-        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4, /* 0 */
-        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4,
-        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4,
-        0xA4A4, 0xA400, 0xA4A4, 0xA4A4,
-        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4, /* 16 */
-        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4,
-        0xA4A4, 0xA4A4, 0x00A4,
-};
-
-const u16 bcm43xx_ilt_sigmasqr1[BCM43xx_ILT_SIGMASQR_SIZE] = {
-        0x007A, 0x0075, 0x0071, 0x006C, /* 0 */
-        0x0067, 0x0063, 0x005E, 0x0059,
-        0x0054, 0x0050, 0x004B, 0x0046,
-        0x0042, 0x003D, 0x003D, 0x003D,
-        0x003D, 0x003D, 0x003D, 0x003D, /* 16 */
-        0x003D, 0x003D, 0x003D, 0x003D,
-        0x003D, 0x003D, 0x0000, 0x003D,
-        0x003D, 0x003D, 0x003D, 0x003D,
-        0x003D, 0x003D, 0x003D, 0x003D, /* 32 */
-        0x003D, 0x003D, 0x003D, 0x003D,
-        0x0042, 0x0046, 0x004B, 0x0050,
-        0x0054, 0x0059, 0x005E, 0x0063,
-        0x0067, 0x006C, 0x0071, 0x0075, /* 48 */
-        0x007A,
-};
-
-const u16 bcm43xx_ilt_sigmasqr2[BCM43xx_ILT_SIGMASQR_SIZE] = {
-        0x00DE, 0x00DC, 0x00DA, 0x00D8, /* 0 */
-        0x00D6, 0x00D4, 0x00D2, 0x00CF,
-        0x00CD, 0x00CA, 0x00C7, 0x00C4,
-        0x00C1, 0x00BE, 0x00BE, 0x00BE,
-        0x00BE, 0x00BE, 0x00BE, 0x00BE, /* 16 */
-        0x00BE, 0x00BE, 0x00BE, 0x00BE,
-        0x00BE, 0x00BE, 0x0000, 0x00BE,
-        0x00BE, 0x00BE, 0x00BE, 0x00BE,
-        0x00BE, 0x00BE, 0x00BE, 0x00BE, /* 32 */
-        0x00BE, 0x00BE, 0x00BE, 0x00BE,
-        0x00C1, 0x00C4, 0x00C7, 0x00CA,
-        0x00CD, 0x00CF, 0x00D2, 0x00D4,
-        0x00D6, 0x00D8, 0x00DA, 0x00DC, /* 48 */
-        0x00DE,
-};
-
-/**** Helper functions to access the device Internal Lookup Tables ****/
-
-void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val)
-{
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset);
-                mmiowb();
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, val);
-        } else {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset);
-                mmiowb();
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA1, val);
-        }
-}
-
-void bcm43xx_ilt_write32(struct bcm43xx_private *bcm, u16 offset, u32 val)
-{
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset);
-                mmiowb();
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA2, (val & 0xFFFF0000) >> 16);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, val & 0x0000FFFF);
-        } else {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset);
-                mmiowb();
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA2, (val & 0xFFFF0000) >> 16);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA1, val & 0x0000FFFF);
-        }
-}
-
-u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset)
-{
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset);
-                return bcm43xx_phy_read(bcm, BCM43xx_PHY_ILT_A_DATA1);
-        } else {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset);
-                return bcm43xx_phy_read(bcm, BCM43xx_PHY_ILT_G_DATA1);
-        }
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h
deleted file mode 100644
index d7eaf5f25b7f..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef BCM43xx_ILT_H_
-#define BCM43xx_ILT_H_
-
-#define BCM43xx_ILT_ROTOR_SIZE          53
-extern const u32 bcm43xx_ilt_rotor[BCM43xx_ILT_ROTOR_SIZE];
-#define BCM43xx_ILT_RETARD_SIZE         53
-extern const u32 bcm43xx_ilt_retard[BCM43xx_ILT_RETARD_SIZE];
-#define BCM43xx_ILT_FINEFREQA_SIZE      256
-extern const u16 bcm43xx_ilt_finefreqa[BCM43xx_ILT_FINEFREQA_SIZE];
-#define BCM43xx_ILT_FINEFREQG_SIZE      256
-extern const u16 bcm43xx_ilt_finefreqg[BCM43xx_ILT_FINEFREQG_SIZE];
-#define BCM43xx_ILT_NOISEA2_SIZE        8
-extern const u16 bcm43xx_ilt_noisea2[BCM43xx_ILT_NOISEA2_SIZE];
-#define BCM43xx_ILT_NOISEA3_SIZE        8
-extern const u16 bcm43xx_ilt_noisea3[BCM43xx_ILT_NOISEA3_SIZE];
-#define BCM43xx_ILT_NOISEG1_SIZE        8
-extern const u16 bcm43xx_ilt_noiseg1[BCM43xx_ILT_NOISEG1_SIZE];
-#define BCM43xx_ILT_NOISEG2_SIZE        8
-extern const u16 bcm43xx_ilt_noiseg2[BCM43xx_ILT_NOISEG2_SIZE];
-#define BCM43xx_ILT_NOISESCALEG_SIZE    27
-extern const u16 bcm43xx_ilt_noisescaleg1[BCM43xx_ILT_NOISESCALEG_SIZE];
-extern const u16 bcm43xx_ilt_noisescaleg2[BCM43xx_ILT_NOISESCALEG_SIZE];
-extern const u16 bcm43xx_ilt_noisescaleg3[BCM43xx_ILT_NOISESCALEG_SIZE];
-#define BCM43xx_ILT_SIGMASQR_SIZE       53
-extern const u16 bcm43xx_ilt_sigmasqr1[BCM43xx_ILT_SIGMASQR_SIZE];
-extern const u16 bcm43xx_ilt_sigmasqr2[BCM43xx_ILT_SIGMASQR_SIZE];
-
-
-void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val);
-void bcm43xx_ilt_write32(struct bcm43xx_private *bcm, u16 offset, u32 val);
-u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset);
-
-#endif /* BCM43xx_ILT_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
deleted file mode 100644
index cb51dc51cce6..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include "bcm43xx_leds.h"
-#include "bcm43xx_radio.h"
-#include "bcm43xx.h"
-
-#include <linux/bitops.h>
-
-
-static void bcm43xx_led_changestate(struct bcm43xx_led *led)
-{
-        struct bcm43xx_private *bcm = led->bcm;
-        const int index = bcm43xx_led_index(led);
-        const u16 mask = (1 << index);
-        u16 ledctl;
-
-        assert(index >= 0 && index < BCM43xx_NR_LEDS);
-        assert(led->blink_interval);
-        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
-        ledctl = (ledctl & mask) ? (ledctl & ~mask) : (ledctl | mask);
-        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
-}
-
-static void bcm43xx_led_blink(unsigned long d)
-{
-        struct bcm43xx_led *led = (struct bcm43xx_led *)d;
-        struct bcm43xx_private *bcm = led->bcm;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bcm->leds_lock, flags);
-        if (led->blink_interval) {
-                bcm43xx_led_changestate(led);
-                mod_timer(&led->blink_timer, jiffies + led->blink_interval);
-        }
-        spin_unlock_irqrestore(&bcm->leds_lock, flags);
-}
-
-static void bcm43xx_led_blink_start(struct bcm43xx_led *led,
-                                    unsigned long interval)
-{
-        if (led->blink_interval)
-                return;
-        led->blink_interval = interval;
-        bcm43xx_led_changestate(led);
-        led->blink_timer.expires = jiffies + interval;
-        add_timer(&led->blink_timer);
-}
-
-static void bcm43xx_led_blink_stop(struct bcm43xx_led *led, int sync)
-{
-        struct bcm43xx_private *bcm = led->bcm;
-        const int index = bcm43xx_led_index(led);
-        u16 ledctl;
-
-        if (!led->blink_interval)
-                return;
-        if (unlikely(sync))
-                del_timer_sync(&led->blink_timer);
-        else
-                del_timer(&led->blink_timer);
-        led->blink_interval = 0;
-
-        /* Make sure the LED is turned off. */
-        assert(index >= 0 && index < BCM43xx_NR_LEDS);
-        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
-        if (led->activelow)
-                ledctl |= (1 << index);
-        else
-                ledctl &= ~(1 << index);
-        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
-}
-
-static void bcm43xx_led_init_hardcoded(struct bcm43xx_private *bcm,
-                                       struct bcm43xx_led *led,
-                                       int led_index)
-{
-        /* This function is called, if the behaviour (and activelow)
-         * information for a LED is missing in the SPROM.
-         * We hardcode the behaviour values for various devices here.
-         * Note that the BCM43xx_LED_TEST_XXX behaviour values can
-         * be used to figure out which led is mapped to which index.
-         */
-
-        switch (led_index) {
-        case 0:
-                led->behaviour = BCM43xx_LED_ACTIVITY;
-                led->activelow = 1;
-                if (bcm->board_vendor == PCI_VENDOR_ID_COMPAQ)
-                        led->behaviour = BCM43xx_LED_RADIO_ALL;
-                break;
-        case 1:
-                led->behaviour = BCM43xx_LED_RADIO_B;
-                if (bcm->board_vendor == PCI_VENDOR_ID_ASUSTEK)
-                        led->behaviour = BCM43xx_LED_ASSOC;
-                break;
-        case 2:
-                led->behaviour = BCM43xx_LED_RADIO_A;
-                break;
-        case 3:
-                led->behaviour = BCM43xx_LED_OFF;
-                break;
-        default:
-                assert(0);
-        }
-}
-
-int bcm43xx_leds_init(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_led *led;
-        u8 sprom[4];
-        int i;
-
-        sprom[0] = bcm->sprom.wl0gpio0;
-        sprom[1] = bcm->sprom.wl0gpio1;
-        sprom[2] = bcm->sprom.wl0gpio2;
-        sprom[3] = bcm->sprom.wl0gpio3;
-
-        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
-                led = &(bcm->leds[i]);
-                led->bcm = bcm;
-                setup_timer(&led->blink_timer,
-                            bcm43xx_led_blink,
-                            (unsigned long)led);
-
-                if (sprom[i] == 0xFF) {
-                        bcm43xx_led_init_hardcoded(bcm, led, i);
-                } else {
-                        led->behaviour = sprom[i] & BCM43xx_LED_BEHAVIOUR;
-                        led->activelow = !!(sprom[i] & BCM43xx_LED_ACTIVELOW);
-                }
-        }
-
-        return 0;
-}
-
-void bcm43xx_leds_exit(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_led *led;
-        int i;
-
-        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
-                led = &(bcm->leds[i]);
-                bcm43xx_led_blink_stop(led, 1);
-        }
-        bcm43xx_leds_switch_all(bcm, 0);
-}
-
-void bcm43xx_leds_update(struct bcm43xx_private *bcm, int activity)
-{
-        struct bcm43xx_led *led;
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        const int transferring = (jiffies - bcm->stats.last_tx) < BCM43xx_LED_XFER_THRES;
-        int i, turn_on;
-        unsigned long interval = 0;
-        u16 ledctl;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bcm->leds_lock, flags);
-        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
-        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
-                led = &(bcm->leds[i]);
-
-                turn_on = 0;
-                switch (led->behaviour) {
-                case BCM43xx_LED_INACTIVE:
-                        continue;
-                case BCM43xx_LED_OFF:
-                case BCM43xx_LED_BCM4303_3:
-                        break;
-                case BCM43xx_LED_ON:
-                        turn_on = 1;
-                        break;
-                case BCM43xx_LED_ACTIVITY:
-                case BCM43xx_LED_BCM4303_0:
-                        turn_on = activity;
-                        break;
-                case BCM43xx_LED_RADIO_ALL:
-                        turn_on = radio->enabled && bcm43xx_is_hw_radio_enabled(bcm);
-                        break;
-                case BCM43xx_LED_RADIO_A:
-                case BCM43xx_LED_BCM4303_2:
-                        turn_on = (radio->enabled && bcm43xx_is_hw_radio_enabled(bcm) &&
-                                   phy->type == BCM43xx_PHYTYPE_A);
-                        break;
-                case BCM43xx_LED_RADIO_B:
-                case BCM43xx_LED_BCM4303_1:
-                        turn_on = (radio->enabled && bcm43xx_is_hw_radio_enabled(bcm) &&
-                                   (phy->type == BCM43xx_PHYTYPE_B ||
-                                    phy->type == BCM43xx_PHYTYPE_G));
-                        break;
-                case BCM43xx_LED_MODE_BG:
-                        if (phy->type == BCM43xx_PHYTYPE_G && bcm43xx_is_hw_radio_enabled(bcm) &&
-                            1/*FIXME: using G rates.*/)
-                                turn_on = 1;
-                        break;
-                case BCM43xx_LED_TRANSFER:
-                        if (transferring)
-                                bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_MEDIUM);
-                        else
-                                bcm43xx_led_blink_stop(led, 0);
-                        continue;
-                case BCM43xx_LED_APTRANSFER:
-                        if (bcm->ieee->iw_mode == IW_MODE_MASTER) {
-                                if (transferring) {
-                                        interval = BCM43xx_LEDBLINK_FAST;
-                                        turn_on = 1;
-                                }
-                        } else {
-                                turn_on = 1;
-                                if (0/*TODO: not assoc*/)
-                                        interval = BCM43xx_LEDBLINK_SLOW;
-                                else if (transferring)
-                                        interval = BCM43xx_LEDBLINK_FAST;
-                                else
-                                        turn_on = 0;
-                        }
-                        if (turn_on)
-                                bcm43xx_led_blink_start(led, interval);
-                        else
-                                bcm43xx_led_blink_stop(led, 0);
-                        continue;
-                case BCM43xx_LED_WEIRD:
-                        //TODO
-                        break;
-                case BCM43xx_LED_ASSOC:
-                        if (bcm->softmac->associnfo.associated)
-                                turn_on = 1;
-                        break;
-#ifdef CONFIG_BCM43XX_DEBUG
-                case BCM43xx_LED_TEST_BLINKSLOW:
-                        bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_SLOW);
-                        continue;
-                case BCM43xx_LED_TEST_BLINKMEDIUM:
-                        bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_MEDIUM);
-                        continue;
-                case BCM43xx_LED_TEST_BLINKFAST:
-                        bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_FAST);
-                        continue;
-#endif /* CONFIG_BCM43XX_DEBUG */
-                default:
-                        dprintkl(KERN_INFO PFX "Bad value in leds_update,"
-                                " led->behaviour: 0x%x\n", led->behaviour);
-                };
-
-                if (led->activelow)
-                        turn_on = !turn_on;
-                if (turn_on)
-                        ledctl |= (1 << i);
-                else
-                        ledctl &= ~(1 << i);
-        }
-        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
-        spin_unlock_irqrestore(&bcm->leds_lock, flags);
-}
-
-void bcm43xx_leds_switch_all(struct bcm43xx_private *bcm, int on)
-{
-        struct bcm43xx_led *led;
-        u16 ledctl;
-        int i;
-        int bit_on;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bcm->leds_lock, flags);
-        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
-        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
-                led = &(bcm->leds[i]);
-                if (led->behaviour == BCM43xx_LED_INACTIVE)
-                        continue;
-                if (on)
-                        bit_on = led->activelow ? 0 : 1;
-                else
-                        bit_on = led->activelow ? 1 : 0;
-                if (bit_on)
-                        ledctl |= (1 << i);
-                else
-                        ledctl &= ~(1 << i);
-        }
-        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
-        spin_unlock_irqrestore(&bcm->leds_lock, flags);
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.h b/drivers/net/wireless/bcm43xx/bcm43xx_leds.h
deleted file mode 100644
index 811e14a81198..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_leds.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef BCM43xx_LEDS_H_
-#define BCM43xx_LEDS_H_
-
-#include <linux/types.h>
-#include <linux/timer.h>
-
-
-struct bcm43xx_led {
-        u8 behaviour:7;
-        u8 activelow:1;
-
-        struct bcm43xx_private *bcm;
-        struct timer_list blink_timer;
-        unsigned long blink_interval;
-};
-#define bcm43xx_led_index(led)  ((int)((led) - (led)->bcm->leds))
-
-/* Delay between state changes when blinking in jiffies */
-#define BCM43xx_LEDBLINK_SLOW           (HZ / 1)
-#define BCM43xx_LEDBLINK_MEDIUM         (HZ / 4)
-#define BCM43xx_LEDBLINK_FAST           (HZ / 8)
-
-#define BCM43xx_LED_XFER_THRES          (HZ / 100)
-
-#define BCM43xx_LED_BEHAVIOUR           0x7F
-#define BCM43xx_LED_ACTIVELOW           0x80
-enum { /* LED behaviour values */
-        BCM43xx_LED_OFF,
-        BCM43xx_LED_ON,
-        BCM43xx_LED_ACTIVITY,
-        BCM43xx_LED_RADIO_ALL,
-        BCM43xx_LED_RADIO_A,
-        BCM43xx_LED_RADIO_B,
-        BCM43xx_LED_MODE_BG,
-        BCM43xx_LED_TRANSFER,
-        BCM43xx_LED_APTRANSFER,
-        BCM43xx_LED_WEIRD,//FIXME
-        BCM43xx_LED_ASSOC,
-        BCM43xx_LED_INACTIVE,
-
-        /* Behaviour values for testing.
-         * With these values it is easier to figure out
-         * the real behaviour of leds, in case the SPROM
-         * is missing information.
-         */
-        BCM43xx_LED_TEST_BLINKSLOW,
-        BCM43xx_LED_TEST_BLINKMEDIUM,
-        BCM43xx_LED_TEST_BLINKFAST,
-
-        /* Misc values for BCM4303 */
-        BCM43xx_LED_BCM4303_0 = 0x2B,
-        BCM43xx_LED_BCM4303_1 = 0x78,
-        BCM43xx_LED_BCM4303_2 = 0x2E,
-        BCM43xx_LED_BCM4303_3 = 0x19,
-};
-
-int bcm43xx_leds_init(struct bcm43xx_private *bcm);
-void bcm43xx_leds_exit(struct bcm43xx_private *bcm);
-void bcm43xx_leds_update(struct bcm43xx_private *bcm, int activity);
-void bcm43xx_leds_switch_all(struct bcm43xx_private *bcm, int on);
-
-#endif /* BCM43xx_LEDS_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
deleted file mode 100644
index b96a325b6ec8..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ /dev/null
@@ -1,4281 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include <linux/if_arp.h>
-#include <linux/etherdevice.h>
-#include <linux/version.h>
-#include <linux/firmware.h>
-#include <linux/wireless.h>
-#include <linux/workqueue.h>
-#include <linux/skbuff.h>
-#include <linux/dma-mapping.h>
-#include <net/iw_handler.h>
-
-#include "bcm43xx.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_debugfs.h"
-#include "bcm43xx_radio.h"
-#include "bcm43xx_phy.h"
-#include "bcm43xx_dma.h"
-#include "bcm43xx_pio.h"
-#include "bcm43xx_power.h"
-#include "bcm43xx_wx.h"
-#include "bcm43xx_ethtool.h"
-#include "bcm43xx_xmit.h"
-#include "bcm43xx_sysfs.h"
-
-
-MODULE_DESCRIPTION("Broadcom BCM43xx wireless driver");
-MODULE_AUTHOR("Martin Langer");
-MODULE_AUTHOR("Stefano Brivio");
-MODULE_AUTHOR("Michael Buesch");
-MODULE_LICENSE("GPL");
-
-#if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO)
-static int modparam_pio;
-module_param_named(pio, modparam_pio, int, 0444);
-MODULE_PARM_DESC(pio, "enable(1) / disable(0) PIO mode");
-#elif defined(CONFIG_BCM43XX_DMA)
-# define modparam_pio   0
-#elif defined(CONFIG_BCM43XX_PIO)
-# define modparam_pio   1
-#endif
-
-static int modparam_bad_frames_preempt;
-module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
-MODULE_PARM_DESC(bad_frames_preempt, "enable(1) / disable(0) Bad Frames Preemption");
-
-static int modparam_short_retry = BCM43xx_DEFAULT_SHORT_RETRY_LIMIT;
-module_param_named(short_retry, modparam_short_retry, int, 0444);
-MODULE_PARM_DESC(short_retry, "Short-Retry-Limit (0 - 15)");
-
-static int modparam_long_retry = BCM43xx_DEFAULT_LONG_RETRY_LIMIT;
-module_param_named(long_retry, modparam_long_retry, int, 0444);
-MODULE_PARM_DESC(long_retry, "Long-Retry-Limit (0 - 15)");
-
-static int modparam_locale = -1;
-module_param_named(locale, modparam_locale, int, 0444);
-MODULE_PARM_DESC(country, "Select LocaleCode 0-11 (For travelers)");
-
-static int modparam_noleds;
-module_param_named(noleds, modparam_noleds, int, 0444);
-MODULE_PARM_DESC(noleds, "Turn off all LED activity");
-
-static char modparam_fwpostfix[64];
-module_param_string(fwpostfix, modparam_fwpostfix, 64, 0444);
-MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for using multiple firmware image versions.");
-
-
-/* If you want to debug with just a single device, enable this,
- * where the string is the pci device ID (as given by the kernel's
- * pci_name function) of the device to be used.
- */
-//#define DEBUG_SINGLE_DEVICE_ONLY      "0001:11:00.0"
-
-/* If you want to enable printing of each MMIO access, enable this. */
-//#define DEBUG_ENABLE_MMIO_PRINT
-
-/* If you want to enable printing of MMIO access within
- * ucode/pcm upload, initvals write, enable this.
- */
-//#define DEBUG_ENABLE_UCODE_MMIO_PRINT
-
-/* If you want to enable printing of PCI Config Space access, enable this */
-//#define DEBUG_ENABLE_PCILOG
-
-
-/* Detailed list maintained at:
- * http://openfacts.berlios.de/index-en.phtml?title=Bcm43xxDevices
- */
-        static struct pci_device_id bcm43xx_pci_tbl[] = {
-        /* Broadcom 4303 802.11b */
-        { PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4307 802.11b */
-        { PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4311 802.11(a)/b/g */
-        { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4312 802.11a/b/g */
-        { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4318 802.11b/g */
-        { PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4319 802.11a/b/g */
-        { PCI_VENDOR_ID_BROADCOM, 0x4319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4306 802.11b/g */
-        { PCI_VENDOR_ID_BROADCOM, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4306 802.11a */
-//      { PCI_VENDOR_ID_BROADCOM, 0x4321, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 4309 802.11a/b/g */
-        { PCI_VENDOR_ID_BROADCOM, 0x4324, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        /* Broadcom 43XG 802.11b/g */
-        { PCI_VENDOR_ID_BROADCOM, 0x4325, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { 0 },
-};
-MODULE_DEVICE_TABLE(pci, bcm43xx_pci_tbl);
-
-static void bcm43xx_ram_write(struct bcm43xx_private *bcm, u16 offset, u32 val)
-{
-        u32 status;
-
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        if (!(status & BCM43xx_SBF_XFER_REG_BYTESWAP))
-                val = swab32(val);
-
-        bcm43xx_write32(bcm, BCM43xx_MMIO_RAM_CONTROL, offset);
-        mmiowb();
-        bcm43xx_write32(bcm, BCM43xx_MMIO_RAM_DATA, val);
-}
-
-static inline
-void bcm43xx_shm_control_word(struct bcm43xx_private *bcm,
-                              u16 routing, u16 offset)
-{
-        u32 control;
-
-        /* "offset" is the WORD offset. */
-
-        control = routing;
-        control <<= 16;
-        control |= offset;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_CONTROL, control);
-}
-
-u32 bcm43xx_shm_read32(struct bcm43xx_private *bcm,
-                       u16 routing, u16 offset)
-{
-        u32 ret;
-
-        if (routing == BCM43xx_SHM_SHARED) {
-                if (offset & 0x0003) {
-                        /* Unaligned access */
-                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
-                        ret = bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED);
-                        ret <<= 16;
-                        bcm43xx_shm_control_word(bcm, routing, (offset >> 2) + 1);
-                        ret |= bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA);
-
-                        return ret;
-                }
-                offset >>= 2;
-        }
-        bcm43xx_shm_control_word(bcm, routing, offset);
-        ret = bcm43xx_read32(bcm, BCM43xx_MMIO_SHM_DATA);
-
-        return ret;
-}
-
-u16 bcm43xx_shm_read16(struct bcm43xx_private *bcm,
-                       u16 routing, u16 offset)
-{
-        u16 ret;
-
-        if (routing == BCM43xx_SHM_SHARED) {
-                if (offset & 0x0003) {
-                        /* Unaligned access */
-                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
-                        ret = bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED);
-
-                        return ret;
-                }
-                offset >>= 2;
-        }
-        bcm43xx_shm_control_word(bcm, routing, offset);
-        ret = bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA);
-
-        return ret;
-}
-
-void bcm43xx_shm_write32(struct bcm43xx_private *bcm,
-                         u16 routing, u16 offset,
-                         u32 value)
-{
-        if (routing == BCM43xx_SHM_SHARED) {
-                if (offset & 0x0003) {
-                        /* Unaligned access */
-                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
-                        mmiowb();
-                        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED,
-                                        (value >> 16) & 0xffff);
-                        mmiowb();
-                        bcm43xx_shm_control_word(bcm, routing, (offset >> 2) + 1);
-                        mmiowb();
-                        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA,
-                                        value & 0xffff);
-                        return;
-                }
-                offset >>= 2;
-        }
-        bcm43xx_shm_control_word(bcm, routing, offset);
-        mmiowb();
-        bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA, value);
-}
-
-void bcm43xx_shm_write16(struct bcm43xx_private *bcm,
-                         u16 routing, u16 offset,
-                         u16 value)
-{
-        if (routing == BCM43xx_SHM_SHARED) {
-                if (offset & 0x0003) {
-                        /* Unaligned access */
-                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
-                        mmiowb();
-                        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED,
-                                        value);
-                        return;
-                }
-                offset >>= 2;
-        }
-        bcm43xx_shm_control_word(bcm, routing, offset);
-        mmiowb();
-        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA, value);
-}
-
-void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf)
-{
-        /* We need to be careful. As we read the TSF from multiple
-         * registers, we should take care of register overflows.
-         * In theory, the whole tsf read process should be atomic.
-         * We try to be atomic here, by restaring the read process,
-         * if any of the high registers changed (overflew).
-         */
-        if (bcm->current_core->rev >= 3) {
-                u32 low, high, high2;
-
-                do {
-                        high = bcm43xx_read32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_HIGH);
-                        low = bcm43xx_read32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_LOW);
-                        high2 = bcm43xx_read32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_HIGH);
-                } while (unlikely(high != high2));
-
-                *tsf = high;
-                *tsf <<= 32;
-                *tsf |= low;
-        } else {
-                u64 tmp;
-                u16 v0, v1, v2, v3;
-                u16 test1, test2, test3;
-
-                do {
-                        v3 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_3);
-                        v2 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_2);
-                        v1 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_1);
-                        v0 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_0);
-
-                        test3 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_3);
-                        test2 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_2);
-                        test1 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_1);
-                } while (v3 != test3 || v2 != test2 || v1 != test1);
-
-                *tsf = v3;
-                *tsf <<= 48;
-                tmp = v2;
-                tmp <<= 32;
-                *tsf |= tmp;
-                tmp = v1;
-                tmp <<= 16;
-                *tsf |= tmp;
-                *tsf |= v0;
-        }
-}
-
-void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf)
-{
-        u32 status;
-
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        status |= BCM43xx_SBF_TIME_UPDATE;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
-        mmiowb();
-
-        /* Be careful with the in-progress timer.
-         * First zero out the low register, so we have a full
-         * register-overflow duration to complete the operation.
-         */
-        if (bcm->current_core->rev >= 3) {
-                u32 lo = (tsf & 0x00000000FFFFFFFFULL);
-                u32 hi = (tsf & 0xFFFFFFFF00000000ULL) >> 32;
-
-                bcm43xx_write32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_LOW, 0);
-                mmiowb();
-                bcm43xx_write32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_HIGH, hi);
-                mmiowb();
-                bcm43xx_write32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_LOW, lo);
-        } else {
-                u16 v0 = (tsf & 0x000000000000FFFFULL);
-                u16 v1 = (tsf & 0x00000000FFFF0000ULL) >> 16;
-                u16 v2 = (tsf & 0x0000FFFF00000000ULL) >> 32;
-                u16 v3 = (tsf & 0xFFFF000000000000ULL) >> 48;
-
-                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_0, 0);
-                mmiowb();
-                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_3, v3);
-                mmiowb();
-                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_2, v2);
-                mmiowb();
-                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_1, v1);
-                mmiowb();
-                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_0, v0);
-        }
-
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        status &= ~BCM43xx_SBF_TIME_UPDATE;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
-}
-
-static
-void bcm43xx_macfilter_set(struct bcm43xx_private *bcm,
-                           u16 offset,
-                           const u8 *mac)
-{
-        u16 data;
-
-        offset |= 0x0020;
-        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_CONTROL, offset);
-
-        data = mac[0];
-        data |= mac[1] << 8;
-        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_DATA, data);
-        data = mac[2];
-        data |= mac[3] << 8;
-        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_DATA, data);
-        data = mac[4];
-        data |= mac[5] << 8;
-        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_DATA, data);
-}
-
-static void bcm43xx_macfilter_clear(struct bcm43xx_private *bcm,
-                                    u16 offset)
-{
-        const u8 zero_addr[ETH_ALEN] = { 0 };
-
-        bcm43xx_macfilter_set(bcm, offset, zero_addr);
-}
-
-static void bcm43xx_write_mac_bssid_templates(struct bcm43xx_private *bcm)
-{
-        const u8 *mac = (const u8 *)(bcm->net_dev->dev_addr);
-        const u8 *bssid = (const u8 *)(bcm->ieee->bssid);
-        u8 mac_bssid[ETH_ALEN * 2];
-        int i;
-
-        memcpy(mac_bssid, mac, ETH_ALEN);
-        memcpy(mac_bssid + ETH_ALEN, bssid, ETH_ALEN);
-
-        /* Write our MAC address and BSSID to template ram */
-        for (i = 0; i < ARRAY_SIZE(mac_bssid); i += sizeof(u32))
-                bcm43xx_ram_write(bcm, 0x20 + i, *((u32 *)(mac_bssid + i)));
-        for (i = 0; i < ARRAY_SIZE(mac_bssid); i += sizeof(u32))
-                bcm43xx_ram_write(bcm, 0x78 + i, *((u32 *)(mac_bssid + i)));
-        for (i = 0; i < ARRAY_SIZE(mac_bssid); i += sizeof(u32))
-                bcm43xx_ram_write(bcm, 0x478 + i, *((u32 *)(mac_bssid + i)));
-}
-
-//FIXME: Well, we should probably call them from somewhere.
-#if 0
-static void bcm43xx_set_slot_time(struct bcm43xx_private *bcm, u16 slot_time)
-{
-        /* slot_time is in usec. */
-        if (bcm43xx_current_phy(bcm)->type != BCM43xx_PHYTYPE_G)
-                return;
-        bcm43xx_write16(bcm, 0x684, 510 + slot_time);
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0010, slot_time);
-}
-
-static void bcm43xx_short_slot_timing_enable(struct bcm43xx_private *bcm)
-{
-        bcm43xx_set_slot_time(bcm, 9);
-}
-
-static void bcm43xx_short_slot_timing_disable(struct bcm43xx_private *bcm)
-{
-        bcm43xx_set_slot_time(bcm, 20);
-}
-#endif
-
-/* FIXME: To get the MAC-filter working, we need to implement the
- *        following functions (and rename them :)
- */
-#if 0
-static void bcm43xx_disassociate(struct bcm43xx_private *bcm)
-{
-        bcm43xx_mac_suspend(bcm);
-        bcm43xx_macfilter_clear(bcm, BCM43xx_MACFILTER_ASSOC);
-
-        bcm43xx_ram_write(bcm, 0x0026, 0x0000);
-        bcm43xx_ram_write(bcm, 0x0028, 0x0000);
-        bcm43xx_ram_write(bcm, 0x007E, 0x0000);
-        bcm43xx_ram_write(bcm, 0x0080, 0x0000);
-        bcm43xx_ram_write(bcm, 0x047E, 0x0000);
-        bcm43xx_ram_write(bcm, 0x0480, 0x0000);
-
-        if (bcm->current_core->rev < 3) {
-                bcm43xx_write16(bcm, 0x0610, 0x8000);
-                bcm43xx_write16(bcm, 0x060E, 0x0000);
-        } else
-                bcm43xx_write32(bcm, 0x0188, 0x80000000);
-
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0004, 0x000003ff);
-
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_G &&
-            ieee80211_is_ofdm_rate(bcm->softmac->txrates.default_rate))
-                bcm43xx_short_slot_timing_enable(bcm);
-
-        bcm43xx_mac_enable(bcm);
-}
-
-static void bcm43xx_associate(struct bcm43xx_private *bcm,
-                              const u8 *mac)
-{
-        memcpy(bcm->ieee->bssid, mac, ETH_ALEN);
-
-        bcm43xx_mac_suspend(bcm);
-        bcm43xx_macfilter_set(bcm, BCM43xx_MACFILTER_ASSOC, mac);
-        bcm43xx_write_mac_bssid_templates(bcm);
-        bcm43xx_mac_enable(bcm);
-}
-#endif
-
-/* Enable a Generic IRQ. "mask" is the mask of which IRQs to enable.
- * Returns the _previously_ enabled IRQ mask.
- */
-static inline u32 bcm43xx_interrupt_enable(struct bcm43xx_private *bcm, u32 mask)
-{
-        u32 old_mask;
-
-        old_mask = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK, old_mask | mask);
-
-        return old_mask;
-}
-
-/* Disable a Generic IRQ. "mask" is the mask of which IRQs to disable.
- * Returns the _previously_ enabled IRQ mask.
- */
-static inline u32 bcm43xx_interrupt_disable(struct bcm43xx_private *bcm, u32 mask)
-{
-        u32 old_mask;
-
-        old_mask = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK, old_mask & ~mask);
-
-        return old_mask;
-}
-
-/* Synchronize IRQ top- and bottom-half.
- * IRQs must be masked before calling this.
- * This must not be called with the irq_lock held.
- */
-static void bcm43xx_synchronize_irq(struct bcm43xx_private *bcm)
-{
-        synchronize_irq(bcm->irq);
-        tasklet_disable(&bcm->isr_tasklet);
-}
-
-/* Make sure we don't receive more data from the device. */
-static int bcm43xx_disable_interrupts_sync(struct bcm43xx_private *bcm)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (unlikely(bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)) {
-                spin_unlock_irqrestore(&bcm->irq_lock, flags);
-                return -EBUSY;
-        }
-        bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-        bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK); /* flush */
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        bcm43xx_synchronize_irq(bcm);
-
-        return 0;
-}
-
-static int bcm43xx_read_radioinfo(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u32 radio_id;
-        u16 manufact;
-        u16 version;
-        u8 revision;
-
-        if (bcm->chip_id == 0x4317) {
-                if (bcm->chip_rev == 0x00)
-                        radio_id = 0x3205017F;
-                else if (bcm->chip_rev == 0x01)
-                        radio_id = 0x4205017F;
-                else
-                        radio_id = 0x5205017F;
-        } else {
-                bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, BCM43xx_RADIOCTL_ID);
-                radio_id = bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_DATA_HIGH);
-                radio_id <<= 16;
-                bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, BCM43xx_RADIOCTL_ID);
-                radio_id |= bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW);
-        }
-
-        manufact = (radio_id & 0x00000FFF);
-        version = (radio_id & 0x0FFFF000) >> 12;
-        revision = (radio_id & 0xF0000000) >> 28;
-
-        dprintk(KERN_INFO PFX "Detected Radio: ID: %x (Manuf: %x Ver: %x Rev: %x)\n",
-                radio_id, manufact, version, revision);
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A:
-                if ((version != 0x2060) || (revision != 1) || (manufact != 0x17f))
-                        goto err_unsupported_radio;
-                break;
-        case BCM43xx_PHYTYPE_B:
-                if ((version & 0xFFF0) != 0x2050)
-                        goto err_unsupported_radio;
-                break;
-        case BCM43xx_PHYTYPE_G:
-                if (version != 0x2050)
-                        goto err_unsupported_radio;
-                break;
-        }
-
-        radio->manufact = manufact;
-        radio->version = version;
-        radio->revision = revision;
-
-        if (phy->type == BCM43xx_PHYTYPE_A)
-                radio->txpower_desired = bcm->sprom.maxpower_aphy;
-        else
-                radio->txpower_desired = bcm->sprom.maxpower_bgphy;
-
-        return 0;
-
-err_unsupported_radio:
-        printk(KERN_ERR PFX "Unsupported Radio connected to the PHY!\n");
-        return -ENODEV;
-}
-
-static const char * bcm43xx_locale_iso(u8 locale)
-{
-        /* ISO 3166-1 country codes.
-         * Note that there aren't ISO 3166-1 codes for
-         * all or locales. (Not all locales are countries)
-         */
-        switch (locale) {
-        case BCM43xx_LOCALE_WORLD:
-        case BCM43xx_LOCALE_ALL:
-                return "XX";
-        case BCM43xx_LOCALE_THAILAND:
-                return "TH";
-        case BCM43xx_LOCALE_ISRAEL:
-                return "IL";
-        case BCM43xx_LOCALE_JORDAN:
-                return "JO";
-        case BCM43xx_LOCALE_CHINA:
-                return "CN";
-        case BCM43xx_LOCALE_JAPAN:
-        case BCM43xx_LOCALE_JAPAN_HIGH:
-                return "JP";
-        case BCM43xx_LOCALE_USA_CANADA_ANZ:
-        case BCM43xx_LOCALE_USA_LOW:
-                return "US";
-        case BCM43xx_LOCALE_EUROPE:
-                return "EU";
-        case BCM43xx_LOCALE_NONE:
-                return "  ";
-        }
-        assert(0);
-        return "  ";
-}
-
-static const char * bcm43xx_locale_string(u8 locale)
-{
-        switch (locale) {
-        case BCM43xx_LOCALE_WORLD:
-                return "World";
-        case BCM43xx_LOCALE_THAILAND:
-                return "Thailand";
-        case BCM43xx_LOCALE_ISRAEL:
-                return "Israel";
-        case BCM43xx_LOCALE_JORDAN:
-                return "Jordan";
-        case BCM43xx_LOCALE_CHINA:
-                return "China";
-        case BCM43xx_LOCALE_JAPAN:
-                return "Japan";
-        case BCM43xx_LOCALE_USA_CANADA_ANZ:
-                return "USA/Canada/ANZ";
-        case BCM43xx_LOCALE_EUROPE:
-                return "Europe";
-        case BCM43xx_LOCALE_USA_LOW:
-                return "USAlow";
-        case BCM43xx_LOCALE_JAPAN_HIGH:
-                return "JapanHigh";
-        case BCM43xx_LOCALE_ALL:
-                return "All";
-        case BCM43xx_LOCALE_NONE:
-                return "None";
-        }
-        assert(0);
-        return "";
-}
-
-static inline u8 bcm43xx_crc8(u8 crc, u8 data)
-{
-        static const u8 t[] = {
-                0x00, 0xF7, 0xB9, 0x4E, 0x25, 0xD2, 0x9C, 0x6B,
-                0x4A, 0xBD, 0xF3, 0x04, 0x6F, 0x98, 0xD6, 0x21,
-                0x94, 0x63, 0x2D, 0xDA, 0xB1, 0x46, 0x08, 0xFF,
-                0xDE, 0x29, 0x67, 0x90, 0xFB, 0x0C, 0x42, 0xB5,
-                0x7F, 0x88, 0xC6, 0x31, 0x5A, 0xAD, 0xE3, 0x14,
-                0x35, 0xC2, 0x8C, 0x7B, 0x10, 0xE7, 0xA9, 0x5E,
-                0xEB, 0x1C, 0x52, 0xA5, 0xCE, 0x39, 0x77, 0x80,
-                0xA1, 0x56, 0x18, 0xEF, 0x84, 0x73, 0x3D, 0xCA,
-                0xFE, 0x09, 0x47, 0xB0, 0xDB, 0x2C, 0x62, 0x95,
-                0xB4, 0x43, 0x0D, 0xFA, 0x91, 0x66, 0x28, 0xDF,
-                0x6A, 0x9D, 0xD3, 0x24, 0x4F, 0xB8, 0xF6, 0x01,
-                0x20, 0xD7, 0x99, 0x6E, 0x05, 0xF2, 0xBC, 0x4B,
-                0x81, 0x76, 0x38, 0xCF, 0xA4, 0x53, 0x1D, 0xEA,
-                0xCB, 0x3C, 0x72, 0x85, 0xEE, 0x19, 0x57, 0xA0,
-                0x15, 0xE2, 0xAC, 0x5B, 0x30, 0xC7, 0x89, 0x7E,
-                0x5F, 0xA8, 0xE6, 0x11, 0x7A, 0x8D, 0xC3, 0x34,
-                0xAB, 0x5C, 0x12, 0xE5, 0x8E, 0x79, 0x37, 0xC0,
-                0xE1, 0x16, 0x58, 0xAF, 0xC4, 0x33, 0x7D, 0x8A,
-                0x3F, 0xC8, 0x86, 0x71, 0x1A, 0xED, 0xA3, 0x54,
-                0x75, 0x82, 0xCC, 0x3B, 0x50, 0xA7, 0xE9, 0x1E,
-                0xD4, 0x23, 0x6D, 0x9A, 0xF1, 0x06, 0x48, 0xBF,
-                0x9E, 0x69, 0x27, 0xD0, 0xBB, 0x4C, 0x02, 0xF5,
-                0x40, 0xB7, 0xF9, 0x0E, 0x65, 0x92, 0xDC, 0x2B,
-                0x0A, 0xFD, 0xB3, 0x44, 0x2F, 0xD8, 0x96, 0x61,
-                0x55, 0xA2, 0xEC, 0x1B, 0x70, 0x87, 0xC9, 0x3E,
-                0x1F, 0xE8, 0xA6, 0x51, 0x3A, 0xCD, 0x83, 0x74,
-                0xC1, 0x36, 0x78, 0x8F, 0xE4, 0x13, 0x5D, 0xAA,
-                0x8B, 0x7C, 0x32, 0xC5, 0xAE, 0x59, 0x17, 0xE0,
-                0x2A, 0xDD, 0x93, 0x64, 0x0F, 0xF8, 0xB6, 0x41,
-                0x60, 0x97, 0xD9, 0x2E, 0x45, 0xB2, 0xFC, 0x0B,
-                0xBE, 0x49, 0x07, 0xF0, 0x9B, 0x6C, 0x22, 0xD5,
-                0xF4, 0x03, 0x4D, 0xBA, 0xD1, 0x26, 0x68, 0x9F,
-        };
-        return t[crc ^ data];
-}
-
-static u8 bcm43xx_sprom_crc(const u16 *sprom)
-{
-        int word;
-        u8 crc = 0xFF;
-
-        for (word = 0; word < BCM43xx_SPROM_SIZE - 1; word++) {
-                crc = bcm43xx_crc8(crc, sprom[word] & 0x00FF);
-                crc = bcm43xx_crc8(crc, (sprom[word] & 0xFF00) >> 8);
-        }
-        crc = bcm43xx_crc8(crc, sprom[BCM43xx_SPROM_VERSION] & 0x00FF);
-        crc ^= 0xFF;
-
-        return crc;
-}
-
-int bcm43xx_sprom_read(struct bcm43xx_private *bcm, u16 *sprom)
-{
-        int i;
-        u8 crc, expected_crc;
-
-        for (i = 0; i < BCM43xx_SPROM_SIZE; i++)
-                sprom[i] = bcm43xx_read16(bcm, BCM43xx_SPROM_BASE + (i * 2));
-        /* CRC-8 check. */
-        crc = bcm43xx_sprom_crc(sprom);
-        expected_crc = (sprom[BCM43xx_SPROM_VERSION] & 0xFF00) >> 8;
-        if (crc != expected_crc) {
-                printk(KERN_WARNING PFX "WARNING: Invalid SPROM checksum "
-                                        "(0x%02X, expected: 0x%02X)\n",
-                       crc, expected_crc);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-int bcm43xx_sprom_write(struct bcm43xx_private *bcm, const u16 *sprom)
-{
-        int i, err;
-        u8 crc, expected_crc;
-        u32 spromctl;
-
-        /* CRC-8 validation of the input data. */
-        crc = bcm43xx_sprom_crc(sprom);
-        expected_crc = (sprom[BCM43xx_SPROM_VERSION] & 0xFF00) >> 8;
-        if (crc != expected_crc) {
-                printk(KERN_ERR PFX "SPROM input data: Invalid CRC\n");
-                return -EINVAL;
-        }
-
-        printk(KERN_INFO PFX "Writing SPROM. Do NOT turn off the power! Please stand by...\n");
-        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCICFG_SPROMCTL, &spromctl);
-        if (err)
-                goto err_ctlreg;
-        spromctl |= 0x10; /* SPROM WRITE enable. */
-        err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);
-        if (err)
-                goto err_ctlreg;
-        /* We must burn lots of CPU cycles here, but that does not
-         * really matter as one does not write the SPROM every other minute...
-         */
-        printk(KERN_INFO PFX "[ 0%%");
-        mdelay(500);
-        for (i = 0; i < BCM43xx_SPROM_SIZE; i++) {
-                if (i == 16)
-                        printk("25%%");
-                else if (i == 32)
-                        printk("50%%");
-                else if (i == 48)
-                        printk("75%%");
-                else if (i % 2)
-                        printk(".");
-                bcm43xx_write16(bcm, BCM43xx_SPROM_BASE + (i * 2), sprom[i]);
-                mmiowb();
-                mdelay(20);
-        }
-        spromctl &= ~0x10; /* SPROM WRITE enable. */
-        err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);
-        if (err)
-                goto err_ctlreg;
-        mdelay(500);
-        printk("100%% ]\n");
-        printk(KERN_INFO PFX "SPROM written.\n");
-        bcm43xx_controller_restart(bcm, "SPROM update");
-
-        return 0;
-err_ctlreg:
-        printk(KERN_ERR PFX "Could not access SPROM control register.\n");
-        return -ENODEV;
-}
-
-static int bcm43xx_sprom_extract(struct bcm43xx_private *bcm)
-{
-        u16 value;
-        u16 *sprom;
-
-        sprom = kzalloc(BCM43xx_SPROM_SIZE * sizeof(u16),
-                        GFP_KERNEL);
-        if (!sprom) {
-                printk(KERN_ERR PFX "sprom_extract OOM\n");
-                return -ENOMEM;
-        }
-        bcm43xx_sprom_read(bcm, sprom);
-
-        /* boardflags2 */
-        value = sprom[BCM43xx_SPROM_BOARDFLAGS2];
-        bcm->sprom.boardflags2 = value;
-
-        /* il0macaddr */
-        value = sprom[BCM43xx_SPROM_IL0MACADDR + 0];
-        *(((__be16 *)bcm->sprom.il0macaddr) + 0) = cpu_to_be16(value);
-        value = sprom[BCM43xx_SPROM_IL0MACADDR + 1];
-        *(((__be16 *)bcm->sprom.il0macaddr) + 1) = cpu_to_be16(value);
-        value = sprom[BCM43xx_SPROM_IL0MACADDR + 2];
-        *(((__be16 *)bcm->sprom.il0macaddr) + 2) = cpu_to_be16(value);
-
-        /* et0macaddr */
-        value = sprom[BCM43xx_SPROM_ET0MACADDR + 0];
-        *(((__be16 *)bcm->sprom.et0macaddr) + 0) = cpu_to_be16(value);
-        value = sprom[BCM43xx_SPROM_ET0MACADDR + 1];
-        *(((__be16 *)bcm->sprom.et0macaddr) + 1) = cpu_to_be16(value);
-        value = sprom[BCM43xx_SPROM_ET0MACADDR + 2];
-        *(((__be16 *)bcm->sprom.et0macaddr) + 2) = cpu_to_be16(value);
-
-        /* et1macaddr */
-        value = sprom[BCM43xx_SPROM_ET1MACADDR + 0];
-        *(((__be16 *)bcm->sprom.et1macaddr) + 0) = cpu_to_be16(value);
-        value = sprom[BCM43xx_SPROM_ET1MACADDR + 1];
-        *(((__be16 *)bcm->sprom.et1macaddr) + 1) = cpu_to_be16(value);
-        value = sprom[BCM43xx_SPROM_ET1MACADDR + 2];
-        *(((__be16 *)bcm->sprom.et1macaddr) + 2) = cpu_to_be16(value);
-
-        /* ethernet phy settings */
-        value = sprom[BCM43xx_SPROM_ETHPHY];
-        bcm->sprom.et0phyaddr = (value & 0x001F);
-        bcm->sprom.et1phyaddr = (value & 0x03E0) >> 5;
-
-        /* boardrev, antennas, locale */
-        value = sprom[BCM43xx_SPROM_BOARDREV];
-        bcm->sprom.boardrev = (value & 0x00FF);
-        bcm->sprom.locale = (value & 0x0F00) >> 8;
-        bcm->sprom.antennas_aphy = (value & 0x3000) >> 12;
-        bcm->sprom.antennas_bgphy = (value & 0xC000) >> 14;
-        if (modparam_locale != -1) {
-                if (modparam_locale >= 0 && modparam_locale <= 11) {
-                        bcm->sprom.locale = modparam_locale;
-                        printk(KERN_WARNING PFX "Operating with modified "
-                                                "LocaleCode %u (%s)\n",
-                               bcm->sprom.locale,
-                               bcm43xx_locale_string(bcm->sprom.locale));
-                } else {
-                        printk(KERN_WARNING PFX "Module parameter \"locale\" "
-                                                "invalid value. (0 - 11)\n");
-                }
-        }
-
-        /* pa0b* */
-        value = sprom[BCM43xx_SPROM_PA0B0];
-        bcm->sprom.pa0b0 = value;
-        value = sprom[BCM43xx_SPROM_PA0B1];
-        bcm->sprom.pa0b1 = value;
-        value = sprom[BCM43xx_SPROM_PA0B2];
-        bcm->sprom.pa0b2 = value;
-
-        /* wl0gpio* */
-        value = sprom[BCM43xx_SPROM_WL0GPIO0];
-        if (value == 0x0000)
-                value = 0xFFFF;
-        bcm->sprom.wl0gpio0 = value & 0x00FF;
-        bcm->sprom.wl0gpio1 = (value & 0xFF00) >> 8;
-        value = sprom[BCM43xx_SPROM_WL0GPIO2];
-        if (value == 0x0000)
-                value = 0xFFFF;
-        bcm->sprom.wl0gpio2 = value & 0x00FF;
-        bcm->sprom.wl0gpio3 = (value & 0xFF00) >> 8;
-
-        /* maxpower */
-        value = sprom[BCM43xx_SPROM_MAXPWR];
-        bcm->sprom.maxpower_aphy = (value & 0xFF00) >> 8;
-        bcm->sprom.maxpower_bgphy = value & 0x00FF;
-
-        /* pa1b* */
-        value = sprom[BCM43xx_SPROM_PA1B0];
-        bcm->sprom.pa1b0 = value;
-        value = sprom[BCM43xx_SPROM_PA1B1];
-        bcm->sprom.pa1b1 = value;
-        value = sprom[BCM43xx_SPROM_PA1B2];
-        bcm->sprom.pa1b2 = value;
-
-        /* idle tssi target */
-        value = sprom[BCM43xx_SPROM_IDL_TSSI_TGT];
-        bcm->sprom.idle_tssi_tgt_aphy = value & 0x00FF;
-        bcm->sprom.idle_tssi_tgt_bgphy = (value & 0xFF00) >> 8;
-
-        /* boardflags */
-        value = sprom[BCM43xx_SPROM_BOARDFLAGS];
-        if (value == 0xFFFF)
-                value = 0x0000;
-        bcm->sprom.boardflags = value;
-        /* boardflags workarounds */
-        if (bcm->board_vendor == PCI_VENDOR_ID_DELL &&
-            bcm->chip_id == 0x4301 &&
-            bcm->board_revision == 0x74)
-                bcm->sprom.boardflags |= BCM43xx_BFL_BTCOEXIST;
-        if (bcm->board_vendor == PCI_VENDOR_ID_APPLE &&
-            bcm->board_type == 0x4E &&
-            bcm->board_revision > 0x40)
-                bcm->sprom.boardflags |= BCM43xx_BFL_PACTRL;
-
-        /* antenna gain */
-        value = sprom[BCM43xx_SPROM_ANTENNA_GAIN];
-        if (value == 0x0000 || value == 0xFFFF)
-                value = 0x0202;
-        /* convert values to Q5.2 */
-        bcm->sprom.antennagain_aphy = ((value & 0xFF00) >> 8) * 4;
-        bcm->sprom.antennagain_bgphy = (value & 0x00FF) * 4;
-
-        kfree(sprom);
-
-        return 0;
-}
-
-static int bcm43xx_geo_init(struct bcm43xx_private *bcm)
-{
-        struct ieee80211_geo *geo;
-        struct ieee80211_channel *chan;
-        int have_a = 0, have_bg = 0;
-        int i;
-        u8 channel;
-        struct bcm43xx_phyinfo *phy;
-        const char *iso_country;
-        u8 max_bg_channel;
-
-        geo = kzalloc(sizeof(*geo), GFP_KERNEL);
-        if (!geo)
-                return -ENOMEM;
-
-        for (i = 0; i < bcm->nr_80211_available; i++) {
-                phy = &(bcm->core_80211_ext[i].phy);
-                switch (phy->type) {
-                case BCM43xx_PHYTYPE_B:
-                case BCM43xx_PHYTYPE_G:
-                        have_bg = 1;
-                        break;
-                case BCM43xx_PHYTYPE_A:
-                        have_a = 1;
-                        break;
-                default:
-                        assert(0);
-                }
-        }
-        iso_country = bcm43xx_locale_iso(bcm->sprom.locale);
-
-/* set the maximum channel based on locale set in sprom or witle locale option */
-        switch (bcm->sprom.locale) {
-        case BCM43xx_LOCALE_THAILAND:
-        case BCM43xx_LOCALE_ISRAEL:
-        case BCM43xx_LOCALE_JORDAN:
-        case BCM43xx_LOCALE_USA_CANADA_ANZ:
-        case BCM43xx_LOCALE_USA_LOW:
-                max_bg_channel = 11;
-                break;
-        case BCM43xx_LOCALE_JAPAN:
-        case BCM43xx_LOCALE_JAPAN_HIGH:
-                max_bg_channel = 14;
-                break;
-        default:
-                max_bg_channel = 13;
-        }
-
-        if (have_a) {
-                for (i = 0, channel = IEEE80211_52GHZ_MIN_CHANNEL;
-                      channel <= IEEE80211_52GHZ_MAX_CHANNEL; channel++) {
-                        chan = &geo->a[i++];
-                        chan->freq = bcm43xx_channel_to_freq_a(channel);
-                        chan->channel = channel;
-                }
-                geo->a_channels = i;
-        }
-        if (have_bg) {
-                for (i = 0, channel = IEEE80211_24GHZ_MIN_CHANNEL;
-                      channel <= max_bg_channel; channel++) {
-                        chan = &geo->bg[i++];
-                        chan->freq = bcm43xx_channel_to_freq_bg(channel);
-                        chan->channel = channel;
-                }
-                geo->bg_channels = i;
-        }
-        memcpy(geo->name, iso_country, 2);
-        if (0 /*TODO: Outdoor use only */)
-                geo->name[2] = 'O';
-        else if (0 /*TODO: Indoor use only */)
-                geo->name[2] = 'I';
-        else
-                geo->name[2] = ' ';
-        geo->name[3] = '\0';
-
-        ieee80211_set_geo(bcm->ieee, geo);
-        kfree(geo);
-
-        return 0;
-}
-
-/* DummyTransmission function, as documented on 
- * http://bcm-specs.sipsolutions.net/DummyTransmission
- */
-void bcm43xx_dummy_transmission(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        unsigned int i, max_loop;
-        u16 value = 0;
-        u32 buffer[5] = {
-                0x00000000,
-                0x0000D400,
-                0x00000000,
-                0x00000001,
-                0x00000000,
-        };
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A:
-                max_loop = 0x1E;
-                buffer[0] = 0xCC010200;
-                break;
-        case BCM43xx_PHYTYPE_B:
-        case BCM43xx_PHYTYPE_G:
-                max_loop = 0xFA;
-                buffer[0] = 0x6E840B00; 
-                break;
-        default:
-                assert(0);
-                return;
-        }
-
-        for (i = 0; i < 5; i++)
-                bcm43xx_ram_write(bcm, i * 4, buffer[i]);
-
-        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* dummy read */
-
-        bcm43xx_write16(bcm, 0x0568, 0x0000);
-        bcm43xx_write16(bcm, 0x07C0, 0x0000);
-        bcm43xx_write16(bcm, 0x050C, ((phy->type == BCM43xx_PHYTYPE_A) ? 1 : 0));
-        bcm43xx_write16(bcm, 0x0508, 0x0000);
-        bcm43xx_write16(bcm, 0x050A, 0x0000);
-        bcm43xx_write16(bcm, 0x054C, 0x0000);
-        bcm43xx_write16(bcm, 0x056A, 0x0014);
-        bcm43xx_write16(bcm, 0x0568, 0x0826);
-        bcm43xx_write16(bcm, 0x0500, 0x0000);
-        bcm43xx_write16(bcm, 0x0502, 0x0030);
-
-        if (radio->version == 0x2050 && radio->revision <= 0x5)
-                bcm43xx_radio_write16(bcm, 0x0051, 0x0017);
-        for (i = 0x00; i < max_loop; i++) {
-                value = bcm43xx_read16(bcm, 0x050E);
-                if (value & 0x0080)
-                        break;
-                udelay(10);
-        }
-        for (i = 0x00; i < 0x0A; i++) {
-                value = bcm43xx_read16(bcm, 0x050E);
-                if (value & 0x0400)
-                        break;
-                udelay(10);
-        }
-        for (i = 0x00; i < 0x0A; i++) {
-                value = bcm43xx_read16(bcm, 0x0690);
-                if (!(value & 0x0100))
-                        break;
-                udelay(10);
-        }
-        if (radio->version == 0x2050 && radio->revision <= 0x5)
-                bcm43xx_radio_write16(bcm, 0x0051, 0x0037);
-}
-
-static void key_write(struct bcm43xx_private *bcm,
-                      u8 index, u8 algorithm, const __le16 *key)
-{
-        unsigned int i, basic_wep = 0;
-        u32 offset;
-        u16 value;
- 
-        /* Write associated key information */
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x100 + (index * 2),
-                            ((index << 4) | (algorithm & 0x0F)));
- 
-        /* The first 4 WEP keys need extra love */
-        if (((algorithm == BCM43xx_SEC_ALGO_WEP) ||
-            (algorithm == BCM43xx_SEC_ALGO_WEP104)) && (index < 4))
-                basic_wep = 1;
- 
-        /* Write key payload, 8 little endian words */
-        offset = bcm->security_offset + (index * BCM43xx_SEC_KEYSIZE);
-        for (i = 0; i < (BCM43xx_SEC_KEYSIZE / sizeof(u16)); i++) {
-                value = le16_to_cpu(key[i]);
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
-                                    offset + (i * 2), value);
- 
-                if (!basic_wep)
-                        continue;
- 
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
-                                    offset + (i * 2) + 4 * BCM43xx_SEC_KEYSIZE,
-                                    value);
-        }
-}
-
-static void keymac_write(struct bcm43xx_private *bcm,
-                         u8 index, const __be32 *addr)
-{
-        /* for keys 0-3 there is no associated mac address */
-        if (index < 4)
-                return;
-
-        index -= 4;
-        if (bcm->current_core->rev >= 5) {
-                bcm43xx_shm_write32(bcm,
-                                    BCM43xx_SHM_HWMAC,
-                                    index * 2,
-                                    be32_to_cpu(*addr));
-                bcm43xx_shm_write16(bcm,
-                                    BCM43xx_SHM_HWMAC,
-                                    (index * 2) + 1,
-                                    be16_to_cpu(*((__be16 *)(addr + 1))));
-        } else {
-                if (index < 8) {
-                        TODO(); /* Put them in the macaddress filter */
-                } else {
-                        TODO();
-                        /* Put them BCM43xx_SHM_SHARED, stating index 0x0120.
-                           Keep in mind to update the count of keymacs in 0x003E as well! */
-                }
-        }
-}
-
-static int bcm43xx_key_write(struct bcm43xx_private *bcm,
-                             u8 index, u8 algorithm,
-                             const u8 *_key, int key_len,
-                             const u8 *mac_addr)
-{
-        u8 key[BCM43xx_SEC_KEYSIZE] = { 0 };
-
-        if (index >= ARRAY_SIZE(bcm->key))
-                return -EINVAL;
-        if (key_len > ARRAY_SIZE(key))
-                return -EINVAL;
-        if (algorithm < 1 || algorithm > 5)
-                return -EINVAL;
-
-        memcpy(key, _key, key_len);
-        key_write(bcm, index, algorithm, (const __le16 *)key);
-        keymac_write(bcm, index, (const __be32 *)mac_addr);
-
-        bcm->key[index].algorithm = algorithm;
-
-        return 0;
-}
-
-static void bcm43xx_clear_keys(struct bcm43xx_private *bcm)
-{
-        static const __be32 zero_mac[2] = { 0 };
-        unsigned int i,j, nr_keys = 54;
-        u16 offset;
-
-        if (bcm->current_core->rev < 5)
-                nr_keys = 16;
-        assert(nr_keys <= ARRAY_SIZE(bcm->key));
-
-        for (i = 0; i < nr_keys; i++) {
-                bcm->key[i].enabled = 0;
-                /* returns for i < 4 immediately */
-                keymac_write(bcm, i, zero_mac);
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
-                                    0x100 + (i * 2), 0x0000);
-                for (j = 0; j < 8; j++) {
-                        offset = bcm->security_offset + (j * 4) + (i * BCM43xx_SEC_KEYSIZE);
-                        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
-                                            offset, 0x0000);
-                }
-        }
-        dprintk(KERN_INFO PFX "Keys cleared\n");
-}
-
-/* Lowlevel core-switch function. This is only to be used in
- * bcm43xx_switch_core() and bcm43xx_probe_cores()
- */
-static int _switch_core(struct bcm43xx_private *bcm, int core)
-{
-        int err;
-        int attempts = 0;
-        u32 current_core;
-
-        assert(core >= 0);
-        while (1) {
-                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_ACTIVE_CORE,
-                                                 (core * 0x1000) + 0x18000000);
-                if (unlikely(err))
-                        goto error;
-                err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCICFG_ACTIVE_CORE,
-                                                &current_core);
-                if (unlikely(err))
-                        goto error;
-                current_core = (current_core - 0x18000000) / 0x1000;
-                if (current_core == core)
-                        break;
-
-                if (unlikely(attempts++ > BCM43xx_SWITCH_CORE_MAX_RETRIES))
-                        goto error;
-                udelay(10);
-        }
-
-        return 0;
-error:
-        printk(KERN_ERR PFX "Failed to switch to core %d\n", core);
-        return -ENODEV;
-}
-
-int bcm43xx_switch_core(struct bcm43xx_private *bcm, struct bcm43xx_coreinfo *new_core)
-{
-        int err;
-
-        if (unlikely(!new_core))
-                return 0;
-        if (!new_core->available)
-                return -ENODEV;
-        if (bcm->current_core == new_core)
-                return 0;
-        err = _switch_core(bcm, new_core->index);
-        if (unlikely(err))
-                goto out;
-
-        bcm->current_core = new_core;
-out:
-        return err;
-}
-
-static int bcm43xx_core_enabled(struct bcm43xx_private *bcm)
-{
-        u32 value;
-
-        value = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-        value &= BCM43xx_SBTMSTATELOW_CLOCK | BCM43xx_SBTMSTATELOW_RESET
-                 | BCM43xx_SBTMSTATELOW_REJECT;
-
-        return (value == BCM43xx_SBTMSTATELOW_CLOCK);
-}
-
-/* disable current core */
-static int bcm43xx_core_disable(struct bcm43xx_private *bcm, u32 core_flags)
-{
-        u32 sbtmstatelow;
-        u32 sbtmstatehigh;
-        int i;
-
-        /* fetch sbtmstatelow from core information registers */
-        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-
-        /* core is already in reset */
-        if (sbtmstatelow & BCM43xx_SBTMSTATELOW_RESET)
-                goto out;
-
-        if (sbtmstatelow & BCM43xx_SBTMSTATELOW_CLOCK) {
-                sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK |
-                               BCM43xx_SBTMSTATELOW_REJECT;
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-
-                for (i = 0; i < 1000; i++) {
-                        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-                        if (sbtmstatelow & BCM43xx_SBTMSTATELOW_REJECT) {
-                                i = -1;
-                                break;
-                        }
-                        udelay(10);
-                }
-                if (i != -1) {
-                        printk(KERN_ERR PFX "Error: core_disable() REJECT timeout!\n");
-                        return -EBUSY;
-                }
-
-                for (i = 0; i < 1000; i++) {
-                        sbtmstatehigh = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
-                        if (!(sbtmstatehigh & BCM43xx_SBTMSTATEHIGH_BUSY)) {
-                                i = -1;
-                                break;
-                        }
-                        udelay(10);
-                }
-                if (i != -1) {
-                        printk(KERN_ERR PFX "Error: core_disable() BUSY timeout!\n");
-                        return -EBUSY;
-                }
-
-                sbtmstatelow = BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK |
-                               BCM43xx_SBTMSTATELOW_REJECT |
-                               BCM43xx_SBTMSTATELOW_RESET |
-                               BCM43xx_SBTMSTATELOW_CLOCK |
-                               core_flags;
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-                udelay(10);
-        }
-
-        sbtmstatelow = BCM43xx_SBTMSTATELOW_RESET |
-                       BCM43xx_SBTMSTATELOW_REJECT |
-                       core_flags;
-        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-
-out:
-        bcm->current_core->enabled = 0;
-
-        return 0;
-}
-
-/* enable (reset) current core */
-static int bcm43xx_core_enable(struct bcm43xx_private *bcm, u32 core_flags)
-{
-        u32 sbtmstatelow;
-        u32 sbtmstatehigh;
-        u32 sbimstate;
-        int err;
-
-        err = bcm43xx_core_disable(bcm, core_flags);
-        if (err)
-                goto out;
-
-        sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK |
-                       BCM43xx_SBTMSTATELOW_RESET |
-                       BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK |
-                       core_flags;
-        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-        udelay(1);
-
-        sbtmstatehigh = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
-        if (sbtmstatehigh & BCM43xx_SBTMSTATEHIGH_SERROR) {
-                sbtmstatehigh = 0x00000000;
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATEHIGH, sbtmstatehigh);
-        }
-
-        sbimstate = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMSTATE);
-        if (sbimstate & (BCM43xx_SBIMSTATE_IB_ERROR | BCM43xx_SBIMSTATE_TIMEOUT)) {
-                sbimstate &= ~(BCM43xx_SBIMSTATE_IB_ERROR | BCM43xx_SBIMSTATE_TIMEOUT);
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBIMSTATE, sbimstate);
-        }
-
-        sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK |
-                       BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK |
-                       core_flags;
-        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-        udelay(1);
-
-        sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK | core_flags;
-        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-        udelay(1);
-
-        bcm->current_core->enabled = 1;
-        assert(err == 0);
-out:
-        return err;
-}
-
-/* http://bcm-specs.sipsolutions.net/80211CoreReset */
-void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy)
-{
-        u32 flags = 0x00040000;
-
-        if ((bcm43xx_core_enabled(bcm)) &&
-            !bcm43xx_using_pio(bcm)) {
-        }
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_SHUTTINGDOWN) {
-                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
-                                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
-                                & ~(BCM43xx_SBF_MAC_ENABLED | 0x00000002));
-        } else {
-                if (connect_phy)
-                        flags |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
-                bcm43xx_phy_connect(bcm, connect_phy);
-                bcm43xx_core_enable(bcm, flags);
-                bcm43xx_write16(bcm, 0x03E6, 0x0000);
-                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
-                                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
-                                | BCM43xx_SBF_400);
-        }
-}
-
-static void bcm43xx_wireless_core_disable(struct bcm43xx_private *bcm)
-{
-        bcm43xx_radio_turn_off(bcm);
-        bcm43xx_write16(bcm, 0x03E6, 0x00F4);
-        bcm43xx_core_disable(bcm, 0);
-}
-
-/* Mark the current 80211 core inactive. */
-static void bcm43xx_wireless_core_mark_inactive(struct bcm43xx_private *bcm)
-{
-        u32 sbtmstatelow;
-
-        bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-        bcm43xx_radio_turn_off(bcm);
-        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-        sbtmstatelow &= 0xDFF5FFFF;
-        sbtmstatelow |= 0x000A0000;
-        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-        udelay(1);
-        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-        sbtmstatelow &= 0xFFF5FFFF;
-        sbtmstatelow |= 0x00080000;
-        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-        udelay(1);
-}
-
-static void handle_irq_transmit_status(struct bcm43xx_private *bcm)
-{
-        u32 v0, v1;
-        u16 tmp;
-        struct bcm43xx_xmitstatus stat;
-
-        while (1) {
-                v0 = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_0);
-                if (!v0)
-                        break;
-                v1 = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_1);
-
-                stat.cookie = (v0 >> 16) & 0x0000FFFF;
-                tmp = (u16)((v0 & 0xFFF0) | ((v0 & 0xF) >> 1));
-                stat.flags = tmp & 0xFF;
-                stat.cnt1 = (tmp & 0x0F00) >> 8;
-                stat.cnt2 = (tmp & 0xF000) >> 12;
-                stat.seq = (u16)(v1 & 0xFFFF);
-                stat.unknown = (u16)((v1 >> 16) & 0xFF);
-
-                bcm43xx_debugfs_log_txstat(bcm, &stat);
-
-                if (stat.flags & BCM43xx_TXSTAT_FLAG_AMPDU)
-                        continue;
-                if (stat.flags & BCM43xx_TXSTAT_FLAG_INTER)
-                        continue;
-
-                if (bcm43xx_using_pio(bcm))
-                        bcm43xx_pio_handle_xmitstatus(bcm, &stat);
-                else
-                        bcm43xx_dma_handle_xmitstatus(bcm, &stat);
-        }
-}
-
-static void drain_txstatus_queue(struct bcm43xx_private *bcm)
-{
-        u32 dummy;
-
-        if (bcm->current_core->rev < 5)
-                return;
-        /* Read all entries from the microcode TXstatus FIFO
-         * and throw them away.
-         */
-        while (1) {
-                dummy = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_0);
-                if (!dummy)
-                        break;
-                dummy = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_1);
-        }
-}
-
-static void bcm43xx_generate_noise_sample(struct bcm43xx_private *bcm)
-{
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x408, 0x7F7F);
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x40A, 0x7F7F);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD,
-                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD) | (1 << 4));
-        assert(bcm->noisecalc.core_at_start == bcm->current_core);
-        assert(bcm->noisecalc.channel_at_start == bcm43xx_current_radio(bcm)->channel);
-}
-
-static void bcm43xx_calculate_link_quality(struct bcm43xx_private *bcm)
-{
-        /* Top half of Link Quality calculation. */
-
-        if (bcm->noisecalc.calculation_running)
-                return;
-        bcm->noisecalc.core_at_start = bcm->current_core;
-        bcm->noisecalc.channel_at_start = bcm43xx_current_radio(bcm)->channel;
-        bcm->noisecalc.calculation_running = 1;
-        bcm->noisecalc.nr_samples = 0;
-
-        bcm43xx_generate_noise_sample(bcm);
-}
-
-static void handle_irq_noise(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 tmp;
-        u8 noise[4];
-        u8 i, j;
-        s32 average;
-
-        /* Bottom half of Link Quality calculation. */
-
-        assert(bcm->noisecalc.calculation_running);
-        if (bcm->noisecalc.core_at_start != bcm->current_core ||
-            bcm->noisecalc.channel_at_start != radio->channel)
-                goto drop_calculation;
-        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x408);
-        noise[0] = (tmp & 0x00FF);
-        noise[1] = (tmp & 0xFF00) >> 8;
-        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x40A);
-        noise[2] = (tmp & 0x00FF);
-        noise[3] = (tmp & 0xFF00) >> 8;
-        if (noise[0] == 0x7F || noise[1] == 0x7F ||
-            noise[2] == 0x7F || noise[3] == 0x7F)
-                goto generate_new;
-
-        /* Get the noise samples. */
-        assert(bcm->noisecalc.nr_samples < 8);
-        i = bcm->noisecalc.nr_samples;
-        noise[0] = limit_value(noise[0], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
-        noise[1] = limit_value(noise[1], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
-        noise[2] = limit_value(noise[2], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
-        noise[3] = limit_value(noise[3], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
-        bcm->noisecalc.samples[i][0] = radio->nrssi_lt[noise[0]];
-        bcm->noisecalc.samples[i][1] = radio->nrssi_lt[noise[1]];
-        bcm->noisecalc.samples[i][2] = radio->nrssi_lt[noise[2]];
-        bcm->noisecalc.samples[i][3] = radio->nrssi_lt[noise[3]];
-        bcm->noisecalc.nr_samples++;
-        if (bcm->noisecalc.nr_samples == 8) {
-                /* Calculate the Link Quality by the noise samples. */
-                average = 0;
-                for (i = 0; i < 8; i++) {
-                        for (j = 0; j < 4; j++)
-                                average += bcm->noisecalc.samples[i][j];
-                }
-                average /= (8 * 4);
-                average *= 125;
-                average += 64;
-                average /= 128;
-
-                tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x40C);
-                tmp = (tmp / 128) & 0x1F;
-                if (tmp >= 8)
-                        average += 2;
-                else
-                        average -= 25;
-                if (tmp == 8)
-                        average -= 72;
-                else
-                        average -= 48;
-
-                bcm->stats.noise = average;
-drop_calculation:
-                bcm->noisecalc.calculation_running = 0;
-                return;
-        }
-generate_new:
-        bcm43xx_generate_noise_sample(bcm);
-}
-
-static void handle_irq_ps(struct bcm43xx_private *bcm)
-{
-        if (bcm->ieee->iw_mode == IW_MODE_MASTER) {
-                ///TODO: PS TBTT
-        } else {
-                if (1/*FIXME: the last PSpoll frame was sent successfully */)
-                        bcm43xx_power_saving_ctl_bits(bcm, -1, -1);
-        }
-        if (bcm->ieee->iw_mode == IW_MODE_ADHOC)
-                bcm->reg124_set_0x4 = 1;
-        //FIXME else set to false?
-}
-
-static void handle_irq_reg124(struct bcm43xx_private *bcm)
-{
-        if (!bcm->reg124_set_0x4)
-                return;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD,
-                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD)
-                        | 0x4);
-        //FIXME: reset reg124_set_0x4 to false?
-}
-
-static void handle_irq_pmq(struct bcm43xx_private *bcm)
-{
-        u32 tmp;
-
-        //TODO: AP mode.
-
-        while (1) {
-                tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_PS_STATUS);
-                if (!(tmp & 0x00000008))
-                        break;
-        }
-        /* 16bit write is odd, but correct. */
-        bcm43xx_write16(bcm, BCM43xx_MMIO_PS_STATUS, 0x0002);
-}
-
-static void bcm43xx_generate_beacon_template(struct bcm43xx_private *bcm,
-                                             u16 ram_offset, u16 shm_size_offset)
-{
-        u32 value;
-        u16 size = 0;
-
-        /* Timestamp. */
-        //FIXME: assumption: The chip sets the timestamp
-        value = 0;
-        bcm43xx_ram_write(bcm, ram_offset++, value);
-        bcm43xx_ram_write(bcm, ram_offset++, value);
-        size += 8;
-
-        /* Beacon Interval / Capability Information */
-        value = 0x0000;//FIXME: Which interval?
-        value |= (1 << 0) << 16; /* ESS */
-        value |= (1 << 2) << 16; /* CF Pollable */      //FIXME?
-        value |= (1 << 3) << 16; /* CF Poll Request */  //FIXME?
-        if (!bcm->ieee->open_wep)
-                value |= (1 << 4) << 16; /* Privacy */
-        bcm43xx_ram_write(bcm, ram_offset++, value);
-        size += 4;
-
-        /* SSID */
-        //TODO
-
-        /* FH Parameter Set */
-        //TODO
-
-        /* DS Parameter Set */
-        //TODO
-
-        /* CF Parameter Set */
-        //TODO
-
-        /* TIM */
-        //TODO
-
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, shm_size_offset, size);
-}
-
-static void handle_irq_beacon(struct bcm43xx_private *bcm)
-{
-        u32 status;
-
-        bcm->irq_savedstate &= ~BCM43xx_IRQ_BEACON;
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD);
-
-        if ((status & 0x1) && (status & 0x2)) {
-                /* ACK beacon IRQ. */
-                bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON,
-                                BCM43xx_IRQ_BEACON);
-                bcm->irq_savedstate |= BCM43xx_IRQ_BEACON;
-                return;
-        }
-        if (!(status & 0x1)) {
-                bcm43xx_generate_beacon_template(bcm, 0x68, 0x18);
-                status |= 0x1;
-                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD, status);
-        }
-        if (!(status & 0x2)) {
-                bcm43xx_generate_beacon_template(bcm, 0x468, 0x1A);
-                status |= 0x2;
-                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD, status);
-        }
-}
-
-/* Interrupt handler bottom-half */
-static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)
-{
-        u32 reason;
-        u32 dma_reason[6];
-        u32 merged_dma_reason = 0;
-        int i, activity = 0;
-        unsigned long flags;
-
-#ifdef CONFIG_BCM43XX_DEBUG
-        u32 _handled = 0x00000000;
-# define bcmirq_handled(irq)    do { _handled |= (irq); } while (0)
-#else
-# define bcmirq_handled(irq)    do { /* nothing */ } while (0)
-#endif /* CONFIG_BCM43XX_DEBUG*/
-
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        reason = bcm->irq_reason;
-        for (i = 5; i >= 0; i--) {
-                dma_reason[i] = bcm->dma_reason[i];
-                merged_dma_reason |= dma_reason[i];
-        }
-
-        if (unlikely(reason & BCM43xx_IRQ_XMIT_ERROR)) {
-                /* TX error. We get this when Template Ram is written in wrong endianess
-                 * in dummy_tx(). We also get this if something is wrong with the TX header
-                 * on DMA or PIO queues.
-                 * Maybe we get this in other error conditions, too.
-                 */
-                printkl(KERN_ERR PFX "FATAL ERROR: BCM43xx_IRQ_XMIT_ERROR\n");
-                bcmirq_handled(BCM43xx_IRQ_XMIT_ERROR);
-        }
-        if (unlikely(merged_dma_reason & BCM43xx_DMAIRQ_FATALMASK)) {
-                printkl(KERN_ERR PFX "FATAL ERROR: Fatal DMA error: "
-                                     "0x%08X, 0x%08X, 0x%08X, "
-                                     "0x%08X, 0x%08X, 0x%08X\n",
-                        dma_reason[0], dma_reason[1],
-                        dma_reason[2], dma_reason[3],
-                        dma_reason[4], dma_reason[5]);
-                bcm43xx_controller_restart(bcm, "DMA error");
-                mmiowb();
-                spin_unlock_irqrestore(&bcm->irq_lock, flags);
-                return;
-        }
-        if (unlikely(merged_dma_reason & BCM43xx_DMAIRQ_NONFATALMASK)) {
-                printkl(KERN_ERR PFX "DMA error: "
-                                     "0x%08X, 0x%08X, 0x%08X, "
-                                     "0x%08X, 0x%08X, 0x%08X\n",
-                        dma_reason[0], dma_reason[1],
-                        dma_reason[2], dma_reason[3],
-                        dma_reason[4], dma_reason[5]);
-        }
-
-        if (reason & BCM43xx_IRQ_PS) {
-                handle_irq_ps(bcm);
-                bcmirq_handled(BCM43xx_IRQ_PS);
-        }
-
-        if (reason & BCM43xx_IRQ_REG124) {
-                handle_irq_reg124(bcm);
-                bcmirq_handled(BCM43xx_IRQ_REG124);
-        }
-
-        if (reason & BCM43xx_IRQ_BEACON) {
-                if (bcm->ieee->iw_mode == IW_MODE_MASTER)
-                        handle_irq_beacon(bcm);
-                bcmirq_handled(BCM43xx_IRQ_BEACON);
-        }
-
-        if (reason & BCM43xx_IRQ_PMQ) {
-                handle_irq_pmq(bcm);
-                bcmirq_handled(BCM43xx_IRQ_PMQ);
-        }
-
-        if (reason & BCM43xx_IRQ_SCAN) {
-                /*TODO*/
-                //bcmirq_handled(BCM43xx_IRQ_SCAN);
-        }
-
-        if (reason & BCM43xx_IRQ_NOISE) {
-                handle_irq_noise(bcm);
-                bcmirq_handled(BCM43xx_IRQ_NOISE);
-        }
-
-        /* Check the DMA reason registers for received data. */
-        if (dma_reason[0] & BCM43xx_DMAIRQ_RX_DONE) {
-                if (bcm43xx_using_pio(bcm))
-                        bcm43xx_pio_rx(bcm43xx_current_pio(bcm)->queue0);
-                else
-                        bcm43xx_dma_rx(bcm43xx_current_dma(bcm)->rx_ring0);
-                /* We intentionally don't set "activity" to 1, here. */
-        }
-        assert(!(dma_reason[1] & BCM43xx_DMAIRQ_RX_DONE));
-        assert(!(dma_reason[2] & BCM43xx_DMAIRQ_RX_DONE));
-        if (dma_reason[3] & BCM43xx_DMAIRQ_RX_DONE) {
-                if (bcm43xx_using_pio(bcm))
-                        bcm43xx_pio_rx(bcm43xx_current_pio(bcm)->queue3);
-                else
-                        bcm43xx_dma_rx(bcm43xx_current_dma(bcm)->rx_ring3);
-                activity = 1;
-        }
-        assert(!(dma_reason[4] & BCM43xx_DMAIRQ_RX_DONE));
-        assert(!(dma_reason[5] & BCM43xx_DMAIRQ_RX_DONE));
-        bcmirq_handled(BCM43xx_IRQ_RX);
-
-        if (reason & BCM43xx_IRQ_XMIT_STATUS) {
-                handle_irq_transmit_status(bcm);
-                activity = 1;
-                //TODO: In AP mode, this also causes sending of powersave responses.
-                bcmirq_handled(BCM43xx_IRQ_XMIT_STATUS);
-        }
-
-        /* IRQ_PIO_WORKAROUND is handled in the top-half. */
-        bcmirq_handled(BCM43xx_IRQ_PIO_WORKAROUND);
-#ifdef CONFIG_BCM43XX_DEBUG
-        if (unlikely(reason & ~_handled)) {
-                printkl(KERN_WARNING PFX
-                        "Unhandled IRQ! Reason: 0x%08x,  Unhandled: 0x%08x,  "
-                        "DMA: 0x%08x, 0x%08x, 0x%08x, 0x%08x\n",
-                        reason, (reason & ~_handled),
-                        dma_reason[0], dma_reason[1],
-                        dma_reason[2], dma_reason[3]);
-        }
-#endif
-#undef bcmirq_handled
-
-        if (!modparam_noleds)
-                bcm43xx_leds_update(bcm, activity);
-        bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate);
-        mmiowb();
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-}
-
-static void pio_irq_workaround(struct bcm43xx_private *bcm,
-                               u16 base, int queueidx)
-{
-        u16 rxctl;
-
-        rxctl = bcm43xx_read16(bcm, base + BCM43xx_PIO_RXCTL);
-        if (rxctl & BCM43xx_PIO_RXCTL_DATAAVAILABLE)
-                bcm->dma_reason[queueidx] |= BCM43xx_DMAIRQ_RX_DONE;
-        else
-                bcm->dma_reason[queueidx] &= ~BCM43xx_DMAIRQ_RX_DONE;
-}
-
-static void bcm43xx_interrupt_ack(struct bcm43xx_private *bcm, u32 reason)
-{
-        if (bcm43xx_using_pio(bcm) &&
-            (bcm->current_core->rev < 3) &&
-            (!(reason & BCM43xx_IRQ_PIO_WORKAROUND))) {
-                /* Apply a PIO specific workaround to the dma_reasons */
-                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO1_BASE, 0);
-                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO2_BASE, 1);
-                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO3_BASE, 2);
-                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO4_BASE, 3);
-        }
-
-        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, reason);
-
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA0_REASON,
-                        bcm->dma_reason[0]);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA1_REASON,
-                        bcm->dma_reason[1]);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA2_REASON,
-                        bcm->dma_reason[2]);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA3_REASON,
-                        bcm->dma_reason[3]);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA4_REASON,
-                        bcm->dma_reason[4]);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA5_REASON,
-                        bcm->dma_reason[5]);
-}
-
-/* Interrupt handler top-half */
-static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id)
-{
-        irqreturn_t ret = IRQ_HANDLED;
-        struct bcm43xx_private *bcm = dev_id;
-        u32 reason;
-
-        if (!bcm)
-                return IRQ_NONE;
-
-        spin_lock(&bcm->irq_lock);
-
-        reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
-        if (reason == 0xffffffff) {
-                /* irq not for us (shared irq) */
-                ret = IRQ_NONE;
-                goto out;
-        }
-        reason &= bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK);
-        if (!reason)
-                goto out;
-
-        assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);
-        assert(bcm->current_core->id == BCM43xx_COREID_80211);
-
-        bcm->dma_reason[0] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA0_REASON)
-                             & 0x0001DC00;
-        bcm->dma_reason[1] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA1_REASON)
-                             & 0x0000DC00;
-        bcm->dma_reason[2] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA2_REASON)
-                             & 0x0000DC00;
-        bcm->dma_reason[3] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA3_REASON)
-                             & 0x0001DC00;
-        bcm->dma_reason[4] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA4_REASON)
-                             & 0x0000DC00;
-        bcm->dma_reason[5] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA5_REASON)
-                             & 0x0000DC00;
-
-        bcm43xx_interrupt_ack(bcm, reason);
-
-        /* disable all IRQs. They are enabled again in the bottom half. */
-        bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-        /* save the reason code and call our bottom half. */
-        bcm->irq_reason = reason;
-        tasklet_schedule(&bcm->isr_tasklet);
-
-out:
-        mmiowb();
-        spin_unlock(&bcm->irq_lock);
-
-        return ret;
-}
-
-static void bcm43xx_release_firmware(struct bcm43xx_private *bcm, int force)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        if (bcm->firmware_norelease && !force)
-                return; /* Suspending or controller reset. */
-        release_firmware(phy->ucode);
-        phy->ucode = NULL;
-        release_firmware(phy->pcm);
-        phy->pcm = NULL;
-        release_firmware(phy->initvals0);
-        phy->initvals0 = NULL;
-        release_firmware(phy->initvals1);
-        phy->initvals1 = NULL;
-}
-
-static int bcm43xx_request_firmware(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u8 rev = bcm->current_core->rev;
-        int err = 0;
-        int nr;
-        char buf[22 + sizeof(modparam_fwpostfix) - 1] = { 0 };
-
-        if (!phy->ucode) {
-                snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_microcode%d%s.fw",
-                         (rev >= 5 ? 5 : rev),
-                         modparam_fwpostfix);
-                err = request_firmware(&phy->ucode, buf, &bcm->pci_dev->dev);
-                if (err) {
-                        printk(KERN_ERR PFX 
-                               "Error: Microcode \"%s\" not available or load failed.\n",
-                                buf);
-                        goto error;
-                }
-        }
-
-        if (!phy->pcm) {
-                snprintf(buf, ARRAY_SIZE(buf),
-                         "bcm43xx_pcm%d%s.fw",
-                         (rev < 5 ? 4 : 5),
-                         modparam_fwpostfix);
-                err = request_firmware(&phy->pcm, buf, &bcm->pci_dev->dev);
-                if (err) {
-                        printk(KERN_ERR PFX
-                               "Error: PCM \"%s\" not available or load failed.\n",
-                               buf);
-                        goto error;
-                }
-        }
-
-        if (!phy->initvals0) {
-                if (rev == 2 || rev == 4) {
-                        switch (phy->type) {
-                        case BCM43xx_PHYTYPE_A:
-                                nr = 3;
-                                break;
-                        case BCM43xx_PHYTYPE_B:
-                        case BCM43xx_PHYTYPE_G:
-                                nr = 1;
-                                break;
-                        default:
-                                goto err_noinitval;
-                        }
-                
-                } else if (rev >= 5) {
-                        switch (phy->type) {
-                        case BCM43xx_PHYTYPE_A:
-                                nr = 7;
-                                break;
-                        case BCM43xx_PHYTYPE_B:
-                        case BCM43xx_PHYTYPE_G:
-                                nr = 5;
-                                break;
-                        default:
-                                goto err_noinitval;
-                        }
-                } else
-                        goto err_noinitval;
-                snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_initval%02d%s.fw",
-                         nr, modparam_fwpostfix);
-
-                err = request_firmware(&phy->initvals0, buf, &bcm->pci_dev->dev);
-                if (err) {
-                        printk(KERN_ERR PFX 
-                               "Error: InitVals \"%s\" not available or load failed.\n",
-                                buf);
-                        goto error;
-                }
-                if (phy->initvals0->size % sizeof(struct bcm43xx_initval)) {
-                        printk(KERN_ERR PFX "InitVals fileformat error.\n");
-                        goto error;
-                }
-        }
-
-        if (!phy->initvals1) {
-                if (rev >= 5) {
-                        u32 sbtmstatehigh;
-
-                        switch (phy->type) {
-                        case BCM43xx_PHYTYPE_A:
-                                sbtmstatehigh = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
-                                if (sbtmstatehigh & 0x00010000)
-                                        nr = 9;
-                                else
-                                        nr = 10;
-                                break;
-                        case BCM43xx_PHYTYPE_B:
-                        case BCM43xx_PHYTYPE_G:
-                                        nr = 6;
-                                break;
-                        default:
-                                goto err_noinitval;
-                        }
-                        snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_initval%02d%s.fw",
-                                 nr, modparam_fwpostfix);
-
-                        err = request_firmware(&phy->initvals1, buf, &bcm->pci_dev->dev);
-                        if (err) {
-                                printk(KERN_ERR PFX 
-                                       "Error: InitVals \"%s\" not available or load failed.\n",
-                                        buf);
-                                goto error;
-                        }
-                        if (phy->initvals1->size % sizeof(struct bcm43xx_initval)) {
-                                printk(KERN_ERR PFX "InitVals fileformat error.\n");
-                                goto error;
-                        }
-                }
-        }
-
-out:
-        return err;
-error:
-        bcm43xx_release_firmware(bcm, 1);
-        goto out;
-err_noinitval:
-        printk(KERN_ERR PFX "Error: No InitVals available!\n");
-        err = -ENOENT;
-        goto error;
-}
-
-static void bcm43xx_upload_microcode(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        const __be32 *data;
-        unsigned int i, len;
-
-        /* Upload Microcode. */
-        data = (__be32 *)(phy->ucode->data);
-        len = phy->ucode->size / sizeof(u32);
-        bcm43xx_shm_control_word(bcm, BCM43xx_SHM_UCODE, 0x0000);
-        for (i = 0; i < len; i++) {
-                bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA,
-                                be32_to_cpu(data[i]));
-                udelay(10);
-        }
-
-        /* Upload PCM data. */
-        data = (__be32 *)(phy->pcm->data);
-        len = phy->pcm->size / sizeof(u32);
-        bcm43xx_shm_control_word(bcm, BCM43xx_SHM_PCM, 0x01ea);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA, 0x00004000);
-        bcm43xx_shm_control_word(bcm, BCM43xx_SHM_PCM, 0x01eb);
-        for (i = 0; i < len; i++) {
-                bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA,
-                                be32_to_cpu(data[i]));
-                udelay(10);
-        }
-}
-
-static int bcm43xx_write_initvals(struct bcm43xx_private *bcm,
-                                  const struct bcm43xx_initval *data,
-                                  const unsigned int len)
-{
-        u16 offset, size;
-        u32 value;
-        unsigned int i;
-
-        for (i = 0; i < len; i++) {
-                offset = be16_to_cpu(data[i].offset);
-                size = be16_to_cpu(data[i].size);
-                value = be32_to_cpu(data[i].value);
-
-                if (unlikely(offset >= 0x1000))
-                        goto err_format;
-                if (size == 2) {
-                        if (unlikely(value & 0xFFFF0000))
-                                goto err_format;
-                        bcm43xx_write16(bcm, offset, (u16)value);
-                } else if (size == 4) {
-                        bcm43xx_write32(bcm, offset, value);
-                } else
-                        goto err_format;
-        }
-
-        return 0;
-
-err_format:
-        printk(KERN_ERR PFX "InitVals (bcm43xx_initvalXX.fw) file-format error. "
-                            "Please fix your bcm43xx firmware files.\n");
-        return -EPROTO;
-}
-
-static int bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        int err;
-
-        err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)phy->initvals0->data,
-                                     phy->initvals0->size / sizeof(struct bcm43xx_initval));
-        if (err)
-                goto out;
-        if (phy->initvals1) {
-                err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)phy->initvals1->data,
-                                             phy->initvals1->size / sizeof(struct bcm43xx_initval));
-                if (err)
-                        goto out;
-        }
-out:
-        return err;
-}
-
-static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
-{
-        int err;
-
-        bcm->irq = bcm->pci_dev->irq;
-        err = request_irq(bcm->irq, bcm43xx_interrupt_handler,
-                          IRQF_SHARED, KBUILD_MODNAME, bcm);
-        if (err)
-                printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
-
-        return err;
-}
-
-/* Switch to the core used to write the GPIO register.
- * This is either the ChipCommon, or the PCI core.
- */
-static int switch_to_gpio_core(struct bcm43xx_private *bcm)
-{
-        int err;
-
-        /* Where to find the GPIO register depends on the chipset.
-         * If it has a ChipCommon, its register at offset 0x6c is the GPIO
-         * control register. Otherwise the register at offset 0x6c in the
-         * PCI core is the GPIO control register.
-         */
-        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
-        if (err == -ENODEV) {
-                err = bcm43xx_switch_core(bcm, &bcm->core_pci);
-                if (unlikely(err == -ENODEV)) {
-                        printk(KERN_ERR PFX "gpio error: "
-                               "Neither ChipCommon nor PCI core available!\n");
-                }
-        }
-
-        return err;
-}
-
-/* Initialize the GPIOs
- * http://bcm-specs.sipsolutions.net/GPIO
- */
-static int bcm43xx_gpio_init(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_coreinfo *old_core;
-        int err;
-        u32 mask, set;
-
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
-                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
-                        & 0xFFFF3FFF);
-
-        bcm43xx_leds_switch_all(bcm, 0);
-        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_MASK,
-                        bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_MASK) | 0x000F);
-
-        mask = 0x0000001F;
-        set = 0x0000000F;
-        if (bcm->chip_id == 0x4301) {
-                mask |= 0x0060;
-                set |= 0x0060;
-        }
-        if (0 /* FIXME: conditional unknown */) {
-                bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_MASK,
-                                bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_MASK)
-                                | 0x0100);
-                mask |= 0x0180;
-                set |= 0x0180;
-        }
-        if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) {
-                bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_MASK,
-                                bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_MASK)
-                                | 0x0200);
-                mask |= 0x0200;
-                set |= 0x0200;
-        }
-        if (bcm->current_core->rev >= 2)
-                mask  |= 0x0010; /* FIXME: This is redundant. */
-
-        old_core = bcm->current_core;
-        err = switch_to_gpio_core(bcm);
-        if (err)
-                goto out;
-        bcm43xx_write32(bcm, BCM43xx_GPIO_CONTROL,
-                        (bcm43xx_read32(bcm, BCM43xx_GPIO_CONTROL) & mask) | set);
-        err = bcm43xx_switch_core(bcm, old_core);
-out:
-        return err;
-}
-
-/* Turn off all GPIO stuff. Call this on module unload, for example. */
-static int bcm43xx_gpio_cleanup(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_coreinfo *old_core;
-        int err;
-
-        old_core = bcm->current_core;
-        err = switch_to_gpio_core(bcm);
-        if (err)
-                return err;
-        bcm43xx_write32(bcm, BCM43xx_GPIO_CONTROL, 0x00000000);
-        err = bcm43xx_switch_core(bcm, old_core);
-        assert(err == 0);
-
-        return 0;
-}
-
-/* http://bcm-specs.sipsolutions.net/EnableMac */
-void bcm43xx_mac_enable(struct bcm43xx_private *bcm)
-{
-        bcm->mac_suspended--;
-        assert(bcm->mac_suspended >= 0);
-        if (bcm->mac_suspended == 0) {
-                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
-                                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
-                                | BCM43xx_SBF_MAC_ENABLED);
-                bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, BCM43xx_IRQ_READY);
-                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* dummy read */
-                bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */
-                bcm43xx_power_saving_ctl_bits(bcm, -1, -1);
-        }
-}
-
-/* http://bcm-specs.sipsolutions.net/SuspendMAC */
-void bcm43xx_mac_suspend(struct bcm43xx_private *bcm)
-{
-        int i;
-        u32 tmp;
-
-        assert(bcm->mac_suspended >= 0);
-        if (bcm->mac_suspended == 0) {
-                bcm43xx_power_saving_ctl_bits(bcm, -1, 1);
-                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
-                                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
-                                & ~BCM43xx_SBF_MAC_ENABLED);
-                bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */
-                for (i = 10000; i; i--) {
-                        tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
-                        if (tmp & BCM43xx_IRQ_READY)
-                                goto out;
-                        udelay(1);
-                }
-                printkl(KERN_ERR PFX "MAC suspend failed\n");
-        }
-out:
-        bcm->mac_suspended++;
-}
-
-void bcm43xx_set_iwmode(struct bcm43xx_private *bcm,
-                        int iw_mode)
-{
-        unsigned long flags;
-        struct net_device *net_dev = bcm->net_dev;
-        u32 status;
-        u16 value;
-
-        spin_lock_irqsave(&bcm->ieee->lock, flags);
-        bcm->ieee->iw_mode = iw_mode;
-        spin_unlock_irqrestore(&bcm->ieee->lock, flags);
-        if (iw_mode == IW_MODE_MONITOR)
-                net_dev->type = ARPHRD_IEEE80211;
-        else
-                net_dev->type = ARPHRD_ETHER;
-
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        /* Reset status to infrastructured mode */
-        status &= ~(BCM43xx_SBF_MODE_AP | BCM43xx_SBF_MODE_MONITOR);
-        status &= ~BCM43xx_SBF_MODE_PROMISC;
-        status |= BCM43xx_SBF_MODE_NOTADHOC;
-
-/* FIXME: Always enable promisc mode, until we get the MAC filters working correctly. */
-status |= BCM43xx_SBF_MODE_PROMISC;
-
-        switch (iw_mode) {
-        case IW_MODE_MONITOR:
-                status |= BCM43xx_SBF_MODE_MONITOR;
-                status |= BCM43xx_SBF_MODE_PROMISC;
-                break;
-        case IW_MODE_ADHOC:
-                status &= ~BCM43xx_SBF_MODE_NOTADHOC;
-                break;
-        case IW_MODE_MASTER:
-                status |= BCM43xx_SBF_MODE_AP;
-                break;
-        case IW_MODE_SECOND:
-        case IW_MODE_REPEAT:
-                TODO(); /* TODO */
-                break;
-        case IW_MODE_INFRA:
-                /* nothing to be done here... */
-                break;
-        default:
-                dprintk(KERN_ERR PFX "Unknown mode in set_iwmode: %d\n", iw_mode);
-        }
-        if (net_dev->flags & IFF_PROMISC)
-                status |= BCM43xx_SBF_MODE_PROMISC;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
-
-        value = 0x0002;
-        if (iw_mode != IW_MODE_ADHOC && iw_mode != IW_MODE_MASTER) {
-                if (bcm->chip_id == 0x4306 && bcm->chip_rev == 3)
-                        value = 0x0064;
-                else
-                        value = 0x0032;
-        }
-        bcm43xx_write16(bcm, 0x0612, value);
-}
-
-/* This is the opposite of bcm43xx_chip_init() */
-static void bcm43xx_chip_cleanup(struct bcm43xx_private *bcm)
-{
-        bcm43xx_radio_turn_off(bcm);
-        if (!modparam_noleds)
-                bcm43xx_leds_exit(bcm);
-        bcm43xx_gpio_cleanup(bcm);
-        bcm43xx_release_firmware(bcm, 0);
-}
-
-/* Initialize the chip
- * http://bcm-specs.sipsolutions.net/ChipInit
- */
-static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        int err;
-        int i, tmp;
-        u32 value32;
-        u16 value16;
-
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
-                        BCM43xx_SBF_CORE_READY
-                        | BCM43xx_SBF_400);
-
-        err = bcm43xx_request_firmware(bcm);
-        if (err)
-                goto out;
-        bcm43xx_upload_microcode(bcm);
-
-        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, 0xFFFFFFFF);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, 0x00020402);
-        i = 0;
-        while (1) {
-                value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
-                if (value32 == BCM43xx_IRQ_READY)
-                        break;
-                i++;
-                if (i >= BCM43xx_IRQWAIT_MAX_RETRIES) {
-                        printk(KERN_ERR PFX "IRQ_READY timeout\n");
-                        err = -ENODEV;
-                        goto err_release_fw;
-                }
-                udelay(10);
-        }
-        bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */
-
-        value16 = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                     BCM43xx_UCODE_REVISION);
-
-        dprintk(KERN_INFO PFX "Microcode rev 0x%x, pl 0x%x "
-                "(20%.2i-%.2i-%.2i  %.2i:%.2i:%.2i)\n", value16,
-                bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                   BCM43xx_UCODE_PATCHLEVEL),
-                (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                    BCM43xx_UCODE_DATE) >> 12) & 0xf,
-                (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                    BCM43xx_UCODE_DATE) >> 8) & 0xf,
-                bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                   BCM43xx_UCODE_DATE) & 0xff,
-                (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                   BCM43xx_UCODE_TIME) >> 11) & 0x1f,
-                (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                   BCM43xx_UCODE_TIME) >> 5) & 0x3f,
-                bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                   BCM43xx_UCODE_TIME) & 0x1f);
-
-        if ( value16 > 0x128 ) {
-                printk(KERN_ERR PFX
-                        "Firmware: no support for microcode extracted "
-                        "from version 4.x binary drivers.\n");
-                err = -EOPNOTSUPP;
-                goto err_release_fw;
-        }
-
-        err = bcm43xx_gpio_init(bcm);
-        if (err)
-                goto err_release_fw;
-
-        err = bcm43xx_upload_initvals(bcm);
-        if (err)
-                goto err_gpio_cleanup;
-        bcm43xx_radio_turn_on(bcm);
-        bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
-        printk(KERN_INFO PFX "Radio %s by hardware\n",
-                (bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
-
-        bcm43xx_write16(bcm, 0x03E6, 0x0000);
-        err = bcm43xx_phy_init(bcm);
-        if (err)
-                goto err_radio_off;
-
-        /* Select initial Interference Mitigation. */
-        tmp = radio->interfmode;
-        radio->interfmode = BCM43xx_RADIO_INTERFMODE_NONE;
-        bcm43xx_radio_set_interference_mitigation(bcm, tmp);
-
-        bcm43xx_phy_set_antenna_diversity(bcm);
-        bcm43xx_radio_set_txantenna(bcm, BCM43xx_RADIO_TXANTENNA_DEFAULT);
-        if (phy->type == BCM43xx_PHYTYPE_B) {
-                value16 = bcm43xx_read16(bcm, 0x005E);
-                value16 |= 0x0004;
-                bcm43xx_write16(bcm, 0x005E, value16);
-        }
-        bcm43xx_write32(bcm, 0x0100, 0x01000000);
-        if (bcm->current_core->rev < 5)
-                bcm43xx_write32(bcm, 0x010C, 0x01000000);
-
-        value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        value32 &= ~ BCM43xx_SBF_MODE_NOTADHOC;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32);
-        value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        value32 |= BCM43xx_SBF_MODE_NOTADHOC;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32);
-
-        value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        value32 |= 0x100000;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32);
-
-        if (bcm43xx_using_pio(bcm)) {
-                bcm43xx_write32(bcm, 0x0210, 0x00000100);
-                bcm43xx_write32(bcm, 0x0230, 0x00000100);
-                bcm43xx_write32(bcm, 0x0250, 0x00000100);
-                bcm43xx_write32(bcm, 0x0270, 0x00000100);
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0034, 0x0000);
-        }
-
-        /* Probe Response Timeout value */
-        /* FIXME: Default to 0, has to be set by ioctl probably... :-/ */
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0074, 0x0000);
-
-        /* Initially set the wireless operation mode. */
-        bcm43xx_set_iwmode(bcm, bcm->ieee->iw_mode);
-
-        if (bcm->current_core->rev < 3) {
-                bcm43xx_write16(bcm, 0x060E, 0x0000);
-                bcm43xx_write16(bcm, 0x0610, 0x8000);
-                bcm43xx_write16(bcm, 0x0604, 0x0000);
-                bcm43xx_write16(bcm, 0x0606, 0x0200);
-        } else {
-                bcm43xx_write32(bcm, 0x0188, 0x80000000);
-                bcm43xx_write32(bcm, 0x018C, 0x02000000);
-        }
-        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, 0x00004000);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA0_IRQ_MASK, 0x0001DC00);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA1_IRQ_MASK, 0x0000DC00);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA2_IRQ_MASK, 0x0000DC00);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA3_IRQ_MASK, 0x0001DC00);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA4_IRQ_MASK, 0x0000DC00);
-        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA5_IRQ_MASK, 0x0000DC00);
-
-        value32 = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-        value32 |= 0x00100000;
-        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, value32);
-
-        bcm43xx_write16(bcm, BCM43xx_MMIO_POWERUP_DELAY, bcm43xx_pctl_powerup_delay(bcm));
-
-        assert(err == 0);
-        dprintk(KERN_INFO PFX "Chip initialized\n");
-out:
-        return err;
-
-err_radio_off:
-        bcm43xx_radio_turn_off(bcm);
-err_gpio_cleanup:
-        bcm43xx_gpio_cleanup(bcm);
-err_release_fw:
-        bcm43xx_release_firmware(bcm, 1);
-        goto out;
-}
-        
-/* Validate chip access
- * http://bcm-specs.sipsolutions.net/ValidateChipAccess */
-static int bcm43xx_validate_chip(struct bcm43xx_private *bcm)
-{
-        u32 value;
-        u32 shm_backup;
-
-        shm_backup = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0000);
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED, 0x0000, 0xAA5555AA);
-        if (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0000) != 0xAA5555AA)
-                goto error;
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED, 0x0000, 0x55AAAA55);
-        if (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0000) != 0x55AAAA55)
-                goto error;
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED, 0x0000, shm_backup);
-
-        value = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        if ((value | 0x80000000) != 0x80000400)
-                goto error;
-
-        value = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
-        if (value != 0x00000000)
-                goto error;
-
-        return 0;
-error:
-        printk(KERN_ERR PFX "Failed to validate the chipaccess\n");
-        return -ENODEV;
-}
-
-static void bcm43xx_init_struct_phyinfo(struct bcm43xx_phyinfo *phy)
-{
-        /* Initialize a "phyinfo" structure. The structure is already
-         * zeroed out.
-         * This is called on insmod time to initialize members.
-         */
-        phy->savedpctlreg = 0xFFFF;
-        spin_lock_init(&phy->lock);
-}
-
-static void bcm43xx_init_struct_radioinfo(struct bcm43xx_radioinfo *radio)
-{
-        /* Initialize a "radioinfo" structure. The structure is already
-         * zeroed out.
-         * This is called on insmod time to initialize members.
-         */
-        radio->interfmode = BCM43xx_RADIO_INTERFMODE_NONE;
-        radio->channel = 0xFF;
-        radio->initial_channel = 0xFF;
-}
-
-static int bcm43xx_probe_cores(struct bcm43xx_private *bcm)
-{
-        int err, i;
-        int current_core;
-        u32 core_vendor, core_id, core_rev;
-        u32 sb_id_hi, chip_id_32 = 0;
-        u16 pci_device, chip_id_16;
-        u8 core_count;
-
-        memset(&bcm->core_chipcommon, 0, sizeof(struct bcm43xx_coreinfo));
-        memset(&bcm->core_pci, 0, sizeof(struct bcm43xx_coreinfo));
-        memset(&bcm->core_80211, 0, sizeof(struct bcm43xx_coreinfo)
-                                    * BCM43xx_MAX_80211_CORES);
-        memset(&bcm->core_80211_ext, 0, sizeof(struct bcm43xx_coreinfo_80211)
-                                        * BCM43xx_MAX_80211_CORES);
-        bcm->nr_80211_available = 0;
-        bcm->current_core = NULL;
-        bcm->active_80211_core = NULL;
-
-        /* map core 0 */
-        err = _switch_core(bcm, 0);
-        if (err)
-                goto out;
-
-        /* fetch sb_id_hi from core information registers */
-        sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI);
-
-        core_id = (sb_id_hi & 0x8FF0) >> 4;
-        core_rev = (sb_id_hi & 0x7000) >> 8;
-        core_rev |= (sb_id_hi & 0xF);
-        core_vendor = (sb_id_hi & 0xFFFF0000) >> 16;
-
-        /* if present, chipcommon is always core 0; read the chipid from it */
-        if (core_id == BCM43xx_COREID_CHIPCOMMON) {
-                chip_id_32 = bcm43xx_read32(bcm, 0);
-                chip_id_16 = chip_id_32 & 0xFFFF;
-                bcm->core_chipcommon.available = 1;
-                bcm->core_chipcommon.id = core_id;
-                bcm->core_chipcommon.rev = core_rev;
-                bcm->core_chipcommon.index = 0;
-                /* While we are at it, also read the capabilities. */
-                bcm->chipcommon_capabilities = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_CAPABILITIES);
-        } else {
-                /* without a chipCommon, use a hard coded table. */
-                pci_device = bcm->pci_dev->device;
-                if (pci_device == 0x4301)
-                        chip_id_16 = 0x4301;
-                else if ((pci_device >= 0x4305) && (pci_device <= 0x4307))
-                        chip_id_16 = 0x4307;
-                else if ((pci_device >= 0x4402) && (pci_device <= 0x4403))
-                        chip_id_16 = 0x4402;
-                else if ((pci_device >= 0x4610) && (pci_device <= 0x4615))
-                        chip_id_16 = 0x4610;
-                else if ((pci_device >= 0x4710) && (pci_device <= 0x4715))
-                        chip_id_16 = 0x4710;
-                else {
-                        printk(KERN_ERR PFX "Could not determine Chip ID\n");
-                        return -ENODEV;
-                }
-        }
-
-        /* ChipCommon with Core Rev >=4 encodes number of cores,
-         * otherwise consult hardcoded table */
-        if ((core_id == BCM43xx_COREID_CHIPCOMMON) && (core_rev >= 4)) {
-                core_count = (chip_id_32 & 0x0F000000) >> 24;
-        } else {
-                switch (chip_id_16) {
-                        case 0x4610:
-                        case 0x4704:
-                        case 0x4710:
-                                core_count = 9;
-                                break;
-                        case 0x4310:
-                                core_count = 8;
-                                break;
-                        case 0x5365:
-                                core_count = 7;
-                                break;
-                        case 0x4306:
-                                core_count = 6;
-                                break;
-                        case 0x4301:
-                        case 0x4307:
-                                core_count = 5;
-                                break;
-                        case 0x4402:
-                                core_count = 3;
-                                break;
-                        default:
-                                /* SOL if we get here */
-                                assert(0);
-                                core_count = 1;
-                }
-        }
-
-        bcm->chip_id = chip_id_16;
-        bcm->chip_rev = (chip_id_32 & 0x000F0000) >> 16;
-        bcm->chip_package = (chip_id_32 & 0x00F00000) >> 20;
-
-        dprintk(KERN_INFO PFX "Chip ID 0x%x, rev 0x%x\n",
-                bcm->chip_id, bcm->chip_rev);
-        dprintk(KERN_INFO PFX "Number of cores: %d\n", core_count);
-        if (bcm->core_chipcommon.available) {
-                dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x\n",
-                        core_id, core_rev, core_vendor);
-                current_core = 1;
-        } else
-                current_core = 0;
-        for ( ; current_core < core_count; current_core++) {
-                struct bcm43xx_coreinfo *core;
-                struct bcm43xx_coreinfo_80211 *ext_80211;
-
-                err = _switch_core(bcm, current_core);
-                if (err)
-                        goto out;
-                /* Gather information */
-                /* fetch sb_id_hi from core information registers */
-                sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI);
-
-                /* extract core_id, core_rev, core_vendor */
-                core_id = (sb_id_hi & 0x8FF0) >> 4;
-                core_rev = ((sb_id_hi & 0xF) | ((sb_id_hi & 0x7000) >> 8));
-                core_vendor = (sb_id_hi & 0xFFFF0000) >> 16;
-
-                dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n",
-                        current_core, core_id, core_rev, core_vendor);
-
-                core = NULL;
-                switch (core_id) {
-                case BCM43xx_COREID_PCI:
-                case BCM43xx_COREID_PCIE:
-                        core = &bcm->core_pci;
-                        if (core->available) {
-                                printk(KERN_WARNING PFX "Multiple PCI cores found.\n");
-                                continue;
-                        }
-                        break;
-                case BCM43xx_COREID_80211:
-                        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
-                                core = &(bcm->core_80211[i]);
-                                ext_80211 = &(bcm->core_80211_ext[i]);
-                                if (!core->available)
-                                        break;
-                                core = NULL;
-                        }
-                        if (!core) {
-                                printk(KERN_WARNING PFX "More than %d cores of type 802.11 found.\n",
-                                       BCM43xx_MAX_80211_CORES);
-                                continue;
-                        }
-                        if (i != 0) {
-                                /* More than one 80211 core is only supported
-                                 * by special chips.
-                                 * There are chips with two 80211 cores, but with
-                                 * dangling pins on the second core. Be careful
-                                 * and ignore these cores here.
-                                 */
-                                if (1 /*bcm->pci_dev->device != 0x4324*/ ) {
-                                /* TODO: A PHY */
-                                        dprintk(KERN_INFO PFX "Ignoring additional 802.11a core.\n");
-                                        continue;
-                                }
-                        }
-                        switch (core_rev) {
-                        case 2:
-                        case 4:
-                        case 5:
-                        case 6:
-                        case 7:
-                        case 9:
-                        case 10:
-                                break;
-                        default:
-                                printk(KERN_WARNING PFX
-                                       "Unsupported 80211 core revision %u\n",
-                                       core_rev);
-                        }
-                        bcm->nr_80211_available++;
-                        core->priv = ext_80211;
-                        bcm43xx_init_struct_phyinfo(&ext_80211->phy);
-                        bcm43xx_init_struct_radioinfo(&ext_80211->radio);
-                        break;
-                case BCM43xx_COREID_CHIPCOMMON:
-                        printk(KERN_WARNING PFX "Multiple CHIPCOMMON cores found.\n");
-                        break;
-                }
-                if (core) {
-                        core->available = 1;
-                        core->id = core_id;
-                        core->rev = core_rev;
-                        core->index = current_core;
-                }
-        }
-
-        if (!bcm->core_80211[0].available) {
-                printk(KERN_ERR PFX "Error: No 80211 core found!\n");
-                err = -ENODEV;
-                goto out;
-        }
-
-        err = bcm43xx_switch_core(bcm, &bcm->core_80211[0]);
-
-        assert(err == 0);
-out:
-        return err;
-}
-
-static void bcm43xx_gen_bssid(struct bcm43xx_private *bcm)
-{
-        const u8 *mac = (const u8*)(bcm->net_dev->dev_addr);
-        u8 *bssid = bcm->ieee->bssid;
-
-        switch (bcm->ieee->iw_mode) {
-        case IW_MODE_ADHOC:
-                random_ether_addr(bssid);
-                break;
-        case IW_MODE_MASTER:
-        case IW_MODE_INFRA:
-        case IW_MODE_REPEAT:
-        case IW_MODE_SECOND:
-        case IW_MODE_MONITOR:
-                memcpy(bssid, mac, ETH_ALEN);
-                break;
-        default:
-                assert(0);
-        }
-}
-
-static void bcm43xx_rate_memory_write(struct bcm43xx_private *bcm,
-                                      u16 rate,
-                                      int is_ofdm)
-{
-        u16 offset;
-
-        if (is_ofdm) {
-                offset = 0x480;
-                offset += (bcm43xx_plcp_get_ratecode_ofdm(rate) & 0x000F) * 2;
-        }
-        else {
-                offset = 0x4C0;
-                offset += (bcm43xx_plcp_get_ratecode_cck(rate) & 0x000F) * 2;
-        }
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, offset + 0x20,
-                            bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, offset));
-}
-
-static void bcm43xx_rate_memory_init(struct bcm43xx_private *bcm)
-{
-        switch (bcm43xx_current_phy(bcm)->type) {
-        case BCM43xx_PHYTYPE_A:
-        case BCM43xx_PHYTYPE_G:
-                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_6MB, 1);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_12MB, 1);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_18MB, 1);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_24MB, 1);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_36MB, 1);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_48MB, 1);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_54MB, 1);
-        case BCM43xx_PHYTYPE_B:
-                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_1MB, 0);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_2MB, 0);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_5MB, 0);
-                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_11MB, 0);
-                break;
-        default:
-                assert(0);
-        }
-}
-
-static void bcm43xx_wireless_core_cleanup(struct bcm43xx_private *bcm)
-{
-        bcm43xx_chip_cleanup(bcm);
-        bcm43xx_pio_free(bcm);
-        bcm43xx_dma_free(bcm);
-
-        bcm->current_core->initialized = 0;
-}
-
-/* http://bcm-specs.sipsolutions.net/80211Init */
-static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm,
-                                      int active_wlcore)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u32 ucodeflags;
-        int err;
-        u32 sbimconfiglow;
-        u8 limit;
-
-        if (bcm->core_pci.rev <= 5 && bcm->core_pci.id != BCM43xx_COREID_PCIE) {
-                sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW);
-                sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK;
-                sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK;
-                if (bcm->bustype == BCM43xx_BUSTYPE_PCI)
-                        sbimconfiglow |= 0x32;
-                else
-                        sbimconfiglow |= 0x53;
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow);
-        }
-
-        bcm43xx_phy_calibrate(bcm);
-        err = bcm43xx_chip_init(bcm);
-        if (err)
-                goto out;
-
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0016, bcm->current_core->rev);
-        ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, BCM43xx_UCODEFLAGS_OFFSET);
-
-        if (0 /*FIXME: which condition has to be used here? */)
-                ucodeflags |= 0x00000010;
-
-        /* HW decryption needs to be set now */
-        ucodeflags |= 0x40000000;
-        
-        if (phy->type == BCM43xx_PHYTYPE_G) {
-                ucodeflags |= BCM43xx_UCODEFLAG_UNKBGPHY;
-                if (phy->rev == 1)
-                        ucodeflags |= BCM43xx_UCODEFLAG_UNKGPHY;
-                if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
-                        ucodeflags |= BCM43xx_UCODEFLAG_UNKPACTRL;
-        } else if (phy->type == BCM43xx_PHYTYPE_B) {
-                ucodeflags |= BCM43xx_UCODEFLAG_UNKBGPHY;
-                if (phy->rev >= 2 && radio->version == 0x2050)
-                        ucodeflags &= ~BCM43xx_UCODEFLAG_UNKGPHY;
-        }
-
-        if (ucodeflags != bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                             BCM43xx_UCODEFLAGS_OFFSET)) {
-                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                                    BCM43xx_UCODEFLAGS_OFFSET, ucodeflags);
-        }
-
-        /* Short/Long Retry Limit.
-         * The retry-limit is a 4-bit counter. Enforce this to avoid overflowing
-         * the chip-internal counter.
-         */
-        limit = limit_value(modparam_short_retry, 0, 0xF);
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0006, limit);
-        limit = limit_value(modparam_long_retry, 0, 0xF);
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0007, limit);
-
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0044, 3);
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0046, 2);
-
-        bcm43xx_rate_memory_init(bcm);
-
-        /* Minimum Contention Window */
-        if (phy->type == BCM43xx_PHYTYPE_B)
-                bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0003, 0x0000001f);
-        else
-                bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0003, 0x0000000f);
-        /* Maximum Contention Window */
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0004, 0x000003ff);
-
-        bcm43xx_gen_bssid(bcm);
-        bcm43xx_write_mac_bssid_templates(bcm);
-
-        if (bcm->current_core->rev >= 5)
-                bcm43xx_write16(bcm, 0x043C, 0x000C);
-
-        if (active_wlcore) {
-                if (bcm43xx_using_pio(bcm)) {
-                        err = bcm43xx_pio_init(bcm);
-                } else {
-                        err = bcm43xx_dma_init(bcm);
-                        if (err == -ENOSYS)
-                                err = bcm43xx_pio_init(bcm);
-                }
-                if (err)
-                        goto err_chip_cleanup;
-        }
-        bcm43xx_write16(bcm, 0x0612, 0x0050);
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0416, 0x0050);
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0414, 0x01F4);
-
-        if (active_wlcore) {
-                if (radio->initial_channel != 0xFF)
-                        bcm43xx_radio_selectchannel(bcm, radio->initial_channel, 0);
-        }
-
-        /* Don't enable MAC/IRQ here, as it will race with the IRQ handler.
-         * We enable it later.
-         */
-        bcm->current_core->initialized = 1;
-out:
-        return err;
-
-err_chip_cleanup:
-        bcm43xx_chip_cleanup(bcm);
-        goto out;
-}
-
-static int bcm43xx_chipset_attach(struct bcm43xx_private *bcm)
-{
-        int err;
-        u16 pci_status;
-
-        err = bcm43xx_pctl_set_crystal(bcm, 1);
-        if (err)
-                goto out;
-        err = bcm43xx_pci_read_config16(bcm, PCI_STATUS, &pci_status);
-        if (err)
-                goto out;
-        err = bcm43xx_pci_write_config16(bcm, PCI_STATUS, pci_status & ~PCI_STATUS_SIG_TARGET_ABORT);
-
-out:
-        return err;
-}
-
-static void bcm43xx_chipset_detach(struct bcm43xx_private *bcm)
-{
-        bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_SLOW);
-        bcm43xx_pctl_set_crystal(bcm, 0);
-}
-
-static void bcm43xx_pcicore_broadcast_value(struct bcm43xx_private *bcm,
-                                            u32 address,
-                                            u32 data)
-{
-        bcm43xx_write32(bcm, BCM43xx_PCICORE_BCAST_ADDR, address);
-        bcm43xx_write32(bcm, BCM43xx_PCICORE_BCAST_DATA, data);
-}
-
-static int bcm43xx_pcicore_commit_settings(struct bcm43xx_private *bcm)
-{
-        int err = 0;
-
-        bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-
-        if (bcm->core_chipcommon.available) {
-                err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
-                if (err)
-                        goto out;
-
-                bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000);
-
-                /* this function is always called when a PCI core is mapped */
-                err = bcm43xx_switch_core(bcm, &bcm->core_pci);
-                if (err)
-                        goto out;
-        } else
-                bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000);
-
-        bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate);
-
-out:
-        return err;
-}
-
-static u32 bcm43xx_pcie_reg_read(struct bcm43xx_private *bcm, u32 address)
-{
-        bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_ADDR, address);
-        return bcm43xx_read32(bcm, BCM43xx_PCIECORE_REG_DATA);
-}
-
-static void bcm43xx_pcie_reg_write(struct bcm43xx_private *bcm, u32 address,
-                                    u32 data)
-{
-        bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_ADDR, address);
-        bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_DATA, data);
-}
-
-static void bcm43xx_pcie_mdio_write(struct bcm43xx_private *bcm, u8 dev, u8 reg,
-                                    u16 data)
-{
-        int i;
-
-        bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_CTL, 0x0082);
-        bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_DATA, BCM43xx_PCIE_MDIO_ST |
-                        BCM43xx_PCIE_MDIO_WT | (dev << BCM43xx_PCIE_MDIO_DEV) |
-                        (reg << BCM43xx_PCIE_MDIO_REG) | BCM43xx_PCIE_MDIO_TA |
-                        data);
-        udelay(10);
-
-        for (i = 0; i < 10; i++) {
-                if (bcm43xx_read32(bcm, BCM43xx_PCIECORE_MDIO_CTL) &
-                    BCM43xx_PCIE_MDIO_TC)
-                        break;
-                msleep(1);
-        }
-        bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_CTL, 0);
-}
-
-/* Make an I/O Core usable. "core_mask" is the bitmask of the cores to enable.
- * To enable core 0, pass a core_mask of 1<<0
- */
-static int bcm43xx_setup_backplane_pci_connection(struct bcm43xx_private *bcm,
-                                                  u32 core_mask)
-{
-        u32 backplane_flag_nr;
-        u32 value;
-        struct bcm43xx_coreinfo *old_core;
-        int err = 0;
-
-        value = bcm43xx_read32(bcm, BCM43xx_CIR_SBTPSFLAG);
-        backplane_flag_nr = value & BCM43xx_BACKPLANE_FLAG_NR_MASK;
-
-        old_core = bcm->current_core;
-        err = bcm43xx_switch_core(bcm, &bcm->core_pci);
-        if (err)
-                goto out;
-
-        if (bcm->current_core->rev < 6 &&
-                bcm->current_core->id == BCM43xx_COREID_PCI) {
-                value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC);
-                value |= (1 << backplane_flag_nr);
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBINTVEC, value);
-        } else {
-                err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCICFG_ICR, &value);
-                if (err) {
-                        printk(KERN_ERR PFX "Error: ICR setup failure!\n");
-                        goto out_switch_back;
-                }
-                value |= core_mask << 8;
-                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_ICR, value);
-                if (err) {
-                        printk(KERN_ERR PFX "Error: ICR setup failure!\n");
-                        goto out_switch_back;
-                }
-        }
-
-        if (bcm->current_core->id == BCM43xx_COREID_PCI) {
-                value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2);
-                value |= BCM43xx_SBTOPCI2_PREFETCH | BCM43xx_SBTOPCI2_BURST;
-                bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value);
-
-                if (bcm->current_core->rev < 5) {
-                        value = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW);
-                        value |= (2 << BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT)
-                                 & BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK;
-                        value |= (3 << BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT)
-                                 & BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK;
-                        bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, value);
-                        err = bcm43xx_pcicore_commit_settings(bcm);
-                        assert(err == 0);
-                } else if (bcm->current_core->rev >= 11) {
-                        value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2);
-                        value |= BCM43xx_SBTOPCI2_MEMREAD_MULTI;
-                        bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value);
-                }
-        } else {
-                if (bcm->current_core->rev == 0 || bcm->current_core->rev == 1) {
-                        value = bcm43xx_pcie_reg_read(bcm, BCM43xx_PCIE_TLP_WORKAROUND);
-                        value |= 0x8;
-                        bcm43xx_pcie_reg_write(bcm, BCM43xx_PCIE_TLP_WORKAROUND,
-                                               value);
-                }
-                if (bcm->current_core->rev == 0) {
-                        bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX,
-                                                BCM43xx_SERDES_RXTIMER, 0x8128);
-                        bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX,
-                                                BCM43xx_SERDES_CDR, 0x0100);
-                        bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX,
-                                                BCM43xx_SERDES_CDR_BW, 0x1466);
-                } else if (bcm->current_core->rev == 1) {
-                        value = bcm43xx_pcie_reg_read(bcm, BCM43xx_PCIE_DLLP_LINKCTL);
-                        value |= 0x40;
-                        bcm43xx_pcie_reg_write(bcm, BCM43xx_PCIE_DLLP_LINKCTL,
-                                               value);
-                }
-        }
-out_switch_back:
-        err = bcm43xx_switch_core(bcm, old_core);
-out:
-        return err;
-}
-
-static void bcm43xx_periodic_every120sec(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        if (phy->type != BCM43xx_PHYTYPE_G || phy->rev < 2)
-                return;
-
-        bcm43xx_mac_suspend(bcm);
-        bcm43xx_phy_lo_g_measure(bcm);
-        bcm43xx_mac_enable(bcm);
-}
-
-static void bcm43xx_periodic_every60sec(struct bcm43xx_private *bcm)
-{
-        bcm43xx_phy_lo_mark_all_unused(bcm);
-        if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
-                bcm43xx_mac_suspend(bcm);
-                bcm43xx_calc_nrssi_slope(bcm);
-                bcm43xx_mac_enable(bcm);
-        }
-}
-
-static void bcm43xx_periodic_every30sec(struct bcm43xx_private *bcm)
-{
-        /* Update device statistics. */
-        bcm43xx_calculate_link_quality(bcm);
-}
-
-static void bcm43xx_periodic_every15sec(struct bcm43xx_private *bcm)
-{
-        bcm43xx_phy_xmitpower(bcm); //FIXME: unless scanning?
-        //TODO for APHY (temperature?)
-}
-
-static void bcm43xx_periodic_every1sec(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        int radio_hw_enable;
-
-        /* check if radio hardware enabled status changed */
-        radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
-        if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
-                bcm->radio_hw_enable = radio_hw_enable;
-                printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
-                       (radio_hw_enable == 0) ? "disabled" : "enabled");
-                bcm43xx_leds_update(bcm, 0);
-        }
-        if (phy->type == BCM43xx_PHYTYPE_G) {
-                //TODO: update_aci_moving_average
-                if (radio->aci_enable && radio->aci_wlan_automatic) {
-                        bcm43xx_mac_suspend(bcm);
-                        if (!radio->aci_enable && 1 /*TODO: not scanning? */) {
-                                if (0 /*TODO: bunch of conditions*/) {
-                                        bcm43xx_radio_set_interference_mitigation(bcm,
-                                                                                  BCM43xx_RADIO_INTERFMODE_MANUALWLAN);
-                                }
-                        } else if (1/*TODO*/) {
-                                /*
-                                if ((aci_average > 1000) && !(bcm43xx_radio_aci_scan(bcm))) {
-                                        bcm43xx_radio_set_interference_mitigation(bcm,
-                                                                                  BCM43xx_RADIO_INTERFMODE_NONE);
-                                }
-                                */
-                        }
-                        bcm43xx_mac_enable(bcm);
-                } else if (radio->interfmode == BCM43xx_RADIO_INTERFMODE_NONWLAN &&
-                           phy->rev == 1) {
-                        //TODO: implement rev1 workaround
-                }
-        }
-}
-
-static void do_periodic_work(struct bcm43xx_private *bcm)
-{
-        if (bcm->periodic_state % 120 == 0)
-                bcm43xx_periodic_every120sec(bcm);
-        if (bcm->periodic_state % 60 == 0)
-                bcm43xx_periodic_every60sec(bcm);
-        if (bcm->periodic_state % 30 == 0)
-                bcm43xx_periodic_every30sec(bcm);
-        if (bcm->periodic_state % 15 == 0)
-                bcm43xx_periodic_every15sec(bcm);
-        bcm43xx_periodic_every1sec(bcm);
-
-        schedule_delayed_work(&bcm->periodic_work, HZ);
-}
-
-static void bcm43xx_periodic_work_handler(struct work_struct *work)
-{
-        struct bcm43xx_private *bcm =
-                container_of(work, struct bcm43xx_private, periodic_work.work);
-        struct net_device *net_dev = bcm->net_dev;
-        unsigned long flags;
-        u32 savedirqs = 0;
-        unsigned long orig_trans_start = 0;
-
-        mutex_lock(&bcm->mutex);
-        /* keep from doing and rearming periodic work if shutting down */
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_UNINIT)
-                goto unlock_mutex;
-        if (unlikely(bcm->periodic_state % 60 == 0)) {
-                /* Periodic work will take a long time, so we want it to
-                 * be preemtible.
-                 */
-
-                netif_tx_lock_bh(net_dev);
-                /* We must fake a started transmission here, as we are going to
-                 * disable TX. If we wouldn't fake a TX, it would be possible to
-                 * trigger the netdev watchdog, if the last real TX is already
-                 * some time on the past (slightly less than 5secs)
-                 */
-                orig_trans_start = net_dev->trans_start;
-                net_dev->trans_start = jiffies;
-                netif_stop_queue(net_dev);
-                netif_tx_unlock_bh(net_dev);
-
-                spin_lock_irqsave(&bcm->irq_lock, flags);
-                bcm43xx_mac_suspend(bcm);
-                if (bcm43xx_using_pio(bcm))
-                        bcm43xx_pio_freeze_txqueues(bcm);
-                savedirqs = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-                spin_unlock_irqrestore(&bcm->irq_lock, flags);
-                bcm43xx_synchronize_irq(bcm);
-        } else {
-                /* Periodic work should take short time, so we want low
-                 * locking overhead.
-                 */
-                spin_lock_irqsave(&bcm->irq_lock, flags);
-        }
-
-        do_periodic_work(bcm);
-
-        if (unlikely(bcm->periodic_state % 60 == 0)) {
-                spin_lock_irqsave(&bcm->irq_lock, flags);
-                tasklet_enable(&bcm->isr_tasklet);
-                bcm43xx_interrupt_enable(bcm, savedirqs);
-                if (bcm43xx_using_pio(bcm))
-                        bcm43xx_pio_thaw_txqueues(bcm);
-                bcm43xx_mac_enable(bcm);
-                netif_wake_queue(bcm->net_dev);
-                net_dev->trans_start = orig_trans_start;
-        }
-        mmiowb();
-        bcm->periodic_state++;
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-unlock_mutex:
-        mutex_unlock(&bcm->mutex);
-}
-
-void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
-{
-        struct delayed_work *work = &bcm->periodic_work;
-
-        assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);
-        INIT_DELAYED_WORK(work, bcm43xx_periodic_work_handler);
-        schedule_delayed_work(work, 0);
-}
-
-static void bcm43xx_security_init(struct bcm43xx_private *bcm)
-{
-        bcm->security_offset = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                                  0x0056) * 2;
-        bcm43xx_clear_keys(bcm);
-}
-
-static int bcm43xx_rng_read(struct hwrng *rng, u32 *data)
-{
-        struct bcm43xx_private *bcm = (struct bcm43xx_private *)rng->priv;
-        unsigned long flags;
-
-        spin_lock_irqsave(&(bcm)->irq_lock, flags);
-        *data = bcm43xx_read16(bcm, BCM43xx_MMIO_RNG);
-        spin_unlock_irqrestore(&(bcm)->irq_lock, flags);
-
-        return (sizeof(u16));
-}
-
-static void bcm43xx_rng_exit(struct bcm43xx_private *bcm)
-{
-        hwrng_unregister(&bcm->rng);
-}
-
-static int bcm43xx_rng_init(struct bcm43xx_private *bcm)
-{
-        int err;
-
-        snprintf(bcm->rng_name, ARRAY_SIZE(bcm->rng_name),
-                 "%s_%s", KBUILD_MODNAME, bcm->net_dev->name);
-        bcm->rng.name = bcm->rng_name;
-        bcm->rng.data_read = bcm43xx_rng_read;
-        bcm->rng.priv = (unsigned long)bcm;
-        err = hwrng_register(&bcm->rng);
-        if (err)
-                printk(KERN_ERR PFX "RNG init failed (%d)\n", err);
-
-        return err;
-}
-
-void bcm43xx_cancel_work(struct bcm43xx_private *bcm)
-{
-        /* The system must be unlocked when this routine is entered.
-         * If not, the next 2 steps may deadlock */
-        cancel_work_sync(&bcm->restart_work);
-        cancel_delayed_work_sync(&bcm->periodic_work);
-}
-
-static int bcm43xx_shutdown_all_wireless_cores(struct bcm43xx_private *bcm)
-{
-        int ret = 0;
-        int i, err;
-        struct bcm43xx_coreinfo *core;
-
-        bcm43xx_set_status(bcm, BCM43xx_STAT_SHUTTINGDOWN);
-        for (i = 0; i < bcm->nr_80211_available; i++) {
-                core = &(bcm->core_80211[i]);
-                assert(core->available);
-                if (!core->initialized)
-                        continue;
-                err = bcm43xx_switch_core(bcm, core);
-                if (err) {
-                        dprintk(KERN_ERR PFX "shutdown_all_wireless_cores "
-                                             "switch_core failed (%d)\n", err);
-                        ret = err;
-                        continue;
-                }
-                bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-                bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */
-                bcm43xx_wireless_core_cleanup(bcm);
-                if (core == bcm->active_80211_core)
-                        bcm->active_80211_core = NULL;
-        }
-        free_irq(bcm->irq, bcm);
-        bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
-
-        return ret;
-}
-
-/* This is the opposite of bcm43xx_init_board() */
-static void bcm43xx_free_board(struct bcm43xx_private *bcm)
-{
-        bcm43xx_rng_exit(bcm);
-        bcm43xx_sysfs_unregister(bcm);
-
-        mutex_lock(&(bcm)->mutex);
-        bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
-        mutex_unlock(&(bcm)->mutex);
-
-        bcm43xx_cancel_work(bcm);
-
-        mutex_lock(&(bcm)->mutex);
-        bcm43xx_shutdown_all_wireless_cores(bcm);
-        bcm43xx_pctl_set_crystal(bcm, 0);
-        mutex_unlock(&(bcm)->mutex);
-}
-
-static void prepare_phydata_for_init(struct bcm43xx_phyinfo *phy)
-{
-        phy->antenna_diversity = 0xFFFF;
-        memset(phy->minlowsig, 0xFF, sizeof(phy->minlowsig));
-        memset(phy->minlowsigpos, 0, sizeof(phy->minlowsigpos));
-
-        /* Flags */
-        phy->calibrated = 0;
-        phy->is_locked = 0;
-
-        if (phy->_lo_pairs) {
-                memset(phy->_lo_pairs, 0,
-                       sizeof(struct bcm43xx_lopair) * BCM43xx_LO_COUNT);
-        }
-        memset(phy->loopback_gain, 0, sizeof(phy->loopback_gain));
-}
-
-static void prepare_radiodata_for_init(struct bcm43xx_private *bcm,
-                                       struct bcm43xx_radioinfo *radio)
-{
-        int i;
-
-        /* Set default attenuation values. */
-        radio->baseband_atten = bcm43xx_default_baseband_attenuation(bcm);
-        radio->radio_atten = bcm43xx_default_radio_attenuation(bcm);
-        radio->txctl1 = bcm43xx_default_txctl1(bcm);
-        radio->txctl2 = 0xFFFF;
-        radio->txpwr_offset = 0;
-
-        /* NRSSI */
-        radio->nrssislope = 0;
-        for (i = 0; i < ARRAY_SIZE(radio->nrssi); i++)
-                radio->nrssi[i] = -1000;
-        for (i = 0; i < ARRAY_SIZE(radio->nrssi_lt); i++)
-                radio->nrssi_lt[i] = i;
-
-        radio->lofcal = 0xFFFF;
-        radio->initval = 0xFFFF;
-
-        radio->aci_enable = 0;
-        radio->aci_wlan_automatic = 0;
-        radio->aci_hw_rssi = 0;
-}
-
-static void prepare_priv_for_init(struct bcm43xx_private *bcm)
-{
-        int i;
-        struct bcm43xx_coreinfo *core;
-        struct bcm43xx_coreinfo_80211 *wlext;
-
-        assert(!bcm->active_80211_core);
-
-        bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZING);
-
-        /* Flags */
-        bcm->was_initialized = 0;
-        bcm->reg124_set_0x4 = 0;
-
-        /* Stats */
-        memset(&bcm->stats, 0, sizeof(bcm->stats));
-
-        /* Wireless core data */
-        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
-                core = &(bcm->core_80211[i]);
-                wlext = core->priv;
-
-                if (!core->available)
-                        continue;
-                assert(wlext == &(bcm->core_80211_ext[i]));
-
-                prepare_phydata_for_init(&wlext->phy);
-                prepare_radiodata_for_init(bcm, &wlext->radio);
-        }
-
-        /* IRQ related flags */
-        bcm->irq_reason = 0;
-        memset(bcm->dma_reason, 0, sizeof(bcm->dma_reason));
-        bcm->irq_savedstate = BCM43xx_IRQ_INITIAL;
-
-        bcm->mac_suspended = 1;
-
-        /* Noise calculation context */
-        memset(&bcm->noisecalc, 0, sizeof(bcm->noisecalc));
-
-        /* Periodic work context */
-        bcm->periodic_state = 0;
-}
-
-static int wireless_core_up(struct bcm43xx_private *bcm,
-                            int active_wlcore)
-{
-        int err;
-
-        if (!bcm43xx_core_enabled(bcm))
-                bcm43xx_wireless_core_reset(bcm, 1);
-        if (!active_wlcore)
-                bcm43xx_wireless_core_mark_inactive(bcm);
-        err = bcm43xx_wireless_core_init(bcm, active_wlcore);
-        if (err)
-                goto out;
-        if (!active_wlcore)
-                bcm43xx_radio_turn_off(bcm);
-out:
-        return err;
-}
-
-/* Select and enable the "to be used" wireless core.
- * Locking: bcm->mutex must be aquired before calling this.
- *          bcm->irq_lock must not be aquired.
- */
-int bcm43xx_select_wireless_core(struct bcm43xx_private *bcm,
-                                 int phytype)
-{
-        int i, err;
-        struct bcm43xx_coreinfo *active_core = NULL;
-        struct bcm43xx_coreinfo_80211 *active_wlext = NULL;
-        struct bcm43xx_coreinfo *core;
-        struct bcm43xx_coreinfo_80211 *wlext;
-        int adjust_active_sbtmstatelow = 0;
-
-        might_sleep();
-
-        if (phytype < 0) {
-                /* If no phytype is requested, select the first core. */
-                assert(bcm->core_80211[0].available);
-                wlext = bcm->core_80211[0].priv;
-                phytype = wlext->phy.type;
-        }
-        /* Find the requested core. */
-        for (i = 0; i < bcm->nr_80211_available; i++) {
-                core = &(bcm->core_80211[i]);
-                wlext = core->priv;
-                if (wlext->phy.type == phytype) {
-                        active_core = core;
-                        active_wlext = wlext;
-                        break;
-                }
-        }
-        if (!active_core)
-                return -ESRCH; /* No such PHYTYPE on this board. */
-
-        if (bcm->active_80211_core) {
-                /* We already selected a wl core in the past.
-                 * So first clean up everything.
-                 */
-                dprintk(KERN_INFO PFX "select_wireless_core: cleanup\n");
-                ieee80211softmac_stop(bcm->net_dev);
-                bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZED);
-                err = bcm43xx_disable_interrupts_sync(bcm);
-                assert(!err);
-                tasklet_enable(&bcm->isr_tasklet);
-                err = bcm43xx_shutdown_all_wireless_cores(bcm);
-                if (err)
-                        goto error;
-                /* Ok, everything down, continue to re-initialize. */
-                bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZING);
-        }
-
-        /* Reset all data structures. */
-        prepare_priv_for_init(bcm);
-
-        err = bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_FAST);
-        if (err)
-                goto error;
-
-        /* Mark all unused cores "inactive". */
-        for (i = 0; i < bcm->nr_80211_available; i++) {
-                core = &(bcm->core_80211[i]);
-                wlext = core->priv;
-
-                if (core == active_core)
-                        continue;
-                err = bcm43xx_switch_core(bcm, core);
-                if (err) {
-                        dprintk(KERN_ERR PFX "Could not switch to inactive "
-                                             "802.11 core (%d)\n", err);
-                        goto error;
-                }
-                err = wireless_core_up(bcm, 0);
-                if (err) {
-                        dprintk(KERN_ERR PFX "core_up for inactive 802.11 core "
-                                             "failed (%d)\n", err);
-                        goto error;
-                }
-                adjust_active_sbtmstatelow = 1;
-        }
-
-        /* Now initialize the active 802.11 core. */
-        err = bcm43xx_switch_core(bcm, active_core);
-        if (err) {
-                dprintk(KERN_ERR PFX "Could not switch to active "
-                                     "802.11 core (%d)\n", err);
-                goto error;
-        }
-        if (adjust_active_sbtmstatelow &&
-            active_wlext->phy.type == BCM43xx_PHYTYPE_G) {
-                u32 sbtmstatelow;
-
-                sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-                sbtmstatelow |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
-        }
-        err = wireless_core_up(bcm, 1);
-        if (err) {
-                dprintk(KERN_ERR PFX "core_up for active 802.11 core "
-                                     "failed (%d)\n", err);
-                goto error;
-        }
-        err = bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_DYNAMIC);
-        if (err)
-                goto error;
-        bcm->active_80211_core = active_core;
-
-        bcm43xx_macfilter_clear(bcm, BCM43xx_MACFILTER_ASSOC);
-        bcm43xx_macfilter_set(bcm, BCM43xx_MACFILTER_SELF, (u8 *)(bcm->net_dev->dev_addr));
-        bcm43xx_security_init(bcm);
-        drain_txstatus_queue(bcm);
-        ieee80211softmac_start(bcm->net_dev);
-
-        /* Let's go! Be careful after enabling the IRQs.
-         * Don't switch cores, for example.
-         */
-        bcm43xx_mac_enable(bcm);
-        bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZED);
-        err = bcm43xx_initialize_irq(bcm);
-        if (err)
-                goto error;
-        bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate);
-
-        dprintk(KERN_INFO PFX "Selected 802.11 core (phytype %d)\n",
-                active_wlext->phy.type);
-
-        return 0;
-
-error:
-        bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
-        bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_SLOW);
-        return err;
-}
-
-static int bcm43xx_init_board(struct bcm43xx_private *bcm)
-{
-        int err;
-
-        mutex_lock(&(bcm)->mutex);
-
-        tasklet_enable(&bcm->isr_tasklet);
-        err = bcm43xx_pctl_set_crystal(bcm, 1);
-        if (err)
-                goto err_tasklet;
-        err = bcm43xx_pctl_init(bcm);
-        if (err)
-                goto err_crystal_off;
-        err = bcm43xx_select_wireless_core(bcm, -1);
-        if (err)
-                goto err_crystal_off;
-        err = bcm43xx_sysfs_register(bcm);
-        if (err)
-                goto err_wlshutdown;
-        err = bcm43xx_rng_init(bcm);
-        if (err)
-                goto err_sysfs_unreg;
-        bcm43xx_periodic_tasks_setup(bcm);
-
-        /*FIXME: This should be handled by softmac instead. */
-        schedule_delayed_work(&bcm->softmac->associnfo.work, 0);
-
-out:
-        mutex_unlock(&(bcm)->mutex);
-
-        return err;
-
-err_sysfs_unreg:
-        bcm43xx_sysfs_unregister(bcm);
-err_wlshutdown:
-        bcm43xx_shutdown_all_wireless_cores(bcm);
-err_crystal_off:
-        bcm43xx_pctl_set_crystal(bcm, 0);
-err_tasklet:
-        tasklet_disable(&bcm->isr_tasklet);
-        goto out;
-}
-
-static void bcm43xx_detach_board(struct bcm43xx_private *bcm)
-{
-        struct pci_dev *pci_dev = bcm->pci_dev;
-        int i;
-
-        bcm43xx_chipset_detach(bcm);
-        /* Do _not_ access the chip, after it is detached. */
-        pci_iounmap(pci_dev, bcm->mmio_addr);
-        pci_release_regions(pci_dev);
-        pci_disable_device(pci_dev);
-
-        /* Free allocated structures/fields */
-        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
-                kfree(bcm->core_80211_ext[i].phy._lo_pairs);
-                if (bcm->core_80211_ext[i].phy.dyn_tssi_tbl)
-                        kfree(bcm->core_80211_ext[i].phy.tssi2dbm);
-        }
-}       
-
-static int bcm43xx_read_phyinfo(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 value;
-        u8 phy_analog;
-        u8 phy_type;
-        u8 phy_rev;
-        int phy_rev_ok = 1;
-        void *p;
-
-        value = bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_VER);
-
-        phy_analog = (value & 0xF000) >> 12;
-        phy_type = (value & 0x0F00) >> 8;
-        phy_rev = (value & 0x000F);
-
-        dprintk(KERN_INFO PFX "Detected PHY: Analog: %x, Type %x, Revision %x\n",
-                phy_analog, phy_type, phy_rev);
-
-        switch (phy_type) {
-        case BCM43xx_PHYTYPE_A:
-                if (phy_rev >= 4)
-                        phy_rev_ok = 0;
-                /*FIXME: We need to switch the ieee->modulation, etc.. flags,
-                 *       if we switch 80211 cores after init is done.
-                 *       As we do not implement on the fly switching between
-                 *       wireless cores, I will leave this as a future task.
-                 */
-                bcm->ieee->modulation = IEEE80211_OFDM_MODULATION;
-                bcm->ieee->mode = IEEE_A;
-                bcm->ieee->freq_band = IEEE80211_52GHZ_BAND |
-                                       IEEE80211_24GHZ_BAND;
-                break;
-        case BCM43xx_PHYTYPE_B:
-                if (phy_rev != 2 && phy_rev != 4 && phy_rev != 6 && phy_rev != 7)
-                        phy_rev_ok = 0;
-                bcm->ieee->modulation = IEEE80211_CCK_MODULATION;
-                bcm->ieee->mode = IEEE_B;
-                bcm->ieee->freq_band = IEEE80211_24GHZ_BAND;
-                break;
-        case BCM43xx_PHYTYPE_G:
-                if (phy_rev > 8)
-                        phy_rev_ok = 0;
-                bcm->ieee->modulation = IEEE80211_OFDM_MODULATION |
-                                        IEEE80211_CCK_MODULATION;
-                bcm->ieee->mode = IEEE_G;
-                bcm->ieee->freq_band = IEEE80211_24GHZ_BAND;
-                break;
-        default:
-                printk(KERN_ERR PFX "Error: Unknown PHY Type %x\n",
-                       phy_type);
-                return -ENODEV;
-        };
-        bcm->ieee->perfect_rssi = RX_RSSI_MAX;
-        bcm->ieee->worst_rssi = 0;
-        if (!phy_rev_ok) {
-                printk(KERN_WARNING PFX "Invalid PHY Revision %x\n",
-                       phy_rev);
-        }
-
-        phy->analog = phy_analog;
-        phy->type = phy_type;
-        phy->rev = phy_rev;
-        if ((phy_type == BCM43xx_PHYTYPE_B) || (phy_type == BCM43xx_PHYTYPE_G)) {
-                p = kzalloc(sizeof(struct bcm43xx_lopair) * BCM43xx_LO_COUNT,
-                            GFP_KERNEL);
-                if (!p)
-                        return -ENOMEM;
-                phy->_lo_pairs = p;
-        }
-
-        return 0;
-}
-
-static int bcm43xx_attach_board(struct bcm43xx_private *bcm)
-{
-        struct pci_dev *pci_dev = bcm->pci_dev;
-        struct net_device *net_dev = bcm->net_dev;
-        int err;
-        int i;
-        u32 coremask;
-
-        err = pci_enable_device(pci_dev);
-        if (err) {
-                printk(KERN_ERR PFX "pci_enable_device() failed\n");
-                goto out;
-        }
-        err = pci_request_regions(pci_dev, KBUILD_MODNAME);
-        if (err) {
-                printk(KERN_ERR PFX "pci_request_regions() failed\n");
-                goto err_pci_disable;
-        }
-        /* enable PCI bus-mastering */
-        pci_set_master(pci_dev);
-        bcm->mmio_addr = pci_iomap(pci_dev, 0, ~0UL);
-        if (!bcm->mmio_addr) {
-                printk(KERN_ERR PFX "pci_iomap() failed\n");
-                err = -EIO;
-                goto err_pci_release;
-        }
-        net_dev->base_addr = (unsigned long)bcm->mmio_addr;
-
-        err = bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID,
-                                  &bcm->board_vendor);
-        if (err)
-                goto err_iounmap;
-        err = bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_ID,
-                                  &bcm->board_type);
-        if (err)
-                goto err_iounmap;
-
-        bcm->board_revision = bcm->pci_dev->revision;
-
-        err = bcm43xx_chipset_attach(bcm);
-        if (err)
-                goto err_iounmap;
-        err = bcm43xx_pctl_init(bcm);
-        if (err)
-                goto err_chipset_detach;
-        err = bcm43xx_probe_cores(bcm);
-        if (err)
-                goto err_chipset_detach;
-        
-        /* Attach all IO cores to the backplane. */
-        coremask = 0;
-        for (i = 0; i < bcm->nr_80211_available; i++)
-                coremask |= (1 << bcm->core_80211[i].index);
-        //FIXME: Also attach some non80211 cores?
-        err = bcm43xx_setup_backplane_pci_connection(bcm, coremask);
-        if (err) {
-                printk(KERN_ERR PFX "Backplane->PCI connection failed!\n");
-                goto err_chipset_detach;
-        }
-
-        err = bcm43xx_sprom_extract(bcm);
-        if (err)
-                goto err_chipset_detach;
-        err = bcm43xx_leds_init(bcm);
-        if (err)
-                goto err_chipset_detach;
-
-        for (i = 0; i < bcm->nr_80211_available; i++) {
-                err = bcm43xx_switch_core(bcm, &bcm->core_80211[i]);
-                assert(err != -ENODEV);
-                if (err)
-                        goto err_80211_unwind;
-
-                /* Enable the selected wireless core.
-                 * Connect PHY only on the first core.
-                 */
-                bcm43xx_wireless_core_reset(bcm, (i == 0));
-
-                err = bcm43xx_read_phyinfo(bcm);
-                if (err && (i == 0))
-                        goto err_80211_unwind;
-
-                err = bcm43xx_read_radioinfo(bcm);
-                if (err && (i == 0))
-                        goto err_80211_unwind;
-
-                err = bcm43xx_validate_chip(bcm);
-                if (err && (i == 0))
-                        goto err_80211_unwind;
-
-                bcm43xx_radio_turn_off(bcm);
-                err = bcm43xx_phy_init_tssi2dbm_table(bcm);
-                if (err)
-                        goto err_80211_unwind;
-                bcm43xx_wireless_core_disable(bcm);
-        }
-        err = bcm43xx_geo_init(bcm);
-        if (err)
-                goto err_80211_unwind;
-        bcm43xx_pctl_set_crystal(bcm, 0);
-
-        /* Set the MAC address in the networking subsystem */
-        if (is_valid_ether_addr(bcm->sprom.et1macaddr))
-                memcpy(bcm->net_dev->dev_addr, bcm->sprom.et1macaddr, 6);
-        else
-                memcpy(bcm->net_dev->dev_addr, bcm->sprom.il0macaddr, 6);
-
-        snprintf(bcm->nick, IW_ESSID_MAX_SIZE,
-                 "Broadcom %04X", bcm->chip_id);
-
-        assert(err == 0);
-out:
-        return err;
-
-err_80211_unwind:
-        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
-                kfree(bcm->core_80211_ext[i].phy._lo_pairs);
-                if (bcm->core_80211_ext[i].phy.dyn_tssi_tbl)
-                        kfree(bcm->core_80211_ext[i].phy.tssi2dbm);
-        }
-err_chipset_detach:
-        bcm43xx_chipset_detach(bcm);
-err_iounmap:
-        pci_iounmap(pci_dev, bcm->mmio_addr);
-err_pci_release:
-        pci_release_regions(pci_dev);
-err_pci_disable:
-        pci_disable_device(pci_dev);
-        printk(KERN_ERR PFX "Unable to attach board\n");
-        goto out;
-}
-
-/* Do the Hardware IO operations to send the txb */
-static inline int bcm43xx_tx(struct bcm43xx_private *bcm,
-                             struct ieee80211_txb *txb)
-{
-        int err = -ENODEV;
-
-        if (bcm43xx_using_pio(bcm))
-                err = bcm43xx_pio_tx(bcm, txb);
-        else
-                err = bcm43xx_dma_tx(bcm, txb);
-        bcm->net_dev->trans_start = jiffies;
-
-        return err;
-}
-
-static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev,
-                                       u8 channel)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct bcm43xx_radioinfo *radio;
-        unsigned long flags;
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
-                bcm43xx_mac_suspend(bcm);
-                bcm43xx_radio_selectchannel(bcm, channel, 0);
-                bcm43xx_mac_enable(bcm);
-        } else {
-                radio = bcm43xx_current_radio(bcm);
-                radio->initial_channel = channel;
-        }
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-}
-
-/* set_security() callback in struct ieee80211_device */
-static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,
-                                           struct ieee80211_security *sec)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct ieee80211_security *secinfo = &bcm->ieee->sec;
-        unsigned long flags;
-        int keyidx;
-        
-        dprintk(KERN_INFO PFX "set security called");
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-
-        for (keyidx = 0; keyidx<WEP_KEYS; keyidx++)
-                if (sec->flags & (1<<keyidx)) {
-                        secinfo->encode_alg[keyidx] = sec->encode_alg[keyidx];
-                        secinfo->key_sizes[keyidx] = sec->key_sizes[keyidx];
-                        memcpy(secinfo->keys[keyidx], sec->keys[keyidx], SCM_KEY_LEN);
-                }
-        
-        if (sec->flags & SEC_ACTIVE_KEY) {
-                secinfo->active_key = sec->active_key;
-                dprintk(", .active_key = %d", sec->active_key);
-        }
-        if (sec->flags & SEC_UNICAST_GROUP) {
-                secinfo->unicast_uses_group = sec->unicast_uses_group;
-                dprintk(", .unicast_uses_group = %d", sec->unicast_uses_group);
-        }
-        if (sec->flags & SEC_LEVEL) {
-                secinfo->level = sec->level;
-                dprintk(", .level = %d", sec->level);
-        }
-        if (sec->flags & SEC_ENABLED) {
-                secinfo->enabled = sec->enabled;
-                dprintk(", .enabled = %d", sec->enabled);
-        }
-        if (sec->flags & SEC_ENCRYPT) {
-                secinfo->encrypt = sec->encrypt;
-                dprintk(", .encrypt = %d", sec->encrypt);
-        }
-        if (sec->flags & SEC_AUTH_MODE) {
-                secinfo->auth_mode = sec->auth_mode;
-                dprintk(", .auth_mode = %d", sec->auth_mode);
-        }
-        dprintk("\n");
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED &&
-            !bcm->ieee->host_encrypt) {
-                if (secinfo->enabled) {
-                        /* upload WEP keys to hardware */
-                        char null_address[6] = { 0 };
-                        u8 algorithm = 0;
-                        for (keyidx = 0; keyidx<WEP_KEYS; keyidx++) {
-                                if (!(sec->flags & (1<<keyidx)))
-                                        continue;
-                                switch (sec->encode_alg[keyidx]) {
-                                        case SEC_ALG_NONE: algorithm = BCM43xx_SEC_ALGO_NONE; break;
-                                        case SEC_ALG_WEP:
-                                                algorithm = BCM43xx_SEC_ALGO_WEP;
-                                                if (secinfo->key_sizes[keyidx] == 13)
-                                                        algorithm = BCM43xx_SEC_ALGO_WEP104;
-                                                break;
-                                        case SEC_ALG_TKIP:
-                                                FIXME();
-                                                algorithm = BCM43xx_SEC_ALGO_TKIP;
-                                                break;
-                                        case SEC_ALG_CCMP:
-                                                FIXME();
-                                                algorithm = BCM43xx_SEC_ALGO_AES;
-                                                break;
-                                        default:
-                                                assert(0);
-                                                break;
-                                }
-                                bcm43xx_key_write(bcm, keyidx, algorithm, sec->keys[keyidx], secinfo->key_sizes[keyidx], &null_address[0]);
-                                bcm->key[keyidx].enabled = 1;
-                                bcm->key[keyidx].algorithm = algorithm;
-                        }
-                } else
-                                bcm43xx_clear_keys(bcm);
-        }
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-}
-
-/* hard_start_xmit() callback in struct ieee80211_device */
-static int bcm43xx_ieee80211_hard_start_xmit(struct ieee80211_txb *txb,
-                                             struct net_device *net_dev,
-                                             int pri)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err = -ENODEV;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED))
-                err = bcm43xx_tx(bcm, txb);
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-
-        if (unlikely(err))
-                return NETDEV_TX_BUSY;
-        return NETDEV_TX_OK;
-}
-
-static void bcm43xx_net_tx_timeout(struct net_device *net_dev)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        bcm43xx_controller_restart(bcm, "TX timeout");
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void bcm43xx_net_poll_controller(struct net_device *net_dev)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-
-        local_irq_save(flags);
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)
-                bcm43xx_interrupt_handler(bcm->irq, bcm);
-        local_irq_restore(flags);
-}
-#endif /* CONFIG_NET_POLL_CONTROLLER */
-
-static int bcm43xx_net_open(struct net_device *net_dev)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-
-        return bcm43xx_init_board(bcm);
-}
-
-static int bcm43xx_net_stop(struct net_device *net_dev)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err;
-
-        ieee80211softmac_stop(net_dev);
-        err = bcm43xx_disable_interrupts_sync(bcm);
-        assert(!err);
-        bcm43xx_free_board(bcm);
-        bcm43xx_cancel_work(bcm);
-
-        return 0;
-}
-
-static int bcm43xx_init_private(struct bcm43xx_private *bcm,
-                                struct net_device *net_dev,
-                                struct pci_dev *pci_dev)
-{
-        bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
-        bcm->ieee = netdev_priv(net_dev);
-        bcm->softmac = ieee80211_priv(net_dev);
-        bcm->softmac->set_channel = bcm43xx_ieee80211_set_chan;
-
-        bcm->irq_savedstate = BCM43xx_IRQ_INITIAL;
-        bcm->mac_suspended = 1;
-        bcm->pci_dev = pci_dev;
-        bcm->net_dev = net_dev;
-        bcm->bad_frames_preempt = modparam_bad_frames_preempt;
-        spin_lock_init(&bcm->irq_lock);
-        spin_lock_init(&bcm->leds_lock);
-        mutex_init(&bcm->mutex);
-        tasklet_init(&bcm->isr_tasklet,
-                     (void (*)(unsigned long))bcm43xx_interrupt_tasklet,
-                     (unsigned long)bcm);
-        tasklet_disable_nosync(&bcm->isr_tasklet);
-        if (modparam_pio)
-                bcm->__using_pio = 1;
-        bcm->rts_threshold = BCM43xx_DEFAULT_RTS_THRESHOLD;
-
-        /* default to sw encryption for now */
-        bcm->ieee->host_build_iv = 0;
-        bcm->ieee->host_encrypt = 1;
-        bcm->ieee->host_decrypt = 1;
-        
-        bcm->ieee->iw_mode = BCM43xx_INITIAL_IWMODE;
-        bcm->ieee->tx_headroom = sizeof(struct bcm43xx_txhdr);
-        bcm->ieee->set_security = bcm43xx_ieee80211_set_security;
-        bcm->ieee->hard_start_xmit = bcm43xx_ieee80211_hard_start_xmit;
-
-        return 0;
-}
-
-static int __devinit bcm43xx_init_one(struct pci_dev *pdev,
-                                      const struct pci_device_id *ent)
-{
-        struct net_device *net_dev;
-        struct bcm43xx_private *bcm;
-        int err;
-
-#ifdef DEBUG_SINGLE_DEVICE_ONLY
-        if (strcmp(pci_name(pdev), DEBUG_SINGLE_DEVICE_ONLY))
-                return -ENODEV;
-#endif
-
-        net_dev = alloc_ieee80211softmac(sizeof(*bcm));
-        if (!net_dev) {
-                printk(KERN_ERR PFX
-                       "could not allocate ieee80211 device %s\n",
-                       pci_name(pdev));
-                err = -ENOMEM;
-                goto out;
-        }
-        /* initialize the net_device struct */
-        SET_NETDEV_DEV(net_dev, &pdev->dev);
-
-        net_dev->open = bcm43xx_net_open;
-        net_dev->stop = bcm43xx_net_stop;
-        net_dev->tx_timeout = bcm43xx_net_tx_timeout;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        net_dev->poll_controller = bcm43xx_net_poll_controller;
-#endif
-        net_dev->wireless_handlers = &bcm43xx_wx_handlers_def;
-        net_dev->irq = pdev->irq;
-        SET_ETHTOOL_OPS(net_dev, &bcm43xx_ethtool_ops);
-
-        /* initialize the bcm43xx_private struct */
-        bcm = bcm43xx_priv(net_dev);
-        memset(bcm, 0, sizeof(*bcm));
-        err = bcm43xx_init_private(bcm, net_dev, pdev);
-        if (err)
-                goto err_free_netdev;
-
-        pci_set_drvdata(pdev, net_dev);
-
-        err = bcm43xx_attach_board(bcm);
-        if (err)
-                goto err_free_netdev;
-
-        err = register_netdev(net_dev);
-        if (err) {
-                printk(KERN_ERR PFX "Cannot register net device, "
-                       "aborting.\n");
-                err = -ENOMEM;
-                goto err_detach_board;
-        }
-
-        bcm43xx_debugfs_add_device(bcm);
-
-        assert(err == 0);
-out:
-        return err;
-
-err_detach_board:
-        bcm43xx_detach_board(bcm);
-err_free_netdev:
-        free_ieee80211softmac(net_dev);
-        goto out;
-}
-
-static void __devexit bcm43xx_remove_one(struct pci_dev *pdev)
-{
-        struct net_device *net_dev = pci_get_drvdata(pdev);
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-
-        bcm43xx_debugfs_remove_device(bcm);
-        unregister_netdev(net_dev);
-        bcm43xx_detach_board(bcm);
-        free_ieee80211softmac(net_dev);
-}
-
-/* Hard-reset the chip. Do not call this directly.
- * Use bcm43xx_controller_restart()
- */
-static void bcm43xx_chip_reset(struct work_struct *work)
-{
-        struct bcm43xx_private *bcm =
-                container_of(work, struct bcm43xx_private, restart_work);
-        struct bcm43xx_phyinfo *phy;
-        int err = -ENODEV;
-
-        bcm43xx_cancel_work(bcm);
-        mutex_lock(&(bcm)->mutex);
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
-                phy = bcm43xx_current_phy(bcm);
-                err = bcm43xx_select_wireless_core(bcm, phy->type);
-                if (!err)
-                        bcm43xx_periodic_tasks_setup(bcm);
-        }
-        mutex_unlock(&(bcm)->mutex);
-
-        printk(KERN_ERR PFX "Controller restart%s\n",
-               (err == 0) ? "ed" : " failed");
-}
-
-/* Hard-reset the chip.
- * This can be called from interrupt or process context.
- * bcm->irq_lock must be locked.
- */
-void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason)
-{
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)
-                return;
-        printk(KERN_ERR PFX "Controller RESET (%s) ...\n", reason);
-        INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset);
-        schedule_work(&bcm->restart_work);
-}
-
-#ifdef CONFIG_PM
-
-static int bcm43xx_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        struct net_device *net_dev = pci_get_drvdata(pdev);
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err;
-
-        dprintk(KERN_INFO PFX "Suspending...\n");
-
-        netif_device_detach(net_dev);
-        bcm->was_initialized = 0;
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
-                bcm->was_initialized = 1;
-                ieee80211softmac_stop(net_dev);
-                err = bcm43xx_disable_interrupts_sync(bcm);
-                if (unlikely(err)) {
-                        dprintk(KERN_ERR PFX "Suspend failed.\n");
-                        return -EAGAIN;
-                }
-                bcm->firmware_norelease = 1;
-                bcm43xx_free_board(bcm);
-                bcm->firmware_norelease = 0;
-        }
-        bcm43xx_chipset_detach(bcm);
-
-        pci_save_state(pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
-        dprintk(KERN_INFO PFX "Device suspended.\n");
-
-        return 0;
-}
-
-static int bcm43xx_resume(struct pci_dev *pdev)
-{
-        struct net_device *net_dev = pci_get_drvdata(pdev);
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err = 0;
-
-        dprintk(KERN_INFO PFX "Resuming...\n");
-
-        pci_set_power_state(pdev, 0);
-        err = pci_enable_device(pdev);
-        if (err) {
-                printk(KERN_ERR PFX "Failure with pci_enable_device!\n");
-                return err;
-        }
-        pci_restore_state(pdev);
-
-        bcm43xx_chipset_attach(bcm);
-        if (bcm->was_initialized)
-                err = bcm43xx_init_board(bcm);
-        if (err) {
-                printk(KERN_ERR PFX "Resume failed!\n");
-                return err;
-        }
-        netif_device_attach(net_dev);
-
-        dprintk(KERN_INFO PFX "Device resumed.\n");
-
-        return 0;
-}
-
-#endif                          /* CONFIG_PM */
-
-static struct pci_driver bcm43xx_pci_driver = {
-        .name = KBUILD_MODNAME,
-        .id_table = bcm43xx_pci_tbl,
-        .probe = bcm43xx_init_one,
-        .remove = __devexit_p(bcm43xx_remove_one),
-#ifdef CONFIG_PM
-        .suspend = bcm43xx_suspend,
-        .resume = bcm43xx_resume,
-#endif                          /* CONFIG_PM */
-};
-
-static int __init bcm43xx_init(void)
-{
-        printk(KERN_INFO KBUILD_MODNAME " driver\n");
-        bcm43xx_debugfs_init();
-        return pci_register_driver(&bcm43xx_pci_driver);
-}
-
-static void __exit bcm43xx_exit(void)
-{
-        pci_unregister_driver(&bcm43xx_pci_driver);
-        bcm43xx_debugfs_exit();
-}
-
-module_init(bcm43xx_init)
-module_exit(bcm43xx_exit)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.h b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
deleted file mode 100644
index 14cfbeb582ef..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef BCM43xx_MAIN_H_
-#define BCM43xx_MAIN_H_
-
-#include "bcm43xx.h"
-
-#define P4D_BYT3S(magic, nr_bytes)      u8 __p4dding##magic[nr_bytes]
-#define P4D_BYTES(line, nr_bytes)       P4D_BYT3S(line, nr_bytes)
-/* Magic helper macro to pad structures. Ignore those above. It's magic. */
-#define PAD_BYTES(nr_bytes)             P4D_BYTES( __LINE__ , (nr_bytes))
-
-
-/* Lightweight function to convert a frequency (in Mhz) to a channel number. */
-static inline
-u8 bcm43xx_freq_to_channel_a(int freq)
-{
-        return ((freq - 5000) / 5);
-}
-static inline
-u8 bcm43xx_freq_to_channel_bg(int freq)
-{
-        u8 channel;
-
-        if (freq == 2484)
-                channel = 14;
-        else
-                channel = (freq - 2407) / 5;
-
-        return channel;
-}
-static inline
-u8 bcm43xx_freq_to_channel(struct bcm43xx_private *bcm,
-                           int freq)
-{
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
-                return bcm43xx_freq_to_channel_a(freq);
-        return bcm43xx_freq_to_channel_bg(freq);
-}
-
-/* Lightweight function to convert a channel number to a frequency (in Mhz). */
-static inline
-int bcm43xx_channel_to_freq_a(u8 channel)
-{
-        return (5000 + (5 * channel));
-}
-static inline
-int bcm43xx_channel_to_freq_bg(u8 channel)
-{
-        int freq;
-
-        if (channel == 14)
-                freq = 2484;
-        else
-                freq = 2407 + (5 * channel);
-
-        return freq;
-}
-static inline
-int bcm43xx_channel_to_freq(struct bcm43xx_private *bcm,
-                            u8 channel)
-{
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
-                return bcm43xx_channel_to_freq_a(channel);
-        return bcm43xx_channel_to_freq_bg(channel);
-}
-
-void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf);
-void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf);
-
-void bcm43xx_set_iwmode(struct bcm43xx_private *bcm,
-                        int iw_mode);
-
-u32 bcm43xx_shm_read32(struct bcm43xx_private *bcm,
-                       u16 routing, u16 offset);
-u16 bcm43xx_shm_read16(struct bcm43xx_private *bcm,
-                       u16 routing, u16 offset);
-void bcm43xx_shm_write32(struct bcm43xx_private *bcm,
-                         u16 routing, u16 offset,
-                         u32 value);
-void bcm43xx_shm_write16(struct bcm43xx_private *bcm,
-                         u16 routing, u16 offset,
-                         u16 value);
-
-void bcm43xx_dummy_transmission(struct bcm43xx_private *bcm);
-
-int bcm43xx_switch_core(struct bcm43xx_private *bcm, struct bcm43xx_coreinfo *new_core);
-
-int bcm43xx_select_wireless_core(struct bcm43xx_private *bcm,
-                                 int phytype);
-
-void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy);
-
-void bcm43xx_mac_suspend(struct bcm43xx_private *bcm);
-void bcm43xx_mac_enable(struct bcm43xx_private *bcm);
-
-void bcm43xx_cancel_work(struct bcm43xx_private *bcm);
-void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm);
-
-void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason);
-
-int bcm43xx_sprom_read(struct bcm43xx_private *bcm, u16 *sprom);
-int bcm43xx_sprom_write(struct bcm43xx_private *bcm, const u16 *sprom);
-
-#endif /* BCM43xx_MAIN_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
deleted file mode 100644
index af3de3343650..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ /dev/null
@@ -1,2346 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/types.h>
-
-#include "bcm43xx.h"
-#include "bcm43xx_phy.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_radio.h"
-#include "bcm43xx_ilt.h"
-#include "bcm43xx_power.h"
-
-
-static const s8 bcm43xx_tssi2dbm_b_table[] = {
-        0x4D, 0x4C, 0x4B, 0x4A,
-        0x4A, 0x49, 0x48, 0x47,
-        0x47, 0x46, 0x45, 0x45,
-        0x44, 0x43, 0x42, 0x42,
-        0x41, 0x40, 0x3F, 0x3E,
-        0x3D, 0x3C, 0x3B, 0x3A,
-        0x39, 0x38, 0x37, 0x36,
-        0x35, 0x34, 0x32, 0x31,
-        0x30, 0x2F, 0x2D, 0x2C,
-        0x2B, 0x29, 0x28, 0x26,
-        0x25, 0x23, 0x21, 0x1F,
-        0x1D, 0x1A, 0x17, 0x14,
-        0x10, 0x0C, 0x06, 0x00,
-          -7,   -7,   -7,   -7,
-          -7,   -7,   -7,   -7,
-          -7,   -7,   -7,   -7,
-};
-
-static const s8 bcm43xx_tssi2dbm_g_table[] = {
-         77,  77,  77,  76,
-         76,  76,  75,  75,
-         74,  74,  73,  73,
-         73,  72,  72,  71,
-         71,  70,  70,  69,
-         68,  68,  67,  67,
-         66,  65,  65,  64,
-         63,  63,  62,  61,
-         60,  59,  58,  57,
-         56,  55,  54,  53,
-         52,  50,  49,  47,
-         45,  43,  40,  37,
-         33,  28,  22,  14,
-          5,  -7, -20, -20,
-        -20, -20, -20, -20,
-        -20, -20, -20, -20,
-};
-
-static void bcm43xx_phy_initg(struct bcm43xx_private *bcm);
-
-
-static inline
-void bcm43xx_voluntary_preempt(void)
-{
-        assert(!in_atomic() && !in_irq() &&
-               !in_interrupt() && !irqs_disabled());
-#ifndef CONFIG_PREEMPT
-        cond_resched();
-#endif /* CONFIG_PREEMPT */
-}
-
-void bcm43xx_raw_phy_lock(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        assert(irqs_disabled());
-        if (bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD) == 0x00000000) {
-                phy->is_locked = 0;
-                return;
-        }
-        if (bcm->current_core->rev < 3) {
-                bcm43xx_mac_suspend(bcm);
-                spin_lock(&phy->lock);
-        } else {
-                if (bcm->ieee->iw_mode != IW_MODE_MASTER)
-                        bcm43xx_power_saving_ctl_bits(bcm, -1, 1);
-        }
-        phy->is_locked = 1;
-}
-
-void bcm43xx_raw_phy_unlock(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        assert(irqs_disabled());
-        if (bcm->current_core->rev < 3) {
-                if (phy->is_locked) {
-                        spin_unlock(&phy->lock);
-                        bcm43xx_mac_enable(bcm);
-                }
-        } else {
-                if (bcm->ieee->iw_mode != IW_MODE_MASTER)
-                        bcm43xx_power_saving_ctl_bits(bcm, -1, -1);
-        }
-        phy->is_locked = 0;
-}
-
-u16 bcm43xx_phy_read(struct bcm43xx_private *bcm, u16 offset)
-{
-        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_CONTROL, offset);
-        return bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_DATA);
-}
-
-void bcm43xx_phy_write(struct bcm43xx_private *bcm, u16 offset, u16 val)
-{
-        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_CONTROL, offset);
-        mmiowb();
-        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_DATA, val);
-}
-
-void bcm43xx_phy_calibrate(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* Dummy read. */
-        if (phy->calibrated)
-                return;
-        if (phy->type == BCM43xx_PHYTYPE_G && phy->rev == 1) {
-                bcm43xx_wireless_core_reset(bcm, 0);
-                bcm43xx_phy_initg(bcm);
-                bcm43xx_wireless_core_reset(bcm, 1);
-        }
-        phy->calibrated = 1;
-}
-
-/* Connect the PHY 
- * http://bcm-specs.sipsolutions.net/SetPHY
- */
-int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int connect)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u32 flags;
-
-        if (bcm->current_core->rev < 5)
-                goto out;
-
-        flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
-        if (connect) {
-                if (!(flags & BCM43xx_SBTMSTATEHIGH_G_PHY_AVAIL))
-                        return -ENODEV;
-                flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-                flags |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
-        } else {
-                if (!(flags & BCM43xx_SBTMSTATEHIGH_A_PHY_AVAIL))
-                        return -ENODEV;
-                flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-                flags &= ~BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
-                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
-        }
-out:
-        phy->connected = connect;
-        if (connect)
-                dprintk(KERN_INFO PFX "PHY connected\n");
-        else
-                dprintk(KERN_INFO PFX "PHY disconnected\n");
-
-        return 0;
-}
-
-/* intialize B PHY power control
- * as described in http://bcm-specs.sipsolutions.net/InitPowerControl
- */
-static void bcm43xx_phy_init_pctl(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 saved_batt = 0, saved_ratt = 0, saved_txctl1 = 0;
-        int must_reset_txpower = 0;
-
-        assert(phy->type != BCM43xx_PHYTYPE_A);
-        if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
-            (bcm->board_type == 0x0416))
-                return;
-
-        bcm43xx_phy_write(bcm, 0x0028, 0x8018);
-        bcm43xx_write16(bcm, 0x03E6, bcm43xx_read16(bcm, 0x03E6) & 0xFFDF);
-
-        if (phy->type == BCM43xx_PHYTYPE_G) {
-                if (!phy->connected)
-                        return;
-                bcm43xx_phy_write(bcm, 0x047A, 0xC111);
-        }
-        if (phy->savedpctlreg != 0xFFFF)
-                return;
-
-        if (phy->type == BCM43xx_PHYTYPE_B &&
-            phy->rev >= 2 &&
-            radio->version == 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0076,
-                                      bcm43xx_radio_read16(bcm, 0x0076) | 0x0084);
-        } else {
-                saved_batt = radio->baseband_atten;
-                saved_ratt = radio->radio_atten;
-                saved_txctl1 = radio->txctl1;
-                if ((radio->revision >= 6) && (radio->revision <= 8)
-                    && /*FIXME: incomplete specs for 5 < revision < 9 */ 0)
-                        bcm43xx_radio_set_txpower_bg(bcm, 0xB, 0x1F, 0);
-                else
-                        bcm43xx_radio_set_txpower_bg(bcm, 0xB, 9, 0);
-                must_reset_txpower = 1;
-        }
-        bcm43xx_dummy_transmission(bcm);
-
-        phy->savedpctlreg = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_PCTL);
-
-        if (must_reset_txpower)
-                bcm43xx_radio_set_txpower_bg(bcm, saved_batt, saved_ratt, saved_txctl1);
-        else
-                bcm43xx_radio_write16(bcm, 0x0076, bcm43xx_radio_read16(bcm, 0x0076) & 0xFF7B);
-        bcm43xx_radio_clear_tssi(bcm);
-}
-
-static void bcm43xx_phy_agcsetup(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 offset = 0x0000;
-
-        if (phy->rev == 1)
-                offset = 0x4C00;
-
-        bcm43xx_ilt_write(bcm, offset, 0x00FE);
-        bcm43xx_ilt_write(bcm, offset + 1, 0x000D);
-        bcm43xx_ilt_write(bcm, offset + 2, 0x0013);
-        bcm43xx_ilt_write(bcm, offset + 3, 0x0019);
-
-        if (phy->rev == 1) {
-                bcm43xx_ilt_write(bcm, 0x1800, 0x2710);
-                bcm43xx_ilt_write(bcm, 0x1801, 0x9B83);
-                bcm43xx_ilt_write(bcm, 0x1802, 0x9B83);
-                bcm43xx_ilt_write(bcm, 0x1803, 0x0F8D);
-                bcm43xx_phy_write(bcm, 0x0455, 0x0004);
-        }
-
-        bcm43xx_phy_write(bcm, 0x04A5, (bcm43xx_phy_read(bcm, 0x04A5) & 0x00FF) | 0x5700);
-        bcm43xx_phy_write(bcm, 0x041A, (bcm43xx_phy_read(bcm, 0x041A) & 0xFF80) | 0x000F);
-        bcm43xx_phy_write(bcm, 0x041A, (bcm43xx_phy_read(bcm, 0x041A) & 0xC07F) | 0x2B80);
-        bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C) & 0xF0FF) | 0x0300);
-
-        bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0008);
-
-        bcm43xx_phy_write(bcm, 0x04A0, (bcm43xx_phy_read(bcm, 0x04A0) & 0xFFF0) | 0x0008);
-        bcm43xx_phy_write(bcm, 0x04A1, (bcm43xx_phy_read(bcm, 0x04A1) & 0xF0FF) | 0x0600);
-        bcm43xx_phy_write(bcm, 0x04A2, (bcm43xx_phy_read(bcm, 0x04A2) & 0xF0FF) | 0x0700);
-        bcm43xx_phy_write(bcm, 0x04A0, (bcm43xx_phy_read(bcm, 0x04A0) & 0xF0FF) | 0x0100);
-
-        if (phy->rev == 1)
-                bcm43xx_phy_write(bcm, 0x04A2, (bcm43xx_phy_read(bcm, 0x04A2) & 0xFFF0) | 0x0007);
-
-        bcm43xx_phy_write(bcm, 0x0488, (bcm43xx_phy_read(bcm, 0x0488) & 0xFF00) | 0x001C);
-        bcm43xx_phy_write(bcm, 0x0488, (bcm43xx_phy_read(bcm, 0x0488) & 0xC0FF) | 0x0200);
-        bcm43xx_phy_write(bcm, 0x0496, (bcm43xx_phy_read(bcm, 0x0496) & 0xFF00) | 0x001C);
-        bcm43xx_phy_write(bcm, 0x0489, (bcm43xx_phy_read(bcm, 0x0489) & 0xFF00) | 0x0020);
-        bcm43xx_phy_write(bcm, 0x0489, (bcm43xx_phy_read(bcm, 0x0489) & 0xC0FF) | 0x0200);
-        bcm43xx_phy_write(bcm, 0x0482, (bcm43xx_phy_read(bcm, 0x0482) & 0xFF00) | 0x002E);
-        bcm43xx_phy_write(bcm, 0x0496, (bcm43xx_phy_read(bcm, 0x0496) & 0x00FF) | 0x1A00);
-        bcm43xx_phy_write(bcm, 0x0481, (bcm43xx_phy_read(bcm, 0x0481) & 0xFF00) | 0x0028);
-        bcm43xx_phy_write(bcm, 0x0481, (bcm43xx_phy_read(bcm, 0x0481) & 0x00FF) | 0x2C00);
-
-        if (phy->rev == 1) {
-                bcm43xx_phy_write(bcm, 0x0430, 0x092B);
-                bcm43xx_phy_write(bcm, 0x041B, (bcm43xx_phy_read(bcm, 0x041B) & 0xFFE1) | 0x0002);
-        } else {
-                bcm43xx_phy_write(bcm, 0x041B, bcm43xx_phy_read(bcm, 0x041B) & 0xFFE1);
-                bcm43xx_phy_write(bcm, 0x041F, 0x287A);
-                bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420) & 0xFFF0) | 0x0004);
-        }
-
-        if (phy->rev > 2) {
-                bcm43xx_phy_write(bcm, 0x0422, 0x287A);
-                bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420)
-                                  & 0x0FFF) | 0x3000);
-        }
-                
-        bcm43xx_phy_write(bcm, 0x04A8, (bcm43xx_phy_read(bcm, 0x04A8) & 0x8080)
-                                        | 0x7874);
-        bcm43xx_phy_write(bcm, 0x048E, 0x1C00);
-
-        if (phy->rev == 1) {
-                bcm43xx_phy_write(bcm, 0x04AB, (bcm43xx_phy_read(bcm, 0x04AB)
-                                  & 0xF0FF) | 0x0600);
-                bcm43xx_phy_write(bcm, 0x048B, 0x005E);
-                bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C)
-                                  & 0xFF00) | 0x001E);
-                bcm43xx_phy_write(bcm, 0x048D, 0x0002);
-        }
-
-        bcm43xx_ilt_write(bcm, offset + 0x0800, 0);
-        bcm43xx_ilt_write(bcm, offset + 0x0801, 7);
-        bcm43xx_ilt_write(bcm, offset + 0x0802, 16);
-        bcm43xx_ilt_write(bcm, offset + 0x0803, 28);
-
-        if (phy->rev >= 6) {
-                bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426)
-                                  & 0xFFFC));
-                bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426)
-                                  & 0xEFFF));
-        }
-}
-
-static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 i;
-
-        assert(phy->type == BCM43xx_PHYTYPE_G);
-        if (phy->rev == 1) {
-                bcm43xx_phy_write(bcm, 0x0406, 0x4F19);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                  (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
-                                  & 0xFC3F) | 0x0340);
-                bcm43xx_phy_write(bcm, 0x042C, 0x005A);
-                bcm43xx_phy_write(bcm, 0x0427, 0x001A);
-
-                for (i = 0; i < BCM43xx_ILT_FINEFREQG_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x5800 + i, bcm43xx_ilt_finefreqg[i]);
-                for (i = 0; i < BCM43xx_ILT_NOISEG1_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg1[i]);
-                for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++)
-                        bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]);
-        } else {
-                /* nrssi values are signed 6-bit values. Not sure why we write 0x7654 here... */
-                bcm43xx_nrssi_hw_write(bcm, 0xBA98, (s16)0x7654);
-
-                if (phy->rev == 2) {
-                        bcm43xx_phy_write(bcm, 0x04C0, 0x1861);
-                        bcm43xx_phy_write(bcm, 0x04C1, 0x0271);
-                } else if (phy->rev > 2) {
-                        bcm43xx_phy_write(bcm, 0x04C0, 0x0098);
-                        bcm43xx_phy_write(bcm, 0x04C1, 0x0070);
-                        bcm43xx_phy_write(bcm, 0x04C9, 0x0080);
-                }
-                bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x800);
-
-                for (i = 0; i < 64; i++)
-                        bcm43xx_ilt_write(bcm, 0x4000 + i, i);
-                for (i = 0; i < BCM43xx_ILT_NOISEG2_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg2[i]);
-        }
-        
-        if (phy->rev <= 2)
-                for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg1[i]);
-        else if ((phy->rev >= 7) && (bcm43xx_phy_read(bcm, 0x0449) & 0x0200))
-                for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg3[i]);
-        else
-                for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg2[i]);
-        
-        if (phy->rev == 2)
-                for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr1[i]);
-        else if ((phy->rev > 2) && (phy->rev <= 8))
-                for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr2[i]);
-        
-        if (phy->rev == 1) {
-                for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++)
-                        bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]);
-                for (i = 0; i < 4; i++) {
-                        bcm43xx_ilt_write(bcm, 0x5404 + i, 0x0020);
-                        bcm43xx_ilt_write(bcm, 0x5408 + i, 0x0020);
-                        bcm43xx_ilt_write(bcm, 0x540C + i, 0x0020);
-                        bcm43xx_ilt_write(bcm, 0x5410 + i, 0x0020);
-                }
-                bcm43xx_phy_agcsetup(bcm);
-
-                if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
-                    (bcm->board_type == 0x0416) &&
-                    (bcm->board_revision == 0x0017))
-                        return;
-
-                bcm43xx_ilt_write(bcm, 0x5001, 0x0002);
-                bcm43xx_ilt_write(bcm, 0x5002, 0x0001);
-        } else {
-                for (i = 0; i <= 0x2F; i++)
-                        bcm43xx_ilt_write(bcm, 0x1000 + i, 0x0820);
-                bcm43xx_phy_agcsetup(bcm);
-                bcm43xx_phy_read(bcm, 0x0400); /* dummy read */
-                bcm43xx_phy_write(bcm, 0x0403, 0x1000);
-                bcm43xx_ilt_write(bcm, 0x3C02, 0x000F);
-                bcm43xx_ilt_write(bcm, 0x3C03, 0x0014);
-
-                if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
-                    (bcm->board_type == 0x0416) &&
-                    (bcm->board_revision == 0x0017))
-                        return;
-
-                bcm43xx_ilt_write(bcm, 0x0401, 0x0002);
-                bcm43xx_ilt_write(bcm, 0x0402, 0x0001);
-        }
-}
-
-/* Initialize the noisescaletable for APHY */
-static void bcm43xx_phy_init_noisescaletbl(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        int i;
-
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, 0x1400);
-        for (i = 0; i < 12; i++) {
-                if (phy->rev == 2)
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6767);
-                else
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2323);
-        }
-        if (phy->rev == 2)
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6700);
-        else
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2300);
-        for (i = 0; i < 11; i++) {
-                if (phy->rev == 2)
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6767);
-                else
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2323);
-        }
-        if (phy->rev == 2)
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x0067);
-        else
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x0023);
-}
-
-static void bcm43xx_phy_setupa(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 i;
-
-        assert(phy->type == BCM43xx_PHYTYPE_A);
-        switch (phy->rev) {
-        case 2:
-                bcm43xx_phy_write(bcm, 0x008E, 0x3800);
-                bcm43xx_phy_write(bcm, 0x0035, 0x03FF);
-                bcm43xx_phy_write(bcm, 0x0036, 0x0400);
-
-                bcm43xx_ilt_write(bcm, 0x3807, 0x0051);
-
-                bcm43xx_phy_write(bcm, 0x001C, 0x0FF9);
-                bcm43xx_phy_write(bcm, 0x0020, bcm43xx_phy_read(bcm, 0x0020) & 0xFF0F);
-                bcm43xx_ilt_write(bcm, 0x3C0C, 0x07BF);
-                bcm43xx_radio_write16(bcm, 0x0002, 0x07BF);
-
-                bcm43xx_phy_write(bcm, 0x0024, 0x4680);
-                bcm43xx_phy_write(bcm, 0x0020, 0x0003);
-                bcm43xx_phy_write(bcm, 0x001D, 0x0F40);
-                bcm43xx_phy_write(bcm, 0x001F, 0x1C00);
-
-                bcm43xx_phy_write(bcm, 0x002A, (bcm43xx_phy_read(bcm, 0x002A) & 0x00FF) | 0x0400);
-                bcm43xx_phy_write(bcm, 0x002B, bcm43xx_phy_read(bcm, 0x002B) & 0xFBFF);
-                bcm43xx_phy_write(bcm, 0x008E, 0x58C1);
-
-                bcm43xx_ilt_write(bcm, 0x0803, 0x000F);
-                bcm43xx_ilt_write(bcm, 0x0804, 0x001F);
-                bcm43xx_ilt_write(bcm, 0x0805, 0x002A);
-                bcm43xx_ilt_write(bcm, 0x0805, 0x0030);
-                bcm43xx_ilt_write(bcm, 0x0807, 0x003A);
-
-                bcm43xx_ilt_write(bcm, 0x0000, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0001, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0002, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0003, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0004, 0x0015);
-                bcm43xx_ilt_write(bcm, 0x0005, 0x0015);
-                bcm43xx_ilt_write(bcm, 0x0006, 0x0019);
-
-                bcm43xx_ilt_write(bcm, 0x0404, 0x0003);
-                bcm43xx_ilt_write(bcm, 0x0405, 0x0003);
-                bcm43xx_ilt_write(bcm, 0x0406, 0x0007);
-
-                for (i = 0; i < 16; i++)
-                        bcm43xx_ilt_write(bcm, 0x4000 + i, (0x8 + i) & 0x000F);
-
-                bcm43xx_ilt_write(bcm, 0x3003, 0x1044);
-                bcm43xx_ilt_write(bcm, 0x3004, 0x7201);
-                bcm43xx_ilt_write(bcm, 0x3006, 0x0040);
-                bcm43xx_ilt_write(bcm, 0x3001, (bcm43xx_ilt_read(bcm, 0x3001) & 0x0010) | 0x0008);
-
-                for (i = 0; i < BCM43xx_ILT_FINEFREQA_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x5800 + i, bcm43xx_ilt_finefreqa[i]);
-                for (i = 0; i < BCM43xx_ILT_NOISEA2_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea2[i]);
-                for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++)
-                        bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]);
-                bcm43xx_phy_init_noisescaletbl(bcm);
-                for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++)
-                        bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]);
-                break;
-        case 3:
-                for (i = 0; i < 64; i++)
-                        bcm43xx_ilt_write(bcm, 0x4000 + i, i);
-
-                bcm43xx_ilt_write(bcm, 0x3807, 0x0051);
-
-                bcm43xx_phy_write(bcm, 0x001C, 0x0FF9);
-                bcm43xx_phy_write(bcm, 0x0020, bcm43xx_phy_read(bcm, 0x0020) & 0xFF0F);
-                bcm43xx_radio_write16(bcm, 0x0002, 0x07BF);
-
-                bcm43xx_phy_write(bcm, 0x0024, 0x4680);
-                bcm43xx_phy_write(bcm, 0x0020, 0x0003);
-                bcm43xx_phy_write(bcm, 0x001D, 0x0F40);
-                bcm43xx_phy_write(bcm, 0x001F, 0x1C00);
-                bcm43xx_phy_write(bcm, 0x002A, (bcm43xx_phy_read(bcm, 0x002A) & 0x00FF) | 0x0400);
-
-                bcm43xx_ilt_write(bcm, 0x3001, (bcm43xx_ilt_read(bcm, 0x3001) & 0x0010) | 0x0008);
-                for (i = 0; i < BCM43xx_ILT_NOISEA3_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea3[i]);
-                bcm43xx_phy_init_noisescaletbl(bcm);
-                for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
-                        bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr1[i]);
-
-                bcm43xx_phy_write(bcm, 0x0003, 0x1808);
-
-                bcm43xx_ilt_write(bcm, 0x0803, 0x000F);
-                bcm43xx_ilt_write(bcm, 0x0804, 0x001F);
-                bcm43xx_ilt_write(bcm, 0x0805, 0x002A);
-                bcm43xx_ilt_write(bcm, 0x0805, 0x0030);
-                bcm43xx_ilt_write(bcm, 0x0807, 0x003A);
-
-                bcm43xx_ilt_write(bcm, 0x0000, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0001, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0002, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0003, 0x0013);
-                bcm43xx_ilt_write(bcm, 0x0004, 0x0015);
-                bcm43xx_ilt_write(bcm, 0x0005, 0x0015);
-                bcm43xx_ilt_write(bcm, 0x0006, 0x0019);
-
-                bcm43xx_ilt_write(bcm, 0x0404, 0x0003);
-                bcm43xx_ilt_write(bcm, 0x0405, 0x0003);
-                bcm43xx_ilt_write(bcm, 0x0406, 0x0007);
-
-                bcm43xx_ilt_write(bcm, 0x3C02, 0x000F);
-                bcm43xx_ilt_write(bcm, 0x3C03, 0x0014);
-                break;
-        default:
-                assert(0);
-        }
-}
-
-/* Initialize APHY. This is also called for the GPHY in some cases. */
-static void bcm43xx_phy_inita(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 tval;
-
-        if (phy->type == BCM43xx_PHYTYPE_A) {
-                bcm43xx_phy_setupa(bcm);
-        } else {
-                bcm43xx_phy_setupg(bcm);
-                if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
-                        bcm43xx_phy_write(bcm, 0x046E, 0x03CF);
-                return;
-        }
-
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_A_CRS,
-                          (bcm43xx_phy_read(bcm, BCM43xx_PHY_A_CRS) & 0xF83C) | 0x0340);
-        bcm43xx_phy_write(bcm, 0x0034, 0x0001);
-
-        TODO();//TODO: RSSI AGC
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_A_CRS,
-                          bcm43xx_phy_read(bcm, BCM43xx_PHY_A_CRS) | (1 << 14));
-        bcm43xx_radio_init2060(bcm);
-
-        if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM)
-            && ((bcm->board_type == 0x0416) || (bcm->board_type == 0x040A))) {
-                if (radio->lofcal == 0xFFFF) {
-                        TODO();//TODO: LOF Cal
-                        bcm43xx_radio_set_tx_iq(bcm);
-                } else
-                        bcm43xx_radio_write16(bcm, 0x001E, radio->lofcal);
-        }
-
-        bcm43xx_phy_write(bcm, 0x007A, 0xF111);
-
-        if (phy->savedpctlreg == 0xFFFF) {
-                bcm43xx_radio_write16(bcm, 0x0019, 0x0000);
-                bcm43xx_radio_write16(bcm, 0x0017, 0x0020);
-
-                tval = bcm43xx_ilt_read(bcm, 0x3001);
-                if (phy->rev == 1) {
-                        bcm43xx_ilt_write(bcm, 0x3001,
-                                          (bcm43xx_ilt_read(bcm, 0x3001) & 0xFF87)
-                                          | 0x0058);
-                } else {
-                        bcm43xx_ilt_write(bcm, 0x3001,
-                                          (bcm43xx_ilt_read(bcm, 0x3001) & 0xFFC3)
-                                          | 0x002C);
-                }
-                bcm43xx_dummy_transmission(bcm);
-                phy->savedpctlreg = bcm43xx_phy_read(bcm, BCM43xx_PHY_A_PCTL);
-                bcm43xx_ilt_write(bcm, 0x3001, tval);
-
-                bcm43xx_radio_set_txpower_a(bcm, 0x0018);
-        }
-        bcm43xx_radio_clear_tssi(bcm);
-}
-
-static void bcm43xx_phy_initb2(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 offset, val;
-
-        bcm43xx_write16(bcm, 0x03EC, 0x3F22);
-        bcm43xx_phy_write(bcm, 0x0020, 0x301C);
-        bcm43xx_phy_write(bcm, 0x0026, 0x0000);
-        bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
-        bcm43xx_phy_write(bcm, 0x0088, 0x3E00);
-        val = 0x3C3D;
-        for (offset = 0x0089; offset < 0x00A7; offset++) {
-                bcm43xx_phy_write(bcm, offset, val);
-                val -= 0x0202;
-        }
-        bcm43xx_phy_write(bcm, 0x03E4, 0x3000);
-        if (radio->channel == 0xFF)
-                bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
-        else
-                bcm43xx_radio_selectchannel(bcm, radio->channel, 0);
-        if (radio->version != 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
-                bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
-        }
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
-        if (radio->version == 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
-                bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
-                bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
-                bcm43xx_radio_write16(bcm, 0x007A, 0x000F);
-                bcm43xx_phy_write(bcm, 0x0038, 0x0677);
-                bcm43xx_radio_init2050(bcm);
-        }
-        bcm43xx_phy_write(bcm, 0x0014, 0x0080);
-        bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
-        bcm43xx_phy_write(bcm, 0x0032, 0x00CC);
-        bcm43xx_phy_write(bcm, 0x0035, 0x07C2);
-        bcm43xx_phy_lo_b_measure(bcm);
-        bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
-        if (radio->version != 0x2050)
-                bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
-        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x1000);
-        bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
-        if (radio->version != 0x2050)
-                bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
-        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
-        bcm43xx_phy_init_pctl(bcm);
-}
-
-static void bcm43xx_phy_initb4(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 offset, val;
-
-        bcm43xx_write16(bcm, 0x03EC, 0x3F22);
-        bcm43xx_phy_write(bcm, 0x0020, 0x301C);
-        bcm43xx_phy_write(bcm, 0x0026, 0x0000);
-        bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
-        bcm43xx_phy_write(bcm, 0x0088, 0x3E00);
-        val = 0x3C3D;
-        for (offset = 0x0089; offset < 0x00A7; offset++) {
-                bcm43xx_phy_write(bcm, offset, val);
-                val -= 0x0202;
-        }
-        bcm43xx_phy_write(bcm, 0x03E4, 0x3000);
-        if (radio->channel == 0xFF)
-                bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
-        else
-                bcm43xx_radio_selectchannel(bcm, radio->channel, 0);
-        if (radio->version != 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
-                bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
-        }
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
-        if (radio->version == 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
-                bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
-                bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
-                bcm43xx_radio_write16(bcm, 0x007A, 0x000F);
-                bcm43xx_phy_write(bcm, 0x0038, 0x0677);
-                bcm43xx_radio_init2050(bcm);
-        }
-        bcm43xx_phy_write(bcm, 0x0014, 0x0080);
-        bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
-        if (radio->version == 0x2050)
-                bcm43xx_phy_write(bcm, 0x0032, 0x00E0);
-        bcm43xx_phy_write(bcm, 0x0035, 0x07C2);
-
-        bcm43xx_phy_lo_b_measure(bcm);
-
-        bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
-        if (radio->version == 0x2050)
-                bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
-        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x1100);
-        bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
-        if (radio->version == 0x2050)
-                bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
-        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
-        if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
-                bcm43xx_calc_nrssi_slope(bcm);
-                bcm43xx_calc_nrssi_threshold(bcm);
-        }
-        bcm43xx_phy_init_pctl(bcm);
-}
-
-static void bcm43xx_phy_initb5(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 offset;
-        u16 value;
-        u8 old_channel;
-
-        if (phy->analog == 1)
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A)
-                                      | 0x0050);
-        if ((bcm->board_vendor != PCI_VENDOR_ID_BROADCOM) &&
-            (bcm->board_type != 0x0416)) {
-                value = 0x2120;
-                for (offset = 0x00A8 ; offset < 0x00C7; offset++) {
-                        bcm43xx_phy_write(bcm, offset, value);
-                        value += 0x0202;
-                }
-        }
-        bcm43xx_phy_write(bcm, 0x0035,
-                          (bcm43xx_phy_read(bcm, 0x0035) & 0xF0FF)
-                          | 0x0700);
-        if (radio->version == 0x2050)
-                bcm43xx_phy_write(bcm, 0x0038, 0x0667);
-
-        if (phy->connected) {
-                if (radio->version == 0x2050) {
-                        bcm43xx_radio_write16(bcm, 0x007A,
-                                              bcm43xx_radio_read16(bcm, 0x007A)
-                                              | 0x0020);
-                        bcm43xx_radio_write16(bcm, 0x0051,
-                                              bcm43xx_radio_read16(bcm, 0x0051)
-                                              | 0x0004);
-                }
-                bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO, 0x0000);
-
-                bcm43xx_phy_write(bcm, 0x0802, bcm43xx_phy_read(bcm, 0x0802) | 0x0100);
-                bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x2000);
-
-                bcm43xx_phy_write(bcm, 0x001C, 0x186A);
-
-                bcm43xx_phy_write(bcm, 0x0013, (bcm43xx_phy_read(bcm, 0x0013) & 0x00FF) | 0x1900);
-                bcm43xx_phy_write(bcm, 0x0035, (bcm43xx_phy_read(bcm, 0x0035) & 0xFFC0) | 0x0064);
-                bcm43xx_phy_write(bcm, 0x005D, (bcm43xx_phy_read(bcm, 0x005D) & 0xFF80) | 0x000A);
-        }
-
-        if (bcm->bad_frames_preempt) {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
-                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | (1 << 11));
-        }
-
-        if (phy->analog == 1) {
-                bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
-                bcm43xx_phy_write(bcm, 0x0021, 0x3763);
-                bcm43xx_phy_write(bcm, 0x0022, 0x1BC3);
-                bcm43xx_phy_write(bcm, 0x0023, 0x06F9);
-                bcm43xx_phy_write(bcm, 0x0024, 0x037E);
-        } else
-                bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
-        bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
-        bcm43xx_write16(bcm, 0x03EC, 0x3F22);
-
-        if (phy->analog == 1)
-                bcm43xx_phy_write(bcm, 0x0020, 0x3E1C);
-        else
-                bcm43xx_phy_write(bcm, 0x0020, 0x301C);
-
-        if (phy->analog == 0)
-                bcm43xx_write16(bcm, 0x03E4, 0x3000);
-
-        old_channel = radio->channel;
-        /* Force to channel 7, even if not supported. */
-        bcm43xx_radio_selectchannel(bcm, 7, 0);
-
-        if (radio->version != 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
-                bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
-        }
-
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
-
-        if (radio->version == 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
-        }
-
-        bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
-        bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
-
-        bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0007);
-
-        bcm43xx_radio_selectchannel(bcm, old_channel, 0);
-
-        bcm43xx_phy_write(bcm, 0x0014, 0x0080);
-        bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
-        bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
-
-        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
-
-        if (radio->version == 0x2050)
-                bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
-
-        bcm43xx_write16(bcm, 0x03E4, (bcm43xx_read16(bcm, 0x03E4) & 0xFFC0) | 0x0004);
-}
-
-static void bcm43xx_phy_initb6(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 offset, val;
-        u8 old_channel;
-
-        bcm43xx_phy_write(bcm, 0x003E, 0x817A);
-        bcm43xx_radio_write16(bcm, 0x007A,
-                              (bcm43xx_radio_read16(bcm, 0x007A) | 0x0058));
-        if (radio->revision == 4 ||
-             radio->revision == 5) {
-                bcm43xx_radio_write16(bcm, 0x0051, 0x0037);
-                bcm43xx_radio_write16(bcm, 0x0052, 0x0070);
-                bcm43xx_radio_write16(bcm, 0x0053, 0x00B3);
-                bcm43xx_radio_write16(bcm, 0x0054, 0x009B);
-                bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
-                bcm43xx_radio_write16(bcm, 0x005B, 0x0088);
-                bcm43xx_radio_write16(bcm, 0x005D, 0x0088);
-                bcm43xx_radio_write16(bcm, 0x005E, 0x0088);
-                bcm43xx_radio_write16(bcm, 0x007D, 0x0088);
-                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                                    BCM43xx_UCODEFLAGS_OFFSET,
-                                    (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                    BCM43xx_UCODEFLAGS_OFFSET)
-                                    | 0x00000200));
-        }
-        if (radio->revision == 8) {
-                bcm43xx_radio_write16(bcm, 0x0051, 0x0000);
-                bcm43xx_radio_write16(bcm, 0x0052, 0x0040);
-                bcm43xx_radio_write16(bcm, 0x0053, 0x00B7);
-                bcm43xx_radio_write16(bcm, 0x0054, 0x0098);
-                bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
-                bcm43xx_radio_write16(bcm, 0x005B, 0x006B);
-                bcm43xx_radio_write16(bcm, 0x005C, 0x000F);
-                if (bcm->sprom.boardflags & 0x8000) {
-                        bcm43xx_radio_write16(bcm, 0x005D, 0x00FA);
-                        bcm43xx_radio_write16(bcm, 0x005E, 0x00D8);
-                } else {
-                        bcm43xx_radio_write16(bcm, 0x005D, 0x00F5);
-                        bcm43xx_radio_write16(bcm, 0x005E, 0x00B8);
-                }
-                bcm43xx_radio_write16(bcm, 0x0073, 0x0003);
-                bcm43xx_radio_write16(bcm, 0x007D, 0x00A8);
-                bcm43xx_radio_write16(bcm, 0x007C, 0x0001);
-                bcm43xx_radio_write16(bcm, 0x007E, 0x0008);
-        }
-        val = 0x1E1F;
-        for (offset = 0x0088; offset < 0x0098; offset++) {
-                bcm43xx_phy_write(bcm, offset, val);
-                val -= 0x0202;
-        }
-        val = 0x3E3F;
-        for (offset = 0x0098; offset < 0x00A8; offset++) {
-                bcm43xx_phy_write(bcm, offset, val);
-                val -= 0x0202;
-        }
-        val = 0x2120;
-        for (offset = 0x00A8; offset < 0x00C8; offset++) {
-                bcm43xx_phy_write(bcm, offset, (val & 0x3F3F));
-                val += 0x0202;
-        }
-        if (phy->type == BCM43xx_PHYTYPE_G) {
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0020);
-                bcm43xx_radio_write16(bcm, 0x0051,
-                                      bcm43xx_radio_read16(bcm, 0x0051) | 0x0004);
-                bcm43xx_phy_write(bcm, 0x0802,
-                                  bcm43xx_phy_read(bcm, 0x0802) | 0x0100);
-                bcm43xx_phy_write(bcm, 0x042B,
-                                  bcm43xx_phy_read(bcm, 0x042B) | 0x2000);
-                bcm43xx_phy_write(bcm, 0x5B, 0x0000);
-                bcm43xx_phy_write(bcm, 0x5C, 0x0000);
-        }
-
-        old_channel = radio->channel;
-        if (old_channel >= 8)
-                bcm43xx_radio_selectchannel(bcm, 1, 0);
-        else
-                bcm43xx_radio_selectchannel(bcm, 13, 0);
-
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
-        udelay(40);
-        if (radio->revision < 6 || radio-> revision == 8) {
-                bcm43xx_radio_write16(bcm, 0x007C, (bcm43xx_radio_read16(bcm, 0x007C)
-                                      | 0x0002));
-                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
-        }
-        if (radio->revision <= 2) {
-                bcm43xx_radio_write16(bcm, 0x007C, 0x0020);
-                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
-                bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
-                bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
-        }
-        bcm43xx_radio_write16(bcm, 0x007A,
-                              (bcm43xx_radio_read16(bcm, 0x007A) & 0x00F8) | 0x0007);
-
-        bcm43xx_radio_selectchannel(bcm, old_channel, 0);
-
-        bcm43xx_phy_write(bcm, 0x0014, 0x0200);
-        if (radio->revision >= 6)
-                bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
-        else
-                bcm43xx_phy_write(bcm, 0x002A, 0x8AC0);
-        bcm43xx_phy_write(bcm, 0x0038, 0x0668);
-        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
-        if (radio->revision <= 5)
-                bcm43xx_phy_write(bcm, 0x005D, (bcm43xx_phy_read(bcm, 0x005D)
-                                  & 0xFF80) | 0x0003);
-        if (radio->revision <= 2)
-                bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
-        
-        if (phy->analog == 4){
-                bcm43xx_write16(bcm, 0x03E4, 0x0009);
-                bcm43xx_phy_write(bcm, 0x61, bcm43xx_phy_read(bcm, 0x61) & 0xFFF);
-        } else {
-                bcm43xx_phy_write(bcm, 0x0002, (bcm43xx_phy_read(bcm, 0x0002) & 0xFFC0) | 0x0004);
-        }
-        if (phy->type == BCM43xx_PHYTYPE_G)
-                bcm43xx_write16(bcm, 0x03E6, 0x0);
-        if (phy->type == BCM43xx_PHYTYPE_B) {
-                bcm43xx_write16(bcm, 0x03E6, 0x8140);
-                bcm43xx_phy_write(bcm, 0x0016, 0x0410);
-                bcm43xx_phy_write(bcm, 0x0017, 0x0820);
-                bcm43xx_phy_write(bcm, 0x0062, 0x0007);
-                bcm43xx_radio_init2050(bcm);
-                bcm43xx_phy_lo_g_measure(bcm);
-                if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
-                        bcm43xx_calc_nrssi_slope(bcm);
-                        bcm43xx_calc_nrssi_threshold(bcm);
-                }
-                bcm43xx_phy_init_pctl(bcm);
-        }
-}
-
-static void bcm43xx_calc_loopback_gain(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 backup_phy[15] = {0};
-        u16 backup_radio[3];
-        u16 backup_bband;
-        u16 i;
-        u16 loop1_cnt, loop1_done, loop1_omitted;
-        u16 loop2_done;
-
-        backup_phy[0] = bcm43xx_phy_read(bcm, 0x0429);
-        backup_phy[1] = bcm43xx_phy_read(bcm, 0x0001);
-        backup_phy[2] = bcm43xx_phy_read(bcm, 0x0811);
-        backup_phy[3] = bcm43xx_phy_read(bcm, 0x0812);
-        if (phy->rev != 1) {
-                backup_phy[4] = bcm43xx_phy_read(bcm, 0x0814);
-                backup_phy[5] = bcm43xx_phy_read(bcm, 0x0815);
-        }
-        backup_phy[6] = bcm43xx_phy_read(bcm, 0x005A);
-        backup_phy[7] = bcm43xx_phy_read(bcm, 0x0059);
-        backup_phy[8] = bcm43xx_phy_read(bcm, 0x0058);
-        backup_phy[9] = bcm43xx_phy_read(bcm, 0x000A);
-        backup_phy[10] = bcm43xx_phy_read(bcm, 0x0003);
-        backup_phy[11] = bcm43xx_phy_read(bcm, 0x080F);
-        backup_phy[12] = bcm43xx_phy_read(bcm, 0x0810);
-        backup_phy[13] = bcm43xx_phy_read(bcm, 0x002B);
-        backup_phy[14] = bcm43xx_phy_read(bcm, 0x0015);
-        bcm43xx_phy_read(bcm, 0x002D); /* dummy read */
-        backup_bband = radio->baseband_atten;
-        backup_radio[0] = bcm43xx_radio_read16(bcm, 0x0052);
-        backup_radio[1] = bcm43xx_radio_read16(bcm, 0x0043);
-        backup_radio[2] = bcm43xx_radio_read16(bcm, 0x007A);
-
-        bcm43xx_phy_write(bcm, 0x0429,
-                          bcm43xx_phy_read(bcm, 0x0429) & 0x3FFF);
-        bcm43xx_phy_write(bcm, 0x0001,
-                          bcm43xx_phy_read(bcm, 0x0001) & 0x8000);
-        bcm43xx_phy_write(bcm, 0x0811,
-                          bcm43xx_phy_read(bcm, 0x0811) | 0x0002);
-        bcm43xx_phy_write(bcm, 0x0812,
-                          bcm43xx_phy_read(bcm, 0x0812) & 0xFFFD);
-        bcm43xx_phy_write(bcm, 0x0811,
-                          bcm43xx_phy_read(bcm, 0x0811) | 0x0001);
-        bcm43xx_phy_write(bcm, 0x0812,
-                          bcm43xx_phy_read(bcm, 0x0812) & 0xFFFE);
-        if (phy->rev != 1) {
-                bcm43xx_phy_write(bcm, 0x0814,
-                                  bcm43xx_phy_read(bcm, 0x0814) | 0x0001);
-                bcm43xx_phy_write(bcm, 0x0815,
-                                  bcm43xx_phy_read(bcm, 0x0815) & 0xFFFE);
-                bcm43xx_phy_write(bcm, 0x0814,
-                                  bcm43xx_phy_read(bcm, 0x0814) | 0x0002);
-                bcm43xx_phy_write(bcm, 0x0815,
-                                  bcm43xx_phy_read(bcm, 0x0815) & 0xFFFD);
-        }
-        bcm43xx_phy_write(bcm, 0x0811,
-                          bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
-        bcm43xx_phy_write(bcm, 0x0812,
-                          bcm43xx_phy_read(bcm, 0x0812) | 0x000C);
-
-        bcm43xx_phy_write(bcm, 0x0811,
-                          (bcm43xx_phy_read(bcm, 0x0811)
-                           & 0xFFCF) | 0x0030);
-        bcm43xx_phy_write(bcm, 0x0812,
-                          (bcm43xx_phy_read(bcm, 0x0812)
-                           & 0xFFCF) | 0x0010);
-
-        bcm43xx_phy_write(bcm, 0x005A, 0x0780);
-        bcm43xx_phy_write(bcm, 0x0059, 0xC810);
-        bcm43xx_phy_write(bcm, 0x0058, 0x000D);
-        if (phy->analog == 0) {
-                bcm43xx_phy_write(bcm, 0x0003, 0x0122);
-        } else {
-                bcm43xx_phy_write(bcm, 0x000A,
-                                  bcm43xx_phy_read(bcm, 0x000A)
-                                  | 0x2000);
-        }
-        if (phy->rev != 1) {
-                bcm43xx_phy_write(bcm, 0x0814,
-                                  bcm43xx_phy_read(bcm, 0x0814) | 0x0004);
-                bcm43xx_phy_write(bcm, 0x0815,
-                                  bcm43xx_phy_read(bcm, 0x0815) & 0xFFFB);
-        }
-        bcm43xx_phy_write(bcm, 0x0003,
-                          (bcm43xx_phy_read(bcm, 0x0003)
-                           & 0xFF9F) | 0x0040);
-        if (radio->version == 0x2050 && radio->revision == 2) {
-                bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
-                bcm43xx_radio_write16(bcm, 0x0043,
-                                      (bcm43xx_radio_read16(bcm, 0x0043)
-                                       & 0xFFF0) | 0x0009);
-                loop1_cnt = 9;
-        } else if (radio->revision == 8) {
-                bcm43xx_radio_write16(bcm, 0x0043, 0x000F);
-                loop1_cnt = 15;
-        } else
-                loop1_cnt = 0;
-
-        bcm43xx_phy_set_baseband_attenuation(bcm, 11);
-
-        if (phy->rev >= 3)
-                bcm43xx_phy_write(bcm, 0x080F, 0xC020);
-        else
-                bcm43xx_phy_write(bcm, 0x080F, 0x8020);
-        bcm43xx_phy_write(bcm, 0x0810, 0x0000);
-
-        bcm43xx_phy_write(bcm, 0x002B,
-                          (bcm43xx_phy_read(bcm, 0x002B)
-                           & 0xFFC0) | 0x0001);
-        bcm43xx_phy_write(bcm, 0x002B,
-                          (bcm43xx_phy_read(bcm, 0x002B)
-                           & 0xC0FF) | 0x0800);
-        bcm43xx_phy_write(bcm, 0x0811,
-                          bcm43xx_phy_read(bcm, 0x0811) | 0x0100);
-        bcm43xx_phy_write(bcm, 0x0812,
-                          bcm43xx_phy_read(bcm, 0x0812) & 0xCFFF);
-        if (bcm->sprom.boardflags & BCM43xx_BFL_EXTLNA) {
-                if (phy->rev >= 7) {
-                        bcm43xx_phy_write(bcm, 0x0811,
-                                          bcm43xx_phy_read(bcm, 0x0811)
-                                          | 0x0800);
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          bcm43xx_phy_read(bcm, 0x0812)
-                                          | 0x8000);
-                }
-        }
-        bcm43xx_radio_write16(bcm, 0x007A,
-                              bcm43xx_radio_read16(bcm, 0x007A)
-                              & 0x00F7);
-
-        for (i = 0; i < loop1_cnt; i++) {
-                bcm43xx_radio_write16(bcm, 0x0043, loop1_cnt);
-                bcm43xx_phy_write(bcm, 0x0812,
-                                  (bcm43xx_phy_read(bcm, 0x0812)
-                                   & 0xF0FF) | (i << 8));
-                bcm43xx_phy_write(bcm, 0x0015,
-                                  (bcm43xx_phy_read(bcm, 0x0015)
-                                   & 0x0FFF) | 0xA000);
-                bcm43xx_phy_write(bcm, 0x0015,
-                                  (bcm43xx_phy_read(bcm, 0x0015)
-                                   & 0x0FFF) | 0xF000);
-                udelay(20);
-                if (bcm43xx_phy_read(bcm, 0x002D) >= 0x0DFC)
-                        break;
-        }
-        loop1_done = i;
-        loop1_omitted = loop1_cnt - loop1_done;
-
-        loop2_done = 0;
-        if (loop1_done >= 8) {
-                bcm43xx_phy_write(bcm, 0x0812,
-                                  bcm43xx_phy_read(bcm, 0x0812)
-                                  | 0x0030);
-                for (i = loop1_done - 8; i < 16; i++) {
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          (bcm43xx_phy_read(bcm, 0x0812)
-                                           & 0xF0FF) | (i << 8));
-                        bcm43xx_phy_write(bcm, 0x0015,
-                                          (bcm43xx_phy_read(bcm, 0x0015)
-                                           & 0x0FFF) | 0xA000);
-                        bcm43xx_phy_write(bcm, 0x0015,
-                                          (bcm43xx_phy_read(bcm, 0x0015)
-                                           & 0x0FFF) | 0xF000);
-                        udelay(20);
-                        if (bcm43xx_phy_read(bcm, 0x002D) >= 0x0DFC)
-                                break;
-                }
-        }
-
-        if (phy->rev != 1) {
-                bcm43xx_phy_write(bcm, 0x0814, backup_phy[4]);
-                bcm43xx_phy_write(bcm, 0x0815, backup_phy[5]);
-        }
-        bcm43xx_phy_write(bcm, 0x005A, backup_phy[6]);
-        bcm43xx_phy_write(bcm, 0x0059, backup_phy[7]);
-        bcm43xx_phy_write(bcm, 0x0058, backup_phy[8]);
-        bcm43xx_phy_write(bcm, 0x000A, backup_phy[9]);
-        bcm43xx_phy_write(bcm, 0x0003, backup_phy[10]);
-        bcm43xx_phy_write(bcm, 0x080F, backup_phy[11]);
-        bcm43xx_phy_write(bcm, 0x0810, backup_phy[12]);
-        bcm43xx_phy_write(bcm, 0x002B, backup_phy[13]);
-        bcm43xx_phy_write(bcm, 0x0015, backup_phy[14]);
-
-        bcm43xx_phy_set_baseband_attenuation(bcm, backup_bband);
-
-        bcm43xx_radio_write16(bcm, 0x0052, backup_radio[0]);
-        bcm43xx_radio_write16(bcm, 0x0043, backup_radio[1]);
-        bcm43xx_radio_write16(bcm, 0x007A, backup_radio[2]);
-
-        bcm43xx_phy_write(bcm, 0x0811, backup_phy[2] | 0x0003);
-        udelay(10);
-        bcm43xx_phy_write(bcm, 0x0811, backup_phy[2]);
-        bcm43xx_phy_write(bcm, 0x0812, backup_phy[3]);
-        bcm43xx_phy_write(bcm, 0x0429, backup_phy[0]);
-        bcm43xx_phy_write(bcm, 0x0001, backup_phy[1]);
-
-        phy->loopback_gain[0] = ((loop1_done * 6) - (loop1_omitted * 4)) - 11;
-        phy->loopback_gain[1] = (24 - (3 * loop2_done)) * 2;
-}
-
-static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 tmp;
-
-        if (phy->rev == 1)
-                bcm43xx_phy_initb5(bcm);
-        else
-                bcm43xx_phy_initb6(bcm);
-        if (phy->rev >= 2 || phy->connected)
-                bcm43xx_phy_inita(bcm);
-
-        if (phy->rev >= 2) {
-                bcm43xx_phy_write(bcm, 0x0814, 0x0000);
-                bcm43xx_phy_write(bcm, 0x0815, 0x0000);
-        }
-        if (phy->rev == 2) {
-                bcm43xx_phy_write(bcm, 0x0811, 0x0000);
-                bcm43xx_phy_write(bcm, 0x0015, 0x00C0);
-        }
-        if (phy->rev > 5) {
-                bcm43xx_phy_write(bcm, 0x0811, 0x0400);
-                bcm43xx_phy_write(bcm, 0x0015, 0x00C0);
-        }
-        if (phy->rev >= 2 && phy->connected) {
-                tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF;
-                if (tmp ==3 || tmp == 5) {
-                        bcm43xx_phy_write(bcm, 0x04C2, 0x1816);
-                        bcm43xx_phy_write(bcm, 0x04C3, 0x8006);
-                        if (tmp == 5) {
-                                bcm43xx_phy_write(bcm, 0x04CC,
-                                                  (bcm43xx_phy_read(bcm, 0x04CC)
-                                                   & 0x00FF) | 0x1F00);
-                        }
-                }
-                bcm43xx_phy_write(bcm, 0x047E, 0x0078);
-        }
-        if (radio->revision == 8) {
-                bcm43xx_phy_write(bcm, 0x0801, bcm43xx_phy_read(bcm, 0x0801) | 0x0080);
-                bcm43xx_phy_write(bcm, 0x043E, bcm43xx_phy_read(bcm, 0x043E) | 0x0004);
-        }
-        if (phy->rev >= 2 && phy->connected)
-                bcm43xx_calc_loopback_gain(bcm);
-        if (radio->revision != 8) {
-                if (radio->initval == 0xFFFF)
-                        radio->initval = bcm43xx_radio_init2050(bcm);
-                else
-                        bcm43xx_radio_write16(bcm, 0x0078, radio->initval);
-        }
-        if (radio->txctl2 == 0xFFFF) {
-                bcm43xx_phy_lo_g_measure(bcm);
-        } else {
-                if (radio->version == 0x2050 && radio->revision == 8) {
-                        bcm43xx_radio_write16(bcm, 0x0052,
-                                              (radio->txctl1 << 4) | radio->txctl2);
-                } else {
-                        bcm43xx_radio_write16(bcm, 0x0052,
-                                              (bcm43xx_radio_read16(bcm, 0x0052)
-                                               & 0xFFF0) | radio->txctl1);
-                }
-                if (phy->rev >= 6) {
-                        bcm43xx_phy_write(bcm, 0x0036,
-                                          (bcm43xx_phy_read(bcm, 0x0036)
-                                           & 0x0FFF) | (radio->txctl2 << 12));
-                }
-                if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
-                        bcm43xx_phy_write(bcm, 0x002E, 0x8075);
-                else
-                        bcm43xx_phy_write(bcm, 0x002E, 0x807F);
-                if (phy->rev < 2)
-                        bcm43xx_phy_write(bcm, 0x002F, 0x0101);
-                else
-                        bcm43xx_phy_write(bcm, 0x002F, 0x0202);
-        }
-        if (phy->connected || phy->rev >= 2) {
-                bcm43xx_phy_lo_adjust(bcm, 0);
-                bcm43xx_phy_write(bcm, 0x080F, 0x8078);
-        }
-
-        if (!(bcm->sprom.boardflags & BCM43xx_BFL_RSSI)) {
-                /* The specs state to update the NRSSI LT with
-                 * the value 0x7FFFFFFF here. I think that is some weird
-                 * compiler optimization in the original driver.
-                 * Essentially, what we do here is resetting all NRSSI LT
-                 * entries to -32 (see the limit_value() in nrssi_hw_update())
-                 */
-                bcm43xx_nrssi_hw_update(bcm, 0xFFFF);
-                bcm43xx_calc_nrssi_threshold(bcm);
-        } else if (phy->connected || phy->rev >= 2) {
-                if (radio->nrssi[0] == -1000) {
-                        assert(radio->nrssi[1] == -1000);
-                        bcm43xx_calc_nrssi_slope(bcm);
-                } else {
-                        assert(radio->nrssi[1] != -1000);
-                        bcm43xx_calc_nrssi_threshold(bcm);
-                }
-        }
-        if (radio->revision == 8)
-                bcm43xx_phy_write(bcm, 0x0805, 0x3230);
-        bcm43xx_phy_init_pctl(bcm);
-        if (bcm->chip_id == 0x4306 && bcm->chip_package == 2) {
-                bcm43xx_phy_write(bcm, 0x0429,
-                                  bcm43xx_phy_read(bcm, 0x0429) & 0xBFFF);
-                bcm43xx_phy_write(bcm, 0x04C3,
-                                  bcm43xx_phy_read(bcm, 0x04C3) & 0x7FFF);
-        }
-}
-
-static u16 bcm43xx_phy_lo_b_r15_loop(struct bcm43xx_private *bcm)
-{
-        int i;
-        u16 ret = 0;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        for (i = 0; i < 10; i++){
-                bcm43xx_phy_write(bcm, 0x0015, 0xAFA0);
-                udelay(1);
-                bcm43xx_phy_write(bcm, 0x0015, 0xEFA0);
-                udelay(10);
-                bcm43xx_phy_write(bcm, 0x0015, 0xFFA0);
-                udelay(40);
-                ret += bcm43xx_phy_read(bcm, 0x002C);
-        }
-        local_irq_restore(flags);
-        bcm43xx_voluntary_preempt();
-
-        return ret;
-}
-
-void bcm43xx_phy_lo_b_measure(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 regstack[12] = { 0 };
-        u16 mls;
-        u16 fval;
-        int i, j;
-
-        regstack[0] = bcm43xx_phy_read(bcm, 0x0015);
-        regstack[1] = bcm43xx_radio_read16(bcm, 0x0052) & 0xFFF0;
-
-        if (radio->version == 0x2053) {
-                regstack[2] = bcm43xx_phy_read(bcm, 0x000A);
-                regstack[3] = bcm43xx_phy_read(bcm, 0x002A);
-                regstack[4] = bcm43xx_phy_read(bcm, 0x0035);
-                regstack[5] = bcm43xx_phy_read(bcm, 0x0003);
-                regstack[6] = bcm43xx_phy_read(bcm, 0x0001);
-                regstack[7] = bcm43xx_phy_read(bcm, 0x0030);
-
-                regstack[8] = bcm43xx_radio_read16(bcm, 0x0043);
-                regstack[9] = bcm43xx_radio_read16(bcm, 0x007A);
-                regstack[10] = bcm43xx_read16(bcm, 0x03EC);
-                regstack[11] = bcm43xx_radio_read16(bcm, 0x0052) & 0x00F0;
-
-                bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
-                bcm43xx_write16(bcm, 0x03EC, 0x3F3F);
-                bcm43xx_phy_write(bcm, 0x0035, regstack[4] & 0xFF7F);
-                bcm43xx_radio_write16(bcm, 0x007A, regstack[9] & 0xFFF0);
-        }
-        bcm43xx_phy_write(bcm, 0x0015, 0xB000);
-        bcm43xx_phy_write(bcm, 0x002B, 0x0004);
-
-        if (radio->version == 0x2053) {
-                bcm43xx_phy_write(bcm, 0x002B, 0x0203);
-                bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
-        }
-
-        phy->minlowsig[0] = 0xFFFF;
-
-        for (i = 0; i < 4; i++) {
-                bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | i);
-                bcm43xx_phy_lo_b_r15_loop(bcm);
-        }
-        for (i = 0; i < 10; i++) {
-                bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | i);
-                mls = bcm43xx_phy_lo_b_r15_loop(bcm) / 10;
-                if (mls < phy->minlowsig[0]) {
-                        phy->minlowsig[0] = mls;
-                        phy->minlowsigpos[0] = i;
-                }
-        }
-        bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | phy->minlowsigpos[0]);
-
-        phy->minlowsig[1] = 0xFFFF;
-
-        for (i = -4; i < 5; i += 2) {
-                for (j = -4; j < 5; j += 2) {
-                        if (j < 0)
-                                fval = (0x0100 * i) + j + 0x0100;
-                        else
-                                fval = (0x0100 * i) + j;
-                        bcm43xx_phy_write(bcm, 0x002F, fval);
-                        mls = bcm43xx_phy_lo_b_r15_loop(bcm) / 10;
-                        if (mls < phy->minlowsig[1]) {
-                                phy->minlowsig[1] = mls;
-                                phy->minlowsigpos[1] = fval;
-                        }
-                }
-        }
-        phy->minlowsigpos[1] += 0x0101;
-
-        bcm43xx_phy_write(bcm, 0x002F, phy->minlowsigpos[1]);
-        if (radio->version == 0x2053) {
-                bcm43xx_phy_write(bcm, 0x000A, regstack[2]);
-                bcm43xx_phy_write(bcm, 0x002A, regstack[3]);
-                bcm43xx_phy_write(bcm, 0x0035, regstack[4]);
-                bcm43xx_phy_write(bcm, 0x0003, regstack[5]);
-                bcm43xx_phy_write(bcm, 0x0001, regstack[6]);
-                bcm43xx_phy_write(bcm, 0x0030, regstack[7]);
-
-                bcm43xx_radio_write16(bcm, 0x0043, regstack[8]);
-                bcm43xx_radio_write16(bcm, 0x007A, regstack[9]);
-
-                bcm43xx_radio_write16(bcm, 0x0052,
-                                      (bcm43xx_radio_read16(bcm, 0x0052) & 0x000F)
-                                      | regstack[11]);
-
-                bcm43xx_write16(bcm, 0x03EC, regstack[10]);
-        }
-        bcm43xx_phy_write(bcm, 0x0015, regstack[0]);
-}
-
-static inline
-u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_private *bcm, u16 control)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 ret;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        if (phy->connected) {
-                bcm43xx_phy_write(bcm, 0x15, 0xE300);
-                control <<= 8;
-                bcm43xx_phy_write(bcm, 0x0812, control | 0x00B0);
-                udelay(5);
-                bcm43xx_phy_write(bcm, 0x0812, control | 0x00B2);
-                udelay(2);
-                bcm43xx_phy_write(bcm, 0x0812, control | 0x00B3);
-                udelay(4);
-                bcm43xx_phy_write(bcm, 0x0015, 0xF300);
-                udelay(8);
-        } else {
-                bcm43xx_phy_write(bcm, 0x0015, control | 0xEFA0);
-                udelay(2);
-                bcm43xx_phy_write(bcm, 0x0015, control | 0xEFE0);
-                udelay(4);
-                bcm43xx_phy_write(bcm, 0x0015, control | 0xFFE0);
-                udelay(8);
-        }
-        ret = bcm43xx_phy_read(bcm, 0x002D);
-        local_irq_restore(flags);
-        bcm43xx_voluntary_preempt();
-
-        return ret;
-}
-
-static u32 bcm43xx_phy_lo_g_singledeviation(struct bcm43xx_private *bcm, u16 control)
-{
-        int i;
-        u32 ret = 0;
-
-        for (i = 0; i < 8; i++)
-                ret += bcm43xx_phy_lo_g_deviation_subval(bcm, control);
-
-        return ret;
-}
-
-/* Write the LocalOscillator CONTROL */
-static inline
-void bcm43xx_lo_write(struct bcm43xx_private *bcm,
-                      struct bcm43xx_lopair *pair)
-{
-        u16 value;
-
-        value = (u8)(pair->low);
-        value |= ((u8)(pair->high)) << 8;
-
-#ifdef CONFIG_BCM43XX_DEBUG
-        /* Sanity check. */
-        if (pair->low < -8 || pair->low > 8 ||
-            pair->high < -8 || pair->high > 8) {
-                printk(KERN_WARNING PFX
-                       "WARNING: Writing invalid LOpair "
-                       "(low: %d, high: %d, index: %lu)\n",
-                       pair->low, pair->high,
-                       (unsigned long)(pair - bcm43xx_current_phy(bcm)->_lo_pairs));
-                dump_stack();
-        }
-#endif
-
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, value);
-}
-
-static inline
-struct bcm43xx_lopair * bcm43xx_find_lopair(struct bcm43xx_private *bcm,
-                                            u16 baseband_attenuation,
-                                            u16 radio_attenuation,
-                                            u16 tx)
-{
-        static const u8 dict[10] = { 11, 10, 11, 12, 13, 12, 13, 12, 13, 12 };
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        if (baseband_attenuation > 6)
-                baseband_attenuation = 6;
-        assert(radio_attenuation < 10);
-
-        if (tx == 3) {
-                return bcm43xx_get_lopair(phy,
-                                          radio_attenuation,
-                                          baseband_attenuation);
-        }
-        return bcm43xx_get_lopair(phy, dict[radio_attenuation], baseband_attenuation);
-}
-
-static inline
-struct bcm43xx_lopair * bcm43xx_current_lopair(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-
-        return bcm43xx_find_lopair(bcm,
-                                   radio->baseband_atten,
-                                   radio->radio_atten,
-                                   radio->txctl1);
-}
-
-/* Adjust B/G LO */
-void bcm43xx_phy_lo_adjust(struct bcm43xx_private *bcm, int fixed)
-{
-        struct bcm43xx_lopair *pair;
-
-        if (fixed) {
-                /* Use fixed values. Only for initialization. */
-                pair = bcm43xx_find_lopair(bcm, 2, 3, 0);
-        } else
-                pair = bcm43xx_current_lopair(bcm);
-        bcm43xx_lo_write(bcm, pair);
-}
-
-static void bcm43xx_phy_lo_g_measure_txctl2(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 txctl2 = 0, i;
-        u32 smallest, tmp;
-
-        bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
-        udelay(10);
-        smallest = bcm43xx_phy_lo_g_singledeviation(bcm, 0);
-        for (i = 0; i < 16; i++) {
-                bcm43xx_radio_write16(bcm, 0x0052, i);
-                udelay(10);
-                tmp = bcm43xx_phy_lo_g_singledeviation(bcm, 0);
-                if (tmp < smallest) {
-                        smallest = tmp;
-                        txctl2 = i;
-                }
-        }
-        radio->txctl2 = txctl2;
-}
-
-static
-void bcm43xx_phy_lo_g_state(struct bcm43xx_private *bcm,
-                            const struct bcm43xx_lopair *in_pair,
-                            struct bcm43xx_lopair *out_pair,
-                            u16 r27)
-{
-        static const struct bcm43xx_lopair transitions[8] = {
-                { .high =  1,  .low =  1, },
-                { .high =  1,  .low =  0, },
-                { .high =  1,  .low = -1, },
-                { .high =  0,  .low = -1, },
-                { .high = -1,  .low = -1, },
-                { .high = -1,  .low =  0, },
-                { .high = -1,  .low =  1, },
-                { .high =  0,  .low =  1, },
-        };
-        struct bcm43xx_lopair lowest_transition = {
-                .high = in_pair->high,
-                .low = in_pair->low,
-        };
-        struct bcm43xx_lopair tmp_pair;
-        struct bcm43xx_lopair transition;
-        int i = 12;
-        int state = 0;
-        int found_lower;
-        int j, begin, end;
-        u32 lowest_deviation;
-        u32 tmp;
-
-        /* Note that in_pair and out_pair can point to the same pair. Be careful. */
-
-        bcm43xx_lo_write(bcm, &lowest_transition);
-        lowest_deviation = bcm43xx_phy_lo_g_singledeviation(bcm, r27);
-        do {
-                found_lower = 0;
-                assert(state >= 0 && state <= 8);
-                if (state == 0) {
-                        begin = 1;
-                        end = 8;
-                } else if (state % 2 == 0) {
-                        begin = state - 1;
-                        end = state + 1;
-                } else {
-                        begin = state - 2;
-                        end = state + 2;
-                }
-                if (begin < 1)
-                        begin += 8;
-                if (end > 8)
-                        end -= 8;
-
-                j = begin;
-                tmp_pair.high = lowest_transition.high;
-                tmp_pair.low = lowest_transition.low;
-                while (1) {
-                        assert(j >= 1 && j <= 8);
-                        transition.high = tmp_pair.high + transitions[j - 1].high;
-                        transition.low = tmp_pair.low + transitions[j - 1].low;
-                        if ((abs(transition.low) < 9) && (abs(transition.high) < 9)) {
-                                bcm43xx_lo_write(bcm, &transition);
-                                tmp = bcm43xx_phy_lo_g_singledeviation(bcm, r27);
-                                if (tmp < lowest_deviation) {
-                                        lowest_deviation = tmp;
-                                        state = j;
-                                        found_lower = 1;
-
-                                        lowest_transition.high = transition.high;
-                                        lowest_transition.low = transition.low;
-                                }
-                        }
-                        if (j == end)
-                                break;
-                        if (j == 8)
-                                j = 1;
-                        else
-                                j++;
-                }
-        } while (i-- && found_lower);
-
-        out_pair->high = lowest_transition.high;
-        out_pair->low = lowest_transition.low;
-}
-
-/* Set the baseband attenuation value on chip. */
-void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,
-                                          u16 baseband_attenuation)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 value;
-
-        if (phy->analog == 0) {
-                value = (bcm43xx_read16(bcm, 0x03E6) & 0xFFF0);
-                value |= (baseband_attenuation & 0x000F);
-                bcm43xx_write16(bcm, 0x03E6, value);
-                return;
-        }
-
-        if (phy->analog > 1) {
-                value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C;
-                value |= (baseband_attenuation << 2) & 0x003C;
-        } else {
-                value = bcm43xx_phy_read(bcm, 0x0060) & ~0x0078;
-                value |= (baseband_attenuation << 3) & 0x0078;
-        }
-        bcm43xx_phy_write(bcm, 0x0060, value);
-}
-
-/* http://bcm-specs.sipsolutions.net/LocalOscillator/Measure */
-void bcm43xx_phy_lo_g_measure(struct bcm43xx_private *bcm)
-{
-        static const u8 pairorder[10] = { 3, 1, 5, 7, 9, 2, 0, 4, 6, 8 };
-        const int is_initializing = (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZING);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 h, i, oldi = 0, j;
-        struct bcm43xx_lopair control;
-        struct bcm43xx_lopair *tmp_control;
-        u16 tmp;
-        u16 regstack[16] = { 0 };
-        u8 oldchannel;
-
-        //XXX: What are these?
-        u8 r27 = 0, r31;
-
-        oldchannel = radio->channel;
-        /* Setup */
-        if (phy->connected) {
-                regstack[0] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS);
-                regstack[1] = bcm43xx_phy_read(bcm, 0x0802);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
-                bcm43xx_phy_write(bcm, 0x0802, regstack[1] & 0xFFFC);
-        }
-        regstack[3] = bcm43xx_read16(bcm, 0x03E2);
-        bcm43xx_write16(bcm, 0x03E2, regstack[3] | 0x8000);
-        regstack[4] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
-        regstack[5] = bcm43xx_phy_read(bcm, 0x15);
-        regstack[6] = bcm43xx_phy_read(bcm, 0x2A);
-        regstack[7] = bcm43xx_phy_read(bcm, 0x35);
-        regstack[8] = bcm43xx_phy_read(bcm, 0x60);
-        regstack[9] = bcm43xx_radio_read16(bcm, 0x43);
-        regstack[10] = bcm43xx_radio_read16(bcm, 0x7A);
-        regstack[11] = bcm43xx_radio_read16(bcm, 0x52);
-        if (phy->connected) {
-                regstack[12] = bcm43xx_phy_read(bcm, 0x0811);
-                regstack[13] = bcm43xx_phy_read(bcm, 0x0812);
-                regstack[14] = bcm43xx_phy_read(bcm, 0x0814);
-                regstack[15] = bcm43xx_phy_read(bcm, 0x0815);
-        }
-        bcm43xx_radio_selectchannel(bcm, 6, 0);
-        if (phy->connected) {
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
-                bcm43xx_phy_write(bcm, 0x0802, regstack[1] & 0xFFFC);
-                bcm43xx_dummy_transmission(bcm);
-        }
-        bcm43xx_radio_write16(bcm, 0x0043, 0x0006);
-
-        bcm43xx_phy_set_baseband_attenuation(bcm, 2);
-
-        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x0000);
-        bcm43xx_phy_write(bcm, 0x002E, 0x007F);
-        bcm43xx_phy_write(bcm, 0x080F, 0x0078);
-        bcm43xx_phy_write(bcm, 0x0035, regstack[7] & ~(1 << 7));
-        bcm43xx_radio_write16(bcm, 0x007A, regstack[10] & 0xFFF0);
-        bcm43xx_phy_write(bcm, 0x002B, 0x0203);
-        bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
-        if (phy->connected) {
-                bcm43xx_phy_write(bcm, 0x0814, regstack[14] | 0x0003);
-                bcm43xx_phy_write(bcm, 0x0815, regstack[15] & 0xFFFC);
-                bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
-                bcm43xx_phy_write(bcm, 0x0812, 0x00B2);
-        }
-        if (is_initializing)
-                bcm43xx_phy_lo_g_measure_txctl2(bcm);
-        bcm43xx_phy_write(bcm, 0x080F, 0x8078);
-
-        /* Measure */
-        control.low = 0;
-        control.high = 0;
-        for (h = 0; h < 10; h++) {
-                /* Loop over each possible RadioAttenuation (0-9) */
-                i = pairorder[h];
-                if (is_initializing) {
-                        if (i == 3) {
-                                control.low = 0;
-                                control.high = 0;
-                        } else if (((i % 2 == 1) && (oldi % 2 == 1)) ||
-                                  ((i % 2 == 0) && (oldi % 2 == 0))) {
-                                tmp_control = bcm43xx_get_lopair(phy, oldi, 0);
-                                memcpy(&control, tmp_control, sizeof(control));
-                        } else {
-                                tmp_control = bcm43xx_get_lopair(phy, 3, 0);
-                                memcpy(&control, tmp_control, sizeof(control));
-                        }
-                }
-                /* Loop over each possible BasebandAttenuation/2 */
-                for (j = 0; j < 4; j++) {
-                        if (is_initializing) {
-                                tmp = i * 2 + j;
-                                r27 = 0;
-                                r31 = 0;
-                                if (tmp > 14) {
-                                        r31 = 1;
-                                        if (tmp > 17)
-                                                r27 = 1;
-                                        if (tmp > 19)
-                                                r27 = 2;
-                                }
-                        } else {
-                                tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
-                                if (!tmp_control->used)
-                                        continue;
-                                memcpy(&control, tmp_control, sizeof(control));
-                                r27 = 3;
-                                r31 = 0;
-                        }
-                        bcm43xx_radio_write16(bcm, 0x43, i);
-                        bcm43xx_radio_write16(bcm, 0x52, radio->txctl2);
-                        udelay(10);
-                        bcm43xx_voluntary_preempt();
-
-                        bcm43xx_phy_set_baseband_attenuation(bcm, j * 2);
-
-                        tmp = (regstack[10] & 0xFFF0);
-                        if (r31)
-                                tmp |= 0x0008;
-                        bcm43xx_radio_write16(bcm, 0x007A, tmp);
-
-                        tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
-                        bcm43xx_phy_lo_g_state(bcm, &control, tmp_control, r27);
-                }
-                oldi = i;
-        }
-        /* Loop over each possible RadioAttenuation (10-13) */
-        for (i = 10; i < 14; i++) {
-                /* Loop over each possible BasebandAttenuation/2 */
-                for (j = 0; j < 4; j++) {
-                        if (is_initializing) {
-                                tmp_control = bcm43xx_get_lopair(phy, i - 9, j * 2);
-                                memcpy(&control, tmp_control, sizeof(control));
-                                tmp = (i - 9) * 2 + j - 5;//FIXME: This is wrong, as the following if statement can never trigger.
-                                r27 = 0;
-                                r31 = 0;
-                                if (tmp > 14) {
-                                        r31 = 1;
-                                        if (tmp > 17)
-                                                r27 = 1;
-                                        if (tmp > 19)
-                                                r27 = 2;
-                                }
-                        } else {
-                                tmp_control = bcm43xx_get_lopair(phy, i - 9, j * 2);
-                                if (!tmp_control->used)
-                                        continue;
-                                memcpy(&control, tmp_control, sizeof(control));
-                                r27 = 3;
-                                r31 = 0;
-                        }
-                        bcm43xx_radio_write16(bcm, 0x43, i - 9);
-                        bcm43xx_radio_write16(bcm, 0x52,
-                                              radio->txctl2
-                                              | (3/*txctl1*/ << 4));//FIXME: shouldn't txctl1 be zero here and 3 in the loop above?
-                        udelay(10);
-                        bcm43xx_voluntary_preempt();
-
-                        bcm43xx_phy_set_baseband_attenuation(bcm, j * 2);
-
-                        tmp = (regstack[10] & 0xFFF0);
-                        if (r31)
-                                tmp |= 0x0008;
-                        bcm43xx_radio_write16(bcm, 0x7A, tmp);
-
-                        tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
-                        bcm43xx_phy_lo_g_state(bcm, &control, tmp_control, r27);
-                }
-        }
-
-        /* Restoration */
-        if (phy->connected) {
-                bcm43xx_phy_write(bcm, 0x0015, 0xE300);
-                bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA0);
-                udelay(5);
-                bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA2);
-                udelay(2);
-                bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA3);
-                bcm43xx_voluntary_preempt();
-        } else
-                bcm43xx_phy_write(bcm, 0x0015, r27 | 0xEFA0);
-        bcm43xx_phy_lo_adjust(bcm, is_initializing);
-        bcm43xx_phy_write(bcm, 0x002E, 0x807F);
-        if (phy->connected)
-                bcm43xx_phy_write(bcm, 0x002F, 0x0202);
-        else
-                bcm43xx_phy_write(bcm, 0x002F, 0x0101);
-        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, regstack[4]);
-        bcm43xx_phy_write(bcm, 0x0015, regstack[5]);
-        bcm43xx_phy_write(bcm, 0x002A, regstack[6]);
-        bcm43xx_phy_write(bcm, 0x0035, regstack[7]);
-        bcm43xx_phy_write(bcm, 0x0060, regstack[8]);
-        bcm43xx_radio_write16(bcm, 0x0043, regstack[9]);
-        bcm43xx_radio_write16(bcm, 0x007A, regstack[10]);
-        regstack[11] &= 0x00F0;
-        regstack[11] |= (bcm43xx_radio_read16(bcm, 0x52) & 0x000F);
-        bcm43xx_radio_write16(bcm, 0x52, regstack[11]);
-        bcm43xx_write16(bcm, 0x03E2, regstack[3]);
-        if (phy->connected) {
-                bcm43xx_phy_write(bcm, 0x0811, regstack[12]);
-                bcm43xx_phy_write(bcm, 0x0812, regstack[13]);
-                bcm43xx_phy_write(bcm, 0x0814, regstack[14]);
-                bcm43xx_phy_write(bcm, 0x0815, regstack[15]);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0]);
-                bcm43xx_phy_write(bcm, 0x0802, regstack[1]);
-        }
-        bcm43xx_radio_selectchannel(bcm, oldchannel, 1);
-
-#ifdef CONFIG_BCM43XX_DEBUG
-        {
-                /* Sanity check for all lopairs. */
-                for (i = 0; i < BCM43xx_LO_COUNT; i++) {
-                        tmp_control = phy->_lo_pairs + i;
-                        if (tmp_control->low < -8 || tmp_control->low > 8 ||
-                            tmp_control->high < -8 || tmp_control->high > 8) {
-                                printk(KERN_WARNING PFX
-                                       "WARNING: Invalid LOpair (low: %d, high: %d, index: %d)\n",
-                                       tmp_control->low, tmp_control->high, i);
-                        }
-                }
-        }
-#endif /* CONFIG_BCM43XX_DEBUG */
-}
-
-static
-void bcm43xx_phy_lo_mark_current_used(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_lopair *pair;
-
-        pair = bcm43xx_current_lopair(bcm);
-        pair->used = 1;
-}
-
-void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_lopair *pair;
-        int i;
-
-        for (i = 0; i < BCM43xx_LO_COUNT; i++) {
-                pair = phy->_lo_pairs + i;
-                pair->used = 0;
-        }
-}
-
-/* http://bcm-specs.sipsolutions.net/EstimatePowerOut
- * This function converts a TSSI value to dBm in Q5.2
- */
-static s8 bcm43xx_phy_estimate_power_out(struct bcm43xx_private *bcm, s8 tssi)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        s8 dbm = 0;
-        s32 tmp;
-
-        tmp = phy->idle_tssi;
-        tmp += tssi;
-        tmp -= phy->savedpctlreg;
-
-        switch (phy->type) {
-                case BCM43xx_PHYTYPE_A:
-                        tmp += 0x80;
-                        tmp = limit_value(tmp, 0x00, 0xFF);
-                        dbm = phy->tssi2dbm[tmp];
-                        TODO(); //TODO: There's a FIXME on the specs
-                        break;
-                case BCM43xx_PHYTYPE_B:
-                case BCM43xx_PHYTYPE_G:
-                        tmp = limit_value(tmp, 0x00, 0x3F);
-                        dbm = phy->tssi2dbm[tmp];
-                        break;
-                default:
-                        assert(0);
-        }
-
-        return dbm;
-}
-
-/* http://bcm-specs.sipsolutions.net/RecalculateTransmissionPower */
-void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        
-        if (phy->savedpctlreg == 0xFFFF)
-                return;
-        if ((bcm->board_type == 0x0416) &&
-            (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM))
-                return;
-        
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A: {
-
-                TODO(); //TODO: Nothing for A PHYs yet :-/
-
-                break;
-        }
-        case BCM43xx_PHYTYPE_B:
-        case BCM43xx_PHYTYPE_G: {
-                u16 tmp;
-                u16 txpower;
-                s8 v0, v1, v2, v3;
-                s8 average;
-                u8 max_pwr;
-                s16 desired_pwr, estimated_pwr, pwr_adjust;
-                s16 radio_att_delta, baseband_att_delta;
-                s16 radio_attenuation, baseband_attenuation;
-                unsigned long phylock_flags;
-
-                tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0058);
-                v0 = (s8)(tmp & 0x00FF);
-                v1 = (s8)((tmp & 0xFF00) >> 8);
-                tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x005A);
-                v2 = (s8)(tmp & 0x00FF);
-                v3 = (s8)((tmp & 0xFF00) >> 8);
-                tmp = 0;
-
-                if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F) {
-                        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0070);
-                        v0 = (s8)(tmp & 0x00FF);
-                        v1 = (s8)((tmp & 0xFF00) >> 8);
-                        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0072);
-                        v2 = (s8)(tmp & 0x00FF);
-                        v3 = (s8)((tmp & 0xFF00) >> 8);
-                        if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F)
-                                return;
-                        v0 = (v0 + 0x20) & 0x3F;
-                        v1 = (v1 + 0x20) & 0x3F;
-                        v2 = (v2 + 0x20) & 0x3F;
-                        v3 = (v3 + 0x20) & 0x3F;
-                        tmp = 1;
-                }
-                bcm43xx_radio_clear_tssi(bcm);
-
-                average = (v0 + v1 + v2 + v3 + 2) / 4;
-
-                if (tmp && (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x005E) & 0x8))
-                        average -= 13;
-
-                estimated_pwr = bcm43xx_phy_estimate_power_out(bcm, average);
-
-                max_pwr = bcm->sprom.maxpower_bgphy;
-
-                if ((bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) &&
-                    (phy->type == BCM43xx_PHYTYPE_G))
-                        max_pwr -= 0x3;
-
-                /*TODO:
-                max_pwr = min(REG - bcm->sprom.antennagain_bgphy - 0x6, max_pwr)
-                        where REG is the max power as per the regulatory domain
-                */
-
-                desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr);
-                /* Check if we need to adjust the current power. */
-                pwr_adjust = desired_pwr - estimated_pwr;
-                radio_att_delta = -(pwr_adjust + 7) >> 3;
-                baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta);
-                if ((radio_att_delta == 0) && (baseband_att_delta == 0)) {
-                        bcm43xx_phy_lo_mark_current_used(bcm);
-                        return;
-                }
-
-                /* Calculate the new attenuation values. */
-                baseband_attenuation = radio->baseband_atten;
-                baseband_attenuation += baseband_att_delta;
-                radio_attenuation = radio->radio_atten;
-                radio_attenuation += radio_att_delta;
-
-                /* Get baseband and radio attenuation values into their permitted ranges.
-                 * baseband 0-11, radio 0-9.
-                 * Radio attenuation affects power level 4 times as much as baseband.
-                 */
-                if (radio_attenuation < 0) {
-                        baseband_attenuation -= (4 * -radio_attenuation);
-                        radio_attenuation = 0;
-                } else if (radio_attenuation > 9) {
-                        baseband_attenuation += (4 * (radio_attenuation - 9));
-                        radio_attenuation = 9;
-                } else {
-                        while (baseband_attenuation < 0 && radio_attenuation > 0) {
-                                baseband_attenuation += 4;
-                                radio_attenuation--;
-                        }
-                        while (baseband_attenuation > 11 && radio_attenuation < 9) {
-                                baseband_attenuation -= 4;
-                                radio_attenuation++;
-                        }
-                }
-                baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
-
-                txpower = radio->txctl1;
-                if ((radio->version == 0x2050) && (radio->revision == 2)) {
-                        if (radio_attenuation <= 1) {
-                                if (txpower == 0) {
-                                        txpower = 3;
-                                        radio_attenuation += 2;
-                                        baseband_attenuation += 2;
-                                } else if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) {
-                                        baseband_attenuation += 4 * (radio_attenuation - 2);
-                                        radio_attenuation = 2;
-                                }
-                        } else if (radio_attenuation > 4 && txpower != 0) {
-                                txpower = 0;
-                                if (baseband_attenuation < 3) {
-                                        radio_attenuation -= 3;
-                                        baseband_attenuation += 2;
-                                } else {
-                                        radio_attenuation -= 2;
-                                        baseband_attenuation -= 2;
-                                }
-                        }
-                }
-                radio->txctl1 = txpower;
-                baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
-                radio_attenuation = limit_value(radio_attenuation, 0, 9);
-
-                bcm43xx_phy_lock(bcm, phylock_flags);
-                bcm43xx_radio_lock(bcm);
-                bcm43xx_radio_set_txpower_bg(bcm, baseband_attenuation,
-                                             radio_attenuation, txpower);
-                bcm43xx_phy_lo_mark_current_used(bcm);
-                bcm43xx_radio_unlock(bcm);
-                bcm43xx_phy_unlock(bcm, phylock_flags);
-                break;
-        }
-        default:
-                assert(0);
-        }
-}
-
-static inline
-s32 bcm43xx_tssi2dbm_ad(s32 num, s32 den)
-{
-        if (num < 0)
-                return num/den;
-        else
-                return (num+den/2)/den;
-}
-
-static inline
-s8 bcm43xx_tssi2dbm_entry(s8 entry [], u8 index, s16 pab0, s16 pab1, s16 pab2)
-{
-        s32 m1, m2, f = 256, q, delta;
-        s8 i = 0;
-        
-        m1 = bcm43xx_tssi2dbm_ad(16 * pab0 + index * pab1, 32);
-        m2 = max(bcm43xx_tssi2dbm_ad(32768 + index * pab2, 256), 1);
-        do {
-                if (i > 15)
-                        return -EINVAL;
-                q = bcm43xx_tssi2dbm_ad(f * 4096 -
-                                        bcm43xx_tssi2dbm_ad(m2 * f, 16) * f, 2048);
-                delta = abs(q - f);
-                f = q;
-                i++;
-        } while (delta >= 2);
-        entry[index] = limit_value(bcm43xx_tssi2dbm_ad(m1 * f, 8192), -127, 128);
-        return 0;
-}
-
-/* http://bcm-specs.sipsolutions.net/TSSI_to_DBM_Table */
-int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        s16 pab0, pab1, pab2;
-        u8 idx;
-        s8 *dyn_tssi2dbm;
-        
-        if (phy->type == BCM43xx_PHYTYPE_A) {
-                pab0 = (s16)(bcm->sprom.pa1b0);
-                pab1 = (s16)(bcm->sprom.pa1b1);
-                pab2 = (s16)(bcm->sprom.pa1b2);
-        } else {
-                pab0 = (s16)(bcm->sprom.pa0b0);
-                pab1 = (s16)(bcm->sprom.pa0b1);
-                pab2 = (s16)(bcm->sprom.pa0b2);
-        }
-
-        if ((bcm->chip_id == 0x4301) && (radio->version != 0x2050)) {
-                phy->idle_tssi = 0x34;
-                phy->tssi2dbm = bcm43xx_tssi2dbm_b_table;
-                return 0;
-        }
-
-        if (pab0 != 0 && pab1 != 0 && pab2 != 0 &&
-            pab0 != -1 && pab1 != -1 && pab2 != -1) {
-                /* The pabX values are set in SPROM. Use them. */
-                if (phy->type == BCM43xx_PHYTYPE_A) {
-                        if ((s8)bcm->sprom.idle_tssi_tgt_aphy != 0 &&
-                            (s8)bcm->sprom.idle_tssi_tgt_aphy != -1)
-                                phy->idle_tssi = (s8)(bcm->sprom.idle_tssi_tgt_aphy);
-                        else
-                                phy->idle_tssi = 62;
-                } else {
-                        if ((s8)bcm->sprom.idle_tssi_tgt_bgphy != 0 &&
-                            (s8)bcm->sprom.idle_tssi_tgt_bgphy != -1)
-                                phy->idle_tssi = (s8)(bcm->sprom.idle_tssi_tgt_bgphy);
-                        else
-                                phy->idle_tssi = 62;
-                }
-                dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
-                if (dyn_tssi2dbm == NULL) {
-                        printk(KERN_ERR PFX "Could not allocate memory "
-                                            "for tssi2dbm table\n");
-                        return -ENOMEM;
-                }
-                for (idx = 0; idx < 64; idx++)
-                        if (bcm43xx_tssi2dbm_entry(dyn_tssi2dbm, idx, pab0, pab1, pab2)) {
-                                phy->tssi2dbm = NULL;
-                                printk(KERN_ERR PFX "Could not generate "
-                                                    "tssi2dBm table\n");
-                                kfree(dyn_tssi2dbm);
-                                return -ENODEV;
-                        }
-                phy->tssi2dbm = dyn_tssi2dbm;
-                phy->dyn_tssi_tbl = 1;
-        } else {
-                /* pabX values not set in SPROM. */
-                switch (phy->type) {
-                case BCM43xx_PHYTYPE_A:
-                        /* APHY needs a generated table. */
-                        phy->tssi2dbm = NULL;
-                        printk(KERN_ERR PFX "Could not generate tssi2dBm "
-                                            "table (wrong SPROM info)!\n");
-                        return -ENODEV;
-                case BCM43xx_PHYTYPE_B:
-                        phy->idle_tssi = 0x34;
-                        phy->tssi2dbm = bcm43xx_tssi2dbm_b_table;
-                        break;
-                case BCM43xx_PHYTYPE_G:
-                        phy->idle_tssi = 0x34;
-                        phy->tssi2dbm = bcm43xx_tssi2dbm_g_table;
-                        break;
-                }
-        }
-
-        return 0;
-}
-
-int bcm43xx_phy_init(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        int err = -ENODEV;
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A:
-                if (phy->rev == 2 || phy->rev == 3) {
-                        bcm43xx_phy_inita(bcm);
-                        err = 0;
-                }
-                break;
-        case BCM43xx_PHYTYPE_B:
-                switch (phy->rev) {
-                case 2:
-                        bcm43xx_phy_initb2(bcm);
-                        err = 0;
-                        break;
-                case 4:
-                        bcm43xx_phy_initb4(bcm);
-                        err = 0;
-                        break;
-                case 5:
-                        bcm43xx_phy_initb5(bcm);
-                        err = 0;
-                        break;
-                case 6:
-                        bcm43xx_phy_initb6(bcm);
-                        err = 0;
-                        break;
-                }
-                break;
-        case BCM43xx_PHYTYPE_G:
-                bcm43xx_phy_initg(bcm);
-                err = 0;
-                break;
-        }
-        if (err)
-                printk(KERN_WARNING PFX "Unknown PHYTYPE found!\n");
-
-        return err;
-}
-
-void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 antennadiv;
-        u16 offset;
-        u16 value;
-        u32 ucodeflags;
-
-        antennadiv = phy->antenna_diversity;
-
-        if (antennadiv == 0xFFFF)
-                antennadiv = 3;
-        assert(antennadiv <= 3);
-
-        ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                        BCM43xx_UCODEFLAGS_OFFSET);
-        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                            BCM43xx_UCODEFLAGS_OFFSET,
-                            ucodeflags & ~BCM43xx_UCODEFLAG_AUTODIV);
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A:
-        case BCM43xx_PHYTYPE_G:
-                if (phy->type == BCM43xx_PHYTYPE_A)
-                        offset = 0x0000;
-                else
-                        offset = 0x0400;
-
-                if (antennadiv == 2)
-                        value = (3/*automatic*/ << 7);
-                else
-                        value = (antennadiv << 7);
-                bcm43xx_phy_write(bcm, offset + 1,
-                                  (bcm43xx_phy_read(bcm, offset + 1)
-                                   & 0x7E7F) | value);
-
-                if (antennadiv >= 2) {
-                        if (antennadiv == 2)
-                                value = (antennadiv << 7);
-                        else
-                                value = (0/*force0*/ << 7);
-                        bcm43xx_phy_write(bcm, offset + 0x2B,
-                                          (bcm43xx_phy_read(bcm, offset + 0x2B)
-                                           & 0xFEFF) | value);
-                }
-
-                if (phy->type == BCM43xx_PHYTYPE_G) {
-                        if (antennadiv >= 2)
-                                bcm43xx_phy_write(bcm, 0x048C,
-                                                  bcm43xx_phy_read(bcm, 0x048C)
-                                                   | 0x2000);
-                        else
-                                bcm43xx_phy_write(bcm, 0x048C,
-                                                  bcm43xx_phy_read(bcm, 0x048C)
-                                                   & ~0x2000);
-                        if (phy->rev >= 2) {
-                                bcm43xx_phy_write(bcm, 0x0461,
-                                                  bcm43xx_phy_read(bcm, 0x0461)
-                                                   | 0x0010);
-                                bcm43xx_phy_write(bcm, 0x04AD,
-                                                  (bcm43xx_phy_read(bcm, 0x04AD)
-                                                   & 0x00FF) | 0x0015);
-                                if (phy->rev == 2)
-                                        bcm43xx_phy_write(bcm, 0x0427, 0x0008);
-                                else
-                                        bcm43xx_phy_write(bcm, 0x0427,
-                                                (bcm43xx_phy_read(bcm, 0x0427)
-                                                 & 0x00FF) | 0x0008);
-                        }
-                        else if (phy->rev >= 6)
-                                bcm43xx_phy_write(bcm, 0x049B, 0x00DC);
-                } else {
-                        if (phy->rev < 3)
-                                bcm43xx_phy_write(bcm, 0x002B,
-                                                  (bcm43xx_phy_read(bcm, 0x002B)
-                                                   & 0x00FF) | 0x0024);
-                        else {
-                                bcm43xx_phy_write(bcm, 0x0061,
-                                                  bcm43xx_phy_read(bcm, 0x0061)
-                                                   | 0x0010);
-                                if (phy->rev == 3) {
-                                        bcm43xx_phy_write(bcm, 0x0093, 0x001D);
-                                        bcm43xx_phy_write(bcm, 0x0027, 0x0008);
-                                } else {
-                                        bcm43xx_phy_write(bcm, 0x0093, 0x003A);
-                                        bcm43xx_phy_write(bcm, 0x0027,
-                                                (bcm43xx_phy_read(bcm, 0x0027)
-                                                 & 0x00FF) | 0x0008);
-                                }
-                        }
-                }
-                break;
-        case BCM43xx_PHYTYPE_B:
-                if (bcm->current_core->rev == 2)
-                        value = (3/*automatic*/ << 7);
-                else
-                        value = (antennadiv << 7);
-                bcm43xx_phy_write(bcm, 0x03E2,
-                                  (bcm43xx_phy_read(bcm, 0x03E2)
-                                   & 0xFE7F) | value);
-                break;
-        default:
-                assert(0);
-        }
-
-        if (antennadiv >= 2) {
-                ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                                BCM43xx_UCODEFLAGS_OFFSET);
-                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                                    BCM43xx_UCODEFLAGS_OFFSET,
-                                    ucodeflags | BCM43xx_UCODEFLAG_AUTODIV);
-        }
-
-        phy->antenna_diversity = antennadiv;
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.h b/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
deleted file mode 100644
index 73118364b552..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef BCM43xx_PHY_H_
-#define BCM43xx_PHY_H_
-
-#include <linux/types.h>
-
-struct bcm43xx_private;
-
-void bcm43xx_raw_phy_lock(struct bcm43xx_private *bcm);
-#define bcm43xx_phy_lock(bcm, flags) \
-        do {                                    \
-                local_irq_save(flags);          \
-                bcm43xx_raw_phy_lock(bcm);      \
-        } while (0)
-void bcm43xx_raw_phy_unlock(struct bcm43xx_private *bcm);
-#define bcm43xx_phy_unlock(bcm, flags) \
-        do {                                    \
-                bcm43xx_raw_phy_unlock(bcm);    \
-                local_irq_restore(flags);       \
-        } while (0)
-
-/* Card uses the loopback gain stuff */
-#define has_loopback_gain(phy) \
-        (((phy)->rev > 1) || ((phy)->connected))
-
-u16 bcm43xx_phy_read(struct bcm43xx_private *bcm, u16 offset);
-void bcm43xx_phy_write(struct bcm43xx_private *bcm, u16 offset, u16 val);
-
-int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm);
-int bcm43xx_phy_init(struct bcm43xx_private *bcm);
-
-void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_private *bcm);
-void bcm43xx_phy_calibrate(struct bcm43xx_private *bcm);
-int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int connect);
-
-void bcm43xx_phy_lo_b_measure(struct bcm43xx_private *bcm);
-void bcm43xx_phy_lo_g_measure(struct bcm43xx_private *bcm);
-void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm);
-
-/* Adjust the LocalOscillator to the saved values.
- * "fixed" is only set to 1 once in initialization. Set to 0 otherwise.
- */
-void bcm43xx_phy_lo_adjust(struct bcm43xx_private *bcm, int fixed);
-void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_private *bcm);
-
-void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,
-                                          u16 baseband_attenuation);
-
-#endif /* BCM43xx_PHY_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
deleted file mode 100644
index 76ab109cd2db..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  PIO Transmission
-
-  Copyright (c) 2005 Michael Buesch <mbuesch@freenet.de>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include "bcm43xx.h"
-#include "bcm43xx_pio.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_xmit.h"
-#include "bcm43xx_power.h"
-
-#include <linux/delay.h>
-
-
-static void tx_start(struct bcm43xx_pioqueue *queue)
-{
-        bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                          BCM43xx_PIO_TXCTL_INIT);
-}
-
-static void tx_octet(struct bcm43xx_pioqueue *queue,
-                     u8 octet)
-{
-        if (queue->need_workarounds) {
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
-                                  octet);
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                                  BCM43xx_PIO_TXCTL_WRITELO);
-        } else {
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                                  BCM43xx_PIO_TXCTL_WRITELO);
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
-                                  octet);
-        }
-}
-
-static u16 tx_get_next_word(struct bcm43xx_txhdr *txhdr,
-                            const u8 *packet,
-                            unsigned int *pos)
-{
-        const u8 *source;
-        unsigned int i = *pos;
-        u16 ret;
-
-        if (i < sizeof(*txhdr)) {
-                source = (const u8 *)txhdr;
-        } else {
-                source = packet;
-                i -= sizeof(*txhdr);
-        }
-        ret = le16_to_cpu( *((__le16 *)(source + i)) );
-        *pos += 2;
-
-        return ret;
-}
-
-static void tx_data(struct bcm43xx_pioqueue *queue,
-                    struct bcm43xx_txhdr *txhdr,
-                    const u8 *packet,
-                    unsigned int octets)
-{
-        u16 data;
-        unsigned int i = 0;
-
-        if (queue->need_workarounds) {
-                data = tx_get_next_word(txhdr, packet, &i);
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, data);
-        }
-        bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                          BCM43xx_PIO_TXCTL_WRITELO |
-                          BCM43xx_PIO_TXCTL_WRITEHI);
-        while (i < octets - 1) {
-                data = tx_get_next_word(txhdr, packet, &i);
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, data);
-        }
-        if (octets % 2)
-                tx_octet(queue, packet[octets - sizeof(*txhdr) - 1]);
-}
-
-static void tx_complete(struct bcm43xx_pioqueue *queue,
-                        struct sk_buff *skb)
-{
-        if (queue->need_workarounds) {
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
-                                  skb->data[skb->len - 1]);
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                                  BCM43xx_PIO_TXCTL_WRITELO |
-                                  BCM43xx_PIO_TXCTL_COMPLETE);
-        } else {
-                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                                  BCM43xx_PIO_TXCTL_COMPLETE);
-        }
-}
-
-static u16 generate_cookie(struct bcm43xx_pioqueue *queue,
-                           struct bcm43xx_pio_txpacket *packet)
-{
-        u16 cookie = 0x0000;
-        int packetindex;
-
-        /* We use the upper 4 bits for the PIO
-         * controller ID and the lower 12 bits
-         * for the packet index (in the cache).
-         */
-        switch (queue->mmio_base) {
-        case BCM43xx_MMIO_PIO1_BASE:
-                break;
-        case BCM43xx_MMIO_PIO2_BASE:
-                cookie = 0x1000;
-                break;
-        case BCM43xx_MMIO_PIO3_BASE:
-                cookie = 0x2000;
-                break;
-        case BCM43xx_MMIO_PIO4_BASE:
-                cookie = 0x3000;
-                break;
-        default:
-                assert(0);
-        }
-        packetindex = pio_txpacket_getindex(packet);
-        assert(((u16)packetindex & 0xF000) == 0x0000);
-        cookie |= (u16)packetindex;
-
-        return cookie;
-}
-
-static
-struct bcm43xx_pioqueue * parse_cookie(struct bcm43xx_private *bcm,
-                                       u16 cookie,
-                                       struct bcm43xx_pio_txpacket **packet)
-{
-        struct bcm43xx_pio *pio = bcm43xx_current_pio(bcm);
-        struct bcm43xx_pioqueue *queue = NULL;
-        int packetindex;
-
-        switch (cookie & 0xF000) {
-        case 0x0000:
-                queue = pio->queue0;
-                break;
-        case 0x1000:
-                queue = pio->queue1;
-                break;
-        case 0x2000:
-                queue = pio->queue2;
-                break;
-        case 0x3000:
-                queue = pio->queue3;
-                break;
-        default:
-                assert(0);
-        }
-        packetindex = (cookie & 0x0FFF);
-        assert(packetindex >= 0 && packetindex < BCM43xx_PIO_MAXTXPACKETS);
-        *packet = &(queue->tx_packets_cache[packetindex]);
-
-        return queue;
-}
-
-static void pio_tx_write_fragment(struct bcm43xx_pioqueue *queue,
-                                  struct sk_buff *skb,
-                                  struct bcm43xx_pio_txpacket *packet)
-{
-        struct bcm43xx_txhdr txhdr;
-        unsigned int octets;
-
-        assert(skb_shinfo(skb)->nr_frags == 0);
-        bcm43xx_generate_txhdr(queue->bcm,
-                               &txhdr, skb->data, skb->len,
-                               (packet->xmitted_frags == 0),
-                               generate_cookie(queue, packet));
-
-        tx_start(queue);
-        octets = skb->len + sizeof(txhdr);
-        if (queue->need_workarounds)
-                octets--;
-        tx_data(queue, &txhdr, (u8 *)skb->data, octets);
-        tx_complete(queue, skb);
-}
-
-static void free_txpacket(struct bcm43xx_pio_txpacket *packet,
-                          int irq_context)
-{
-        struct bcm43xx_pioqueue *queue = packet->queue;
-
-        ieee80211_txb_free(packet->txb);
-        list_move(&packet->list, &queue->txfree);
-        queue->nr_txfree++;
-
-        assert(queue->tx_devq_used >= packet->xmitted_octets);
-        assert(queue->tx_devq_packets >= packet->xmitted_frags);
-        queue->tx_devq_used -= packet->xmitted_octets;
-        queue->tx_devq_packets -= packet->xmitted_frags;
-}
-
-static int pio_tx_packet(struct bcm43xx_pio_txpacket *packet)
-{
-        struct bcm43xx_pioqueue *queue = packet->queue;
-        struct ieee80211_txb *txb = packet->txb;
-        struct sk_buff *skb;
-        u16 octets;
-        int i;
-
-        for (i = packet->xmitted_frags; i < txb->nr_frags; i++) {
-                skb = txb->fragments[i];
-
-                octets = (u16)skb->len + sizeof(struct bcm43xx_txhdr);
-                assert(queue->tx_devq_size >= octets);
-                assert(queue->tx_devq_packets <= BCM43xx_PIO_MAXTXDEVQPACKETS);
-                assert(queue->tx_devq_used <= queue->tx_devq_size);
-                /* Check if there is sufficient free space on the device
-                 * TX queue. If not, return and let the TX tasklet
-                 * retry later.
-                 */
-                if (queue->tx_devq_packets == BCM43xx_PIO_MAXTXDEVQPACKETS)
-                        return -EBUSY;
-                if (queue->tx_devq_used + octets > queue->tx_devq_size)
-                        return -EBUSY;
-                /* Now poke the device. */
-                pio_tx_write_fragment(queue, skb, packet);
-
-                /* Account for the packet size.
-                 * (We must not overflow the device TX queue)
-                 */
-                queue->tx_devq_packets++;
-                queue->tx_devq_used += octets;
-
-                assert(packet->xmitted_frags < packet->txb->nr_frags);
-                packet->xmitted_frags++;
-                packet->xmitted_octets += octets;
-        }
-        list_move_tail(&packet->list, &queue->txrunning);
-
-        return 0;
-}
-
-static void tx_tasklet(unsigned long d)
-{
-        struct bcm43xx_pioqueue *queue = (struct bcm43xx_pioqueue *)d;
-        struct bcm43xx_private *bcm = queue->bcm;
-        unsigned long flags;
-        struct bcm43xx_pio_txpacket *packet, *tmp_packet;
-        int err;
-        u16 txctl;
-
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-
-        if (queue->tx_frozen)
-                goto out_unlock;
-        txctl = bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL);
-        if (txctl & BCM43xx_PIO_TXCTL_SUSPEND)
-                goto out_unlock;
-
-        list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list) {
-                assert(packet->xmitted_frags < packet->txb->nr_frags);
-                if (packet->xmitted_frags == 0) {
-                        int i;
-                        struct sk_buff *skb;
-
-                        /* Check if the device queue is big
-                         * enough for every fragment. If not, drop the
-                         * whole packet.
-                         */
-                        for (i = 0; i < packet->txb->nr_frags; i++) {
-                                skb = packet->txb->fragments[i];
-                                if (unlikely(skb->len > queue->tx_devq_size)) {
-                                        dprintkl(KERN_ERR PFX "PIO TX device queue too small. "
-                                                              "Dropping packet.\n");
-                                        free_txpacket(packet, 1);
-                                        goto next_packet;
-                                }
-                        }
-                }
-                /* Try to transmit the packet.
-                 * This may not completely succeed.
-                 */
-                err = pio_tx_packet(packet);
-                if (err)
-                        break;
-        next_packet:
-                continue;
-        }
-out_unlock:
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-}
-
-static void setup_txqueues(struct bcm43xx_pioqueue *queue)
-{
-        struct bcm43xx_pio_txpacket *packet;
-        int i;
-
-        queue->nr_txfree = BCM43xx_PIO_MAXTXPACKETS;
-        for (i = 0; i < BCM43xx_PIO_MAXTXPACKETS; i++) {
-                packet = &(queue->tx_packets_cache[i]);
-
-                packet->queue = queue;
-                INIT_LIST_HEAD(&packet->list);
-
-                list_add(&packet->list, &queue->txfree);
-        }
-}
-
-static
-struct bcm43xx_pioqueue * bcm43xx_setup_pioqueue(struct bcm43xx_private *bcm,
-                                                 u16 pio_mmio_base)
-{
-        struct bcm43xx_pioqueue *queue;
-        u32 value;
-        u16 qsize;
-
-        queue = kzalloc(sizeof(*queue), GFP_KERNEL);
-        if (!queue)
-                goto out;
-
-        queue->bcm = bcm;
-        queue->mmio_base = pio_mmio_base;
-        queue->need_workarounds = (bcm->current_core->rev < 3);
-
-        INIT_LIST_HEAD(&queue->txfree);
-        INIT_LIST_HEAD(&queue->txqueue);
-        INIT_LIST_HEAD(&queue->txrunning);
-        tasklet_init(&queue->txtask, tx_tasklet,
-                     (unsigned long)queue);
-
-        value = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        value &= ~BCM43xx_SBF_XFER_REG_BYTESWAP;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value);
-
-        qsize = bcm43xx_read16(bcm, queue->mmio_base + BCM43xx_PIO_TXQBUFSIZE);
-        if (qsize == 0) {
-                printk(KERN_ERR PFX "ERROR: This card does not support PIO "
-                                    "operation mode. Please use DMA mode "
-                                    "(module parameter pio=0).\n");
-                goto err_freequeue;
-        }
-        if (qsize <= BCM43xx_PIO_TXQADJUST) {
-                printk(KERN_ERR PFX "PIO tx device-queue too small (%u)\n",
-                       qsize);
-                goto err_freequeue;
-        }
-        qsize -= BCM43xx_PIO_TXQADJUST;
-        queue->tx_devq_size = qsize;
-
-        setup_txqueues(queue);
-
-out:
-        return queue;
-
-err_freequeue:
-        kfree(queue);
-        queue = NULL;
-        goto out;
-}
-
-static void cancel_transfers(struct bcm43xx_pioqueue *queue)
-{
-        struct bcm43xx_pio_txpacket *packet, *tmp_packet;
-
-        netif_tx_disable(queue->bcm->net_dev);
-        tasklet_disable(&queue->txtask);
-
-        list_for_each_entry_safe(packet, tmp_packet, &queue->txrunning, list)
-                free_txpacket(packet, 0);
-        list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list)
-                free_txpacket(packet, 0);
-}
-
-static void bcm43xx_destroy_pioqueue(struct bcm43xx_pioqueue *queue)
-{
-        if (!queue)
-                return;
-
-        cancel_transfers(queue);
-        kfree(queue);
-}
-
-void bcm43xx_pio_free(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_pio *pio;
-
-        if (!bcm43xx_using_pio(bcm))
-                return;
-        pio = bcm43xx_current_pio(bcm);
-
-        bcm43xx_destroy_pioqueue(pio->queue3);
-        pio->queue3 = NULL;
-        bcm43xx_destroy_pioqueue(pio->queue2);
-        pio->queue2 = NULL;
-        bcm43xx_destroy_pioqueue(pio->queue1);
-        pio->queue1 = NULL;
-        bcm43xx_destroy_pioqueue(pio->queue0);
-        pio->queue0 = NULL;
-}
-
-int bcm43xx_pio_init(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_pio *pio = bcm43xx_current_pio(bcm);
-        struct bcm43xx_pioqueue *queue;
-        int err = -ENOMEM;
-
-        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO1_BASE);
-        if (!queue)
-                goto out;
-        pio->queue0 = queue;
-
-        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO2_BASE);
-        if (!queue)
-                goto err_destroy0;
-        pio->queue1 = queue;
-
-        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO3_BASE);
-        if (!queue)
-                goto err_destroy1;
-        pio->queue2 = queue;
-
-        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO4_BASE);
-        if (!queue)
-                goto err_destroy2;
-        pio->queue3 = queue;
-
-        if (bcm->current_core->rev < 3)
-                bcm->irq_savedstate |= BCM43xx_IRQ_PIO_WORKAROUND;
-
-        dprintk(KERN_INFO PFX "PIO initialized\n");
-        err = 0;
-out:
-        return err;
-
-err_destroy2:
-        bcm43xx_destroy_pioqueue(pio->queue2);
-        pio->queue2 = NULL;
-err_destroy1:
-        bcm43xx_destroy_pioqueue(pio->queue1);
-        pio->queue1 = NULL;
-err_destroy0:
-        bcm43xx_destroy_pioqueue(pio->queue0);
-        pio->queue0 = NULL;
-        goto out;
-}
-
-int bcm43xx_pio_tx(struct bcm43xx_private *bcm,
-                   struct ieee80211_txb *txb)
-{
-        struct bcm43xx_pioqueue *queue = bcm43xx_current_pio(bcm)->queue1;
-        struct bcm43xx_pio_txpacket *packet;
-
-        assert(!queue->tx_suspended);
-        assert(!list_empty(&queue->txfree));
-
-        packet = list_entry(queue->txfree.next, struct bcm43xx_pio_txpacket, list);
-        packet->txb = txb;
-        packet->xmitted_frags = 0;
-        packet->xmitted_octets = 0;
-        list_move_tail(&packet->list, &queue->txqueue);
-        queue->nr_txfree--;
-        assert(queue->nr_txfree < BCM43xx_PIO_MAXTXPACKETS);
-
-        /* Suspend TX, if we are out of packets in the "free" queue. */
-        if (list_empty(&queue->txfree)) {
-                netif_stop_queue(queue->bcm->net_dev);
-                queue->tx_suspended = 1;
-        }
-
-        tasklet_schedule(&queue->txtask);
-
-        return 0;
-}
-
-void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
-                                   struct bcm43xx_xmitstatus *status)
-{
-        struct bcm43xx_pioqueue *queue;
-        struct bcm43xx_pio_txpacket *packet;
-
-        queue = parse_cookie(bcm, status->cookie, &packet);
-        assert(queue);
-
-        free_txpacket(packet, 1);
-        if (queue->tx_suspended) {
-                queue->tx_suspended = 0;
-                netif_wake_queue(queue->bcm->net_dev);
-        }
-        /* If there are packets on the txqueue, poke the tasklet
-         * to transmit them.
-         */
-        if (!list_empty(&queue->txqueue))
-                tasklet_schedule(&queue->txtask);
-}
-
-static void pio_rx_error(struct bcm43xx_pioqueue *queue,
-                         int clear_buffers,
-                         const char *error)
-{
-        int i;
-
-        printkl("PIO RX error: %s\n", error);
-        bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL,
-                          BCM43xx_PIO_RXCTL_READY);
-        if (clear_buffers) {
-                assert(queue->mmio_base == BCM43xx_MMIO_PIO1_BASE);
-                for (i = 0; i < 15; i++) {
-                        /* Dummy read. */
-                        bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
-                }
-        }
-}
-
-void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue)
-{
-        __le16 preamble[21] = { 0 };
-        struct bcm43xx_rxhdr *rxhdr;
-        u16 tmp, len, rxflags2;
-        int i, preamble_readwords;
-        struct sk_buff *skb;
-
-        tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL);
-        if (!(tmp & BCM43xx_PIO_RXCTL_DATAAVAILABLE))
-                return;
-        bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL,
-                          BCM43xx_PIO_RXCTL_DATAAVAILABLE);
-
-        for (i = 0; i < 10; i++) {
-                tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL);
-                if (tmp & BCM43xx_PIO_RXCTL_READY)
-                        goto data_ready;
-                udelay(10);
-        }
-        dprintkl(KERN_ERR PFX "PIO RX timed out\n");
-        return;
-data_ready:
-
-        len = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
-        if (unlikely(len > 0x700)) {
-                pio_rx_error(queue, 0, "len > 0x700");
-                return;
-        }
-        if (unlikely(len == 0 && queue->mmio_base != BCM43xx_MMIO_PIO4_BASE)) {
-                pio_rx_error(queue, 0, "len == 0");
-                return;
-        }
-        preamble[0] = cpu_to_le16(len);
-        if (queue->mmio_base == BCM43xx_MMIO_PIO4_BASE)
-                preamble_readwords = 14 / sizeof(u16);
-        else
-                preamble_readwords = 18 / sizeof(u16);
-        for (i = 0; i < preamble_readwords; i++) {
-                tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
-                preamble[i + 1] = cpu_to_le16(tmp);
-        }
-        rxhdr = (struct bcm43xx_rxhdr *)preamble;
-        rxflags2 = le16_to_cpu(rxhdr->flags2);
-        if (unlikely(rxflags2 & BCM43xx_RXHDR_FLAGS2_INVALIDFRAME)) {
-                pio_rx_error(queue,
-                             (queue->mmio_base == BCM43xx_MMIO_PIO1_BASE),
-                             "invalid frame");
-                return;
-        }
-        if (queue->mmio_base == BCM43xx_MMIO_PIO4_BASE) {
-                /* We received an xmit status. */
-                struct bcm43xx_hwxmitstatus *hw;
-                struct bcm43xx_xmitstatus stat;
-
-                hw = (struct bcm43xx_hwxmitstatus *)(preamble + 1);
-                stat.cookie = le16_to_cpu(hw->cookie);
-                stat.flags = hw->flags;
-                stat.cnt1 = hw->cnt1;
-                stat.cnt2 = hw->cnt2;
-                stat.seq = le16_to_cpu(hw->seq);
-                stat.unknown = le16_to_cpu(hw->unknown);
-
-                bcm43xx_debugfs_log_txstat(queue->bcm, &stat);
-                bcm43xx_pio_handle_xmitstatus(queue->bcm, &stat);
-
-                return;
-        }
-
-        skb = dev_alloc_skb(len);
-        if (unlikely(!skb)) {
-                pio_rx_error(queue, 1, "OOM");
-                return;
-        }
-        skb_put(skb, len);
-        for (i = 0; i < len - 1; i += 2) {
-                tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
-                *((__le16 *)(skb->data + i)) = cpu_to_le16(tmp);
-        }
-        if (len % 2) {
-                tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
-                skb->data[len - 1] = (tmp & 0x00FF);
-/* The specs say the following is required, but
- * it is wrong and corrupts the PLCP. If we don't do
- * this, the PLCP seems to be correct. So ifdef it out for now.
- */
-#if 0
-                if (rxflags2 & BCM43xx_RXHDR_FLAGS2_TYPE2FRAME)
-                        skb->data[2] = (tmp & 0xFF00) >> 8;
-                else
-                        skb->data[0] = (tmp & 0xFF00) >> 8;
-#endif
-        }
-        skb_trim(skb, len - IEEE80211_FCS_LEN);
-        bcm43xx_rx(queue->bcm, skb, rxhdr);
-}
-
-void bcm43xx_pio_tx_suspend(struct bcm43xx_pioqueue *queue)
-{
-        bcm43xx_power_saving_ctl_bits(queue->bcm, -1, 1);
-        bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                          bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL)
-                          | BCM43xx_PIO_TXCTL_SUSPEND);
-}
-
-void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue)
-{
-        bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
-                          bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL)
-                          & ~BCM43xx_PIO_TXCTL_SUSPEND);
-        bcm43xx_power_saving_ctl_bits(queue->bcm, -1, -1);
-        if (!list_empty(&queue->txqueue))
-                tasklet_schedule(&queue->txtask);
-}
-
-void bcm43xx_pio_freeze_txqueues(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_pio *pio;
-
-        assert(bcm43xx_using_pio(bcm));
-        pio = bcm43xx_current_pio(bcm);
-        pio->queue0->tx_frozen = 1;
-        pio->queue1->tx_frozen = 1;
-        pio->queue2->tx_frozen = 1;
-        pio->queue3->tx_frozen = 1;
-}
-
-void bcm43xx_pio_thaw_txqueues(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_pio *pio;
-
-        assert(bcm43xx_using_pio(bcm));
-        pio = bcm43xx_current_pio(bcm);
-        pio->queue0->tx_frozen = 0;
-        pio->queue1->tx_frozen = 0;
-        pio->queue2->tx_frozen = 0;
-        pio->queue3->tx_frozen = 0;
-        if (!list_empty(&pio->queue0->txqueue))
-                tasklet_schedule(&pio->queue0->txtask);
-        if (!list_empty(&pio->queue1->txqueue))
-                tasklet_schedule(&pio->queue1->txtask);
-        if (!list_empty(&pio->queue2->txqueue))
-                tasklet_schedule(&pio->queue2->txtask);
-        if (!list_empty(&pio->queue3->txqueue))
-                tasklet_schedule(&pio->queue3->txtask);
-}
-
-
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.h b/drivers/net/wireless/bcm43xx/bcm43xx_pio.h
deleted file mode 100644
index bc78a3c2cafb..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef BCM43xx_PIO_H_
-#define BCM43xx_PIO_H_
-
-#include "bcm43xx.h"
-
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/skbuff.h>
-
-
-#define BCM43xx_PIO_TXCTL               0x00
-#define BCM43xx_PIO_TXDATA              0x02
-#define BCM43xx_PIO_TXQBUFSIZE          0x04
-#define BCM43xx_PIO_RXCTL               0x08
-#define BCM43xx_PIO_RXDATA              0x0A
-
-#define BCM43xx_PIO_TXCTL_WRITELO       (1 << 0)
-#define BCM43xx_PIO_TXCTL_WRITEHI       (1 << 1)
-#define BCM43xx_PIO_TXCTL_COMPLETE      (1 << 2)
-#define BCM43xx_PIO_TXCTL_INIT          (1 << 3)
-#define BCM43xx_PIO_TXCTL_SUSPEND       (1 << 7)
-
-#define BCM43xx_PIO_RXCTL_DATAAVAILABLE (1 << 0)
-#define BCM43xx_PIO_RXCTL_READY         (1 << 1)
-
-/* PIO constants */
-#define BCM43xx_PIO_MAXTXDEVQPACKETS    31
-#define BCM43xx_PIO_TXQADJUST           80
-
-/* PIO tuning knobs */
-#define BCM43xx_PIO_MAXTXPACKETS        256
-
-
-
-#ifdef CONFIG_BCM43XX_PIO
-
-
-struct bcm43xx_pioqueue;
-struct bcm43xx_xmitstatus;
-
-struct bcm43xx_pio_txpacket {
-        struct bcm43xx_pioqueue *queue;
-        struct ieee80211_txb *txb;
-        struct list_head list;
-
-        u8 xmitted_frags;
-        u16 xmitted_octets;
-};
-
-#define pio_txpacket_getindex(packet) ((int)((packet) - (packet)->queue->tx_packets_cache)) 
-
-struct bcm43xx_pioqueue {
-        struct bcm43xx_private *bcm;
-        u16 mmio_base;
-
-        u8 tx_suspended:1,
-           tx_frozen:1,
-           need_workarounds:1; /* Workarounds needed for core.rev < 3 */
-
-        /* Adjusted size of the device internal TX buffer. */
-        u16 tx_devq_size;
-        /* Used octets of the device internal TX buffer. */
-        u16 tx_devq_used;
-        /* Used packet slots in the device internal TX buffer. */
-        u8 tx_devq_packets;
-        /* Packets from the txfree list can
-         * be taken on incoming TX requests.
-         */
-        struct list_head txfree;
-        unsigned int nr_txfree;
-        /* Packets on the txqueue are queued,
-         * but not completely written to the chip, yet.
-         */
-        struct list_head txqueue;
-        /* Packets on the txrunning queue are completely
-         * posted to the device. We are waiting for the txstatus.
-         */
-        struct list_head txrunning;
-        /* Total number or packets sent.
-         * (This counter can obviously wrap).
-         */
-        unsigned int nr_tx_packets;
-        struct tasklet_struct txtask;
-        struct bcm43xx_pio_txpacket tx_packets_cache[BCM43xx_PIO_MAXTXPACKETS];
-};
-
-static inline
-u16 bcm43xx_pio_read(struct bcm43xx_pioqueue *queue,
-                     u16 offset)
-{
-        return bcm43xx_read16(queue->bcm, queue->mmio_base + offset);
-}
-
-static inline
-void bcm43xx_pio_write(struct bcm43xx_pioqueue *queue,
-                       u16 offset, u16 value)
-{
-        bcm43xx_write16(queue->bcm, queue->mmio_base + offset, value);
-        mmiowb();
-}
-
-
-int bcm43xx_pio_init(struct bcm43xx_private *bcm);
-void bcm43xx_pio_free(struct bcm43xx_private *bcm);
-
-int bcm43xx_pio_tx(struct bcm43xx_private *bcm,
-                   struct ieee80211_txb *txb);
-void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
-                                   struct bcm43xx_xmitstatus *status);
-void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue);
-
-/* Suspend a TX queue on hardware level. */
-void bcm43xx_pio_tx_suspend(struct bcm43xx_pioqueue *queue);
-void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue);
-/* Suspend (freeze) the TX tasklet (software level). */
-void bcm43xx_pio_freeze_txqueues(struct bcm43xx_private *bcm);
-void bcm43xx_pio_thaw_txqueues(struct bcm43xx_private *bcm);
-
-#else /* CONFIG_BCM43XX_PIO */
-
-static inline
-int bcm43xx_pio_init(struct bcm43xx_private *bcm)
-{
-        return 0;
-}
-static inline
-void bcm43xx_pio_free(struct bcm43xx_private *bcm)
-{
-}
-static inline
-int bcm43xx_pio_tx(struct bcm43xx_private *bcm,
-                   struct ieee80211_txb *txb)
-{
-        return 0;
-}
-static inline
-void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
-                                   struct bcm43xx_xmitstatus *status)
-{
-}
-static inline
-void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue)
-{
-}
-static inline
-void bcm43xx_pio_tx_suspend(struct bcm43xx_pioqueue *queue)
-{
-}
-static inline
-void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue)
-{
-}
-static inline
-void bcm43xx_pio_freeze_txqueues(struct bcm43xx_private *bcm)
-{
-}
-static inline
-void bcm43xx_pio_thaw_txqueues(struct bcm43xx_private *bcm)
-{
-}
-
-#endif /* CONFIG_BCM43XX_PIO */
-#endif /* BCM43xx_PIO_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_power.c b/drivers/net/wireless/bcm43xx/bcm43xx_power.c
deleted file mode 100644
index 7e774f410953..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_power.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include <linux/delay.h>
-
-#include "bcm43xx.h"
-#include "bcm43xx_power.h"
-#include "bcm43xx_main.h"
-
-
-/* Get the Slow Clock Source */
-static int bcm43xx_pctl_get_slowclksrc(struct bcm43xx_private *bcm)
-{
-        u32 tmp;
-        int err;
-
-        assert(bcm->current_core == &bcm->core_chipcommon);
-        if (bcm->current_core->rev < 6) {
-                if (bcm->bustype == BCM43xx_BUSTYPE_PCMCIA ||
-                    bcm->bustype == BCM43xx_BUSTYPE_SB)
-                        return BCM43xx_PCTL_CLKSRC_XTALOS;
-                if (bcm->bustype == BCM43xx_BUSTYPE_PCI) {
-                        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_OUT, &tmp);
-                        assert(!err);
-                        if (tmp & 0x10)
-                                return BCM43xx_PCTL_CLKSRC_PCI;
-                        return BCM43xx_PCTL_CLKSRC_XTALOS;
-                }
-        }
-        if (bcm->current_core->rev < 10) {
-                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
-                tmp &= 0x7;
-                if (tmp == 0)
-                        return BCM43xx_PCTL_CLKSRC_LOPWROS;
-                if (tmp == 1)
-                        return BCM43xx_PCTL_CLKSRC_XTALOS;
-                if (tmp == 2)
-                        return BCM43xx_PCTL_CLKSRC_PCI;
-        }
-
-        return BCM43xx_PCTL_CLKSRC_XTALOS;
-}
-
-/* Get max/min slowclock frequency
- * as described in http://bcm-specs.sipsolutions.net/PowerControl
- */
-static int bcm43xx_pctl_clockfreqlimit(struct bcm43xx_private *bcm,
-                                       int get_max)
-{
-        int limit;
-        int clocksrc;
-        int divisor;
-        u32 tmp;
-
-        assert(bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL);
-        assert(bcm->current_core == &bcm->core_chipcommon);
-
-        clocksrc = bcm43xx_pctl_get_slowclksrc(bcm);
-        if (bcm->current_core->rev < 6) {
-                switch (clocksrc) {
-                case BCM43xx_PCTL_CLKSRC_PCI:
-                        divisor = 64;
-                        break;
-                case BCM43xx_PCTL_CLKSRC_XTALOS:
-                        divisor = 32;
-                        break;
-                default:
-                        assert(0);
-                        divisor = 1;
-                }
-        } else if (bcm->current_core->rev < 10) {
-                switch (clocksrc) {
-                case BCM43xx_PCTL_CLKSRC_LOPWROS:
-                        divisor = 1;
-                        break;
-                case BCM43xx_PCTL_CLKSRC_XTALOS:
-                case BCM43xx_PCTL_CLKSRC_PCI:
-                        tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
-                        divisor = ((tmp & 0xFFFF0000) >> 16) + 1;
-                        divisor *= 4;
-                        break;
-                default:
-                        assert(0);
-                        divisor = 1;
-                }
-        } else {
-                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL);
-                divisor = ((tmp & 0xFFFF0000) >> 16) + 1;
-                divisor *= 4;
-        }
-
-        switch (clocksrc) {
-        case BCM43xx_PCTL_CLKSRC_LOPWROS:
-                if (get_max)
-                        limit = 43000;
-                else
-                        limit = 25000;
-                break;
-        case BCM43xx_PCTL_CLKSRC_XTALOS:
-                if (get_max)
-                        limit = 20200000;
-                else
-                        limit = 19800000;
-                break;
-        case BCM43xx_PCTL_CLKSRC_PCI:
-                if (get_max)
-                        limit = 34000000;
-                else
-                        limit = 25000000;
-                break;
-        default:
-                assert(0);
-                limit = 0;
-        }
-        limit /= divisor;
-
-        return limit;
-}
-
-
-/* init power control
- * as described in http://bcm-specs.sipsolutions.net/PowerControl
- */
-int bcm43xx_pctl_init(struct bcm43xx_private *bcm)
-{
-        int err, maxfreq;
-        struct bcm43xx_coreinfo *old_core;
-
-        old_core = bcm->current_core;
-        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
-        if (err == -ENODEV)
-                return 0;
-        if (err)
-                goto out;
-
-        if (bcm->chip_id == 0x4321) {
-                if (bcm->chip_rev == 0)
-                        bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_CTL, 0x03A4);
-                if (bcm->chip_rev == 1)
-                        bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_CTL, 0x00A4);
-        }
-
-        if (bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL) {
-                if (bcm->current_core->rev >= 10) {
-                        /* Set Idle Power clock rate to 1Mhz */
-                        bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL,
-                                       (bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL)
-                                       & 0x0000FFFF) | 0x40000);
-                } else {
-                        maxfreq = bcm43xx_pctl_clockfreqlimit(bcm, 1);
-                        bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY,
-                                       (maxfreq * 150 + 999999) / 1000000);
-                        bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_FREFSELDELAY,
-                                       (maxfreq * 15 + 999999) / 1000000);
-                }
-        }
-
-        err = bcm43xx_switch_core(bcm, old_core);
-        assert(err == 0);
-
-out:
-        return err;
-}
-
-u16 bcm43xx_pctl_powerup_delay(struct bcm43xx_private *bcm)
-{
-        u16 delay = 0;
-        int err;
-        u32 pll_on_delay;
-        struct bcm43xx_coreinfo *old_core;
-        int minfreq;
-
-        if (bcm->bustype != BCM43xx_BUSTYPE_PCI)
-                goto out;
-        if (!(bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL))
-                goto out;
-        old_core = bcm->current_core;
-        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
-        if (err == -ENODEV)
-                goto out;
-
-        minfreq = bcm43xx_pctl_clockfreqlimit(bcm, 0);
-        pll_on_delay = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY);
-        delay = (((pll_on_delay + 2) * 1000000) + (minfreq - 1)) / minfreq;
-
-        err = bcm43xx_switch_core(bcm, old_core);
-        assert(err == 0);
-
-out:
-        return delay;
-}
-
-/* set the powercontrol clock
- * as described in http://bcm-specs.sipsolutions.net/PowerControl
- */
-int bcm43xx_pctl_set_clock(struct bcm43xx_private *bcm, u16 mode)
-{
-        int err;
-        struct bcm43xx_coreinfo *old_core;
-        u32 tmp;
-
-        old_core = bcm->current_core;
-        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
-        if (err == -ENODEV)
-                return 0;
-        if (err)
-                goto out;
-        
-        if (bcm->core_chipcommon.rev < 6) {
-                if (mode == BCM43xx_PCTL_CLK_FAST) {
-                        err = bcm43xx_pctl_set_crystal(bcm, 1);
-                        if (err)
-                                goto out;
-                }
-        } else {
-                if ((bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL) &&
-                        (bcm->core_chipcommon.rev < 10)) {
-                        switch (mode) {
-                        case BCM43xx_PCTL_CLK_FAST:
-                                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
-                                tmp = (tmp & ~BCM43xx_PCTL_FORCE_SLOW) | BCM43xx_PCTL_FORCE_PLL;
-                                bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL, tmp);
-                                break;
-                        case BCM43xx_PCTL_CLK_SLOW:
-                                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
-                                tmp |= BCM43xx_PCTL_FORCE_SLOW;
-                                bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL, tmp);
-                                break;
-                        case BCM43xx_PCTL_CLK_DYNAMIC:
-                                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
-                                tmp &= ~BCM43xx_PCTL_FORCE_SLOW;
-                                tmp |= BCM43xx_PCTL_FORCE_PLL;
-                                tmp &= ~BCM43xx_PCTL_DYN_XTAL;
-                                bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL, tmp);
-                        }
-                }
-        }
-        
-        err = bcm43xx_switch_core(bcm, old_core);
-        assert(err == 0);
-
-out:
-        return err;
-}
-
-int bcm43xx_pctl_set_crystal(struct bcm43xx_private *bcm, int on)
-{
-        int err;
-        u32 in, out, outenable;
-
-        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_IN, &in);
-        if (err)
-                goto err_pci;
-        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_OUT, &out);
-        if (err)
-                goto err_pci;
-        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_OUTENABLE, &outenable);
-        if (err)
-                goto err_pci;
-
-        outenable |= (BCM43xx_PCTL_XTAL_POWERUP | BCM43xx_PCTL_PLL_POWERDOWN);
-
-        if (on) {
-                if (in & 0x40)
-                        return 0;
-
-                out |= (BCM43xx_PCTL_XTAL_POWERUP | BCM43xx_PCTL_PLL_POWERDOWN);
-
-                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUT, out);
-                if (err)
-                        goto err_pci;
-                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUTENABLE, outenable);
-                if (err)
-                        goto err_pci;
-                udelay(1000);
-
-                out &= ~BCM43xx_PCTL_PLL_POWERDOWN;
-                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUT, out);
-                if (err)
-                        goto err_pci;
-                udelay(5000);
-        } else {
-                if (bcm->current_core->rev < 5)
-                        return 0;
-                if (bcm->sprom.boardflags & BCM43xx_BFL_XTAL_NOSLOW)
-                        return 0;
-
-/*              XXX: Why BCM43xx_MMIO_RADIO_HWENABLED_xx can't be read at this time?
- *              err = bcm43xx_switch_core(bcm, bcm->active_80211_core);
- *              if (err)
- *                      return err;
- *              if (((bcm->current_core->rev >= 3) &&
- *                      (bcm43xx_read32(bcm, BCM43xx_MMIO_RADIO_HWENABLED_HI) & (1 << 16))) ||
- *                    ((bcm->current_core->rev < 3) &&
- *                      !(bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_HWENABLED_LO) & (1 << 4))))
- *                      return 0;
- *              err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
- *              if (err)
- *                      return err;
- */
-                
-                err = bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_SLOW);
-                if (err)
-                        goto out;
-                out &= ~BCM43xx_PCTL_XTAL_POWERUP;
-                out |= BCM43xx_PCTL_PLL_POWERDOWN;
-                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUT, out);
-                if (err)
-                        goto err_pci;
-                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUTENABLE, outenable);
-                if (err)
-                        goto err_pci;
-        }
-
-out:
-        return err;
-
-err_pci:
-        printk(KERN_ERR PFX "Error: pctl_set_clock() could not access PCI config space!\n");
-        err = -EBUSY;
-        goto out;
-}
-
-/* Set the PowerSavingControlBits.
- * Bitvalues:
- *   0  => unset the bit
- *   1  => set the bit
- *   -1 => calculate the bit
- */
-void bcm43xx_power_saving_ctl_bits(struct bcm43xx_private *bcm,
-                                   int bit25, int bit26)
-{
-        int i;
-        u32 status;
-
-//FIXME: Force 25 to off and 26 to on for now:
-bit25 = 0;
-bit26 = 1;
-
-        if (bit25 == -1) {
-                //TODO: If powersave is not off and FIXME is not set and we are not in adhoc
-                //      and thus is not an AP and we are associated, set bit 25
-        }
-        if (bit26 == -1) {
-                //TODO: If the device is awake or this is an AP, or we are scanning, or FIXME,
-                //      or we are associated, or FIXME, or the latest PS-Poll packet sent was
-                //      successful, set bit26
-        }
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        if (bit25)
-                status |= BCM43xx_SBF_PS1;
-        else
-                status &= ~BCM43xx_SBF_PS1;
-        if (bit26)
-                status |= BCM43xx_SBF_PS2;
-        else
-                status &= ~BCM43xx_SBF_PS2;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
-        if (bit26 && bcm->current_core->rev >= 5) {
-                for (i = 0; i < 100; i++) {
-                        if (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0040) != 4)
-                                break;
-                        udelay(10);
-                }
-        }
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_power.h b/drivers/net/wireless/bcm43xx/bcm43xx_power.h
deleted file mode 100644
index c966ab3a5a8c..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_power.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef BCM43xx_POWER_H_
-#define BCM43xx_POWER_H_
-
-#include <linux/types.h>
-
-/* Clock sources */
-enum {
-        /* PCI clock */
-        BCM43xx_PCTL_CLKSRC_PCI,
-        /* Crystal slow clock oscillator */
-        BCM43xx_PCTL_CLKSRC_XTALOS,
-        /* Low power oscillator */
-        BCM43xx_PCTL_CLKSRC_LOPWROS,
-};
-
-struct bcm43xx_private;
-
-int bcm43xx_pctl_init(struct bcm43xx_private *bcm);
-int bcm43xx_pctl_set_clock(struct bcm43xx_private *bcm, u16 mode);
-int bcm43xx_pctl_set_crystal(struct bcm43xx_private *bcm, int on);
-u16 bcm43xx_pctl_powerup_delay(struct bcm43xx_private *bcm);
-
-void bcm43xx_power_saving_ctl_bits(struct bcm43xx_private *bcm,
-                                   int bit25, int bit26);
-
-#endif /* BCM43xx_POWER_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
deleted file mode 100644
index c605099c9baf..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ /dev/null
@@ -1,2170 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include <linux/delay.h>
-
-#include "bcm43xx.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_phy.h"
-#include "bcm43xx_radio.h"
-#include "bcm43xx_ilt.h"
-
-
-/* Table for bcm43xx_radio_calibrationvalue() */
-static const u16 rcc_table[16] = {
-        0x0002, 0x0003, 0x0001, 0x000F,
-        0x0006, 0x0007, 0x0005, 0x000F,
-        0x000A, 0x000B, 0x0009, 0x000F,
-        0x000E, 0x000F, 0x000D, 0x000F,
-};
-
-/* Reverse the bits of a 4bit value.
- * Example:  1101 is flipped 1011
- */
-static u16 flip_4bit(u16 value)
-{
-        u16 flipped = 0x0000;
-
-        assert((value & ~0x000F) == 0x0000);
-
-        flipped |= (value & 0x0001) << 3;
-        flipped |= (value & 0x0002) << 1;
-        flipped |= (value & 0x0004) >> 1;
-        flipped |= (value & 0x0008) >> 3;
-
-        return flipped;
-}
-
-/* Get the freq, as it has to be written to the device. */
-static inline
-u16 channel2freq_bg(u8 channel)
-{
-        /* Frequencies are given as frequencies_bg[index] + 2.4GHz
-         * Starting with channel 1
-         */
-        static const u16 frequencies_bg[14] = {
-                12, 17, 22, 27,
-                32, 37, 42, 47,
-                52, 57, 62, 67,
-                72, 84,
-        };
-
-        assert(channel >= 1 && channel <= 14);
-
-        return frequencies_bg[channel - 1];
-}
-
-/* Get the freq, as it has to be written to the device. */
-static inline
-u16 channel2freq_a(u8 channel)
-{
-        assert(channel <= 200);
-
-        return (5000 + 5 * channel);
-}
-
-void bcm43xx_radio_lock(struct bcm43xx_private *bcm)
-{
-        u32 status;
-
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        status |= BCM43xx_SBF_RADIOREG_LOCK;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
-        mmiowb();
-        udelay(10);
-}
-
-void bcm43xx_radio_unlock(struct bcm43xx_private *bcm)
-{
-        u32 status;
-
-        bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_VER); /* dummy read */
-        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
-        status &= ~BCM43xx_SBF_RADIOREG_LOCK;
-        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
-        mmiowb();
-}
-
-u16 bcm43xx_radio_read16(struct bcm43xx_private *bcm, u16 offset)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A:
-                offset |= 0x0040;
-                break;
-        case BCM43xx_PHYTYPE_B:
-                if (radio->version == 0x2053) {
-                        if (offset < 0x70)
-                                offset += 0x80;
-                        else if (offset < 0x80)
-                                offset += 0x70;
-                } else if (radio->version == 0x2050) {
-                        offset |= 0x80;
-                } else
-                        assert(0);
-                break;
-        case BCM43xx_PHYTYPE_G:
-                offset |= 0x80;
-                break;
-        }
-
-        bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, offset);
-        return bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW);
-}
-
-void bcm43xx_radio_write16(struct bcm43xx_private *bcm, u16 offset, u16 val)
-{
-        bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, offset);
-        mmiowb();
-        bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW, val);
-}
-
-static void bcm43xx_set_all_gains(struct bcm43xx_private *bcm,
-                                  s16 first, s16 second, s16 third)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 i;
-        u16 start = 0x08, end = 0x18;
-        u16 offset = 0x0400;
-        u16 tmp;
-
-        if (phy->rev <= 1) {
-                offset = 0x5000;
-                start = 0x10;
-                end = 0x20;
-        }
-
-        for (i = 0; i < 4; i++)
-                bcm43xx_ilt_write(bcm, offset + i, first);
-
-        for (i = start; i < end; i++)
-                bcm43xx_ilt_write(bcm, offset + i, second);
-
-        if (third != -1) {
-                tmp = ((u16)third << 14) | ((u16)third << 6);
-                bcm43xx_phy_write(bcm, 0x04A0,
-                                  (bcm43xx_phy_read(bcm, 0x04A0) & 0xBFBF) | tmp);
-                bcm43xx_phy_write(bcm, 0x04A1,
-                                  (bcm43xx_phy_read(bcm, 0x04A1) & 0xBFBF) | tmp);
-                bcm43xx_phy_write(bcm, 0x04A2,
-                                  (bcm43xx_phy_read(bcm, 0x04A2) & 0xBFBF) | tmp);
-        }
-        bcm43xx_dummy_transmission(bcm);
-}
-
-static void bcm43xx_set_original_gains(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 i, tmp;
-        u16 offset = 0x0400;
-        u16 start = 0x0008, end = 0x0018;
-
-        if (phy->rev <= 1) {
-                offset = 0x5000;
-                start = 0x0010;
-                end = 0x0020;
-        }
-
-        for (i = 0; i < 4; i++) {
-                tmp = (i & 0xFFFC);
-                tmp |= (i & 0x0001) << 1;
-                tmp |= (i & 0x0002) >> 1;
-
-                bcm43xx_ilt_write(bcm, offset + i, tmp);
-        }
-
-        for (i = start; i < end; i++)
-                bcm43xx_ilt_write(bcm, offset + i, i - start);
-
-        bcm43xx_phy_write(bcm, 0x04A0,
-                          (bcm43xx_phy_read(bcm, 0x04A0) & 0xBFBF) | 0x4040);
-        bcm43xx_phy_write(bcm, 0x04A1,
-                          (bcm43xx_phy_read(bcm, 0x04A1) & 0xBFBF) | 0x4040);
-        bcm43xx_phy_write(bcm, 0x04A2,
-                          (bcm43xx_phy_read(bcm, 0x04A2) & 0xBFBF) | 0x4000);
-        bcm43xx_dummy_transmission(bcm);
-}
-
-/* Synthetic PU workaround */
-static void bcm43xx_synth_pu_workaround(struct bcm43xx_private *bcm, u8 channel)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        
-        if (radio->version != 0x2050 || radio->revision >= 6) {
-                /* We do not need the workaround. */
-                return;
-        }
-
-        if (channel <= 10) {
-                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
-                                channel2freq_bg(channel + 4));
-        } else {
-                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
-                                channel2freq_bg(1));
-        }
-        udelay(100);
-        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
-                        channel2freq_bg(channel));
-}
-
-u8 bcm43xx_radio_aci_detect(struct bcm43xx_private *bcm, u8 channel)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u8 ret = 0;
-        u16 saved, rssi, temp;
-        int i, j = 0;
-
-        saved = bcm43xx_phy_read(bcm, 0x0403);
-        bcm43xx_radio_selectchannel(bcm, channel, 0);
-        bcm43xx_phy_write(bcm, 0x0403, (saved & 0xFFF8) | 5);
-        if (radio->aci_hw_rssi)
-                rssi = bcm43xx_phy_read(bcm, 0x048A) & 0x3F;
-        else
-                rssi = saved & 0x3F;
-        /* clamp temp to signed 5bit */
-        if (rssi > 32)
-                rssi -= 64;
-        for (i = 0;i < 100; i++) {
-                temp = (bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x3F;
-                if (temp > 32)
-                        temp -= 64;
-                if (temp < rssi)
-                        j++;
-                if (j >= 20)
-                        ret = 1;
-        }
-        bcm43xx_phy_write(bcm, 0x0403, saved);
-
-        return ret;
-}
-
-u8 bcm43xx_radio_aci_scan(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u8 ret[13];
-        unsigned int channel = radio->channel;
-        unsigned int i, j, start, end;
-        unsigned long phylock_flags;
-
-        if (!((phy->type == BCM43xx_PHYTYPE_G) && (phy->rev > 0)))
-                return 0;
-
-        bcm43xx_phy_lock(bcm, phylock_flags);
-        bcm43xx_radio_lock(bcm);
-        bcm43xx_phy_write(bcm, 0x0802,
-                          bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC);
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0x7FFF);
-        bcm43xx_set_all_gains(bcm, 3, 8, 1);
-
-        start = (channel - 5 > 0) ? channel - 5 : 1;
-        end = (channel + 5 < 14) ? channel + 5 : 13;
-
-        for (i = start; i <= end; i++) {
-                if (abs(channel - i) > 2)
-                        ret[i-1] = bcm43xx_radio_aci_detect(bcm, i);
-        }
-        bcm43xx_radio_selectchannel(bcm, channel, 0);
-        bcm43xx_phy_write(bcm, 0x0802,
-                          (bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC) | 0x0003);
-        bcm43xx_phy_write(bcm, 0x0403,
-                          bcm43xx_phy_read(bcm, 0x0403) & 0xFFF8);
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x8000);
-        bcm43xx_set_original_gains(bcm);
-        for (i = 0; i < 13; i++) {
-                if (!ret[i])
-                        continue;
-                end = (i + 5 < 13) ? i + 5 : 13;
-                for (j = i; j < end; j++)
-                        ret[j] = 1;
-        }
-        bcm43xx_radio_unlock(bcm);
-        bcm43xx_phy_unlock(bcm, phylock_flags);
-
-        return ret[channel - 1];
-}
-
-/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-void bcm43xx_nrssi_hw_write(struct bcm43xx_private *bcm, u16 offset, s16 val)
-{
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_CTRL, offset);
-        mmiowb();
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_DATA, (u16)val);
-}
-
-/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-s16 bcm43xx_nrssi_hw_read(struct bcm43xx_private *bcm, u16 offset)
-{
-        u16 val;
-
-        bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_CTRL, offset);
-        val = bcm43xx_phy_read(bcm, BCM43xx_PHY_NRSSILT_DATA);
-
-        return (s16)val;
-}
-
-/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val)
-{
-        u16 i;
-        s16 tmp;
-
-        for (i = 0; i < 64; i++) {
-                tmp = bcm43xx_nrssi_hw_read(bcm, i);
-                tmp -= val;
-                tmp = limit_value(tmp, -32, 31);
-                bcm43xx_nrssi_hw_write(bcm, i, tmp);
-        }
-}
-
-/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        s16 i, delta;
-        s32 tmp;
-
-        delta = 0x1F - radio->nrssi[0];
-        for (i = 0; i < 64; i++) {
-                tmp = (i - delta) * radio->nrssislope;
-                tmp /= 0x10000;
-                tmp += 0x3A;
-                tmp = limit_value(tmp, 0, 0x3F);
-                radio->nrssi_lt[i] = tmp;
-        }
-}
-
-static void bcm43xx_calc_nrssi_offset(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        u16 backup[20] = { 0 };
-        s16 v47F;
-        u16 i;
-        u16 saved = 0xFFFF;
-
-        backup[0] = bcm43xx_phy_read(bcm, 0x0001);
-        backup[1] = bcm43xx_phy_read(bcm, 0x0811);
-        backup[2] = bcm43xx_phy_read(bcm, 0x0812);
-        backup[3] = bcm43xx_phy_read(bcm, 0x0814);
-        backup[4] = bcm43xx_phy_read(bcm, 0x0815);
-        backup[5] = bcm43xx_phy_read(bcm, 0x005A);
-        backup[6] = bcm43xx_phy_read(bcm, 0x0059);
-        backup[7] = bcm43xx_phy_read(bcm, 0x0058);
-        backup[8] = bcm43xx_phy_read(bcm, 0x000A);
-        backup[9] = bcm43xx_phy_read(bcm, 0x0003);
-        backup[10] = bcm43xx_radio_read16(bcm, 0x007A);
-        backup[11] = bcm43xx_radio_read16(bcm, 0x0043);
-
-        bcm43xx_phy_write(bcm, 0x0429,
-                          bcm43xx_phy_read(bcm, 0x0429) & 0x7FFF);
-        bcm43xx_phy_write(bcm, 0x0001,
-                          (bcm43xx_phy_read(bcm, 0x0001) & 0x3FFF) | 0x4000);
-        bcm43xx_phy_write(bcm, 0x0811,
-                          bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
-        bcm43xx_phy_write(bcm, 0x0812,
-                          (bcm43xx_phy_read(bcm, 0x0812) & 0xFFF3) | 0x0004);
-        bcm43xx_phy_write(bcm, 0x0802,
-                          bcm43xx_phy_read(bcm, 0x0802) & ~(0x1 | 0x2));
-        if (phy->rev >= 6) {
-                backup[12] = bcm43xx_phy_read(bcm, 0x002E);
-                backup[13] = bcm43xx_phy_read(bcm, 0x002F);
-                backup[14] = bcm43xx_phy_read(bcm, 0x080F);
-                backup[15] = bcm43xx_phy_read(bcm, 0x0810);
-                backup[16] = bcm43xx_phy_read(bcm, 0x0801);
-                backup[17] = bcm43xx_phy_read(bcm, 0x0060);
-                backup[18] = bcm43xx_phy_read(bcm, 0x0014);
-                backup[19] = bcm43xx_phy_read(bcm, 0x0478);
-
-                bcm43xx_phy_write(bcm, 0x002E, 0);
-                bcm43xx_phy_write(bcm, 0x002F, 0);
-                bcm43xx_phy_write(bcm, 0x080F, 0);
-                bcm43xx_phy_write(bcm, 0x0810, 0);
-                bcm43xx_phy_write(bcm, 0x0478,
-                                  bcm43xx_phy_read(bcm, 0x0478) | 0x0100);
-                bcm43xx_phy_write(bcm, 0x0801,
-                                  bcm43xx_phy_read(bcm, 0x0801) | 0x0040);
-                bcm43xx_phy_write(bcm, 0x0060,
-                                  bcm43xx_phy_read(bcm, 0x0060) | 0x0040);
-                bcm43xx_phy_write(bcm, 0x0014,
-                                  bcm43xx_phy_read(bcm, 0x0014) | 0x0200);
-        }
-        bcm43xx_radio_write16(bcm, 0x007A,
-                              bcm43xx_radio_read16(bcm, 0x007A) | 0x0070);
-        bcm43xx_radio_write16(bcm, 0x007A,
-                              bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
-        udelay(30);
-
-        v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
-        if (v47F >= 0x20)
-                v47F -= 0x40;
-        if (v47F == 31) {
-                for (i = 7; i >= 4; i--) {
-                        bcm43xx_radio_write16(bcm, 0x007B, i);
-                        udelay(20);
-                        v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
-                        if (v47F >= 0x20)
-                                v47F -= 0x40;
-                        if (v47F < 31 && saved == 0xFFFF)
-                                saved = i;
-                }
-                if (saved == 0xFFFF)
-                        saved = 4;
-        } else {
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
-                bcm43xx_phy_write(bcm, 0x0814,
-                                  bcm43xx_phy_read(bcm, 0x0814) | 0x0001);
-                bcm43xx_phy_write(bcm, 0x0815,
-                                  bcm43xx_phy_read(bcm, 0x0815) & 0xFFFE);
-                bcm43xx_phy_write(bcm, 0x0811,
-                                  bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
-                bcm43xx_phy_write(bcm, 0x0812,
-                                  bcm43xx_phy_read(bcm, 0x0812) | 0x000C);
-                bcm43xx_phy_write(bcm, 0x0811,
-                                  bcm43xx_phy_read(bcm, 0x0811) | 0x0030);
-                bcm43xx_phy_write(bcm, 0x0812,
-                                  bcm43xx_phy_read(bcm, 0x0812) | 0x0030);
-                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
-                bcm43xx_phy_write(bcm, 0x0059, 0x0810);
-                bcm43xx_phy_write(bcm, 0x0058, 0x000D);
-                if (phy->analog == 0) {
-                        bcm43xx_phy_write(bcm, 0x0003, 0x0122);
-                } else {
-                        bcm43xx_phy_write(bcm, 0x000A,
-                                          bcm43xx_phy_read(bcm, 0x000A)
-                                          | 0x2000);
-                }
-                bcm43xx_phy_write(bcm, 0x0814,
-                                  bcm43xx_phy_read(bcm, 0x0814) | 0x0004);
-                bcm43xx_phy_write(bcm, 0x0815,
-                                  bcm43xx_phy_read(bcm, 0x0815) & 0xFFFB);
-                bcm43xx_phy_write(bcm, 0x0003,
-                                  (bcm43xx_phy_read(bcm, 0x0003) & 0xFF9F)
-                                  | 0x0040);
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x000F);
-                bcm43xx_set_all_gains(bcm, 3, 0, 1);
-                bcm43xx_radio_write16(bcm, 0x0043,
-                                      (bcm43xx_radio_read16(bcm, 0x0043)
-                                       & 0x00F0) | 0x000F);
-                udelay(30);
-                v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
-                if (v47F >= 0x20)
-                        v47F -= 0x40;
-                if (v47F == -32) {
-                        for (i = 0; i < 4; i++) {
-                                bcm43xx_radio_write16(bcm, 0x007B, i);
-                                udelay(20);
-                                v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
-                                if (v47F >= 0x20)
-                                        v47F -= 0x40;
-                                if (v47F > -31 && saved == 0xFFFF)
-                                        saved = i;
-                        }
-                        if (saved == 0xFFFF)
-                                saved = 3;
-                } else
-                        saved = 0;
-        }
-        bcm43xx_radio_write16(bcm, 0x007B, saved);
-
-        if (phy->rev >= 6) {
-                bcm43xx_phy_write(bcm, 0x002E, backup[12]);
-                bcm43xx_phy_write(bcm, 0x002F, backup[13]);
-                bcm43xx_phy_write(bcm, 0x080F, backup[14]);
-                bcm43xx_phy_write(bcm, 0x0810, backup[15]);
-        }
-        bcm43xx_phy_write(bcm, 0x0814, backup[3]);
-        bcm43xx_phy_write(bcm, 0x0815, backup[4]);
-        bcm43xx_phy_write(bcm, 0x005A, backup[5]);
-        bcm43xx_phy_write(bcm, 0x0059, backup[6]);
-        bcm43xx_phy_write(bcm, 0x0058, backup[7]);
-        bcm43xx_phy_write(bcm, 0x000A, backup[8]);
-        bcm43xx_phy_write(bcm, 0x0003, backup[9]);
-        bcm43xx_radio_write16(bcm, 0x0043, backup[11]);
-        bcm43xx_radio_write16(bcm, 0x007A, backup[10]);
-        bcm43xx_phy_write(bcm, 0x0802,
-                          bcm43xx_phy_read(bcm, 0x0802) | 0x1 | 0x2);
-        bcm43xx_phy_write(bcm, 0x0429,
-                          bcm43xx_phy_read(bcm, 0x0429) | 0x8000);
-        bcm43xx_set_original_gains(bcm);
-        if (phy->rev >= 6) {
-                bcm43xx_phy_write(bcm, 0x0801, backup[16]);
-                bcm43xx_phy_write(bcm, 0x0060, backup[17]);
-                bcm43xx_phy_write(bcm, 0x0014, backup[18]);
-                bcm43xx_phy_write(bcm, 0x0478, backup[19]);
-        }
-        bcm43xx_phy_write(bcm, 0x0001, backup[0]);
-        bcm43xx_phy_write(bcm, 0x0812, backup[2]);
-        bcm43xx_phy_write(bcm, 0x0811, backup[1]);
-}
-
-void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 backup[18] = { 0 };
-        u16 tmp;
-        s16 nrssi0, nrssi1;
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_B:
-                backup[0] = bcm43xx_radio_read16(bcm, 0x007A);
-                backup[1] = bcm43xx_radio_read16(bcm, 0x0052);
-                backup[2] = bcm43xx_radio_read16(bcm, 0x0043);
-                backup[3] = bcm43xx_phy_read(bcm, 0x0030);
-                backup[4] = bcm43xx_phy_read(bcm, 0x0026);
-                backup[5] = bcm43xx_phy_read(bcm, 0x0015);
-                backup[6] = bcm43xx_phy_read(bcm, 0x002A);
-                backup[7] = bcm43xx_phy_read(bcm, 0x0020);
-                backup[8] = bcm43xx_phy_read(bcm, 0x005A);
-                backup[9] = bcm43xx_phy_read(bcm, 0x0059);
-                backup[10] = bcm43xx_phy_read(bcm, 0x0058);
-                backup[11] = bcm43xx_read16(bcm, 0x03E2);
-                backup[12] = bcm43xx_read16(bcm, 0x03E6);
-                backup[13] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
-
-                tmp  = bcm43xx_radio_read16(bcm, 0x007A);
-                tmp &= (phy->rev >= 5) ? 0x007F : 0x000F;
-                bcm43xx_radio_write16(bcm, 0x007A, tmp);
-                bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
-                bcm43xx_write16(bcm, 0x03EC, 0x7F7F);
-                bcm43xx_phy_write(bcm, 0x0026, 0x0000);
-                bcm43xx_phy_write(bcm, 0x0015,
-                                  bcm43xx_phy_read(bcm, 0x0015) | 0x0020);
-                bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
-
-                nrssi0 = (s16)bcm43xx_phy_read(bcm, 0x0027);
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
-                if (phy->analog >= 2) {
-                        bcm43xx_write16(bcm, 0x03E6, 0x0040);
-                } else if (phy->analog == 0) {
-                        bcm43xx_write16(bcm, 0x03E6, 0x0122);
-                } else {
-                        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
-                                        bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT) & 0x2000);
-                }
-                bcm43xx_phy_write(bcm, 0x0020, 0x3F3F);
-                bcm43xx_phy_write(bcm, 0x0015, 0xF330);
-                bcm43xx_radio_write16(bcm, 0x005A, 0x0060);
-                bcm43xx_radio_write16(bcm, 0x0043,
-                                      bcm43xx_radio_read16(bcm, 0x0043) & 0x00F0);
-                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
-                bcm43xx_phy_write(bcm, 0x0059, 0x0810);
-                bcm43xx_phy_write(bcm, 0x0058, 0x000D);
-                udelay(20);
-
-                nrssi1 = (s16)bcm43xx_phy_read(bcm, 0x0027);
-                bcm43xx_phy_write(bcm, 0x0030, backup[3]);
-                bcm43xx_radio_write16(bcm, 0x007A, backup[0]);
-                bcm43xx_write16(bcm, 0x03E2, backup[11]);
-                bcm43xx_phy_write(bcm, 0x0026, backup[4]);
-                bcm43xx_phy_write(bcm, 0x0015, backup[5]);
-                bcm43xx_phy_write(bcm, 0x002A, backup[6]);
-                bcm43xx_synth_pu_workaround(bcm, radio->channel);
-                if (phy->analog != 0)
-                        bcm43xx_write16(bcm, 0x03F4, backup[13]);
-
-                bcm43xx_phy_write(bcm, 0x0020, backup[7]);
-                bcm43xx_phy_write(bcm, 0x005A, backup[8]);
-                bcm43xx_phy_write(bcm, 0x0059, backup[9]);
-                bcm43xx_phy_write(bcm, 0x0058, backup[10]);
-                bcm43xx_radio_write16(bcm, 0x0052, backup[1]);
-                bcm43xx_radio_write16(bcm, 0x0043, backup[2]);
-
-                if (nrssi0 == nrssi1)
-                        radio->nrssislope = 0x00010000;
-                else 
-                        radio->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
-
-                if (nrssi0 <= -4) {
-                        radio->nrssi[0] = nrssi0;
-                        radio->nrssi[1] = nrssi1;
-                }
-                break;
-        case BCM43xx_PHYTYPE_G:
-                if (radio->revision >= 9)
-                        return;
-                if (radio->revision == 8)
-                        bcm43xx_calc_nrssi_offset(bcm);
-
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0x7FFF);
-                bcm43xx_phy_write(bcm, 0x0802,
-                                  bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC);
-                backup[7] = bcm43xx_read16(bcm, 0x03E2);
-                bcm43xx_write16(bcm, 0x03E2,
-                                bcm43xx_read16(bcm, 0x03E2) | 0x8000);
-                backup[0] = bcm43xx_radio_read16(bcm, 0x007A);
-                backup[1] = bcm43xx_radio_read16(bcm, 0x0052);
-                backup[2] = bcm43xx_radio_read16(bcm, 0x0043);
-                backup[3] = bcm43xx_phy_read(bcm, 0x0015);
-                backup[4] = bcm43xx_phy_read(bcm, 0x005A);
-                backup[5] = bcm43xx_phy_read(bcm, 0x0059);
-                backup[6] = bcm43xx_phy_read(bcm, 0x0058);
-                backup[8] = bcm43xx_read16(bcm, 0x03E6);
-                backup[9] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
-                if (phy->rev >= 3) {
-                        backup[10] = bcm43xx_phy_read(bcm, 0x002E);
-                        backup[11] = bcm43xx_phy_read(bcm, 0x002F);
-                        backup[12] = bcm43xx_phy_read(bcm, 0x080F);
-                        backup[13] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_LO_CONTROL);
-                        backup[14] = bcm43xx_phy_read(bcm, 0x0801);
-                        backup[15] = bcm43xx_phy_read(bcm, 0x0060);
-                        backup[16] = bcm43xx_phy_read(bcm, 0x0014);
-                        backup[17] = bcm43xx_phy_read(bcm, 0x0478);
-                        bcm43xx_phy_write(bcm, 0x002E, 0);
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, 0);
-                        switch (phy->rev) {
-                        case 4: case 6: case 7:
-                                bcm43xx_phy_write(bcm, 0x0478,
-                                                  bcm43xx_phy_read(bcm, 0x0478)
-                                                  | 0x0100);
-                                bcm43xx_phy_write(bcm, 0x0801,
-                                                  bcm43xx_phy_read(bcm, 0x0801)
-                                                  | 0x0040);
-                                break;
-                        case 3: case 5:
-                                bcm43xx_phy_write(bcm, 0x0801,
-                                                  bcm43xx_phy_read(bcm, 0x0801)
-                                                  & 0xFFBF);
-                                break;
-                        }
-                        bcm43xx_phy_write(bcm, 0x0060,
-                                          bcm43xx_phy_read(bcm, 0x0060)
-                                          | 0x0040);
-                        bcm43xx_phy_write(bcm, 0x0014,
-                                          bcm43xx_phy_read(bcm, 0x0014)
-                                          | 0x0200);
-                }
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0070);
-                bcm43xx_set_all_gains(bcm, 0, 8, 0);
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x00F7);
-                if (phy->rev >= 2) {
-                        bcm43xx_phy_write(bcm, 0x0811,
-                                          (bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF) | 0x0030);
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          (bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF) | 0x0010);
-                }
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
-                udelay(20);
-
-                nrssi0 = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
-                if (nrssi0 >= 0x0020)
-                        nrssi0 -= 0x0040;
-
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
-                if (phy->analog >= 2) {
-                        bcm43xx_phy_write(bcm, 0x0003,
-                                          (bcm43xx_phy_read(bcm, 0x0003)
-                                           & 0xFF9F) | 0x0040);
-                }
-
-                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
-                                bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
-                                | 0x2000);
-                bcm43xx_radio_write16(bcm, 0x007A,
-                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x000F);
-                bcm43xx_phy_write(bcm, 0x0015, 0xF330);
-                if (phy->rev >= 2) {
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          (bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF) | 0x0020);
-                        bcm43xx_phy_write(bcm, 0x0811,
-                                          (bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF) | 0x0020);
-                }
-
-                bcm43xx_set_all_gains(bcm, 3, 0, 1);
-                if (radio->revision == 8) {
-                        bcm43xx_radio_write16(bcm, 0x0043, 0x001F);
-                } else {
-                        tmp = bcm43xx_radio_read16(bcm, 0x0052) & 0xFF0F;
-                        bcm43xx_radio_write16(bcm, 0x0052, tmp | 0x0060);
-                        tmp = bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0;
-                        bcm43xx_radio_write16(bcm, 0x0043, tmp | 0x0009);
-                }
-                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
-                bcm43xx_phy_write(bcm, 0x0059, 0x0810);
-                bcm43xx_phy_write(bcm, 0x0058, 0x000D);
-                udelay(20);
-                nrssi1 = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
-                if (nrssi1 >= 0x0020)
-                        nrssi1 -= 0x0040;
-                if (nrssi0 == nrssi1)
-                        radio->nrssislope = 0x00010000;
-                else
-                        radio->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
-                if (nrssi0 >= -4) {
-                        radio->nrssi[0] = nrssi1;
-                        radio->nrssi[1] = nrssi0;
-                }
-                if (phy->rev >= 3) {
-                        bcm43xx_phy_write(bcm, 0x002E, backup[10]);
-                        bcm43xx_phy_write(bcm, 0x002F, backup[11]);
-                        bcm43xx_phy_write(bcm, 0x080F, backup[12]);
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, backup[13]);
-                }
-                if (phy->rev >= 2) {
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF);
-                        bcm43xx_phy_write(bcm, 0x0811,
-                                          bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF);
-                }
-
-                bcm43xx_radio_write16(bcm, 0x007A, backup[0]);
-                bcm43xx_radio_write16(bcm, 0x0052, backup[1]);
-                bcm43xx_radio_write16(bcm, 0x0043, backup[2]);
-                bcm43xx_write16(bcm, 0x03E2, backup[7]);
-                bcm43xx_write16(bcm, 0x03E6, backup[8]);
-                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[9]);
-                bcm43xx_phy_write(bcm, 0x0015, backup[3]);
-                bcm43xx_phy_write(bcm, 0x005A, backup[4]);
-                bcm43xx_phy_write(bcm, 0x0059, backup[5]);
-                bcm43xx_phy_write(bcm, 0x0058, backup[6]);
-                bcm43xx_synth_pu_workaround(bcm, radio->channel);
-                bcm43xx_phy_write(bcm, 0x0802,
-                                  bcm43xx_phy_read(bcm, 0x0802) | (0x0001 | 0x0002));
-                bcm43xx_set_original_gains(bcm);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x8000);
-                if (phy->rev >= 3) {
-                        bcm43xx_phy_write(bcm, 0x0801, backup[14]);
-                        bcm43xx_phy_write(bcm, 0x0060, backup[15]);
-                        bcm43xx_phy_write(bcm, 0x0014, backup[16]);
-                        bcm43xx_phy_write(bcm, 0x0478, backup[17]);
-                }
-                bcm43xx_nrssi_mem_update(bcm);
-                bcm43xx_calc_nrssi_threshold(bcm);
-                break;
-        default:
-                assert(0);
-        }
-}
-
-void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        s32 threshold;
-        s32 a, b;
-        s16 tmp16;
-        u16 tmp_u16;
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_B: {
-                if (radio->version != 0x2050)
-                        return;
-                if (!(bcm->sprom.boardflags & BCM43xx_BFL_RSSI))
-                        return;
-
-                if (radio->revision >= 6) {
-                        threshold = (radio->nrssi[1] - radio->nrssi[0]) * 32;
-                        threshold += 20 * (radio->nrssi[0] + 1);
-                        threshold /= 40;
-                } else
-                        threshold = radio->nrssi[1] - 5;
-
-                threshold = limit_value(threshold, 0, 0x3E);
-                bcm43xx_phy_read(bcm, 0x0020); /* dummy read */
-                bcm43xx_phy_write(bcm, 0x0020, (((u16)threshold) << 8) | 0x001C);
-
-                if (radio->revision >= 6) {
-                        bcm43xx_phy_write(bcm, 0x0087, 0x0E0D);
-                        bcm43xx_phy_write(bcm, 0x0086, 0x0C0B);
-                        bcm43xx_phy_write(bcm, 0x0085, 0x0A09);
-                        bcm43xx_phy_write(bcm, 0x0084, 0x0808);
-                        bcm43xx_phy_write(bcm, 0x0083, 0x0808);
-                        bcm43xx_phy_write(bcm, 0x0082, 0x0604);
-                        bcm43xx_phy_write(bcm, 0x0081, 0x0302);
-                        bcm43xx_phy_write(bcm, 0x0080, 0x0100);
-                }
-                break;
-        }
-        case BCM43xx_PHYTYPE_G:
-                if (!phy->connected ||
-                    !(bcm->sprom.boardflags & BCM43xx_BFL_RSSI)) {
-                        tmp16 = bcm43xx_nrssi_hw_read(bcm, 0x20);
-                        if (tmp16 >= 0x20)
-                                tmp16 -= 0x40;
-                        if (tmp16 < 3) {
-                                bcm43xx_phy_write(bcm, 0x048A,
-                                                  (bcm43xx_phy_read(bcm, 0x048A)
-                                                   & 0xF000) | 0x09EB);
-                        } else {
-                                bcm43xx_phy_write(bcm, 0x048A,
-                                                  (bcm43xx_phy_read(bcm, 0x048A)
-                                                   & 0xF000) | 0x0AED);
-                        }
-                } else {
-                        if (radio->interfmode == BCM43xx_RADIO_INTERFMODE_NONWLAN) {
-                                a = 0xE;
-                                b = 0xA;
-                        } else if (!radio->aci_wlan_automatic && radio->aci_enable) {
-                                a = 0x13;
-                                b = 0x12;
-                        } else {
-                                a = 0xE;
-                                b = 0x11;
-                        }
-
-                        a = a * (radio->nrssi[1] - radio->nrssi[0]);
-                        a += (radio->nrssi[0] << 6);
-                        if (a < 32)
-                                a += 31;
-                        else
-                                a += 32;
-                        a = a >> 6;
-                        a = limit_value(a, -31, 31);
-
-                        b = b * (radio->nrssi[1] - radio->nrssi[0]);
-                        b += (radio->nrssi[0] << 6);
-                        if (b < 32)
-                                b += 31;
-                        else
-                                b += 32;
-                        b = b >> 6;
-                        b = limit_value(b, -31, 31);
-
-                        tmp_u16 = bcm43xx_phy_read(bcm, 0x048A) & 0xF000;
-                        tmp_u16 |= ((u32)b & 0x0000003F);
-                        tmp_u16 |= (((u32)a & 0x0000003F) << 6);
-                        bcm43xx_phy_write(bcm, 0x048A, tmp_u16);
-                }
-                break;
-        default:
-                assert(0);
-        }
-}
-
-/* Stack implementation to save/restore values from the
- * interference mitigation code.
- * It is save to restore values in random order.
- */
-static void _stack_save(u32 *_stackptr, size_t *stackidx,
-                        u8 id, u16 offset, u16 value)
-{
-        u32 *stackptr = &(_stackptr[*stackidx]);
-
-        assert((offset & 0xE000) == 0x0000);
-        assert((id & 0xF8) == 0x00);
-        *stackptr = offset;
-        *stackptr |= ((u32)id) << 13;
-        *stackptr |= ((u32)value) << 16;
-        (*stackidx)++;
-        assert(*stackidx < BCM43xx_INTERFSTACK_SIZE);
-}
-
-static u16 _stack_restore(u32 *stackptr,
-                          u8 id, u16 offset)
-{
-        size_t i;
-
-        assert((offset & 0xE000) == 0x0000);
-        assert((id & 0xF8) == 0x00);
-        for (i = 0; i < BCM43xx_INTERFSTACK_SIZE; i++, stackptr++) {
-                if ((*stackptr & 0x00001FFF) != offset)
-                        continue;
-                if (((*stackptr & 0x00007000) >> 13) != id)
-                        continue;
-                return ((*stackptr & 0xFFFF0000) >> 16);
-        }
-        assert(0);
-
-        return 0;
-}
-
-#define phy_stacksave(offset)                                   \
-        do {                                                    \
-                _stack_save(stack, &stackidx, 0x1, (offset),    \
-                            bcm43xx_phy_read(bcm, (offset)));   \
-        } while (0)
-#define phy_stackrestore(offset)                                \
-        do {                                                    \
-                bcm43xx_phy_write(bcm, (offset),                \
-                                  _stack_restore(stack, 0x1,    \
-                                                 (offset)));    \
-        } while (0)
-#define radio_stacksave(offset)                                         \
-        do {                                                            \
-                _stack_save(stack, &stackidx, 0x2, (offset),            \
-                            bcm43xx_radio_read16(bcm, (offset)));       \
-        } while (0)
-#define radio_stackrestore(offset)                                      \
-        do {                                                            \
-                bcm43xx_radio_write16(bcm, (offset),                    \
-                                      _stack_restore(stack, 0x2,        \
-                                                     (offset)));        \
-        } while (0)
-#define ilt_stacksave(offset)                                   \
-        do {                                                    \
-                _stack_save(stack, &stackidx, 0x3, (offset),    \
-                            bcm43xx_ilt_read(bcm, (offset)));   \
-        } while (0)
-#define ilt_stackrestore(offset)                                \
-        do {                                                    \
-                bcm43xx_ilt_write(bcm, (offset),                \
-                                  _stack_restore(stack, 0x3,    \
-                                                 (offset)));    \
-        } while (0)
-
-static void
-bcm43xx_radio_interference_mitigation_enable(struct bcm43xx_private *bcm,
-                                             int mode)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 tmp, flipped;
-        u32 tmp32;
-        size_t stackidx = 0;
-        u32 *stack = radio->interfstack;
-
-        switch (mode) {
-        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
-                if (phy->rev != 1) {
-                        bcm43xx_phy_write(bcm, 0x042B,
-                                          bcm43xx_phy_read(bcm, 0x042B) | 0x0800);
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & ~0x4000);
-                        break;
-                }
-                radio_stacksave(0x0078);
-                tmp = (bcm43xx_radio_read16(bcm, 0x0078) & 0x001E);
-                flipped = flip_4bit(tmp);
-                if (flipped < 10 && flipped >= 8)
-                        flipped = 7;
-                else if (flipped >= 10)
-                        flipped -= 3;
-                flipped = flip_4bit(flipped);
-                flipped = (flipped << 1) | 0x0020;
-                bcm43xx_radio_write16(bcm, 0x0078, flipped);
-
-                bcm43xx_calc_nrssi_threshold(bcm);
-
-                phy_stacksave(0x0406);
-                bcm43xx_phy_write(bcm, 0x0406, 0x7E28);
-
-                bcm43xx_phy_write(bcm, 0x042B,
-                                  bcm43xx_phy_read(bcm, 0x042B) | 0x0800);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
-                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | 0x1000);
-
-                phy_stacksave(0x04A0);
-                bcm43xx_phy_write(bcm, 0x04A0,
-                                  (bcm43xx_phy_read(bcm, 0x04A0) & 0xC0C0) | 0x0008);
-                phy_stacksave(0x04A1);
-                bcm43xx_phy_write(bcm, 0x04A1,
-                                  (bcm43xx_phy_read(bcm, 0x04A1) & 0xC0C0) | 0x0605);
-                phy_stacksave(0x04A2);
-                bcm43xx_phy_write(bcm, 0x04A2,
-                                  (bcm43xx_phy_read(bcm, 0x04A2) & 0xC0C0) | 0x0204);
-                phy_stacksave(0x04A8);
-                bcm43xx_phy_write(bcm, 0x04A8,
-                                  (bcm43xx_phy_read(bcm, 0x04A8) & 0xC0C0) | 0x0803);
-                phy_stacksave(0x04AB);
-                bcm43xx_phy_write(bcm, 0x04AB,
-                                  (bcm43xx_phy_read(bcm, 0x04AB) & 0xC0C0) | 0x0605);
-
-                phy_stacksave(0x04A7);
-                bcm43xx_phy_write(bcm, 0x04A7, 0x0002);
-                phy_stacksave(0x04A3);
-                bcm43xx_phy_write(bcm, 0x04A3, 0x287A);
-                phy_stacksave(0x04A9);
-                bcm43xx_phy_write(bcm, 0x04A9, 0x2027);
-                phy_stacksave(0x0493);
-                bcm43xx_phy_write(bcm, 0x0493, 0x32F5);
-                phy_stacksave(0x04AA);
-                bcm43xx_phy_write(bcm, 0x04AA, 0x2027);
-                phy_stacksave(0x04AC);
-                bcm43xx_phy_write(bcm, 0x04AC, 0x32F5);
-                break;
-        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
-                if (bcm43xx_phy_read(bcm, 0x0033) & 0x0800)
-                        break;
-
-                radio->aci_enable = 1;
-
-                phy_stacksave(BCM43xx_PHY_RADIO_BITFIELD);
-                phy_stacksave(BCM43xx_PHY_G_CRS);
-                if (phy->rev < 2) {
-                        phy_stacksave(0x0406);
-                } else {
-                        phy_stacksave(0x04C0);
-                        phy_stacksave(0x04C1);
-                }
-                phy_stacksave(0x0033);
-                phy_stacksave(0x04A7);
-                phy_stacksave(0x04A3);
-                phy_stacksave(0x04A9);
-                phy_stacksave(0x04AA);
-                phy_stacksave(0x04AC);
-                phy_stacksave(0x0493);
-                phy_stacksave(0x04A1);
-                phy_stacksave(0x04A0);
-                phy_stacksave(0x04A2);
-                phy_stacksave(0x048A);
-                phy_stacksave(0x04A8);
-                phy_stacksave(0x04AB);
-                if (phy->rev == 2) {
-                        phy_stacksave(0x04AD);
-                        phy_stacksave(0x04AE);
-                } else if (phy->rev >= 3) {
-                        phy_stacksave(0x04AD);
-                        phy_stacksave(0x0415);
-                        phy_stacksave(0x0416);
-                        phy_stacksave(0x0417);
-                        ilt_stacksave(0x1A00 + 0x2);
-                        ilt_stacksave(0x1A00 + 0x3);
-                }
-                phy_stacksave(0x042B);
-                phy_stacksave(0x048C);
-
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
-                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD)
-                                  & ~0x1000);
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                  (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
-                                   & 0xFFFC) | 0x0002);
-
-                bcm43xx_phy_write(bcm, 0x0033, 0x0800);
-                bcm43xx_phy_write(bcm, 0x04A3, 0x2027);
-                bcm43xx_phy_write(bcm, 0x04A9, 0x1CA8);
-                bcm43xx_phy_write(bcm, 0x0493, 0x287A);
-                bcm43xx_phy_write(bcm, 0x04AA, 0x1CA8);
-                bcm43xx_phy_write(bcm, 0x04AC, 0x287A);
-
-                bcm43xx_phy_write(bcm, 0x04A0,
-                                  (bcm43xx_phy_read(bcm, 0x04A0)
-                                   & 0xFFC0) | 0x001A);
-                bcm43xx_phy_write(bcm, 0x04A7, 0x000D);
-
-                if (phy->rev < 2) {
-                        bcm43xx_phy_write(bcm, 0x0406, 0xFF0D);
-                } else if (phy->rev == 2) {
-                        bcm43xx_phy_write(bcm, 0x04C0, 0xFFFF);
-                        bcm43xx_phy_write(bcm, 0x04C1, 0x00A9);
-                } else {
-                        bcm43xx_phy_write(bcm, 0x04C0, 0x00C1);
-                        bcm43xx_phy_write(bcm, 0x04C1, 0x0059);
-                }
-
-                bcm43xx_phy_write(bcm, 0x04A1,
-                                  (bcm43xx_phy_read(bcm, 0x04A1)
-                                   & 0xC0FF) | 0x1800);
-                bcm43xx_phy_write(bcm, 0x04A1,
-                                  (bcm43xx_phy_read(bcm, 0x04A1)
-                                   & 0xFFC0) | 0x0015);
-                bcm43xx_phy_write(bcm, 0x04A8,
-                                  (bcm43xx_phy_read(bcm, 0x04A8)
-                                   & 0xCFFF) | 0x1000);
-                bcm43xx_phy_write(bcm, 0x04A8,
-                                  (bcm43xx_phy_read(bcm, 0x04A8)
-                                   & 0xF0FF) | 0x0A00);
-                bcm43xx_phy_write(bcm, 0x04AB,
-                                  (bcm43xx_phy_read(bcm, 0x04AB)
-                                   & 0xCFFF) | 0x1000);
-                bcm43xx_phy_write(bcm, 0x04AB,
-                                  (bcm43xx_phy_read(bcm, 0x04AB)
-                                   & 0xF0FF) | 0x0800);
-                bcm43xx_phy_write(bcm, 0x04AB,
-                                  (bcm43xx_phy_read(bcm, 0x04AB)
-                                   & 0xFFCF) | 0x0010);
-                bcm43xx_phy_write(bcm, 0x04AB,
-                                  (bcm43xx_phy_read(bcm, 0x04AB)
-                                   & 0xFFF0) | 0x0005);
-                bcm43xx_phy_write(bcm, 0x04A8,
-                                  (bcm43xx_phy_read(bcm, 0x04A8)
-                                   & 0xFFCF) | 0x0010);
-                bcm43xx_phy_write(bcm, 0x04A8,
-                                  (bcm43xx_phy_read(bcm, 0x04A8)
-                                   & 0xFFF0) | 0x0006);
-                bcm43xx_phy_write(bcm, 0x04A2,
-                                  (bcm43xx_phy_read(bcm, 0x04A2)
-                                   & 0xF0FF) | 0x0800);
-                bcm43xx_phy_write(bcm, 0x04A0,
-                                  (bcm43xx_phy_read(bcm, 0x04A0)
-                                   & 0xF0FF) | 0x0500);
-                bcm43xx_phy_write(bcm, 0x04A2,
-                                  (bcm43xx_phy_read(bcm, 0x04A2)
-                                   & 0xFFF0) | 0x000B);
-
-                if (phy->rev >= 3) {
-                        bcm43xx_phy_write(bcm, 0x048A,
-                                          bcm43xx_phy_read(bcm, 0x048A)
-                                          & ~0x8000);
-                        bcm43xx_phy_write(bcm, 0x0415,
-                                          (bcm43xx_phy_read(bcm, 0x0415)
-                                           & 0x8000) | 0x36D8);
-                        bcm43xx_phy_write(bcm, 0x0416,
-                                          (bcm43xx_phy_read(bcm, 0x0416)
-                                           & 0x8000) | 0x36D8);
-                        bcm43xx_phy_write(bcm, 0x0417,
-                                          (bcm43xx_phy_read(bcm, 0x0417)
-                                           & 0xFE00) | 0x016D);
-                } else {
-                        bcm43xx_phy_write(bcm, 0x048A,
-                                          bcm43xx_phy_read(bcm, 0x048A)
-                                          | 0x1000);
-                        bcm43xx_phy_write(bcm, 0x048A,
-                                          (bcm43xx_phy_read(bcm, 0x048A)
-                                           & 0x9FFF) | 0x2000);
-                        tmp32 = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                                   BCM43xx_UCODEFLAGS_OFFSET);
-                        if (!(tmp32 & 0x800)) {
-                                tmp32 |= 0x800;
-                                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                                                    BCM43xx_UCODEFLAGS_OFFSET,
-                                                    tmp32);
-                        }
-                }
-                if (phy->rev >= 2) {
-                        bcm43xx_phy_write(bcm, 0x042B,
-                                          bcm43xx_phy_read(bcm, 0x042B)
-                                          | 0x0800);
-                }
-                bcm43xx_phy_write(bcm, 0x048C,
-                                  (bcm43xx_phy_read(bcm, 0x048C)
-                                   & 0xF0FF) | 0x0200);
-                if (phy->rev == 2) {
-                        bcm43xx_phy_write(bcm, 0x04AE,
-                                          (bcm43xx_phy_read(bcm, 0x04AE)
-                                           & 0xFF00) | 0x007F);
-                        bcm43xx_phy_write(bcm, 0x04AD,
-                                          (bcm43xx_phy_read(bcm, 0x04AD)
-                                           & 0x00FF) | 0x1300);
-                } else if (phy->rev >= 6) {
-                        bcm43xx_ilt_write(bcm, 0x1A00 + 0x3, 0x007F);
-                        bcm43xx_ilt_write(bcm, 0x1A00 + 0x2, 0x007F);
-                        bcm43xx_phy_write(bcm, 0x04AD,
-                                          bcm43xx_phy_read(bcm, 0x04AD)
-                                          & 0x00FF);
-                }
-                bcm43xx_calc_nrssi_slope(bcm);
-                break;
-        default:
-                assert(0);
-        }
-}
-
-static void
-bcm43xx_radio_interference_mitigation_disable(struct bcm43xx_private *bcm,
-                                              int mode)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u32 tmp32;
-        u32 *stack = radio->interfstack;
-
-        switch (mode) {
-        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
-                if (phy->rev != 1) {
-                        bcm43xx_phy_write(bcm, 0x042B,
-                                          bcm43xx_phy_read(bcm, 0x042B) & ~0x0800);
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x4000);
-                        break;
-                }
-                phy_stackrestore(0x0078);
-                bcm43xx_calc_nrssi_threshold(bcm);
-                phy_stackrestore(0x0406);
-                bcm43xx_phy_write(bcm, 0x042B,
-                                  bcm43xx_phy_read(bcm, 0x042B) & ~0x0800);
-                if (!bcm->bad_frames_preempt) {
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
-                                          bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD)
-                                          & ~(1 << 11));
-                }
-                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x4000);
-                phy_stackrestore(0x04A0);
-                phy_stackrestore(0x04A1);
-                phy_stackrestore(0x04A2);
-                phy_stackrestore(0x04A8);
-                phy_stackrestore(0x04AB);
-                phy_stackrestore(0x04A7);
-                phy_stackrestore(0x04A3);
-                phy_stackrestore(0x04A9);
-                phy_stackrestore(0x0493);
-                phy_stackrestore(0x04AA);
-                phy_stackrestore(0x04AC);
-                break;
-        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
-                if (!(bcm43xx_phy_read(bcm, 0x0033) & 0x0800))
-                        break;
-
-                radio->aci_enable = 0;
-
-                phy_stackrestore(BCM43xx_PHY_RADIO_BITFIELD);
-                phy_stackrestore(BCM43xx_PHY_G_CRS);
-                phy_stackrestore(0x0033);
-                phy_stackrestore(0x04A3);
-                phy_stackrestore(0x04A9);
-                phy_stackrestore(0x0493);
-                phy_stackrestore(0x04AA);
-                phy_stackrestore(0x04AC);
-                phy_stackrestore(0x04A0);
-                phy_stackrestore(0x04A7);
-                if (phy->rev >= 2) {
-                        phy_stackrestore(0x04C0);
-                        phy_stackrestore(0x04C1);
-                } else
-                        phy_stackrestore(0x0406);
-                phy_stackrestore(0x04A1);
-                phy_stackrestore(0x04AB);
-                phy_stackrestore(0x04A8);
-                if (phy->rev == 2) {
-                        phy_stackrestore(0x04AD);
-                        phy_stackrestore(0x04AE);
-                } else if (phy->rev >= 3) {
-                        phy_stackrestore(0x04AD);
-                        phy_stackrestore(0x0415);
-                        phy_stackrestore(0x0416);
-                        phy_stackrestore(0x0417);
-                        ilt_stackrestore(0x1A00 + 0x2);
-                        ilt_stackrestore(0x1A00 + 0x3);
-                }
-                phy_stackrestore(0x04A2);
-                phy_stackrestore(0x04A8);
-                phy_stackrestore(0x042B);
-                phy_stackrestore(0x048C);
-                tmp32 = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                           BCM43xx_UCODEFLAGS_OFFSET);
-                if (tmp32 & 0x800) {
-                        tmp32 &= ~0x800;
-                        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                                            BCM43xx_UCODEFLAGS_OFFSET,
-                                            tmp32);
-                }
-                bcm43xx_calc_nrssi_slope(bcm);
-                break;
-        default:
-                assert(0);
-        }
-}
-
-#undef phy_stacksave
-#undef phy_stackrestore
-#undef radio_stacksave
-#undef radio_stackrestore
-#undef ilt_stacksave
-#undef ilt_stackrestore
-
-int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_private *bcm,
-                                              int mode)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        int currentmode;
-
-        if ((phy->type != BCM43xx_PHYTYPE_G) ||
-            (phy->rev == 0) ||
-            (!phy->connected))
-                return -ENODEV;
-
-        radio->aci_wlan_automatic = 0;
-        switch (mode) {
-        case BCM43xx_RADIO_INTERFMODE_AUTOWLAN:
-                radio->aci_wlan_automatic = 1;
-                if (radio->aci_enable)
-                        mode = BCM43xx_RADIO_INTERFMODE_MANUALWLAN;
-                else
-                        mode = BCM43xx_RADIO_INTERFMODE_NONE;
-                break;
-        case BCM43xx_RADIO_INTERFMODE_NONE:
-        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
-        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        currentmode = radio->interfmode;
-        if (currentmode == mode)
-                return 0;
-        if (currentmode != BCM43xx_RADIO_INTERFMODE_NONE)
-                bcm43xx_radio_interference_mitigation_disable(bcm, currentmode);
-
-        if (mode == BCM43xx_RADIO_INTERFMODE_NONE) {
-                radio->aci_enable = 0;
-                radio->aci_hw_rssi = 0;
-        } else
-                bcm43xx_radio_interference_mitigation_enable(bcm, mode);
-        radio->interfmode = mode;
-
-        return 0;
-}
-
-u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)
-{
-        u16 reg, index, ret;
-
-        reg = bcm43xx_radio_read16(bcm, 0x0060);
-        index = (reg & 0x001E) >> 1;
-        ret = rcc_table[index] << 1;
-        ret |= (reg & 0x0001);
-        ret |= 0x0020;
-
-        return ret;
-}
-
-#define LPD(L, P, D)    (((L) << 2) | ((P) << 1) | ((D) << 0))
-static u16 bcm43xx_get_812_value(struct bcm43xx_private *bcm, u8 lpd)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 loop_or = 0;
-        u16 adj_loopback_gain = phy->loopback_gain[0];
-        u8 loop;
-        u16 extern_lna_control;
-
-        if (!phy->connected)
-                return 0;
-        if (!has_loopback_gain(phy)) {
-                if (phy->rev < 7 || !(bcm->sprom.boardflags
-                    & BCM43xx_BFL_EXTLNA)) {
-                        switch (lpd) {
-                        case LPD(0, 1, 1):
-                                return 0x0FB2;
-                        case LPD(0, 0, 1):
-                                return 0x00B2;
-                        case LPD(1, 0, 1):
-                                return 0x30B2;
-                        case LPD(1, 0, 0):
-                                return 0x30B3;
-                        default:
-                                assert(0);
-                        }
-                } else {
-                        switch (lpd) {
-                        case LPD(0, 1, 1):
-                                return 0x8FB2;
-                        case LPD(0, 0, 1):
-                                return 0x80B2;
-                        case LPD(1, 0, 1):
-                                return 0x20B2;
-                        case LPD(1, 0, 0):
-                                return 0x20B3;
-                        default:
-                                assert(0);
-                        }
-                }
-        } else {
-                if (radio->revision == 8)
-                        adj_loopback_gain += 0x003E;
-                else
-                        adj_loopback_gain += 0x0026;
-                if (adj_loopback_gain >= 0x46) {
-                        adj_loopback_gain -= 0x46;
-                        extern_lna_control = 0x3000;
-                } else if (adj_loopback_gain >= 0x3A) {
-                        adj_loopback_gain -= 0x3A;
-                        extern_lna_control = 0x2000;
-                } else if (adj_loopback_gain >= 0x2E) {
-                        adj_loopback_gain -= 0x2E;
-                        extern_lna_control = 0x1000;
-                } else {
-                        adj_loopback_gain -= 0x10;
-                        extern_lna_control = 0x0000;
-                }
-                for (loop = 0; loop < 16; loop++) {
-                        u16 tmp = adj_loopback_gain - 6 * loop;
-                        if (tmp < 6)
-                                break;
-                }
-
-                loop_or = (loop << 8) | extern_lna_control;
-                if (phy->rev >= 7 && bcm->sprom.boardflags
-                    & BCM43xx_BFL_EXTLNA) {
-                        if (extern_lna_control)
-                                loop_or |= 0x8000;
-                        switch (lpd) {
-                        case LPD(0, 1, 1):
-                                return 0x8F92;
-                        case LPD(0, 0, 1):
-                                return (0x8092 | loop_or);
-                        case LPD(1, 0, 1):
-                                return (0x2092 | loop_or);
-                        case LPD(1, 0, 0):
-                                return (0x2093 | loop_or);
-                        default:
-                                assert(0);
-                        }
-                } else {
-                        switch (lpd) {
-                        case LPD(0, 1, 1):
-                                return 0x0F92;
-                        case LPD(0, 0, 1):
-                        case LPD(1, 0, 1):
-                                return (0x0092 | loop_or);
-                        case LPD(1, 0, 0):
-                                return (0x0093 | loop_or);
-                        default:
-                                assert(0);
-                        }
-                }
-        }
-        return 0;
-}
-
-u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 backup[21] = { 0 };
-        u16 ret;
-        u16 i, j;
-        u32 tmp1 = 0, tmp2 = 0;
-
-        backup[0] = bcm43xx_radio_read16(bcm, 0x0043);
-        backup[14] = bcm43xx_radio_read16(bcm, 0x0051);
-        backup[15] = bcm43xx_radio_read16(bcm, 0x0052);
-        backup[1] = bcm43xx_phy_read(bcm, 0x0015);
-        backup[16] = bcm43xx_phy_read(bcm, 0x005A);
-        backup[17] = bcm43xx_phy_read(bcm, 0x0059);
-        backup[18] = bcm43xx_phy_read(bcm, 0x0058);
-        if (phy->type == BCM43xx_PHYTYPE_B) {
-                backup[2] = bcm43xx_phy_read(bcm, 0x0030);
-                backup[3] = bcm43xx_read16(bcm, 0x03EC);
-                bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
-                bcm43xx_write16(bcm, 0x03EC, 0x3F3F);
-        } else {
-                if (phy->connected) {
-                        backup[4] = bcm43xx_phy_read(bcm, 0x0811);
-                        backup[5] = bcm43xx_phy_read(bcm, 0x0812);
-                        backup[6] = bcm43xx_phy_read(bcm, 0x0814);
-                        backup[7] = bcm43xx_phy_read(bcm, 0x0815);
-                        backup[8] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS);
-                        backup[9] = bcm43xx_phy_read(bcm, 0x0802);
-                        bcm43xx_phy_write(bcm, 0x0814,
-                                          (bcm43xx_phy_read(bcm, 0x0814)
-                                          | 0x0003));
-                        bcm43xx_phy_write(bcm, 0x0815,
-                                          (bcm43xx_phy_read(bcm, 0x0815)
-                                          & 0xFFFC));
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                          (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
-                                          & 0x7FFF));
-                        bcm43xx_phy_write(bcm, 0x0802,
-                                          (bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC));
-                        if (phy->rev > 1) { /* loopback gain enabled */
-                                backup[19] = bcm43xx_phy_read(bcm, 0x080F);
-                                backup[20] = bcm43xx_phy_read(bcm, 0x0810);
-                                if (phy->rev >= 3)
-                                        bcm43xx_phy_write(bcm, 0x080F, 0xC020);
-                                else
-                                        bcm43xx_phy_write(bcm, 0x080F, 0x8020);
-                                bcm43xx_phy_write(bcm, 0x0810, 0x0000);
-                        }
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          bcm43xx_get_812_value(bcm, LPD(0, 1, 1)));
-                        if (phy->rev < 7 || !(bcm->sprom.boardflags
-                            & BCM43xx_BFL_EXTLNA))
-                                bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
-                        else
-                                bcm43xx_phy_write(bcm, 0x0811, 0x09B3);
-                }
-        }
-        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
-                        (bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_RADIO) | 0x8000));
-        backup[10] = bcm43xx_phy_read(bcm, 0x0035);
-        bcm43xx_phy_write(bcm, 0x0035,
-                          (bcm43xx_phy_read(bcm, 0x0035) & 0xFF7F));
-        backup[11] = bcm43xx_read16(bcm, 0x03E6);
-        backup[12] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
-
-        // Initialization
-        if (phy->analog == 0) {
-                bcm43xx_write16(bcm, 0x03E6, 0x0122);
-        } else {
-                if (phy->analog >= 2)
-                        bcm43xx_phy_write(bcm, 0x0003,
-                                          (bcm43xx_phy_read(bcm, 0x0003)
-                                          & 0xFFBF) | 0x0040);
-                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
-                                (bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
-                                | 0x2000));
-        }
-
-        ret = bcm43xx_radio_calibrationvalue(bcm);
-
-        if (phy->type == BCM43xx_PHYTYPE_B)
-                bcm43xx_radio_write16(bcm, 0x0078, 0x0026);
-
-        if (phy->connected)
-                bcm43xx_phy_write(bcm, 0x0812,
-                                  bcm43xx_get_812_value(bcm, LPD(0, 1, 1)));
-        bcm43xx_phy_write(bcm, 0x0015, 0xBFAF);
-        bcm43xx_phy_write(bcm, 0x002B, 0x1403);
-        if (phy->connected)
-                bcm43xx_phy_write(bcm, 0x0812,
-                                  bcm43xx_get_812_value(bcm, LPD(0, 0, 1)));
-        bcm43xx_phy_write(bcm, 0x0015, 0xBFA0);
-        bcm43xx_radio_write16(bcm, 0x0051,
-                              (bcm43xx_radio_read16(bcm, 0x0051) | 0x0004));
-        if (radio->revision == 8)
-                bcm43xx_radio_write16(bcm, 0x0043, 0x001F);
-        else {
-                bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
-                bcm43xx_radio_write16(bcm, 0x0043,
-                                      (bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0)
-                                      | 0x0009);
-        }
-        bcm43xx_phy_write(bcm, 0x0058, 0x0000);
-
-        for (i = 0; i < 16; i++) {
-                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
-                bcm43xx_phy_write(bcm, 0x0059, 0xC810);
-                bcm43xx_phy_write(bcm, 0x0058, 0x000D);
-                if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
-                bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
-                udelay(10);
-                if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
-                bcm43xx_phy_write(bcm, 0x0015, 0xEFB0);
-                udelay(10);
-                if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 0)));
-                bcm43xx_phy_write(bcm, 0x0015, 0xFFF0);
-                udelay(20);
-                tmp1 += bcm43xx_phy_read(bcm, 0x002D);
-                bcm43xx_phy_write(bcm, 0x0058, 0x0000);
-                if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812,
-                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
-                bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
-        }
-
-        tmp1++;
-        tmp1 >>= 9;
-        udelay(10);
-        bcm43xx_phy_write(bcm, 0x0058, 0x0000);
-
-        for (i = 0; i < 16; i++) {
-                bcm43xx_radio_write16(bcm, 0x0078, (flip_4bit(i) << 1) | 0x0020);
-                backup[13] = bcm43xx_radio_read16(bcm, 0x0078);
-                udelay(10);
-                for (j = 0; j < 16; j++) {
-                        bcm43xx_phy_write(bcm, 0x005A, 0x0D80);
-                        bcm43xx_phy_write(bcm, 0x0059, 0xC810);
-                        bcm43xx_phy_write(bcm, 0x0058, 0x000D);
-                        if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812,
-                                                  bcm43xx_get_812_value(bcm,
-                                                  LPD(1, 0, 1)));
-                        bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
-                        udelay(10);
-                        if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812,
-                                                  bcm43xx_get_812_value(bcm,
-                                                  LPD(1, 0, 1)));
-                        bcm43xx_phy_write(bcm, 0x0015, 0xEFB0);
-                        udelay(10);
-                        if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812,
-                                                  bcm43xx_get_812_value(bcm,
-                                                  LPD(1, 0, 0)));
-                        bcm43xx_phy_write(bcm, 0x0015, 0xFFF0);
-                        udelay(10);
-                        tmp2 += bcm43xx_phy_read(bcm, 0x002D);
-                        bcm43xx_phy_write(bcm, 0x0058, 0x0000);
-                        if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812,
-                                                  bcm43xx_get_812_value(bcm,
-                                                  LPD(1, 0, 1)));
-                        bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
-                }
-                tmp2++;
-                tmp2 >>= 8;
-                if (tmp1 < tmp2)
-                        break;
-        }
-
-        /* Restore the registers */
-        bcm43xx_phy_write(bcm, 0x0015, backup[1]);
-        bcm43xx_radio_write16(bcm, 0x0051, backup[14]);
-        bcm43xx_radio_write16(bcm, 0x0052, backup[15]);
-        bcm43xx_radio_write16(bcm, 0x0043, backup[0]);
-        bcm43xx_phy_write(bcm, 0x005A, backup[16]);
-        bcm43xx_phy_write(bcm, 0x0059, backup[17]);
-        bcm43xx_phy_write(bcm, 0x0058, backup[18]);
-        bcm43xx_write16(bcm, 0x03E6, backup[11]);
-        if (phy->analog != 0)
-                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[12]);
-        bcm43xx_phy_write(bcm, 0x0035, backup[10]);
-        bcm43xx_radio_selectchannel(bcm, radio->channel, 1);
-        if (phy->type == BCM43xx_PHYTYPE_B) {
-                bcm43xx_phy_write(bcm, 0x0030, backup[2]);
-                bcm43xx_write16(bcm, 0x03EC, backup[3]);
-        } else {
-                if (phy->connected) {
-                        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
-                                        (bcm43xx_read16(bcm,
-                                        BCM43xx_MMIO_PHY_RADIO) & 0x7FFF));
-                        bcm43xx_phy_write(bcm, 0x0811, backup[4]);
-                        bcm43xx_phy_write(bcm, 0x0812, backup[5]);
-                        bcm43xx_phy_write(bcm, 0x0814, backup[6]);
-                        bcm43xx_phy_write(bcm, 0x0815, backup[7]);
-                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, backup[8]);
-                        bcm43xx_phy_write(bcm, 0x0802, backup[9]);
-                        if (phy->rev > 1) {
-                                bcm43xx_phy_write(bcm, 0x080F, backup[19]);
-                                bcm43xx_phy_write(bcm, 0x0810, backup[20]);
-                        }
-                }
-        }
-        if (i >= 15)
-                ret = backup[13];
-
-        return ret;
-}
-
-void bcm43xx_radio_init2060(struct bcm43xx_private *bcm)
-{
-        int err;
-
-        bcm43xx_radio_write16(bcm, 0x0004, 0x00C0);
-        bcm43xx_radio_write16(bcm, 0x0005, 0x0008);
-        bcm43xx_radio_write16(bcm, 0x0009, 0x0040);
-        bcm43xx_radio_write16(bcm, 0x0005, 0x00AA);
-        bcm43xx_radio_write16(bcm, 0x0032, 0x008F);
-        bcm43xx_radio_write16(bcm, 0x0006, 0x008F);
-        bcm43xx_radio_write16(bcm, 0x0034, 0x008F);
-        bcm43xx_radio_write16(bcm, 0x002C, 0x0007);
-        bcm43xx_radio_write16(bcm, 0x0082, 0x0080);
-        bcm43xx_radio_write16(bcm, 0x0080, 0x0000);
-        bcm43xx_radio_write16(bcm, 0x003F, 0x00DA);
-        bcm43xx_radio_write16(bcm, 0x0005, bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008);
-        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0010);
-        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020);
-        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020);
-        udelay(400);
-
-        bcm43xx_radio_write16(bcm, 0x0081, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020) | 0x0010);
-        udelay(400);
-
-        bcm43xx_radio_write16(bcm, 0x0005, (bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008) | 0x0008);
-        bcm43xx_radio_write16(bcm, 0x0085, bcm43xx_radio_read16(bcm, 0x0085) & ~0x0010);
-        bcm43xx_radio_write16(bcm, 0x0005, bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008);
-        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0040);
-        bcm43xx_radio_write16(bcm, 0x0081, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0040) | 0x0040);
-        bcm43xx_radio_write16(bcm, 0x0005, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0008) | 0x0008);
-        bcm43xx_phy_write(bcm, 0x0063, 0xDDC6);
-        bcm43xx_phy_write(bcm, 0x0069, 0x07BE);
-        bcm43xx_phy_write(bcm, 0x006A, 0x0000);
-
-        err = bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_A, 0);
-        assert(err == 0);
-        udelay(1000);
-}
-
-static inline
-u16 freq_r3A_value(u16 frequency)
-{
-        u16 value;
-
-        if (frequency < 5091)
-                value = 0x0040;
-        else if (frequency < 5321)
-                value = 0x0000;
-        else if (frequency < 5806)
-                value = 0x0080;
-        else
-                value = 0x0040;
-
-        return value;
-}
-
-void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm)
-{
-        static const u8 data_high[5] = { 0x00, 0x40, 0x80, 0x90, 0xD0 };
-        static const u8 data_low[5]  = { 0x00, 0x01, 0x05, 0x06, 0x0A };
-        u16 tmp = bcm43xx_radio_read16(bcm, 0x001E);
-        int i, j;
-        
-        for (i = 0; i < 5; i++) {
-                for (j = 0; j < 5; j++) {
-                        if (tmp == (data_high[i] | data_low[j])) {
-                                bcm43xx_phy_write(bcm, 0x0069, (i - j) << 8 | 0x00C0);
-                                return;
-                        }
-                }
-        }
-}
-
-int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,
-                                u8 channel,
-                                int synthetic_pu_workaround)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 r8, tmp;
-        u16 freq;
-
-        if (!ieee80211_is_valid_channel(bcm->ieee, channel))
-                return -EINVAL;
-        if ((radio->manufact == 0x17F) &&
-            (radio->version == 0x2060) &&
-            (radio->revision == 1)) {
-                freq = channel2freq_a(channel);
-
-                r8 = bcm43xx_radio_read16(bcm, 0x0008);
-                bcm43xx_write16(bcm, 0x03F0, freq);
-                bcm43xx_radio_write16(bcm, 0x0008, r8);
-
-                TODO();//TODO: write max channel TX power? to Radio 0x2D
-                tmp = bcm43xx_radio_read16(bcm, 0x002E);
-                tmp &= 0x0080;
-                TODO();//TODO: OR tmp with the Power out estimation for this channel?
-                bcm43xx_radio_write16(bcm, 0x002E, tmp);
-
-                if (freq >= 4920 && freq <= 5500) {
-                        /* 
-                         * r8 = (((freq * 15 * 0xE1FC780F) >> 32) / 29) & 0x0F;
-                         *    = (freq * 0.025862069
-                         */
-                        r8 = 3 * freq / 116; /* is equal to r8 = freq * 0.025862 */
-                }
-                bcm43xx_radio_write16(bcm, 0x0007, (r8 << 4) | r8);
-                bcm43xx_radio_write16(bcm, 0x0020, (r8 << 4) | r8);
-                bcm43xx_radio_write16(bcm, 0x0021, (r8 << 4) | r8);
-                bcm43xx_radio_write16(bcm, 0x0022,
-                                      (bcm43xx_radio_read16(bcm, 0x0022)
-                                       & 0x000F) | (r8 << 4));
-                bcm43xx_radio_write16(bcm, 0x002A, (r8 << 4));
-                bcm43xx_radio_write16(bcm, 0x002B, (r8 << 4));
-                bcm43xx_radio_write16(bcm, 0x0008,
-                                      (bcm43xx_radio_read16(bcm, 0x0008)
-                                       & 0x00F0) | (r8 << 4));
-                bcm43xx_radio_write16(bcm, 0x0029,
-                                      (bcm43xx_radio_read16(bcm, 0x0029)
-                                       & 0xFF0F) | 0x00B0);
-                bcm43xx_radio_write16(bcm, 0x0035, 0x00AA);
-                bcm43xx_radio_write16(bcm, 0x0036, 0x0085);
-                bcm43xx_radio_write16(bcm, 0x003A,
-                                      (bcm43xx_radio_read16(bcm, 0x003A)
-                                       & 0xFF20) | freq_r3A_value(freq));
-                bcm43xx_radio_write16(bcm, 0x003D,
-                                      bcm43xx_radio_read16(bcm, 0x003D) & 0x00FF);
-                bcm43xx_radio_write16(bcm, 0x0081,
-                                      (bcm43xx_radio_read16(bcm, 0x0081)
-                                       & 0xFF7F) | 0x0080);
-                bcm43xx_radio_write16(bcm, 0x0035,
-                                      bcm43xx_radio_read16(bcm, 0x0035) & 0xFFEF);
-                bcm43xx_radio_write16(bcm, 0x0035,
-                                      (bcm43xx_radio_read16(bcm, 0x0035)
-                                       & 0xFFEF) | 0x0010);
-                bcm43xx_radio_set_tx_iq(bcm);
-                TODO(); //TODO: TSSI2dbm workaround
-                bcm43xx_phy_xmitpower(bcm);//FIXME correct?
-        } else {
-                if (synthetic_pu_workaround)
-                        bcm43xx_synth_pu_workaround(bcm, channel);
-
-                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
-                                channel2freq_bg(channel));
-
-                if (channel == 14) {
-                        if (bcm->sprom.locale == BCM43xx_LOCALE_JAPAN) {
-                                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                                                    BCM43xx_UCODEFLAGS_OFFSET,
-                                                    bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                                                       BCM43xx_UCODEFLAGS_OFFSET)
-                                                    & ~(1 << 7));
-                        } else {
-                                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
-                                                    BCM43xx_UCODEFLAGS_OFFSET,
-                                                    bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
-                                                                       BCM43xx_UCODEFLAGS_OFFSET)
-                                                    | (1 << 7));
-                        }
-                        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
-                                        bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
-                                        | (1 << 11));
-                } else {
-                        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
-                                        bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
-                                        & 0xF7BF);
-                }
-        }
-
-        radio->channel = channel;
-        //XXX: Using the longer of 2 timeouts (8000 vs 2000 usecs). Specs states
-        //     that 2000 usecs might suffice.
-        udelay(8000);
-
-        return 0;
-}
-
-void bcm43xx_radio_set_txantenna(struct bcm43xx_private *bcm, u32 val)
-{
-        u16 tmp;
-
-        val <<= 8;
-        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0022) & 0xFCFF;
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0022, tmp | val);
-        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x03A8) & 0xFCFF;
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x03A8, tmp | val);
-        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0054) & 0xFCFF;
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0054, tmp | val);
-}
-
-/* http://bcm-specs.sipsolutions.net/TX_Gain_Base_Band */
-static u16 bcm43xx_get_txgain_base_band(u16 txpower)
-{
-        u16 ret;
-
-        assert(txpower <= 63);
-
-        if (txpower >= 54)
-                ret = 2;
-        else if (txpower >= 49)
-                ret = 4;
-        else if (txpower >= 44)
-                ret = 5;
-        else
-                ret = 6;
-
-        return ret;
-}
-
-/* http://bcm-specs.sipsolutions.net/TX_Gain_Radio_Frequency_Power_Amplifier */
-static u16 bcm43xx_get_txgain_freq_power_amp(u16 txpower)
-{
-        u16 ret;
-
-        assert(txpower <= 63);
-
-        if (txpower >= 32)
-                ret = 0;
-        else if (txpower >= 25)
-                ret = 1;
-        else if (txpower >= 20)
-                ret = 2;
-        else if (txpower >= 12)
-                ret = 3;
-        else
-                ret = 4;
-
-        return ret;
-}
-
-/* http://bcm-specs.sipsolutions.net/TX_Gain_Digital_Analog_Converter */
-static u16 bcm43xx_get_txgain_dac(u16 txpower)
-{
-        u16 ret;
-
-        assert(txpower <= 63);
-
-        if (txpower >= 54)
-                ret = txpower - 53;
-        else if (txpower >= 49)
-                ret = txpower - 42;
-        else if (txpower >= 44)
-                ret = txpower - 37;
-        else if (txpower >= 32)
-                ret = txpower - 32;
-        else if (txpower >= 25)
-                ret = txpower - 20;
-        else if (txpower >= 20)
-                ret = txpower - 13;
-        else if (txpower >= 12)
-                ret = txpower - 8;
-        else
-                ret = txpower;
-
-        return ret;
-}
-
-void bcm43xx_radio_set_txpower_a(struct bcm43xx_private *bcm, u16 txpower)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 pamp, base, dac, ilt;
-
-        txpower = limit_value(txpower, 0, 63);
-
-        pamp = bcm43xx_get_txgain_freq_power_amp(txpower);
-        pamp <<= 5;
-        pamp &= 0x00E0;
-        bcm43xx_phy_write(bcm, 0x0019, pamp);
-
-        base = bcm43xx_get_txgain_base_band(txpower);
-        base &= 0x000F;
-        bcm43xx_phy_write(bcm, 0x0017, base | 0x0020);
-
-        ilt = bcm43xx_ilt_read(bcm, 0x3001);
-        ilt &= 0x0007;
-
-        dac = bcm43xx_get_txgain_dac(txpower);
-        dac <<= 3;
-        dac |= ilt;
-
-        bcm43xx_ilt_write(bcm, 0x3001, dac);
-
-        radio->txpwr_offset = txpower;
-
-        TODO();
-        //TODO: FuncPlaceholder (Adjust BB loft cancel)
-}
-
-void bcm43xx_radio_set_txpower_bg(struct bcm43xx_private *bcm,
-                                 u16 baseband_attenuation, u16 radio_attenuation,
-                                 u16 txpower)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        if (baseband_attenuation == 0xFFFF)
-                baseband_attenuation = radio->baseband_atten;
-        if (radio_attenuation == 0xFFFF)
-                radio_attenuation = radio->radio_atten;
-        if (txpower == 0xFFFF)
-                txpower = radio->txctl1;
-        radio->baseband_atten = baseband_attenuation;
-        radio->radio_atten = radio_attenuation;
-        radio->txctl1 = txpower;
-
-        assert(/*baseband_attenuation >= 0 &&*/ baseband_attenuation <= 11);
-        if (radio->revision < 6)
-                assert(/*radio_attenuation >= 0 &&*/ radio_attenuation <= 9);
-        else
-                assert(/* radio_attenuation >= 0 &&*/ radio_attenuation <= 31);
-        assert(/*txpower >= 0 &&*/ txpower <= 7);
-
-        bcm43xx_phy_set_baseband_attenuation(bcm, baseband_attenuation);
-        bcm43xx_radio_write16(bcm, 0x0043, radio_attenuation);
-        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0064, radio_attenuation);
-        if (radio->version == 0x2050) {
-                bcm43xx_radio_write16(bcm, 0x0052,
-                                      (bcm43xx_radio_read16(bcm, 0x0052) & ~0x0070)
-                                       | ((txpower << 4) & 0x0070));
-        }
-        //FIXME: The spec is very weird and unclear here.
-        if (phy->type == BCM43xx_PHYTYPE_G)
-                bcm43xx_phy_lo_adjust(bcm, 0);
-}
-
-u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-
-        if (radio->version == 0x2050 && radio->revision < 6)
-                return 0;
-        return 2;
-}
-
-u16 bcm43xx_default_radio_attenuation(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 att = 0xFFFF;
-
-        if (phy->type == BCM43xx_PHYTYPE_A)
-                return 0x60;
-
-        switch (radio->version) {
-        case 0x2053:
-                switch (radio->revision) {
-                case 1:
-                        att = 6;
-                        break;
-                }
-                break;
-        case 0x2050:
-                switch (radio->revision) {
-                case 0:
-                        att = 5;
-                        break;
-                case 1:
-                        if (phy->type == BCM43xx_PHYTYPE_G) {
-                                if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
-                                    bcm->board_type == 0x421 &&
-                                    bcm->board_revision >= 30)
-                                        att = 3;
-                                else if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
-                                         bcm->board_type == 0x416)
-                                        att = 3;
-                                else
-                                        att = 1;
-                        } else {
-                                if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
-                                    bcm->board_type == 0x421 &&
-                                    bcm->board_revision >= 30)
-                                        att = 7;
-                                else
-                                        att = 6;
-                        }
-                        break;
-                case 2:
-                        if (phy->type == BCM43xx_PHYTYPE_G) {
-                                if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
-                                    bcm->board_type == 0x421 &&
-                                    bcm->board_revision >= 30)
-                                        att = 3;
-                                else if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
-                                         bcm->board_type == 0x416)
-                                        att = 5;
-                                else if (bcm->chip_id == 0x4320)
-                                        att = 4;
-                                else
-                                        att = 3;
-                        } else
-                                att = 6;
-                        break;
-                case 3:
-                        att = 5;
-                        break;
-                case 4:
-                case 5:
-                        att = 1;
-                        break;
-                case 6:
-                case 7:
-                        att = 5;
-                        break;
-                case 8:
-                        att = 0x1A;
-                        break;
-                case 9:
-                default:
-                        att = 5;
-                }
-        }
-        if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
-            bcm->board_type == 0x421) {
-                if (bcm->board_revision < 0x43)
-                        att = 2;
-                else if (bcm->board_revision < 0x51)
-                        att = 3;
-        }
-        if (att == 0xFFFF)
-                att = 5;
-
-        return att;
-}
-
-u16 bcm43xx_default_txctl1(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-
-        if (radio->version != 0x2050)
-                return 0;
-        if (radio->revision == 1)
-                return 3;
-        if (radio->revision < 6)
-                return 2;
-        if (radio->revision == 8)
-                return 1;
-        return 0;
-}
-
-void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        int err;
-
-        if (radio->enabled)
-                return;
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A:
-                bcm43xx_radio_write16(bcm, 0x0004, 0x00C0);
-                bcm43xx_radio_write16(bcm, 0x0005, 0x0008);
-                bcm43xx_phy_write(bcm, 0x0010, bcm43xx_phy_read(bcm, 0x0010) & 0xFFF7);
-                bcm43xx_phy_write(bcm, 0x0011, bcm43xx_phy_read(bcm, 0x0011) & 0xFFF7);
-                bcm43xx_radio_init2060(bcm);    
-                break;
-        case BCM43xx_PHYTYPE_B:
-        case BCM43xx_PHYTYPE_G:
-                bcm43xx_phy_write(bcm, 0x0015, 0x8000);
-                bcm43xx_phy_write(bcm, 0x0015, 0xCC00);
-                bcm43xx_phy_write(bcm, 0x0015, (phy->connected ? 0x00C0 : 0x0000));
-                err = bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 1);
-                assert(err == 0);
-                break;
-        default:
-                assert(0);
-        }
-        radio->enabled = 1;
-        dprintk(KERN_INFO PFX "Radio turned on\n");
-        bcm43xx_leds_update(bcm, 0);
-}
-        
-void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-
-        if (phy->type == BCM43xx_PHYTYPE_A) {
-                bcm43xx_radio_write16(bcm, 0x0004, 0x00FF);
-                bcm43xx_radio_write16(bcm, 0x0005, 0x00FB);
-                bcm43xx_phy_write(bcm, 0x0010, bcm43xx_phy_read(bcm, 0x0010) | 0x0008);
-                bcm43xx_phy_write(bcm, 0x0011, bcm43xx_phy_read(bcm, 0x0011) | 0x0008);
-        }
-        if (phy->type == BCM43xx_PHYTYPE_G && bcm->current_core->rev >= 5) {
-                bcm43xx_phy_write(bcm, 0x0811, bcm43xx_phy_read(bcm, 0x0811) | 0x008C);
-                bcm43xx_phy_write(bcm, 0x0812, bcm43xx_phy_read(bcm, 0x0812) & 0xFF73);
-        } else
-                bcm43xx_phy_write(bcm, 0x0015, 0xAA00);
-        radio->enabled = 0;
-        dprintk(KERN_INFO PFX "Radio initialized\n");
-        bcm43xx_leds_update(bcm, 0);
-}
-
-void bcm43xx_radio_clear_tssi(struct bcm43xx_private *bcm)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
-        switch (phy->type) {
-        case BCM43xx_PHYTYPE_A:
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0068, 0x7F7F);
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x006a, 0x7F7F);
-                break;
-        case BCM43xx_PHYTYPE_B:
-        case BCM43xx_PHYTYPE_G:
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0058, 0x7F7F);
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x005a, 0x7F7F);
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0070, 0x7F7F);
-                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0072, 0x7F7F);
-                break;
-        }
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
deleted file mode 100644
index 77a98a53a2e2..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef BCM43xx_RADIO_H_
-#define BCM43xx_RADIO_H_
-
-#include "bcm43xx.h"
-
-
-#define BCM43xx_RADIO_DEFAULT_CHANNEL_A         36
-#define BCM43xx_RADIO_DEFAULT_CHANNEL_BG        6
-
-/* Force antenna 0. */
-#define BCM43xx_RADIO_TXANTENNA_0               0
-/* Force antenna 1. */
-#define BCM43xx_RADIO_TXANTENNA_1               1
-/* Use the RX antenna, that was selected for the most recently
- * received good PLCP header.
- */
-#define BCM43xx_RADIO_TXANTENNA_LASTPLCP        3
-#define BCM43xx_RADIO_TXANTENNA_DEFAULT         BCM43xx_RADIO_TXANTENNA_LASTPLCP
-
-#define BCM43xx_RADIO_INTERFMODE_NONE           0
-#define BCM43xx_RADIO_INTERFMODE_NONWLAN        1
-#define BCM43xx_RADIO_INTERFMODE_MANUALWLAN     2
-#define BCM43xx_RADIO_INTERFMODE_AUTOWLAN       3
-
-
-void bcm43xx_radio_lock(struct bcm43xx_private *bcm);
-void bcm43xx_radio_unlock(struct bcm43xx_private *bcm);
-
-u16 bcm43xx_radio_read16(struct bcm43xx_private *bcm, u16 offset);
-void bcm43xx_radio_write16(struct bcm43xx_private *bcm, u16 offset, u16 val);
-
-u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm);
-void bcm43xx_radio_init2060(struct bcm43xx_private *bcm);
-
-void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm);
-void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm);
-
-static inline
-int bcm43xx_is_hw_radio_enabled(struct bcm43xx_private *bcm)
-{
-        /* function to return state of hardware enable of radio
-         * returns 0 if radio disabled, 1 if radio enabled
-         */
-        if (bcm->current_core->rev >= 3)
-                return ((bcm43xx_read32(bcm, BCM43xx_MMIO_RADIO_HWENABLED_HI)
-                                        & BCM43xx_MMIO_RADIO_HWENABLED_HI_MASK)
-                                        == 0) ? 1 : 0;
-        else
-                return ((bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_HWENABLED_LO)
-                                        & BCM43xx_MMIO_RADIO_HWENABLED_LO_MASK)
-                                        == 0) ? 0 : 1;
-}
-
-int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm, u8 channel,
-                                int synthetic_pu_workaround);
-
-void bcm43xx_radio_set_txpower_a(struct bcm43xx_private *bcm, u16 txpower);
-void bcm43xx_radio_set_txpower_bg(struct bcm43xx_private *bcm,
-                               u16 baseband_attenuation, u16 attenuation,
-                               u16 txpower);
-
-u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_private *bcm);
-u16 bcm43xx_default_radio_attenuation(struct bcm43xx_private *bcm);
-u16 bcm43xx_default_txctl1(struct bcm43xx_private *bcm);
-
-void bcm43xx_radio_set_txantenna(struct bcm43xx_private *bcm, u32 val);
-
-void bcm43xx_radio_clear_tssi(struct bcm43xx_private *bcm);
-
-u8 bcm43xx_radio_aci_detect(struct bcm43xx_private *bcm, u8 channel);
-u8 bcm43xx_radio_aci_scan(struct bcm43xx_private *bcm);
-
-int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_private *bcm, int mode);
-
-void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm);
-void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm);
-s16 bcm43xx_nrssi_hw_read(struct bcm43xx_private *bcm, u16 offset);
-void bcm43xx_nrssi_hw_write(struct bcm43xx_private *bcm, u16 offset, s16 val);
-void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val);
-void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm);
-
-void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm);
-u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm);
-
-#endif /* BCM43xx_RADIO_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
deleted file mode 100644
index 8ab5f93d192a..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  SYSFS support routines
-
-  Copyright (c) 2006 Michael Buesch <mbuesch@freenet.de>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include "bcm43xx_sysfs.h"
-#include "bcm43xx.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_radio.h"
-
-#include <linux/capability.h>
-
-
-#define GENERIC_FILESIZE        64
-
-
-static int get_integer(const char *buf, size_t count)
-{
-        char tmp[10 + 1] = { 0 };
-        int ret = -EINVAL;
-
-        if (count == 0)
-                goto out;
-        count = min(count, (size_t)10);
-        memcpy(tmp, buf, count);
-        ret = simple_strtol(tmp, NULL, 10);
-out:
-        return ret;
-}
-
-static int get_boolean(const char *buf, size_t count)
-{
-        if (count != 0) {
-                if (buf[0] == '1')
-                        return 1;
-                if (buf[0] == '0')
-                        return 0;
-                if (count >= 4 && memcmp(buf, "true", 4) == 0)
-                        return 1;
-                if (count >= 5 && memcmp(buf, "false", 5) == 0)
-                        return 0;
-                if (count >= 3 && memcmp(buf, "yes", 3) == 0)
-                        return 1;
-                if (count >= 2 && memcmp(buf, "no", 2) == 0)
-                        return 0;
-                if (count >= 2 && memcmp(buf, "on", 2) == 0)
-                        return 1;
-                if (count >= 3 && memcmp(buf, "off", 3) == 0)
-                        return 0;
-        }
-        return -EINVAL;
-}
-
-static int sprom2hex(const u16 *sprom, char *buf, size_t buf_len)
-{
-        int i, pos = 0;
-
-        for (i = 0; i < BCM43xx_SPROM_SIZE; i++) {
-                pos += snprintf(buf + pos, buf_len - pos - 1,
-                                "%04X", swab16(sprom[i]) & 0xFFFF);
-        }
-        pos += snprintf(buf + pos, buf_len - pos - 1, "\n");
-
-        return pos + 1;
-}
-
-static int hex2sprom(u16 *sprom, const char *dump, size_t len)
-{
-        char tmp[5] = { 0 };
-        int cnt = 0;
-        unsigned long parsed;
-
-        if (len < BCM43xx_SPROM_SIZE * sizeof(u16) * 2)
-                return -EINVAL;
-
-        while (cnt < BCM43xx_SPROM_SIZE) {
-                memcpy(tmp, dump, 4);
-                dump += 4;
-                parsed = simple_strtoul(tmp, NULL, 16);
-                sprom[cnt++] = swab16((u16)parsed);
-        }
-
-        return 0;
-}
-
-static ssize_t bcm43xx_attr_sprom_show(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        u16 *sprom;
-        unsigned long flags;
-        int err;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        assert(BCM43xx_SPROM_SIZE * sizeof(u16) <= PAGE_SIZE);
-        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
-                        GFP_KERNEL);
-        if (!sprom)
-                return -ENOMEM;
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        err = bcm43xx_sprom_read(bcm, sprom);
-        if (!err)
-                err = sprom2hex(sprom, buf, PAGE_SIZE);
-        mmiowb();
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-        kfree(sprom);
-
-        return err;
-}
-
-static ssize_t bcm43xx_attr_sprom_store(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        u16 *sprom;
-        unsigned long flags;
-        int err;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
-                        GFP_KERNEL);
-        if (!sprom)
-                return -ENOMEM;
-        err = hex2sprom(sprom, buf, count);
-        if (err)
-                goto out_kfree;
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        spin_lock(&bcm->leds_lock);
-        err = bcm43xx_sprom_write(bcm, sprom);
-        mmiowb();
-        spin_unlock(&bcm->leds_lock);
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-out_kfree:
-        kfree(sprom);
-
-        return err ? err : count;
-
-}
-
-static DEVICE_ATTR(sprom, 0600,
-                   bcm43xx_attr_sprom_show,
-                   bcm43xx_attr_sprom_store);
-
-static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,
-                                            struct device_attribute *attr,
-                                            char *buf)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        ssize_t count = 0;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        mutex_lock(&bcm->mutex);
-
-        switch (bcm43xx_current_radio(bcm)->interfmode) {
-        case BCM43xx_RADIO_INTERFMODE_NONE:
-                count = snprintf(buf, PAGE_SIZE, "0 (No Interference Mitigation)\n");
-                break;
-        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
-                count = snprintf(buf, PAGE_SIZE, "1 (Non-WLAN Interference Mitigation)\n");
-                break;
-        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
-                count = snprintf(buf, PAGE_SIZE, "2 (WLAN Interference Mitigation)\n");
-                break;
-        default:
-                assert(0);
-        }
-
-        mutex_unlock(&bcm->mutex);
-
-        return count;
-
-}
-
-static ssize_t bcm43xx_attr_interfmode_store(struct device *dev,
-                                             struct device_attribute *attr,
-                                             const char *buf, size_t count)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        unsigned long flags;
-        int err;
-        int mode;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        mode = get_integer(buf, count);
-        switch (mode) {
-        case 0:
-                mode = BCM43xx_RADIO_INTERFMODE_NONE;
-                break;
-        case 1:
-                mode = BCM43xx_RADIO_INTERFMODE_NONWLAN;
-                break;
-        case 2:
-                mode = BCM43xx_RADIO_INTERFMODE_MANUALWLAN;
-                break;
-        case 3:
-                mode = BCM43xx_RADIO_INTERFMODE_AUTOWLAN;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-
-        err = bcm43xx_radio_set_interference_mitigation(bcm, mode);
-        if (err) {
-                printk(KERN_ERR PFX "Interference Mitigation not "
-                                    "supported by device\n");
-        }
-        mmiowb();
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return err ? err : count;
-}
-
-static DEVICE_ATTR(interference, 0644,
-                   bcm43xx_attr_interfmode_show,
-                   bcm43xx_attr_interfmode_store);
-
-static ssize_t bcm43xx_attr_preamble_show(struct device *dev,
-                                          struct device_attribute *attr,
-                                          char *buf)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        ssize_t count;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        mutex_lock(&bcm->mutex);
-
-        if (bcm->short_preamble)
-                count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble enabled)\n");
-        else
-                count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble disabled)\n");
-
-        mutex_unlock(&bcm->mutex);
-
-        return count;
-}
-
-static ssize_t bcm43xx_attr_preamble_store(struct device *dev,
-                                           struct device_attribute *attr,
-                                           const char *buf, size_t count)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        unsigned long flags;
-        int value;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        value = get_boolean(buf, count);
-        if (value < 0)
-                return value;
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-
-        bcm->short_preamble = !!value;
-
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(shortpreamble, 0644,
-                   bcm43xx_attr_preamble_show,
-                   bcm43xx_attr_preamble_store);
-
-static ssize_t bcm43xx_attr_phymode_store(struct device *dev,
-                                          struct device_attribute *attr,
-                                          const char *buf, size_t count)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        int phytype;
-        int err = -EINVAL;
-
-        if (count < 1)
-                goto out;
-        switch (buf[0]) {
-        case 'a':  case 'A':
-                phytype = BCM43xx_PHYTYPE_A;
-                break;
-        case 'b':  case 'B':
-                phytype = BCM43xx_PHYTYPE_B;
-                break;
-        case 'g':  case 'G':
-                phytype = BCM43xx_PHYTYPE_G;
-                break;
-        default:
-                goto out;
-        }
-
-        bcm43xx_cancel_work(bcm);
-        mutex_lock(&(bcm)->mutex);
-        err = bcm43xx_select_wireless_core(bcm, phytype);
-        if (!err)
-                bcm43xx_periodic_tasks_setup(bcm);
-        mutex_unlock(&(bcm)->mutex);
-        if (err == -ESRCH)
-                err = -ENODEV;
-
-out:
-        return err ? err : count;
-}
-
-static ssize_t bcm43xx_attr_phymode_show(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
-{
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        ssize_t count = 0;
-
-        mutex_lock(&(bcm)->mutex);
-        switch (bcm43xx_current_phy(bcm)->type) {
-        case BCM43xx_PHYTYPE_A:
-                snprintf(buf, PAGE_SIZE, "A");
-                break;
-        case BCM43xx_PHYTYPE_B:
-                snprintf(buf, PAGE_SIZE, "B");
-                break;
-        case BCM43xx_PHYTYPE_G:
-                snprintf(buf, PAGE_SIZE, "G");
-                break;
-        default:
-                assert(0);
-        }
-        mutex_unlock(&(bcm)->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(phymode, 0644,
-                   bcm43xx_attr_phymode_show,
-                   bcm43xx_attr_phymode_store);
-
-static ssize_t bcm43xx_attr_microcode_show(struct device *dev,
-                                           struct device_attribute *attr,
-                                           char *buf)
-{
-        unsigned long flags;
-        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-        ssize_t count = 0;
-        u16 status;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        mutex_lock(&(bcm)->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        status = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
-                                    BCM43xx_UCODE_STATUS);
-
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&(bcm)->mutex);
-        switch (status) {
-        case 0x0000:
-                count = snprintf(buf, PAGE_SIZE, "0x%.4x (invalid)\n",
-                                 status);
-                break;
-        case 0x0001:
-                count = snprintf(buf, PAGE_SIZE, "0x%.4x (init)\n",
-                                 status);
-                break;
-        case 0x0002:
-                count = snprintf(buf, PAGE_SIZE, "0x%.4x (active)\n",
-                                 status);
-                break;
-        case 0x0003:
-                count = snprintf(buf, PAGE_SIZE, "0x%.4x (suspended)\n",
-                                 status);
-                break;
-        case 0x0004:
-                count = snprintf(buf, PAGE_SIZE, "0x%.4x (asleep)\n",
-                                 status);
-                break;
-        default:
-                count = snprintf(buf, PAGE_SIZE, "0x%.4x (unknown)\n",
-                                 status);
-                break;
-        }
-
-        return count;
-}
-
-static DEVICE_ATTR(microcodestatus, 0444,
-                   bcm43xx_attr_microcode_show,
-                   NULL);
-
-int bcm43xx_sysfs_register(struct bcm43xx_private *bcm)
-{
-        struct device *dev = &bcm->pci_dev->dev;
-        int err;
-
-        assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);
-
-        err = device_create_file(dev, &dev_attr_sprom);
-        if (err)
-                goto out;
-        err = device_create_file(dev, &dev_attr_interference);
-        if (err)
-                goto err_remove_sprom;
-        err = device_create_file(dev, &dev_attr_shortpreamble);
-        if (err)
-                goto err_remove_interfmode;
-        err = device_create_file(dev, &dev_attr_phymode);
-        if (err)
-                goto err_remove_shortpreamble;
-        err = device_create_file(dev, &dev_attr_microcodestatus);
-        if (err)
-                goto err_remove_phymode;
-
-out:
-        return err;
-err_remove_phymode:
-        device_remove_file(dev, &dev_attr_phymode);
-err_remove_shortpreamble:
-        device_remove_file(dev, &dev_attr_shortpreamble);
-err_remove_interfmode:
-        device_remove_file(dev, &dev_attr_interference);
-err_remove_sprom:
-        device_remove_file(dev, &dev_attr_sprom);
-        goto out;
-}
-
-void bcm43xx_sysfs_unregister(struct bcm43xx_private *bcm)
-{
-        struct device *dev = &bcm->pci_dev->dev;
-
-        device_remove_file(dev, &dev_attr_microcodestatus);
-        device_remove_file(dev, &dev_attr_phymode);
-        device_remove_file(dev, &dev_attr_shortpreamble);
-        device_remove_file(dev, &dev_attr_interference);
-        device_remove_file(dev, &dev_attr_sprom);
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h
deleted file mode 100644
index cc701df71e2a..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef BCM43xx_SYSFS_H_
-#define BCM43xx_SYSFS_H_
-
-struct bcm43xx_private;
-
-int bcm43xx_sysfs_register(struct bcm43xx_private *bcm);
-void bcm43xx_sysfs_unregister(struct bcm43xx_private *bcm);
-
-#endif /* BCM43xx_SYSFS_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
deleted file mode 100644
index 6acfdc49dccd..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ /dev/null
@@ -1,1035 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include <linux/wireless.h>
-#include <net/iw_handler.h>
-#include <net/ieee80211softmac.h>
-#include <net/ieee80211softmac_wx.h>
-#include <linux/capability.h>
-#include <linux/delay.h>
-
-#include "bcm43xx.h"
-#include "bcm43xx_wx.h"
-#include "bcm43xx_main.h"
-#include "bcm43xx_radio.h"
-#include "bcm43xx_phy.h"
-
-
-/* The WIRELESS_EXT version, which is implemented by this driver. */
-#define BCM43xx_WX_VERSION      18
-
-#define MAX_WX_STRING           80
-
-static int bcm43xx_wx_get_name(struct net_device *net_dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *data,
-                               char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int i;
-        struct bcm43xx_phyinfo *phy;
-        char suffix[7] = { 0 };
-        int have_a = 0, have_b = 0, have_g = 0;
-
-        mutex_lock(&bcm->mutex);
-        for (i = 0; i < bcm->nr_80211_available; i++) {
-                phy = &(bcm->core_80211_ext[i].phy);
-                switch (phy->type) {
-                case BCM43xx_PHYTYPE_A:
-                        have_a = 1;
-                        break;
-                case BCM43xx_PHYTYPE_G:
-                        have_g = 1;
-                case BCM43xx_PHYTYPE_B:
-                        have_b = 1;
-                        break;
-                default:
-                        assert(0);
-                }
-        }
-        mutex_unlock(&bcm->mutex);
-
-        i = 0;
-        if (have_a) {
-                suffix[i++] = 'a';
-                suffix[i++] = '/';
-        }
-        if (have_b) {
-                suffix[i++] = 'b';
-                suffix[i++] = '/';
-        }
-        if (have_g) {
-                suffix[i++] = 'g';
-                suffix[i++] = '/';
-        }
-        if (i != 0) 
-                suffix[i - 1] = '\0';
-
-        snprintf(data->name, IFNAMSIZ, "IEEE 802.11%s", suffix);
-
-        return 0;
-}
-
-static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *data,
-                                      char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-        u8 channel;
-        s8 expon;
-        int freq;
-        int err = -EINVAL;
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-
-        if ((data->freq.e == 0) &&
-            (data->freq.m >= 0) && (data->freq.m <= 1000)) {
-                channel = data->freq.m;
-                freq = bcm43xx_channel_to_freq(bcm, channel);
-        } else {
-                freq = data->freq.m;
-                expon = 6 - data->freq.e;
-                while (--expon >= 0)    /* scale down the frequency to MHz */
-                        freq /= 10;
-                assert(freq > 1000);
-                channel = bcm43xx_freq_to_channel(bcm, freq);
-        }
-        if (!ieee80211_is_valid_channel(bcm->ieee, channel))
-                goto out_unlock;
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
-                //ieee80211softmac_disassoc(softmac, $REASON);
-                bcm43xx_mac_suspend(bcm);
-                err = bcm43xx_radio_selectchannel(bcm, channel, 0);
-                bcm43xx_mac_enable(bcm);
-        } else {
-                bcm43xx_current_radio(bcm)->initial_channel = channel;
-                err = 0;
-        }
-out_unlock:
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return err;
-}
-
-static int bcm43xx_wx_get_channelfreq(struct net_device *net_dev,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *data,
-                                      char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct bcm43xx_radioinfo *radio;
-        int err = -ENODEV;
-        u16 channel;
-
-        mutex_lock(&bcm->mutex);
-        radio = bcm43xx_current_radio(bcm);
-        channel = radio->channel;
-        if (channel == 0xFF) {
-                channel = radio->initial_channel;
-                if (channel == 0xFF)
-                        goto out_unlock;
-        }
-        assert(channel > 0 && channel <= 1000);
-        data->freq.e = 1;
-        data->freq.m = bcm43xx_channel_to_freq(bcm, channel) * 100000;
-        data->freq.flags = 1;
-
-        err = 0;
-out_unlock:
-        mutex_unlock(&bcm->mutex);
-
-        return err;
-}
-
-static int bcm43xx_wx_set_mode(struct net_device *net_dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *data,
-                               char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-        int mode;
-
-        mode = data->mode;
-        if (mode == IW_MODE_AUTO)
-                mode = BCM43xx_INITIAL_IWMODE;
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
-                if (bcm->ieee->iw_mode != mode)
-                        bcm43xx_set_iwmode(bcm, mode);
-        } else
-                bcm->ieee->iw_mode = mode;
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_get_mode(struct net_device *net_dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *data,
-                               char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-
-        mutex_lock(&bcm->mutex);
-        data->mode = bcm->ieee->iw_mode;
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *data,
-                                      char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct iw_range *range = (struct iw_range *)extra;
-        const struct ieee80211_geo *geo;
-        int i, j;
-        struct bcm43xx_phyinfo *phy;
-
-        data->data.length = sizeof(*range);
-        memset(range, 0, sizeof(*range));
-
-        //TODO: What about 802.11b?
-        /* 54Mb/s == ~27Mb/s payload throughput (802.11g) */
-        range->throughput = 27 * 1000 * 1000;
-
-        range->max_qual.qual = 100;
-        range->max_qual.level = 146; /* set floor at -110 dBm (146 - 256) */
-        range->max_qual.noise = 146;
-        range->max_qual.updated = IW_QUAL_ALL_UPDATED;
-
-        range->avg_qual.qual = 50;
-        range->avg_qual.level = 0;
-        range->avg_qual.noise = 0;
-        range->avg_qual.updated = IW_QUAL_ALL_UPDATED;
-
-        range->min_rts = BCM43xx_MIN_RTS_THRESHOLD;
-        range->max_rts = BCM43xx_MAX_RTS_THRESHOLD;
-        range->min_frag = MIN_FRAG_THRESHOLD;
-        range->max_frag = MAX_FRAG_THRESHOLD;
-
-        range->encoding_size[0] = 5;
-        range->encoding_size[1] = 13;
-        range->num_encoding_sizes = 2;
-        range->max_encoding_tokens = WEP_KEYS;
-
-        range->we_version_compiled = WIRELESS_EXT;
-        range->we_version_source = BCM43xx_WX_VERSION;
-
-        range->enc_capa = IW_ENC_CAPA_WPA |
-                          IW_ENC_CAPA_WPA2 |
-                          IW_ENC_CAPA_CIPHER_TKIP |
-                          IW_ENC_CAPA_CIPHER_CCMP;
-
-        mutex_lock(&bcm->mutex);
-        phy = bcm43xx_current_phy(bcm);
-
-        range->num_bitrates = 0;
-        i = 0;
-        if (phy->type == BCM43xx_PHYTYPE_A ||
-            phy->type == BCM43xx_PHYTYPE_G) {
-                range->num_bitrates = 8;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB * 500000;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB * 500000;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB * 500000;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB * 500000;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB * 500000;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB * 500000;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB * 500000;
-                range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB * 500000;
-        }
-        if (phy->type == BCM43xx_PHYTYPE_B ||
-            phy->type == BCM43xx_PHYTYPE_G) {
-                range->num_bitrates += 4;
-                range->bitrate[i++] = IEEE80211_CCK_RATE_1MB * 500000;
-                range->bitrate[i++] = IEEE80211_CCK_RATE_2MB * 500000;
-                range->bitrate[i++] = IEEE80211_CCK_RATE_5MB * 500000;
-                range->bitrate[i++] = IEEE80211_CCK_RATE_11MB * 500000;
-        }
-
-        geo = ieee80211_get_geo(bcm->ieee);
-        range->num_channels = geo->a_channels + geo->bg_channels;
-        j = 0;
-        for (i = 0; i < geo->a_channels; i++) {
-                if (j == IW_MAX_FREQUENCIES)
-                        break;
-                range->freq[j].i = j + 1;
-                range->freq[j].m = geo->a[i].freq * 100000;
-                range->freq[j].e = 1;
-                j++;
-        }
-        for (i = 0; i < geo->bg_channels; i++) {
-                if (j == IW_MAX_FREQUENCIES)
-                        break;
-                range->freq[j].i = j + 1;
-                range->freq[j].m = geo->bg[i].freq * 100000;
-                range->freq[j].e = 1;
-                j++;
-        }
-        range->num_frequency = j;
-
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_set_nick(struct net_device *net_dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *data,
-                               char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        size_t len;
-
-        mutex_lock(&bcm->mutex);
-        len =  min((size_t)data->data.length, (size_t)IW_ESSID_MAX_SIZE);
-        memcpy(bcm->nick, extra, len);
-        bcm->nick[len] = '\0';
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_get_nick(struct net_device *net_dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *data,
-                               char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        size_t len;
-
-        mutex_lock(&bcm->mutex);
-        len = strlen(bcm->nick);
-        memcpy(extra, bcm->nick, len);
-        data->data.length = (__u16)len;
-        data->data.flags = 1;
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_set_rts(struct net_device *net_dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *data,
-                              char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-        int err = -EINVAL;
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (data->rts.disabled) {
-                bcm->rts_threshold = BCM43xx_MAX_RTS_THRESHOLD;
-                err = 0;
-        } else {
-                if (data->rts.value >= BCM43xx_MIN_RTS_THRESHOLD &&
-                    data->rts.value <= BCM43xx_MAX_RTS_THRESHOLD) {
-                        bcm->rts_threshold = data->rts.value;
-                        err = 0;
-                }
-        }
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return err;
-}
-
-static int bcm43xx_wx_get_rts(struct net_device *net_dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *data,
-                              char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-
-        mutex_lock(&bcm->mutex);
-        data->rts.value = bcm->rts_threshold;
-        data->rts.fixed = 0;
-        data->rts.disabled = (bcm->rts_threshold == BCM43xx_MAX_RTS_THRESHOLD);
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_set_frag(struct net_device *net_dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *data,
-                               char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-        int err = -EINVAL;
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (data->frag.disabled) {
-                bcm->ieee->fts = MAX_FRAG_THRESHOLD;
-                err = 0;
-        } else {
-                if (data->frag.value >= MIN_FRAG_THRESHOLD &&
-                    data->frag.value <= MAX_FRAG_THRESHOLD) {
-                        bcm->ieee->fts = data->frag.value & ~0x1;
-                        err = 0;
-                }
-        }
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return err;
-}
-
-static int bcm43xx_wx_get_frag(struct net_device *net_dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *data,
-                               char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-
-        mutex_lock(&bcm->mutex);
-        data->frag.value = bcm->ieee->fts;
-        data->frag.fixed = 0;
-        data->frag.disabled = (bcm->ieee->fts == MAX_FRAG_THRESHOLD);
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
-                                    struct iw_request_info *info,
-                                    union iwreq_data *data,
-                                    char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct bcm43xx_radioinfo *radio;
-        struct bcm43xx_phyinfo *phy;
-        unsigned long flags;
-        int err = -ENODEV;
-        u16 maxpower;
-
-        if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
-                printk(KERN_ERR PFX "TX power not in dBm.\n");
-                return -EOPNOTSUPP;
-        }
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)
-                goto out_unlock;
-        radio = bcm43xx_current_radio(bcm);
-        phy = bcm43xx_current_phy(bcm);
-        if (data->txpower.disabled != (!(radio->enabled))) {
-                if (data->txpower.disabled)
-                        bcm43xx_radio_turn_off(bcm);
-                else
-                        bcm43xx_radio_turn_on(bcm);
-        }
-        if (data->txpower.value > 0) {
-                /* desired and maxpower dBm values are in Q5.2 */
-                if (phy->type == BCM43xx_PHYTYPE_A)
-                        maxpower = bcm->sprom.maxpower_aphy;
-                else
-                        maxpower = bcm->sprom.maxpower_bgphy;
-                radio->txpower_desired = limit_value(data->txpower.value << 2,
-                                                     0, maxpower);
-                bcm43xx_phy_xmitpower(bcm);
-        }
-        err = 0;
-
-out_unlock:
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return err;
-}
-
-static int bcm43xx_wx_get_xmitpower(struct net_device *net_dev,
-                                    struct iw_request_info *info,
-                                    union iwreq_data *data,
-                                    char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct bcm43xx_radioinfo *radio;
-        int err = -ENODEV;
-
-        mutex_lock(&bcm->mutex);
-        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)
-                goto out_unlock;
-        radio = bcm43xx_current_radio(bcm);
-        /* desired dBm value is in Q5.2 */
-        data->txpower.value = radio->txpower_desired >> 2;
-        data->txpower.fixed = 1;
-        data->txpower.flags = IW_TXPOW_DBM;
-        data->txpower.disabled = !(radio->enabled);
-
-        err = 0;
-out_unlock:
-        mutex_unlock(&bcm->mutex);
-
-        return err;
-}
-
-static int bcm43xx_wx_set_encoding(struct net_device *net_dev,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *data,
-                                   char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err;
-
-        err = ieee80211_wx_set_encode(bcm->ieee, info, data, extra);
-
-        return err;
-}
-
-static int bcm43xx_wx_set_encodingext(struct net_device *net_dev,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *data,
-                                   char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err;
-
-        err = ieee80211_wx_set_encodeext(bcm->ieee, info, data, extra);
-
-        return err;
-}
-
-static int bcm43xx_wx_get_encoding(struct net_device *net_dev,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *data,
-                                   char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err;
-
-        err = ieee80211_wx_get_encode(bcm->ieee, info, data, extra);
-
-        return err;
-}
-
-static int bcm43xx_wx_get_encodingext(struct net_device *net_dev,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *data,
-                                   char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err;
-
-        err = ieee80211_wx_get_encodeext(bcm->ieee, info, data, extra);
-
-        return err;
-}
-
-static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,
-                                     struct iw_request_info *info,
-                                     union iwreq_data *data,
-                                     char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-        int mode, err = 0;
-
-        mode = *((int *)extra);
-        switch (mode) {
-        case 0:
-                mode = BCM43xx_RADIO_INTERFMODE_NONE;
-                break;
-        case 1:
-                mode = BCM43xx_RADIO_INTERFMODE_NONWLAN;
-                break;
-        case 2:
-                mode = BCM43xx_RADIO_INTERFMODE_MANUALWLAN;
-                break;
-        case 3:
-                mode = BCM43xx_RADIO_INTERFMODE_AUTOWLAN;
-                break;
-        default:
-                printk(KERN_ERR PFX "set_interfmode allowed parameters are: "
-                                    "0 => None,  1 => Non-WLAN,  2 => WLAN,  "
-                                    "3 => Auto-WLAN\n");
-                return -EINVAL;
-        }
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
-                err = bcm43xx_radio_set_interference_mitigation(bcm, mode);
-                if (err) {
-                        printk(KERN_ERR PFX "Interference Mitigation not "
-                                            "supported by device\n");
-                }
-        } else {
-                if (mode == BCM43xx_RADIO_INTERFMODE_AUTOWLAN) {
-                        printk(KERN_ERR PFX "Interference Mitigation mode Auto-WLAN "
-                                            "not supported while the interface is down.\n");
-                        err = -ENODEV;
-                } else
-                        bcm43xx_current_radio(bcm)->interfmode = mode;
-        }
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return err;
-}
-
-static int bcm43xx_wx_get_interfmode(struct net_device *net_dev,
-                                     struct iw_request_info *info,
-                                     union iwreq_data *data,
-                                     char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int mode;
-
-        mutex_lock(&bcm->mutex);
-        mode = bcm43xx_current_radio(bcm)->interfmode;
-        mutex_unlock(&bcm->mutex);
-
-        switch (mode) {
-        case BCM43xx_RADIO_INTERFMODE_NONE:
-                strncpy(extra, "0 (No Interference Mitigation)", MAX_WX_STRING);
-                break;
-        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
-                strncpy(extra, "1 (Non-WLAN Interference Mitigation)", MAX_WX_STRING);
-                break;
-        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
-                strncpy(extra, "2 (WLAN Interference Mitigation)", MAX_WX_STRING);
-                break;
-        default:
-                assert(0);
-        }
-        data->data.length = strlen(extra) + 1;
-
-        return 0;
-}
-
-static int bcm43xx_wx_set_shortpreamble(struct net_device *net_dev,
-                                        struct iw_request_info *info,
-                                        union iwreq_data *data,
-                                        char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-        int on;
-
-        on = *((int *)extra);
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        bcm->short_preamble = !!on;
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_get_shortpreamble(struct net_device *net_dev,
-                                        struct iw_request_info *info,
-                                        union iwreq_data *data,
-                                        char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int on;
-
-        mutex_lock(&bcm->mutex);
-        on = bcm->short_preamble;
-        mutex_unlock(&bcm->mutex);
-
-        if (on)
-                strncpy(extra, "1 (Short Preamble enabled)", MAX_WX_STRING);
-        else
-                strncpy(extra, "0 (Short Preamble disabled)", MAX_WX_STRING);
-        data->data.length = strlen(extra) + 1;
-
-        return 0;
-}
-
-static int bcm43xx_wx_set_swencryption(struct net_device *net_dev,
-                                       struct iw_request_info *info,
-                                       union iwreq_data *data,
-                                       char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
-        int on;
-        
-        on = *((int *)extra);
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        bcm->ieee->host_encrypt = !!on;
-        bcm->ieee->host_decrypt = !!on;
-        bcm->ieee->host_build_iv = !on;
-        bcm->ieee->host_strip_iv_icv = !on;
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-
-        return 0;
-}
-
-static int bcm43xx_wx_get_swencryption(struct net_device *net_dev,
-                                       struct iw_request_info *info,
-                                       union iwreq_data *data,
-                                       char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int on;
-
-        mutex_lock(&bcm->mutex);
-        on = bcm->ieee->host_encrypt;
-        mutex_unlock(&bcm->mutex);
-
-        if (on)
-                strncpy(extra, "1 (SW encryption enabled) ", MAX_WX_STRING);
-        else
-                strncpy(extra, "0 (SW encryption disabled) ", MAX_WX_STRING);
-        data->data.length = strlen(extra + 1);
-
-        return 0;
-}
-
-/* Enough buffer to hold a hexdump of the sprom data. */
-#define SPROM_BUFFERSIZE        512
-
-static int sprom2hex(const u16 *sprom, char *dump)
-{
-        int i, pos = 0;
-
-        for (i = 0; i < BCM43xx_SPROM_SIZE; i++) {
-                pos += snprintf(dump + pos, SPROM_BUFFERSIZE - pos - 1,
-                                "%04X", swab16(sprom[i]) & 0xFFFF);
-        }
-
-        return pos + 1;
-}
-
-static int hex2sprom(u16 *sprom, const char *dump, unsigned int len)
-{
-        char tmp[5] = { 0 };
-        int cnt = 0;
-        unsigned long parsed;
-
-        if (len < BCM43xx_SPROM_SIZE * sizeof(u16) * 2)
-                return -EINVAL;
-        while (cnt < BCM43xx_SPROM_SIZE) {
-                memcpy(tmp, dump, 4);
-                dump += 4;
-                parsed = simple_strtoul(tmp, NULL, 16);
-                sprom[cnt++] = swab16((u16)parsed);
-        }
-
-        return 0;
-}
-
-static int bcm43xx_wx_sprom_read(struct net_device *net_dev,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *data,
-                                 char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err = -EPERM;
-        u16 *sprom;
-        unsigned long flags;
-
-        if (!capable(CAP_SYS_RAWIO))
-                goto out;
-
-        err = -ENOMEM;
-        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
-                        GFP_KERNEL);
-        if (!sprom)
-                goto out;
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        err = -ENODEV;
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)
-                err = bcm43xx_sprom_read(bcm, sprom);
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-        if (!err)
-                data->data.length = sprom2hex(sprom, extra);
-        kfree(sprom);
-out:
-        return err;
-}
-
-static int bcm43xx_wx_sprom_write(struct net_device *net_dev,
-                                  struct iw_request_info *info,
-                                  union iwreq_data *data,
-                                  char *extra)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        int err = -EPERM;
-        u16 *sprom;
-        unsigned long flags;
-        char *input;
-        unsigned int len;
-
-        if (!capable(CAP_SYS_RAWIO))
-                goto out;
-
-        err = -ENOMEM;
-        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
-                        GFP_KERNEL);
-        if (!sprom)
-                goto out;
-
-        len = data->data.length;
-        extra[len - 1] = '\0';
-        input = strchr(extra, ':');
-        if (input) {
-                input++;
-                len -= input - extra;
-        } else
-                input = extra;
-        err = hex2sprom(sprom, input, len);
-        if (err)
-                goto out_kfree;
-
-        mutex_lock(&bcm->mutex);
-        spin_lock_irqsave(&bcm->irq_lock, flags);
-        spin_lock(&bcm->leds_lock);
-        err = -ENODEV;
-        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)
-                err = bcm43xx_sprom_write(bcm, sprom);
-        spin_unlock(&bcm->leds_lock);
-        spin_unlock_irqrestore(&bcm->irq_lock, flags);
-        mutex_unlock(&bcm->mutex);
-out_kfree:
-        kfree(sprom);
-out:
-        return err;
-}
-
-/* Get wireless statistics.  Called by /proc/net/wireless and by SIOCGIWSTATS */
-
-static struct iw_statistics *bcm43xx_get_wireless_stats(struct net_device *net_dev)
-{
-        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct ieee80211softmac_device *mac = ieee80211_priv(net_dev);
-        struct iw_statistics *wstats;
-        struct ieee80211_network *network = NULL;
-        static int tmp_level = 0;
-        static int tmp_qual = 0;
-        unsigned long flags;
-
-        wstats = &bcm->stats.wstats;
-        if (!mac->associnfo.associated) {
-                wstats->miss.beacon = 0;
-//              bcm->ieee->ieee_stats.tx_retry_limit_exceeded = 0; // FIXME: should this be cleared here?
-                wstats->discard.retries = 0;
-//              bcm->ieee->ieee_stats.tx_discards_wrong_sa = 0; // FIXME: same question
-                wstats->discard.nwid = 0;
-//              bcm->ieee->ieee_stats.rx_discards_undecryptable = 0; // FIXME: ditto
-                wstats->discard.code = 0;
-//              bcm->ieee->ieee_stats.rx_fragments = 0;  // FIXME: same here
-                wstats->discard.fragment = 0;
-                wstats->discard.misc = 0;
-                wstats->qual.qual = 0;
-                wstats->qual.level = 0;
-                wstats->qual.noise = 0;
-                wstats->qual.updated = 7;
-                wstats->qual.updated |= IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-                return wstats;
-        }
-        /* fill in the real statistics when iface associated */
-        spin_lock_irqsave(&mac->ieee->lock, flags);
-        list_for_each_entry(network, &mac->ieee->network_list, list) {
-                if (!memcmp(mac->associnfo.bssid, network->bssid, ETH_ALEN)) {
-                        if (!tmp_level) {       /* get initial values */
-                                tmp_level = network->stats.signal;
-                                tmp_qual = network->stats.rssi;
-                        } else {                /* smooth results */
-                                tmp_level = (15 * tmp_level + network->stats.signal)/16;
-                                tmp_qual = (15 * tmp_qual + network->stats.rssi)/16;
-                        }
-                        break;
-                }
-        }
-        spin_unlock_irqrestore(&mac->ieee->lock, flags);
-        wstats->qual.level = tmp_level;
-        wstats->qual.qual = 100 * tmp_qual / RX_RSSI_MAX;
-        wstats->qual.noise = bcm->stats.noise;
-        wstats->qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-        wstats->discard.code = bcm->ieee->ieee_stats.rx_discards_undecryptable;
-        wstats->discard.retries = bcm->ieee->ieee_stats.tx_retry_limit_exceeded;
-        wstats->discard.nwid = bcm->ieee->ieee_stats.tx_discards_wrong_sa;
-        wstats->discard.fragment = bcm->ieee->ieee_stats.rx_fragments;
-        wstats->discard.misc = 0;       // FIXME
-        wstats->miss.beacon = 0;        // FIXME
-        return wstats;
-}
-
-
-#ifdef WX
-# undef WX
-#endif
-#define WX(ioctl)  [(ioctl) - SIOCSIWCOMMIT]
-static const iw_handler bcm43xx_wx_handlers[] = {
-        /* Wireless Identification */
-        WX(SIOCGIWNAME)         = bcm43xx_wx_get_name,
-        /* Basic operations */
-        WX(SIOCSIWFREQ)         = bcm43xx_wx_set_channelfreq,
-        WX(SIOCGIWFREQ)         = bcm43xx_wx_get_channelfreq,
-        WX(SIOCSIWMODE)         = bcm43xx_wx_set_mode,
-        WX(SIOCGIWMODE)         = bcm43xx_wx_get_mode,
-        /* Informative stuff */
-        WX(SIOCGIWRANGE)        = bcm43xx_wx_get_rangeparams,
-        /* Access Point manipulation */
-        WX(SIOCSIWAP)           = ieee80211softmac_wx_set_wap,
-        WX(SIOCGIWAP)           = ieee80211softmac_wx_get_wap,
-        WX(SIOCSIWSCAN)         = ieee80211softmac_wx_trigger_scan,
-        WX(SIOCGIWSCAN)         = ieee80211softmac_wx_get_scan_results,
-        /* 802.11 specific support */
-        WX(SIOCSIWESSID)        = ieee80211softmac_wx_set_essid,
-        WX(SIOCGIWESSID)        = ieee80211softmac_wx_get_essid,
-        WX(SIOCSIWNICKN)        = bcm43xx_wx_set_nick,
-        WX(SIOCGIWNICKN)        = bcm43xx_wx_get_nick,
-        /* Other parameters */
-        WX(SIOCSIWRATE)         = ieee80211softmac_wx_set_rate,
-        WX(SIOCGIWRATE)         = ieee80211softmac_wx_get_rate,
-        WX(SIOCSIWRTS)          = bcm43xx_wx_set_rts,
-        WX(SIOCGIWRTS)          = bcm43xx_wx_get_rts,
-        WX(SIOCSIWFRAG)         = bcm43xx_wx_set_frag,
-        WX(SIOCGIWFRAG)         = bcm43xx_wx_get_frag,
-        WX(SIOCSIWTXPOW)        = bcm43xx_wx_set_xmitpower,
-        WX(SIOCGIWTXPOW)        = bcm43xx_wx_get_xmitpower,
-//TODO  WX(SIOCSIWRETRY)        = bcm43xx_wx_set_retry,
-//TODO  WX(SIOCGIWRETRY)        = bcm43xx_wx_get_retry,
-        /* Encoding */
-        WX(SIOCSIWENCODE)       = bcm43xx_wx_set_encoding,
-        WX(SIOCGIWENCODE)       = bcm43xx_wx_get_encoding,
-        WX(SIOCSIWENCODEEXT)    = bcm43xx_wx_set_encodingext,
-        WX(SIOCGIWENCODEEXT)    = bcm43xx_wx_get_encodingext,
-        /* Power saving */
-//TODO  WX(SIOCSIWPOWER)        = bcm43xx_wx_set_power,
-//TODO  WX(SIOCGIWPOWER)        = bcm43xx_wx_get_power,
-        WX(SIOCSIWGENIE)        = ieee80211softmac_wx_set_genie,
-        WX(SIOCGIWGENIE)        = ieee80211softmac_wx_get_genie,
-        WX(SIOCSIWAUTH)         = ieee80211_wx_set_auth,
-        WX(SIOCGIWAUTH)         = ieee80211_wx_get_auth,
-};
-#undef WX
-
-static const iw_handler bcm43xx_priv_wx_handlers[] = {
-        /* Set Interference Mitigation Mode. */
-        bcm43xx_wx_set_interfmode,
-        /* Get Interference Mitigation Mode. */
-        bcm43xx_wx_get_interfmode,
-        /* Enable/Disable Short Preamble mode. */
-        bcm43xx_wx_set_shortpreamble,
-        /* Get Short Preamble mode. */
-        bcm43xx_wx_get_shortpreamble,
-        /* Enable/Disable Software Encryption mode */
-        bcm43xx_wx_set_swencryption,
-        /* Get Software Encryption mode */
-        bcm43xx_wx_get_swencryption,
-        /* Write SRPROM data. */
-        bcm43xx_wx_sprom_write,
-        /* Read SPROM data. */
-        bcm43xx_wx_sprom_read,
-};
-
-#define PRIV_WX_SET_INTERFMODE          (SIOCIWFIRSTPRIV + 0)
-#define PRIV_WX_GET_INTERFMODE          (SIOCIWFIRSTPRIV + 1)
-#define PRIV_WX_SET_SHORTPREAMBLE       (SIOCIWFIRSTPRIV + 2)
-#define PRIV_WX_GET_SHORTPREAMBLE       (SIOCIWFIRSTPRIV + 3)
-#define PRIV_WX_SET_SWENCRYPTION        (SIOCIWFIRSTPRIV + 4)
-#define PRIV_WX_GET_SWENCRYPTION        (SIOCIWFIRSTPRIV + 5)
-#define PRIV_WX_SPROM_WRITE             (SIOCIWFIRSTPRIV + 6)
-#define PRIV_WX_SPROM_READ              (SIOCIWFIRSTPRIV + 7)
-
-#define PRIV_WX_DUMMY(ioctl)    \
-        {                                       \
-                .cmd            = (ioctl),      \
-                .name           = "__unused"    \
-        }
-
-static const struct iw_priv_args bcm43xx_priv_wx_args[] = {
-        {
-                .cmd            = PRIV_WX_SET_INTERFMODE,
-                .set_args       = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                .name           = "set_interfmode",
-        },
-        {
-                .cmd            = PRIV_WX_GET_INTERFMODE,
-                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-                .name           = "get_interfmode",
-        },
-        {
-                .cmd            = PRIV_WX_SET_SHORTPREAMBLE,
-                .set_args       = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                .name           = "set_shortpreamb",
-        },
-        {
-                .cmd            = PRIV_WX_GET_SHORTPREAMBLE,
-                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-                .name           = "get_shortpreamb",
-        },
-        {
-                .cmd            = PRIV_WX_SET_SWENCRYPTION,
-                .set_args       = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                .name           = "set_swencrypt",
-        },
-        {
-                .cmd            = PRIV_WX_GET_SWENCRYPTION,
-                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-                .name           = "get_swencrypt",
-        },
-        {
-                .cmd            = PRIV_WX_SPROM_WRITE,
-                .set_args       = IW_PRIV_TYPE_CHAR | SPROM_BUFFERSIZE,
-                .name           = "write_sprom",
-        },
-        {
-                .cmd            = PRIV_WX_SPROM_READ,
-                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | SPROM_BUFFERSIZE,
-                .name           = "read_sprom",
-        },
-};
-
-const struct iw_handler_def bcm43xx_wx_handlers_def = {
-        .standard               = bcm43xx_wx_handlers,
-        .num_standard           = ARRAY_SIZE(bcm43xx_wx_handlers),
-        .num_private            = ARRAY_SIZE(bcm43xx_priv_wx_handlers),
-        .num_private_args       = ARRAY_SIZE(bcm43xx_priv_wx_args),
-        .private                = bcm43xx_priv_wx_handlers,
-        .private_args           = bcm43xx_priv_wx_args,
-        .get_wireless_stats     = bcm43xx_get_wireless_stats,
-};
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.h b/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
deleted file mode 100644
index 1f29ff3aa4c3..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  Some parts of the code in this file are derived from the ipw2200
-  driver  Copyright(c) 2003 - 2004 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef BCM43xx_WX_H_
-#define BCM43xx_WX_H_
-
-extern const struct iw_handler_def bcm43xx_wx_handlers_def;
-
-#endif /* BCM43xx_WX_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
deleted file mode 100644
index f79fe11f9e81..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
-
-  Broadcom BCM43xx wireless driver
-
-  Transmission (TX/RX) related functions.
-
-  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-                     Stefano Brivio <st3@riseup.net>
-                     Michael Buesch <mbuesch@freenet.de>
-                     Danny van Dyk <kugelfang@gentoo.org>
-                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-
-*/
-
-#include "bcm43xx_xmit.h"
-
-#include <linux/etherdevice.h>
-
-
-/* Extract the bitrate out of a CCK PLCP header. */
-static u8 bcm43xx_plcp_get_bitrate_cck(struct bcm43xx_plcp_hdr4 *plcp)
-{
-        switch (plcp->raw[0]) {
-        case 0x0A:
-                return IEEE80211_CCK_RATE_1MB;
-        case 0x14:
-                return IEEE80211_CCK_RATE_2MB;
-        case 0x37:
-                return IEEE80211_CCK_RATE_5MB;
-        case 0x6E:
-                return IEEE80211_CCK_RATE_11MB;
-        }
-        assert(0);
-        return 0;
-}
-
-/* Extract the bitrate out of an OFDM PLCP header. */
-static u8 bcm43xx_plcp_get_bitrate_ofdm(struct bcm43xx_plcp_hdr4 *plcp)
-{
-        switch (plcp->raw[0] & 0xF) {
-        case 0xB:
-                return IEEE80211_OFDM_RATE_6MB;
-        case 0xF:
-                return IEEE80211_OFDM_RATE_9MB;
-        case 0xA:
-                return IEEE80211_OFDM_RATE_12MB;
-        case 0xE:
-                return IEEE80211_OFDM_RATE_18MB;
-        case 0x9:
-                return IEEE80211_OFDM_RATE_24MB;
-        case 0xD:
-                return IEEE80211_OFDM_RATE_36MB;
-        case 0x8:
-                return IEEE80211_OFDM_RATE_48MB;
-        case 0xC:
-                return IEEE80211_OFDM_RATE_54MB;
-        }
-        assert(0);
-        return 0;
-}
-
-u8 bcm43xx_plcp_get_ratecode_cck(const u8 bitrate)
-{
-        switch (bitrate) {
-        case IEEE80211_CCK_RATE_1MB:
-                return 0x0A;
-        case IEEE80211_CCK_RATE_2MB:
-                return 0x14;
-        case IEEE80211_CCK_RATE_5MB:
-                return 0x37;
-        case IEEE80211_CCK_RATE_11MB:
-                return 0x6E;
-        }
-        assert(0);
-        return 0;
-}
-
-u8 bcm43xx_plcp_get_ratecode_ofdm(const u8 bitrate)
-{
-        switch (bitrate) {
-        case IEEE80211_OFDM_RATE_6MB:
-                return 0xB;
-        case IEEE80211_OFDM_RATE_9MB:
-                return 0xF;
-        case IEEE80211_OFDM_RATE_12MB:
-                return 0xA;
-        case IEEE80211_OFDM_RATE_18MB:
-                return 0xE;
-        case IEEE80211_OFDM_RATE_24MB:
-                return 0x9;
-        case IEEE80211_OFDM_RATE_36MB:
-                return 0xD;
-        case IEEE80211_OFDM_RATE_48MB:
-                return 0x8;
-        case IEEE80211_OFDM_RATE_54MB:
-                return 0xC;
-        }
-        assert(0);
-        return 0;
-}
-
-static void bcm43xx_generate_plcp_hdr(struct bcm43xx_plcp_hdr4 *plcp,
-                                      const u16 octets, const u8 bitrate,
-                                      const int ofdm_modulation)
-{
-        __le32 *data = &(plcp->data);
-        __u8 *raw = plcp->raw;
-
-        if (ofdm_modulation) {
-                u32 val = bcm43xx_plcp_get_ratecode_ofdm(bitrate);
-                assert(!(octets & 0xF000));
-                val |= (octets << 5);
-                *data = cpu_to_le32(val);
-        } else {
-                u32 plen;
-
-                plen = octets * 16 / bitrate;
-                if ((octets * 16 % bitrate) > 0) {
-                        plen++;
-                        if ((bitrate == IEEE80211_CCK_RATE_11MB)
-                            && ((octets * 8 % 11) < 4)) {
-                                raw[1] = 0x84;
-                        } else
-                                raw[1] = 0x04;
-                } else
-                        raw[1] = 0x04;
-                *data |= cpu_to_le32(plen << 16);
-                raw[0] = bcm43xx_plcp_get_ratecode_cck(bitrate);
-        }
-}
-
-static u8 bcm43xx_calc_fallback_rate(u8 bitrate)
-{
-        switch (bitrate) {
-        case IEEE80211_CCK_RATE_1MB:
-                return IEEE80211_CCK_RATE_1MB;
-        case IEEE80211_CCK_RATE_2MB:
-                return IEEE80211_CCK_RATE_1MB;
-        case IEEE80211_CCK_RATE_5MB:
-                return IEEE80211_CCK_RATE_2MB;
-        case IEEE80211_CCK_RATE_11MB:
-                return IEEE80211_CCK_RATE_5MB;
-        case IEEE80211_OFDM_RATE_6MB:
-                return IEEE80211_CCK_RATE_5MB;
-        case IEEE80211_OFDM_RATE_9MB:
-                return IEEE80211_OFDM_RATE_6MB;
-        case IEEE80211_OFDM_RATE_12MB:
-                return IEEE80211_OFDM_RATE_9MB;
-        case IEEE80211_OFDM_RATE_18MB:
-                return IEEE80211_OFDM_RATE_12MB;
-        case IEEE80211_OFDM_RATE_24MB:
-                return IEEE80211_OFDM_RATE_18MB;
-        case IEEE80211_OFDM_RATE_36MB:
-                return IEEE80211_OFDM_RATE_24MB;
-        case IEEE80211_OFDM_RATE_48MB:
-                return IEEE80211_OFDM_RATE_36MB;
-        case IEEE80211_OFDM_RATE_54MB:
-                return IEEE80211_OFDM_RATE_48MB;
-        }
-        assert(0);
-        return 0;
-}
-
-static
-__le16 bcm43xx_calc_duration_id(const struct ieee80211_hdr *wireless_header,
-                                u8 bitrate)
-{
-        const u16 frame_ctl = le16_to_cpu(wireless_header->frame_ctl);
-        __le16 duration_id = wireless_header->duration_id;
-
-        switch (WLAN_FC_GET_TYPE(frame_ctl)) {
-        case IEEE80211_FTYPE_DATA:
-        case IEEE80211_FTYPE_MGMT:
-                //TODO: Steal the code from ieee80211, once it is completed there.
-                break;
-        case IEEE80211_FTYPE_CTL:
-                /* Use the original duration/id. */
-                break;
-        default:
-                assert(0);
-        }
-
-        return duration_id;
-}
-
-static inline
-u16 ceiling_div(u16 dividend, u16 divisor)
-{
-        return ((dividend + divisor - 1) / divisor);
-}
-
-static void bcm43xx_generate_rts(const struct bcm43xx_phyinfo *phy,
-                                 struct bcm43xx_txhdr *txhdr,
-                                 u16 *flags,
-                                 u8 bitrate,
-                                 const struct ieee80211_hdr_4addr *wlhdr)
-{
-        u16 fctl;
-        u16 dur;
-        u8 fallback_bitrate;
-        int ofdm_modulation;
-        int fallback_ofdm_modulation;
-//      u8 *sa, *da;
-        u16 flen;
-
-//FIXME sa = ieee80211_get_SA((struct ieee80211_hdr *)wlhdr);
-//FIXME da = ieee80211_get_DA((struct ieee80211_hdr *)wlhdr);
-        fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate);
-        ofdm_modulation = !(ieee80211_is_cck_rate(bitrate));
-        fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));
-
-        flen = sizeof(u16) + sizeof(u16) + ETH_ALEN + ETH_ALEN + IEEE80211_FCS_LEN,
-        bcm43xx_generate_plcp_hdr((struct bcm43xx_plcp_hdr4 *)(&txhdr->rts_cts_plcp),
-                                  flen, bitrate,
-                                  !ieee80211_is_cck_rate(bitrate));
-        bcm43xx_generate_plcp_hdr((struct bcm43xx_plcp_hdr4 *)(&txhdr->rts_cts_fallback_plcp),
-                                  flen, fallback_bitrate,
-                                  !ieee80211_is_cck_rate(fallback_bitrate));
-        fctl = IEEE80211_FTYPE_CTL;
-        fctl |= IEEE80211_STYPE_RTS;
-        dur = le16_to_cpu(wlhdr->duration_id);
-/*FIXME: should we test for dur==0 here and let it unmodified in this case?
- *       The following assert checks for this case...
- */
-assert(dur);
-/*FIXME: The duration calculation is not really correct.
- *       I am not 100% sure which bitrate to use. We use the RTS rate here,
- *       but this is likely to be wrong.
- */
-        if (phy->type == BCM43xx_PHYTYPE_A) {
-                /* Three times SIFS */
-                dur += 16 * 3;
-                /* Add ACK duration. */
-                dur += ceiling_div((16 + 8 * (14 /*bytes*/) + 6) * 10,
-                                   bitrate * 4);
-                /* Add CTS duration. */
-                dur += ceiling_div((16 + 8 * (14 /*bytes*/) + 6) * 10,
-                                   bitrate * 4);
-        } else {
-                /* Three times SIFS */
-                dur += 10 * 3;
-                /* Add ACK duration. */
-                dur += ceiling_div(8 * (14 /*bytes*/) * 10,
-                                   bitrate);
-                /* Add CTS duration. */
-                dur += ceiling_div(8 * (14 /*bytes*/) * 10,
-                                   bitrate);
-        }
-
-        txhdr->rts_cts_frame_control = cpu_to_le16(fctl);
-        txhdr->rts_cts_dur = cpu_to_le16(dur);
-//printk(BCM43xx_MACFMT "  " BCM43xx_MACFMT "  " BCM43xx_MACFMT "\n", BCM43xx_MACARG(wlhdr->addr1), BCM43xx_MACARG(wlhdr->addr2), BCM43xx_MACARG(wlhdr->addr3));
-//printk(BCM43xx_MACFMT "  " BCM43xx_MACFMT "\n", BCM43xx_MACARG(sa), BCM43xx_MACARG(da));
-        memcpy(txhdr->rts_cts_mac1, wlhdr->addr1, ETH_ALEN);//FIXME!
-//      memcpy(txhdr->rts_cts_mac2, sa, ETH_ALEN);
-
-        *flags |= BCM43xx_TXHDRFLAG_RTSCTS;
-        *flags |= BCM43xx_TXHDRFLAG_RTS;
-        if (ofdm_modulation)
-                *flags |= BCM43xx_TXHDRFLAG_RTSCTS_OFDM;
-        if (fallback_ofdm_modulation)
-                *flags |= BCM43xx_TXHDRFLAG_RTSCTSFALLBACK_OFDM;
-}
-                                 
-void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
-                            struct bcm43xx_txhdr *txhdr,
-                            const unsigned char *fragment_data,
-                            const unsigned int fragment_len,
-                            const int is_first_fragment,
-                            const u16 cookie)
-{
-        const struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        const struct ieee80211_hdr_4addr *wireless_header = (const struct ieee80211_hdr_4addr *)fragment_data;
-        const struct ieee80211_security *secinfo = &bcm->ieee->sec;
-        u8 bitrate;
-        u8 fallback_bitrate;
-        int ofdm_modulation;
-        int fallback_ofdm_modulation;
-        u16 plcp_fragment_len = fragment_len;
-        u16 flags = 0;
-        u16 control = 0;
-        u16 wsec_rate = 0;
-        u16 encrypt_frame;
-        const u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(wireless_header->frame_ctl));
-        const int is_mgt = (ftype == IEEE80211_FTYPE_MGMT);
-
-        /* Now construct the TX header. */
-        memset(txhdr, 0, sizeof(*txhdr));
-
-        bitrate = ieee80211softmac_suggest_txrate(bcm->softmac,
-                is_multicast_ether_addr(wireless_header->addr1), is_mgt);
-        ofdm_modulation = !(ieee80211_is_cck_rate(bitrate));
-        fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate);
-        fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));
-
-        /* Set Frame Control from 80211 header. */
-        txhdr->frame_control = wireless_header->frame_ctl;
-        /* Copy address1 from 80211 header. */
-        memcpy(txhdr->mac1, wireless_header->addr1, 6);
-        /* Set the fallback duration ID. */
-        txhdr->fallback_dur_id = bcm43xx_calc_duration_id((const struct ieee80211_hdr *)wireless_header,
-                                                          fallback_bitrate);
-        /* Set the cookie (used as driver internal ID for the frame) */
-        txhdr->cookie = cpu_to_le16(cookie);
-
-        /* Hardware appends FCS. */
-        plcp_fragment_len += IEEE80211_FCS_LEN;
-
-        /* Hardware encryption. */
-        encrypt_frame = le16_to_cpup(&wireless_header->frame_ctl) & IEEE80211_FCTL_PROTECTED;
-        if (encrypt_frame && !bcm->ieee->host_encrypt) {
-                const struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *)wireless_header;
-                memcpy(txhdr->wep_iv, hdr->payload, 4);
-                /* Hardware appends ICV. */
-                plcp_fragment_len += 4;
-
-                wsec_rate |= (bcm->key[secinfo->active_key].algorithm << BCM43xx_TXHDR_WSEC_ALGO_SHIFT)
-                             & BCM43xx_TXHDR_WSEC_ALGO_MASK;
-                wsec_rate |= (secinfo->active_key << BCM43xx_TXHDR_WSEC_KEYINDEX_SHIFT)
-                             & BCM43xx_TXHDR_WSEC_KEYINDEX_MASK;
-        }
-
-        /* Generate the PLCP header and the fallback PLCP header. */
-        bcm43xx_generate_plcp_hdr((struct bcm43xx_plcp_hdr4 *)(&txhdr->plcp),
-                                  plcp_fragment_len,
-                                  bitrate, ofdm_modulation);
-        bcm43xx_generate_plcp_hdr(&txhdr->fallback_plcp, plcp_fragment_len,
-                                  fallback_bitrate, fallback_ofdm_modulation);
-
-        /* Set the CONTROL field */
-        if (ofdm_modulation)
-                control |= BCM43xx_TXHDRCTL_OFDM;
-        if (bcm->short_preamble) //FIXME: could be the other way around, please test
-                control |= BCM43xx_TXHDRCTL_SHORT_PREAMBLE;
-        control |= (phy->antenna_diversity << BCM43xx_TXHDRCTL_ANTENNADIV_SHIFT)
-                   & BCM43xx_TXHDRCTL_ANTENNADIV_MASK;
-
-        /* Set the FLAGS field */
-        if (!is_multicast_ether_addr(wireless_header->addr1) &&
-            !is_broadcast_ether_addr(wireless_header->addr1))
-                flags |= BCM43xx_TXHDRFLAG_EXPECTACK;
-        if (1 /* FIXME: PS poll?? */)
-                flags |= 0x10; // FIXME: unknown meaning.
-        if (fallback_ofdm_modulation)
-                flags |= BCM43xx_TXHDRFLAG_FALLBACKOFDM;
-        if (is_first_fragment)
-                flags |= BCM43xx_TXHDRFLAG_FIRSTFRAGMENT;
-
-        /* Set WSEC/RATE field */
-        wsec_rate |= (txhdr->plcp.raw[0] << BCM43xx_TXHDR_RATE_SHIFT)
-                     & BCM43xx_TXHDR_RATE_MASK;
-
-        /* Generate the RTS/CTS packet, if required. */
-        /* FIXME: We should first try with CTS-to-self,
-         *        if we are on 80211g. If we get too many
-         *        failures (hidden nodes), we should switch back to RTS/CTS.
-         */
-        if (0/*FIXME txctl->use_rts_cts*/) {
-                bcm43xx_generate_rts(phy, txhdr, &flags,
-                                     0/*FIXME txctl->rts_cts_rate*/,
-                                     wireless_header);
-        }
-
-        txhdr->flags = cpu_to_le16(flags);
-        txhdr->control = cpu_to_le16(control);
-        txhdr->wsec_rate = cpu_to_le16(wsec_rate);
-}
-
-static s8 bcm43xx_rssi_postprocess(struct bcm43xx_private *bcm,
-                                   u8 in_rssi, int ofdm,
-                                   int adjust_2053, int adjust_2050)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        s32 tmp;
-
-        switch (radio->version) {
-        case 0x2050:
-                if (ofdm) {
-                        tmp = in_rssi;
-                        if (tmp > 127)
-                                tmp -= 256;
-                        tmp *= 73;
-                        tmp /= 64;
-                        if (adjust_2050)
-                                tmp += 25;
-                        else
-                                tmp -= 3;
-                } else {
-                        if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
-                                if (in_rssi > 63)
-                                        in_rssi = 63;
-                                tmp = radio->nrssi_lt[in_rssi];
-                                tmp = 31 - tmp;
-                                tmp *= -131;
-                                tmp /= 128;
-                                tmp -= 57;
-                        } else {
-                                tmp = in_rssi;
-                                tmp = 31 - tmp;
-                                tmp *= -149;
-                                tmp /= 128;
-                                tmp -= 68;
-                        }
-                        if (phy->type == BCM43xx_PHYTYPE_G &&
-                            adjust_2050)
-                                tmp += 25;
-                }
-                break;
-        case 0x2060:
-                if (in_rssi > 127)
-                        tmp = in_rssi - 256;
-                else
-                        tmp = in_rssi;
-                break;
-        default:
-                tmp = in_rssi;
-                tmp -= 11;
-                tmp *= 103;
-                tmp /= 64;
-                if (adjust_2053)
-                        tmp -= 109;
-                else
-                        tmp -= 83;
-        }
-
-        return (s8)tmp;
-}
-
-//TODO
-#if 0
-static s8 bcm43xx_rssinoise_postprocess(struct bcm43xx_private *bcm,
-                                        u8 in_rssi)
-{
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        s8 ret;
-
-        if (phy->type == BCM43xx_PHYTYPE_A) {
-                //TODO: Incomplete specs.
-                ret = 0;
-        } else
-                ret = bcm43xx_rssi_postprocess(bcm, in_rssi, 0, 1, 1);
-
-        return ret;
-}
-#endif
-
-int bcm43xx_rx(struct bcm43xx_private *bcm,
-               struct sk_buff *skb,
-               struct bcm43xx_rxhdr *rxhdr)
-{
-        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-        struct bcm43xx_plcp_hdr4 *plcp;
-        struct ieee80211_rx_stats stats;
-        struct ieee80211_hdr_4addr *wlhdr;
-        u16 frame_ctl;
-        int is_packet_for_us = 0;
-        int err = -EINVAL;
-        const u16 rxflags1 = le16_to_cpu(rxhdr->flags1);
-        const u16 rxflags2 = le16_to_cpu(rxhdr->flags2);
-        const u16 rxflags3 = le16_to_cpu(rxhdr->flags3);
-        const int is_ofdm = !!(rxflags1 & BCM43xx_RXHDR_FLAGS1_OFDM);
-
-        if (rxflags2 & BCM43xx_RXHDR_FLAGS2_TYPE2FRAME) {
-                plcp = (struct bcm43xx_plcp_hdr4 *)(skb->data + 2);
-                /* Skip two unknown bytes and the PLCP header. */
-                skb_pull(skb, 2 + sizeof(struct bcm43xx_plcp_hdr6));
-        } else {
-                plcp = (struct bcm43xx_plcp_hdr4 *)(skb->data);
-                /* Skip the PLCP header. */
-                skb_pull(skb, sizeof(struct bcm43xx_plcp_hdr6));
-        }
-        /* The SKB contains the PAYLOAD (wireless header + data)
-         * at this point. The FCS at the end is stripped.
-         */
-
-        memset(&stats, 0, sizeof(stats));
-        stats.mac_time = le16_to_cpu(rxhdr->mactime);
-        stats.rssi = rxhdr->rssi;
-        stats.signal = bcm43xx_rssi_postprocess(bcm, rxhdr->rssi, is_ofdm,
-                                              !!(rxflags1 & BCM43xx_RXHDR_FLAGS1_2053RSSIADJ),
-                                              !!(rxflags3 & BCM43xx_RXHDR_FLAGS3_2050RSSIADJ));
-        stats.noise = bcm->stats.noise;
-        if (is_ofdm)
-                stats.rate = bcm43xx_plcp_get_bitrate_ofdm(plcp);
-        else
-                stats.rate = bcm43xx_plcp_get_bitrate_cck(plcp);
-        stats.received_channel = radio->channel;
-        stats.mask = IEEE80211_STATMASK_SIGNAL |
-                     IEEE80211_STATMASK_NOISE |
-                     IEEE80211_STATMASK_RATE |
-                     IEEE80211_STATMASK_RSSI;
-        if (phy->type == BCM43xx_PHYTYPE_A)
-                stats.freq = IEEE80211_52GHZ_BAND;
-        else
-                stats.freq = IEEE80211_24GHZ_BAND;
-        stats.len = skb->len;
-
-        bcm->stats.last_rx = jiffies;
-        if (bcm->ieee->iw_mode == IW_MODE_MONITOR) {
-                err = ieee80211_rx(bcm->ieee, skb, &stats);
-                return (err == 0) ? -EINVAL : 0;
-        }
-
-        wlhdr = (struct ieee80211_hdr_4addr *)(skb->data);
-
-        switch (bcm->ieee->iw_mode) {
-        case IW_MODE_ADHOC:
-                if (memcmp(wlhdr->addr1, bcm->net_dev->dev_addr, ETH_ALEN) == 0 ||
-                    memcmp(wlhdr->addr3, bcm->ieee->bssid, ETH_ALEN) == 0 ||
-                    is_broadcast_ether_addr(wlhdr->addr1) ||
-                    is_multicast_ether_addr(wlhdr->addr1) ||
-                    bcm->net_dev->flags & IFF_PROMISC)
-                        is_packet_for_us = 1;
-                break;
-        case IW_MODE_INFRA:
-        default:
-                /* When receiving multicast or broadcast packets, filter out
-                   the packets we send ourself; we shouldn't see those */
-                if (memcmp(wlhdr->addr3, bcm->ieee->bssid, ETH_ALEN) == 0 ||
-                    memcmp(wlhdr->addr1, bcm->net_dev->dev_addr, ETH_ALEN) == 0 ||
-                    (memcmp(wlhdr->addr3, bcm->net_dev->dev_addr, ETH_ALEN) &&
-                     (is_broadcast_ether_addr(wlhdr->addr1) ||
-                      is_multicast_ether_addr(wlhdr->addr1) ||
-                      bcm->net_dev->flags & IFF_PROMISC)))
-                        is_packet_for_us = 1;
-                break;
-        }
-
-        frame_ctl = le16_to_cpu(wlhdr->frame_ctl);
-        switch (WLAN_FC_GET_TYPE(frame_ctl)) {
-        case IEEE80211_FTYPE_MGMT:
-                ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats);
-                break;
-        case IEEE80211_FTYPE_DATA:
-                if (is_packet_for_us) {
-                        err = ieee80211_rx(bcm->ieee, skb, &stats);
-                        err = (err == 0) ? -EINVAL : 0;
-                }
-                break;
-        case IEEE80211_FTYPE_CTL:
-                break;
-        default:
-                assert(0);
-                return -EINVAL;
-        }
-
-        return err;
-}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
deleted file mode 100644
index 47c135a7f4dc..000000000000
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef BCM43xx_XMIT_H_
-#define BCM43xx_XMIT_H_
-
-#include "bcm43xx_main.h"
-
-
-#define _bcm43xx_declare_plcp_hdr(size) \
-        struct bcm43xx_plcp_hdr##size {         \
-                union {                         \
-                        __le32 data;            \
-                        __u8 raw[size];         \
-                } __attribute__((__packed__));  \
-        } __attribute__((__packed__))
-
-/* struct bcm43xx_plcp_hdr4 */
-_bcm43xx_declare_plcp_hdr(4);
-/* struct bcm43xx_plcp_hdr6 */
-_bcm43xx_declare_plcp_hdr(6);
-
-#undef _bcm43xx_declare_plcp_hdr
-
-/* Device specific TX header. To be prepended to TX frames. */
-struct bcm43xx_txhdr {
-        union {
-                struct {
-                        __le16 flags;
-                        __le16 wsec_rate;
-                        __le16 frame_control;
-                        u16 unknown_zeroed_0;
-                        __le16 control;
-                        u8 wep_iv[10];
-                        u8 unknown_wsec_tkip_data[3]; //FIXME
-                        PAD_BYTES(3);
-                        u8 mac1[6];
-                        u16 unknown_zeroed_1;
-                        struct bcm43xx_plcp_hdr4 rts_cts_fallback_plcp;
-                        __le16 rts_cts_dur_fallback;
-                        struct bcm43xx_plcp_hdr4 fallback_plcp;
-                        __le16 fallback_dur_id;
-                        PAD_BYTES(2);
-                        __le16 cookie;
-                        __le16 unknown_scb_stuff; //FIXME
-                        struct bcm43xx_plcp_hdr6 rts_cts_plcp;
-                        __le16 rts_cts_frame_control;
-                        __le16 rts_cts_dur;
-                        u8 rts_cts_mac1[6];
-                        u8 rts_cts_mac2[6];
-                        PAD_BYTES(2);
-                        struct bcm43xx_plcp_hdr6 plcp;
-                } __attribute__((__packed__));
-                u8 raw[82];
-        } __attribute__((__packed__));
-} __attribute__((__packed__));
-
-/* Values/Masks for the device TX header */
-#define BCM43xx_TXHDRFLAG_EXPECTACK             0x0001
-#define BCM43xx_TXHDRFLAG_RTSCTS                0x0002
-#define BCM43xx_TXHDRFLAG_RTS                   0x0004
-#define BCM43xx_TXHDRFLAG_FIRSTFRAGMENT         0x0008
-#define BCM43xx_TXHDRFLAG_DESTPSMODE            0x0020
-#define BCM43xx_TXHDRFLAG_RTSCTS_OFDM           0x0080
-#define BCM43xx_TXHDRFLAG_FALLBACKOFDM          0x0100
-#define BCM43xx_TXHDRFLAG_RTSCTSFALLBACK_OFDM   0x0200
-#define BCM43xx_TXHDRFLAG_CTS                   0x0400
-#define BCM43xx_TXHDRFLAG_FRAMEBURST            0x0800
-
-#define BCM43xx_TXHDRCTL_OFDM                   0x0001
-#define BCM43xx_TXHDRCTL_SHORT_PREAMBLE         0x0010
-#define BCM43xx_TXHDRCTL_ANTENNADIV_MASK        0x0030
-#define BCM43xx_TXHDRCTL_ANTENNADIV_SHIFT       8
-
-#define BCM43xx_TXHDR_RATE_MASK                 0x0F00
-#define BCM43xx_TXHDR_RATE_SHIFT                8
-#define BCM43xx_TXHDR_RTSRATE_MASK              0xF000
-#define BCM43xx_TXHDR_RTSRATE_SHIFT             12
-#define BCM43xx_TXHDR_WSEC_KEYINDEX_MASK        0x00F0
-#define BCM43xx_TXHDR_WSEC_KEYINDEX_SHIFT       4
-#define BCM43xx_TXHDR_WSEC_ALGO_MASK            0x0003
-#define BCM43xx_TXHDR_WSEC_ALGO_SHIFT           0
-
-void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
-                            struct bcm43xx_txhdr *txhdr,
-                            const unsigned char *fragment_data,
-                            const unsigned int fragment_len,
-                            const int is_first_fragment,
-                            const u16 cookie);
-
-/* RX header as received from the hardware. */
-struct bcm43xx_rxhdr {
-        /* Frame Length. Must be generated explicitly in PIO mode. */
-        __le16 frame_length;
-        PAD_BYTES(2);
-        /* Flags field 1 */
-        __le16 flags1;
-        u8 rssi;
-        u8 signal_quality;
-        PAD_BYTES(2);
-        /* Flags field 3 */
-        __le16 flags3;
-        /* Flags field 2 */
-        __le16 flags2;
-        /* Lower 16bits of the TSF at the time the frame started. */
-        __le16 mactime;
-        PAD_BYTES(14);
-} __attribute__((__packed__));
-
-#define BCM43xx_RXHDR_FLAGS1_OFDM               (1 << 0)
-/*#define BCM43xx_RXHDR_FLAGS1_SIGNAL???        (1 << 3) FIXME */
-#define BCM43xx_RXHDR_FLAGS1_SHORTPREAMBLE      (1 << 7)
-#define BCM43xx_RXHDR_FLAGS1_2053RSSIADJ        (1 << 14)
-
-#define BCM43xx_RXHDR_FLAGS2_INVALIDFRAME       (1 << 0)
-#define BCM43xx_RXHDR_FLAGS2_TYPE2FRAME         (1 << 2)
-/*FIXME: WEP related flags */
-
-#define BCM43xx_RXHDR_FLAGS3_2050RSSIADJ        (1 << 10)
-
-/* Transmit Status as received from the hardware. */
-struct bcm43xx_hwxmitstatus {
-        PAD_BYTES(4);
-        __le16 cookie;
-        u8 flags;
-        u8 cnt1:4,
-           cnt2:4;
-        PAD_BYTES(2);
-        __le16 seq;
-        __le16 unknown; //FIXME
-} __attribute__((__packed__));
-
-/* Transmit Status in CPU byteorder. */
-struct bcm43xx_xmitstatus {
-        u16 cookie;
-        u8 flags;
-        u8 cnt1:4,
-           cnt2:4;
-        u16 seq;
-        u16 unknown; //FIXME
-};
-
-#define BCM43xx_TXSTAT_FLAG_AMPDU       0x10
-#define BCM43xx_TXSTAT_FLAG_INTER       0x20
-
-u8 bcm43xx_plcp_get_ratecode_cck(const u8 bitrate);
-u8 bcm43xx_plcp_get_ratecode_ofdm(const u8 bitrate);
-
-int bcm43xx_rx(struct bcm43xx_private *bcm,
-               struct sk_buff *skb,
-               struct bcm43xx_rxhdr *rxhdr);
-
-#endif /* BCM43xx_XMIT_H_ */
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 98d6ff69d375..fa87c5c2ae0b 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -4495,9 +4495,9 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                                                        priv->
                                                                        essid_len),
                                                           print_mac(mac, priv->bssid),
-                                                          ntohs(auth->status),
+                                                          le16_to_cpu(auth->status),
                                                           ipw_get_status_code
-                                                          (ntohs
+                                                          (le16_to_cpu
                                                            (auth->status)));
 
                                                 priv->status &=
@@ -4532,9 +4532,9 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                                           IPW_DL_STATE |
                                                           IPW_DL_ASSOC,
                                                           "association failed (0x%04X): %s\n",
-                                                          ntohs(resp->status),
+                                                          le16_to_cpu(resp->status),
                                                           ipw_get_status_code
-                                                          (ntohs
+                                                          (le16_to_cpu
                                                            (resp->status)));
                                         }
 
@@ -4591,8 +4591,8 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
                                                   "authentication failed (0x%04X): %s\n",
-                                                  ntohs(auth->status),
-                                                  ipw_get_status_code(ntohs
+                                                  le16_to_cpu(auth->status),
+                                                  ipw_get_status_code(le16_to_cpu
                                                                       (auth->
                                                                        status)));
                                 }
@@ -10350,9 +10350,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
                                          remaining_bytes,
                                          PCI_DMA_TODEVICE));
 
-                        tfd->u.data.num_chunks =
-                            cpu_to_le32(le32_to_cpu(tfd->u.data.num_chunks) +
-                                        1);
+                        le32_add_cpu(&tfd->u.data.num_chunks, 1);
                 }
         }
 
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index fdc187e0769d..cd3295b66dd6 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -385,73 +385,73 @@ struct clx2_queue {
         dma_addr_t dma_addr;            /**< physical addr for BD's */
         int low_mark;                  /**< low watermark, resume queue if free space more than this */
         int high_mark;                 /**< high watermark, stop queue if free space less than this */
-} __attribute__ ((packed));
+} __attribute__ ((packed)); /* XXX */
 
 struct machdr32 {
         __le16 frame_ctl;
-        u16 duration;           // watch out for endians!
+        __le16 duration;                // watch out for endians!
         u8 addr1[MACADRR_BYTE_LEN];
         u8 addr2[MACADRR_BYTE_LEN];
         u8 addr3[MACADRR_BYTE_LEN];
-        u16 seq_ctrl;           // more endians!
+        __le16 seq_ctrl;                // more endians!
         u8 addr4[MACADRR_BYTE_LEN];
         __le16 qos_ctrl;
 } __attribute__ ((packed));
 
 struct machdr30 {
         __le16 frame_ctl;
-        u16 duration;           // watch out for endians!
+        __le16 duration;                // watch out for endians!
         u8 addr1[MACADRR_BYTE_LEN];
         u8 addr2[MACADRR_BYTE_LEN];
         u8 addr3[MACADRR_BYTE_LEN];
-        u16 seq_ctrl;           // more endians!
+        __le16 seq_ctrl;                // more endians!
         u8 addr4[MACADRR_BYTE_LEN];
 } __attribute__ ((packed));
 
 struct machdr26 {
         __le16 frame_ctl;
-        u16 duration;           // watch out for endians!
+        __le16 duration;                // watch out for endians!
         u8 addr1[MACADRR_BYTE_LEN];
         u8 addr2[MACADRR_BYTE_LEN];
         u8 addr3[MACADRR_BYTE_LEN];
-        u16 seq_ctrl;           // more endians!
+        __le16 seq_ctrl;                // more endians!
         __le16 qos_ctrl;
 } __attribute__ ((packed));
 
 struct machdr24 {
         __le16 frame_ctl;
-        u16 duration;           // watch out for endians!
+        __le16 duration;                // watch out for endians!
         u8 addr1[MACADRR_BYTE_LEN];
         u8 addr2[MACADRR_BYTE_LEN];
         u8 addr3[MACADRR_BYTE_LEN];
-        u16 seq_ctrl;           // more endians!
+        __le16 seq_ctrl;                // more endians!
 } __attribute__ ((packed));
 
 // TX TFD with 32 byte MAC Header
 struct tx_tfd_32 {
         struct machdr32 mchdr;  // 32
-        u32 uivplaceholder[2];  // 8
+        __le32 uivplaceholder[2];       // 8
 } __attribute__ ((packed));
 
 // TX TFD with 30 byte MAC Header
 struct tx_tfd_30 {
         struct machdr30 mchdr;  // 30
         u8 reserved[2];         // 2
-        u32 uivplaceholder[2];  // 8
+        __le32 uivplaceholder[2];       // 8
 } __attribute__ ((packed));
 
 // tx tfd with 26 byte mac header
 struct tx_tfd_26 {
         struct machdr26 mchdr;  // 26
         u8 reserved1[2];        // 2
-        u32 uivplaceholder[2];  // 8
+        __le32 uivplaceholder[2];       // 8
         u8 reserved2[4];        // 4
 } __attribute__ ((packed));
 
 // tx tfd with 24 byte mac header
 struct tx_tfd_24 {
         struct machdr24 mchdr;  // 24
-        u32 uivplaceholder[2];  // 8
+        __le32 uivplaceholder[2];       // 8
         u8 reserved[8];         // 8
 } __attribute__ ((packed));
 
@@ -460,7 +460,7 @@ struct tx_tfd_24 {
 struct tfd_command {
         u8 index;
         u8 length;
-        u16 reserved;
+        __le16 reserved;
         u8 payload[0];
 } __attribute__ ((packed));
 
@@ -562,27 +562,27 @@ struct rate_histogram {
 struct ipw_cmd_stats {
         u8 cmd_id;
         u8 seq_num;
-        u16 good_sfd;
-        u16 bad_plcp;
-        u16 wrong_bssid;
-        u16 valid_mpdu;
-        u16 bad_mac_header;
-        u16 reserved_frame_types;
-        u16 rx_ina;
-        u16 bad_crc32;
-        u16 invalid_cts;
-        u16 invalid_acks;
-        u16 long_distance_ina_fina;
-        u16 dsp_silence_unreachable;
-        u16 accumulated_rssi;
-        u16 rx_ovfl_frame_tossed;
-        u16 rssi_silence_threshold;
-        u16 rx_ovfl_frame_supplied;
-        u16 last_rx_frame_signal;
-        u16 last_rx_frame_noise;
-        u16 rx_autodetec_no_ofdm;
-        u16 rx_autodetec_no_barker;
-        u16 reserved;
+        __le16 good_sfd;
+        __le16 bad_plcp;
+        __le16 wrong_bssid;
+        __le16 valid_mpdu;
+        __le16 bad_mac_header;
+        __le16 reserved_frame_types;
+        __le16 rx_ina;
+        __le16 bad_crc32;
+        __le16 invalid_cts;
+        __le16 invalid_acks;
+        __le16 long_distance_ina_fina;
+        __le16 dsp_silence_unreachable;
+        __le16 accumulated_rssi;
+        __le16 rx_ovfl_frame_tossed;
+        __le16 rssi_silence_threshold;
+        __le16 rx_ovfl_frame_supplied;
+        __le16 last_rx_frame_signal;
+        __le16 last_rx_frame_noise;
+        __le16 rx_autodetec_no_ofdm;
+        __le16 rx_autodetec_no_barker;
+        __le16 reserved;
 } __attribute__ ((packed));
 
 struct notif_channel_result {
@@ -637,7 +637,7 @@ struct notif_association {
 struct notif_authenticate {
         u8 state;
         struct machdr24 addr;
-        u16 status;
+        __le16 status;
 } __attribute__ ((packed));
 
 struct notif_calibration {
@@ -732,14 +732,14 @@ struct ipw_rx_queue {
 struct alive_command_responce {
         u8 alive_command;
         u8 sequence_number;
-        u16 software_revision;
+        __le16 software_revision;
         u8 device_identifier;
         u8 reserved1[5];
-        u16 reserved2;
-        u16 reserved3;
-        u16 clock_settle_time;
-        u16 powerup_settle_time;
-        u16 reserved4;
+        __le16 reserved2;
+        __le16 reserved3;
+        __le16 clock_settle_time;
+        __le16 powerup_settle_time;
+        __le16 reserved4;
         u8 time_stamp[5];       /* month, day, year, hours, minutes */
         u8 ucode_valid;
 } __attribute__ ((packed));
@@ -878,7 +878,11 @@ static inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan,
 
 struct ipw_associate {
         u8 channel;
+#ifdef __LITTLE_ENDIAN_BITFIELD
         u8 auth_type:4, auth_key:4;
+#else
+        u8 auth_key:4, auth_type:4;
+#endif
         u8 assoc_type;
         u8 reserved;
         __le16 policy_support;
@@ -918,12 +922,12 @@ struct ipw_frag_threshold {
 struct ipw_retry_limit {
         u8 short_retry_limit;
         u8 long_retry_limit;
-        u16 reserved;
+        __le16 reserved;
 } __attribute__ ((packed));
 
 struct ipw_dino_config {
-        u32 dino_config_addr;
-        u16 dino_config_size;
+        __le32 dino_config_addr;
+        __le16 dino_config_size;
         u8 dino_response;
         u8 reserved;
 } __attribute__ ((packed));
@@ -998,7 +1002,7 @@ struct ipw_sensitivity_calib {
  * - \a status contains status;
  * - \a param filled with status parameters.
  */
-struct ipw_cmd {
+struct ipw_cmd {         /* XXX */
         u32 cmd;   /**< Host command */
         u32 status;/**< Status */
         u32 status_len;
@@ -1092,7 +1096,7 @@ struct ipw_ibss_seq {
         struct list_head list;
 };
 
-struct ipw_error_elem {
+struct ipw_error_elem {  /* XXX */
         u32 desc;
         u32 time;
         u32 blink1;
@@ -1102,13 +1106,13 @@ struct ipw_error_elem {
         u32 data;
 };
 
-struct ipw_event {
+struct ipw_event {       /* XXX */
         u32 event;
         u32 time;
         u32 data;
 } __attribute__ ((packed));
 
-struct ipw_fw_error {
+struct ipw_fw_error {    /* XXX */
         unsigned long jiffies;
         u32 status;
         u32 config;
@@ -1153,7 +1157,7 @@ struct ipw_prom_priv {
  */
 struct ipw_rt_hdr {
         struct ieee80211_radiotap_header rt_hdr;
-        u64 rt_tsf;      /* TSF */
+        u64 rt_tsf;      /* TSF */      /* XXX */
         u8 rt_flags;    /* radiotap packet flags */
         u8 rt_rate;     /* rate in 500kb/s */
         __le16 rt_channel;      /* channel in mhz */
@@ -1940,8 +1944,8 @@ enum {
 #define IPW_MEM_FIXED_OVERRIDE          (IPW_SHARED_LOWER_BOUND + 0x41C)
 
 struct ipw_fixed_rate {
-        u16 tx_rates;
-        u16 reserved;
+        __le16 tx_rates;
+        __le16 reserved;
 } __attribute__ ((packed));
 
 #define IPW_INDIRECT_ADDR_MASK (~0x3ul)
@@ -1951,12 +1955,12 @@ struct host_cmd {
         u8 len;
         u16 reserved;
         u32 *param;
-} __attribute__ ((packed));
+} __attribute__ ((packed));     /* XXX */
 
 struct cmdlog_host_cmd {
         u8 cmd;
         u8 len;
-        u16 reserved;
+        __le16 reserved;
         char param[124];
 } __attribute__ ((packed));
 
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index b54ff712e703..f844b738d34e 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,7 +1,22 @@
+config IWLCORE
+        tristate "Intel Wireless Wifi Core"
+        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+
+config IWLWIFI_LEDS
+        bool
+        default n
+
+config IWLWIFI_RFKILL
+        boolean "IWLWIFI RF kill support"
+        depends on IWLCORE
+        select RFKILL
+        select RFKILL_INPUT
+
 config IWL4965
         tristate "Intel Wireless WiFi 4965AGN"
         depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
         select FW_LOADER
+        select IWLCORE
         ---help---
           Select to build the driver supporting the:
 
@@ -24,21 +39,22 @@ config IWL4965
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
           module will be called iwl4965.ko.
 
-config IWL4965_QOS
-        bool "Enable Wireless QoS in iwl4965 driver"
-        depends on IWL4965
-        ---help---
-          This option will enable wireless quality of service (QoS) for the
-          iwl4965 driver.
-
 config IWL4965_HT
         bool "Enable 802.11n HT features in iwl4965 driver"
         depends on EXPERIMENTAL
-        depends on IWL4965 && IWL4965_QOS
+        depends on IWL4965
         ---help---
           This option enables IEEE 802.11n High Throughput features
           for the iwl4965 driver.
 
+config IWL4965_LEDS
+        bool "Enable LEDS features in iwl4965 driver"
+        depends on IWL4965 && MAC80211_LEDS && LEDS_CLASS
+        select IWLWIFI_LEDS
+        ---help---
+          This option enables LEDS for the iwlwifi drivers
+
+
 config IWL4965_SPECTRUM_MEASUREMENT
         bool "Enable Spectrum Measurement in iwl4965 driver"
         depends on IWL4965
@@ -52,7 +68,7 @@ config IWL4965_SENSITIVITY
           This option will enable sensitivity calibration for the iwl4965
           driver.
 
-config IWL4965_DEBUG
+config IWLWIFI_DEBUG
         bool "Enable full debugging output in iwl4965 driver"
         depends on IWL4965
         ---help---
@@ -78,6 +94,12 @@ config IWL4965_DEBUG
           as the debug information can assist others in helping you resolve
           any problems you may encounter.
 
+config IWLWIFI_DEBUGFS
+        bool "Iwlwifi debugfs support"
+        depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS
+        ---help---
+          Enable creation of debugfs files for the iwlwifi drivers.
+
 config IWL3945
         tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
         depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
@@ -104,19 +126,18 @@ config IWL3945
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
           module will be called iwl3945.ko.
 
-config IWL3945_QOS
-        bool "Enable Wireless QoS in iwl3945 driver"
-        depends on IWL3945
-        ---help---
-          This option will enable wireless quality of service (QoS) for the
-          iwl3945 driver.
-
 config IWL3945_SPECTRUM_MEASUREMENT
         bool "Enable Spectrum Measurement in iwl3945 drivers"
         depends on IWL3945
         ---help---
           This option will enable spectrum measurement for the iwl3945 driver.
 
+config IWL3945_LEDS
+        bool "Enable LEDS features in iwl3945 driver"
+        depends on IWL3945 && MAC80211_LEDS && LEDS_CLASS
+        ---help---
+          This option enables LEDS for the iwl3945 driver.
+
 config IWL3945_DEBUG
         bool "Enable full debugging output in iwl3945 driver"
         depends on IWL3945
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 3bbd38358d53..4f3e88b12e3a 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,5 +1,13 @@
+obj-$(CONFIG_IWLCORE)   := iwlcore.o
+iwlcore-objs            := iwl-core.o iwl-eeprom.o iwl-hcmd.o
+iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
+iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
+iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o
+
 obj-$(CONFIG_IWL3945)   += iwl3945.o
-iwl3945-objs            = iwl3945-base.o iwl-3945.o iwl-3945-rs.o
+iwl3945-objs            := iwl3945-base.o iwl-3945.o iwl-3945-rs.o
+iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o
 
 obj-$(CONFIG_IWL4965)   += iwl4965.o
-iwl4965-objs            = iwl4965-base.o iwl-4965.o iwl-4965-rs.o
+iwl4965-objs            := iwl4965-base.o iwl-4965.o iwl-4965-rs.o iwl-sta.o
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-commands.h b/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
index 46bb2c7d11dd..817ece773643 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -515,14 +515,20 @@ struct iwl3945_qosparam_cmd {
 #define STA_CONTROL_MODIFY_MSK          0x01
 
 /* key flags __le16*/
-#define STA_KEY_FLG_ENCRYPT_MSK __constant_cpu_to_le16(0x7)
-#define STA_KEY_FLG_NO_ENC      __constant_cpu_to_le16(0x0)
-#define STA_KEY_FLG_WEP         __constant_cpu_to_le16(0x1)
-#define STA_KEY_FLG_CCMP        __constant_cpu_to_le16(0x2)
-#define STA_KEY_FLG_TKIP        __constant_cpu_to_le16(0x3)
+#define STA_KEY_FLG_ENCRYPT_MSK __constant_cpu_to_le16(0x0007)
+#define STA_KEY_FLG_NO_ENC      __constant_cpu_to_le16(0x0000)
+#define STA_KEY_FLG_WEP         __constant_cpu_to_le16(0x0001)
+#define STA_KEY_FLG_CCMP        __constant_cpu_to_le16(0x0002)
+#define STA_KEY_FLG_TKIP        __constant_cpu_to_le16(0x0003)
 
 #define STA_KEY_FLG_KEYID_POS   8
 #define STA_KEY_FLG_INVALID     __constant_cpu_to_le16(0x0800)
+/* wep key is either from global key (0) or from station info array (1) */
+#define STA_KEY_FLG_WEP_KEY_MAP_MSK  __constant_cpu_to_le16(0x0008)
+
+/* wep key in STA: 5-bytes (0) or 13-bytes (1) */
+#define STA_KEY_FLG_KEY_SIZE_MSK     __constant_cpu_to_le16(0x1000)
+#define STA_KEY_MULTICAST_MSK        __constant_cpu_to_le16(0x4000)
 
 /* Flags indicate whether to modify vs. don't change various station params */
 #define STA_MODIFY_KEY_MASK             0x01
@@ -546,7 +552,8 @@ struct iwl3945_keyinfo {
         u8 tkip_rx_tsc_byte2;   /* TSC[2] for key mix ph1 detection */
         u8 reserved1;
         __le16 tkip_rx_ttak[5]; /* 10-byte unicast TKIP TTAK */
-        __le16 reserved2;
+        u8 key_offset;
+        u8 reserved2;
         u8 key[16];             /* 16-byte unicast decryption key */
 } __attribute__ ((packed));
 
@@ -659,26 +666,26 @@ struct iwl3945_rx_frame_hdr {
         u8 payload[0];
 } __attribute__ ((packed));
 
-#define RX_RES_STATUS_NO_CRC32_ERROR    __constant_cpu_to_le32(1 << 0)
-#define RX_RES_STATUS_NO_RXE_OVERFLOW   __constant_cpu_to_le32(1 << 1)
+#define RX_RES_STATUS_NO_CRC32_ERROR    __constant_cpu_to_le32(1 << 0)
+#define RX_RES_STATUS_NO_RXE_OVERFLOW   __constant_cpu_to_le32(1 << 1)
 
-#define RX_RES_PHY_FLAGS_BAND_24_MSK    __constant_cpu_to_le16(1 << 0)
-#define RX_RES_PHY_FLAGS_MOD_CCK_MSK            __constant_cpu_to_le16(1 << 1)
-#define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK     __constant_cpu_to_le16(1 << 2)
-#define RX_RES_PHY_FLAGS_NARROW_BAND_MSK        __constant_cpu_to_le16(1 << 3)
-#define RX_RES_PHY_FLAGS_ANTENNA_MSK            __constant_cpu_to_le16(0xf0)
+#define RX_RES_PHY_FLAGS_BAND_24_MSK    __constant_cpu_to_le16(1 << 0)
+#define RX_RES_PHY_FLAGS_MOD_CCK_MSK            __constant_cpu_to_le16(1 << 1)
+#define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK     __constant_cpu_to_le16(1 << 2)
+#define RX_RES_PHY_FLAGS_NARROW_BAND_MSK        __constant_cpu_to_le16(1 << 3)
+#define RX_RES_PHY_FLAGS_ANTENNA_MSK            __constant_cpu_to_le16(0xf0)
 
-#define RX_RES_STATUS_SEC_TYPE_MSK      (0x7 << 8)
-#define RX_RES_STATUS_SEC_TYPE_NONE     (0x0 << 8)
-#define RX_RES_STATUS_SEC_TYPE_WEP      (0x1 << 8)
-#define RX_RES_STATUS_SEC_TYPE_CCMP     (0x2 << 8)
-#define RX_RES_STATUS_SEC_TYPE_TKIP     (0x3 << 8)
+#define RX_RES_STATUS_SEC_TYPE_MSK      (0x7 << 8)
+#define RX_RES_STATUS_SEC_TYPE_NONE     (0x0 << 8)
+#define RX_RES_STATUS_SEC_TYPE_WEP      (0x1 << 8)
+#define RX_RES_STATUS_SEC_TYPE_CCMP     (0x2 << 8)
+#define RX_RES_STATUS_SEC_TYPE_TKIP     (0x3 << 8)
 
-#define RX_RES_STATUS_DECRYPT_TYPE_MSK  (0x3 << 11)
-#define RX_RES_STATUS_NOT_DECRYPT       (0x0 << 11)
-#define RX_RES_STATUS_DECRYPT_OK        (0x3 << 11)
-#define RX_RES_STATUS_BAD_ICV_MIC       (0x1 << 11)
-#define RX_RES_STATUS_BAD_KEY_TTAK      (0x2 << 11)
+#define RX_RES_STATUS_DECRYPT_TYPE_MSK  (0x3 << 11)
+#define RX_RES_STATUS_NOT_DECRYPT       (0x0 << 11)
+#define RX_RES_STATUS_DECRYPT_OK        (0x3 << 11)
+#define RX_RES_STATUS_BAD_ICV_MIC       (0x1 << 11)
+#define RX_RES_STATUS_BAD_KEY_TTAK      (0x2 << 11)
 
 struct iwl3945_rx_frame_end {
         __le32 status;
@@ -700,45 +707,6 @@ struct iwl3945_rx_frame {
         struct iwl3945_rx_frame_end end;
 } __attribute__ ((packed));
 
-/* Fixed (non-configurable) rx data from phy */
-#define RX_PHY_FLAGS_ANTENNAE_OFFSET            (4)
-#define RX_PHY_FLAGS_ANTENNAE_MASK              (0x70)
-#define IWL_AGC_DB_MASK         (0x3f80)        /* MASK(7,13) */
-#define IWL_AGC_DB_POS          (7)
-struct iwl4965_rx_non_cfg_phy {
-        __le16 ant_selection;   /* ant A bit 4, ant B bit 5, ant C bit 6 */
-        __le16 agc_info;        /* agc code 0:6, agc dB 7:13, reserved 14:15 */
-        u8 rssi_info[6];        /* we use even entries, 0/2/4 for A/B/C rssi */
-        u8 pad[0];
-} __attribute__ ((packed));
-
-/*
- * REPLY_4965_RX = 0xc3 (response only, not a command)
- * Used only for legacy (non 11n) frames.
- */
-#define RX_RES_PHY_CNT 14
-struct iwl4965_rx_phy_res {
-        u8 non_cfg_phy_cnt;     /* non configurable DSP phy data byte count */
-        u8 cfg_phy_cnt;         /* configurable DSP phy data byte count */
-        u8 stat_id;             /* configurable DSP phy data set ID */
-        u8 reserved1;
-        __le64 timestamp;       /* TSF at on air rise */
-        __le32 beacon_time_stamp; /* beacon at on-air rise */
-        __le16 phy_flags;       /* general phy flags: band, modulation, ... */
-        __le16 channel;         /* channel number */
-        __le16 non_cfg_phy[RX_RES_PHY_CNT];     /* upto 14 phy entries */
-        __le32 reserved2;
-        __le32 rate_n_flags;
-        __le16 byte_count;              /* frame's byte-count */
-        __le16 reserved3;
-} __attribute__ ((packed));
-
-struct iwl4965_rx_mpdu_res_start {
-        __le16 byte_count;
-        __le16 reserved;
-} __attribute__ ((packed));
-
-
 /******************************************************************************
  * (5)
  * Tx Commands & Responses:
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-core.h b/drivers/net/wireless/iwlwifi/iwl-3945-core.h
new file mode 100644
index 000000000000..bc12f97ba0b1
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-core.h
@@ -0,0 +1,80 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Tomas Winkler <tomas.winkler@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#ifndef __iwl_3945_dev_h__
+#define __iwl_3945_dev_h__
+
+#define IWL_PCI_DEVICE(dev, subdev, cfg) \
+        .vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \
+        .subvendor = PCI_ANY_ID, .subdevice = (subdev), \
+        .driver_data = (kernel_ulong_t)&(cfg)
+
+#define IWL_SKU_G       0x1
+#define IWL_SKU_A       0x2
+
+struct iwl_3945_cfg {
+        const char *name;
+        const char *fw_name;
+        unsigned int sku;
+};
+
+#endif /* __iwl_dev_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-debug.h b/drivers/net/wireless/iwlwifi/iwl-3945-debug.h
index f853c6b9f76e..f1d002f7b790 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
@@ -40,6 +40,15 @@ do { if (iwl3945_debug_level & (level)) \
 do { if ((iwl3945_debug_level & (level)) && net_ratelimit()) \
   printk(KERN_ERR DRV_NAME": %c %s " fmt, \
          in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
+
+static inline void iwl3945_print_hex_dump(int level, void *p, u32 len)
+{
+        if (!(iwl3945_debug_level & level))
+                return;
+
+        print_hex_dump(KERN_DEBUG, "iwl data: ", DUMP_PREFIX_OFFSET, 16, 1,
+                        p, len, 1);
+}
 #else
 static inline void IWL_DEBUG(int level, const char *fmt, ...)
 {
@@ -47,7 +56,12 @@ static inline void IWL_DEBUG(int level, const char *fmt, ...)
 static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
 {
 }
-#endif                          /* CONFIG_IWL3945_DEBUG */
+static inline void iwl3945_print_hex_dump(int level, void *p, u32 len)
+{
+}
+#endif  /* CONFIG_IWL3945_DEBUG */
+
+
 
 /*
  * To use the debug system;
@@ -143,6 +157,7 @@ static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
         IWL_DEBUG_LIMIT(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
 #define IWL_DEBUG_HT(f, a...) IWL_DEBUG(IWL_DL_HT, f, ## a)
 #define IWL_DEBUG_STATS(f, a...) IWL_DEBUG(IWL_DL_STATS, f, ## a)
+#define IWL_DEBUG_STATS_LIMIT(f, a...) IWL_DEBUG_LIMIT(IWL_DL_STATS, f, ## a)
 #define IWL_DEBUG_TX_REPLY(f, a...) IWL_DEBUG(IWL_DL_TX_REPLY, f, ## a)
 #define IWL_DEBUG_QOS(f, a...)   IWL_DEBUG(IWL_DL_QOS, f, ## a)
 #define IWL_DEBUG_RADIO(f, a...)  IWL_DEBUG(IWL_DL_RADIO, f, ## a)
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
index 571815d7e8bf..ad612a8719f4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -198,43 +198,27 @@ struct iwl3945_eeprom_temperature_corr {
  */
 struct iwl3945_eeprom {
         u8 reserved0[16];
-#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
         u16 device_id;  /* abs.ofs: 16 */
         u8 reserved1[2];
-#define EEPROM_PMC                          (2*0x0A)    /* 2 bytes */
         u16 pmc;                /* abs.ofs: 20 */
         u8 reserved2[20];
-#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
         u8 mac_address[6];      /* abs.ofs: 42 */
         u8 reserved3[58];
-#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
         u16 board_revision;     /* abs.ofs: 106 */
         u8 reserved4[11];
-#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
         u8 board_pba_number[9]; /* abs.ofs: 119 */
         u8 reserved5[8];
-#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
         u16 version;            /* abs.ofs: 136 */
-#define EEPROM_SKU_CAP                      (2*0x45)    /* 1  bytes */
         u8 sku_cap;             /* abs.ofs: 138 */
-#define EEPROM_LEDS_MODE                    (2*0x45+1)  /* 1  bytes */
         u8 leds_mode;           /* abs.ofs: 139 */
-#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
         u16 oem_mode;
-#define EEPROM_WOWLAN_MODE                  (2*0x47)    /* 2  bytes */
         u16 wowlan_mode;        /* abs.ofs: 142 */
-#define EEPROM_LEDS_TIME_INTERVAL           (2*0x48)    /* 2  bytes */
         u16 leds_time_interval; /* abs.ofs: 144 */
-#define EEPROM_LEDS_OFF_TIME                (2*0x49)    /* 1  bytes */
         u8 leds_off_time;       /* abs.ofs: 146 */
-#define EEPROM_LEDS_ON_TIME                 (2*0x49+1)  /* 1  bytes */
         u8 leds_on_time;        /* abs.ofs: 147 */
-#define EEPROM_ALMGOR_M_VERSION             (2*0x4A)    /* 1  bytes */
         u8 almgor_m_version;    /* abs.ofs: 148 */
-#define EEPROM_ANTENNA_SWITCH_TYPE          (2*0x4A+1)  /* 1  bytes */
         u8 antenna_switch_type; /* abs.ofs: 149 */
         u8 reserved6[42];
-#define EEPROM_REGULATORY_SKU_ID            (2*0x60)    /* 4  bytes */
         u8 sku_id[4];           /* abs.ofs: 192 */
 
 /*
@@ -249,9 +233,7 @@ struct iwl3945_eeprom {
  *
  * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
  */
-#define EEPROM_REGULATORY_BAND_1            (2*0x62)    /* 2  bytes */
         u16 band_1_count;       /* abs.ofs: 196 */
-#define EEPROM_REGULATORY_BAND_1_CHANNELS   (2*0x63)    /* 28 bytes */
         struct iwl3945_eeprom_channel band_1_channels[14];  /* abs.ofs: 196 */
 
 /*
@@ -259,36 +241,28 @@ struct iwl3945_eeprom {
  * 5.0 GHz channels 7, 8, 11, 12, 16
  * (4915-5080MHz) (none of these is ever supported)
  */
-#define EEPROM_REGULATORY_BAND_2            (2*0x71)    /* 2  bytes */
         u16 band_2_count;       /* abs.ofs: 226 */
-#define EEPROM_REGULATORY_BAND_2_CHANNELS   (2*0x72)    /* 26 bytes */
         struct iwl3945_eeprom_channel band_2_channels[13];  /* abs.ofs: 228 */
 
 /*
  * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
  * (5170-5320MHz)
  */
-#define EEPROM_REGULATORY_BAND_3            (2*0x7F)    /* 2  bytes */
         u16 band_3_count;       /* abs.ofs: 254 */
-#define EEPROM_REGULATORY_BAND_3_CHANNELS   (2*0x80)    /* 24 bytes */
         struct iwl3945_eeprom_channel band_3_channels[12];  /* abs.ofs: 256 */
 
 /*
  * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
  * (5500-5700MHz)
  */
-#define EEPROM_REGULATORY_BAND_4            (2*0x8C)    /* 2  bytes */
         u16 band_4_count;       /* abs.ofs: 280 */
-#define EEPROM_REGULATORY_BAND_4_CHANNELS   (2*0x8D)    /* 22 bytes */
         struct iwl3945_eeprom_channel band_4_channels[11];  /* abs.ofs: 282 */
 
 /*
  * 5.7 GHz channels 145, 149, 153, 157, 161, 165
  * (5725-5825MHz)
  */
-#define EEPROM_REGULATORY_BAND_5            (2*0x98)    /* 2  bytes */
         u16 band_5_count;       /* abs.ofs: 304 */
-#define EEPROM_REGULATORY_BAND_5_CHANNELS   (2*0x99)    /* 12 bytes */
         struct iwl3945_eeprom_channel band_5_channels[6];  /* abs.ofs: 306 */
 
         u8 reserved9[194];
@@ -296,15 +270,9 @@ struct iwl3945_eeprom {
 /*
  * 3945 Txpower calibration data.
  */
-#define EEPROM_TXPOWER_CALIB_GROUP0 0x200
-#define EEPROM_TXPOWER_CALIB_GROUP1 0x240
-#define EEPROM_TXPOWER_CALIB_GROUP2 0x280
-#define EEPROM_TXPOWER_CALIB_GROUP3 0x2c0
-#define EEPROM_TXPOWER_CALIB_GROUP4 0x300
 #define IWL_NUM_TX_CALIB_GROUPS 5
         struct iwl3945_eeprom_txpower_group groups[IWL_NUM_TX_CALIB_GROUPS];
 /* abs.ofs: 512 */
-#define EEPROM_CALIB_TEMPERATURE_CORRECT 0x340
         struct iwl3945_eeprom_temperature_corr corrections;  /* abs.ofs: 832 */
         u8 reserved16[172];     /* fill out to full 1024 byte block */
 } __attribute__ ((packed));
@@ -321,181 +289,6 @@ struct iwl3945_eeprom {
 #define PCI_REG_WUM8       0x0E8
 #define PCI_CFG_PMC_PME_FROM_D3COLD_SUPPORT         (0x80000000)
 
-/*=== CSR (control and status registers) ===*/
-#define CSR_BASE    (0x000)
-
-#define CSR_SW_VER              (CSR_BASE+0x000)
-#define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000) /* hardware interface config */
-#define CSR_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */
-#define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */
-#define CSR_INT_MASK            (CSR_BASE+0x00c) /* host interrupt enable */
-#define CSR_FH_INT_STATUS       (CSR_BASE+0x010) /* busmaster int status/ack*/
-#define CSR_GPIO_IN             (CSR_BASE+0x018) /* read external chip pins */
-#define CSR_RESET               (CSR_BASE+0x020) /* busmaster enable, NMI, etc*/
-#define CSR_GP_CNTRL            (CSR_BASE+0x024)
-
-/*
- * Hardware revision info
- * Bit fields:
- * 31-8:  Reserved
- *  7-4:  Type of device:  0x0 = 4965, 0xd = 3945
- *  3-2:  Revision step:  0 = A, 1 = B, 2 = C, 3 = D
- *  1-0:  "Dash" value, as in A-1, etc.
- */
-#define CSR_HW_REV              (CSR_BASE+0x028)
-
-/* EEPROM reads */
-#define CSR_EEPROM_REG          (CSR_BASE+0x02c)
-#define CSR_EEPROM_GP           (CSR_BASE+0x030)
-#define CSR_GP_UCODE            (CSR_BASE+0x044)
-#define CSR_UCODE_DRV_GP1       (CSR_BASE+0x054)
-#define CSR_UCODE_DRV_GP1_SET   (CSR_BASE+0x058)
-#define CSR_UCODE_DRV_GP1_CLR   (CSR_BASE+0x05c)
-#define CSR_UCODE_DRV_GP2       (CSR_BASE+0x060)
-#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)
-
-/* Analog phase-lock-loop configuration (3945 only)
- * Set bit 24. */
-#define CSR_ANA_PLL_CFG         (CSR_BASE+0x20c)
-
-/* Bits for CSR_HW_IF_CONFIG_REG */
-#define CSR_HW_IF_CONFIG_REG_BIT_ALMAGOR_MB         (0x00000100)
-#define CSR_HW_IF_CONFIG_REG_BIT_ALMAGOR_MM         (0x00000200)
-#define CSR_HW_IF_CONFIG_REG_BIT_SKU_MRC            (0x00000400)
-#define CSR_HW_IF_CONFIG_REG_BIT_BOARD_TYPE         (0x00000800)
-#define CSR_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A    (0x00000000)
-#define CSR_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B    (0x00001000)
-#define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM     (0x00200000)
-
-/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
- * acknowledged (reset) by host writing "1" to flagged bits. */
-#define CSR_INT_BIT_FH_RX        (1 << 31) /* Rx DMA, cmd responses, FH_INT[17:16] */
-#define CSR_INT_BIT_HW_ERR       (1 << 29) /* DMA hardware error FH_INT[31] */
-#define CSR_INT_BIT_DNLD         (1 << 28) /* uCode Download */
-#define CSR_INT_BIT_FH_TX        (1 << 27) /* Tx DMA FH_INT[1:0] */
-#define CSR_INT_BIT_SCD          (1 << 26) /* TXQ pointer advanced */
-#define CSR_INT_BIT_SW_ERR       (1 << 25) /* uCode error */
-#define CSR_INT_BIT_RF_KILL      (1 << 7)  /* HW RFKILL switch GP_CNTRL[27] toggled */
-#define CSR_INT_BIT_CT_KILL      (1 << 6)  /* Critical temp (chip too hot) rfkill */
-#define CSR_INT_BIT_SW_RX        (1 << 3)  /* Rx, command responses, 3945 */
-#define CSR_INT_BIT_WAKEUP       (1 << 1)  /* NIC controller waking up (pwr mgmt) */
-#define CSR_INT_BIT_ALIVE        (1 << 0)  /* uCode interrupts once it initializes */
-
-#define CSR_INI_SET_MASK        (CSR_INT_BIT_FH_RX   | \
-                                 CSR_INT_BIT_HW_ERR  | \
-                                 CSR_INT_BIT_FH_TX   | \
-                                 CSR_INT_BIT_SW_ERR  | \
-                                 CSR_INT_BIT_RF_KILL | \
-                                 CSR_INT_BIT_SW_RX   | \
-                                 CSR_INT_BIT_WAKEUP  | \
-                                 CSR_INT_BIT_ALIVE)
-
-/* interrupt flags in FH (flow handler) (PCI busmaster DMA) */
-#define CSR_FH_INT_BIT_ERR       (1 << 31) /* Error */
-#define CSR_FH_INT_BIT_HI_PRIOR  (1 << 30) /* High priority Rx, bypass coalescing */
-#define CSR_FH_INT_BIT_RX_CHNL2  (1 << 18) /* Rx channel 2 (3945 only) */
-#define CSR_FH_INT_BIT_RX_CHNL1  (1 << 17) /* Rx channel 1 */
-#define CSR_FH_INT_BIT_RX_CHNL0  (1 << 16) /* Rx channel 0 */
-#define CSR_FH_INT_BIT_TX_CHNL6  (1 << 6)  /* Tx channel 6 (3945 only) */
-#define CSR_FH_INT_BIT_TX_CHNL1  (1 << 1)  /* Tx channel 1 */
-#define CSR_FH_INT_BIT_TX_CHNL0  (1 << 0)  /* Tx channel 0 */
-
-#define CSR_FH_INT_RX_MASK      (CSR_FH_INT_BIT_HI_PRIOR | \
-                                 CSR_FH_INT_BIT_RX_CHNL2 | \
-                                 CSR_FH_INT_BIT_RX_CHNL1 | \
-                                 CSR_FH_INT_BIT_RX_CHNL0)
-
-#define CSR_FH_INT_TX_MASK      (CSR_FH_INT_BIT_TX_CHNL6 | \
-                                 CSR_FH_INT_BIT_TX_CHNL1 | \
-                                 CSR_FH_INT_BIT_TX_CHNL0)
-
-
-/* RESET */
-#define CSR_RESET_REG_FLAG_NEVO_RESET                (0x00000001)
-#define CSR_RESET_REG_FLAG_FORCE_NMI                 (0x00000002)
-#define CSR_RESET_REG_FLAG_SW_RESET                  (0x00000080)
-#define CSR_RESET_REG_FLAG_MASTER_DISABLED           (0x00000100)
-#define CSR_RESET_REG_FLAG_STOP_MASTER               (0x00000200)
-
-/* GP (general purpose) CONTROL */
-#define CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY        (0x00000001)
-#define CSR_GP_CNTRL_REG_FLAG_INIT_DONE              (0x00000004)
-#define CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ         (0x00000008)
-#define CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP         (0x00000010)
-
-#define CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN           (0x00000001)
-
-#define CSR_GP_CNTRL_REG_MSK_POWER_SAVE_TYPE         (0x07000000)
-#define CSR_GP_CNTRL_REG_FLAG_MAC_POWER_SAVE         (0x04000000)
-#define CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW          (0x08000000)
-
-
-/* EEPROM REG */
-#define CSR_EEPROM_REG_READ_VALID_MSK   (0x00000001)
-#define CSR_EEPROM_REG_BIT_CMD          (0x00000002)
-
-/* EEPROM GP */
-#define CSR_EEPROM_GP_VALID_MSK         (0x00000006)
-#define CSR_EEPROM_GP_BAD_SIGNATURE     (0x00000000)
-#define CSR_EEPROM_GP_IF_OWNER_MSK      (0x00000180)
-
-/* UCODE DRV GP */
-#define CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP             (0x00000001)
-#define CSR_UCODE_SW_BIT_RFKILL                     (0x00000002)
-#define CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED           (0x00000004)
-#define CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT      (0x00000008)
-
-/* GPIO */
-#define CSR_GPIO_IN_BIT_AUX_POWER                   (0x00000200)
-#define CSR_GPIO_IN_VAL_VAUX_PWR_SRC                (0x00000000)
-#define CSR_GPIO_IN_VAL_VMAIN_PWR_SRC           CSR_GPIO_IN_BIT_AUX_POWER
-
-/* GI Chicken Bits */
-#define CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX  (0x00800000)
-#define CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER  (0x20000000)
-
-/* CSR_ANA_PLL_CFG */
-#define CSR_ANA_PLL_CFG_SH              (0x00880300)
-
-/*=== HBUS (Host-side Bus) ===*/
-#define HBUS_BASE       (0x400)
-
-/*
- * Registers for accessing device's internal SRAM memory (e.g. SCD SRAM
- * structures, error log, event log, verifying uCode load).
- * First write to address register, then read from or write to data register
- * to complete the job.  Once the address register is set up, accesses to
- * data registers auto-increment the address by one dword.
- * Bit usage for address registers (read or write):
- *  0-31:  memory address within device
- */
-#define HBUS_TARG_MEM_RADDR     (HBUS_BASE+0x00c)
-#define HBUS_TARG_MEM_WADDR     (HBUS_BASE+0x010)
-#define HBUS_TARG_MEM_WDAT      (HBUS_BASE+0x018)
-#define HBUS_TARG_MEM_RDAT      (HBUS_BASE+0x01c)
-
-/*
- * Registers for accessing device's internal peripheral registers
- * (e.g. SCD, BSM, etc.).  First write to address register,
- * then read from or write to data register to complete the job.
- * Bit usage for address registers (read or write):
- *  0-15:  register address (offset) within device
- * 24-25:  (# bytes - 1) to read or write (e.g. 3 for dword)
- */
-#define HBUS_TARG_PRPH_WADDR    (HBUS_BASE+0x044)
-#define HBUS_TARG_PRPH_RADDR    (HBUS_BASE+0x048)
-#define HBUS_TARG_PRPH_WDAT     (HBUS_BASE+0x04c)
-#define HBUS_TARG_PRPH_RDAT     (HBUS_BASE+0x050)
-
-/*
- * Per-Tx-queue write pointer (index, really!) (3945 and 4965).
- * Indicates index to next TFD that driver will fill (1 past latest filled).
- * Bit usage:
- *  0-7:  queue write index
- * 11-8:  queue selector
- */
-#define HBUS_TARG_WRPTR         (HBUS_BASE+0x060)
-
 /* SCD (3945 Tx Frame Scheduler) */
 #define SCD_BASE                        (CSR_BASE + 0x2E00)
 
@@ -663,7 +456,7 @@ struct iwl3945_eeprom {
 /* Size of uCode instruction memory in bootstrap state machine */
 #define IWL_MAX_BSM_SIZE ALM_RTC_INST_SIZE
 
-#define IWL_MAX_NUM_QUEUES      8
+#define IWL39_MAX_NUM_QUEUES    8
 
 static inline int iwl3945_hw_valid_rtc_data_addr(u32 addr)
 {
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-io.h b/drivers/net/wireless/iwlwifi/iwl-3945-io.h
index 75e20d0a20d1..0b9475114618 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-io.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
@@ -59,28 +59,28 @@
  *
  */
 
-#define _iwl3945_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs))
+#define _iwl3945_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs))
 #ifdef CONFIG_IWL3945_DEBUG
-static inline void __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv *iwl,
+static inline void __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv *priv,
                                  u32 ofs, u32 val)
 {
         IWL_DEBUG_IO("write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);
-        _iwl3945_write32(iwl, ofs, val);
+        _iwl3945_write32(priv, ofs, val);
 }
-#define iwl3945_write32(iwl, ofs, val) \
-        __iwl3945_write32(__FILE__, __LINE__, iwl, ofs, val)
+#define iwl3945_write32(priv, ofs, val) \
+        __iwl3945_write32(__FILE__, __LINE__, priv, ofs, val)
 #else
-#define iwl3945_write32(iwl, ofs, val) _iwl3945_write32(iwl, ofs, val)
+#define iwl3945_write32(priv, ofs, val) _iwl3945_write32(priv, ofs, val)
 #endif
 
-#define _iwl3945_read32(iwl, ofs) readl((iwl)->hw_base + (ofs))
+#define _iwl3945_read32(priv, ofs) readl((priv)->hw_base + (ofs))
 #ifdef CONFIG_IWL3945_DEBUG
-static inline u32 __iwl3945_read32(char *f, u32 l, struct iwl3945_priv *iwl, u32 ofs)
+static inline u32 __iwl3945_read32(char *f, u32 l, struct iwl3945_priv *priv, u32 ofs)
 {
         IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);
-        return _iwl3945_read32(iwl, ofs);
+        return _iwl3945_read32(priv, ofs);
 }
-#define iwl3945_read32(iwl, ofs) __iwl3945_read32(__FILE__, __LINE__, iwl, ofs)
+#define iwl3945_read32(priv, ofs) __iwl3945_read32(__FILE__, __LINE__, priv, ofs)
 #else
 #define iwl3945_read32(p, o) _iwl3945_read32(p, o)
 #endif
@@ -105,18 +105,13 @@ static inline int __iwl3945_poll_bit(const char *f, u32 l,
                                  u32 bits, u32 mask, int timeout)
 {
         int ret = _iwl3945_poll_bit(priv, addr, bits, mask, timeout);
-        if (unlikely(ret  == -ETIMEDOUT))
-                IWL_DEBUG_IO
-                    ("poll_bit(0x%08X, 0x%08X, 0x%08X) - timedout - %s %d\n",
-                     addr, bits, mask, f, l);
-        else
-                IWL_DEBUG_IO
-                    ("poll_bit(0x%08X, 0x%08X, 0x%08X) = 0x%08X - %s %d\n",
-                     addr, bits, mask, ret, f, l);
+        IWL_DEBUG_IO("poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n",
+                      addr, bits, mask,
+                      unlikely(ret  == -ETIMEDOUT)?"timeout":"", f, l);
         return ret;
 }
-#define iwl3945_poll_bit(iwl, addr, bits, mask, timeout) \
-        __iwl3945_poll_bit(__FILE__, __LINE__, iwl, addr, bits, mask, timeout)
+#define iwl3945_poll_bit(priv, addr, bits, mask, timeout) \
+        __iwl3945_poll_bit(__FILE__, __LINE__, priv, addr, bits, mask, timeout)
 #else
 #define iwl3945_poll_bit(p, a, b, m, t) _iwl3945_poll_bit(p, a, b, m, t)
 #endif
@@ -321,8 +316,8 @@ static inline int __iwl3945_poll_direct_bit(const char *f, u32 l,
                              "- %s %d\n", addr, mask, ret, f, l);
         return ret;
 }
-#define iwl3945_poll_direct_bit(iwl, addr, mask, timeout) \
-        __iwl3945_poll_direct_bit(__FILE__, __LINE__, iwl, addr, mask, timeout)
+#define iwl3945_poll_direct_bit(priv, addr, mask, timeout) \
+        __iwl3945_poll_direct_bit(__FILE__, __LINE__, priv, addr, mask, timeout)
 #else
 #define iwl3945_poll_direct_bit _iwl3945_poll_direct_bit
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
new file mode 100644
index 000000000000..d200d08fb086
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
@@ -0,0 +1,433 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <net/mac80211.h>
+#include <linux/etherdevice.h>
+#include <asm/unaligned.h>
+
+#include "iwl-3945.h"
+#include "iwl-helpers.h"
+
+#define IWL_1MB_RATE (128 * 1024)
+#define IWL_LED_THRESHOLD (16)
+#define IWL_MAX_BLINK_TBL (10)
+
+static const struct {
+        u16 brightness;
+        u8 on_time;
+        u8 of_time;
+} blink_tbl[] =
+{
+        {300, 25, 25},
+        {200, 40, 40},
+        {100, 55, 55},
+        {70, 65, 65},
+        {50, 75, 75},
+        {20, 85, 85},
+        {15, 95, 95 },
+        {10, 110, 110},
+        {5, 130, 130},
+        {0, 167, 167}
+};
+
+static int iwl3945_led_cmd_callback(struct iwl3945_priv *priv,
+                                    struct iwl3945_cmd *cmd,
+                                    struct sk_buff *skb)
+{
+        return 1;
+}
+
+
+/* Send led command */
+static int iwl_send_led_cmd(struct iwl3945_priv *priv,
+                            struct iwl3945_led_cmd *led_cmd)
+{
+        struct iwl3945_host_cmd cmd = {
+                .id = REPLY_LEDS_CMD,
+                .len = sizeof(struct iwl3945_led_cmd),
+                .data = led_cmd,
+                .meta.flags = CMD_ASYNC,
+                .meta.u.callback = iwl3945_led_cmd_callback
+        };
+
+        return iwl3945_send_cmd(priv, &cmd);
+}
+
+
+/* Set led on command */
+static int iwl3945_led_on(struct iwl3945_priv *priv, int led_id)
+{
+        struct iwl3945_led_cmd led_cmd = {
+                .id = led_id,
+                .on = IWL_LED_SOLID,
+                .off = 0,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+
+/* Set led on command */
+static int iwl3945_led_pattern(struct iwl3945_priv *priv, int led_id,
+                               enum led_brightness brightness)
+{
+        struct iwl3945_led_cmd led_cmd = {
+                .id = led_id,
+                .on = brightness,
+                .off = brightness,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+        if (brightness == LED_FULL) {
+                led_cmd.on = IWL_LED_SOLID;
+                led_cmd.off = 0;
+        }
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+
+/* Set led register off */
+static int iwl3945_led_on_reg(struct iwl3945_priv *priv, int led_id)
+{
+        IWL_DEBUG_LED("led on %d\n", led_id);
+        return iwl3945_led_on(priv, led_id);
+}
+
+/* Set led off command */
+static int iwl3945_led_off(struct iwl3945_priv *priv, int led_id)
+{
+        struct iwl3945_led_cmd led_cmd = {
+                .id = led_id,
+                .on = 0,
+                .off = 0,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+        IWL_DEBUG_LED("led off %d\n", led_id);
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+
+/* Set led register off */
+static int iwl3945_led_off_reg(struct iwl3945_priv *priv, int led_id)
+{
+        iwl3945_led_off(priv, led_id);
+        return 0;
+}
+
+/* Set led blink command */
+static int iwl3945_led_not_solid(struct iwl3945_priv *priv, int led_id,
+                               u8 brightness)
+{
+        struct iwl3945_led_cmd led_cmd = {
+                .id = led_id,
+                .on = brightness,
+                .off = brightness,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+
+
+/*
+ * brightness call back function for Tx/Rx LED
+ */
+static int iwl3945_led_associated(struct iwl3945_priv *priv, int led_id)
+{
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
+            !test_bit(STATUS_READY, &priv->status))
+                return 0;
+
+
+        /* start counting Tx/Rx bytes */
+        if (!priv->last_blink_time && priv->allow_blinking)
+                priv->last_blink_time = jiffies;
+        return 0;
+}
+
+/*
+ * brightness call back for association and radio
+ */
+static void iwl3945_led_brightness_set(struct led_classdev *led_cdev,
+                                enum led_brightness brightness)
+{
+        struct iwl3945_led *led = container_of(led_cdev,
+                                               struct iwl3945_led, led_dev);
+        struct iwl3945_priv *priv = led->priv;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return;
+
+        switch (brightness) {
+        case LED_FULL:
+                if (led->type == IWL_LED_TRG_ASSOC) {
+                        priv->allow_blinking = 1;
+                        IWL_DEBUG_LED("MAC is  associated\n");
+                }
+                if (led->led_on)
+                        led->led_on(priv, IWL_LED_LINK);
+                break;
+        case LED_OFF:
+                if (led->type == IWL_LED_TRG_ASSOC) {
+                        priv->allow_blinking = 0;
+                        IWL_DEBUG_LED("MAC is disassociated\n");
+                }
+                if (led->led_off)
+                        led->led_off(priv, IWL_LED_LINK);
+                break;
+        default:
+                if (led->led_pattern)
+                        led->led_pattern(priv, IWL_LED_LINK, brightness);
+                break;
+        }
+}
+
+
+
+/*
+ * Register led class with the system
+ */
+static int iwl3945_led_register_led(struct iwl3945_priv *priv,
+                                   struct iwl3945_led *led,
+                                   enum led_type type, u8 set_led,
+                                   const char *name, char *trigger)
+{
+        struct device *device = wiphy_dev(priv->hw->wiphy);
+        int ret;
+
+        led->led_dev.name = name;
+        led->led_dev.brightness_set = iwl3945_led_brightness_set;
+        led->led_dev.default_trigger = trigger;
+
+        ret = led_classdev_register(device, &led->led_dev);
+        if (ret) {
+                IWL_ERROR("Error: failed to register led handler.\n");
+                return ret;
+        }
+
+        led->priv = priv;
+        led->type = type;
+        led->registered = 1;
+
+        if (set_led && led->led_on)
+                led->led_on(priv, IWL_LED_LINK);
+        return 0;
+}
+
+
+/*
+ * calculate blink rate according to last 2 sec Tx/Rx activities
+ */
+static inline u8 get_blink_rate(struct iwl3945_priv *priv)
+{
+        int index;
+        u8 blink_rate;
+
+        if (priv->rxtxpackets < IWL_LED_THRESHOLD)
+                index = 10;
+        else {
+                for (index = 0; index < IWL_MAX_BLINK_TBL; index++) {
+                        if (priv->rxtxpackets > (blink_tbl[index].brightness *
+                                                 IWL_1MB_RATE))
+                                break;
+                }
+        }
+        /* if 0 frame is transfered */
+        if ((index == IWL_MAX_BLINK_TBL) || !priv->allow_blinking)
+                blink_rate = IWL_LED_SOLID;
+        else
+                blink_rate = blink_tbl[index].on_time;
+
+        return blink_rate;
+}
+
+static inline int is_rf_kill(struct iwl3945_priv *priv)
+{
+        return test_bit(STATUS_RF_KILL_HW, &priv->status) ||
+                test_bit(STATUS_RF_KILL_SW, &priv->status);
+}
+
+/*
+ * this function called from handler. Since setting Led command can
+ * happen very frequent we postpone led command to be called from
+ * REPLY handler so we know ucode is up
+ */
+void iwl3945_led_background(struct iwl3945_priv *priv)
+{
+        u8 blink_rate;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
+                priv->last_blink_time = 0;
+                return;
+        }
+        if (is_rf_kill(priv)) {
+                priv->last_blink_time = 0;
+                return;
+        }
+
+        if (!priv->allow_blinking) {
+                priv->last_blink_time = 0;
+                if (priv->last_blink_rate != IWL_LED_SOLID) {
+                        priv->last_blink_rate = IWL_LED_SOLID;
+                        iwl3945_led_on(priv, IWL_LED_LINK);
+                }
+                return;
+        }
+        if (!priv->last_blink_time ||
+            !time_after(jiffies, priv->last_blink_time +
+                        msecs_to_jiffies(1000)))
+                return;
+
+        blink_rate = get_blink_rate(priv);
+
+        /* call only if blink rate change */
+        if (blink_rate != priv->last_blink_rate) {
+                if (blink_rate != IWL_LED_SOLID) {
+                        priv->last_blink_time = jiffies +
+                                                msecs_to_jiffies(1000);
+                        iwl3945_led_not_solid(priv, IWL_LED_LINK, blink_rate);
+                } else {
+                        priv->last_blink_time = 0;
+                        iwl3945_led_on(priv, IWL_LED_LINK);
+                }
+        }
+
+        priv->last_blink_rate = blink_rate;
+        priv->rxtxpackets = 0;
+}
+
+
+/* Register all led handler */
+int iwl3945_led_register(struct iwl3945_priv *priv)
+{
+        char *trigger;
+        char name[32];
+        int ret;
+
+        priv->last_blink_rate = 0;
+        priv->rxtxpackets = 0;
+        priv->last_blink_time = 0;
+        priv->allow_blinking = 0;
+
+        trigger = ieee80211_get_radio_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:radio",
+                 wiphy_name(priv->hw->wiphy));
+
+        priv->led[IWL_LED_TRG_RADIO].led_on = iwl3945_led_on_reg;
+        priv->led[IWL_LED_TRG_RADIO].led_off = iwl3945_led_off_reg;
+        priv->led[IWL_LED_TRG_RADIO].led_pattern = NULL;
+
+        ret = iwl3945_led_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_RADIO],
+                                   IWL_LED_TRG_RADIO, 1,
+                                   name, trigger);
+        if (ret)
+                goto exit_fail;
+
+        trigger = ieee80211_get_assoc_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:assoc",
+                 wiphy_name(priv->hw->wiphy));
+
+        ret = iwl3945_led_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_ASSOC],
+                                   IWL_LED_TRG_ASSOC, 0,
+                                   name, trigger);
+        /* for assoc always turn led on */
+        priv->led[IWL_LED_TRG_ASSOC].led_on = iwl3945_led_on_reg;
+        priv->led[IWL_LED_TRG_ASSOC].led_off = iwl3945_led_on_reg;
+        priv->led[IWL_LED_TRG_ASSOC].led_pattern = NULL;
+
+        if (ret)
+                goto exit_fail;
+
+        trigger = ieee80211_get_rx_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:RX",
+                 wiphy_name(priv->hw->wiphy));
+
+
+        ret = iwl3945_led_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_RX],
+                                   IWL_LED_TRG_RX, 0,
+                                   name, trigger);
+
+        priv->led[IWL_LED_TRG_RX].led_on = iwl3945_led_associated;
+        priv->led[IWL_LED_TRG_RX].led_off = iwl3945_led_associated;
+        priv->led[IWL_LED_TRG_RX].led_pattern = iwl3945_led_pattern;
+
+        if (ret)
+                goto exit_fail;
+
+        trigger = ieee80211_get_tx_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:TX",
+                 wiphy_name(priv->hw->wiphy));
+        ret = iwl3945_led_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_TX],
+                                   IWL_LED_TRG_TX, 0,
+                                   name, trigger);
+        priv->led[IWL_LED_TRG_TX].led_on = iwl3945_led_associated;
+        priv->led[IWL_LED_TRG_TX].led_off = iwl3945_led_associated;
+        priv->led[IWL_LED_TRG_TX].led_pattern = iwl3945_led_pattern;
+
+        if (ret)
+                goto exit_fail;
+
+        return 0;
+
+exit_fail:
+        iwl3945_led_unregister(priv);
+        return ret;
+}
+
+
+/* unregister led class */
+static void iwl3945_led_unregister_led(struct iwl3945_led *led, u8 set_led)
+{
+        if (!led->registered)
+                return;
+
+        led_classdev_unregister(&led->led_dev);
+
+        if (set_led)
+                led->led_dev.brightness_set(&led->led_dev, LED_OFF);
+        led->registered = 0;
+}
+
+/* Unregister all led handlers */
+void iwl3945_led_unregister(struct iwl3945_priv *priv)
+{
+        iwl3945_led_unregister_led(&priv->led[IWL_LED_TRG_ASSOC], 0);
+        iwl3945_led_unregister_led(&priv->led[IWL_LED_TRG_RX], 0);
+        iwl3945_led_unregister_led(&priv->led[IWL_LED_TRG_TX], 0);
+        iwl3945_led_unregister_led(&priv->led[IWL_LED_TRG_RADIO], 1);
+}
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.h b/drivers/net/wireless/iwlwifi/iwl-3945-led.h
new file mode 100644
index 000000000000..b1d2f6b8b259
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.h
@@ -0,0 +1,73 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#ifndef IWL3945_LEDS_H
+#define IWL3945_LEDS_H
+
+struct iwl3945_priv;
+
+#ifdef CONFIG_IWL3945_LEDS
+#define IWL_LED_SOLID 11
+#define IWL_LED_NAME_LEN 31
+#define IWL_DEF_LED_INTRVL __constant_cpu_to_le32(1000)
+
+#define IWL_LED_ACTIVITY       (0<<1)
+#define IWL_LED_LINK           (1<<1)
+
+enum led_type {
+        IWL_LED_TRG_TX,
+        IWL_LED_TRG_RX,
+        IWL_LED_TRG_ASSOC,
+        IWL_LED_TRG_RADIO,
+        IWL_LED_TRG_MAX,
+};
+
+#include <linux/leds.h>
+
+struct iwl3945_led {
+        struct iwl3945_priv *priv;
+        struct led_classdev led_dev;
+
+        int (*led_on) (struct iwl3945_priv *priv, int led_id);
+        int (*led_off) (struct iwl3945_priv *priv, int led_id);
+        int (*led_pattern) (struct iwl3945_priv *priv, int led_id,
+                            enum led_brightness brightness);
+
+        enum led_type type;
+        unsigned int registered;
+};
+
+extern int iwl3945_led_register(struct iwl3945_priv *priv);
+extern void iwl3945_led_unregister(struct iwl3945_priv *priv);
+extern void iwl3945_led_background(struct iwl3945_priv *priv);
+
+#else
+static inline int iwl3945_led_register(struct iwl3945_priv *priv) { return 0; }
+static inline void iwl3945_led_unregister(struct iwl3945_priv *priv) {}
+static inline void iwl3945_led_background(struct iwl3945_priv *priv) {}
+#endif /* CONFIG_IWL3945_LEDS */
+
+#endif /* IWL3945_LEDS_H */
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 80d31ae51e77..85c22641542d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -37,7 +37,7 @@
 
 #include <linux/workqueue.h>
 
-#include "../net/mac80211/ieee80211_rate.h"
+#include "../net/mac80211/rate.h"
 
 #include "iwl-3945.h"
 
@@ -100,14 +100,6 @@ static struct iwl3945_tpt_entry iwl3945_tpt_table_a[] = {
         {-89, IWL_RATE_6M_INDEX}
 };
 
-static struct iwl3945_tpt_entry iwl3945_tpt_table_b[] = {
-        {-86, IWL_RATE_11M_INDEX},
-        {-88, IWL_RATE_5M_INDEX},
-        {-90, IWL_RATE_2M_INDEX},
-        {-92, IWL_RATE_1M_INDEX}
-
-};
-
 static struct iwl3945_tpt_entry iwl3945_tpt_table_g[] = {
         {-60, IWL_RATE_54M_INDEX},
         {-64, IWL_RATE_48M_INDEX},
@@ -129,7 +121,7 @@ static struct iwl3945_tpt_entry iwl3945_tpt_table_g[] = {
 #define IWL_RATE_MIN_SUCCESS_TH       8
 #define IWL_RATE_DECREASE_TH       1920
 
-static u8 iwl3945_get_rate_index_by_rssi(s32 rssi, u8 mode)
+static u8 iwl3945_get_rate_index_by_rssi(s32 rssi, enum ieee80211_band band)
 {
         u32 index = 0;
         u32 table_size = 0;
@@ -138,21 +130,19 @@ static u8 iwl3945_get_rate_index_by_rssi(s32 rssi, u8 mode)
         if ((rssi < IWL_MIN_RSSI_VAL) || (rssi > IWL_MAX_RSSI_VAL))
                 rssi = IWL_MIN_RSSI_VAL;
 
-        switch (mode) {
-        case MODE_IEEE80211G:
+        switch (band) {
+        case IEEE80211_BAND_2GHZ:
                 tpt_table = iwl3945_tpt_table_g;
                 table_size = ARRAY_SIZE(iwl3945_tpt_table_g);
                 break;
 
-        case MODE_IEEE80211A:
+        case IEEE80211_BAND_5GHZ:
                 tpt_table = iwl3945_tpt_table_a;
                 table_size = ARRAY_SIZE(iwl3945_tpt_table_a);
                 break;
 
         default:
-        case MODE_IEEE80211B:
-                tpt_table = iwl3945_tpt_table_b;
-                table_size = ARRAY_SIZE(iwl3945_tpt_table_b);
+                BUG();
                 break;
         }
 
@@ -168,9 +158,9 @@ static void iwl3945_clear_window(struct iwl3945_rate_scale_data *window)
 {
         window->data = 0;
         window->success_counter = 0;
-        window->success_ratio = IWL_INVALID_VALUE;
+        window->success_ratio = -1;
         window->counter = 0;
-        window->average_tpt = IWL_INVALID_VALUE;
+        window->average_tpt = IWL_INV_TPT;
         window->stamp = 0;
 }
 
@@ -340,17 +330,17 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
          * after assoc.. */
 
         for (i = IWL_RATE_COUNT - 1; i >= 0; i--) {
-                if (sta->supp_rates & (1 << i)) {
-                        sta->txrate = i;
+                if (sta->supp_rates[local->hw.conf.channel->band] & (1 << i)) {
+                        sta->txrate_idx = i;
                         break;
                 }
         }
 
-        sta->last_txrate = sta->txrate;
+        sta->last_txrate_idx = sta->txrate_idx;
 
-        /* For MODE_IEEE80211A mode it start at IWL_FIRST_OFDM_RATE */
-        if (local->hw.conf.phymode == MODE_IEEE80211A)
-                sta->last_txrate += IWL_FIRST_OFDM_RATE;
+        /* For 5 GHz band it start at IWL_FIRST_OFDM_RATE */
+        if (local->hw.conf.channel->band == IEEE80211_BAND_5GHZ)
+                sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
 
         IWL_DEBUG_RATE("leave\n");
 }
@@ -429,17 +419,19 @@ static int rs_adjust_next_rate(struct iwl3945_priv *priv, int rate)
 {
         int next_rate = iwl3945_get_prev_ieee_rate(rate);
 
-        switch (priv->phymode) {
-        case MODE_IEEE80211A:
+        switch (priv->band) {
+        case IEEE80211_BAND_5GHZ:
                 if (rate == IWL_RATE_12M_INDEX)
                         next_rate = IWL_RATE_9M_INDEX;
                 else if (rate == IWL_RATE_6M_INDEX)
                         next_rate = IWL_RATE_6M_INDEX;
                 break;
+/* XXX cannot be invoked in current mac80211 so not a regression
         case MODE_IEEE80211B:
                 if (rate == IWL_RATE_11M_INDEX_TABLE)
                         next_rate = IWL_RATE_5M_INDEX_TABLE;
                 break;
+ */
         default:
                 break;
         }
@@ -465,22 +457,25 @@ static void rs_tx_status(void *priv_rate,
         struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_rate;
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct iwl3945_rs_sta *rs_sta;
+        struct ieee80211_supported_band *sband;
 
         IWL_DEBUG_RATE("enter\n");
 
-        retries = tx_resp->retry_count;
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
 
-        first_index = tx_resp->control.tx_rate;
+
+        retries = tx_resp->retry_count;
+        first_index = tx_resp->control.tx_rate->hw_value;
         if ((first_index < 0) || (first_index >= IWL_RATE_COUNT)) {
-                IWL_DEBUG_RATE("leave: Rate out of bounds: %0x for %d\n",
-                               tx_resp->control.tx_rate, first_index);
+                IWL_DEBUG_RATE("leave: Rate out of bounds: %d\n", first_index);
                 return;
         }
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, hdr->addr1);
         if (!sta || !sta->rate_ctrl_priv) {
-                if (sta)
-                        sta_info_put(sta);
+                rcu_read_unlock();
                 IWL_DEBUG_RATE("leave: No STA priv data to update!\n");
                 return;
         }
@@ -553,7 +548,7 @@ static void rs_tx_status(void *priv_rate,
 
         spin_unlock_irqrestore(&rs_sta->lock, flags);
 
-        sta_info_put(sta);
+        rcu_read_unlock();
 
         IWL_DEBUG_RATE("leave\n");
 
@@ -561,14 +556,14 @@ static void rs_tx_status(void *priv_rate,
 }
 
 static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
-                                 u8 index, u16 rate_mask, int phymode)
+                                 u8 index, u16 rate_mask, enum ieee80211_band band)
 {
         u8 high = IWL_RATE_INVALID;
         u8 low = IWL_RATE_INVALID;
 
         /* 802.11A walks to the next literal adjacent rate in
          * the rate table */
-        if (unlikely(phymode == MODE_IEEE80211A)) {
+        if (unlikely(band == IEEE80211_BAND_5GHZ)) {
                 int i;
                 u32 mask;
 
@@ -639,7 +634,8 @@ static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
  *
  */
 static void rs_get_rate(void *priv_rate, struct net_device *dev,
-                        struct ieee80211_hw_mode *mode, struct sk_buff *skb,
+                        struct ieee80211_supported_band *sband,
+                        struct sk_buff *skb,
                         struct rate_selection *sel)
 {
         u8 low = IWL_RATE_INVALID;
@@ -648,9 +644,9 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         int index;
         struct iwl3945_rs_sta *rs_sta;
         struct iwl3945_rate_scale_data *window = NULL;
-        int current_tpt = IWL_INVALID_VALUE;
-        int low_tpt = IWL_INVALID_VALUE;
-        int high_tpt = IWL_INVALID_VALUE;
+        int current_tpt = IWL_INV_TPT;
+        int low_tpt = IWL_INV_TPT;
+        int high_tpt = IWL_INV_TPT;
         u32 fail_count;
         s8 scale_action = 0;
         unsigned long flags;
@@ -663,6 +659,8 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
 
         IWL_DEBUG_RATE("enter\n");
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, hdr->addr1);
 
         /* Send management frames and broadcast/multicast data using lowest
@@ -672,16 +670,15 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
             is_multicast_ether_addr(hdr->addr1) ||
             !sta || !sta->rate_ctrl_priv) {
                 IWL_DEBUG_RATE("leave: No STA priv data to update!\n");
-                sel->rate = rate_lowest(local, local->oper_hw_mode, sta);
-                if (sta)
-                        sta_info_put(sta);
+                sel->rate = rate_lowest(local, sband, sta);
+                rcu_read_unlock();
                 return;
         }
 
-        rate_mask = sta->supp_rates;
-        index = min(sta->last_txrate & 0xffff, IWL_RATE_COUNT - 1);
+        rate_mask = sta->supp_rates[sband->band];
+        index = min(sta->last_txrate_idx & 0xffff, IWL_RATE_COUNT - 1);
 
-        if (priv->phymode == (u8) MODE_IEEE80211A)
+        if (sband->band == IEEE80211_BAND_5GHZ)
                 rate_mask = rate_mask << IWL_FIRST_OFDM_RATE;
 
         rs_sta = (void *)sta->rate_ctrl_priv;
@@ -713,7 +710,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
 
         if (((fail_count <= IWL_RATE_MIN_FAILURE_TH) &&
              (window->success_counter < IWL_RATE_MIN_SUCCESS_TH))) {
-                window->average_tpt = IWL_INVALID_VALUE;
+                window->average_tpt = IWL_INV_TPT;
                 spin_unlock_irqrestore(&rs_sta->lock, flags);
 
                 IWL_DEBUG_RATE("Invalid average_tpt on rate %d: "
@@ -732,7 +729,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         current_tpt = window->average_tpt;
 
         high_low = iwl3945_get_adjacent_rate(rs_sta, index, rate_mask,
-                                         local->hw.conf.phymode);
+                                             sband->band);
         low = high_low & 0xff;
         high = (high_low >> 8) & 0xff;
 
@@ -749,19 +746,16 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         if ((window->success_ratio < IWL_RATE_DECREASE_TH) || !current_tpt) {
                 IWL_DEBUG_RATE("decrease rate because of low success_ratio\n");
                 scale_action = -1;
-        } else if ((low_tpt == IWL_INVALID_VALUE) &&
-                   (high_tpt == IWL_INVALID_VALUE))
+        } else if ((low_tpt == IWL_INV_TPT) && (high_tpt == IWL_INV_TPT))
                 scale_action = 1;
-        else if ((low_tpt != IWL_INVALID_VALUE) &&
-                   (high_tpt != IWL_INVALID_VALUE)
-                   && (low_tpt < current_tpt)
-                   && (high_tpt < current_tpt)) {
+        else if ((low_tpt != IWL_INV_TPT) && (high_tpt != IWL_INV_TPT) &&
+                 (low_tpt < current_tpt) && (high_tpt < current_tpt)) {
                 IWL_DEBUG_RATE("No action -- low [%d] & high [%d] < "
                                "current_tpt [%d]\n",
                                low_tpt, high_tpt, current_tpt);
                 scale_action = 0;
         } else {
-                if (high_tpt != IWL_INVALID_VALUE) {
+                if (high_tpt != IWL_INV_TPT) {
                         if (high_tpt > current_tpt)
                                 scale_action = 1;
                         else {
@@ -769,7 +763,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
                                     ("decrease rate because of high tpt\n");
                                 scale_action = -1;
                         }
-                } else if (low_tpt != IWL_INVALID_VALUE) {
+                } else if (low_tpt != IWL_INV_TPT) {
                         if (low_tpt > current_tpt) {
                                 IWL_DEBUG_RATE
                                     ("decrease rate because of low tpt\n");
@@ -810,17 +804,17 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
 
  out:
 
-        sta->last_txrate = index;
-        if (priv->phymode == (u8) MODE_IEEE80211A)
-                sta->txrate = sta->last_txrate - IWL_FIRST_OFDM_RATE;
+        sta->last_txrate_idx = index;
+        if (sband->band == IEEE80211_BAND_5GHZ)
+                sta->txrate_idx = sta->last_txrate_idx - IWL_FIRST_OFDM_RATE;
         else
-                sta->txrate = sta->last_txrate;
+                sta->txrate_idx = sta->last_txrate_idx;
 
-        sta_info_put(sta);
+        rcu_read_unlock();
 
         IWL_DEBUG_RATE("leave: %d\n", index);
 
-        sel->rate = &priv->ieee_rates[index];
+        sel->rate = &sband->bitrates[sta->txrate_idx];
 }
 
 static struct rate_control_ops rs_ops = {
@@ -848,13 +842,15 @@ int iwl3945_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
         unsigned long now = jiffies;
         u32 max_time = 0;
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, priv->stations[sta_id].sta.sta.addr);
         if (!sta || !sta->rate_ctrl_priv) {
-                if (sta) {
-                        sta_info_put(sta);
+                if (sta)
                         IWL_DEBUG_RATE("leave - no private rate data!\n");
-                } else
+                else
                         IWL_DEBUG_RATE("leave - no station!\n");
+                rcu_read_unlock();
                 return sprintf(buf, "station %d not found\n", sta_id);
         }
 
@@ -895,7 +891,7 @@ int iwl3945_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
                 i = j;
         }
         spin_unlock_irqrestore(&rs_sta->lock, flags);
-        sta_info_put(sta);
+        rcu_read_unlock();
 
         /* Display the average rate of all samples taken.
          *
@@ -932,11 +928,12 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
                 return;
         }
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, priv->stations[sta_id].sta.sta.addr);
         if (!sta || !sta->rate_ctrl_priv) {
-                if (sta)
-                        sta_info_put(sta);
                 IWL_DEBUG_RATE("leave - no private rate data!\n");
+                rcu_read_unlock();
                 return;
         }
 
@@ -945,8 +942,9 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
         spin_lock_irqsave(&rs_sta->lock, flags);
 
         rs_sta->tgg = 0;
-        switch (priv->phymode) {
-        case MODE_IEEE80211G:
+        switch (priv->band) {
+        case IEEE80211_BAND_2GHZ:
+                /* TODO: this always does G, not a regression */
                 if (priv->active_rxon.flags & RXON_FLG_TGG_PROTECT_MSK) {
                         rs_sta->tgg = 1;
                         rs_sta->expected_tpt = iwl3945_expected_tpt_g_prot;
@@ -954,18 +952,15 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
                         rs_sta->expected_tpt = iwl3945_expected_tpt_g;
                 break;
 
-        case MODE_IEEE80211A:
+        case IEEE80211_BAND_5GHZ:
                 rs_sta->expected_tpt = iwl3945_expected_tpt_a;
                 break;
-
-        default:
-                IWL_WARNING("Invalid phymode.  Defaulting to 802.11b\n");
-        case MODE_IEEE80211B:
-                rs_sta->expected_tpt = iwl3945_expected_tpt_b;
+        case IEEE80211_NUM_BANDS:
+                BUG();
                 break;
         }
 
-        sta_info_put(sta);
+        rcu_read_unlock();
         spin_unlock_irqrestore(&rs_sta->lock, flags);
 
         rssi = priv->last_rx_rssi;
@@ -974,20 +969,19 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
 
         IWL_DEBUG(IWL_DL_INFO | IWL_DL_RATE, "Network RSSI: %d\n", rssi);
 
-        rs_sta->start_rate =
-                        iwl3945_get_rate_index_by_rssi(rssi, priv->phymode);
+        rs_sta->start_rate = iwl3945_get_rate_index_by_rssi(rssi, priv->band);
 
         IWL_DEBUG_RATE("leave: rssi %d assign rate index: "
                        "%d (plcp 0x%x)\n", rssi, rs_sta->start_rate,
                        iwl3945_rates[rs_sta->start_rate].plcp);
 }
 
-void iwl3945_rate_control_register(struct ieee80211_hw *hw)
+int iwl3945_rate_control_register(void)
 {
-        ieee80211_rate_control_register(&rs_ops);
+        return ieee80211_rate_control_register(&rs_ops);
 }
 
-void iwl3945_rate_control_unregister(struct ieee80211_hw *hw)
+void iwl3945_rate_control_unregister(void)
 {
         ieee80211_rate_control_unregister(&rs_ops);
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.h b/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
index d5e9220f871d..f085d330bdcf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -36,8 +36,8 @@ struct iwl3945_rate_info {
         u8 next_rs;             /* next rate used in rs algo */
         u8 prev_rs_tgg;         /* previous rate used in TGG rs algo */
         u8 next_rs_tgg;         /* next rate used in TGG rs algo */
-        u8 table_rs_index;      /* index in rate scale table cmd */
-        u8 prev_table_rs;       /* prev in rate table cmd */
+        u8 table_rs_index;      /* index in rate scale table cmd */
+        u8 prev_table_rs;       /* prev in rate table cmd */
 };
 
 /*
@@ -159,7 +159,7 @@ enum {
 
 #define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1)
 
-#define IWL_INVALID_VALUE    -1
+#define IWL_INV_TPT    -1
 
 #define IWL_MIN_RSSI_VAL                 -100
 #define IWL_MAX_RSSI_VAL                    0
@@ -202,7 +202,7 @@ extern void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
  * ieee80211_register_hw
  *
  */
-extern void iwl3945_rate_control_register(struct ieee80211_hw *hw);
+extern int iwl3945_rate_control_register(void);
 
 /**
  * iwl3945_rate_control_unregister - Unregister the rate control callbacks
@@ -210,6 +210,6 @@ extern void iwl3945_rate_control_register(struct ieee80211_hw *hw);
  * This should be called after calling ieee80211_unregister_hw, but before
  * the driver is unloaded.
  */
-extern void iwl3945_rate_control_unregister(struct ieee80211_hw *hw);
+extern void iwl3945_rate_control_unregister(void);
 
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 8d4d91d35fd2..598e4eef4f40 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -39,6 +39,7 @@
 #include <asm/unaligned.h>
 #include <net/mac80211.h>
 
+#include "iwl-3945-core.h"
 #include "iwl-3945.h"
 #include "iwl-helpers.h"
 #include "iwl-3945-rs.h"
@@ -183,6 +184,16 @@ void iwl3945_disable_events(struct iwl3945_priv *priv)
 
 }
 
+static int iwl3945_hwrate_to_plcp_idx(u8 plcp)
+{
+        int idx;
+
+        for (idx = 0; idx < IWL_RATE_COUNT; idx++)
+                if (iwl3945_rates[idx].plcp == plcp)
+                        return idx;
+        return -1;
+}
+
 /**
  * iwl3945_get_antenna_flags - Get antenna flags for RXON command
  * @priv: eeprom and antenna fields are used to determine antenna flags
@@ -216,14 +227,126 @@ __le32 iwl3945_get_antenna_flags(const struct iwl3945_priv *priv)
         return 0;               /* "diversity" is default if error */
 }
 
+#ifdef CONFIG_IWL3945_DEBUG
+#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x
+
+static const char *iwl3945_get_tx_fail_reason(u32 status)
+{
+        switch (status & TX_STATUS_MSK) {
+        case TX_STATUS_SUCCESS:
+                return "SUCCESS";
+                TX_STATUS_ENTRY(SHORT_LIMIT);
+                TX_STATUS_ENTRY(LONG_LIMIT);
+                TX_STATUS_ENTRY(FIFO_UNDERRUN);
+                TX_STATUS_ENTRY(MGMNT_ABORT);
+                TX_STATUS_ENTRY(NEXT_FRAG);
+                TX_STATUS_ENTRY(LIFE_EXPIRE);
+                TX_STATUS_ENTRY(DEST_PS);
+                TX_STATUS_ENTRY(ABORTED);
+                TX_STATUS_ENTRY(BT_RETRY);
+                TX_STATUS_ENTRY(STA_INVALID);
+                TX_STATUS_ENTRY(FRAG_DROPPED);
+                TX_STATUS_ENTRY(TID_DISABLE);
+                TX_STATUS_ENTRY(FRAME_FLUSHED);
+                TX_STATUS_ENTRY(INSUFFICIENT_CF_POLL);
+                TX_STATUS_ENTRY(TX_LOCKED);
+                TX_STATUS_ENTRY(NO_BEACON_ON_RADAR);
+        }
+
+        return "UNKNOWN";
+}
+#else
+static inline const char *iwl3945_get_tx_fail_reason(u32 status)
+{
+        return "";
+}
+#endif
+
+
+/**
+ * iwl3945_tx_queue_reclaim - Reclaim Tx queue entries already Tx'd
+ *
+ * When FW advances 'R' index, all entries between old and new 'R' index
+ * need to be reclaimed. As result, some free space forms. If there is
+ * enough free space (> low mark), wake the stack that feeds us.
+ */
+static void iwl3945_tx_queue_reclaim(struct iwl3945_priv *priv,
+                                     int txq_id, int index)
+{
+        struct iwl3945_tx_queue *txq = &priv->txq[txq_id];
+        struct iwl3945_queue *q = &txq->q;
+        struct iwl3945_tx_info *tx_info;
+
+        BUG_ON(txq_id == IWL_CMD_QUEUE_NUM);
+
+        for (index = iwl_queue_inc_wrap(index, q->n_bd); q->read_ptr != index;
+                q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
+
+                tx_info = &txq->txb[txq->q.read_ptr];
+                ieee80211_tx_status_irqsafe(priv->hw, tx_info->skb[0],
+                                            &tx_info->status);
+                tx_info->skb[0] = NULL;
+                iwl3945_hw_txq_free_tfd(priv, txq);
+        }
+
+        if (iwl3945_queue_space(q) > q->low_mark && (txq_id >= 0) &&
+                        (txq_id != IWL_CMD_QUEUE_NUM) &&
+                        priv->mac80211_registered)
+                ieee80211_wake_queue(priv->hw, txq_id);
+}
+
+/**
+ * iwl3945_rx_reply_tx - Handle Tx response
+ */
+static void iwl3945_rx_reply_tx(struct iwl3945_priv *priv,
+                            struct iwl3945_rx_mem_buffer *rxb)
+{
+        struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data;
+        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
+        int txq_id = SEQ_TO_QUEUE(sequence);
+        int index = SEQ_TO_INDEX(sequence);
+        struct iwl3945_tx_queue *txq = &priv->txq[txq_id];
+        struct ieee80211_tx_status *tx_status;
+        struct iwl3945_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
+        u32  status = le32_to_cpu(tx_resp->status);
+        int rate_idx;
+
+        if ((index >= txq->q.n_bd) || (iwl3945_x2_queue_used(&txq->q, index) == 0)) {
+                IWL_ERROR("Read index for DMA queue txq_id (%d) index %d "
+                          "is out of range [0-%d] %d %d\n", txq_id,
+                          index, txq->q.n_bd, txq->q.write_ptr,
+                          txq->q.read_ptr);
+                return;
+        }
+
+        tx_status = &(txq->txb[txq->q.read_ptr].status);
+
+        tx_status->retry_count = tx_resp->failure_frame;
+        /* tx_status->rts_retry_count = tx_resp->failure_rts; */
+        tx_status->flags = ((status & TX_STATUS_MSK) == TX_STATUS_SUCCESS) ?
+                                IEEE80211_TX_STATUS_ACK : 0;
+
+        IWL_DEBUG_TX("Tx queue %d Status %s (0x%08x) plcp rate %d retries %d\n",
+                        txq_id, iwl3945_get_tx_fail_reason(status), status,
+                        tx_resp->rate, tx_resp->failure_frame);
+
+        rate_idx = iwl3945_hwrate_to_plcp_idx(tx_resp->rate);
+        tx_status->control.tx_rate = &priv->ieee_rates[rate_idx];
+        IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index);
+        iwl3945_tx_queue_reclaim(priv, txq_id, index);
+
+        if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
+                IWL_ERROR("TODO:  Implement Tx ABORT REQUIRED!!!\n");
+}
+
+
+
 /*****************************************************************************
  *
  * Intel PRO/Wireless 3945ABG/BG Network Connection
  *
  *  RX handler implementations
  *
- *  Used by iwl-base.c
- *
  *****************************************************************************/
 
 void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, struct iwl3945_rx_mem_buffer *rxb)
@@ -235,9 +358,161 @@ void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, struct iwl3945_rx_mem_b
 
         memcpy(&priv->statistics, pkt->u.raw, sizeof(priv->statistics));
 
+        iwl3945_led_background(priv);
+
         priv->last_statistics_time = jiffies;
 }
 
+/******************************************************************************
+ *
+ * Misc. internal state and helper functions
+ *
+ ******************************************************************************/
+#ifdef CONFIG_IWL3945_DEBUG
+
+/**
+ * iwl3945_report_frame - dump frame to syslog during debug sessions
+ *
+ * You may hack this function to show different aspects of received frames,
+ * including selective frame dumps.
+ * group100 parameter selects whether to show 1 out of 100 good frames.
+ */
+static void iwl3945_dbg_report_frame(struct iwl3945_priv *priv,
+                      struct iwl3945_rx_packet *pkt,
+                      struct ieee80211_hdr *header, int group100)
+{
+        u32 to_us;
+        u32 print_summary = 0;
+        u32 print_dump = 0;     /* set to 1 to dump all frames' contents */
+        u32 hundred = 0;
+        u32 dataframe = 0;
+        u16 fc;
+        u16 seq_ctl;
+        u16 channel;
+        u16 phy_flags;
+        u16 length;
+        u16 status;
+        u16 bcn_tmr;
+        u32 tsf_low;
+        u64 tsf;
+        u8 rssi;
+        u8 agc;
+        u16 sig_avg;
+        u16 noise_diff;
+        struct iwl3945_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);
+        struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
+        struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);
+        u8 *data = IWL_RX_DATA(pkt);
+
+        /* MAC header */
+        fc = le16_to_cpu(header->frame_control);
+        seq_ctl = le16_to_cpu(header->seq_ctrl);
+
+        /* metadata */
+        channel = le16_to_cpu(rx_hdr->channel);
+        phy_flags = le16_to_cpu(rx_hdr->phy_flags);
+        length = le16_to_cpu(rx_hdr->len);
+
+        /* end-of-frame status and timestamp */
+        status = le32_to_cpu(rx_end->status);
+        bcn_tmr = le32_to_cpu(rx_end->beacon_timestamp);
+        tsf_low = le64_to_cpu(rx_end->timestamp) & 0x0ffffffff;
+        tsf = le64_to_cpu(rx_end->timestamp);
+
+        /* signal statistics */
+        rssi = rx_stats->rssi;
+        agc = rx_stats->agc;
+        sig_avg = le16_to_cpu(rx_stats->sig_avg);
+        noise_diff = le16_to_cpu(rx_stats->noise_diff);
+
+        to_us = !compare_ether_addr(header->addr1, priv->mac_addr);
+
+        /* if data frame is to us and all is good,
+         *   (optionally) print summary for only 1 out of every 100 */
+        if (to_us && (fc & ~IEEE80211_FCTL_PROTECTED) ==
+            (IEEE80211_FCTL_FROMDS | IEEE80211_FTYPE_DATA)) {
+                dataframe = 1;
+                if (!group100)
+                        print_summary = 1;      /* print each frame */
+                else if (priv->framecnt_to_us < 100) {
+                        priv->framecnt_to_us++;
+                        print_summary = 0;
+                } else {
+                        priv->framecnt_to_us = 0;
+                        print_summary = 1;
+                        hundred = 1;
+                }
+        } else {
+                /* print summary for all other frames */
+                print_summary = 1;
+        }
+
+        if (print_summary) {
+                char *title;
+                u32 rate;
+
+                if (hundred)
+                        title = "100Frames";
+                else if (fc & IEEE80211_FCTL_RETRY)
+                        title = "Retry";
+                else if (ieee80211_is_assoc_response(fc))
+                        title = "AscRsp";
+                else if (ieee80211_is_reassoc_response(fc))
+                        title = "RasRsp";
+                else if (ieee80211_is_probe_response(fc)) {
+                        title = "PrbRsp";
+                        print_dump = 1; /* dump frame contents */
+                } else if (ieee80211_is_beacon(fc)) {
+                        title = "Beacon";
+                        print_dump = 1; /* dump frame contents */
+                } else if (ieee80211_is_atim(fc))
+                        title = "ATIM";
+                else if (ieee80211_is_auth(fc))
+                        title = "Auth";
+                else if (ieee80211_is_deauth(fc))
+                        title = "DeAuth";
+                else if (ieee80211_is_disassoc(fc))
+                        title = "DisAssoc";
+                else
+                        title = "Frame";
+
+                rate = iwl3945_hwrate_to_plcp_idx(rx_hdr->rate);
+                if (rate == -1)
+                        rate = 0;
+                else
+                        rate = iwl3945_rates[rate].ieee / 2;
+
+                /* print frame summary.
+                 * MAC addresses show just the last byte (for brevity),
+                 *    but you can hack it to show more, if you'd like to. */
+                if (dataframe)
+                        IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "
+                                     "len=%u, rssi=%d, chnl=%d, rate=%u, \n",
+                                     title, fc, header->addr1[5],
+                                     length, rssi, channel, rate);
+                else {
+                        /* src/dst addresses assume managed mode */
+                        IWL_DEBUG_RX("%s: 0x%04x, dst=0x%02x, "
+                                     "src=0x%02x, rssi=%u, tim=%lu usec, "
+                                     "phy=0x%02x, chnl=%d\n",
+                                     title, fc, header->addr1[5],
+                                     header->addr3[5], rssi,
+                                     tsf_low - priv->scan_start_tsf,
+                                     phy_flags, channel);
+                }
+        }
+        if (print_dump)
+                iwl3945_print_hex_dump(IWL_DL_RX, data, length);
+}
+#else
+static inline void iwl3945_dbg_report_frame(struct iwl3945_priv *priv,
+                      struct iwl3945_rx_packet *pkt,
+                      struct ieee80211_hdr *header, int group100)
+{
+}
+#endif
+
+
 static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
                                  struct sk_buff *skb,
                                  struct iwl3945_rx_frame_hdr *rx_hdr,
@@ -247,9 +522,9 @@ static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
          * the information provided in the skb from the hardware */
         s8 signal = stats->ssi;
         s8 noise = 0;
-        int rate = stats->rate;
+        int rate = stats->rate_idx;
         u64 tsf = stats->mactime;
-        __le16 phy_flags_hw = rx_hdr->phy_flags;
+        __le16 phy_flags_hw = rx_hdr->phy_flags, antenna;
 
         struct iwl3945_rt_rx_hdr {
                 struct ieee80211_radiotap_header rt_hdr;
@@ -315,15 +590,14 @@ static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
                                           IEEE80211_CHAN_2GHZ),
                               &iwl3945_rt->rt_chbitmask);
 
-        rate = iwl3945_rate_index_from_plcp(rate);
         if (rate == -1)
                 iwl3945_rt->rt_rate = 0;
         else
                 iwl3945_rt->rt_rate = iwl3945_rates[rate].ieee;
 
         /* antenna number */
-        iwl3945_rt->rt_antenna =
-                le16_to_cpu(phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4;
+        antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK;
+        iwl3945_rt->rt_antenna = le16_to_cpu(antenna) >> 4;
 
         /* set the preamble flag if we have it */
         if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)
@@ -368,6 +642,10 @@ static void iwl3945_handle_data_packet(struct iwl3945_priv *priv, int is_data,
         if (priv->add_radiotap)
                 iwl3945_add_radiotap(priv, rxb->skb, rx_hdr, stats);
 
+#ifdef CONFIG_IWL3945_LEDS
+        if (is_data)
+                priv->rxtxpackets += len;
+#endif
         ieee80211_rx_irqsafe(priv->hw, rxb->skb, stats);
         rxb->skb = NULL;
 }
@@ -377,25 +655,28 @@ static void iwl3945_handle_data_packet(struct iwl3945_priv *priv, int is_data,
 static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                                 struct iwl3945_rx_mem_buffer *rxb)
 {
+        struct ieee80211_hdr *header;
+        struct ieee80211_rx_status rx_status;
         struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data;
         struct iwl3945_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);
         struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
         struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);
-        struct ieee80211_hdr *header;
+        int snr;
         u16 rx_stats_sig_avg = le16_to_cpu(rx_stats->sig_avg);
         u16 rx_stats_noise_diff = le16_to_cpu(rx_stats->noise_diff);
-        struct ieee80211_rx_status stats = {
-                .mactime = le64_to_cpu(rx_end->timestamp),
-                .freq = ieee80211chan2mhz(le16_to_cpu(rx_hdr->channel)),
-                .channel = le16_to_cpu(rx_hdr->channel),
-                .phymode = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
-                MODE_IEEE80211G : MODE_IEEE80211A,
-                .antenna = 0,
-                .rate = rx_hdr->rate,
-                .flag = 0,
-        };
         u8 network_packet;
-        int snr;
+
+        rx_status.antenna = 0;
+        rx_status.flag = 0;
+        rx_status.mactime = le64_to_cpu(rx_end->timestamp);
+        rx_status.freq =
+                ieee80211_frequency_to_channel(le16_to_cpu(rx_hdr->channel));
+        rx_status.band = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
+                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+
+        rx_status.rate_idx = iwl3945_hwrate_to_plcp_idx(rx_hdr->rate);
+        if (rx_status.band == IEEE80211_BAND_5GHZ)
+                rx_status.rate_idx -= IWL_FIRST_OFDM_RATE;
 
         if ((unlikely(rx_stats->phy_count > 20))) {
                 IWL_DEBUG_DROP
@@ -411,12 +692,12 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
         }
 
         if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
-                iwl3945_handle_data_packet(priv, 1, rxb, &stats);
+                iwl3945_handle_data_packet(priv, 1, rxb, &rx_status);
                 return;
         }
 
         /* Convert 3945's rssi indicator to dBm */
-        stats.ssi = rx_stats->rssi - IWL_RSSI_OFFSET;
+        rx_status.ssi = rx_stats->rssi - IWL_RSSI_OFFSET;
 
         /* Set default noise value to -127 */
         if (priv->last_rx_noise == 0)
@@ -432,51 +713,47 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
          *   signal-to-noise ratio (SNR) is (sig_avg / noise_diff).
          * Convert linear SNR to dB SNR, then subtract that from rssi dBm
          *   to obtain noise level in dBm.
-         * Calculate stats.signal (quality indicator in %) based on SNR. */
+         * Calculate rx_status.signal (quality indicator in %) based on SNR. */
         if (rx_stats_noise_diff) {
                 snr = rx_stats_sig_avg / rx_stats_noise_diff;
-                stats.noise = stats.ssi - iwl3945_calc_db_from_ratio(snr);
-                stats.signal = iwl3945_calc_sig_qual(stats.ssi, stats.noise);
+                rx_status.noise = rx_status.ssi -
+                                        iwl3945_calc_db_from_ratio(snr);
+                rx_status.signal = iwl3945_calc_sig_qual(rx_status.ssi,
+                                                         rx_status.noise);
 
         /* If noise info not available, calculate signal quality indicator (%)
          *   using just the dBm signal level. */
         } else {
-                stats.noise = priv->last_rx_noise;
-                stats.signal = iwl3945_calc_sig_qual(stats.ssi, 0);
+                rx_status.noise = priv->last_rx_noise;
+                rx_status.signal = iwl3945_calc_sig_qual(rx_status.ssi, 0);
         }
 
 
         IWL_DEBUG_STATS("Rssi %d noise %d qual %d sig_avg %d noise_diff %d\n",
-                        stats.ssi, stats.noise, stats.signal,
+                        rx_status.ssi, rx_status.noise, rx_status.signal,
                         rx_stats_sig_avg, rx_stats_noise_diff);
 
-        stats.freq = ieee80211chan2mhz(stats.channel);
-
-        /* can be covered by iwl3945_report_frame() in most cases */
-/*      IWL_DEBUG_RX("RX status: 0x%08X\n", rx_end->status); */
-
         header = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);
 
         network_packet = iwl3945_is_network_packet(priv, header);
 
-#ifdef CONFIG_IWL3945_DEBUG
-        if (iwl3945_debug_level & IWL_DL_STATS && net_ratelimit())
-                IWL_DEBUG_STATS
-                    ("[%c] %d RSSI: %d Signal: %u, Noise: %u, Rate: %u\n",
-                     network_packet ? '*' : ' ',
-                     stats.channel, stats.ssi, stats.ssi,
-                     stats.ssi, stats.rate);
+        IWL_DEBUG_STATS_LIMIT("[%c] %d RSSI:%d Signal:%u, Noise:%u, Rate:%u\n",
+                              network_packet ? '*' : ' ',
+                              le16_to_cpu(rx_hdr->channel),
+                              rx_status.ssi, rx_status.ssi,
+                              rx_status.ssi, rx_status.rate_idx);
 
+#ifdef CONFIG_IWL3945_DEBUG
         if (iwl3945_debug_level & (IWL_DL_RX))
                 /* Set "1" to report good data frames in groups of 100 */
-                iwl3945_report_frame(priv, pkt, header, 1);
+                iwl3945_dbg_report_frame(priv, pkt, header, 1);
 #endif
 
         if (network_packet) {
                 priv->last_beacon_time = le32_to_cpu(rx_end->beacon_timestamp);
                 priv->last_tsf = le64_to_cpu(rx_end->timestamp);
-                priv->last_rx_rssi = stats.ssi;
-                priv->last_rx_noise = stats.noise;
+                priv->last_rx_rssi = rx_status.ssi;
+                priv->last_rx_noise = rx_status.noise;
         }
 
         switch (le16_to_cpu(header->frame_control) & IEEE80211_FCTL_FTYPE) {
@@ -563,7 +840,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                         }
                 }
 
-                iwl3945_handle_data_packet(priv, 0, rxb, &stats);
+                iwl3945_handle_data_packet(priv, 0, rxb, &rx_status);
                 break;
 
         case IEEE80211_FTYPE_CTL:
@@ -580,7 +857,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                                        print_mac(mac2, header->addr2),
                                        print_mac(mac3, header->addr3));
                 else
-                        iwl3945_handle_data_packet(priv, 1, rxb, &stats);
+                        iwl3945_handle_data_packet(priv, 1, rxb, &rx_status);
                 break;
         }
         }
@@ -689,7 +966,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv,
                               struct ieee80211_hdr *hdr, int sta_id, int tx_id)
 {
         unsigned long flags;
-        u16 rate_index = min(ctrl->tx_rate & 0xffff, IWL_RATE_COUNT - 1);
+        u16 rate_index = min(ctrl->tx_rate->hw_value & 0xffff, IWL_RATE_COUNT - 1);
         u16 rate_mask;
         int rate;
         u8 rts_retry_limit;
@@ -709,7 +986,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv,
         priv->stations[sta_id].current_rate.rate_n_flags = rate;
 
         if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
-            (sta_id != IWL3945_BROADCAST_ID) &&
+            (sta_id != priv->hw_setting.bcast_sta_id) &&
                 (sta_id != IWL_MULTICAST_ID))
                 priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate;
 
@@ -996,19 +1273,19 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv)
         if (rev_id & PCI_CFG_REV_ID_BIT_RTP)
                 IWL_DEBUG_INFO("RTP type \n");
         else if (rev_id & PCI_CFG_REV_ID_BIT_BASIC_SKU) {
-                IWL_DEBUG_INFO("ALM-MB type\n");
+                IWL_DEBUG_INFO("3945 RADIO-MB type\n");
                 iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BIT_ALMAGOR_MB);
+                            CSR39_HW_IF_CONFIG_REG_BIT_3945_MB);
         } else {
-                IWL_DEBUG_INFO("ALM-MM type\n");
+                IWL_DEBUG_INFO("3945 RADIO-MM type\n");
                 iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BIT_ALMAGOR_MM);
+                            CSR39_HW_IF_CONFIG_REG_BIT_3945_MM);
         }
 
         if (EEPROM_SKU_CAP_OP_MODE_MRC == priv->eeprom.sku_cap) {
                 IWL_DEBUG_INFO("SKU OP mode is mrc\n");
                 iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BIT_SKU_MRC);
+                            CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC);
         } else
                 IWL_DEBUG_INFO("SKU OP mode is basic\n");
 
@@ -1016,24 +1293,24 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv)
                 IWL_DEBUG_INFO("3945ABG revision is 0x%X\n",
                                priv->eeprom.board_revision);
                 iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
+                            CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
         } else {
                 IWL_DEBUG_INFO("3945ABG revision is 0x%X\n",
                                priv->eeprom.board_revision);
                 iwl3945_clear_bit(priv, CSR_HW_IF_CONFIG_REG,
-                              CSR_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
+                              CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
         }
 
         if (priv->eeprom.almgor_m_version <= 1) {
                 iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A);
+                            CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A);
                 IWL_DEBUG_INFO("Card M type A version is 0x%X\n",
                                priv->eeprom.almgor_m_version);
         } else {
                 IWL_DEBUG_INFO("Card M type B version is 0x%X\n",
                                priv->eeprom.almgor_m_version);
                 iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B);
+                            CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B);
         }
         spin_unlock_irqrestore(&priv->lock, flags);
 
@@ -1552,14 +1829,14 @@ int iwl3945_hw_reg_send_txpower(struct iwl3945_priv *priv)
                 .channel = priv->active_rxon.channel,
         };
 
-        txpower.band = (priv->phymode == MODE_IEEE80211A) ? 0 : 1;
+        txpower.band = (priv->band == IEEE80211_BAND_5GHZ) ? 0 : 1;
         ch_info = iwl3945_get_channel_info(priv,
-                                       priv->phymode,
+                                       priv->band,
                                        le16_to_cpu(priv->active_rxon.channel));
         if (!ch_info) {
                 IWL_ERROR
                     ("Failed to get channel info for channel %d [%d]\n",
-                     le16_to_cpu(priv->active_rxon.channel), priv->phymode);
+                     le16_to_cpu(priv->active_rxon.channel), priv->band);
                 return -EINVAL;
         }
 
@@ -2241,8 +2518,8 @@ int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv)
                 table[index].next_rate_index = iwl3945_rates[prev_index].table_rs_index;
         }
 
-        switch (priv->phymode) {
-        case MODE_IEEE80211A:
+        switch (priv->band) {
+        case IEEE80211_BAND_5GHZ:
                 IWL_DEBUG_RATE("Select A mode rate scale\n");
                 /* If one of the following CCK rates is used,
                  * have it fall back to the 6M OFDM rate */
@@ -2257,8 +2534,8 @@ int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv)
                     iwl3945_rates[IWL_FIRST_OFDM_RATE].table_rs_index;
                 break;
 
-        case MODE_IEEE80211B:
-                IWL_DEBUG_RATE("Select B mode rate scale\n");
+        case IEEE80211_BAND_2GHZ:
+                IWL_DEBUG_RATE("Select B/G mode rate scale\n");
                 /* If an OFDM rate is used, have it fall back to the
                  * 1M CCK rates */
                 for (i = IWL_RATE_6M_INDEX_TABLE; i <= IWL_RATE_54M_INDEX_TABLE; i++)
@@ -2269,7 +2546,7 @@ int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv)
                 break;
 
         default:
-                IWL_DEBUG_RATE("Select G mode rate scale\n");
+                WARN_ON(1);
                 break;
         }
 
@@ -2303,7 +2580,6 @@ int iwl3945_hw_set_hw_setting(struct iwl3945_priv *priv)
                 return -ENOMEM;
         }
 
-        priv->hw_setting.ac_queue_count = AC_NUM;
         priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE;
         priv->hw_setting.max_pkt_size = 2342;
         priv->hw_setting.tx_cmd_len = sizeof(struct iwl3945_tx_cmd);
@@ -2311,6 +2587,8 @@ int iwl3945_hw_set_hw_setting(struct iwl3945_priv *priv)
         priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;
         priv->hw_setting.max_stations = IWL3945_STATION_COUNT;
         priv->hw_setting.bcast_sta_id = IWL3945_BROADCAST_ID;
+
+        priv->hw_setting.tx_ant_num = 2;
         return 0;
 }
 
@@ -2323,7 +2601,7 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv,
         tx_beacon_cmd = (struct iwl3945_tx_beacon_cmd *)&frame->u;
         memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));
 
-        tx_beacon_cmd->tx.sta_id = IWL3945_BROADCAST_ID;
+        tx_beacon_cmd->tx.sta_id = priv->hw_setting.bcast_sta_id;
         tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
 
         frame_size = iwl3945_fill_beacon_frame(priv,
@@ -2350,6 +2628,7 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv,
 
 void iwl3945_hw_rx_handler_setup(struct iwl3945_priv *priv)
 {
+        priv->rx_handlers[REPLY_TX] = iwl3945_rx_reply_tx;
         priv->rx_handlers[REPLY_3945_RX] = iwl3945_rx_reply_rx;
 }
 
@@ -2364,9 +2643,25 @@ void iwl3945_hw_cancel_deferred_work(struct iwl3945_priv *priv)
         cancel_delayed_work(&priv->thermal_periodic);
 }
 
+static struct iwl_3945_cfg iwl3945_bg_cfg = {
+        .name = "3945BG",
+        .fw_name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode",
+        .sku = IWL_SKU_G,
+};
+
+static struct iwl_3945_cfg iwl3945_abg_cfg = {
+        .name = "3945ABG",
+        .fw_name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode",
+        .sku = IWL_SKU_A|IWL_SKU_G,
+};
+
 struct pci_device_id iwl3945_hw_card_ids[] = {
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4222)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4227)},
+        {IWL_PCI_DEVICE(0x4222, 0x1005, iwl3945_bg_cfg)},
+        {IWL_PCI_DEVICE(0x4222, 0x1034, iwl3945_bg_cfg)},
+        {IWL_PCI_DEVICE(0x4222, 0x1044, iwl3945_bg_cfg)},
+        {IWL_PCI_DEVICE(0x4227, 0x1014, iwl3945_bg_cfg)},
+        {IWL_PCI_DEVICE(0x4222, PCI_ANY_ID, iwl3945_abg_cfg)},
+        {IWL_PCI_DEVICE(0x4227, PCI_ANY_ID, iwl3945_abg_cfg)},
         {0}
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index 1da14f9bbe0f..45c1c5533bf0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -40,9 +40,17 @@
 extern struct pci_device_id iwl3945_hw_card_ids[];
 
 #define DRV_NAME        "iwl3945"
-#include "iwl-3945-hw.h"
+#include "iwl-csr.h"
 #include "iwl-prph.h"
+#include "iwl-3945-hw.h"
 #include "iwl-3945-debug.h"
+#include "iwl-3945-led.h"
+
+/* Change firmware file name, using "-" and incrementing number,
+ *   *only* when uCode interface or architecture changes so that it
+ *   is not compatible with earlier drivers.
+ * This number will also appear in << 8 position of 1st dword of uCode file */
+#define IWL3945_UCODE_API "-1"
 
 /* Default noise level to report when noise measurement is not available.
  *   This may be because we're:
@@ -109,6 +117,9 @@ struct iwl3945_queue {
                                 * space less than this */
 } __attribute__ ((packed));
 
+int iwl3945_queue_space(const struct iwl3945_queue *q);
+int iwl3945_x2_queue_used(const struct iwl3945_queue *q, int i);
+
 #define MAX_NUM_OF_TBS          (20)
 
 /* One for each TFD */
@@ -195,7 +206,7 @@ struct iwl3945_channel_info {
 
         u8 group_index;   /* 0-4, maps channel to group1/2/3/4/5 */
         u8 band_index;    /* 0-4, maps channel to band1/2/3/4/5 */
-        u8 phymode;       /* MODE_IEEE80211{A,B,G} */
+        enum ieee80211_band band;
 
         /* Radio/DSP gain settings for each "normal" data Tx rate.
          * These include, in addition to RF and DSP gain, a few fields for
@@ -269,8 +280,8 @@ struct iwl3945_frame {
 
 #define SEQ_TO_QUEUE(x)  ((x >> 8) & 0xbf)
 #define QUEUE_TO_SEQ(x)  ((x & 0xbf) << 8)
-#define SEQ_TO_INDEX(x) (x & 0xff)
-#define INDEX_TO_SEQ(x) (x & 0xff)
+#define SEQ_TO_INDEX(x) ((u8)(x & 0xff))
+#define INDEX_TO_SEQ(x) ((u8)(x & 0xff))
 #define SEQ_HUGE_FRAME  (0x4000)
 #define SEQ_RX_FRAME    __constant_cpu_to_le16(0x8000)
 #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
@@ -390,23 +401,24 @@ struct iwl3945_rx_queue {
 #define MIN_B_CHANNELS  1
 
 #define STATUS_HCMD_ACTIVE      0       /* host command in progress */
-#define STATUS_INT_ENABLED      1
-#define STATUS_RF_KILL_HW       2
-#define STATUS_RF_KILL_SW       3
-#define STATUS_INIT             4
-#define STATUS_ALIVE            5
-#define STATUS_READY            6
-#define STATUS_TEMPERATURE      7
-#define STATUS_GEO_CONFIGURED   8
-#define STATUS_EXIT_PENDING     9
-#define STATUS_IN_SUSPEND       10
-#define STATUS_STATISTICS       11
-#define STATUS_SCANNING         12
-#define STATUS_SCAN_ABORTING    13
-#define STATUS_SCAN_HW          14
-#define STATUS_POWER_PMI        15
-#define STATUS_FW_ERROR         16
-#define STATUS_CONF_PENDING     17
+#define STATUS_HCMD_SYNC_ACTIVE 1       /* sync host command in progress */
+#define STATUS_INT_ENABLED      2
+#define STATUS_RF_KILL_HW       3
+#define STATUS_RF_KILL_SW       4
+#define STATUS_INIT             5
+#define STATUS_ALIVE            6
+#define STATUS_READY            7
+#define STATUS_TEMPERATURE      8
+#define STATUS_GEO_CONFIGURED   9
+#define STATUS_EXIT_PENDING     10
+#define STATUS_IN_SUSPEND       11
+#define STATUS_STATISTICS       12
+#define STATUS_SCANNING         13
+#define STATUS_SCAN_ABORTING    14
+#define STATUS_SCAN_HW          15
+#define STATUS_POWER_PMI        16
+#define STATUS_FW_ERROR         17
+#define STATUS_CONF_PENDING     18
 
 #define MAX_TID_COUNT        9
 
@@ -431,8 +443,6 @@ union iwl3945_ht_rate_supp {
         };
 };
 
-#ifdef CONFIG_IWL3945_QOS
-
 union iwl3945_qos_capabity {
         struct {
                 u8 edca_count:4;        /* bit 0-3 */
@@ -460,7 +470,6 @@ struct iwl3945_qos_info {
         union iwl3945_qos_capabity qos_cap;
         struct iwl3945_qosparam_cmd def_qos_parm;
 };
-#endif /*CONFIG_IWL3945_QOS */
 
 #define STA_PS_STATUS_WAKE             0
 #define STA_PS_STATUS_SLEEP            1
@@ -511,8 +520,8 @@ struct iwl3945_ibss_seq {
 /**
  * struct iwl3945_driver_hw_info
  * @max_txq_num: Max # Tx queues supported
- * @ac_queue_count: # Tx queues for EDCA Access Categories (AC)
  * @tx_cmd_len: Size of Tx command (but not including frame itself)
+ * @tx_ant_num: Number of TX antennas
  * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)
  * @rx_buf_size:
  * @max_pkt_size:
@@ -524,8 +533,8 @@ struct iwl3945_ibss_seq {
  */
 struct iwl3945_driver_hw_info {
         u16 max_txq_num;
-        u16 ac_queue_count;
         u16 tx_cmd_len;
+        u16 tx_ant_num;
         u16 max_rxq_size;
         u32 rx_buf_size;
         u32 max_pkt_size;
@@ -561,16 +570,6 @@ extern int iwl3945_is_network_packet(struct iwl3945_priv *priv,
                                  struct ieee80211_hdr *header);
 extern int iwl3945_power_init_handle(struct iwl3945_priv *priv);
 extern int iwl3945_eeprom_init(struct iwl3945_priv *priv);
-#ifdef CONFIG_IWL3945_DEBUG
-extern void iwl3945_report_frame(struct iwl3945_priv *priv,
-                             struct iwl3945_rx_packet *pkt,
-                             struct ieee80211_hdr *header, int group100);
-#else
-static inline void iwl3945_report_frame(struct iwl3945_priv *priv,
-                                    struct iwl3945_rx_packet *pkt,
-                                    struct ieee80211_hdr *header,
-                                    int group100) {}
-#endif
 extern void iwl3945_handle_data_packet_monitor(struct iwl3945_priv *priv,
                                            struct iwl3945_rx_mem_buffer *rxb,
                                            void *data, short len,
@@ -688,25 +687,28 @@ enum {
 
 #endif
 
+#define IWL_MAX_NUM_QUEUES IWL39_MAX_NUM_QUEUES
+
 struct iwl3945_priv {
 
         /* ieee device used by generic ieee processing code */
         struct ieee80211_hw *hw;
         struct ieee80211_channel *ieee_channels;
         struct ieee80211_rate *ieee_rates;
+        struct iwl_3945_cfg *cfg; /* device configuration */
 
         /* temporary frame storage list */
         struct list_head free_frames;
         int frames_count;
 
-        u8 phymode;
+        enum ieee80211_band band;
         int alloc_rxb_skb;
         bool add_radiotap;
 
         void (*rx_handlers[REPLY_MAX])(struct iwl3945_priv *priv,
                                        struct iwl3945_rx_mem_buffer *rxb);
 
-        const struct ieee80211_hw_mode *modes;
+        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
 
 #ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
         /* spectrum measurement report caching */
@@ -779,13 +781,15 @@ struct iwl3945_priv {
         struct iwl3945_init_alive_resp card_alive_init;
         struct iwl3945_alive_resp card_alive;
 
-#ifdef LED
-        /* LED related variables */
-        struct iwl3945_activity_blink activity;
-        unsigned long led_packets;
-        int led_state;
+#ifdef CONFIG_IWL3945_LEDS
+        struct iwl3945_led led[IWL_LED_TRG_MAX];
+        unsigned long last_blink_time;
+        u8 last_blink_rate;
+        u8 allow_blinking;
+        unsigned int rxtxpackets;
 #endif
 
+
         u16 active_rate;
         u16 active_rate_basic;
 
@@ -803,7 +807,6 @@ struct iwl3945_priv {
         struct iwl3945_tx_queue txq[IWL_MAX_NUM_QUEUES];
 
         unsigned long status;
-        u32 config;
 
         int last_rx_rssi;       /* From Rx packet statisitics */
         int last_rx_noise;      /* From beacon statistics */
@@ -830,10 +833,9 @@ struct iwl3945_priv {
         struct iwl3945_station_entry stations[IWL_STATION_COUNT];
 
         /* Indication if ieee80211_ops->open has been called */
-        int is_open;
+        u8 is_open;
 
         u8 mac80211_registered;
-        int is_abg;
 
         u32 notif_missed_beacons;
 
@@ -852,7 +854,7 @@ struct iwl3945_priv {
         /* eeprom */
         struct iwl3945_eeprom eeprom;
 
-        int iw_mode;
+        enum ieee80211_if_types iw_mode;
 
         struct sk_buff *ibss_beacon;
 
@@ -869,9 +871,7 @@ struct iwl3945_priv {
         u16 assoc_capability;
         u8 ps_mode;
 
-#ifdef CONFIG_IWL3945_QOS
         struct iwl3945_qos_info qos_data;
-#endif /*CONFIG_IWL3945_QOS */
 
         struct workqueue_struct *workqueue;
 
@@ -937,13 +937,12 @@ static inline int is_channel_radar(const struct iwl3945_channel_info *ch_info)
 
 static inline u8 is_channel_a_band(const struct iwl3945_channel_info *ch_info)
 {
-        return ch_info->phymode == MODE_IEEE80211A;
+        return ch_info->band == IEEE80211_BAND_5GHZ;
 }
 
 static inline u8 is_channel_bg_band(const struct iwl3945_channel_info *ch_info)
 {
-        return ((ch_info->phymode == MODE_IEEE80211B) ||
-                (ch_info->phymode == MODE_IEEE80211G));
+        return ch_info->band == IEEE80211_BAND_2GHZ;
 }
 
 static inline int is_channel_passive(const struct iwl3945_channel_info *ch)
@@ -956,18 +955,8 @@ static inline int is_channel_ibss(const struct iwl3945_channel_info *ch)
         return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
 }
 
-static inline int iwl3945_rate_index_from_plcp(int plcp)
-{
-        int i;
-
-        for (i = 0; i < IWL_RATE_COUNT; i++)
-                if (iwl3945_rates[i].plcp == plcp)
-                        return i;
-        return -1;
-}
-
 extern const struct iwl3945_channel_info *iwl3945_get_channel_info(
-        const struct iwl3945_priv *priv, int phymode, u16 channel);
+        const struct iwl3945_priv *priv, enum ieee80211_band band, u16 channel);
 
 /* Requires full declaration of iwl3945_priv before including */
 #include "iwl-3945-io.h"
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
index f3470c896d9a..3bcd107e2d71 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,6 +84,9 @@ enum {
         REPLY_REMOVE_STA = 0x19,        /* not used */
         REPLY_REMOVE_ALL_STA = 0x1a,    /* not used */
 
+        /* Security */
+        REPLY_WEPKEY = 0x20,
+
         /* RX, TX, LEDs */
         REPLY_TX = 0x1c,
         REPLY_RATE_SCALE = 0x47,        /* 3945 only */
@@ -139,7 +142,7 @@ enum {
         REPLY_PHY_CALIBRATION_CMD = 0xb0,
         REPLY_RX_PHY_CMD = 0xc0,
         REPLY_RX_MPDU_CMD = 0xc1,
-        REPLY_4965_RX = 0xc3,
+        REPLY_RX = 0xc3,
         REPLY_COMPRESSED_BA = 0xc5,
         REPLY_MAX = 0xff
 };
@@ -151,16 +154,16 @@ enum {
  *
  *****************************************************************************/
 
-/* iwl4965_cmd_header flags value */
+/* iwl_cmd_header flags value */
 #define IWL_CMD_FAILED_MSK 0x40
 
 /**
- * struct iwl4965_cmd_header
+ * struct iwl_cmd_header
  *
  * This header format appears in the beginning of each command sent from the
  * driver, and each response/notification received from uCode.
  */
-struct iwl4965_cmd_header {
+struct iwl_cmd_header {
         u8 cmd;         /* Command ID:  REPLY_RXON, etc. */
         u8 flags;       /* IWL_CMD_* */
         /*
@@ -194,7 +197,7 @@ struct iwl4965_cmd_header {
  * 4965 rate_n_flags bit fields
  *
  * rate_n_flags format is used in following 4965 commands:
- *  REPLY_4965_RX (response only)
+ *  REPLY_RX (response only)
  *  REPLY_TX (both command and response)
  *  REPLY_TX_LINK_QUALITY_CMD
  *
@@ -266,11 +269,10 @@ struct iwl4965_cmd_header {
  *          10 B active, A inactive
  *          11 Both active
  */
-#define RATE_MCS_ANT_A_POS      14
-#define RATE_MCS_ANT_B_POS      15
-#define RATE_MCS_ANT_A_MSK      0x4000
-#define RATE_MCS_ANT_B_MSK      0x8000
-#define RATE_MCS_ANT_AB_MSK     0xc000
+#define RATE_MCS_ANT_POS       14
+#define RATE_MCS_ANT_A_MSK     0x04000
+#define RATE_MCS_ANT_B_MSK     0x08000
+#define RATE_MCS_ANT_AB_MSK    0x0C000
 
 
 /**
@@ -727,14 +729,21 @@ struct iwl4965_qosparam_cmd {
 #define STA_CONTROL_MODIFY_MSK          0x01
 
 /* key flags __le16*/
-#define STA_KEY_FLG_ENCRYPT_MSK __constant_cpu_to_le16(0x7)
-#define STA_KEY_FLG_NO_ENC      __constant_cpu_to_le16(0x0)
-#define STA_KEY_FLG_WEP         __constant_cpu_to_le16(0x1)
-#define STA_KEY_FLG_CCMP        __constant_cpu_to_le16(0x2)
-#define STA_KEY_FLG_TKIP        __constant_cpu_to_le16(0x3)
+#define STA_KEY_FLG_ENCRYPT_MSK __constant_cpu_to_le16(0x0007)
+#define STA_KEY_FLG_NO_ENC      __constant_cpu_to_le16(0x0000)
+#define STA_KEY_FLG_WEP         __constant_cpu_to_le16(0x0001)
+#define STA_KEY_FLG_CCMP        __constant_cpu_to_le16(0x0002)
+#define STA_KEY_FLG_TKIP        __constant_cpu_to_le16(0x0003)
 
 #define STA_KEY_FLG_KEYID_POS   8
 #define STA_KEY_FLG_INVALID     __constant_cpu_to_le16(0x0800)
+/* wep key is either from global key (0) or from station info array (1) */
+#define STA_KEY_FLG_MAP_KEY_MSK __constant_cpu_to_le16(0x0008)
+
+/* wep key in STA: 5-bytes (0) or 13-bytes (1) */
+#define STA_KEY_FLG_KEY_SIZE_MSK     __constant_cpu_to_le16(0x1000)
+#define STA_KEY_MULTICAST_MSK        __constant_cpu_to_le16(0x4000)
+#define STA_KEY_MAX_NUM         8
 
 /* Flags indicate whether to modify vs. don't change various station params */
 #define STA_MODIFY_KEY_MASK             0x01
@@ -752,7 +761,8 @@ struct iwl4965_keyinfo {
         u8 tkip_rx_tsc_byte2;   /* TSC[2] for key mix ph1 detection */
         u8 reserved1;
         __le16 tkip_rx_ttak[5]; /* 10-byte unicast TKIP TTAK */
-        __le16 reserved2;
+        u8 key_offset;
+        u8 reserved2;
         u8 key[16];             /* 16-byte unicast decryption key */
 } __attribute__ ((packed));
 
@@ -842,6 +852,30 @@ struct iwl4965_add_sta_resp {
         u8 status;      /* ADD_STA_* */
 } __attribute__ ((packed));
 
+/*
+ * REPLY_WEP_KEY = 0x20
+ */
+struct iwl_wep_key {
+        u8 key_index;
+        u8 key_offset;
+        u8 reserved1[2];
+        u8 key_size;
+        u8 reserved2[3];
+        u8 key[16];
+} __attribute__ ((packed));
+
+struct iwl_wep_cmd {
+        u8 num_keys;
+        u8 global_key_type;
+        u8 flags;
+        u8 reserved;
+        struct iwl_wep_key key[0];
+} __attribute__ ((packed));
+
+#define WEP_KEY_WEP_TYPE 1
+#define WEP_KEYS_MAX 4
+#define WEP_INVALID_OFFSET 0xff
+#define WEP_KEY_LEN_128 13
 
 /******************************************************************************
  * (4)
@@ -868,26 +902,35 @@ struct iwl4965_rx_frame_hdr {
         u8 payload[0];
 } __attribute__ ((packed));
 
-#define RX_RES_STATUS_NO_CRC32_ERROR    __constant_cpu_to_le32(1 << 0)
-#define RX_RES_STATUS_NO_RXE_OVERFLOW   __constant_cpu_to_le32(1 << 1)
+#define RX_RES_STATUS_NO_CRC32_ERROR    __constant_cpu_to_le32(1 << 0)
+#define RX_RES_STATUS_NO_RXE_OVERFLOW   __constant_cpu_to_le32(1 << 1)
+
+#define RX_RES_PHY_FLAGS_BAND_24_MSK    __constant_cpu_to_le16(1 << 0)
+#define RX_RES_PHY_FLAGS_MOD_CCK_MSK            __constant_cpu_to_le16(1 << 1)
+#define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK     __constant_cpu_to_le16(1 << 2)
+#define RX_RES_PHY_FLAGS_NARROW_BAND_MSK        __constant_cpu_to_le16(1 << 3)
+#define RX_RES_PHY_FLAGS_ANTENNA_MSK            __constant_cpu_to_le16(0xf0)
+
+#define RX_RES_STATUS_SEC_TYPE_MSK      (0x7 << 8)
+#define RX_RES_STATUS_SEC_TYPE_NONE     (0x0 << 8)
+#define RX_RES_STATUS_SEC_TYPE_WEP      (0x1 << 8)
+#define RX_RES_STATUS_SEC_TYPE_CCMP     (0x2 << 8)
+#define RX_RES_STATUS_SEC_TYPE_TKIP     (0x3 << 8)
+#define RX_RES_STATUS_SEC_TYPE_ERR      (0x7 << 8)
 
-#define RX_RES_PHY_FLAGS_BAND_24_MSK    __constant_cpu_to_le16(1 << 0)
-#define RX_RES_PHY_FLAGS_MOD_CCK_MSK            __constant_cpu_to_le16(1 << 1)
-#define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK     __constant_cpu_to_le16(1 << 2)
-#define RX_RES_PHY_FLAGS_NARROW_BAND_MSK        __constant_cpu_to_le16(1 << 3)
-#define RX_RES_PHY_FLAGS_ANTENNA_MSK            __constant_cpu_to_le16(0xf0)
+#define RX_RES_STATUS_STATION_FOUND     (1<<6)
+#define RX_RES_STATUS_NO_STATION_INFO_MISMATCH  (1<<7)
 
-#define RX_RES_STATUS_SEC_TYPE_MSK      (0x7 << 8)
-#define RX_RES_STATUS_SEC_TYPE_NONE     (0x0 << 8)
-#define RX_RES_STATUS_SEC_TYPE_WEP      (0x1 << 8)
-#define RX_RES_STATUS_SEC_TYPE_CCMP     (0x2 << 8)
-#define RX_RES_STATUS_SEC_TYPE_TKIP     (0x3 << 8)
+#define RX_RES_STATUS_DECRYPT_TYPE_MSK  (0x3 << 11)
+#define RX_RES_STATUS_NOT_DECRYPT       (0x0 << 11)
+#define RX_RES_STATUS_DECRYPT_OK        (0x3 << 11)
+#define RX_RES_STATUS_BAD_ICV_MIC       (0x1 << 11)
+#define RX_RES_STATUS_BAD_KEY_TTAK      (0x2 << 11)
 
-#define RX_RES_STATUS_DECRYPT_TYPE_MSK  (0x3 << 11)
-#define RX_RES_STATUS_NOT_DECRYPT       (0x0 << 11)
-#define RX_RES_STATUS_DECRYPT_OK        (0x3 << 11)
-#define RX_RES_STATUS_BAD_ICV_MIC       (0x1 << 11)
-#define RX_RES_STATUS_BAD_KEY_TTAK      (0x2 << 11)
+#define RX_MPDU_RES_STATUS_ICV_OK       (0x20)
+#define RX_MPDU_RES_STATUS_MIC_OK       (0x40)
+#define RX_MPDU_RES_STATUS_TTAK_OK      (1 << 7)
+#define RX_MPDU_RES_STATUS_DEC_DONE_MSK (0x800)
 
 struct iwl4965_rx_frame_end {
         __le32 status;
@@ -922,7 +965,7 @@ struct iwl4965_rx_non_cfg_phy {
 } __attribute__ ((packed));
 
 /*
- * REPLY_4965_RX = 0xc3 (response only, not a command)
+ * REPLY_RX = 0xc3 (response only, not a command)
  * Used only for legacy (non 11n) frames.
  */
 #define RX_RES_PHY_CNT 14
@@ -1038,6 +1081,10 @@ struct iwl4965_rx_mpdu_res_start {
  * MAC header) to DWORD boundary. */
 #define TX_CMD_FLG_MH_PAD_MSK __constant_cpu_to_le32(1 << 20)
 
+/* accelerate aggregation support
+ * 0 - no CCMP encryption; 1 - CCMP encryption */
+#define TX_CMD_FLG_AGG_CCMP_MSK __constant_cpu_to_le32(1 << 22)
+
 /* HCCA-AP - disable duration overwriting. */
 #define TX_CMD_FLG_DUR_MSK __constant_cpu_to_le32(1 << 25)
 
@@ -1300,6 +1347,25 @@ struct iwl4965_tx_resp {
         __le32 status;  /* TX status (for aggregation status of 1st frame) */
 } __attribute__ ((packed));
 
+struct agg_tx_status {
+        __le16 status;
+        __le16 sequence;
+} __attribute__ ((packed));
+
+struct iwl4965_tx_resp_agg {
+        u8 frame_count;         /* 1 no aggregation, >1 aggregation */
+        u8 reserved1;
+        u8 failure_rts;
+        u8 failure_frame;
+        __le32 rate_n_flags;
+        __le16 wireless_media_time;
+        __le16 reserved3;
+        __le32 pa_power1;
+        __le32 pa_power2;
+        struct agg_tx_status status;    /* TX status (for aggregation status */
+                                        /* of 1st frame) */
+} __attribute__ ((packed));
+
 /*
  * REPLY_COMPRESSED_BA = 0xc5 (response only, not a command)
  *
@@ -1313,9 +1379,8 @@ struct iwl4965_compressed_ba_resp {
         /* Index of recipient (BA-sending) station in uCode's station table */
         u8 sta_id;
         u8 tid;
-        __le16 ba_seq_ctl;
-        __le32 ba_bitmap0;
-        __le32 ba_bitmap1;
+        __le16 seq_ctl;
+        __le64 bitmap;
         __le16 scd_flow;
         __le16 scd_ssn;
 } __attribute__ ((packed));
@@ -1348,11 +1413,11 @@ struct iwl4965_txpowertable_cmd {
 
 
 /**
- * struct iwl4965_link_qual_general_params
+ * struct iwl_link_qual_general_params
  *
  * Used in REPLY_TX_LINK_QUALITY_CMD
  */
-struct iwl4965_link_qual_general_params {
+struct iwl_link_qual_general_params {
         u8 flags;
 
         /* No entries at or above this (driver chosen) index contain MIMO */
@@ -1379,11 +1444,11 @@ struct iwl4965_link_qual_general_params {
 } __attribute__ ((packed));
 
 /**
- * struct iwl4965_link_qual_agg_params
+ * struct iwl_link_qual_agg_params
  *
  * Used in REPLY_TX_LINK_QUALITY_CMD
  */
-struct iwl4965_link_qual_agg_params {
+struct iwl_link_qual_agg_params {
 
         /* Maximum number of uSec in aggregation.
          * Driver should set this to 4000 (4 milliseconds). */
@@ -1593,14 +1658,14 @@ struct iwl4965_link_qual_agg_params {
  * legacy), and then repeat the search process.
  *
  */
-struct iwl4965_link_quality_cmd {
+struct iwl_link_quality_cmd {
 
         /* Index of destination/recipient station in uCode's station table */
         u8 sta_id;
         u8 reserved1;
         __le16 control;         /* not used */
-        struct iwl4965_link_qual_general_params general_params;
-        struct iwl4965_link_qual_agg_params agg_params;
+        struct iwl_link_qual_general_params general_params;
+        struct iwl_link_qual_agg_params agg_params;
 
         /*
          * Rate info; when using rate-scaling, Tx command's initial_rate_index
@@ -2625,7 +2690,7 @@ struct iwl4965_led_cmd {
 
 struct iwl4965_rx_packet {
         __le32 len;
-        struct iwl4965_cmd_header hdr;
+        struct iwl_cmd_header hdr;
         union {
                 struct iwl4965_alive_resp alive_frame;
                 struct iwl4965_rx_frame rx_frame;
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index ffe1e9dfdec7..1a66b508a8ea 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,316 +92,6 @@
 /* RSSI to dBm */
 #define IWL_RSSI_OFFSET 44
 
-/*
- * EEPROM related constants, enums, and structures.
- */
-
-/*
- * EEPROM access time values:
- *
- * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG,
- *   then clearing (with subsequent read/modify/write) CSR_EEPROM_REG bit
- *   CSR_EEPROM_REG_BIT_CMD (0x2).
- * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).
- * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.
- * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.
- */
-#define IWL_EEPROM_ACCESS_TIMEOUT       5000 /* uSec */
-#define IWL_EEPROM_ACCESS_DELAY         10   /* uSec */
-
-/*
- * Regulatory channel usage flags in EEPROM struct iwl4965_eeprom_channel.flags.
- *
- * IBSS and/or AP operation is allowed *only* on those channels with
- * (VALID && IBSS && ACTIVE && !RADAR).  This restriction is in place because
- * RADAR detection is not supported by the 4965 driver, but is a
- * requirement for establishing a new network for legal operation on channels
- * requiring RADAR detection or restricting ACTIVE scanning.
- *
- * NOTE:  "WIDE" flag does not indicate anything about "FAT" 40 MHz channels.
- *        It only indicates that 20 MHz channel use is supported; FAT channel
- *        usage is indicated by a separate set of regulatory flags for each
- *        FAT channel pair.
- *
- * NOTE:  Using a channel inappropriately will result in a uCode error!
- */
-enum {
-        EEPROM_CHANNEL_VALID = (1 << 0),        /* usable for this SKU/geo */
-        EEPROM_CHANNEL_IBSS = (1 << 1),         /* usable as an IBSS channel */
-        /* Bit 2 Reserved */
-        EEPROM_CHANNEL_ACTIVE = (1 << 3),       /* active scanning allowed */
-        EEPROM_CHANNEL_RADAR = (1 << 4),        /* radar detection required */
-        EEPROM_CHANNEL_WIDE = (1 << 5),         /* 20 MHz channel okay */
-        EEPROM_CHANNEL_NARROW = (1 << 6),       /* 10 MHz channel (not used) */
-        EEPROM_CHANNEL_DFS = (1 << 7),  /* dynamic freq selection candidate */
-};
-
-/* SKU Capabilities */
-#define EEPROM_SKU_CAP_SW_RF_KILL_ENABLE                (1 << 0)
-#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE                (1 << 1)
-
-/* *regulatory* channel data format in eeprom, one for each channel.
- * There are separate entries for FAT (40 MHz) vs. normal (20 MHz) channels. */
-struct iwl4965_eeprom_channel {
-        u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
-        s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
-} __attribute__ ((packed));
-
-/* 4965 has two radio transmitters (and 3 radio receivers) */
-#define EEPROM_TX_POWER_TX_CHAINS      (2)
-
-/* 4965 has room for up to 8 sets of txpower calibration data */
-#define EEPROM_TX_POWER_BANDS          (8)
-
-/* 4965 factory calibration measures txpower gain settings for
- * each of 3 target output levels */
-#define EEPROM_TX_POWER_MEASUREMENTS   (3)
-
-/* 4965 driver does not work with txpower calibration version < 5.
- * Look for this in calib_version member of struct iwl4965_eeprom. */
-#define EEPROM_TX_POWER_VERSION_NEW    (5)
-
-
-/*
- * 4965 factory calibration data for one txpower level, on one channel,
- * measured on one of the 2 tx chains (radio transmitter and associated
- * antenna).  EEPROM contains:
- *
- * 1)  Temperature (degrees Celsius) of device when measurement was made.
- *
- * 2)  Gain table index used to achieve the target measurement power.
- *     This refers to the "well-known" gain tables (see iwl-4965-hw.h).
- *
- * 3)  Actual measured output power, in half-dBm ("34" = 17 dBm).
- *
- * 4)  RF power amplifier detector level measurement (not used).
- */
-struct iwl4965_eeprom_calib_measure {
-        u8 temperature;         /* Device temperature (Celsius) */
-        u8 gain_idx;            /* Index into gain table */
-        u8 actual_pow;          /* Measured RF output power, half-dBm */
-        s8 pa_det;              /* Power amp detector level (not used) */
-} __attribute__ ((packed));
-
-
-/*
- * 4965 measurement set for one channel.  EEPROM contains:
- *
- * 1)  Channel number measured
- *
- * 2)  Measurements for each of 3 power levels for each of 2 radio transmitters
- *     (a.k.a. "tx chains") (6 measurements altogether)
- */
-struct iwl4965_eeprom_calib_ch_info {
-        u8 ch_num;
-        struct iwl4965_eeprom_calib_measure measurements[EEPROM_TX_POWER_TX_CHAINS]
-                [EEPROM_TX_POWER_MEASUREMENTS];
-} __attribute__ ((packed));
-
-/*
- * 4965 txpower subband info.
- *
- * For each frequency subband, EEPROM contains the following:
- *
- * 1)  First and last channels within range of the subband.  "0" values
- *     indicate that this sample set is not being used.
- *
- * 2)  Sample measurement sets for 2 channels close to the range endpoints.
- */
-struct iwl4965_eeprom_calib_subband_info {
-        u8 ch_from;     /* channel number of lowest channel in subband */
-        u8 ch_to;       /* channel number of highest channel in subband */
-        struct iwl4965_eeprom_calib_ch_info ch1;
-        struct iwl4965_eeprom_calib_ch_info ch2;
-} __attribute__ ((packed));
-
-
-/*
- * 4965 txpower calibration info.  EEPROM contains:
- *
- * 1)  Factory-measured saturation power levels (maximum levels at which
- *     tx power amplifier can output a signal without too much distortion).
- *     There is one level for 2.4 GHz band and one for 5 GHz band.  These
- *     values apply to all channels within each of the bands.
- *
- * 2)  Factory-measured power supply voltage level.  This is assumed to be
- *     constant (i.e. same value applies to all channels/bands) while the
- *     factory measurements are being made.
- *
- * 3)  Up to 8 sets of factory-measured txpower calibration values.
- *     These are for different frequency ranges, since txpower gain
- *     characteristics of the analog radio circuitry vary with frequency.
- *
- *     Not all sets need to be filled with data;
- *     struct iwl4965_eeprom_calib_subband_info contains range of channels
- *     (0 if unused) for each set of data.
- */
-struct iwl4965_eeprom_calib_info {
-        u8 saturation_power24;  /* half-dBm (e.g. "34" = 17 dBm) */
-        u8 saturation_power52;  /* half-dBm */
-        s16 voltage;            /* signed */
-        struct iwl4965_eeprom_calib_subband_info band_info[EEPROM_TX_POWER_BANDS];
-} __attribute__ ((packed));
-
-
-/*
- * 4965 EEPROM map
- */
-struct iwl4965_eeprom {
-        u8 reserved0[16];
-#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
-        u16 device_id;          /* abs.ofs: 16 */
-        u8 reserved1[2];
-#define EEPROM_PMC                          (2*0x0A)    /* 2 bytes */
-        u16 pmc;                /* abs.ofs: 20 */
-        u8 reserved2[20];
-#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
-        u8 mac_address[6];      /* abs.ofs: 42 */
-        u8 reserved3[58];
-#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
-        u16 board_revision;     /* abs.ofs: 106 */
-        u8 reserved4[11];
-#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
-        u8 board_pba_number[9]; /* abs.ofs: 119 */
-        u8 reserved5[8];
-#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
-        u16 version;            /* abs.ofs: 136 */
-#define EEPROM_SKU_CAP                      (2*0x45)    /* 1  bytes */
-        u8 sku_cap;             /* abs.ofs: 138 */
-#define EEPROM_LEDS_MODE                    (2*0x45+1)  /* 1  bytes */
-        u8 leds_mode;           /* abs.ofs: 139 */
-#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
-        u16 oem_mode;
-#define EEPROM_WOWLAN_MODE                  (2*0x47)    /* 2  bytes */
-        u16 wowlan_mode;        /* abs.ofs: 142 */
-#define EEPROM_LEDS_TIME_INTERVAL           (2*0x48)    /* 2  bytes */
-        u16 leds_time_interval; /* abs.ofs: 144 */
-#define EEPROM_LEDS_OFF_TIME                (2*0x49)    /* 1  bytes */
-        u8 leds_off_time;       /* abs.ofs: 146 */
-#define EEPROM_LEDS_ON_TIME                 (2*0x49+1)  /* 1  bytes */
-        u8 leds_on_time;        /* abs.ofs: 147 */
-#define EEPROM_ALMGOR_M_VERSION             (2*0x4A)    /* 1  bytes */
-        u8 almgor_m_version;    /* abs.ofs: 148 */
-#define EEPROM_ANTENNA_SWITCH_TYPE          (2*0x4A+1)  /* 1  bytes */
-        u8 antenna_switch_type; /* abs.ofs: 149 */
-        u8 reserved6[8];
-#define EEPROM_4965_BOARD_REVISION          (2*0x4F)    /* 2 bytes */
-        u16 board_revision_4965;        /* abs.ofs: 158 */
-        u8 reserved7[13];
-#define EEPROM_4965_BOARD_PBA               (2*0x56+1)  /* 9 bytes */
-        u8 board_pba_number_4965[9];    /* abs.ofs: 173 */
-        u8 reserved8[10];
-#define EEPROM_REGULATORY_SKU_ID            (2*0x60)    /* 4  bytes */
-        u8 sku_id[4];           /* abs.ofs: 192 */
-
-/*
- * Per-channel regulatory data.
- *
- * Each channel that *might* be supported by 3945 or 4965 has a fixed location
- * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory
- * txpower (MSB).
- *
- * Entries immediately below are for 20 MHz channel width.  FAT (40 MHz)
- * channels (only for 4965, not supported by 3945) appear later in the EEPROM.
- *
- * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- */
-#define EEPROM_REGULATORY_BAND_1            (2*0x62)    /* 2  bytes */
-        u16 band_1_count;       /* abs.ofs: 196 */
-#define EEPROM_REGULATORY_BAND_1_CHANNELS   (2*0x63)    /* 28 bytes */
-        struct iwl4965_eeprom_channel band_1_channels[14]; /* abs.ofs: 196 */
-
-/*
- * 4.9 GHz channels 183, 184, 185, 187, 188, 189, 192, 196,
- * 5.0 GHz channels 7, 8, 11, 12, 16
- * (4915-5080MHz) (none of these is ever supported)
- */
-#define EEPROM_REGULATORY_BAND_2            (2*0x71)    /* 2  bytes */
-        u16 band_2_count;       /* abs.ofs: 226 */
-#define EEPROM_REGULATORY_BAND_2_CHANNELS   (2*0x72)    /* 26 bytes */
-        struct iwl4965_eeprom_channel band_2_channels[13]; /* abs.ofs: 228 */
-
-/*
- * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
- * (5170-5320MHz)
- */
-#define EEPROM_REGULATORY_BAND_3            (2*0x7F)    /* 2  bytes */
-        u16 band_3_count;       /* abs.ofs: 254 */
-#define EEPROM_REGULATORY_BAND_3_CHANNELS   (2*0x80)    /* 24 bytes */
-        struct iwl4965_eeprom_channel band_3_channels[12]; /* abs.ofs: 256 */
-
-/*
- * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
- * (5500-5700MHz)
- */
-#define EEPROM_REGULATORY_BAND_4            (2*0x8C)    /* 2  bytes */
-        u16 band_4_count;       /* abs.ofs: 280 */
-#define EEPROM_REGULATORY_BAND_4_CHANNELS   (2*0x8D)    /* 22 bytes */
-        struct iwl4965_eeprom_channel band_4_channels[11]; /* abs.ofs: 282 */
-
-/*
- * 5.7 GHz channels 145, 149, 153, 157, 161, 165
- * (5725-5825MHz)
- */
-#define EEPROM_REGULATORY_BAND_5            (2*0x98)    /* 2  bytes */
-        u16 band_5_count;       /* abs.ofs: 304 */
-#define EEPROM_REGULATORY_BAND_5_CHANNELS   (2*0x99)    /* 12 bytes */
-        struct iwl4965_eeprom_channel band_5_channels[6]; /* abs.ofs: 306 */
-
-        u8 reserved10[2];
-
-
-/*
- * 2.4 GHz FAT channels 1 (5), 2 (6), 3 (7), 4 (8), 5 (9), 6 (10), 7 (11)
- *
- * The channel listed is the center of the lower 20 MHz half of the channel.
- * The overall center frequency is actually 2 channels (10 MHz) above that,
- * and the upper half of each FAT channel is centered 4 channels (20 MHz) away
- * from the lower half; e.g. the upper half of FAT channel 1 is channel 5,
- * and the overall FAT channel width centers on channel 3.
- *
- * NOTE:  The RXON command uses 20 MHz channel numbers to specify the
- *        control channel to which to tune.  RXON also specifies whether the
- *        control channel is the upper or lower half of a FAT channel.
- *
- * NOTE:  4965 does not support FAT channels on 2.4 GHz.
- */
-#define EEPROM_REGULATORY_BAND_24_FAT_CHANNELS (2*0xA0) /* 14 bytes */
-        struct iwl4965_eeprom_channel band_24_channels[7]; /* abs.ofs: 320 */
-        u8 reserved11[2];
-
-/*
- * 5.2 GHz FAT channels 36 (40), 44 (48), 52 (56), 60 (64),
- * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161)
- */
-#define EEPROM_REGULATORY_BAND_52_FAT_CHANNELS (2*0xA8) /* 22 bytes */
-        struct iwl4965_eeprom_channel band_52_channels[11]; /* abs.ofs: 336 */
-        u8 reserved12[6];
-
-/*
- * 4965 driver requires txpower calibration format version 5 or greater.
- * Driver does not work with txpower calibration version < 5.
- * This value is simply a 16-bit number, no major/minor versions here.
- */
-#define EEPROM_CALIB_VERSION_OFFSET            (2*0xB6) /* 2 bytes */
-        u16 calib_version;      /* abs.ofs: 364 */
-        u8 reserved13[2];
-        u8 reserved14[96];      /* abs.ofs: 368 */
-
-/*
- * 4965 Txpower calibration data.
- */
-#define EEPROM_IWL_CALIB_TXPOWER_OFFSET        (2*0xE8) /* 48  bytes */
-        struct iwl4965_eeprom_calib_info calib_info;    /* abs.ofs: 464 */
-
-        u8 reserved16[140];     /* fill out to full 1024 byte block */
-
-
-} __attribute__ ((packed));
-
-#define IWL_EEPROM_IMAGE_SIZE 1024
-
-/* End of EEPROM */
 
 #include "iwl-4965-commands.h"
 
@@ -410,182 +100,6 @@ struct iwl4965_eeprom {
 #define PCI_REG_WUM8       0x0E8
 #define PCI_CFG_PMC_PME_FROM_D3COLD_SUPPORT         (0x80000000)
 
-/*=== CSR (control and status registers) ===*/
-#define CSR_BASE    (0x000)
-
-#define CSR_SW_VER              (CSR_BASE+0x000)
-#define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000) /* hardware interface config */
-#define CSR_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */
-#define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */
-#define CSR_INT_MASK            (CSR_BASE+0x00c) /* host interrupt enable */
-#define CSR_FH_INT_STATUS       (CSR_BASE+0x010) /* busmaster int status/ack*/
-#define CSR_GPIO_IN             (CSR_BASE+0x018) /* read external chip pins */
-#define CSR_RESET               (CSR_BASE+0x020) /* busmaster enable, NMI, etc*/
-#define CSR_GP_CNTRL            (CSR_BASE+0x024)
-
-/*
- * Hardware revision info
- * Bit fields:
- * 31-8:  Reserved
- *  7-4:  Type of device:  0x0 = 4965, 0xd = 3945
- *  3-2:  Revision step:  0 = A, 1 = B, 2 = C, 3 = D
- *  1-0:  "Dash" value, as in A-1, etc.
- *
- * NOTE:  Revision step affects calculation of CCK txpower for 4965.
- */
-#define CSR_HW_REV              (CSR_BASE+0x028)
-
-/* EEPROM reads */
-#define CSR_EEPROM_REG          (CSR_BASE+0x02c)
-#define CSR_EEPROM_GP           (CSR_BASE+0x030)
-#define CSR_GP_UCODE            (CSR_BASE+0x044)
-#define CSR_UCODE_DRV_GP1       (CSR_BASE+0x054)
-#define CSR_UCODE_DRV_GP1_SET   (CSR_BASE+0x058)
-#define CSR_UCODE_DRV_GP1_CLR   (CSR_BASE+0x05c)
-#define CSR_UCODE_DRV_GP2       (CSR_BASE+0x060)
-#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)
-
-/*
- * Indicates hardware rev, to determine CCK backoff for txpower calculation.
- * Bit fields:
- *  3-2:  0 = A, 1 = B, 2 = C, 3 = D step
- */
-#define CSR_HW_REV_WA_REG       (CSR_BASE+0x22C)
-
-/* Hardware interface configuration bits */
-#define CSR_HW_IF_CONFIG_REG_BIT_KEDRON_R       (0x00000010)
-#define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER      (0x00000C00)
-#define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI         (0x00000100)
-#define CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI       (0x00000200)
-#define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM (0x00200000)
-
-/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
- * acknowledged (reset) by host writing "1" to flagged bits. */
-#define CSR_INT_BIT_FH_RX        (1 << 31) /* Rx DMA, cmd responses, FH_INT[17:16] */
-#define CSR_INT_BIT_HW_ERR       (1 << 29) /* DMA hardware error FH_INT[31] */
-#define CSR_INT_BIT_DNLD         (1 << 28) /* uCode Download */
-#define CSR_INT_BIT_FH_TX        (1 << 27) /* Tx DMA FH_INT[1:0] */
-#define CSR_INT_BIT_SCD          (1 << 26) /* TXQ pointer advanced */
-#define CSR_INT_BIT_SW_ERR       (1 << 25) /* uCode error */
-#define CSR_INT_BIT_RF_KILL      (1 << 7)  /* HW RFKILL switch GP_CNTRL[27] toggled */
-#define CSR_INT_BIT_CT_KILL      (1 << 6)  /* Critical temp (chip too hot) rfkill */
-#define CSR_INT_BIT_SW_RX        (1 << 3)  /* Rx, command responses, 3945 */
-#define CSR_INT_BIT_WAKEUP       (1 << 1)  /* NIC controller waking up (pwr mgmt) */
-#define CSR_INT_BIT_ALIVE        (1 << 0)  /* uCode interrupts once it initializes */
-
-#define CSR_INI_SET_MASK        (CSR_INT_BIT_FH_RX   | \
-                                 CSR_INT_BIT_HW_ERR  | \
-                                 CSR_INT_BIT_FH_TX   | \
-                                 CSR_INT_BIT_SW_ERR  | \
-                                 CSR_INT_BIT_RF_KILL | \
-                                 CSR_INT_BIT_SW_RX   | \
-                                 CSR_INT_BIT_WAKEUP  | \
-                                 CSR_INT_BIT_ALIVE)
-
-/* interrupt flags in FH (flow handler) (PCI busmaster DMA) */
-#define CSR_FH_INT_BIT_ERR       (1 << 31) /* Error */
-#define CSR_FH_INT_BIT_HI_PRIOR  (1 << 30) /* High priority Rx, bypass coalescing */
-#define CSR_FH_INT_BIT_RX_CHNL1  (1 << 17) /* Rx channel 1 */
-#define CSR_FH_INT_BIT_RX_CHNL0  (1 << 16) /* Rx channel 0 */
-#define CSR_FH_INT_BIT_TX_CHNL1  (1 << 1)  /* Tx channel 1 */
-#define CSR_FH_INT_BIT_TX_CHNL0  (1 << 0)  /* Tx channel 0 */
-
-#define CSR_FH_INT_RX_MASK      (CSR_FH_INT_BIT_HI_PRIOR | \
-                                 CSR_FH_INT_BIT_RX_CHNL1 | \
-                                 CSR_FH_INT_BIT_RX_CHNL0)
-
-#define CSR_FH_INT_TX_MASK      (CSR_FH_INT_BIT_TX_CHNL1 | \
-                                 CSR_FH_INT_BIT_TX_CHNL0)
-
-
-/* RESET */
-#define CSR_RESET_REG_FLAG_NEVO_RESET                (0x00000001)
-#define CSR_RESET_REG_FLAG_FORCE_NMI                 (0x00000002)
-#define CSR_RESET_REG_FLAG_SW_RESET                  (0x00000080)
-#define CSR_RESET_REG_FLAG_MASTER_DISABLED           (0x00000100)
-#define CSR_RESET_REG_FLAG_STOP_MASTER               (0x00000200)
-
-/* GP (general purpose) CONTROL */
-#define CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY        (0x00000001)
-#define CSR_GP_CNTRL_REG_FLAG_INIT_DONE              (0x00000004)
-#define CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ         (0x00000008)
-#define CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP         (0x00000010)
-
-#define CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN           (0x00000001)
-
-#define CSR_GP_CNTRL_REG_MSK_POWER_SAVE_TYPE         (0x07000000)
-#define CSR_GP_CNTRL_REG_FLAG_MAC_POWER_SAVE         (0x04000000)
-#define CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW          (0x08000000)
-
-
-/* EEPROM REG */
-#define CSR_EEPROM_REG_READ_VALID_MSK   (0x00000001)
-#define CSR_EEPROM_REG_BIT_CMD          (0x00000002)
-
-/* EEPROM GP */
-#define CSR_EEPROM_GP_VALID_MSK         (0x00000006)
-#define CSR_EEPROM_GP_BAD_SIGNATURE     (0x00000000)
-#define CSR_EEPROM_GP_IF_OWNER_MSK      (0x00000180)
-
-/* UCODE DRV GP */
-#define CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP             (0x00000001)
-#define CSR_UCODE_SW_BIT_RFKILL                     (0x00000002)
-#define CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED           (0x00000004)
-#define CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT      (0x00000008)
-
-/* GPIO */
-#define CSR_GPIO_IN_BIT_AUX_POWER                   (0x00000200)
-#define CSR_GPIO_IN_VAL_VAUX_PWR_SRC                (0x00000000)
-#define CSR_GPIO_IN_VAL_VMAIN_PWR_SRC           CSR_GPIO_IN_BIT_AUX_POWER
-
-/* GI Chicken Bits */
-#define CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX  (0x00800000)
-#define CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER  (0x20000000)
-
-/*=== HBUS (Host-side Bus) ===*/
-#define HBUS_BASE       (0x400)
-
-/*
- * Registers for accessing device's internal SRAM memory (e.g. SCD SRAM
- * structures, error log, event log, verifying uCode load).
- * First write to address register, then read from or write to data register
- * to complete the job.  Once the address register is set up, accesses to
- * data registers auto-increment the address by one dword.
- * Bit usage for address registers (read or write):
- *  0-31:  memory address within device
- */
-#define HBUS_TARG_MEM_RADDR     (HBUS_BASE+0x00c)
-#define HBUS_TARG_MEM_WADDR     (HBUS_BASE+0x010)
-#define HBUS_TARG_MEM_WDAT      (HBUS_BASE+0x018)
-#define HBUS_TARG_MEM_RDAT      (HBUS_BASE+0x01c)
-
-/*
- * Registers for accessing device's internal peripheral registers
- * (e.g. SCD, BSM, etc.).  First write to address register,
- * then read from or write to data register to complete the job.
- * Bit usage for address registers (read or write):
- *  0-15:  register address (offset) within device
- * 24-25:  (# bytes - 1) to read or write (e.g. 3 for dword)
- */
-#define HBUS_TARG_PRPH_WADDR    (HBUS_BASE+0x044)
-#define HBUS_TARG_PRPH_RADDR    (HBUS_BASE+0x048)
-#define HBUS_TARG_PRPH_WDAT     (HBUS_BASE+0x04c)
-#define HBUS_TARG_PRPH_RDAT     (HBUS_BASE+0x050)
-
-/*
- * Per-Tx-queue write pointer (index, really!) (3945 and 4965).
- * Driver sets this to indicate index to next TFD that driver will fill
- * (1 past latest filled).
- * Bit usage:
- *  0-7:  queue write index (0-255)
- * 11-8:  queue selector (0-15)
- */
-#define HBUS_TARG_WRPTR         (HBUS_BASE+0x060)
-
-#define HBUS_TARG_MBX_C         (HBUS_BASE+0x030)
-
-#define HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED         (0x00000004)
-
 #define TFD_QUEUE_SIZE_MAX      (256)
 
 #define IWL_NUM_SCAN_RATES         (2)
@@ -599,9 +113,6 @@ struct iwl4965_eeprom {
 #define TFD_TX_CMD_SLOTS 256
 #define TFD_CMD_SLOTS 32
 
-#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl4965_cmd) - \
-                              sizeof(struct iwl4965_cmd_meta))
-
 /*
  * RX related structures and functions
  */
@@ -615,16 +126,18 @@ struct iwl4965_eeprom {
 /* Sizes and addresses for instruction and data memory (SRAM) in
  * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */
 #define RTC_INST_LOWER_BOUND                    (0x000000)
-#define KDR_RTC_INST_UPPER_BOUND                (0x018000)
+#define IWL49_RTC_INST_UPPER_BOUND              (0x018000)
 
 #define RTC_DATA_LOWER_BOUND                    (0x800000)
-#define KDR_RTC_DATA_UPPER_BOUND                (0x80A000)
+#define IWL49_RTC_DATA_UPPER_BOUND              (0x80A000)
 
-#define KDR_RTC_INST_SIZE    (KDR_RTC_INST_UPPER_BOUND - RTC_INST_LOWER_BOUND)
-#define KDR_RTC_DATA_SIZE    (KDR_RTC_DATA_UPPER_BOUND - RTC_DATA_LOWER_BOUND)
+#define IWL49_RTC_INST_SIZE     \
+                        (IWL49_RTC_INST_UPPER_BOUND - RTC_INST_LOWER_BOUND)
+#define IWL49_RTC_DATA_SIZE     \
+                        (IWL49_RTC_DATA_UPPER_BOUND - RTC_DATA_LOWER_BOUND)
 
-#define IWL_MAX_INST_SIZE KDR_RTC_INST_SIZE
-#define IWL_MAX_DATA_SIZE KDR_RTC_DATA_SIZE
+#define IWL_MAX_INST_SIZE IWL49_RTC_INST_SIZE
+#define IWL_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE
 
 /* Size of uCode instruction memory in bootstrap state machine */
 #define IWL_MAX_BSM_SIZE BSM_SRAM_SIZE
@@ -632,7 +145,7 @@ struct iwl4965_eeprom {
 static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr)
 {
         return (addr >= RTC_DATA_LOWER_BOUND) &&
-               (addr < KDR_RTC_DATA_UPPER_BOUND);
+               (addr < IWL49_RTC_DATA_UPPER_BOUND);
 }
 
 /********************* START TEMPERATURE *************************************/
@@ -1872,10 +1385,10 @@ static inline __le32 iwl4965_hw_set_rate_n_flags(u8 rate, u16 flags)
  * up to 7 DMA channels (FIFOs).  Each Tx queue is supported by a circular array
  * in DRAM containing 256 Transmit Frame Descriptors (TFDs).
  */
-#define IWL4965_MAX_WIN_SIZE              64
-#define IWL4965_QUEUE_SIZE               256
-#define IWL4965_NUM_FIFOS                  7
-#define IWL_MAX_NUM_QUEUES                16
+#define IWL4965_MAX_WIN_SIZE    64
+#define IWL4965_QUEUE_SIZE      256
+#define IWL4965_NUM_FIFOS       7
+#define IWL4965_MAX_NUM_QUEUES  16
 
 
 /**
@@ -2040,30 +1553,30 @@ struct iwl4965_sched_queue_byte_cnt_tbl {
  */
 struct iwl4965_shared {
         struct iwl4965_sched_queue_byte_cnt_tbl
-         queues_byte_cnt_tbls[IWL_MAX_NUM_QUEUES];
-        __le32 val0;
+         queues_byte_cnt_tbls[IWL4965_MAX_NUM_QUEUES];
+        __le32 rb_closed;
 
         /* __le32 rb_closed_stts_rb_num:12; */
 #define IWL_rb_closed_stts_rb_num_POS 0
 #define IWL_rb_closed_stts_rb_num_LEN 12
-#define IWL_rb_closed_stts_rb_num_SYM val0
+#define IWL_rb_closed_stts_rb_num_SYM rb_closed
         /* __le32 rsrv1:4; */
         /* __le32 rb_closed_stts_rx_frame_num:12; */
 #define IWL_rb_closed_stts_rx_frame_num_POS 16
 #define IWL_rb_closed_stts_rx_frame_num_LEN 12
-#define IWL_rb_closed_stts_rx_frame_num_SYM val0
+#define IWL_rb_closed_stts_rx_frame_num_SYM rb_closed
         /* __le32 rsrv2:4; */
 
-        __le32 val1;
+        __le32 frm_finished;
         /* __le32 frame_finished_stts_rb_num:12; */
 #define IWL_frame_finished_stts_rb_num_POS 0
 #define IWL_frame_finished_stts_rb_num_LEN 12
-#define IWL_frame_finished_stts_rb_num_SYM val1
+#define IWL_frame_finished_stts_rb_num_SYM frm_finished
         /* __le32 rsrv3:4; */
         /* __le32 frame_finished_stts_rx_frame_num:12; */
 #define IWL_frame_finished_stts_rx_frame_num_POS 16
 #define IWL_frame_finished_stts_rx_frame_num_LEN 12
-#define IWL_frame_finished_stts_rx_frame_num_SYM val1
+#define IWL_frame_finished_stts_rx_frame_num_SYM frm_finished
         /* __le32 rsrv4:4; */
 
         __le32 padding1;  /* so that allocation will be aligned to 16B */
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-io.h b/drivers/net/wireless/iwlwifi/iwl-4965-io.h
deleted file mode 100644
index 34a0b57eea0c..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-4965-io.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
- *
- * Portions of this file are derived from the ipw3945 project.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * James P. Ketrenos <ipw2100-admin@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl4965_io_h__
-#define __iwl4965_io_h__
-
-#include <linux/io.h>
-
-#include "iwl-4965-debug.h"
-
-/*
- * IO, register, and NIC memory access functions
- *
- * NOTE on naming convention and macro usage for these
- *
- * A single _ prefix before a an access function means that no state
- * check or debug information is printed when that function is called.
- *
- * A double __ prefix before an access function means that state is checked
- * and the current line number is printed in addition to any other debug output.
- *
- * The non-prefixed name is the #define that maps the caller into a
- * #define that provides the caller's __LINE__ to the double prefix version.
- *
- * If you wish to call the function without any debug or state checking,
- * you should use the single _ prefix version (as is used by dependent IO
- * routines, for example _iwl4965_read_direct32 calls the non-check version of
- * _iwl4965_read32.)
- *
- * These declarations are *extremely* useful in quickly isolating code deltas
- * which result in misconfiguring of the hardware I/O.  In combination with
- * git-bisect and the IO debug level you can quickly determine the specific
- * commit which breaks the IO sequence to the hardware.
- *
- */
-
-#define _iwl4965_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs))
-#ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv *iwl,
-                                 u32 ofs, u32 val)
-{
-        IWL_DEBUG_IO("write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);
-        _iwl4965_write32(iwl, ofs, val);
-}
-#define iwl4965_write32(iwl, ofs, val) \
-        __iwl4965_write32(__FILE__, __LINE__, iwl, ofs, val)
-#else
-#define iwl4965_write32(iwl, ofs, val) _iwl4965_write32(iwl, ofs, val)
-#endif
-
-#define _iwl4965_read32(iwl, ofs) readl((iwl)->hw_base + (ofs))
-#ifdef CONFIG_IWL4965_DEBUG
-static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_priv *iwl, u32 ofs)
-{
-        IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);
-        return _iwl4965_read32(iwl, ofs);
-}
-#define iwl4965_read32(iwl, ofs) __iwl4965_read32(__FILE__, __LINE__, iwl, ofs)
-#else
-#define iwl4965_read32(p, o) _iwl4965_read32(p, o)
-#endif
-
-static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr,
-                                u32 bits, u32 mask, int timeout)
-{
-        int i = 0;
-
-        do {
-                if ((_iwl4965_read32(priv, addr) & mask) == (bits & mask))
-                        return i;
-                mdelay(10);
-                i += 10;
-        } while (i < timeout);
-
-        return -ETIMEDOUT;
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static inline int __iwl4965_poll_bit(const char *f, u32 l,
-                                 struct iwl4965_priv *priv, u32 addr,
-                                 u32 bits, u32 mask, int timeout)
-{
-        int ret = _iwl4965_poll_bit(priv, addr, bits, mask, timeout);
-        if (unlikely(ret  == -ETIMEDOUT))
-                IWL_DEBUG_IO
-                    ("poll_bit(0x%08X, 0x%08X, 0x%08X) - timedout - %s %d\n",
-                     addr, bits, mask, f, l);
-        else
-                IWL_DEBUG_IO
-                    ("poll_bit(0x%08X, 0x%08X, 0x%08X) = 0x%08X - %s %d\n",
-                     addr, bits, mask, ret, f, l);
-        return ret;
-}
-#define iwl4965_poll_bit(iwl, addr, bits, mask, timeout) \
-        __iwl4965_poll_bit(__FILE__, __LINE__, iwl, addr, bits, mask, timeout)
-#else
-#define iwl4965_poll_bit(p, a, b, m, t) _iwl4965_poll_bit(p, a, b, m, t)
-#endif
-
-static inline void _iwl4965_set_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)
-{
-        _iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) | mask);
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl4965_set_bit(const char *f, u32 l,
-                                 struct iwl4965_priv *priv, u32 reg, u32 mask)
-{
-        u32 val = _iwl4965_read32(priv, reg) | mask;
-        IWL_DEBUG_IO("set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
-        _iwl4965_write32(priv, reg, val);
-}
-#define iwl4965_set_bit(p, r, m) __iwl4965_set_bit(__FILE__, __LINE__, p, r, m)
-#else
-#define iwl4965_set_bit(p, r, m) _iwl4965_set_bit(p, r, m)
-#endif
-
-static inline void _iwl4965_clear_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)
-{
-        _iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) & ~mask);
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl4965_clear_bit(const char *f, u32 l,
-                                   struct iwl4965_priv *priv, u32 reg, u32 mask)
-{
-        u32 val = _iwl4965_read32(priv, reg) & ~mask;
-        IWL_DEBUG_IO("clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
-        _iwl4965_write32(priv, reg, val);
-}
-#define iwl4965_clear_bit(p, r, m) __iwl4965_clear_bit(__FILE__, __LINE__, p, r, m)
-#else
-#define iwl4965_clear_bit(p, r, m) _iwl4965_clear_bit(p, r, m)
-#endif
-
-static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv)
-{
-        int ret;
-        u32 gp_ctl;
-
-#ifdef CONFIG_IWL4965_DEBUG
-        if (atomic_read(&priv->restrict_refcnt))
-                return 0;
-#endif
-        if (test_bit(STATUS_RF_KILL_HW, &priv->status) ||
-            test_bit(STATUS_RF_KILL_SW, &priv->status)) {
-                IWL_WARNING("WARNING: Requesting MAC access during RFKILL "
-                        "wakes up NIC\n");
-
-                /* 10 msec allows time for NIC to complete its data save */
-                gp_ctl = _iwl4965_read32(priv, CSR_GP_CNTRL);
-                if (gp_ctl & CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY) {
-                        IWL_DEBUG_RF_KILL("Wait for complete power-down, "
-                                "gpctl = 0x%08x\n", gp_ctl);
-                        mdelay(10);
-                } else
-                        IWL_DEBUG_RF_KILL("power-down complete, "
-                                          "gpctl = 0x%08x\n", gp_ctl);
-        }
-
-        /* this bit wakes up the NIC */
-        _iwl4965_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-        ret = _iwl4965_poll_bit(priv, CSR_GP_CNTRL,
-                           CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,
-                           (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |
-                            CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 50);
-        if (ret < 0) {
-                IWL_ERROR("MAC is in deep sleep!\n");
-                return -EIO;
-        }
-
-#ifdef CONFIG_IWL4965_DEBUG
-        atomic_inc(&priv->restrict_refcnt);
-#endif
-        return 0;
-}
-
-#ifdef CONFIG_IWL4965_DEBUG
-static inline int __iwl4965_grab_nic_access(const char *f, u32 l,
-                                               struct iwl4965_priv *priv)
-{
-        if (atomic_read(&priv->restrict_refcnt))
-                IWL_DEBUG_INFO("Grabbing access while already held at "
-                               "line %d.\n", l);
-
-        IWL_DEBUG_IO("grabbing nic access - %s %d\n", f, l);
-        return _iwl4965_grab_nic_access(priv);
-}
-#define iwl4965_grab_nic_access(priv) \
-        __iwl4965_grab_nic_access(__FILE__, __LINE__, priv)
-#else
-#define iwl4965_grab_nic_access(priv) \
-        _iwl4965_grab_nic_access(priv)
-#endif
-
-static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv)
-{
-#ifdef CONFIG_IWL4965_DEBUG
-        if (atomic_dec_and_test(&priv->restrict_refcnt))
-#endif
-                _iwl4965_clear_bit(priv, CSR_GP_CNTRL,
-                               CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl4965_release_nic_access(const char *f, u32 l,
-                                            struct iwl4965_priv *priv)
-{
-        if (atomic_read(&priv->restrict_refcnt) <= 0)
-                IWL_ERROR("Release unheld nic access at line %d.\n", l);
-
-        IWL_DEBUG_IO("releasing nic access - %s %d\n", f, l);
-        _iwl4965_release_nic_access(priv);
-}
-#define iwl4965_release_nic_access(priv) \
-        __iwl4965_release_nic_access(__FILE__, __LINE__, priv)
-#else
-#define iwl4965_release_nic_access(priv) \
-        _iwl4965_release_nic_access(priv)
-#endif
-
-static inline u32 _iwl4965_read_direct32(struct iwl4965_priv *priv, u32 reg)
-{
-        return _iwl4965_read32(priv, reg);
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static inline u32 __iwl4965_read_direct32(const char *f, u32 l,
-                                        struct iwl4965_priv *priv, u32 reg)
-{
-        u32 value = _iwl4965_read_direct32(priv, reg);
-        if (!atomic_read(&priv->restrict_refcnt))
-                IWL_ERROR("Nic access not held from %s %d\n", f, l);
-        IWL_DEBUG_IO("read_direct32(0x%4X) = 0x%08x - %s %d \n", reg, value,
-                     f, l);
-        return value;
-}
-#define iwl4965_read_direct32(priv, reg) \
-        __iwl4965_read_direct32(__FILE__, __LINE__, priv, reg)
-#else
-#define iwl4965_read_direct32 _iwl4965_read_direct32
-#endif
-
-static inline void _iwl4965_write_direct32(struct iwl4965_priv *priv,
-                                         u32 reg, u32 value)
-{
-        _iwl4965_write32(priv, reg, value);
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static void __iwl4965_write_direct32(u32 line,
-                                   struct iwl4965_priv *priv, u32 reg, u32 value)
-{
-        if (!atomic_read(&priv->restrict_refcnt))
-                IWL_ERROR("Nic access not held from line %d\n", line);
-        _iwl4965_write_direct32(priv, reg, value);
-}
-#define iwl4965_write_direct32(priv, reg, value) \
-        __iwl4965_write_direct32(__LINE__, priv, reg, value)
-#else
-#define iwl4965_write_direct32 _iwl4965_write_direct32
-#endif
-
-static inline void iwl4965_write_reg_buf(struct iwl4965_priv *priv,
-                                               u32 reg, u32 len, u32 *values)
-{
-        u32 count = sizeof(u32);
-
-        if ((priv != NULL) && (values != NULL)) {
-                for (; 0 < len; len -= count, reg += count, values++)
-                        _iwl4965_write_direct32(priv, reg, *values);
-        }
-}
-
-static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv,
-                                           u32 addr, u32 mask, int timeout)
-{
-        int i = 0;
-
-        do {
-                if ((_iwl4965_read_direct32(priv, addr) & mask) == mask)
-                        return i;
-                mdelay(10);
-                i += 10;
-        } while (i < timeout);
-
-        return -ETIMEDOUT;
-}
-
-#ifdef CONFIG_IWL4965_DEBUG
-static inline int __iwl4965_poll_direct_bit(const char *f, u32 l,
-                                            struct iwl4965_priv *priv,
-                                            u32 addr, u32 mask, int timeout)
-{
-        int ret  = _iwl4965_poll_direct_bit(priv, addr, mask, timeout);
-
-        if (unlikely(ret == -ETIMEDOUT))
-                IWL_DEBUG_IO("poll_direct_bit(0x%08X, 0x%08X) - "
-                             "timedout - %s %d\n", addr, mask, f, l);
-        else
-                IWL_DEBUG_IO("poll_direct_bit(0x%08X, 0x%08X) = 0x%08X "
-                             "- %s %d\n", addr, mask, ret, f, l);
-        return ret;
-}
-#define iwl4965_poll_direct_bit(iwl, addr, mask, timeout) \
-        __iwl4965_poll_direct_bit(__FILE__, __LINE__, iwl, addr, mask, timeout)
-#else
-#define iwl4965_poll_direct_bit _iwl4965_poll_direct_bit
-#endif
-
-static inline u32 _iwl4965_read_prph(struct iwl4965_priv *priv, u32 reg)
-{
-        _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
-        return _iwl4965_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 reg)
-{
-        if (!atomic_read(&priv->restrict_refcnt))
-                IWL_ERROR("Nic access not held from line %d\n", line);
-        return _iwl4965_read_prph(priv, reg);
-}
-
-#define iwl4965_read_prph(priv, reg) \
-        __iwl4965_read_prph(__LINE__, priv, reg)
-#else
-#define iwl4965_read_prph _iwl4965_read_prph
-#endif
-
-static inline void _iwl4965_write_prph(struct iwl4965_priv *priv,
-                                             u32 addr, u32 val)
-{
-        _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
-                              ((addr & 0x0000FFFF) | (3 << 24)));
-        _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
-}
-#ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv,
-                                              u32 addr, u32 val)
-{
-        if (!atomic_read(&priv->restrict_refcnt))
-                IWL_ERROR("Nic access from line %d\n", line);
-        _iwl4965_write_prph(priv, addr, val);
-}
-
-#define iwl4965_write_prph(priv, addr, val) \
-        __iwl4965_write_prph(__LINE__, priv, addr, val);
-#else
-#define iwl4965_write_prph _iwl4965_write_prph
-#endif
-
-#define _iwl4965_set_bits_prph(priv, reg, mask) \
-        _iwl4965_write_prph(priv, reg, (_iwl4965_read_prph(priv, reg) | mask))
-#ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv,
-                                        u32 reg, u32 mask)
-{
-        if (!atomic_read(&priv->restrict_refcnt))
-                IWL_ERROR("Nic access not held from line %d\n", line);
-
-        _iwl4965_set_bits_prph(priv, reg, mask);
-}
-#define iwl4965_set_bits_prph(priv, reg, mask) \
-        __iwl4965_set_bits_prph(__LINE__, priv, reg, mask)
-#else
-#define iwl4965_set_bits_prph _iwl4965_set_bits_prph
-#endif
-
-#define _iwl4965_set_bits_mask_prph(priv, reg, bits, mask) \
-        _iwl4965_write_prph(priv, reg, ((_iwl4965_read_prph(priv, reg) & mask) | bits))
-
-#ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl4965_set_bits_mask_prph(u32 line,
-                struct iwl4965_priv *priv, u32 reg, u32 bits, u32 mask)
-{
-        if (!atomic_read(&priv->restrict_refcnt))
-                IWL_ERROR("Nic access not held from line %d\n", line);
-        _iwl4965_set_bits_mask_prph(priv, reg, bits, mask);
-}
-#define iwl4965_set_bits_mask_prph(priv, reg, bits, mask) \
-        __iwl4965_set_bits_mask_prph(__LINE__, priv, reg, bits, mask)
-#else
-#define iwl4965_set_bits_mask_prph _iwl4965_set_bits_mask_prph
-#endif
-
-static inline void iwl4965_clear_bits_prph(struct iwl4965_priv
-                                                 *priv, u32 reg, u32 mask)
-{
-        u32 val = _iwl4965_read_prph(priv, reg);
-        _iwl4965_write_prph(priv, reg, (val & ~mask));
-}
-
-static inline u32 iwl4965_read_targ_mem(struct iwl4965_priv *priv, u32 addr)
-{
-        iwl4965_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);
-        return iwl4965_read_direct32(priv, HBUS_TARG_MEM_RDAT);
-}
-
-static inline void iwl4965_write_targ_mem(struct iwl4965_priv *priv, u32 addr, u32 val)
-{
-        iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
-        iwl4965_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);
-}
-
-static inline void iwl4965_write_targ_mem_buf(struct iwl4965_priv *priv, u32 addr,
-                                          u32 len, u32 *values)
-{
-        iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
-        for (; 0 < len; len -= sizeof(u32), values++)
-                iwl4965_write_direct32(priv, HBUS_TARG_MEM_WDAT, *values);
-}
-#endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index d06462264147..b608e1ca8b40 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -36,9 +36,10 @@
 
 #include <linux/workqueue.h>
 
-#include "../net/mac80211/ieee80211_rate.h"
+#include "../net/mac80211/rate.h"
 
 #include "iwl-4965.h"
+#include "iwl-core.h"
 #include "iwl-helpers.h"
 
 #define RS_NAME "iwl-4965-rs"
@@ -83,7 +84,7 @@ struct iwl4965_rate_scale_data {
 /**
  * struct iwl4965_scale_tbl_info -- tx params and success history for all rates
  *
- * There are two of these in struct iwl_rate_scale_priv,
+ * There are two of these in struct iwl4965_lq_sta,
  * one for "active", and one for "search".
  */
 struct iwl4965_scale_tbl_info {
@@ -98,8 +99,23 @@ struct iwl4965_scale_tbl_info {
         struct iwl4965_rate_scale_data win[IWL_RATE_COUNT]; /* rate histories */
 };
 
+#ifdef CONFIG_IWL4965_HT
+
+struct iwl4965_traffic_load {
+        unsigned long time_stamp;       /* age of the oldest statistics */
+        u32 packet_count[TID_QUEUE_MAX_SIZE];   /* packet count in this time
+                                                 * slice */
+        u32 total;                      /* total num of packets during the
+                                         * last TID_MAX_TIME_DIFF */
+        u8 queue_count;                 /* number of queues that has
+                                         * been used since the last cleanup */
+        u8 head;                        /* start of the circular buffer */
+};
+
+#endif /* CONFIG_IWL4965_HT */
+
 /**
- * struct iwl_rate_scale_priv -- driver's rate scaling private structure
+ * struct iwl4965_lq_sta -- driver's rate scaling private structure
  *
  * Pointer to this gets passed back and forth between driver and mac80211.
  */
@@ -124,7 +140,7 @@ struct iwl4965_lq_sta {
         u8 valid_antenna;
         u8 is_green;
         u8 is_dup;
-        u8 phymode;
+        enum ieee80211_band band;
         u8 ibss_sta_added;
 
         /* The following are bitmaps of rates; IWL_RATE_6M_MASK, etc. */
@@ -134,23 +150,30 @@ struct iwl4965_lq_sta {
         u16 active_mimo_rate;
         u16 active_rate_basic;
 
-        struct iwl4965_link_quality_cmd lq;
+        struct iwl_link_quality_cmd lq;
         struct iwl4965_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */
+#ifdef CONFIG_IWL4965_HT
+        struct iwl4965_traffic_load load[TID_MAX_LOAD_COUNT];
+        u8 tx_agg_tid_en;
+#endif
 #ifdef CONFIG_MAC80211_DEBUGFS
         struct dentry *rs_sta_dbgfs_scale_table_file;
         struct dentry *rs_sta_dbgfs_stats_table_file;
+#ifdef CONFIG_IWL4965_HT
+        struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
+#endif
         struct iwl4965_rate dbg_fixed;
-        struct iwl4965_priv *drv;
+        struct iwl_priv *drv;
 #endif
 };
 
-static void rs_rate_scale_perform(struct iwl4965_priv *priv,
+static void rs_rate_scale_perform(struct iwl_priv *priv,
                                    struct net_device *dev,
                                    struct ieee80211_hdr *hdr,
                                    struct sta_info *sta);
 static void rs_fill_link_cmd(struct iwl4965_lq_sta *lq_sta,
                              struct iwl4965_rate *tx_mcs,
-                             struct iwl4965_link_quality_cmd *tbl);
+                             struct iwl_link_quality_cmd *tbl);
 
 
 #ifdef CONFIG_MAC80211_DEBUGFS
@@ -207,68 +230,150 @@ static s32 expected_tpt_mimo40MHzSGI[IWL_RATE_COUNT] = {
         0, 0, 0, 0, 131, 131, 191, 222, 242, 270, 284, 289, 293
 };
 
-static int iwl4965_lq_sync_callback(struct iwl4965_priv *priv,
-                                struct iwl4965_cmd *cmd, struct sk_buff *skb)
+static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags)
 {
-        /*We didn't cache the SKB; let the caller free it */
-        return 1;
+        return (u8)(rate_n_flags & 0xFF);
 }
 
-static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags)
+static void rs_rate_scale_clear_window(struct iwl4965_rate_scale_data *window)
 {
-        return (u8)(rate_n_flags & 0xFF);
+        window->data = 0;
+        window->success_counter = 0;
+        window->success_ratio = IWL_INVALID_VALUE;
+        window->counter = 0;
+        window->average_tpt = IWL_INVALID_VALUE;
+        window->stamp = 0;
 }
 
-static int rs_send_lq_cmd(struct iwl4965_priv *priv,
-                          struct iwl4965_link_quality_cmd *lq, u8 flags)
+#ifdef CONFIG_IWL4965_HT
+/*
+ *      removes the old data from the statistics. All data that is older than
+ *      TID_MAX_TIME_DIFF, will be deleted.
+ */
+static void rs_tl_rm_old_stats(struct iwl4965_traffic_load *tl, u32 curr_time)
 {
-#ifdef CONFIG_IWL4965_DEBUG
-        int i;
-#endif
-        struct iwl4965_host_cmd cmd = {
-                .id = REPLY_TX_LINK_QUALITY_CMD,
-                .len = sizeof(struct iwl4965_link_quality_cmd),
-                .meta.flags = flags,
-                .data = lq,
-        };
-
-        if ((lq->sta_id == 0xFF) &&
-            (priv->iw_mode == IEEE80211_IF_TYPE_IBSS))
-                return -EINVAL;
+        /* The oldest age we want to keep */
+        u32 oldest_time = curr_time - TID_MAX_TIME_DIFF;
+
+        while (tl->queue_count &&
+               (tl->time_stamp < oldest_time)) {
+                tl->total -= tl->packet_count[tl->head];
+                tl->packet_count[tl->head] = 0;
+                tl->time_stamp += TID_QUEUE_CELL_SPACING;
+                tl->queue_count--;
+                tl->head++;
+                if (tl->head >= TID_QUEUE_MAX_SIZE)
+                        tl->head = 0;
+        }
+}
+
+/*
+ *      increment traffic load value for tid and also remove
+ *      any old values if passed the certain time period
+ */
+static void rs_tl_add_packet(struct iwl4965_lq_sta *lq_data, u8 tid)
+{
+        u32 curr_time = jiffies_to_msecs(jiffies);
+        u32 time_diff;
+        s32 index;
+        struct iwl4965_traffic_load *tl = NULL;
 
-        if (lq->sta_id == 0xFF)
-                lq->sta_id = IWL_AP_ID;
+        if (tid >= TID_MAX_LOAD_COUNT)
+                return;
 
-        IWL_DEBUG_RATE("lq station id 0x%x\n", lq->sta_id);
-        IWL_DEBUG_RATE("lq dta 0x%X 0x%X\n",
-                       lq->general_params.single_stream_ant_msk,
-                       lq->general_params.dual_stream_ant_msk);
-#ifdef CONFIG_IWL4965_DEBUG
-        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
-                IWL_DEBUG_RATE("lq index %d 0x%X\n",
-                                i, lq->rs_table[i].rate_n_flags);
-#endif
+        tl = &lq_data->load[tid];
 
-        if (flags & CMD_ASYNC)
-                cmd.meta.u.callback = iwl4965_lq_sync_callback;
+        curr_time -= curr_time % TID_ROUND_VALUE;
 
-        if (iwl4965_is_associated(priv) && priv->assoc_station_added &&
-            priv->lq_mngr.lq_ready)
-                return  iwl4965_send_cmd(priv, &cmd);
+        /* Happens only for the first packet. Initialize the data */
+        if (!(tl->queue_count)) {
+                tl->total = 1;
+                tl->time_stamp = curr_time;
+                tl->queue_count = 1;
+                tl->head = 0;
+                tl->packet_count[0] = 1;
+                return;
+        }
 
-        return 0;
+        time_diff = TIME_WRAP_AROUND(tl->time_stamp, curr_time);
+        index = time_diff / TID_QUEUE_CELL_SPACING;
+
+        /* The history is too long: remove data that is older than */
+        /* TID_MAX_TIME_DIFF */
+        if (index >= TID_QUEUE_MAX_SIZE)
+                rs_tl_rm_old_stats(tl, curr_time);
+
+        index = (tl->head + index) % TID_QUEUE_MAX_SIZE;
+        tl->packet_count[index] = tl->packet_count[index] + 1;
+        tl->total = tl->total + 1;
+
+        if ((index + 1) > tl->queue_count)
+                tl->queue_count = index + 1;
 }
 
-static void rs_rate_scale_clear_window(struct iwl4965_rate_scale_data *window)
+/*
+        get the traffic load value for tid
+*/
+static u32 rs_tl_get_load(struct iwl4965_lq_sta *lq_data, u8 tid)
 {
-        window->data = 0;
-        window->success_counter = 0;
-        window->success_ratio = IWL_INVALID_VALUE;
-        window->counter = 0;
-        window->average_tpt = IWL_INVALID_VALUE;
-        window->stamp = 0;
+        u32 curr_time = jiffies_to_msecs(jiffies);
+        u32 time_diff;
+        s32 index;
+        struct iwl4965_traffic_load *tl = NULL;
+
+        if (tid >= TID_MAX_LOAD_COUNT)
+                return 0;
+
+        tl = &(lq_data->load[tid]);
+
+        curr_time -= curr_time % TID_ROUND_VALUE;
+
+        if (!(tl->queue_count))
+                return 0;
+
+        time_diff = TIME_WRAP_AROUND(tl->time_stamp, curr_time);
+        index = time_diff / TID_QUEUE_CELL_SPACING;
+
+        /* The history is too long: remove data that is older than */
+        /* TID_MAX_TIME_DIFF */
+        if (index >= TID_QUEUE_MAX_SIZE)
+                rs_tl_rm_old_stats(tl, curr_time);
+
+        return tl->total;
+}
+
+static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
+                                struct iwl4965_lq_sta *lq_data, u8 tid,
+                                struct sta_info *sta)
+{
+        unsigned long state;
+        DECLARE_MAC_BUF(mac);
+
+        spin_lock_bh(&sta->ampdu_mlme.ampdu_tx);
+        state = sta->ampdu_mlme.tid_state_tx[tid];
+        spin_unlock_bh(&sta->ampdu_mlme.ampdu_tx);
+
+        if (state == HT_AGG_STATE_IDLE &&
+            rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {
+                IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n",
+                                print_mac(mac, sta->addr), tid);
+                ieee80211_start_tx_ba_session(priv->hw, sta->addr, tid);
+        }
+}
+
+static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,
+                                struct iwl4965_lq_sta *lq_data,
+                                struct sta_info *sta)
+{
+        if ((tid < TID_MAX_LOAD_COUNT))
+                rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);
+        else if (tid == IWL_AGG_ALL_TID)
+                for (tid = 0; tid < TID_MAX_LOAD_COUNT; tid++)
+                        rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);
 }
 
+#endif /* CONFIG_IWLWIFI_HT */
+
 /**
  * rs_collect_tx_data - Update the success/failure sliding window
  *
@@ -277,7 +382,8 @@ static void rs_rate_scale_clear_window(struct iwl4965_rate_scale_data *window)
  * packets.
  */
 static int rs_collect_tx_data(struct iwl4965_rate_scale_data *windows,
-                              int scale_index, s32 tpt, u32 status)
+                              int scale_index, s32 tpt, int retries,
+                              int successes)
 {
         struct iwl4965_rate_scale_data *window = NULL;
         u64 mask;
@@ -298,26 +404,33 @@ static int rs_collect_tx_data(struct iwl4965_rate_scale_data *windows,
          * subtract "1" from the success counter (this is the main reason
          * we keep these bitmaps!).
          */
-        if (window->counter >= win_size) {
-                window->counter = win_size - 1;
-                mask = 1;
-                mask = (mask << (win_size - 1));
-                if ((window->data & mask)) {
-                        window->data &= ~mask;
-                        window->success_counter = window->success_counter - 1;
+        while (retries > 0) {
+                if (window->counter >= win_size) {
+                        window->counter = win_size - 1;
+                        mask = 1;
+                        mask = (mask << (win_size - 1));
+                        if (window->data & mask) {
+                                window->data &= ~mask;
+                                window->success_counter =
+                                        window->success_counter - 1;
+                        }
                 }
-        }
 
-        /* Increment frames-attempted counter */
-        window->counter = window->counter + 1;
+                /* Increment frames-attempted counter */
+                window->counter++;
+
+                /* Shift bitmap by one frame (throw away oldest history),
+                 * OR in "1", and increment "success" if this
+                 * frame was successful. */
+                mask = window->data;
+                window->data = (mask << 1);
+                if (successes > 0) {
+                        window->success_counter = window->success_counter + 1;
+                        window->data |= 0x1;
+                        successes--;
+                }
 
-        /* Shift bitmap by one frame (throw away oldest history),
-         * OR in "1", and increment "success" if this frame was successful. */
-        mask = window->data;
-        window->data = (mask << 1);
-        if (status != 0) {
-                window->success_counter = window->success_counter + 1;
-                window->data |= 0x1;
+                retries--;
         }
 
         /* Calculate current success ratio, avoid divide-by-0! */
@@ -404,13 +517,14 @@ static void rs_mcs_from_tbl(struct iwl4965_rate *mcs_rate,
  * fill "search" or "active" tx mode table.
  */
 static int rs_get_tbl_info_from_mcs(const struct iwl4965_rate *mcs_rate,
-                                    int phymode, struct iwl4965_scale_tbl_info *tbl,
+                                    enum ieee80211_band band,
+                                    struct iwl4965_scale_tbl_info *tbl,
                                     int *rate_idx)
 {
         int index;
         u32 ant_msk;
 
-        index = iwl4965_rate_index_from_plcp(mcs_rate->rate_n_flags);
+        index = iwl4965_hwrate_to_plcp_idx(mcs_rate->rate_n_flags);
 
         if (index  == IWL_RATE_INVALID) {
                 *rate_idx = -1;
@@ -429,7 +543,7 @@ static int rs_get_tbl_info_from_mcs(const struct iwl4965_rate *mcs_rate,
                         tbl->lq_type = LQ_NONE;
                 else {
 
-                        if (phymode == MODE_IEEE80211A)
+                        if (band == IEEE80211_BAND_5GHZ)
                                 tbl->lq_type = LQ_A;
                         else
                                 tbl->lq_type = LQ_G;
@@ -498,7 +612,7 @@ static inline void rs_toggle_antenna(struct iwl4965_rate *new_rate,
         }
 }
 
-static inline u8 rs_use_green(struct iwl4965_priv *priv,
+static inline u8 rs_use_green(struct iwl_priv *priv,
                               struct ieee80211_conf *conf)
 {
 #ifdef CONFIG_IWL4965_HT
@@ -607,7 +721,7 @@ static void rs_get_lower_rate(struct iwl4965_lq_sta *lq_sta,
         if (!is_legacy(tbl->lq_type) && (!ht_possible || !scale_index)) {
                 switch_to_legacy = 1;
                 scale_index = rs_ht_to_legacy[scale_index];
-                if (lq_sta->phymode == MODE_IEEE80211A)
+                if (lq_sta->band == IEEE80211_BAND_5GHZ)
                         tbl->lq_type = LQ_A;
                 else
                         tbl->lq_type = LQ_G;
@@ -625,7 +739,7 @@ static void rs_get_lower_rate(struct iwl4965_lq_sta *lq_sta,
         /* Mask with station rate restriction */
         if (is_legacy(tbl->lq_type)) {
                 /* supp_rates has no CCK bits in A mode */
-                if (lq_sta->phymode == (u8) MODE_IEEE80211A)
+                if (lq_sta->band == IEEE80211_BAND_5GHZ)
                         rate_mask  = (u16)(rate_mask &
                            (lq_sta->supp_rates << IWL_FIRST_OFDM_RATE));
                 else
@@ -658,11 +772,12 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
         u8 retries;
         int rs_index, index = 0;
         struct iwl4965_lq_sta *lq_sta;
-        struct iwl4965_link_quality_cmd *table;
+        struct iwl_link_quality_cmd *table;
         struct sta_info *sta;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;
+        struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = local_to_hw(local);
         struct iwl4965_rate_scale_data *window = NULL;
         struct iwl4965_rate_scale_data *search_win = NULL;
         struct iwl4965_rate tx_mcs;
@@ -677,28 +792,32 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
         if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1))
                 return;
 
+        /* This packet was aggregated but doesn't carry rate scale info */
+        if ((tx_resp->control.flags & IEEE80211_TXCTL_AMPDU) &&
+            !(tx_resp->flags & IEEE80211_TX_STATUS_AMPDU))
+                return;
+
         retries = tx_resp->retry_count;
 
         if (retries > 15)
                 retries = 15;
 
+        rcu_read_lock();
 
         sta = sta_info_get(local, hdr->addr1);
 
-        if (!sta || !sta->rate_ctrl_priv) {
-                if (sta)
-                        sta_info_put(sta);
-                return;
-        }
+        if (!sta || !sta->rate_ctrl_priv)
+                goto out;
+
 
         lq_sta = (struct iwl4965_lq_sta *)sta->rate_ctrl_priv;
 
         if (!priv->lq_mngr.lq_ready)
-                return;
+                goto out;
 
         if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
             !lq_sta->ibss_sta_added)
-                return;
+                goto out;
 
         table = &lq_sta->lq;
         active_index = lq_sta->active_tbl;
@@ -719,17 +838,6 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
         search_win = (struct iwl4965_rate_scale_data *)
             &(search_tbl->win[0]);
 
-        tx_mcs.rate_n_flags = tx_resp->control.tx_rate;
-
-        rs_get_tbl_info_from_mcs(&tx_mcs, priv->phymode,
-                                  &tbl_type, &rs_index);
-        if ((rs_index < 0) || (rs_index >= IWL_RATE_COUNT)) {
-                IWL_DEBUG_RATE("bad rate index at: %d rate 0x%X\n",
-                             rs_index, tx_mcs.rate_n_flags);
-                sta_info_put(sta);
-                return;
-        }
-
         /*
          * Ignore this Tx frame response if its initial rate doesn't match
          * that of latest Link Quality command.  There may be stragglers
@@ -738,14 +846,29 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
          * to check "search" mode, or a prior "search" mode after we've moved
          * to a new "search" mode (which might become the new "active" mode).
          */
-        if (retries &&
-            (tx_mcs.rate_n_flags !=
-                                le32_to_cpu(table->rs_table[0].rate_n_flags))) {
-                IWL_DEBUG_RATE("initial rate does not match 0x%x 0x%x\n",
-                                tx_mcs.rate_n_flags,
-                                le32_to_cpu(table->rs_table[0].rate_n_flags));
-                sta_info_put(sta);
-                return;
+        tx_mcs.rate_n_flags = le32_to_cpu(table->rs_table[0].rate_n_flags);
+        rs_get_tbl_info_from_mcs(&tx_mcs, priv->band, &tbl_type, &rs_index);
+        if (priv->band == IEEE80211_BAND_5GHZ)
+                rs_index -= IWL_FIRST_OFDM_RATE;
+
+        if ((tx_resp->control.tx_rate == NULL) ||
+            (tbl_type.is_SGI ^
+                !!(tx_resp->control.flags & IEEE80211_TXCTL_SHORT_GI)) ||
+            (tbl_type.is_fat ^
+                !!(tx_resp->control.flags & IEEE80211_TXCTL_40_MHZ_WIDTH)) ||
+            (tbl_type.is_dup ^
+                !!(tx_resp->control.flags & IEEE80211_TXCTL_DUP_DATA)) ||
+            (tbl_type.antenna_type ^
+                tx_resp->control.antenna_sel_tx) ||
+            (!!(tx_mcs.rate_n_flags & RATE_MCS_HT_MSK) ^
+                !!(tx_resp->control.flags & IEEE80211_TXCTL_OFDM_HT)) ||
+            (!!(tx_mcs.rate_n_flags & RATE_MCS_GF_MSK) ^
+                !!(tx_resp->control.flags & IEEE80211_TXCTL_GREEN_FIELD)) ||
+            (hw->wiphy->bands[priv->band]->bitrates[rs_index].bitrate !=
+                tx_resp->control.tx_rate->bitrate)) {
+                IWL_DEBUG_RATE("initial rate does not match 0x%x\n",
+                                tx_mcs.rate_n_flags);
+                goto out;
         }
 
         /* Update frame history window with "failure" for each Tx retry. */
@@ -754,7 +877,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
                  * Each tx attempt steps one entry deeper in the rate table. */
                 tx_mcs.rate_n_flags =
                     le32_to_cpu(table->rs_table[index].rate_n_flags);
-                rs_get_tbl_info_from_mcs(&tx_mcs, priv->phymode,
+                rs_get_tbl_info_from_mcs(&tx_mcs, priv->band,
                                           &tbl_type, &rs_index);
 
                 /* If type matches "search" table,
@@ -766,7 +889,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
                                 tpt = search_tbl->expected_tpt[rs_index];
                         else
                                 tpt = 0;
-                        rs_collect_tx_data(search_win, rs_index, tpt, 0);
+                        rs_collect_tx_data(search_win, rs_index, tpt, 1, 0);
 
                 /* Else if type matches "current/active" table,
                  * add failure to "current/active" history */
@@ -777,7 +900,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
                                 tpt = curr_tbl->expected_tpt[rs_index];
                         else
                                 tpt = 0;
-                        rs_collect_tx_data(window, rs_index, tpt, 0);
+                        rs_collect_tx_data(window, rs_index, tpt, 1, 0);
                 }
 
                 /* If not searching for a new mode, increment failed counter
@@ -794,14 +917,8 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
          * if Tx was successful first try, use original rate,
          * else look up the rate that was, finally, successful.
          */
-        if (!tx_resp->retry_count)
-                tx_mcs.rate_n_flags = tx_resp->control.tx_rate;
-        else
-                tx_mcs.rate_n_flags =
-                        le32_to_cpu(table->rs_table[index].rate_n_flags);
-
-        rs_get_tbl_info_from_mcs(&tx_mcs, priv->phymode,
-                                  &tbl_type, &rs_index);
+        tx_mcs.rate_n_flags = le32_to_cpu(table->rs_table[index].rate_n_flags);
+        rs_get_tbl_info_from_mcs(&tx_mcs, priv->band, &tbl_type, &rs_index);
 
         /* Update frame history window with "success" if Tx got ACKed ... */
         if (tx_resp->flags & IEEE80211_TX_STATUS_ACK)
@@ -818,9 +935,13 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
                         tpt = search_tbl->expected_tpt[rs_index];
                 else
                         tpt = 0;
-                rs_collect_tx_data(search_win,
-                                    rs_index, tpt, status);
-
+                if (tx_resp->control.flags & IEEE80211_TXCTL_AMPDU)
+                        rs_collect_tx_data(search_win, rs_index, tpt,
+                                           tx_resp->ampdu_ack_len,
+                                           tx_resp->ampdu_ack_map);
+                else
+                        rs_collect_tx_data(search_win, rs_index, tpt,
+                                           1, status);
         /* Else if type matches "current/active" table,
          * add final tx status to "current/active" history */
         } else if ((tbl_type.lq_type == curr_tbl->lq_type) &&
@@ -830,21 +951,34 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
                         tpt = curr_tbl->expected_tpt[rs_index];
                 else
                         tpt = 0;
-                rs_collect_tx_data(window, rs_index, tpt, status);
+                if (tx_resp->control.flags & IEEE80211_TXCTL_AMPDU)
+                        rs_collect_tx_data(window, rs_index, tpt,
+                                           tx_resp->ampdu_ack_len,
+                                           tx_resp->ampdu_ack_map);
+                else
+                        rs_collect_tx_data(window, rs_index, tpt,
+                                           1, status);
         }
 
         /* If not searching for new mode, increment success/failed counter
          * ... these help determine when to start searching again */
         if (lq_sta->stay_in_tbl) {
-                if (status)
-                        lq_sta->total_success++;
-                else
-                        lq_sta->total_failed++;
+                if (tx_resp->control.flags & IEEE80211_TXCTL_AMPDU) {
+                        lq_sta->total_success += tx_resp->ampdu_ack_map;
+                        lq_sta->total_failed +=
+                             (tx_resp->ampdu_ack_len - tx_resp->ampdu_ack_map);
+                } else {
+                        if (status)
+                                lq_sta->total_success++;
+                        else
+                                lq_sta->total_failed++;
+                }
         }
 
         /* See if there's a better rate or modulation mode to try. */
         rs_rate_scale_perform(priv, dev, hdr, sta);
-        sta_info_put(sta);
+out:
+        rcu_read_unlock();
         return;
 }
 
@@ -948,7 +1082,7 @@ static void rs_get_expected_tpt_table(struct iwl4965_lq_sta *lq_sta,
  * to decrease to match "active" throughput.  When moving from MIMO to SISO,
  * bit rate will typically need to increase, but not if performance was bad.
  */
-static s32 rs_get_best_rate(struct iwl4965_priv *priv,
+static s32 rs_get_best_rate(struct iwl_priv *priv,
                             struct iwl4965_lq_sta *lq_sta,
                             struct iwl4965_scale_tbl_info *tbl, /* "search" */
                             u16 rate_mask, s8 index, s8 rate)
@@ -1046,7 +1180,7 @@ static inline u8 rs_is_both_ant_supp(u8 valid_antenna)
 /*
  * Set up search table for MIMO
  */
-static int rs_switch_to_mimo(struct iwl4965_priv *priv,
+static int rs_switch_to_mimo(struct iwl_priv *priv,
                              struct iwl4965_lq_sta *lq_sta,
                              struct ieee80211_conf *conf,
                              struct sta_info *sta,
@@ -1105,13 +1239,13 @@ static int rs_switch_to_mimo(struct iwl4965_priv *priv,
         return 0;
 #else
         return -1;
-#endif                          /*CONFIG_IWL4965_HT */
+#endif  /*CONFIG_IWL4965_HT */
 }
 
 /*
  * Set up search table for SISO
  */
-static int rs_switch_to_siso(struct iwl4965_priv *priv,
+static int rs_switch_to_siso(struct iwl_priv *priv,
                              struct iwl4965_lq_sta *lq_sta,
                              struct ieee80211_conf *conf,
                              struct sta_info *sta,
@@ -1168,13 +1302,13 @@ static int rs_switch_to_siso(struct iwl4965_priv *priv,
 #else
         return -1;
 
-#endif                          /*CONFIG_IWL4965_HT */
+#endif  /*CONFIG_IWL4965_HT */
 }
 
 /*
  * Try to switch to new modulation mode from legacy
  */
-static int rs_move_legacy_other(struct iwl4965_priv *priv,
+static int rs_move_legacy_other(struct iwl_priv *priv,
                                 struct iwl4965_lq_sta *lq_sta,
                                 struct ieee80211_conf *conf,
                                 struct sta_info *sta,
@@ -1272,7 +1406,7 @@ static int rs_move_legacy_other(struct iwl4965_priv *priv,
 /*
  * Try to switch to new modulation mode from SISO
  */
-static int rs_move_siso_to_other(struct iwl4965_priv *priv,
+static int rs_move_siso_to_other(struct iwl_priv *priv,
                                  struct iwl4965_lq_sta *lq_sta,
                                  struct ieee80211_conf *conf,
                                  struct sta_info *sta,
@@ -1325,6 +1459,7 @@ static int rs_move_siso_to_other(struct iwl4965_priv *priv,
                         break;
                 case IWL_SISO_SWITCH_GI:
                         IWL_DEBUG_HT("LQ: SISO SWITCH TO GI\n");
+
                         memcpy(search_tbl, tbl, sz);
                         search_tbl->action = 0;
                         if (search_tbl->is_SGI)
@@ -1367,7 +1502,7 @@ static int rs_move_siso_to_other(struct iwl4965_priv *priv,
 /*
  * Try to switch to new modulation mode from MIMO
  */
-static int rs_move_mimo_to_other(struct iwl4965_priv *priv,
+static int rs_move_mimo_to_other(struct iwl_priv *priv,
                                  struct iwl4965_lq_sta *lq_sta,
                                  struct ieee80211_conf *conf,
                                  struct sta_info *sta,
@@ -1390,6 +1525,7 @@ static int rs_move_mimo_to_other(struct iwl4965_priv *priv,
                 case IWL_MIMO_SWITCH_ANTENNA_B:
                         IWL_DEBUG_HT("LQ: MIMO SWITCH TO SISO\n");
 
+
                         /* Set up new search table for SISO */
                         memcpy(search_tbl, tbl, sz);
                         search_tbl->lq_type = LQ_SISO;
@@ -1546,7 +1682,7 @@ static void rs_stay_in_table(struct iwl4965_lq_sta *lq_sta)
 /*
  * Do rate scaling and search for new modulation mode.
  */
-static void rs_rate_scale_perform(struct iwl4965_priv *priv,
+static void rs_rate_scale_perform(struct iwl_priv *priv,
                                   struct net_device *dev,
                                   struct ieee80211_hdr *hdr,
                                   struct sta_info *sta)
@@ -1574,6 +1710,10 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
         u8 active_tbl = 0;
         u8 done_search = 0;
         u16 high_low;
+#ifdef CONFIG_IWL4965_HT
+        u8 tid = MAX_TID_COUNT;
+        __le16 *qc;
+#endif
 
         IWL_DEBUG_RATE("rate scale calculate new rate for skb\n");
 
@@ -1594,6 +1734,13 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
         }
         lq_sta = (struct iwl4965_lq_sta *)sta->rate_ctrl_priv;
 
+#ifdef CONFIG_IWL4965_HT
+        qc = ieee80211_get_qos_ctrl(hdr);
+        if (qc) {
+                tid = (u8)(le16_to_cpu(*qc) & 0xf);
+                rs_tl_add_packet(lq_sta, tid);
+        }
+#endif
         /*
          * Select rate-scale / modulation-mode table to work with in
          * the rest of this function:  "search" if searching for better
@@ -1608,7 +1755,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
         is_green = lq_sta->is_green;
 
         /* current tx rate */
-        index = sta->last_txrate;
+        index = sta->last_txrate_idx;
 
         IWL_DEBUG_RATE("Rate scale index %d for type %d\n", index,
                        tbl->lq_type);
@@ -1621,7 +1768,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
 
         /* mask with station rate restriction */
         if (is_legacy(tbl->lq_type)) {
-                if (lq_sta->phymode == (u8) MODE_IEEE80211A)
+                if (lq_sta->band == IEEE80211_BAND_5GHZ)
                         /* supp_rates has no CCK bits in A mode */
                         rate_scale_index_msk = (u16) (rate_mask &
                                 (lq_sta->supp_rates << IWL_FIRST_OFDM_RATE));
@@ -1685,7 +1832,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
                 if (update_lq) {
                         rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
                         rs_fill_link_cmd(lq_sta, &mcs_rate, &lq_sta->lq);
-                        rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+                        iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
                 }
                 goto out;
 
@@ -1727,7 +1874,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
                         tbl = &(lq_sta->lq_info[active_tbl]);
 
                         /* Revert to "active" rate and throughput info */
-                        index = iwl4965_rate_index_from_plcp(
+                        index = iwl4965_hwrate_to_plcp_idx(
                                 tbl->current_rate.rate_n_flags);
                         current_tpt = lq_sta->last_tpt;
 
@@ -1850,7 +1997,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
         if (update_lq) {
                 rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
                 rs_fill_link_cmd(lq_sta, &mcs_rate, &lq_sta->lq);
-                rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+                iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
         }
 
         /* Should we stay with this modulation mode, or search for a new one? */
@@ -1883,14 +2030,14 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
                                 rs_rate_scale_clear_window(&(tbl->win[i]));
 
                         /* Use new "search" start rate */
-                        index = iwl4965_rate_index_from_plcp(
+                        index = iwl4965_hwrate_to_plcp_idx(
                                         tbl->current_rate.rate_n_flags);
 
                         IWL_DEBUG_HT("Switch current  mcs: %X index: %d\n",
                                      tbl->current_rate.rate_n_flags, index);
                         rs_fill_link_cmd(lq_sta, &tbl->current_rate,
                                          &lq_sta->lq);
-                        rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+                        iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
                 }
 
                 /* If the "active" (non-search) mode was legacy,
@@ -1914,15 +2061,14 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
                  * mode for a while before next round of mode comparisons. */
                 if (lq_sta->enable_counter &&
                     (lq_sta->action_counter >= IWL_ACTION_LIMIT)) {
-#ifdef CONFIG_IWL4965_HT_AGG
-                        /* If appropriate, set up aggregation! */
-                        if ((lq_sta->last_tpt > TID_AGG_TPT_THREHOLD) &&
-                            (priv->lq_mngr.agg_ctrl.auto_agg)) {
-                                priv->lq_mngr.agg_ctrl.tid_retry =
-                                    TID_ALL_SPECIFIED;
-                                schedule_work(&priv->agg_work);
+#ifdef CONFIG_IWL4965_HT
+                        if ((lq_sta->last_tpt > IWL_AGG_TPT_THREHOLD) &&
+                            (lq_sta->tx_agg_tid_en & (1 << tid)) &&
+                            (tid != MAX_TID_COUNT)) {
+                                IWL_DEBUG_HT("try to aggregate tid %d\n", tid);
+                                rs_tl_turn_on_agg(priv, tid, lq_sta, sta);
                         }
-#endif /*CONFIG_IWL4965_HT_AGG */
+#endif /*CONFIG_IWL4965_HT */
                         lq_sta->action_counter = 0;
                         rs_set_stay_in_table(0, lq_sta);
                 }
@@ -1942,21 +2088,21 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
 out:
         rs_mcs_from_tbl(&tbl->current_rate, tbl, index, is_green);
         i = index;
-        sta->last_txrate = i;
+        sta->last_txrate_idx = i;
 
-        /* sta->txrate is an index to A mode rates which start
+        /* sta->txrate_idx is an index to A mode rates which start
          * at IWL_FIRST_OFDM_RATE
          */
-        if (lq_sta->phymode == (u8) MODE_IEEE80211A)
-                sta->txrate = i - IWL_FIRST_OFDM_RATE;
+        if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                sta->txrate_idx = i - IWL_FIRST_OFDM_RATE;
         else
-                sta->txrate = i;
+                sta->txrate_idx = i;
 
         return;
 }
 
 
-static void rs_initialize_lq(struct iwl4965_priv *priv,
+static void rs_initialize_lq(struct iwl_priv *priv,
                              struct ieee80211_conf *conf,
                              struct sta_info *sta)
 {
@@ -1972,7 +2118,7 @@ static void rs_initialize_lq(struct iwl4965_priv *priv,
                 goto out;
 
         lq_sta = (struct iwl4965_lq_sta *)sta->rate_ctrl_priv;
-        i = sta->last_txrate;
+        i = sta->last_txrate_idx;
 
         if ((lq_sta->lq.sta_id == 0xff) &&
             (priv->iw_mode == IEEE80211_IF_TYPE_IBSS))
@@ -1996,7 +2142,7 @@ static void rs_initialize_lq(struct iwl4965_priv *priv,
                 mcs_rate.rate_n_flags |= RATE_MCS_CCK_MSK;
 
         tbl->antenna_type = ANT_AUX;
-        rs_get_tbl_info_from_mcs(&mcs_rate, priv->phymode, tbl, &rate_idx);
+        rs_get_tbl_info_from_mcs(&mcs_rate, priv->band, tbl, &rate_idx);
         if (!rs_is_ant_connected(priv->valid_antenna, tbl->antenna_type))
             rs_toggle_antenna(&mcs_rate, tbl);
 
@@ -2004,13 +2150,14 @@ static void rs_initialize_lq(struct iwl4965_priv *priv,
         tbl->current_rate.rate_n_flags = mcs_rate.rate_n_flags;
         rs_get_expected_tpt_table(lq_sta, tbl);
         rs_fill_link_cmd(lq_sta, &mcs_rate, &lq_sta->lq);
-        rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+        iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
  out:
         return;
 }
 
 static void rs_get_rate(void *priv_rate, struct net_device *dev,
-                        struct ieee80211_hw_mode *mode, struct sk_buff *skb,
+                        struct ieee80211_supported_band *sband,
+                        struct sk_buff *skb,
                         struct rate_selection *sel)
 {
 
@@ -2020,11 +2167,13 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         struct sta_info *sta;
         u16 fc;
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;
+        struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
         struct iwl4965_lq_sta *lq_sta;
 
         IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, hdr->addr1);
 
         /* Send management frames and broadcast/multicast data using lowest
@@ -2032,14 +2181,12 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         fc = le16_to_cpu(hdr->frame_control);
         if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1) ||
             !sta || !sta->rate_ctrl_priv) {
-                sel->rate = rate_lowest(local, local->oper_hw_mode, sta);
-                if (sta)
-                        sta_info_put(sta);
-                return;
+                sel->rate = rate_lowest(local, sband, sta);
+                goto out;
         }
 
         lq_sta = (struct iwl4965_lq_sta *)sta->rate_ctrl_priv;
-        i = sta->last_txrate;
+        i = sta->last_txrate_idx;
 
         if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
             !lq_sta->ibss_sta_added) {
@@ -2062,14 +2209,15 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
                         goto done;
         }
 
- done:
+done:
         if ((i < 0) || (i > IWL_RATE_COUNT)) {
-                sel->rate = rate_lowest(local, local->oper_hw_mode, sta);
-                return;
+                sel->rate = rate_lowest(local, sband, sta);
+                goto out;
         }
-        sta_info_put(sta);
 
         sel->rate = &priv->ieee_rates[i];
+out:
+        rcu_read_unlock();
 }
 
 static void *rs_alloc_sta(void *priv, gfp_t gfp)
@@ -2099,13 +2247,15 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
 {
         int i, j;
         struct ieee80211_conf *conf = &local->hw.conf;
-        struct ieee80211_hw_mode *mode = local->oper_hw_mode;
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;
+        struct ieee80211_supported_band *sband;
+        struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
         struct iwl4965_lq_sta *lq_sta = priv_sta;
 
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
+
         lq_sta->flush_timer = 0;
-        lq_sta->supp_rates = sta->supp_rates;
-        sta->txrate = 3;
+        lq_sta->supp_rates = sta->supp_rates[sband->band];
+        sta->txrate_idx = 3;
         for (j = 0; j < LQ_SIZE; j++)
                 for (i = 0; i < IWL_RATE_COUNT; i++)
                         rs_rate_scale_clear_window(&(lq_sta->lq_info[j].win[i]));
@@ -2140,15 +2290,15 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
         }
 
         /* Find highest tx rate supported by hardware and destination station */
-        for (i = 0; i < mode->num_rates; i++) {
-                if ((sta->supp_rates & BIT(i)) &&
-                    (mode->rates[i].flags & IEEE80211_RATE_SUPPORTED))
-                        sta->txrate = i;
-        }
-        sta->last_txrate = sta->txrate;
+        for (i = 0; i < sband->n_bitrates; i++)
+                if (sta->supp_rates[sband->band] & BIT(i))
+                        sta->txrate_idx = i;
+
+        sta->last_txrate_idx = sta->txrate_idx;
+        /* WTF is with this bogus comment? A doesn't have cck rates */
         /* For MODE_IEEE80211A, cck rates are at end of rate table */
-        if (local->hw.conf.phymode == MODE_IEEE80211A)
-                sta->last_txrate += IWL_FIRST_OFDM_RATE;
+        if (local->hw.conf.channel->band == IEEE80211_BAND_5GHZ)
+                sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
 
         lq_sta->is_dup = 0;
         lq_sta->valid_antenna = priv->valid_antenna;
@@ -2157,7 +2307,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
         lq_sta->active_rate = priv->active_rate;
         lq_sta->active_rate &= ~(0x1000);
         lq_sta->active_rate_basic = priv->active_rate_basic;
-        lq_sta->phymode = priv->phymode;
+        lq_sta->band = priv->band;
 #ifdef CONFIG_IWL4965_HT
         /*
          * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),
@@ -2180,6 +2330,8 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
         IWL_DEBUG_HT("SISO RATE 0x%X MIMO RATE 0x%X\n",
                      lq_sta->active_siso_rate,
                      lq_sta->active_mimo_rate);
+        /* as default allow aggregation for all tids */
+        lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;
 #endif /*CONFIG_IWL4965_HT*/
 #ifdef CONFIG_MAC80211_DEBUGFS
         lq_sta->drv = priv;
@@ -2193,7 +2345,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
 
 static void rs_fill_link_cmd(struct iwl4965_lq_sta *lq_sta,
                             struct iwl4965_rate *tx_mcs,
-                            struct iwl4965_link_quality_cmd *lq_cmd)
+                            struct iwl_link_quality_cmd *lq_cmd)
 {
         int index = 0;
         int rate_idx;
@@ -2207,7 +2359,7 @@ static void rs_fill_link_cmd(struct iwl4965_lq_sta *lq_sta,
         rs_dbgfs_set_mcs(lq_sta, tx_mcs, index);
 
         /* Interpret rate_n_flags */
-        rs_get_tbl_info_from_mcs(tx_mcs, lq_sta->phymode,
+        rs_get_tbl_info_from_mcs(tx_mcs, lq_sta->band,
                                   &tbl_type, &rate_idx);
 
         /* How many times should we repeat the initial rate? */
@@ -2261,7 +2413,7 @@ static void rs_fill_link_cmd(struct iwl4965_lq_sta *lq_sta,
                         index++;
                 }
 
-                rs_get_tbl_info_from_mcs(&new_rate, lq_sta->phymode, &tbl_type,
+                rs_get_tbl_info_from_mcs(&new_rate, lq_sta->band, &tbl_type,
                                                 &rate_idx);
 
                 /* Indicate to uCode which entries might be MIMO.
@@ -2318,17 +2470,11 @@ static void rs_free(void *priv_rate)
 
 static void rs_clear(void *priv_rate)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *) priv_rate;
+        struct iwl_priv *priv = (struct iwl_priv *) priv_rate;
 
         IWL_DEBUG_RATE("enter\n");
 
         priv->lq_mngr.lq_ready = 0;
-#ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
-        if (priv->lq_mngr.agg_ctrl.granted_ba)
-                iwl4965_turn_off_agg(priv, TID_ALL_SPECIFIED);
-#endif /*CONFIG_IWL4965_HT_AGG */
-#endif /* CONFIG_IWL4965_HT */
 
         IWL_DEBUG_RATE("leave\n");
 }
@@ -2354,7 +2500,7 @@ static void rs_dbgfs_set_mcs(struct iwl4965_lq_sta *lq_sta,
 {
         u32 base_rate;
 
-        if (lq_sta->phymode == (u8) MODE_IEEE80211A)
+        if (lq_sta->band == IEEE80211_BAND_5GHZ)
                 base_rate = 0x800D;
         else
                 base_rate = 0x820A;
@@ -2398,7 +2544,7 @@ static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,
 
         if (lq_sta->dbg_fixed.rate_n_flags) {
                 rs_fill_link_cmd(lq_sta, &lq_sta->dbg_fixed, &lq_sta->lq);
-                rs_send_lq_cmd(lq_sta->drv, &lq_sta->lq, CMD_ASYNC);
+                iwl_send_lq_cmd(lq_sta->drv, &lq_sta->lq, CMD_ASYNC);
         }
 
         return count;
@@ -2495,6 +2641,12 @@ static void rs_add_debugfs(void *priv, void *priv_sta,
         lq_sta->rs_sta_dbgfs_stats_table_file =
                 debugfs_create_file("rate_stats_table", 0600, dir,
                         lq_sta, &rs_sta_dbgfs_stats_table_ops);
+#ifdef CONFIG_IWL4965_HT
+        lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file =
+                debugfs_create_u8("tx_agg_tid_enable", 0600, dir,
+                &lq_sta->tx_agg_tid_en);
+#endif
+
 }
 
 static void rs_remove_debugfs(void *priv, void *priv_sta)
@@ -2502,6 +2654,9 @@ static void rs_remove_debugfs(void *priv, void *priv_sta)
         struct iwl4965_lq_sta *lq_sta = priv_sta;
         debugfs_remove(lq_sta->rs_sta_dbgfs_scale_table_file);
         debugfs_remove(lq_sta->rs_sta_dbgfs_stats_table_file);
+#ifdef CONFIG_IWL4965_HT
+        debugfs_remove(lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file);
+#endif
 }
 #endif
 
@@ -2525,7 +2680,7 @@ static struct rate_control_ops rs_ops = {
 int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
 {
         struct ieee80211_local *local = hw_to_local(hw);
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         struct iwl4965_lq_sta *lq_sta;
         struct sta_info *sta;
         int cnt = 0, i;
@@ -2534,13 +2689,15 @@ int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
         u32 max_time = 0;
         u8 lq_type, antenna;
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, priv->stations[sta_id].sta.sta.addr);
         if (!sta || !sta->rate_ctrl_priv) {
-                if (sta) {
-                        sta_info_put(sta);
+                if (sta)
                         IWL_DEBUG_RATE("leave - no private rate data!\n");
-                } else
+                else
                         IWL_DEBUG_RATE("leave - no station!\n");
+                rcu_read_unlock();
                 return sprintf(buf, "station %d not found\n", sta_id);
         }
 
@@ -2605,25 +2762,25 @@ int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
 
         cnt += sprintf(&buf[cnt], "\nrate scale type %d antenna %d "
                          "active_search %d rate index %d\n", lq_type, antenna,
-                         lq_sta->search_better_tbl, sta->last_txrate);
+                         lq_sta->search_better_tbl, sta->last_txrate_idx);
 
-        sta_info_put(sta);
+        rcu_read_unlock();
         return cnt;
 }
 
 void iwl4965_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
 
         priv->lq_mngr.lq_ready = 1;
 }
 
-void iwl4965_rate_control_register(struct ieee80211_hw *hw)
+int iwl4965_rate_control_register(void)
 {
-        ieee80211_rate_control_register(&rs_ops);
+        return ieee80211_rate_control_register(&rs_ops);
 }
 
-void iwl4965_rate_control_unregister(struct ieee80211_hw *hw)
+void iwl4965_rate_control_unregister(void)
 {
         ieee80211_rate_control_unregister(&rs_ops);
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.h b/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
index 55f707382787..866e378aa385 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -212,6 +212,18 @@ enum {
 
 #define LQ_SIZE         2       /* 2 mode tables:  "Active" and "Search" */
 
+/* load per tid defines for A-MPDU activation */
+#define IWL_AGG_TPT_THREHOLD    0
+#define IWL_AGG_LOAD_THRESHOLD  10
+#define IWL_AGG_ALL_TID         0xff
+#define TID_QUEUE_CELL_SPACING  50      /*mS */
+#define TID_QUEUE_MAX_SIZE      20
+#define TID_ROUND_VALUE         5       /* mS */
+#define TID_MAX_LOAD_COUNT      8
+
+#define TID_MAX_TIME_DIFF ((TID_QUEUE_MAX_SIZE - 1) * TID_QUEUE_CELL_SPACING)
+#define TIME_WRAP_AROUND(x, y) (((y) > (x)) ? (y) - (x) : (0-(x)) + (y))
+
 extern const struct iwl4965_rate_info iwl4965_rates[IWL_RATE_COUNT];
 
 enum iwl4965_table_type {
@@ -247,7 +259,7 @@ static inline u8 iwl4965_get_prev_ieee_rate(u8 rate_index)
         return rate;
 }
 
-extern int iwl4965_rate_index_from_plcp(int plcp);
+extern int iwl4965_hwrate_to_plcp_idx(u32 rate_n_flags);
 
 /**
  * iwl4965_fill_rs_info - Fill an output text buffer with the rate representation
@@ -276,7 +288,7 @@ extern void iwl4965_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
  * ieee80211_register_hw
  *
  */
-extern void iwl4965_rate_control_register(struct ieee80211_hw *hw);
+extern int iwl4965_rate_control_register(void);
 
 /**
  * iwl4965_rate_control_unregister - Unregister the rate control callbacks
@@ -284,6 +296,6 @@ extern void iwl4965_rate_control_register(struct ieee80211_hw *hw);
  * This should be called after calling ieee80211_unregister_hw, but before
  * the driver is unloaded.
  */
-extern void iwl4965_rate_control_unregister(struct ieee80211_hw *hw);
+extern void iwl4965_rate_control_unregister(void);
 
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 65767570be68..17f629fb96ff 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -38,10 +38,21 @@
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
 
+#include "iwl-eeprom.h"
 #include "iwl-4965.h"
+#include "iwl-core.h"
+#include "iwl-io.h"
 #include "iwl-helpers.h"
 
-static void iwl4965_hw_card_show_info(struct iwl4965_priv *priv);
+/* module parameters */
+static struct iwl_mod_params iwl4965_mod_params = {
+        .num_of_queues = IWL4965_MAX_NUM_QUEUES,
+        .enable_qos = 1,
+        .amsdu_size_8K = 1,
+        /* the rest are 0 by default */
+};
+
+static void iwl4965_hw_card_show_info(struct iwl_priv *priv);
 
 #define IWL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np)    \
         [IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,      \
@@ -79,13 +90,277 @@ const struct iwl4965_rate_info iwl4965_rates[IWL_RATE_COUNT] = {
         IWL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */
 };
 
+#ifdef CONFIG_IWL4965_HT
+
+static const u16 default_tid_to_tx_fifo[] = {
+        IWL_TX_FIFO_AC1,
+        IWL_TX_FIFO_AC0,
+        IWL_TX_FIFO_AC0,
+        IWL_TX_FIFO_AC1,
+        IWL_TX_FIFO_AC2,
+        IWL_TX_FIFO_AC2,
+        IWL_TX_FIFO_AC3,
+        IWL_TX_FIFO_AC3,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_NONE,
+        IWL_TX_FIFO_AC3
+};
+
+#endif  /*CONFIG_IWL4965_HT */
+
+/* check contents of special bootstrap uCode SRAM */
+static int iwl4965_verify_bsm(struct iwl_priv *priv)
+{
+        __le32 *image = priv->ucode_boot.v_addr;
+        u32 len = priv->ucode_boot.len;
+        u32 reg;
+        u32 val;
+
+        IWL_DEBUG_INFO("Begin verify bsm\n");
+
+        /* verify BSM SRAM contents */
+        val = iwl_read_prph(priv, BSM_WR_DWCOUNT_REG);
+        for (reg = BSM_SRAM_LOWER_BOUND;
+             reg < BSM_SRAM_LOWER_BOUND + len;
+             reg += sizeof(u32), image++) {
+                val = iwl_read_prph(priv, reg);
+                if (val != le32_to_cpu(*image)) {
+                        IWL_ERROR("BSM uCode verification failed at "
+                                  "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",
+                                  BSM_SRAM_LOWER_BOUND,
+                                  reg - BSM_SRAM_LOWER_BOUND, len,
+                                  val, le32_to_cpu(*image));
+                        return -EIO;
+                }
+        }
+
+        IWL_DEBUG_INFO("BSM bootstrap uCode image OK\n");
+
+        return 0;
+}
+
+/**
+ * iwl4965_load_bsm - Load bootstrap instructions
+ *
+ * BSM operation:
+ *
+ * The Bootstrap State Machine (BSM) stores a short bootstrap uCode program
+ * in special SRAM that does not power down during RFKILL.  When powering back
+ * up after power-saving sleeps (or during initial uCode load), the BSM loads
+ * the bootstrap program into the on-board processor, and starts it.
+ *
+ * The bootstrap program loads (via DMA) instructions and data for a new
+ * program from host DRAM locations indicated by the host driver in the
+ * BSM_DRAM_* registers.  Once the new program is loaded, it starts
+ * automatically.
+ *
+ * When initializing the NIC, the host driver points the BSM to the
+ * "initialize" uCode image.  This uCode sets up some internal data, then
+ * notifies host via "initialize alive" that it is complete.
+ *
+ * The host then replaces the BSM_DRAM_* pointer values to point to the
+ * normal runtime uCode instructions and a backup uCode data cache buffer
+ * (filled initially with starting data values for the on-board processor),
+ * then triggers the "initialize" uCode to load and launch the runtime uCode,
+ * which begins normal operation.
+ *
+ * When doing a power-save shutdown, runtime uCode saves data SRAM into
+ * the backup data cache in DRAM before SRAM is powered down.
+ *
+ * When powering back up, the BSM loads the bootstrap program.  This reloads
+ * the runtime uCode instructions and the backup data cache into SRAM,
+ * and re-launches the runtime uCode from where it left off.
+ */
+static int iwl4965_load_bsm(struct iwl_priv *priv)
+{
+        __le32 *image = priv->ucode_boot.v_addr;
+        u32 len = priv->ucode_boot.len;
+        dma_addr_t pinst;
+        dma_addr_t pdata;
+        u32 inst_len;
+        u32 data_len;
+        int i;
+        u32 done;
+        u32 reg_offset;
+        int ret;
+
+        IWL_DEBUG_INFO("Begin load bsm\n");
+
+        /* make sure bootstrap program is no larger than BSM's SRAM size */
+        if (len > IWL_MAX_BSM_SIZE)
+                return -EINVAL;
+
+        /* Tell bootstrap uCode where to find the "Initialize" uCode
+         *   in host DRAM ... host DRAM physical address bits 35:4 for 4965.
+         * NOTE:  iwl4965_initialize_alive_start() will replace these values,
+         *        after the "initialize" uCode has run, to point to
+         *        runtime/protocol instructions and backup data cache. */
+        pinst = priv->ucode_init.p_addr >> 4;
+        pdata = priv->ucode_init_data.p_addr >> 4;
+        inst_len = priv->ucode_init.len;
+        data_len = priv->ucode_init_data.len;
+
+        ret = iwl_grab_nic_access(priv);
+        if (ret)
+                return ret;
+
+        iwl_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
+        iwl_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
+        iwl_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);
+        iwl_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG, data_len);
+
+        /* Fill BSM memory with bootstrap instructions */
+        for (reg_offset = BSM_SRAM_LOWER_BOUND;
+             reg_offset < BSM_SRAM_LOWER_BOUND + len;
+             reg_offset += sizeof(u32), image++)
+                _iwl_write_prph(priv, reg_offset, le32_to_cpu(*image));
+
+        ret = iwl4965_verify_bsm(priv);
+        if (ret) {
+                iwl_release_nic_access(priv);
+                return ret;
+        }
+
+        /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
+        iwl_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);
+        iwl_write_prph(priv, BSM_WR_MEM_DST_REG, RTC_INST_LOWER_BOUND);
+        iwl_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
+
+        /* Load bootstrap code into instruction SRAM now,
+         *   to prepare to load "initialize" uCode */
+        iwl_write_prph(priv, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START);
+
+        /* Wait for load of bootstrap uCode to finish */
+        for (i = 0; i < 100; i++) {
+                done = iwl_read_prph(priv, BSM_WR_CTRL_REG);
+                if (!(done & BSM_WR_CTRL_REG_BIT_START))
+                        break;
+                udelay(10);
+        }
+        if (i < 100)
+                IWL_DEBUG_INFO("BSM write complete, poll %d iterations\n", i);
+        else {
+                IWL_ERROR("BSM write did not complete!\n");
+                return -EIO;
+        }
+
+        /* Enable future boot loads whenever power management unit triggers it
+         *   (e.g. when powering back up after power-save shutdown) */
+        iwl_write_prph(priv, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START_EN);
+
+        iwl_release_nic_access(priv);
+
+        return 0;
+}
+
+static int iwl4965_init_drv(struct iwl_priv *priv)
+{
+        int ret;
+        int i;
+
+        priv->antenna = (enum iwl4965_antenna)priv->cfg->mod_params->antenna;
+        priv->retry_rate = 1;
+        priv->ibss_beacon = NULL;
+
+        spin_lock_init(&priv->lock);
+        spin_lock_init(&priv->power_data.lock);
+        spin_lock_init(&priv->sta_lock);
+        spin_lock_init(&priv->hcmd_lock);
+        spin_lock_init(&priv->lq_mngr.lock);
+
+        priv->shared_virt = pci_alloc_consistent(priv->pci_dev,
+                                        sizeof(struct iwl4965_shared),
+                                        &priv->shared_phys);
+
+        if (!priv->shared_virt) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        memset(priv->shared_virt, 0, sizeof(struct iwl4965_shared));
+
+
+        for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++)
+                INIT_LIST_HEAD(&priv->ibss_mac_hash[i]);
+
+        INIT_LIST_HEAD(&priv->free_frames);
+
+        mutex_init(&priv->mutex);
+
+        /* Clear the driver's (not device's) station table */
+        iwlcore_clear_stations_table(priv);
+
+        priv->data_retry_limit = -1;
+        priv->ieee_channels = NULL;
+        priv->ieee_rates = NULL;
+        priv->band = IEEE80211_BAND_2GHZ;
+
+        priv->iw_mode = IEEE80211_IF_TYPE_STA;
+
+        priv->use_ant_b_for_management_frame = 1; /* start with ant B */
+        priv->valid_antenna = 0x7;      /* assume all 3 connected */
+        priv->ps_mode = IWL_MIMO_PS_NONE;
+
+        /* Choose which receivers/antennas to use */
+        iwl4965_set_rxon_chain(priv);
+
+        iwlcore_reset_qos(priv);
+
+        priv->qos_data.qos_active = 0;
+        priv->qos_data.qos_cap.val = 0;
+
+        iwlcore_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6);
+
+        priv->rates_mask = IWL_RATES_MASK;
+        /* If power management is turned on, default to AC mode */
+        priv->power_mode = IWL_POWER_AC;
+        priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
+
+        ret = iwl_init_channel_map(priv);
+        if (ret) {
+                IWL_ERROR("initializing regulatory failed: %d\n", ret);
+                goto err;
+        }
+
+        ret = iwl4965_init_geos(priv);
+        if (ret) {
+                IWL_ERROR("initializing geos failed: %d\n", ret);
+                goto err_free_channel_map;
+        }
+
+        ret = ieee80211_register_hw(priv->hw);
+        if (ret) {
+                IWL_ERROR("Failed to register network device (error %d)\n",
+                                ret);
+                goto err_free_geos;
+        }
+
+        priv->hw->conf.beacon_int = 100;
+        priv->mac80211_registered = 1;
+
+        return 0;
+
+err_free_geos:
+        iwl4965_free_geos(priv);
+err_free_channel_map:
+        iwl_free_channel_map(priv);
+err:
+        return ret;
+}
+
 static int is_fat_channel(__le32 rxon_flags)
 {
         return (rxon_flags & RXON_FLG_CHANNEL_MODE_PURE_40_MSK) ||
                 (rxon_flags & RXON_FLG_CHANNEL_MODE_MIXED_MSK);
 }
 
-static u8 is_single_stream(struct iwl4965_priv *priv)
+static u8 is_single_stream(struct iwl_priv *priv)
 {
 #ifdef CONFIG_IWL4965_HT
         if (!priv->current_ht_config.is_ht ||
@@ -98,13 +373,71 @@ static u8 is_single_stream(struct iwl4965_priv *priv)
         return 0;
 }
 
+int iwl4965_hwrate_to_plcp_idx(u32 rate_n_flags)
+{
+        int idx = 0;
+
+        /* 4965 HT rate format */
+        if (rate_n_flags & RATE_MCS_HT_MSK) {
+                idx = (rate_n_flags & 0xff);
+
+                if (idx >= IWL_RATE_MIMO_6M_PLCP)
+                        idx = idx - IWL_RATE_MIMO_6M_PLCP;
+
+                idx += IWL_FIRST_OFDM_RATE;
+                /* skip 9M not supported in ht*/
+                if (idx >= IWL_RATE_9M_INDEX)
+                        idx += 1;
+                if ((idx >= IWL_FIRST_OFDM_RATE) && (idx <= IWL_LAST_OFDM_RATE))
+                        return idx;
+
+        /* 4965 legacy rate format, search for match in table */
+        } else {
+                for (idx = 0; idx < ARRAY_SIZE(iwl4965_rates); idx++)
+                        if (iwl4965_rates[idx].plcp == (rate_n_flags & 0xFF))
+                                return idx;
+        }
+
+        return -1;
+}
+
+/**
+ * translate ucode response to mac80211 tx status control values
+ */
+void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,
+                                  struct ieee80211_tx_control *control)
+{
+        int rate_index;
+
+        control->antenna_sel_tx =
+                ((rate_n_flags & RATE_MCS_ANT_AB_MSK) >> RATE_MCS_ANT_POS);
+        if (rate_n_flags & RATE_MCS_HT_MSK)
+                control->flags |= IEEE80211_TXCTL_OFDM_HT;
+        if (rate_n_flags & RATE_MCS_GF_MSK)
+                control->flags |= IEEE80211_TXCTL_GREEN_FIELD;
+        if (rate_n_flags & RATE_MCS_FAT_MSK)
+                control->flags |= IEEE80211_TXCTL_40_MHZ_WIDTH;
+        if (rate_n_flags & RATE_MCS_DUP_MSK)
+                control->flags |= IEEE80211_TXCTL_DUP_DATA;
+        if (rate_n_flags & RATE_MCS_SGI_MSK)
+                control->flags |= IEEE80211_TXCTL_SHORT_GI;
+        /* since iwl4965_hwrate_to_plcp_idx is band indifferent, we always use
+         * IEEE80211_BAND_2GHZ band as it contains all the rates */
+        rate_index = iwl4965_hwrate_to_plcp_idx(rate_n_flags);
+        if (rate_index == -1)
+                control->tx_rate = NULL;
+        else
+                control->tx_rate =
+                        &priv->bands[IEEE80211_BAND_2GHZ].bitrates[rate_index];
+}
+
 /*
  * Determine how many receiver/antenna chains to use.
  * More provides better reception via diversity.  Fewer saves power.
  * MIMO (dual stream) requires at least 2, but works better with 3.
  * This does not determine *which* chains to use, just how many.
  */
-static int iwl4965_get_rx_chain_counter(struct iwl4965_priv *priv,
+static int iwl4965_get_rx_chain_counter(struct iwl_priv *priv,
                                         u8 *idle_state, u8 *rx_state)
 {
         u8 is_single = is_single_stream(priv);
@@ -133,32 +466,32 @@ static int iwl4965_get_rx_chain_counter(struct iwl4965_priv *priv,
         return 0;
 }
 
-int iwl4965_hw_rxq_stop(struct iwl4965_priv *priv)
+int iwl4965_hw_rxq_stop(struct iwl_priv *priv)
 {
         int rc;
         unsigned long flags;
 
         spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc) {
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return rc;
         }
 
         /* stop Rx DMA */
-        iwl4965_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
-        rc = iwl4965_poll_direct_bit(priv, FH_MEM_RSSR_RX_STATUS_REG,
+        iwl_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
+        rc = iwl_poll_direct_bit(priv, FH_MEM_RSSR_RX_STATUS_REG,
                                      (1 << 24), 1000);
         if (rc < 0)
                 IWL_ERROR("Can't stop Rx DMA.\n");
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
-u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *addr)
+u8 iwl4965_hw_find_station(struct iwl_priv *priv, const u8 *addr)
 {
         int i;
         int start = 0;
@@ -171,10 +504,10 @@ u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *addr)
                 start = IWL_STA_ID;
 
         if (is_broadcast_ether_addr(addr))
-                return IWL4965_BROADCAST_ID;
+                return priv->hw_params.bcast_sta_id;
 
         spin_lock_irqsave(&priv->sta_lock, flags);
-        for (i = start; i < priv->hw_setting.max_stations; i++)
+        for (i = start; i < priv->hw_params.max_stations; i++)
                 if ((priv->stations[i].used) &&
                     (!compare_ether_addr
                      (priv->stations[i].sta.sta.addr, addr))) {
@@ -190,13 +523,13 @@ u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *addr)
         return ret;
 }
 
-static int iwl4965_nic_set_pwr_src(struct iwl4965_priv *priv, int pwr_max)
+static int iwl4965_nic_set_pwr_src(struct iwl_priv *priv, int pwr_max)
 {
         int ret;
         unsigned long flags;
 
         spin_lock_irqsave(&priv->lock, flags);
-        ret = iwl4965_grab_nic_access(priv);
+        ret = iwl_grab_nic_access(priv);
         if (ret) {
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return ret;
@@ -209,92 +542,92 @@ static int iwl4965_nic_set_pwr_src(struct iwl4965_priv *priv, int pwr_max)
                                            &val);
 
                 if (val & PCI_CFG_PMC_PME_FROM_D3COLD_SUPPORT)
-                        iwl4965_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
+                        iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
                                 APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
                                 ~APMG_PS_CTRL_MSK_PWR_SRC);
         } else
-                iwl4965_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
+                iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
                         APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
                         ~APMG_PS_CTRL_MSK_PWR_SRC);
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return ret;
 }
 
-static int iwl4965_rx_init(struct iwl4965_priv *priv, struct iwl4965_rx_queue *rxq)
+static int iwl4965_rx_init(struct iwl_priv *priv, struct iwl4965_rx_queue *rxq)
 {
-        int rc;
+        int ret;
         unsigned long flags;
         unsigned int rb_size;
 
         spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl4965_grab_nic_access(priv);
-        if (rc) {
+        ret = iwl_grab_nic_access(priv);
+        if (ret) {
                 spin_unlock_irqrestore(&priv->lock, flags);
-                return rc;
+                return ret;
         }
 
-        if (iwl4965_param_amsdu_size_8K)
+        if (priv->cfg->mod_params->amsdu_size_8K)
                 rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;
         else
                 rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;
 
         /* Stop Rx DMA */
-        iwl4965_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
+        iwl_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
 
         /* Reset driver's Rx queue write index */
-        iwl4965_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);
+        iwl_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);
 
         /* Tell device where to find RBD circular buffer in DRAM */
-        iwl4965_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
-                             rxq->dma_addr >> 8);
+        iwl_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
+                           rxq->dma_addr >> 8);
 
         /* Tell device where in DRAM to update its Rx status */
-        iwl4965_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
-                             (priv->hw_setting.shared_phys +
-                              offsetof(struct iwl4965_shared, val0)) >> 4);
+        iwl_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
+                           (priv->shared_phys +
+                            offsetof(struct iwl4965_shared, rb_closed)) >> 4);
 
         /* Enable Rx DMA, enable host interrupt, Rx buffer size 4k, 256 RBDs */
-        iwl4965_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,
-                             FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
-                             FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
-                             rb_size |
-                             /*0x10 << 4 | */
-                             (RX_QUEUE_SIZE_LOG <<
+        iwl_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,
+                           FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
+                           FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
+                           rb_size |
+                             /* 0x10 << 4 | */
+                           (RX_QUEUE_SIZE_LOG <<
                               FH_RCSR_RX_CONFIG_RBDCB_SIZE_BITSHIFT));
 
         /*
-         * iwl4965_write32(priv,CSR_INT_COAL_REG,0);
+         * iwl_write32(priv,CSR_INT_COAL_REG,0);
          */
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
 /* Tell 4965 where to find the "keep warm" buffer */
-static int iwl4965_kw_init(struct iwl4965_priv *priv)
+static int iwl4965_kw_init(struct iwl_priv *priv)
 {
         unsigned long flags;
         int rc;
 
         spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc)
                 goto out;
 
-        iwl4965_write_direct32(priv, IWL_FH_KW_MEM_ADDR_REG,
+        iwl_write_direct32(priv, IWL_FH_KW_MEM_ADDR_REG,
                              priv->kw.dma_addr >> 4);
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
 out:
         spin_unlock_irqrestore(&priv->lock, flags);
         return rc;
 }
 
-static int iwl4965_kw_alloc(struct iwl4965_priv *priv)
+static int iwl4965_kw_alloc(struct iwl_priv *priv)
 {
         struct pci_dev *dev = priv->pci_dev;
         struct iwl4965_kw *kw = &priv->kw;
@@ -307,58 +640,10 @@ static int iwl4965_kw_alloc(struct iwl4965_priv *priv)
         return 0;
 }
 
-#define CHECK_AND_PRINT(x) ((eeprom_ch->flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-
-/**
- * iwl4965_set_fat_chan_info - Copy fat channel info into driver's priv.
- *
- * Does not set up a command, or touch hardware.
- */
-int iwl4965_set_fat_chan_info(struct iwl4965_priv *priv, int phymode, u16 channel,
-                              const struct iwl4965_eeprom_channel *eeprom_ch,
-                              u8 fat_extension_channel)
-{
-        struct iwl4965_channel_info *ch_info;
-
-        ch_info = (struct iwl4965_channel_info *)
-                        iwl4965_get_channel_info(priv, phymode, channel);
-
-        if (!is_channel_valid(ch_info))
-                return -1;
-
-        IWL_DEBUG_INFO("FAT Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x"
-                        " %ddBm): Ad-Hoc %ssupported\n",
-                        ch_info->channel,
-                        is_channel_a_band(ch_info) ?
-                        "5.2" : "2.4",
-                        CHECK_AND_PRINT(IBSS),
-                        CHECK_AND_PRINT(ACTIVE),
-                        CHECK_AND_PRINT(RADAR),
-                        CHECK_AND_PRINT(WIDE),
-                        CHECK_AND_PRINT(NARROW),
-                        CHECK_AND_PRINT(DFS),
-                        eeprom_ch->flags,
-                        eeprom_ch->max_power_avg,
-                        ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS)
-                         && !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ?
-                        "" : "not ");
-
-        ch_info->fat_eeprom = *eeprom_ch;
-        ch_info->fat_max_power_avg = eeprom_ch->max_power_avg;
-        ch_info->fat_curr_txpow = eeprom_ch->max_power_avg;
-        ch_info->fat_min_power = 0;
-        ch_info->fat_scan_power = eeprom_ch->max_power_avg;
-        ch_info->fat_flags = eeprom_ch->flags;
-        ch_info->fat_extension_channel = fat_extension_channel;
-
-        return 0;
-}
-
 /**
  * iwl4965_kw_free - Free the "keep warm" buffer
  */
-static void iwl4965_kw_free(struct iwl4965_priv *priv)
+static void iwl4965_kw_free(struct iwl_priv *priv)
 {
         struct pci_dev *dev = priv->pci_dev;
         struct iwl4965_kw *kw = &priv->kw;
@@ -376,7 +661,7 @@ static void iwl4965_kw_free(struct iwl4965_priv *priv)
  * @param priv
  * @return error code
  */
-static int iwl4965_txq_ctx_reset(struct iwl4965_priv *priv)
+static int iwl4965_txq_ctx_reset(struct iwl_priv *priv)
 {
         int rc = 0;
         int txq_id, slots_num;
@@ -396,7 +681,7 @@ static int iwl4965_txq_ctx_reset(struct iwl4965_priv *priv)
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (unlikely(rc)) {
                 IWL_ERROR("TX reset failed");
                 spin_unlock_irqrestore(&priv->lock, flags);
@@ -404,8 +689,8 @@ static int iwl4965_txq_ctx_reset(struct iwl4965_priv *priv)
         }
 
         /* Turn off all Tx DMA channels */
-        iwl4965_write_prph(priv, KDR_SCD_TXFACT, 0);
-        iwl4965_release_nic_access(priv);
+        iwl_write_prph(priv, IWL49_SCD_TXFACT, 0);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         /* Tell 4965 where to find the keep-warm buffer */
@@ -417,7 +702,7 @@ static int iwl4965_txq_ctx_reset(struct iwl4965_priv *priv)
 
         /* Alloc and init all (default 16) Tx queues,
          * including the command queue (#4) */
-        for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++) {
+        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {
                 slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?
                                         TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
                 rc = iwl4965_tx_queue_init(priv, &priv->txq[txq_id], slots_num,
@@ -438,7 +723,7 @@ static int iwl4965_txq_ctx_reset(struct iwl4965_priv *priv)
         return rc;
 }
 
-int iwl4965_hw_nic_init(struct iwl4965_priv *priv)
+int iwl4965_hw_nic_init(struct iwl_priv *priv)
 {
         int rc;
         unsigned long flags;
@@ -452,11 +737,11 @@ int iwl4965_hw_nic_init(struct iwl4965_priv *priv)
         /* nic_init */
         spin_lock_irqsave(&priv->lock, flags);
 
-        iwl4965_set_bit(priv, CSR_GIO_CHICKEN_BITS,
+        iwl_set_bit(priv, CSR_GIO_CHICKEN_BITS,
                     CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
 
-        iwl4965_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-        rc = iwl4965_poll_bit(priv, CSR_GP_CNTRL,
+        iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+        rc = iwl_poll_bit(priv, CSR_GP_CNTRL,
                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
         if (rc < 0) {
@@ -465,26 +750,25 @@ int iwl4965_hw_nic_init(struct iwl4965_priv *priv)
                 return rc;
         }
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc) {
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return rc;
         }
 
-        iwl4965_read_prph(priv, APMG_CLK_CTRL_REG);
+        iwl_read_prph(priv, APMG_CLK_CTRL_REG);
 
-        iwl4965_write_prph(priv, APMG_CLK_CTRL_REG,
-                                 APMG_CLK_VAL_DMA_CLK_RQT |
-                                 APMG_CLK_VAL_BSM_CLK_RQT);
-        iwl4965_read_prph(priv, APMG_CLK_CTRL_REG);
+        iwl_write_prph(priv, APMG_CLK_CTRL_REG,
+                        APMG_CLK_VAL_DMA_CLK_RQT | APMG_CLK_VAL_BSM_CLK_RQT);
+        iwl_read_prph(priv, APMG_CLK_CTRL_REG);
 
         udelay(20);
 
-        iwl4965_set_bits_prph(priv, APMG_PCIDEV_STT_REG,
-                                    APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
+        iwl_set_bits_prph(priv, APMG_PCIDEV_STT_REG,
+                                APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
 
-        iwl4965_release_nic_access(priv);
-        iwl4965_write32(priv, CSR_INT_COALESCING, 512 / 32);
+        iwl_release_nic_access(priv);
+        iwl_write32(priv, CSR_INT_COALESCING, 512 / 32);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         /* Determine HW type */
@@ -520,25 +804,24 @@ int iwl4965_hw_nic_init(struct iwl4965_priv *priv)
 
         /* set CSR_HW_CONFIG_REG for uCode use */
 
-        iwl4965_set_bit(priv, CSR_SW_VER, CSR_HW_IF_CONFIG_REG_BIT_KEDRON_R |
-                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
+        iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
+                    CSR49_HW_IF_CONFIG_REG_BIT_4965_R |
+                    CSR49_HW_IF_CONFIG_REG_BIT_RADIO_SI |
+                    CSR49_HW_IF_CONFIG_REG_BIT_MAC_SI);
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc < 0) {
                 spin_unlock_irqrestore(&priv->lock, flags);
                 IWL_DEBUG_INFO("Failed to init the card\n");
                 return rc;
         }
 
-        iwl4965_read_prph(priv, APMG_PS_CTRL_REG);
-        iwl4965_set_bits_prph(priv, APMG_PS_CTRL_REG,
-                                    APMG_PS_CTRL_VAL_RESET_REQ);
+        iwl_read_prph(priv, APMG_PS_CTRL_REG);
+        iwl_set_bits_prph(priv, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ);
         udelay(5);
-        iwl4965_clear_bits_prph(priv, APMG_PS_CTRL_REG,
-                                      APMG_PS_CTRL_VAL_RESET_REQ);
+        iwl_clear_bits_prph(priv, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ);
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         iwl4965_hw_card_show_info(priv);
@@ -582,7 +865,7 @@ int iwl4965_hw_nic_init(struct iwl4965_priv *priv)
         return 0;
 }
 
-int iwl4965_hw_nic_stop_master(struct iwl4965_priv *priv)
+int iwl4965_hw_nic_stop_master(struct iwl_priv *priv)
 {
         int rc = 0;
         u32 reg_val;
@@ -591,16 +874,16 @@ int iwl4965_hw_nic_stop_master(struct iwl4965_priv *priv)
         spin_lock_irqsave(&priv->lock, flags);
 
         /* set stop master bit */
-        iwl4965_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
+        iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
 
-        reg_val = iwl4965_read32(priv, CSR_GP_CNTRL);
+        reg_val = iwl_read32(priv, CSR_GP_CNTRL);
 
         if (CSR_GP_CNTRL_REG_FLAG_MAC_POWER_SAVE ==
             (reg_val & CSR_GP_CNTRL_REG_MSK_POWER_SAVE_TYPE))
                 IWL_DEBUG_INFO("Card in power save, master is already "
                                "stopped\n");
         else {
-                rc = iwl4965_poll_bit(priv, CSR_RESET,
+                rc = iwl_poll_bit(priv, CSR_RESET,
                                   CSR_RESET_REG_FLAG_MASTER_DISABLED,
                                   CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
                 if (rc < 0) {
@@ -618,27 +901,26 @@ int iwl4965_hw_nic_stop_master(struct iwl4965_priv *priv)
 /**
  * iwl4965_hw_txq_ctx_stop - Stop all Tx DMA channels, free Tx queue memory
  */
-void iwl4965_hw_txq_ctx_stop(struct iwl4965_priv *priv)
+void iwl4965_hw_txq_ctx_stop(struct iwl_priv *priv)
 {
 
         int txq_id;
         unsigned long flags;
 
         /* Stop each Tx DMA channel, and wait for it to be idle */
-        for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++) {
+        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {
                 spin_lock_irqsave(&priv->lock, flags);
-                if (iwl4965_grab_nic_access(priv)) {
+                if (iwl_grab_nic_access(priv)) {
                         spin_unlock_irqrestore(&priv->lock, flags);
                         continue;
                 }
 
-                iwl4965_write_direct32(priv,
-                                     IWL_FH_TCSR_CHNL_TX_CONFIG_REG(txq_id),
-                                     0x0);
-                iwl4965_poll_direct_bit(priv, IWL_FH_TSSR_TX_STATUS_REG,
-                                        IWL_FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE
-                                        (txq_id), 200);
-                iwl4965_release_nic_access(priv);
+                iwl_write_direct32(priv,
+                                   IWL_FH_TCSR_CHNL_TX_CONFIG_REG(txq_id), 0x0);
+                iwl_poll_direct_bit(priv, IWL_FH_TSSR_TX_STATUS_REG,
+                                    IWL_FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE
+                                    (txq_id), 200);
+                iwl_release_nic_access(priv);
                 spin_unlock_irqrestore(&priv->lock, flags);
         }
 
@@ -646,7 +928,7 @@ void iwl4965_hw_txq_ctx_stop(struct iwl4965_priv *priv)
         iwl4965_hw_txq_ctx_free(priv);
 }
 
-int iwl4965_hw_nic_reset(struct iwl4965_priv *priv)
+int iwl4965_hw_nic_reset(struct iwl_priv *priv)
 {
         int rc = 0;
         unsigned long flags;
@@ -655,29 +937,29 @@ int iwl4965_hw_nic_reset(struct iwl4965_priv *priv)
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        iwl4965_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
+        iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
 
         udelay(10);
 
-        iwl4965_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-        rc = iwl4965_poll_bit(priv, CSR_RESET,
+        iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+        rc = iwl_poll_bit(priv, CSR_RESET,
                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25);
 
         udelay(10);
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (!rc) {
-                iwl4965_write_prph(priv, APMG_CLK_EN_REG,
-                                         APMG_CLK_VAL_DMA_CLK_RQT |
-                                         APMG_CLK_VAL_BSM_CLK_RQT);
+                iwl_write_prph(priv, APMG_CLK_EN_REG,
+                                APMG_CLK_VAL_DMA_CLK_RQT |
+                                APMG_CLK_VAL_BSM_CLK_RQT);
 
                 udelay(10);
 
-                iwl4965_set_bits_prph(priv, APMG_PCIDEV_STT_REG,
-                                APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
+                iwl_set_bits_prph(priv, APMG_PCIDEV_STT_REG,
+                                        APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
 
-                iwl4965_release_nic_access(priv);
+                iwl_release_nic_access(priv);
         }
 
         clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
@@ -694,56 +976,37 @@ int iwl4965_hw_nic_reset(struct iwl4965_priv *priv)
 /**
  * iwl4965_bg_statistics_periodic - Timer callback to queue statistics
  *
- * This callback is provided in order to queue the statistics_work
- * in work_queue context (v. softirq)
+ * This callback is provided in order to send a statistics request.
  *
  * This timer function is continually reset to execute within
  * REG_RECALIB_PERIOD seconds since the last STATISTICS_NOTIFICATION
  * was received.  We need to ensure we receive the statistics in order
- * to update the temperature used for calibrating the TXPOWER.  However,
- * we can't send the statistics command from softirq context (which
- * is the context which timers run at) so we have to queue off the
- * statistics_work to actually send the command to the hardware.
+ * to update the temperature used for calibrating the TXPOWER.
  */
 static void iwl4965_bg_statistics_periodic(unsigned long data)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)data;
-
-        queue_work(priv->workqueue, &priv->statistics_work);
-}
-
-/**
- * iwl4965_bg_statistics_work - Send the statistics request to the hardware.
- *
- * This is queued by iwl4965_bg_statistics_periodic.
- */
-static void iwl4965_bg_statistics_work(struct work_struct *work)
-{
-        struct iwl4965_priv *priv = container_of(work, struct iwl4965_priv,
-                                             statistics_work);
+        struct iwl_priv *priv = (struct iwl_priv *)data;
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
 
-        mutex_lock(&priv->mutex);
-        iwl4965_send_statistics_request(priv);
-        mutex_unlock(&priv->mutex);
+        iwl_send_statistics_request(priv, CMD_ASYNC);
 }
 
 #define CT_LIMIT_CONST          259
 #define TM_CT_KILL_THRESHOLD    110
 
-void iwl4965_rf_kill_ct_config(struct iwl4965_priv *priv)
+void iwl4965_rf_kill_ct_config(struct iwl_priv *priv)
 {
         struct iwl4965_ct_kill_config cmd;
         u32 R1, R2, R3;
         u32 temp_th;
         u32 crit_temperature;
         unsigned long flags;
-        int rc = 0;
+        int ret = 0;
 
         spin_lock_irqsave(&priv->lock, flags);
-        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_CLR,
+        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
                     CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
         spin_unlock_irqrestore(&priv->lock, flags);
 
@@ -761,9 +1024,9 @@ void iwl4965_rf_kill_ct_config(struct iwl4965_priv *priv)
 
         crit_temperature = ((temp_th * (R3-R1))/CT_LIMIT_CONST) + R2;
         cmd.critical_temperature_R =  cpu_to_le32(crit_temperature);
-        rc = iwl4965_send_cmd_pdu(priv,
-                              REPLY_CT_KILL_CONFIG_CMD, sizeof(cmd), &cmd);
-        if (rc)
+        ret = iwl_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,
+                               sizeof(cmd), &cmd);
+        if (ret)
                 IWL_ERROR("REPLY_CT_KILL_CONFIG_CMD failed\n");
         else
                 IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded\n");
@@ -779,7 +1042,7 @@ void iwl4965_rf_kill_ct_config(struct iwl4965_priv *priv)
  *   enough to receive all of our own network traffic, but not so
  *   high that our DSP gets too busy trying to lock onto non-network
  *   activity/noise. */
-static int iwl4965_sens_energy_cck(struct iwl4965_priv *priv,
+static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
                                    u32 norm_fa,
                                    u32 rx_enable_time,
                                    struct statistics_general_data *rx_info)
@@ -970,7 +1233,7 @@ static int iwl4965_sens_energy_cck(struct iwl4965_priv *priv,
 }
 
 
-static int iwl4965_sens_auto_corr_ofdm(struct iwl4965_priv *priv,
+static int iwl4965_sens_auto_corr_ofdm(struct iwl_priv *priv,
                                        u32 norm_fa,
                                        u32 rx_enable_time)
 {
@@ -1035,25 +1298,25 @@ static int iwl4965_sens_auto_corr_ofdm(struct iwl4965_priv *priv,
         return 0;
 }
 
-static int iwl4965_sensitivity_callback(struct iwl4965_priv *priv,
-                                    struct iwl4965_cmd *cmd, struct sk_buff *skb)
+static int iwl4965_sensitivity_callback(struct iwl_priv *priv,
+                                    struct iwl_cmd *cmd, struct sk_buff *skb)
 {
         /* We didn't cache the SKB; let the caller free it */
         return 1;
 }
 
 /* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
-static int iwl4965_sensitivity_write(struct iwl4965_priv *priv, u8 flags)
+static int iwl4965_sensitivity_write(struct iwl_priv *priv, u8 flags)
 {
-        int rc = 0;
         struct iwl4965_sensitivity_cmd cmd ;
         struct iwl4965_sensitivity_data *data = NULL;
-        struct iwl4965_host_cmd cmd_out = {
+        struct iwl_host_cmd cmd_out = {
                 .id = SENSITIVITY_CMD,
                 .len = sizeof(struct iwl4965_sensitivity_cmd),
                 .meta.flags = flags,
                 .data = &cmd,
         };
+        int ret;
 
         data = &(priv->sensitivity_data);
 
@@ -1111,20 +1374,18 @@ static int iwl4965_sensitivity_write(struct iwl4965_priv *priv, u8 flags)
         memcpy(&(priv->sensitivity_tbl[0]), &(cmd.table[0]),
                sizeof(u16)*HD_TABLE_SIZE);
 
-        rc = iwl4965_send_cmd(priv, &cmd_out);
-        if (!rc) {
-                IWL_DEBUG_CALIB("SENSITIVITY_CMD succeeded\n");
-                return rc;
-        }
+        ret = iwl_send_cmd(priv, &cmd_out);
+        if (ret)
+                IWL_ERROR("SENSITIVITY_CMD failed\n");
 
-        return 0;
+        return ret;
 }
 
-void iwl4965_init_sensitivity(struct iwl4965_priv *priv, u8 flags, u8 force)
+void iwl4965_init_sensitivity(struct iwl_priv *priv, u8 flags, u8 force)
 {
-        int rc = 0;
-        int i;
         struct iwl4965_sensitivity_data *data = NULL;
+        int i;
+        int ret  = 0;
 
         IWL_DEBUG_CALIB("Start iwl4965_init_sensitivity\n");
 
@@ -1168,8 +1429,8 @@ void iwl4965_init_sensitivity(struct iwl4965_priv *priv, u8 flags, u8 force)
                 memset(&(priv->sensitivity_tbl[0]), 0,
                     sizeof(u16)*HD_TABLE_SIZE);
 
-        rc |= iwl4965_sensitivity_write(priv, flags);
-        IWL_DEBUG_CALIB("<<return 0x%X\n", rc);
+        ret |= iwl4965_sensitivity_write(priv, flags);
+        IWL_DEBUG_CALIB("<<return 0x%X\n", ret);
 
         return;
 }
@@ -1178,13 +1439,12 @@ void iwl4965_init_sensitivity(struct iwl4965_priv *priv, u8 flags, u8 force)
 /* Reset differential Rx gains in NIC to prepare for chain noise calibration.
  * Called after every association, but this runs only once!
  *  ... once chain noise is calibrated the first time, it's good forever.  */
-void iwl4965_chain_noise_reset(struct iwl4965_priv *priv)
+void iwl4965_chain_noise_reset(struct iwl_priv *priv)
 {
         struct iwl4965_chain_noise_data *data = NULL;
-        int rc = 0;
 
         data = &(priv->chain_noise_data);
-        if ((data->state == IWL_CHAIN_NOISE_ALIVE) && iwl4965_is_associated(priv)) {
+        if ((data->state == IWL_CHAIN_NOISE_ALIVE) && iwl_is_associated(priv)) {
                 struct iwl4965_calibration_cmd cmd;
 
                 memset(&cmd, 0, sizeof(cmd));
@@ -1192,8 +1452,8 @@ void iwl4965_chain_noise_reset(struct iwl4965_priv *priv)
                 cmd.diff_gain_a = 0;
                 cmd.diff_gain_b = 0;
                 cmd.diff_gain_c = 0;
-                rc = iwl4965_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
-                                 sizeof(cmd), &cmd);
+                iwl_send_cmd_pdu_async(priv, REPLY_PHY_CALIBRATION_CMD,
+                                 sizeof(cmd), &cmd, NULL);
                 msleep(4);
                 data->state = IWL_CHAIN_NOISE_ACCUMULATE;
                 IWL_DEBUG_CALIB("Run chain_noise_calibrate\n");
@@ -1207,11 +1467,11 @@ void iwl4965_chain_noise_reset(struct iwl4965_priv *priv)
  * 1)  Which antennas are connected.
  * 2)  Differential rx gain settings to balance the 3 receivers.
  */
-static void iwl4965_noise_calibration(struct iwl4965_priv *priv,
+static void iwl4965_noise_calibration(struct iwl_priv *priv,
                                       struct iwl4965_notif_statistics *stat_resp)
 {
         struct iwl4965_chain_noise_data *data = NULL;
-        int rc = 0;
+        int ret = 0;
 
         u32 chain_noise_a;
         u32 chain_noise_b;
@@ -1417,9 +1677,9 @@ static void iwl4965_noise_calibration(struct iwl4965_priv *priv,
                         cmd.diff_gain_a = data->delta_gain_code[0];
                         cmd.diff_gain_b = data->delta_gain_code[1];
                         cmd.diff_gain_c = data->delta_gain_code[2];
-                        rc = iwl4965_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
+                        ret = iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
                                               sizeof(cmd), &cmd);
-                        if (rc)
+                        if (ret)
                                 IWL_DEBUG_CALIB("fail sending cmd "
                                              "REPLY_PHY_CALIBRATION_CMD \n");
 
@@ -1440,10 +1700,9 @@ static void iwl4965_noise_calibration(struct iwl4965_priv *priv,
         return;
 }
 
-static void iwl4965_sensitivity_calibration(struct iwl4965_priv *priv,
+static void iwl4965_sensitivity_calibration(struct iwl_priv *priv,
                                             struct iwl4965_notif_statistics *resp)
 {
-        int rc = 0;
         u32 rx_enable_time;
         u32 fa_cck;
         u32 fa_ofdm;
@@ -1456,10 +1715,11 @@ static void iwl4965_sensitivity_calibration(struct iwl4965_priv *priv,
         struct statistics_rx *statistics = &(resp->rx);
         unsigned long flags;
         struct statistics_general_data statis;
+        int ret;
 
         data = &(priv->sensitivity_data);
 
-        if (!iwl4965_is_associated(priv)) {
+        if (!iwl_is_associated(priv)) {
                 IWL_DEBUG_CALIB("<< - not associated\n");
                 return;
         }
@@ -1540,14 +1800,14 @@ static void iwl4965_sensitivity_calibration(struct iwl4965_priv *priv,
 
         iwl4965_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time);
         iwl4965_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &statis);
-        rc |= iwl4965_sensitivity_write(priv, CMD_ASYNC);
+        ret = iwl4965_sensitivity_write(priv, CMD_ASYNC);
 
         return;
 }
 
 static void iwl4965_bg_sensitivity_work(struct work_struct *work)
 {
-        struct iwl4965_priv *priv = container_of(work, struct iwl4965_priv,
+        struct iwl_priv *priv = container_of(work, struct iwl_priv,
                         sensitivity_work);
 
         mutex_lock(&priv->mutex);
@@ -1577,7 +1837,7 @@ static void iwl4965_bg_sensitivity_work(struct work_struct *work)
 
 static void iwl4965_bg_txpower_work(struct work_struct *work)
 {
-        struct iwl4965_priv *priv = container_of(work, struct iwl4965_priv,
+        struct iwl_priv *priv = container_of(work, struct iwl_priv,
                         txpower_work);
 
         /* If a scan happened to start before we got here
@@ -1605,11 +1865,11 @@ static void iwl4965_bg_txpower_work(struct work_struct *work)
 /*
  * Acquire priv->lock before calling this function !
  */
-static void iwl4965_set_wr_ptrs(struct iwl4965_priv *priv, int txq_id, u32 index)
+static void iwl4965_set_wr_ptrs(struct iwl_priv *priv, int txq_id, u32 index)
 {
-        iwl4965_write_direct32(priv, HBUS_TARG_WRPTR,
+        iwl_write_direct32(priv, HBUS_TARG_WRPTR,
                              (index & 0xff) | (txq_id << 8));
-        iwl4965_write_prph(priv, KDR_SCD_QUEUE_RDPTR(txq_id), index);
+        iwl_write_prph(priv, IWL49_SCD_QUEUE_RDPTR(txq_id), index);
 }
 
 /**
@@ -1619,7 +1879,7 @@ static void iwl4965_set_wr_ptrs(struct iwl4965_priv *priv, int txq_id, u32 index
  *
  * NOTE:  Acquire priv->lock before calling this function !
  */
-static void iwl4965_tx_queue_set_status(struct iwl4965_priv *priv,
+static void iwl4965_tx_queue_set_status(struct iwl_priv *priv,
                                         struct iwl4965_tx_queue *txq,
                                         int tx_fifo_id, int scd_retry)
 {
@@ -1629,7 +1889,7 @@ static void iwl4965_tx_queue_set_status(struct iwl4965_priv *priv,
         int active = test_bit(txq_id, &priv->txq_ctx_active_msk)?1:0;
 
         /* Set up and activate */
-        iwl4965_write_prph(priv, KDR_SCD_QUEUE_STATUS_BITS(txq_id),
+        iwl_write_prph(priv, IWL49_SCD_QUEUE_STATUS_BITS(txq_id),
                                  (active << SCD_QUEUE_STTS_REG_POS_ACTIVE) |
                                  (tx_fifo_id << SCD_QUEUE_STTS_REG_POS_TXF) |
                                  (scd_retry << SCD_QUEUE_STTS_REG_POS_WSL) |
@@ -1653,22 +1913,22 @@ static const u16 default_queue_to_tx_fifo[] = {
         IWL_TX_FIFO_HCCA_2
 };
 
-static inline void iwl4965_txq_ctx_activate(struct iwl4965_priv *priv, int txq_id)
+static inline void iwl4965_txq_ctx_activate(struct iwl_priv *priv, int txq_id)
 {
         set_bit(txq_id, &priv->txq_ctx_active_msk);
 }
 
-static inline void iwl4965_txq_ctx_deactivate(struct iwl4965_priv *priv, int txq_id)
+static inline void iwl4965_txq_ctx_deactivate(struct iwl_priv *priv, int txq_id)
 {
         clear_bit(txq_id, &priv->txq_ctx_active_msk);
 }
 
-int iwl4965_alive_notify(struct iwl4965_priv *priv)
+int iwl4965_alive_notify(struct iwl_priv *priv)
 {
         u32 a;
         int i = 0;
         unsigned long flags;
-        int rc;
+        int ret;
 
         spin_lock_irqsave(&priv->lock, flags);
 
@@ -1681,46 +1941,46 @@ int iwl4965_alive_notify(struct iwl4965_priv *priv)
                 priv->chain_noise_data.delta_gain_code[i] =
                                 CHAIN_NOISE_DELTA_GAIN_INIT_VAL;
 #endif /* CONFIG_IWL4965_SENSITIVITY*/
-        rc = iwl4965_grab_nic_access(priv);
-        if (rc) {
+        ret = iwl_grab_nic_access(priv);
+        if (ret) {
                 spin_unlock_irqrestore(&priv->lock, flags);
-                return rc;
+                return ret;
         }
 
         /* Clear 4965's internal Tx Scheduler data base */
-        priv->scd_base_addr = iwl4965_read_prph(priv, KDR_SCD_SRAM_BASE_ADDR);
+        priv->scd_base_addr = iwl_read_prph(priv, IWL49_SCD_SRAM_BASE_ADDR);
         a = priv->scd_base_addr + SCD_CONTEXT_DATA_OFFSET;
         for (; a < priv->scd_base_addr + SCD_TX_STTS_BITMAP_OFFSET; a += 4)
-                iwl4965_write_targ_mem(priv, a, 0);
+                iwl_write_targ_mem(priv, a, 0);
         for (; a < priv->scd_base_addr + SCD_TRANSLATE_TBL_OFFSET; a += 4)
-                iwl4965_write_targ_mem(priv, a, 0);
-        for (; a < sizeof(u16) * priv->hw_setting.max_txq_num; a += 4)
-                iwl4965_write_targ_mem(priv, a, 0);
+                iwl_write_targ_mem(priv, a, 0);
+        for (; a < sizeof(u16) * priv->hw_params.max_txq_num; a += 4)
+                iwl_write_targ_mem(priv, a, 0);
 
         /* Tel 4965 where to find Tx byte count tables */
-        iwl4965_write_prph(priv, KDR_SCD_DRAM_BASE_ADDR,
-                (priv->hw_setting.shared_phys +
+        iwl_write_prph(priv, IWL49_SCD_DRAM_BASE_ADDR,
+                (priv->shared_phys +
                  offsetof(struct iwl4965_shared, queues_byte_cnt_tbls)) >> 10);
 
         /* Disable chain mode for all queues */
-        iwl4965_write_prph(priv, KDR_SCD_QUEUECHAIN_SEL, 0);
+        iwl_write_prph(priv, IWL49_SCD_QUEUECHAIN_SEL, 0);
 
         /* Initialize each Tx queue (including the command queue) */
-        for (i = 0; i < priv->hw_setting.max_txq_num; i++) {
+        for (i = 0; i < priv->hw_params.max_txq_num; i++) {
 
                 /* TFD circular buffer read/write indexes */
-                iwl4965_write_prph(priv, KDR_SCD_QUEUE_RDPTR(i), 0);
-                iwl4965_write_direct32(priv, HBUS_TARG_WRPTR, 0 | (i << 8));
+                iwl_write_prph(priv, IWL49_SCD_QUEUE_RDPTR(i), 0);
+                iwl_write_direct32(priv, HBUS_TARG_WRPTR, 0 | (i << 8));
 
                 /* Max Tx Window size for Scheduler-ACK mode */
-                iwl4965_write_targ_mem(priv, priv->scd_base_addr +
+                iwl_write_targ_mem(priv, priv->scd_base_addr +
                                         SCD_CONTEXT_QUEUE_OFFSET(i),
                                         (SCD_WIN_SIZE <<
                                         SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &
                                         SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
 
                 /* Frame limit */
-                iwl4965_write_targ_mem(priv, priv->scd_base_addr +
+                iwl_write_targ_mem(priv, priv->scd_base_addr +
                                         SCD_CONTEXT_QUEUE_OFFSET(i) +
                                         sizeof(u32),
                                         (SCD_FRAME_LIMIT <<
@@ -1728,11 +1988,11 @@ int iwl4965_alive_notify(struct iwl4965_priv *priv)
                                         SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
 
         }
-        iwl4965_write_prph(priv, KDR_SCD_INTERRUPT_MASK,
-                                 (1 << priv->hw_setting.max_txq_num) - 1);
+        iwl_write_prph(priv, IWL49_SCD_INTERRUPT_MASK,
+                                 (1 << priv->hw_params.max_txq_num) - 1);
 
         /* Activate all Tx DMA/FIFO channels */
-        iwl4965_write_prph(priv, KDR_SCD_TXFACT,
+        iwl_write_prph(priv, IWL49_SCD_TXFACT,
                                  SCD_TXFACT_REG_TXFIFO_MASK(0, 7));
 
         iwl4965_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);
@@ -1744,42 +2004,47 @@ int iwl4965_alive_notify(struct iwl4965_priv *priv)
                 iwl4965_tx_queue_set_status(priv, &priv->txq[i], ac, 0);
         }
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        return 0;
+        /* Ask for statistics now, the uCode will send statistics notification
+         * periodically after association */
+        iwl_send_statistics_request(priv, CMD_ASYNC);
+        return ret;
 }
 
 /**
- * iwl4965_hw_set_hw_setting
+ * iwl4965_hw_set_hw_params
  *
  * Called when initializing driver
  */
-int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv)
+int iwl4965_hw_set_hw_params(struct iwl_priv *priv)
 {
-        /* Allocate area for Tx byte count tables and Rx queue status */
-        priv->hw_setting.shared_virt =
-            pci_alloc_consistent(priv->pci_dev,
-                                 sizeof(struct iwl4965_shared),
-                                 &priv->hw_setting.shared_phys);
-
-        if (!priv->hw_setting.shared_virt)
-                return -1;
 
-        memset(priv->hw_setting.shared_virt, 0, sizeof(struct iwl4965_shared));
+        if ((priv->cfg->mod_params->num_of_queues > IWL4965_MAX_NUM_QUEUES) ||
+            (priv->cfg->mod_params->num_of_queues < IWL_MIN_NUM_QUEUES)) {
+                IWL_ERROR("invalid queues_num, should be between %d and %d\n",
+                          IWL_MIN_NUM_QUEUES, IWL4965_MAX_NUM_QUEUES);
+                return -EINVAL;
+        }
 
-        priv->hw_setting.max_txq_num = iwl4965_param_queues_num;
-        priv->hw_setting.ac_queue_count = AC_NUM;
-        priv->hw_setting.tx_cmd_len = sizeof(struct iwl4965_tx_cmd);
-        priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;
-        priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;
-        if (iwl4965_param_amsdu_size_8K)
-                priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE_8K;
+        priv->hw_params.max_txq_num = priv->cfg->mod_params->num_of_queues;
+        priv->hw_params.tx_cmd_len = sizeof(struct iwl4965_tx_cmd);
+        priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;
+        priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
+        if (priv->cfg->mod_params->amsdu_size_8K)
+                priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_8K;
         else
-                priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE_4K;
-        priv->hw_setting.max_pkt_size = priv->hw_setting.rx_buf_size - 256;
-        priv->hw_setting.max_stations = IWL4965_STATION_COUNT;
-        priv->hw_setting.bcast_sta_id = IWL4965_BROADCAST_ID;
+                priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_4K;
+        priv->hw_params.max_pkt_size = priv->hw_params.rx_buf_size - 256;
+        priv->hw_params.max_stations = IWL4965_STATION_COUNT;
+        priv->hw_params.bcast_sta_id = IWL4965_BROADCAST_ID;
+
+        priv->hw_params.tx_chains_num = 2;
+        priv->hw_params.rx_chains_num = 2;
+        priv->hw_params.valid_tx_ant = (IWL_ANTENNA_MAIN | IWL_ANTENNA_AUX);
+        priv->hw_params.valid_rx_ant = (IWL_ANTENNA_MAIN | IWL_ANTENNA_AUX);
+
         return 0;
 }
 
@@ -1788,12 +2053,12 @@ int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv)
  *
  * Destroy all TX DMA queues and structures
  */
-void iwl4965_hw_txq_ctx_free(struct iwl4965_priv *priv)
+void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv)
 {
         int txq_id;
 
         /* Tx queues */
-        for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++)
+        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++)
                 iwl4965_tx_queue_free(priv, &priv->txq[txq_id]);
 
         /* Keep-warm buffer */
@@ -1806,7 +2071,7 @@ void iwl4965_hw_txq_ctx_free(struct iwl4965_priv *priv)
  * Does NOT advance any TFD circular buffer read/write indexes
  * Does NOT free the TFD itself (which is within circular buffer)
  */
-int iwl4965_hw_txq_free_tfd(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq)
+int iwl4965_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl4965_tx_queue *txq)
 {
         struct iwl4965_tfd_frame *bd_tmp = (struct iwl4965_tfd_frame *)&txq->bd[0];
         struct iwl4965_tfd_frame *bd = &bd_tmp[txq->q.read_ptr];
@@ -1859,7 +2124,7 @@ int iwl4965_hw_txq_free_tfd(struct iwl4965_priv *priv, struct iwl4965_tx_queue *
         return 0;
 }
 
-int iwl4965_hw_reg_set_txpower(struct iwl4965_priv *priv, s8 power)
+int iwl4965_hw_reg_set_txpower(struct iwl_priv *priv, s8 power)
 {
         IWL_ERROR("TODO: Implement iwl4965_hw_reg_set_txpower!\n");
         return -EINVAL;
@@ -1914,12 +2179,13 @@ static s32 iwl4965_get_voltage_compensation(s32 eeprom_voltage,
         return comp;
 }
 
-static const struct iwl4965_channel_info *
-iwl4965_get_channel_txpower_info(struct iwl4965_priv *priv, u8 phymode, u16 channel)
+static const struct iwl_channel_info *
+iwl4965_get_channel_txpower_info(struct iwl_priv *priv,
+                                 enum ieee80211_band band, u16 channel)
 {
-        const struct iwl4965_channel_info *ch_info;
+        const struct iwl_channel_info *ch_info;
 
-        ch_info = iwl4965_get_channel_info(priv, phymode, channel);
+        ch_info = iwl_get_channel_info(priv, band, channel);
 
         if (!is_channel_valid(ch_info))
                 return NULL;
@@ -1953,7 +2219,7 @@ static s32 iwl4965_get_tx_atten_grp(u16 channel)
         return -1;
 }
 
-static u32 iwl4965_get_sub_band(const struct iwl4965_priv *priv, u32 channel)
+static u32 iwl4965_get_sub_band(const struct iwl_priv *priv, u32 channel)
 {
         s32 b = -1;
 
@@ -1989,7 +2255,7 @@ static s32 iwl4965_interpolate_value(s32 x, s32 x1, s32 y1, s32 x2, s32 y2)
  * differences in channel frequencies, which is proportional to differences
  * in channel number.
  */
-static int iwl4965_interpolate_chan(struct iwl4965_priv *priv, u32 channel,
+static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel,
                                     struct iwl4965_eeprom_calib_ch_info *chan_info)
 {
         s32 s = -1;
@@ -2322,7 +2588,7 @@ static const struct gain_entry gain_table[2][108] = {
          }
 };
 
-static int iwl4965_fill_txpower_tbl(struct iwl4965_priv *priv, u8 band, u16 channel,
+static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
                                     u8 is_fat, u8 ctrl_chan_high,
                                     struct iwl4965_tx_power_db *tx_power_tbl)
 {
@@ -2336,7 +2602,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl4965_priv *priv, u8 band, u16 chan
         s32 txatten_grp = CALIB_CH_GROUP_MAX;
         int i;
         int c;
-        const struct iwl4965_channel_info *ch_info = NULL;
+        const struct iwl_channel_info *ch_info = NULL;
         struct iwl4965_eeprom_calib_ch_info ch_eeprom_info;
         const struct iwl4965_eeprom_calib_measure *measurement;
         s16 voltage;
@@ -2368,7 +2634,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl4965_priv *priv, u8 band, u16 chan
 
         /* Get current (RXON) channel, band, width */
         ch_info =
-                iwl4965_get_channel_txpower_info(priv, priv->phymode, channel);
+                iwl4965_get_channel_txpower_info(priv, priv->band, channel);
 
         IWL_DEBUG_TXPOWER("chan %d band %d is_fat %d\n", channel, band,
                           is_fat);
@@ -2579,10 +2845,10 @@ static int iwl4965_fill_txpower_tbl(struct iwl4965_priv *priv, u8 band, u16 chan
  * Uses the active RXON for channel, band, and characteristics (fat, high)
  * The power limit is taken from priv->user_txpower_limit.
  */
-int iwl4965_hw_reg_send_txpower(struct iwl4965_priv *priv)
+int iwl4965_hw_reg_send_txpower(struct iwl_priv *priv)
 {
         struct iwl4965_txpowertable_cmd cmd = { 0 };
-        int rc = 0;
+        int ret;
         u8 band = 0;
         u8 is_fat = 0;
         u8 ctrl_chan_high = 0;
@@ -2595,8 +2861,7 @@ int iwl4965_hw_reg_send_txpower(struct iwl4965_priv *priv)
                 return -EAGAIN;
         }
 
-        band = ((priv->phymode == MODE_IEEE80211B) ||
-                (priv->phymode == MODE_IEEE80211G));
+        band = priv->band == IEEE80211_BAND_2GHZ;
 
         is_fat =  is_fat_channel(priv->active_rxon.flags);
 
@@ -2607,29 +2872,70 @@ int iwl4965_hw_reg_send_txpower(struct iwl4965_priv *priv)
         cmd.band = band;
         cmd.channel = priv->active_rxon.channel;
 
-        rc = iwl4965_fill_txpower_tbl(priv, band,
+        ret = iwl4965_fill_txpower_tbl(priv, band,
                                 le16_to_cpu(priv->active_rxon.channel),
                                 is_fat, ctrl_chan_high, &cmd.tx_power);
-        if (rc)
-                return rc;
+        if (ret)
+                goto out;
 
-        rc = iwl4965_send_cmd_pdu(priv, REPLY_TX_PWR_TABLE_CMD, sizeof(cmd), &cmd);
-        return rc;
+        ret = iwl_send_cmd_pdu(priv, REPLY_TX_PWR_TABLE_CMD, sizeof(cmd), &cmd);
+
+out:
+        return ret;
 }
 
-int iwl4965_hw_channel_switch(struct iwl4965_priv *priv, u16 channel)
+static int iwl4965_send_rxon_assoc(struct iwl_priv *priv)
+{
+        int ret = 0;
+        struct iwl4965_rxon_assoc_cmd rxon_assoc;
+        const struct iwl4965_rxon_cmd *rxon1 = &priv->staging_rxon;
+        const struct iwl4965_rxon_cmd *rxon2 = &priv->active_rxon;
+
+        if ((rxon1->flags == rxon2->flags) &&
+            (rxon1->filter_flags == rxon2->filter_flags) &&
+            (rxon1->cck_basic_rates == rxon2->cck_basic_rates) &&
+            (rxon1->ofdm_ht_single_stream_basic_rates ==
+             rxon2->ofdm_ht_single_stream_basic_rates) &&
+            (rxon1->ofdm_ht_dual_stream_basic_rates ==
+             rxon2->ofdm_ht_dual_stream_basic_rates) &&
+            (rxon1->rx_chain == rxon2->rx_chain) &&
+            (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) {
+                IWL_DEBUG_INFO("Using current RXON_ASSOC.  Not resending.\n");
+                return 0;
+        }
+
+        rxon_assoc.flags = priv->staging_rxon.flags;
+        rxon_assoc.filter_flags = priv->staging_rxon.filter_flags;
+        rxon_assoc.ofdm_basic_rates = priv->staging_rxon.ofdm_basic_rates;
+        rxon_assoc.cck_basic_rates = priv->staging_rxon.cck_basic_rates;
+        rxon_assoc.reserved = 0;
+        rxon_assoc.ofdm_ht_single_stream_basic_rates =
+            priv->staging_rxon.ofdm_ht_single_stream_basic_rates;
+        rxon_assoc.ofdm_ht_dual_stream_basic_rates =
+            priv->staging_rxon.ofdm_ht_dual_stream_basic_rates;
+        rxon_assoc.rx_chain_select_flags = priv->staging_rxon.rx_chain;
+
+        ret = iwl_send_cmd_pdu_async(priv, REPLY_RXON_ASSOC,
+                                     sizeof(rxon_assoc), &rxon_assoc, NULL);
+        if (ret)
+                return ret;
+
+        return ret;
+}
+
+
+int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)
 {
         int rc;
         u8 band = 0;
         u8 is_fat = 0;
         u8 ctrl_chan_high = 0;
         struct iwl4965_channel_switch_cmd cmd = { 0 };
-        const struct iwl4965_channel_info *ch_info;
+        const struct iwl_channel_info *ch_info;
 
-        band = ((priv->phymode == MODE_IEEE80211B) ||
-                (priv->phymode == MODE_IEEE80211G));
+        band = priv->band == IEEE80211_BAND_2GHZ;
 
-        ch_info = iwl4965_get_channel_info(priv, priv->phymode, channel);
+        ch_info = iwl_get_channel_info(priv, priv->band, channel);
 
         is_fat = is_fat_channel(priv->staging_rxon.flags);
 
@@ -2655,15 +2961,15 @@ int iwl4965_hw_channel_switch(struct iwl4965_priv *priv, u16 channel)
                 return rc;
         }
 
-        rc = iwl4965_send_cmd_pdu(priv, REPLY_CHANNEL_SWITCH, sizeof(cmd), &cmd);
+        rc = iwl_send_cmd_pdu(priv, REPLY_CHANNEL_SWITCH, sizeof(cmd), &cmd);
         return rc;
 }
 
 #define RTS_HCCA_RETRY_LIMIT            3
 #define RTS_DFAULT_RETRY_LIMIT          60
 
-void iwl4965_hw_build_tx_cmd_rate(struct iwl4965_priv *priv,
-                              struct iwl4965_cmd *cmd,
+void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv,
+                              struct iwl_cmd *cmd,
                               struct ieee80211_tx_control *ctrl,
                               struct ieee80211_hdr *hdr, int sta_id,
                               int is_hcca)
@@ -2674,7 +2980,7 @@ void iwl4965_hw_build_tx_cmd_rate(struct iwl4965_priv *priv,
         u16 fc = le16_to_cpu(hdr->frame_control);
         u8 rate_plcp;
         u16 rate_flags = 0;
-        int rate_idx = min(ctrl->tx_rate & 0xffff, IWL_RATE_COUNT - 1);
+        int rate_idx = min(ctrl->tx_rate->hw_value & 0xffff, IWL_RATE_COUNT - 1);
 
         rate_plcp = iwl4965_rates[rate_idx].plcp;
 
@@ -2729,19 +3035,18 @@ void iwl4965_hw_build_tx_cmd_rate(struct iwl4965_priv *priv,
         tx->rate_n_flags = iwl4965_hw_set_rate_n_flags(rate_plcp, rate_flags);
 }
 
-int iwl4965_hw_get_rx_read(struct iwl4965_priv *priv)
+int iwl4965_hw_get_rx_read(struct iwl_priv *priv)
 {
-        struct iwl4965_shared *shared_data = priv->hw_setting.shared_virt;
-
-        return IWL_GET_BITS(*shared_data, rb_closed_stts_rb_num);
+        struct iwl4965_shared *s = priv->shared_virt;
+        return le32_to_cpu(s->rb_closed) & 0xFFF;
 }
 
-int iwl4965_hw_get_temperature(struct iwl4965_priv *priv)
+int iwl4965_hw_get_temperature(struct iwl_priv *priv)
 {
         return priv->temperature;
 }
 
-unsigned int iwl4965_hw_get_beacon_cmd(struct iwl4965_priv *priv,
+unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,
                           struct iwl4965_frame *frame, u8 rate)
 {
         struct iwl4965_tx_beacon_cmd *tx_beacon_cmd;
@@ -2750,7 +3055,7 @@ unsigned int iwl4965_hw_get_beacon_cmd(struct iwl4965_priv *priv,
         tx_beacon_cmd = &frame->u.beacon;
         memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));
 
-        tx_beacon_cmd->tx.sta_id = IWL4965_BROADCAST_ID;
+        tx_beacon_cmd->tx.sta_id = priv->hw_params.bcast_sta_id;
         tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
 
         frame_size = iwl4965_fill_beacon_frame(priv,
@@ -2780,35 +3085,35 @@ unsigned int iwl4965_hw_get_beacon_cmd(struct iwl4965_priv *priv,
  * 4965 supports up to 16 Tx queues in DRAM, mapped to up to 8 Tx DMA
  * channels supported in hardware.
  */
-int iwl4965_hw_tx_queue_init(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq)
+int iwl4965_hw_tx_queue_init(struct iwl_priv *priv, struct iwl4965_tx_queue *txq)
 {
         int rc;
         unsigned long flags;
         int txq_id = txq->q.id;
 
         spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc) {
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return rc;
         }
 
         /* Circular buffer (TFD queue in DRAM) physical base address */
-        iwl4965_write_direct32(priv, FH_MEM_CBBC_QUEUE(txq_id),
+        iwl_write_direct32(priv, FH_MEM_CBBC_QUEUE(txq_id),
                              txq->q.dma_addr >> 8);
 
         /* Enable DMA channel, using same id as for TFD queue */
-        iwl4965_write_direct32(
+        iwl_write_direct32(
                 priv, IWL_FH_TCSR_CHNL_TX_CONFIG_REG(txq_id),
                 IWL_FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
                 IWL_FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL);
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
-int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl4965_priv *priv, void *ptr,
+int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,
                                  dma_addr_t addr, u16 len)
 {
         int index, is_odd;
@@ -2842,7 +3147,7 @@ int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl4965_priv *priv, void *ptr,
         return 0;
 }
 
-static void iwl4965_hw_card_show_info(struct iwl4965_priv *priv)
+static void iwl4965_hw_card_show_info(struct iwl_priv *priv)
 {
         u16 hw_version = priv->eeprom.board_revision_4965;
 
@@ -2858,17 +3163,15 @@ static void iwl4965_hw_card_show_info(struct iwl4965_priv *priv)
 #define IWL_TX_DELIMITER_SIZE   4
 
 /**
- * iwl4965_tx_queue_update_wr_ptr - Set up entry in Tx byte-count array
+ * iwl4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
  */
-int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,
-                                   struct iwl4965_tx_queue *txq, u16 byte_cnt)
+static void iwl4965_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
+                                            struct iwl4965_tx_queue *txq,
+                                            u16 byte_cnt)
 {
         int len;
         int txq_id = txq->q.id;
-        struct iwl4965_shared *shared_data = priv->hw_setting.shared_virt;
-
-        if (txq->need_update == 0)
-                return 0;
+        struct iwl4965_shared *shared_data = priv->shared_virt;
 
         len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;
 
@@ -2881,8 +3184,6 @@ int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,
                 IWL_SET_BITS16(shared_data->queues_byte_cnt_tbls[txq_id].
                         tfd_offset[IWL4965_QUEUE_SIZE + txq->q.write_ptr],
                         byte_cnt, len);
-
-        return 0;
 }
 
 /**
@@ -2891,7 +3192,7 @@ int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,
  * Selects how many and which Rx receivers/antennas/chains to use.
  * This should not be used for scan command ... it puts data in wrong place.
  */
-void iwl4965_set_rxon_chain(struct iwl4965_priv *priv)
+void iwl4965_set_rxon_chain(struct iwl_priv *priv)
 {
         u8 is_single = is_single_stream(priv);
         u8 idle_state, rx_state;
@@ -2922,378 +3223,6 @@ void iwl4965_set_rxon_chain(struct iwl4965_priv *priv)
         IWL_DEBUG_ASSOC("rx chain %X\n", priv->staging_rxon.rx_chain);
 }
 
-#ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
-/*
-        get the traffic load value for tid
-*/
-static u32 iwl4965_tl_get_load(struct iwl4965_priv *priv, u8 tid)
-{
-        u32 load = 0;
-        u32 current_time = jiffies_to_msecs(jiffies);
-        u32 time_diff;
-        s32 index;
-        unsigned long flags;
-        struct iwl4965_traffic_load *tid_ptr = NULL;
-
-        if (tid >= TID_MAX_LOAD_COUNT)
-                return 0;
-
-        tid_ptr = &(priv->lq_mngr.agg_ctrl.traffic_load[tid]);
-
-        current_time -= current_time % TID_ROUND_VALUE;
-
-        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-        if (!(tid_ptr->queue_count))
-                goto out;
-
-        time_diff = TIME_WRAP_AROUND(tid_ptr->time_stamp, current_time);
-        index = time_diff / TID_QUEUE_CELL_SPACING;
-
-        if (index >= TID_QUEUE_MAX_SIZE) {
-                u32 oldest_time = current_time - TID_MAX_TIME_DIFF;
-
-                while (tid_ptr->queue_count &&
-                       (tid_ptr->time_stamp < oldest_time)) {
-                        tid_ptr->total -= tid_ptr->packet_count[tid_ptr->head];
-                        tid_ptr->packet_count[tid_ptr->head] = 0;
-                        tid_ptr->time_stamp += TID_QUEUE_CELL_SPACING;
-                        tid_ptr->queue_count--;
-                        tid_ptr->head++;
-                        if (tid_ptr->head >= TID_QUEUE_MAX_SIZE)
-                                tid_ptr->head = 0;
-                }
-        }
-        load = tid_ptr->total;
-
- out:
-        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-        return load;
-}
-
-/*
-        increment traffic load value for tid and also remove
-        any old values if passed the certian time period
-*/
-static void iwl4965_tl_add_packet(struct iwl4965_priv *priv, u8 tid)
-{
-        u32 current_time = jiffies_to_msecs(jiffies);
-        u32 time_diff;
-        s32 index;
-        unsigned long flags;
-        struct iwl4965_traffic_load *tid_ptr = NULL;
-
-        if (tid >= TID_MAX_LOAD_COUNT)
-                return;
-
-        tid_ptr = &(priv->lq_mngr.agg_ctrl.traffic_load[tid]);
-
-        current_time -= current_time % TID_ROUND_VALUE;
-
-        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-        if (!(tid_ptr->queue_count)) {
-                tid_ptr->total = 1;
-                tid_ptr->time_stamp = current_time;
-                tid_ptr->queue_count = 1;
-                tid_ptr->head = 0;
-                tid_ptr->packet_count[0] = 1;
-                goto out;
-        }
-
-        time_diff = TIME_WRAP_AROUND(tid_ptr->time_stamp, current_time);
-        index = time_diff / TID_QUEUE_CELL_SPACING;
-
-        if (index >= TID_QUEUE_MAX_SIZE) {
-                u32 oldest_time = current_time - TID_MAX_TIME_DIFF;
-
-                while (tid_ptr->queue_count &&
-                       (tid_ptr->time_stamp < oldest_time)) {
-                        tid_ptr->total -= tid_ptr->packet_count[tid_ptr->head];
-                        tid_ptr->packet_count[tid_ptr->head] = 0;
-                        tid_ptr->time_stamp += TID_QUEUE_CELL_SPACING;
-                        tid_ptr->queue_count--;
-                        tid_ptr->head++;
-                        if (tid_ptr->head >= TID_QUEUE_MAX_SIZE)
-                                tid_ptr->head = 0;
-                }
-        }
-
-        index = (tid_ptr->head + index) % TID_QUEUE_MAX_SIZE;
-        tid_ptr->packet_count[index] = tid_ptr->packet_count[index] + 1;
-        tid_ptr->total = tid_ptr->total + 1;
-
-        if ((index + 1) > tid_ptr->queue_count)
-                tid_ptr->queue_count = index + 1;
- out:
-        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-
-}
-
-#define MMAC_SCHED_MAX_NUMBER_OF_HT_BACK_FLOWS   7
-enum HT_STATUS {
-        BA_STATUS_FAILURE = 0,
-        BA_STATUS_INITIATOR_DELBA,
-        BA_STATUS_RECIPIENT_DELBA,
-        BA_STATUS_RENEW_ADDBA_REQUEST,
-        BA_STATUS_ACTIVE,
-};
-
-/**
- * iwl4964_tl_ba_avail - Find out if an unused aggregation queue is available
- */
-static u8 iwl4964_tl_ba_avail(struct iwl4965_priv *priv)
-{
-        int i;
-        struct iwl4965_lq_mngr *lq;
-        u8 count = 0;
-        u16 msk;
-
-        lq = (struct iwl4965_lq_mngr *)&(priv->lq_mngr);
-
-        /* Find out how many agg queues are in use */
-        for (i = 0; i < TID_MAX_LOAD_COUNT ; i++) {
-                msk = 1 << i;
-                if ((lq->agg_ctrl.granted_ba & msk) ||
-                    (lq->agg_ctrl.wait_for_agg_status & msk))
-                        count++;
-        }
-
-        if (count < MMAC_SCHED_MAX_NUMBER_OF_HT_BACK_FLOWS)
-                return 1;
-
-        return 0;
-}
-
-static void iwl4965_ba_status(struct iwl4965_priv *priv,
-                              u8 tid, enum HT_STATUS status);
-
-static int iwl4965_perform_addba(struct iwl4965_priv *priv, u8 tid, u32 length,
-                                 u32 ba_timeout)
-{
-        int rc;
-
-        rc = ieee80211_start_BA_session(priv->hw, priv->bssid, tid);
-        if (rc)
-                iwl4965_ba_status(priv, tid, BA_STATUS_FAILURE);
-
-        return rc;
-}
-
-static int iwl4965_perform_delba(struct iwl4965_priv *priv, u8 tid)
-{
-        int rc;
-
-        rc = ieee80211_stop_BA_session(priv->hw, priv->bssid, tid);
-        if (rc)
-                iwl4965_ba_status(priv, tid, BA_STATUS_FAILURE);
-
-        return rc;
-}
-
-static void iwl4965_turn_on_agg_for_tid(struct iwl4965_priv *priv,
-                                        struct iwl4965_lq_mngr *lq,
-                                        u8 auto_agg, u8 tid)
-{
-        u32 tid_msk = (1 << tid);
-        unsigned long flags;
-
-        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-/*
-        if ((auto_agg) && (!lq->enable_counter)){
-                lq->agg_ctrl.next_retry = 0;
-                lq->agg_ctrl.tid_retry = 0;
-                spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-                return;
-        }
-*/
-        if (!(lq->agg_ctrl.granted_ba & tid_msk) &&
-            (lq->agg_ctrl.requested_ba & tid_msk)) {
-                u8 available_queues;
-                u32 load;
-
-                spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-                available_queues = iwl4964_tl_ba_avail(priv);
-                load = iwl4965_tl_get_load(priv, tid);
-
-                spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-                if (!available_queues) {
-                        if (auto_agg)
-                                lq->agg_ctrl.tid_retry |= tid_msk;
-                        else {
-                                lq->agg_ctrl.requested_ba &= ~tid_msk;
-                                lq->agg_ctrl.wait_for_agg_status &= ~tid_msk;
-                        }
-                } else if ((auto_agg) &&
-                           ((load <= lq->agg_ctrl.tid_traffic_load_threshold) ||
-                            ((lq->agg_ctrl.wait_for_agg_status & tid_msk))))
-                        lq->agg_ctrl.tid_retry |= tid_msk;
-                else {
-                        lq->agg_ctrl.wait_for_agg_status |= tid_msk;
-                        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-                        iwl4965_perform_addba(priv, tid, 0x40,
-                                              lq->agg_ctrl.ba_timeout);
-                        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-                }
-        }
-        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-}
-
-static void iwl4965_turn_on_agg(struct iwl4965_priv *priv, u8 tid)
-{
-        struct iwl4965_lq_mngr *lq;
-        unsigned long flags;
-
-        lq = (struct iwl4965_lq_mngr *)&(priv->lq_mngr);
-
-        if ((tid < TID_MAX_LOAD_COUNT))
-                iwl4965_turn_on_agg_for_tid(priv, lq, lq->agg_ctrl.auto_agg,
-                                            tid);
-        else if (tid == TID_ALL_SPECIFIED) {
-                if (lq->agg_ctrl.requested_ba) {
-                        for (tid = 0; tid < TID_MAX_LOAD_COUNT; tid++)
-                                iwl4965_turn_on_agg_for_tid(priv, lq,
-                                        lq->agg_ctrl.auto_agg, tid);
-                } else {
-                        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-                        lq->agg_ctrl.tid_retry = 0;
-                        lq->agg_ctrl.next_retry = 0;
-                        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-                }
-        }
-
-}
-
-void iwl4965_turn_off_agg(struct iwl4965_priv *priv, u8 tid)
-{
-        u32 tid_msk;
-        struct iwl4965_lq_mngr *lq;
-        unsigned long flags;
-
-        lq = (struct iwl4965_lq_mngr *)&(priv->lq_mngr);
-
-        if ((tid < TID_MAX_LOAD_COUNT)) {
-                tid_msk = 1 << tid;
-                spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-                lq->agg_ctrl.wait_for_agg_status |= tid_msk;
-                lq->agg_ctrl.requested_ba &= ~tid_msk;
-                spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-                iwl4965_perform_delba(priv, tid);
-        } else if (tid == TID_ALL_SPECIFIED) {
-                spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-                for (tid = 0; tid < TID_MAX_LOAD_COUNT; tid++) {
-                        tid_msk = 1 << tid;
-                        lq->agg_ctrl.wait_for_agg_status |= tid_msk;
-                        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-                        iwl4965_perform_delba(priv, tid);
-                        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-                }
-                lq->agg_ctrl.requested_ba = 0;
-                spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-        }
-}
-
-/**
- * iwl4965_ba_status - Update driver's link quality mgr with tid's HT status
- */
-static void iwl4965_ba_status(struct iwl4965_priv *priv,
-                                u8 tid, enum HT_STATUS status)
-{
-        struct iwl4965_lq_mngr *lq;
-        u32 tid_msk = (1 << tid);
-        unsigned long flags;
-
-        lq = (struct iwl4965_lq_mngr *)&(priv->lq_mngr);
-
-        if ((tid >= TID_MAX_LOAD_COUNT))
-                goto out;
-
-        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-        switch (status) {
-        case BA_STATUS_ACTIVE:
-                if (!(lq->agg_ctrl.granted_ba & tid_msk))
-                        lq->agg_ctrl.granted_ba |= tid_msk;
-                break;
-        default:
-                if ((lq->agg_ctrl.granted_ba & tid_msk))
-                        lq->agg_ctrl.granted_ba &= ~tid_msk;
-                break;
-        }
-
-        lq->agg_ctrl.wait_for_agg_status &= ~tid_msk;
-        if (status != BA_STATUS_ACTIVE) {
-                if (lq->agg_ctrl.auto_agg) {
-                        lq->agg_ctrl.tid_retry |= tid_msk;
-                        lq->agg_ctrl.next_retry =
-                            jiffies + msecs_to_jiffies(500);
-                } else
-                        lq->agg_ctrl.requested_ba &= ~tid_msk;
-        }
-        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
- out:
-        return;
-}
-
-static void iwl4965_bg_agg_work(struct work_struct *work)
-{
-        struct iwl4965_priv *priv = container_of(work, struct iwl4965_priv,
-                                        agg_work);
-
-        u32 tid;
-        u32 retry_tid;
-        u32 tid_msk;
-        unsigned long flags;
-        struct iwl4965_lq_mngr *lq = (struct iwl4965_lq_mngr *)&(priv->lq_mngr);
-
-        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-        retry_tid = lq->agg_ctrl.tid_retry;
-        lq->agg_ctrl.tid_retry = 0;
-        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-
-        if (retry_tid == TID_ALL_SPECIFIED)
-                iwl4965_turn_on_agg(priv, TID_ALL_SPECIFIED);
-        else {
-                for (tid = 0; tid < TID_MAX_LOAD_COUNT; tid++) {
-                        tid_msk = (1 << tid);
-                        if (retry_tid & tid_msk)
-                                iwl4965_turn_on_agg(priv, tid);
-                }
-        }
-
-        spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-        if (lq->agg_ctrl.tid_retry)
-                lq->agg_ctrl.next_retry = jiffies + msecs_to_jiffies(500);
-        spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-        return;
-}
-
-/* TODO: move this functionality to rate scaling */
-void iwl4965_tl_get_stats(struct iwl4965_priv *priv,
-                   struct ieee80211_hdr *hdr)
-{
-        __le16 *qc = ieee80211_get_qos_ctrl(hdr);
-
-        if (qc &&
-            (priv->iw_mode != IEEE80211_IF_TYPE_IBSS)) {
-                u8 tid = 0;
-                tid = (u8) (le16_to_cpu(*qc) & 0xF);
-                if (tid < TID_MAX_LOAD_COUNT)
-                        iwl4965_tl_add_packet(priv, tid);
-        }
-
-        if (priv->lq_mngr.agg_ctrl.next_retry &&
-            (time_after(priv->lq_mngr.agg_ctrl.next_retry, jiffies))) {
-                unsigned long flags;
-
-                spin_lock_irqsave(&priv->lq_mngr.lock, flags);
-                priv->lq_mngr.agg_ctrl.next_retry = 0;
-                spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
-                schedule_work(&priv->agg_work);
-        }
-}
-
-#endif /*CONFIG_IWL4965_HT_AGG */
-#endif /* CONFIG_IWL4965_HT */
-
 /**
  * sign_extend - Sign extend a value using specified bit as sign-bit
  *
@@ -3316,7 +3245,7 @@ static s32 sign_extend(u32 oper, int index)
  *
  * A return of <0 indicates bogus data in the statistics
  */
-int iwl4965_get_temperature(const struct iwl4965_priv *priv)
+int iwl4965_get_temperature(const struct iwl_priv *priv)
 {
         s32 temperature;
         s32 vt;
@@ -3384,7 +3313,7 @@ int iwl4965_get_temperature(const struct iwl4965_priv *priv)
  * Assumes caller will replace priv->last_temperature once calibration
  * executed.
  */
-static int iwl4965_is_temp_calib_needed(struct iwl4965_priv *priv)
+static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv)
 {
         int temp_diff;
 
@@ -3417,7 +3346,7 @@ static int iwl4965_is_temp_calib_needed(struct iwl4965_priv *priv)
 /* Calculate noise level, based on measurements during network silence just
  *   before arriving beacon.  This measurement can be done only if we know
  *   exactly when to expect beacons, therefore only when we're associated. */
-static void iwl4965_rx_calc_noise(struct iwl4965_priv *priv)
+static void iwl4965_rx_calc_noise(struct iwl_priv *priv)
 {
         struct statistics_rx_non_phy *rx_info
                                 = &(priv->statistics.rx.general);
@@ -3454,7 +3383,7 @@ static void iwl4965_rx_calc_noise(struct iwl4965_priv *priv)
                         priv->last_rx_noise);
 }
 
-void iwl4965_hw_rx_statistics(struct iwl4965_priv *priv, struct iwl4965_rx_mem_buffer *rxb)
+void iwl4965_hw_rx_statistics(struct iwl_priv *priv, struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
         int change;
@@ -3488,6 +3417,8 @@ void iwl4965_hw_rx_statistics(struct iwl4965_priv *priv, struct iwl4965_rx_mem_b
 #endif
         }
 
+        iwl_leds_background(priv);
+
         /* If the hardware hasn't reported a change in
          * temperature then don't bother computing a
          * calibrated temperature value */
@@ -3518,7 +3449,7 @@ void iwl4965_hw_rx_statistics(struct iwl4965_priv *priv, struct iwl4965_rx_mem_b
                 queue_work(priv->workqueue, &priv->txpower_work);
 }
 
-static void iwl4965_add_radiotap(struct iwl4965_priv *priv,
+static void iwl4965_add_radiotap(struct iwl_priv *priv,
                                  struct sk_buff *skb,
                                  struct iwl4965_rx_phy_res *rx_start,
                                  struct ieee80211_rx_status *stats,
@@ -3526,8 +3457,9 @@ static void iwl4965_add_radiotap(struct iwl4965_priv *priv,
 {
         s8 signal = stats->ssi;
         s8 noise = 0;
-        int rate = stats->rate;
+        int rate = stats->rate_idx;
         u64 tsf = stats->mactime;
+        __le16 antenna;
         __le16 phy_flags_hw = rx_start->phy_flags;
         struct iwl4965_rt_rx_hdr {
                 struct ieee80211_radiotap_header rt_hdr;
@@ -3594,7 +3526,6 @@ static void iwl4965_add_radiotap(struct iwl4965_priv *priv,
                                           IEEE80211_CHAN_2GHZ),
                               &iwl4965_rt->rt_chbitmask);
 
-        rate = iwl4965_rate_index_from_plcp(rate);
         if (rate == -1)
                 iwl4965_rt->rt_rate = 0;
         else
@@ -3613,8 +3544,8 @@ static void iwl4965_add_radiotap(struct iwl4965_priv *priv,
          * new 802.11n radiotap field "RX chains" that is defined
          * as a bitmask.
          */
-        iwl4965_rt->rt_antenna =
-                le16_to_cpu(phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4;
+        antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK;
+        iwl4965_rt->rt_antenna = le16_to_cpu(antenna) >> 4;
 
         /* set the preamble flag if appropriate */
         if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)
@@ -3623,7 +3554,74 @@ static void iwl4965_add_radiotap(struct iwl4965_priv *priv,
         stats->flag |= RX_FLAG_RADIOTAP;
 }
 
-static void iwl4965_handle_data_packet(struct iwl4965_priv *priv, int is_data,
+static void iwl_update_rx_stats(struct iwl_priv *priv, u16 fc, u16 len)
+{
+        /* 0 - mgmt, 1 - cnt, 2 - data */
+        int idx = (fc & IEEE80211_FCTL_FTYPE) >> 2;
+        priv->rx_stats[idx].cnt++;
+        priv->rx_stats[idx].bytes += len;
+}
+
+static u32 iwl4965_translate_rx_status(u32 decrypt_in)
+{
+        u32 decrypt_out = 0;
+
+        if ((decrypt_in & RX_RES_STATUS_STATION_FOUND) ==
+                                        RX_RES_STATUS_STATION_FOUND)
+                decrypt_out |= (RX_RES_STATUS_STATION_FOUND |
+                                RX_RES_STATUS_NO_STATION_INFO_MISMATCH);
+
+        decrypt_out |= (decrypt_in & RX_RES_STATUS_SEC_TYPE_MSK);
+
+        /* packet was not encrypted */
+        if ((decrypt_in & RX_RES_STATUS_SEC_TYPE_MSK) ==
+                                        RX_RES_STATUS_SEC_TYPE_NONE)
+                return decrypt_out;
+
+        /* packet was encrypted with unknown alg */
+        if ((decrypt_in & RX_RES_STATUS_SEC_TYPE_MSK) ==
+                                        RX_RES_STATUS_SEC_TYPE_ERR)
+                return decrypt_out;
+
+        /* decryption was not done in HW */
+        if ((decrypt_in & RX_MPDU_RES_STATUS_DEC_DONE_MSK) !=
+                                        RX_MPDU_RES_STATUS_DEC_DONE_MSK)
+                return decrypt_out;
+
+        switch (decrypt_in & RX_RES_STATUS_SEC_TYPE_MSK) {
+
+        case RX_RES_STATUS_SEC_TYPE_CCMP:
+                /* alg is CCM: check MIC only */
+                if (!(decrypt_in & RX_MPDU_RES_STATUS_MIC_OK))
+                        /* Bad MIC */
+                        decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;
+                else
+                        decrypt_out |= RX_RES_STATUS_DECRYPT_OK;
+
+                break;
+
+        case RX_RES_STATUS_SEC_TYPE_TKIP:
+                if (!(decrypt_in & RX_MPDU_RES_STATUS_TTAK_OK)) {
+                        /* Bad TTAK */
+                        decrypt_out |= RX_RES_STATUS_BAD_KEY_TTAK;
+                        break;
+                }
+                /* fall through if TTAK OK */
+        default:
+                if (!(decrypt_in & RX_MPDU_RES_STATUS_ICV_OK))
+                        decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;
+                else
+                        decrypt_out |= RX_RES_STATUS_DECRYPT_OK;
+                break;
+        };
+
+        IWL_DEBUG_RX("decrypt_in:0x%x  decrypt_out = 0x%x\n",
+                                        decrypt_in, decrypt_out);
+
+        return decrypt_out;
+}
+
+static void iwl4965_handle_data_packet(struct iwl_priv *priv, int is_data,
                                        int include_phy,
                                        struct iwl4965_rx_mem_buffer *rxb,
                                        struct ieee80211_rx_status *stats)
@@ -3636,6 +3634,7 @@ static void iwl4965_handle_data_packet(struct iwl4965_priv *priv, int is_data,
         __le32 *rx_end;
         unsigned int skblen;
         u32 ampdu_status;
+        u32 ampdu_status_legacy;
 
         if (!include_phy && priv->last_phy_res[0])
                 rx_start = (struct iwl4965_rx_phy_res *)&priv->last_phy_res[1];
@@ -3664,7 +3663,7 @@ static void iwl4965_handle_data_packet(struct iwl4965_priv *priv, int is_data,
                 rx_start->byte_count = amsdu->byte_count;
                 rx_end = (__le32 *) (((u8 *) hdr) + len);
         }
-        if (len > priv->hw_setting.max_pkt_size || len < 16) {
+        if (len > priv->hw_params.max_pkt_size || len < 16) {
                 IWL_WARNING("byte count out of range [16,4K] : %d\n", len);
                 return;
         }
@@ -3672,6 +3671,12 @@ static void iwl4965_handle_data_packet(struct iwl4965_priv *priv, int is_data,
         ampdu_status = le32_to_cpu(*rx_end);
         skblen = ((u8 *) rx_end - (u8 *) & pkt->u.raw[0]) + sizeof(u32);
 
+        if (!include_phy) {
+                /* New status scheme, need to translate */
+                ampdu_status_legacy = ampdu_status;
+                ampdu_status = iwl4965_translate_rx_status(ampdu_status);
+        }
+
         /* start from MAC */
         skb_reserve(rxb->skb, (void *)hdr - (void *)pkt);
         skb_put(rxb->skb, len); /* end where data ends */
@@ -3686,19 +3691,16 @@ static void iwl4965_handle_data_packet(struct iwl4965_priv *priv, int is_data,
         stats->flag = 0;
         hdr = (struct ieee80211_hdr *)rxb->skb->data;
 
-        if (iwl4965_param_hwcrypto)
+        if (!priv->cfg->mod_params->sw_crypto)
                 iwl4965_set_decrypted_flag(priv, rxb->skb, ampdu_status, stats);
 
         if (priv->add_radiotap)
                 iwl4965_add_radiotap(priv, rxb->skb, rx_start, stats, ampdu_status);
 
+        iwl_update_rx_stats(priv, le16_to_cpu(hdr->frame_control), len);
         ieee80211_rx_irqsafe(priv->hw, rxb->skb, stats);
         priv->alloc_rxb_skb--;
         rxb->skb = NULL;
-#ifdef LED
-        priv->led_packets += len;
-        iwl4965_setup_activity_timer(priv);
-#endif
 }
 
 /* Calc max signal level (dBm) among 3 possible receivers */
@@ -3737,85 +3739,16 @@ static int iwl4965_calc_rssi(struct iwl4965_rx_phy_res *rx_resp)
 
 #ifdef CONFIG_IWL4965_HT
 
-/* Parsed Information Elements */
-struct ieee802_11_elems {
-        u8 *ds_params;
-        u8 ds_params_len;
-        u8 *tim;
-        u8 tim_len;
-        u8 *ibss_params;
-        u8 ibss_params_len;
-        u8 *erp_info;
-        u8 erp_info_len;
-        u8 *ht_cap_param;
-        u8 ht_cap_param_len;
-        u8 *ht_extra_param;
-        u8 ht_extra_param_len;
-};
-
-static int parse_elems(u8 *start, size_t len, struct ieee802_11_elems *elems)
-{
-        size_t left = len;
-        u8 *pos = start;
-        int unknown = 0;
-
-        memset(elems, 0, sizeof(*elems));
-
-        while (left >= 2) {
-                u8 id, elen;
-
-                id = *pos++;
-                elen = *pos++;
-                left -= 2;
-
-                if (elen > left)
-                        return -1;
-
-                switch (id) {
-                case WLAN_EID_DS_PARAMS:
-                        elems->ds_params = pos;
-                        elems->ds_params_len = elen;
-                        break;
-                case WLAN_EID_TIM:
-                        elems->tim = pos;
-                        elems->tim_len = elen;
-                        break;
-                case WLAN_EID_IBSS_PARAMS:
-                        elems->ibss_params = pos;
-                        elems->ibss_params_len = elen;
-                        break;
-                case WLAN_EID_ERP_INFO:
-                        elems->erp_info = pos;
-                        elems->erp_info_len = elen;
-                        break;
-                case WLAN_EID_HT_CAPABILITY:
-                        elems->ht_cap_param = pos;
-                        elems->ht_cap_param_len = elen;
-                        break;
-                case WLAN_EID_HT_EXTRA_INFO:
-                        elems->ht_extra_param = pos;
-                        elems->ht_extra_param_len = elen;
-                        break;
-                default:
-                        unknown++;
-                        break;
-                }
-
-                left -= elen;
-                pos += elen;
-        }
-
-        return 0;
-}
-
-void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info, int mode)
+void iwl4965_init_ht_hw_capab(struct iwl_priv *priv,
+                              struct ieee80211_ht_info *ht_info,
+                              enum ieee80211_band band)
 {
         ht_info->cap = 0;
         memset(ht_info->supp_mcs_set, 0, 16);
 
         ht_info->ht_supported = 1;
 
-        if (mode == MODE_IEEE80211A) {
+        if (band == IEEE80211_BAND_5GHZ) {
                 ht_info->cap |= (u16)IEEE80211_HT_CAP_SUP_WIDTH;
                 ht_info->cap |= (u16)IEEE80211_HT_CAP_SGI_40;
                 ht_info->supp_mcs_set[4] = 0x01;
@@ -3824,10 +3757,9 @@ void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info, int mode)
         ht_info->cap |= (u16)IEEE80211_HT_CAP_SGI_20;
         ht_info->cap |= (u16)(IEEE80211_HT_CAP_MIMO_PS &
                              (IWL_MIMO_PS_NONE << 2));
-        if (iwl4965_param_amsdu_size_8K) {
-                printk(KERN_DEBUG "iwl4965 in A-MSDU 8K support mode\n");
+
+        if (priv->cfg->mod_params->amsdu_size_8K)
                 ht_info->cap |= (u16)IEEE80211_HT_CAP_MAX_AMSDU;
-        }
 
         ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
         ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
@@ -3837,7 +3769,7 @@ void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info, int mode)
 }
 #endif /* CONFIG_IWL4965_HT */
 
-static void iwl4965_sta_modify_ps_wake(struct iwl4965_priv *priv, int sta_id)
+static void iwl4965_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)
 {
         unsigned long flags;
 
@@ -3851,7 +3783,7 @@ static void iwl4965_sta_modify_ps_wake(struct iwl4965_priv *priv, int sta_id)
         iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
 }
 
-static void iwl4965_update_ps_mode(struct iwl4965_priv *priv, u16 ps_bit, u8 *addr)
+static void iwl4965_update_ps_mode(struct iwl_priv *priv, u16 ps_bit, u8 *addr)
 {
         /* FIXME: need locking over ps_status ??? */
         u8 sta_id = iwl4965_hw_find_station(priv, addr);
@@ -3868,44 +3800,201 @@ static void iwl4965_update_ps_mode(struct iwl4965_priv *priv, u16 ps_bit, u8 *ad
                 }
         }
 }
+#ifdef CONFIG_IWLWIFI_DEBUG
 
-#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
+/**
+ * iwl4965_dbg_report_frame - dump frame to syslog during debug sessions
+ *
+ * You may hack this function to show different aspects of received frames,
+ * including selective frame dumps.
+ * group100 parameter selects whether to show 1 out of 100 good frames.
+ *
+ * TODO:  This was originally written for 3945, need to audit for
+ *        proper operation with 4965.
+ */
+static void iwl4965_dbg_report_frame(struct iwl_priv *priv,
+                      struct iwl4965_rx_packet *pkt,
+                      struct ieee80211_hdr *header, int group100)
+{
+        u32 to_us;
+        u32 print_summary = 0;
+        u32 print_dump = 0;     /* set to 1 to dump all frames' contents */
+        u32 hundred = 0;
+        u32 dataframe = 0;
+        u16 fc;
+        u16 seq_ctl;
+        u16 channel;
+        u16 phy_flags;
+        int rate_sym;
+        u16 length;
+        u16 status;
+        u16 bcn_tmr;
+        u32 tsf_low;
+        u64 tsf;
+        u8 rssi;
+        u8 agc;
+        u16 sig_avg;
+        u16 noise_diff;
+        struct iwl4965_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);
+        struct iwl4965_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
+        struct iwl4965_rx_frame_end *rx_end = IWL_RX_END(pkt);
+        u8 *data = IWL_RX_DATA(pkt);
+
+        if (likely(!(iwl_debug_level & IWL_DL_RX)))
+                return;
 
-/* Called for REPLY_4965_RX (legacy ABG frames), or
+        /* MAC header */
+        fc = le16_to_cpu(header->frame_control);
+        seq_ctl = le16_to_cpu(header->seq_ctrl);
+
+        /* metadata */
+        channel = le16_to_cpu(rx_hdr->channel);
+        phy_flags = le16_to_cpu(rx_hdr->phy_flags);
+        rate_sym = rx_hdr->rate;
+        length = le16_to_cpu(rx_hdr->len);
+
+        /* end-of-frame status and timestamp */
+        status = le32_to_cpu(rx_end->status);
+        bcn_tmr = le32_to_cpu(rx_end->beacon_timestamp);
+        tsf_low = le64_to_cpu(rx_end->timestamp) & 0x0ffffffff;
+        tsf = le64_to_cpu(rx_end->timestamp);
+
+        /* signal statistics */
+        rssi = rx_stats->rssi;
+        agc = rx_stats->agc;
+        sig_avg = le16_to_cpu(rx_stats->sig_avg);
+        noise_diff = le16_to_cpu(rx_stats->noise_diff);
+
+        to_us = !compare_ether_addr(header->addr1, priv->mac_addr);
+
+        /* if data frame is to us and all is good,
+         *   (optionally) print summary for only 1 out of every 100 */
+        if (to_us && (fc & ~IEEE80211_FCTL_PROTECTED) ==
+            (IEEE80211_FCTL_FROMDS | IEEE80211_FTYPE_DATA)) {
+                dataframe = 1;
+                if (!group100)
+                        print_summary = 1;      /* print each frame */
+                else if (priv->framecnt_to_us < 100) {
+                        priv->framecnt_to_us++;
+                        print_summary = 0;
+                } else {
+                        priv->framecnt_to_us = 0;
+                        print_summary = 1;
+                        hundred = 1;
+                }
+        } else {
+                /* print summary for all other frames */
+                print_summary = 1;
+        }
+
+        if (print_summary) {
+                char *title;
+                int rate_idx;
+                u32 bitrate;
+
+                if (hundred)
+                        title = "100Frames";
+                else if (fc & IEEE80211_FCTL_RETRY)
+                        title = "Retry";
+                else if (ieee80211_is_assoc_response(fc))
+                        title = "AscRsp";
+                else if (ieee80211_is_reassoc_response(fc))
+                        title = "RasRsp";
+                else if (ieee80211_is_probe_response(fc)) {
+                        title = "PrbRsp";
+                        print_dump = 1; /* dump frame contents */
+                } else if (ieee80211_is_beacon(fc)) {
+                        title = "Beacon";
+                        print_dump = 1; /* dump frame contents */
+                } else if (ieee80211_is_atim(fc))
+                        title = "ATIM";
+                else if (ieee80211_is_auth(fc))
+                        title = "Auth";
+                else if (ieee80211_is_deauth(fc))
+                        title = "DeAuth";
+                else if (ieee80211_is_disassoc(fc))
+                        title = "DisAssoc";
+                else
+                        title = "Frame";
+
+                rate_idx = iwl4965_hwrate_to_plcp_idx(rate_sym);
+                if (unlikely(rate_idx == -1))
+                        bitrate = 0;
+                else
+                        bitrate = iwl4965_rates[rate_idx].ieee / 2;
+
+                /* print frame summary.
+                 * MAC addresses show just the last byte (for brevity),
+                 *    but you can hack it to show more, if you'd like to. */
+                if (dataframe)
+                        IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "
+                                     "len=%u, rssi=%d, chnl=%d, rate=%u, \n",
+                                     title, fc, header->addr1[5],
+                                     length, rssi, channel, bitrate);
+                else {
+                        /* src/dst addresses assume managed mode */
+                        IWL_DEBUG_RX("%s: 0x%04x, dst=0x%02x, "
+                                     "src=0x%02x, rssi=%u, tim=%lu usec, "
+                                     "phy=0x%02x, chnl=%d\n",
+                                     title, fc, header->addr1[5],
+                                     header->addr3[5], rssi,
+                                     tsf_low - priv->scan_start_tsf,
+                                     phy_flags, channel);
+                }
+        }
+        if (print_dump)
+                iwl_print_hex_dump(IWL_DL_RX, data, length);
+}
+#else
+static inline void iwl4965_dbg_report_frame(struct iwl_priv *priv,
+                                            struct iwl4965_rx_packet *pkt,
+                                            struct ieee80211_hdr *header,
+                                            int group100)
+{
+}
+#endif
+
+
+
+/* Called for REPLY_RX (legacy ABG frames), or
  * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */
-static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
                                 struct iwl4965_rx_mem_buffer *rxb)
 {
+        struct ieee80211_hdr *header;
+        struct ieee80211_rx_status rx_status;
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
         /* Use phy data (Rx signal strength, etc.) contained within
          *   this rx packet for legacy frames,
          *   or phy data cached from REPLY_RX_PHY_CMD for HT frames. */
-        int include_phy = (pkt->hdr.cmd == REPLY_4965_RX);
+        int include_phy = (pkt->hdr.cmd == REPLY_RX);
         struct iwl4965_rx_phy_res *rx_start = (include_phy) ?
                 (struct iwl4965_rx_phy_res *)&(pkt->u.raw[0]) :
                 (struct iwl4965_rx_phy_res *)&priv->last_phy_res[1];
         __le32 *rx_end;
         unsigned int len = 0;
-        struct ieee80211_hdr *header;
         u16 fc;
-        struct ieee80211_rx_status stats = {
-                .mactime = le64_to_cpu(rx_start->timestamp),
-                .channel = le16_to_cpu(rx_start->channel),
-                .phymode =
-                        (rx_start->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
-                        MODE_IEEE80211G : MODE_IEEE80211A,
-                .antenna = 0,
-                .rate = iwl4965_hw_get_rate(rx_start->rate_n_flags),
-                .flag = 0,
-        };
         u8 network_packet;
 
+        rx_status.mactime = le64_to_cpu(rx_start->timestamp);
+        rx_status.freq =
+                ieee80211_frequency_to_channel(le16_to_cpu(rx_start->channel));
+        rx_status.band = (rx_start->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
+                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+        rx_status.rate_idx =
+                iwl4965_hwrate_to_plcp_idx(le32_to_cpu(rx_start->rate_n_flags));
+        if (rx_status.band == IEEE80211_BAND_5GHZ)
+                rx_status.rate_idx -= IWL_FIRST_OFDM_RATE;
+
+        rx_status.antenna = 0;
+        rx_status.flag = 0;
+
         if ((unlikely(rx_start->cfg_phy_cnt > 20))) {
-                IWL_DEBUG_DROP
-                        ("dsp size out of range [0,20]: "
-                         "%d/n", rx_start->cfg_phy_cnt);
+                IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n",
+                                rx_start->cfg_phy_cnt);
                 return;
         }
+
         if (!include_phy) {
                 if (priv->last_phy_res[0])
                         rx_start = (struct iwl4965_rx_phy_res *)
@@ -3924,7 +4013,7 @@ static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
                                                   + rx_start->cfg_phy_cnt);
 
                 len = le16_to_cpu(rx_start->byte_count);
-                rx_end = (__le32 *) (pkt->u.raw + rx_start->cfg_phy_cnt +
+                rx_end = (__le32 *)(pkt->u.raw + rx_start->cfg_phy_cnt +
                                   sizeof(struct iwl4965_rx_phy_res) + len);
         } else {
                 struct iwl4965_rx_mpdu_res_start *amsdu =
@@ -3946,43 +4035,38 @@ static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
 
         priv->ucode_beacon_time = le32_to_cpu(rx_start->beacon_time_stamp);
 
-        stats.freq = ieee80211chan2mhz(stats.channel);
-
         /* Find max signal strength (dBm) among 3 antenna/receiver chains */
-        stats.ssi = iwl4965_calc_rssi(rx_start);
+        rx_status.ssi = iwl4965_calc_rssi(rx_start);
 
         /* Meaningful noise values are available only from beacon statistics,
          *   which are gathered only when associated, and indicate noise
          *   only for the associated network channel ...
          * Ignore these noise values while scanning (other channels) */
-        if (iwl4965_is_associated(priv) &&
+        if (iwl_is_associated(priv) &&
             !test_bit(STATUS_SCANNING, &priv->status)) {
-                stats.noise = priv->last_rx_noise;
-                stats.signal = iwl4965_calc_sig_qual(stats.ssi, stats.noise);
+                rx_status.noise = priv->last_rx_noise;
+                rx_status.signal = iwl4965_calc_sig_qual(rx_status.ssi,
+                                                         rx_status.noise);
         } else {
-                stats.noise = IWL_NOISE_MEAS_NOT_AVAILABLE;
-                stats.signal = iwl4965_calc_sig_qual(stats.ssi, 0);
+                rx_status.noise = IWL_NOISE_MEAS_NOT_AVAILABLE;
+                rx_status.signal = iwl4965_calc_sig_qual(rx_status.ssi, 0);
         }
 
         /* Reset beacon noise level if not associated. */
-        if (!iwl4965_is_associated(priv))
+        if (!iwl_is_associated(priv))
                 priv->last_rx_noise = IWL_NOISE_MEAS_NOT_AVAILABLE;
 
-#ifdef CONFIG_IWL4965_DEBUG
-        /* TODO:  Parts of iwl4965_report_frame are broken for 4965 */
-        if (iwl4965_debug_level & (IWL_DL_RX))
-                /* Set "1" to report good data frames in groups of 100 */
-                iwl4965_report_frame(priv, pkt, header, 1);
+        /* Set "1" to report good data frames in groups of 100 */
+        /* FIXME: need to optimze the call: */
+        iwl4965_dbg_report_frame(priv, pkt, header, 1);
 
-        if (iwl4965_debug_level & (IWL_DL_RX | IWL_DL_STATS))
-        IWL_DEBUG_RX("Rssi %d, noise %d, qual %d, TSF %lu\n",
-                stats.ssi, stats.noise, stats.signal,
-                 (long unsigned int)le64_to_cpu(rx_start->timestamp));
-#endif
+        IWL_DEBUG_STATS_LIMIT("Rssi %d, noise %d, qual %d, TSF %llu\n",
+                              rx_status.ssi, rx_status.noise, rx_status.signal,
+                              (unsigned long long)rx_status.mactime);
 
         network_packet = iwl4965_is_network_packet(priv, header);
         if (network_packet) {
-                priv->last_rx_rssi = stats.ssi;
+                priv->last_rx_rssi = rx_status.ssi;
                 priv->last_beacon_time =  priv->ucode_beacon_time;
                 priv->last_tsf = le64_to_cpu(rx_start->timestamp);
         }
@@ -3990,102 +4074,10 @@ static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
         fc = le16_to_cpu(header->frame_control);
         switch (fc & IEEE80211_FCTL_FTYPE) {
         case IEEE80211_FTYPE_MGMT:
-
                 if (priv->iw_mode == IEEE80211_IF_TYPE_AP)
                         iwl4965_update_ps_mode(priv, fc  & IEEE80211_FCTL_PM,
                                                 header->addr2);
-                switch (fc & IEEE80211_FCTL_STYPE) {
-                case IEEE80211_STYPE_PROBE_RESP:
-                case IEEE80211_STYPE_BEACON:
-                        if ((priv->iw_mode == IEEE80211_IF_TYPE_STA &&
-                             !compare_ether_addr(header->addr2, priv->bssid)) ||
-                            (priv->iw_mode == IEEE80211_IF_TYPE_IBSS &&
-                             !compare_ether_addr(header->addr3, priv->bssid))) {
-                                struct ieee80211_mgmt *mgmt =
-                                        (struct ieee80211_mgmt *)header;
-                                u64 timestamp =
-                                        le64_to_cpu(mgmt->u.beacon.timestamp);
-
-                                priv->timestamp0 = timestamp & 0xFFFFFFFF;
-                                priv->timestamp1 =
-                                        (timestamp >> 32) & 0xFFFFFFFF;
-                                priv->beacon_int = le16_to_cpu(
-                                    mgmt->u.beacon.beacon_int);
-                                if (priv->call_post_assoc_from_beacon &&
-                                    (priv->iw_mode == IEEE80211_IF_TYPE_STA)) {
-                                        priv->call_post_assoc_from_beacon = 0;
-                                        queue_work(priv->workqueue,
-                                            &priv->post_associate.work);
-                                }
-                        }
-                        break;
-
-                case IEEE80211_STYPE_ACTION:
-                        break;
-
-                        /*
-                         * TODO: Use the new callback function from
-                         * mac80211 instead of sniffing these packets.
-                         */
-                case IEEE80211_STYPE_ASSOC_RESP:
-                case IEEE80211_STYPE_REASSOC_RESP:
-                        if (network_packet) {
-#ifdef CONFIG_IWL4965_HT
-                                u8 *pos = NULL;
-                                struct ieee802_11_elems elems;
-#endif                          /*CONFIG_IWL4965_HT */
-                                struct ieee80211_mgmt *mgnt =
-                                        (struct ieee80211_mgmt *)header;
-
-                                /* We have just associated, give some
-                                 * time for the 4-way handshake if
-                                 * any. Don't start scan too early. */
-                                priv->next_scan_jiffies = jiffies +
-                                        IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;
-
-                                priv->assoc_id = (~((1 << 15) | (1 << 14))
-                                        & le16_to_cpu(mgnt->u.assoc_resp.aid));
-                                priv->assoc_capability =
-                                        le16_to_cpu(
-                                                mgnt->u.assoc_resp.capab_info);
-#ifdef CONFIG_IWL4965_HT
-                                pos = mgnt->u.assoc_resp.variable;
-                                if (!parse_elems(pos,
-                                                 len - (pos - (u8 *) mgnt),
-                                                 &elems)) {
-                                        if (elems.ht_extra_param &&
-                                            elems.ht_cap_param)
-                                                break;
-                                }
-#endif                          /*CONFIG_IWL4965_HT */
-                                /* assoc_id is 0 no association */
-                                if (!priv->assoc_id)
-                                        break;
-                                if (priv->beacon_int)
-                                        queue_work(priv->workqueue,
-                                            &priv->post_associate.work);
-                                else
-                                        priv->call_post_assoc_from_beacon = 1;
-                        }
-
-                        break;
-
-                case IEEE80211_STYPE_PROBE_REQ:
-                        if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
-                            !iwl4965_is_associated(priv)) {
-                                DECLARE_MAC_BUF(mac1);
-                                DECLARE_MAC_BUF(mac2);
-                                DECLARE_MAC_BUF(mac3);
-
-                                IWL_DEBUG_DROP("Dropping (non network): "
-                                               "%s, %s, %s\n",
-                                               print_mac(mac1, header->addr1),
-                                               print_mac(mac2, header->addr2),
-                                               print_mac(mac3, header->addr3));
-                                return;
-                        }
-                }
-                iwl4965_handle_data_packet(priv, 0, include_phy, rxb, &stats);
+                iwl4965_handle_data_packet(priv, 0, include_phy, rxb, &rx_status);
                 break;
 
         case IEEE80211_FTYPE_CTL:
@@ -4094,7 +4086,7 @@ static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
                 case IEEE80211_STYPE_BACK_REQ:
                         IWL_DEBUG_HT("IEEE80211_STYPE_BACK_REQ arrived\n");
                         iwl4965_handle_data_packet(priv, 0, include_phy,
-                                                rxb, &stats);
+                                                rxb, &rx_status);
                         break;
                 default:
                         break;
@@ -4124,7 +4116,7 @@ static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
                                        print_mac(mac3, header->addr3));
                 else
                         iwl4965_handle_data_packet(priv, 1, include_phy, rxb,
-                                                   &stats);
+                                                   &rx_status);
                 break;
         }
         default:
@@ -4135,7 +4127,7 @@ static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
 
 /* Cache phy data (Rx signal strength, etc) for HT frame (REPLY_RX_PHY_CMD).
  * This will be used later in iwl4965_rx_reply_rx() for REPLY_RX_MPDU_CMD. */
-static void iwl4965_rx_reply_rx_phy(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv,
                                     struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -4143,8 +4135,7 @@ static void iwl4965_rx_reply_rx_phy(struct iwl4965_priv *priv,
         memcpy(&priv->last_phy_res[1], &(pkt->u.raw[0]),
                sizeof(struct iwl4965_rx_phy_res));
 }
-
-static void iwl4965_rx_missed_beacon_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,
                                            struct iwl4965_rx_mem_buffer *rxb)
 
 {
@@ -4165,31 +4156,12 @@ static void iwl4965_rx_missed_beacon_notif(struct iwl4965_priv *priv,
         }
 #endif /*CONFIG_IWL4965_SENSITIVITY*/
 }
-
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
-
-/**
- * iwl4965_set_tx_status - Update driver's record of one Tx frame's status
- *
- * This will get sent to mac80211.
- */
-static void iwl4965_set_tx_status(struct iwl4965_priv *priv, int txq_id, int idx,
-                                  u32 status, u32 retry_count, u32 rate)
-{
-        struct ieee80211_tx_status *tx_status =
-                &(priv->txq[txq_id].txb[idx].status);
-
-        tx_status->flags = status ? IEEE80211_TX_STATUS_ACK : 0;
-        tx_status->retry_count += retry_count;
-        tx_status->control.tx_rate = rate;
-}
-
 
 /**
  * iwl4965_sta_modify_enable_tid_tx - Enable Tx for this TID in station table
  */
-static void iwl4965_sta_modify_enable_tid_tx(struct iwl4965_priv *priv,
+static void iwl4965_sta_modify_enable_tid_tx(struct iwl_priv *priv,
                                          int sta_id, int tid)
 {
         unsigned long flags;
@@ -4204,24 +4176,24 @@ static void iwl4965_sta_modify_enable_tid_tx(struct iwl4965_priv *priv,
         iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
 }
 
-
 /**
  * iwl4965_tx_status_reply_compressed_ba - Update tx status from block-ack
  *
  * Go through block-ack's bitmap of ACK'd frames, update driver's record of
  * ACK vs. not.  This gets sent to mac80211, then to rate scaling algo.
  */
-static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv,
+static int iwl4965_tx_status_reply_compressed_ba(struct iwl_priv *priv,
                                                  struct iwl4965_ht_agg *agg,
                                                  struct iwl4965_compressed_ba_resp*
                                                  ba_resp)
 
 {
         int i, sh, ack;
-        u16 ba_seq_ctl = le16_to_cpu(ba_resp->ba_seq_ctl);
-        u32 bitmap0, bitmap1;
-        u32 resp_bitmap0 = le32_to_cpu(ba_resp->ba_bitmap0);
-        u32 resp_bitmap1 = le32_to_cpu(ba_resp->ba_bitmap1);
+        u16 seq_ctl = le16_to_cpu(ba_resp->seq_ctl);
+        u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
+        u64 bitmap;
+        int successes = 0;
+        struct ieee80211_tx_status *tx_status;
 
         if (unlikely(!agg->wait_for_ba))  {
                 IWL_ERROR("Received BA when not expected\n");
@@ -4230,17 +4202,15 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv,
 
         /* Mark that the expected block-ack response arrived */
         agg->wait_for_ba = 0;
-        IWL_DEBUG_TX_REPLY("BA %d %d\n", agg->start_idx, ba_resp->ba_seq_ctl);
+        IWL_DEBUG_TX_REPLY("BA %d %d\n", agg->start_idx, ba_resp->seq_ctl);
 
         /* Calculate shift to align block-ack bits with our Tx window bits */
-        sh = agg->start_idx - SEQ_TO_INDEX(ba_seq_ctl >> 4);
+        sh = agg->start_idx - SEQ_TO_INDEX(seq_ctl>>4);
         if (sh < 0) /* tbw something is wrong with indices */
                 sh += 0x100;
 
         /* don't use 64-bit values for now */
-        bitmap0 = resp_bitmap0 >> sh;
-        bitmap1 = resp_bitmap1 >> sh;
-        bitmap0 |= (resp_bitmap1 & ((1 << sh) | ((1 << sh) - 1))) << (32 - sh);
+        bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
 
         if (agg->frame_count > (64 - sh)) {
                 IWL_DEBUG_TX_REPLY("more frames than bitmap size");
@@ -4249,23 +4219,113 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv,
 
         /* check for success or failure according to the
          * transmitted bitmap and block-ack bitmap */
-        bitmap0 &= agg->bitmap0;
-        bitmap1 &= agg->bitmap1;
+        bitmap &= agg->bitmap;
 
         /* For each frame attempted in aggregation,
          * update driver's record of tx frame's status. */
         for (i = 0; i < agg->frame_count ; i++) {
-                int idx = (agg->start_idx + i) & 0xff;
-                ack = bitmap0 & (1 << i);
+                ack = bitmap & (1 << i);
+                successes += !!ack;
                 IWL_DEBUG_TX_REPLY("%s ON i=%d idx=%d raw=%d\n",
-                        ack? "ACK":"NACK", i, idx, agg->start_idx + i);
-                iwl4965_set_tx_status(priv, agg->txq_id, idx, ack, 0,
-                        agg->rate_n_flags);
+                        ack? "ACK":"NACK", i, (agg->start_idx + i) & 0xff,
+                        agg->start_idx + i);
+        }
+
+        tx_status = &priv->txq[scd_flow].txb[agg->start_idx].status;
+        tx_status->flags = IEEE80211_TX_STATUS_ACK;
+        tx_status->flags |= IEEE80211_TX_STATUS_AMPDU;
+        tx_status->ampdu_ack_map = successes;
+        tx_status->ampdu_ack_len = agg->frame_count;
+        iwl4965_hwrate_to_tx_control(priv, agg->rate_n_flags,
+                                     &tx_status->control);
+
+        IWL_DEBUG_TX_REPLY("Bitmap %llx\n", (unsigned long long)bitmap);
 
+        return 0;
+}
+
+/**
+ * iwl4965_tx_queue_stop_scheduler - Stop queue, but keep configuration
+ */
+static void iwl4965_tx_queue_stop_scheduler(struct iwl_priv *priv,
+                                            u16 txq_id)
+{
+        /* Simply stop the queue, but don't change any configuration;
+         * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */
+        iwl_write_prph(priv,
+                IWL49_SCD_QUEUE_STATUS_BITS(txq_id),
+                (0 << SCD_QUEUE_STTS_REG_POS_ACTIVE)|
+                (1 << SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
+}
+
+/**
+ * txq_id must be greater than IWL_BACK_QUEUE_FIRST_ID
+ * priv->lock must be held by the caller
+ */
+static int iwl4965_tx_queue_agg_disable(struct iwl_priv *priv, u16 txq_id,
+                                        u16 ssn_idx, u8 tx_fifo)
+{
+        int ret = 0;
+
+        if (IWL_BACK_QUEUE_FIRST_ID > txq_id) {
+                IWL_WARNING("queue number too small: %d, must be > %d\n",
+                                txq_id, IWL_BACK_QUEUE_FIRST_ID);
+                return -EINVAL;
         }
 
-        IWL_DEBUG_TX_REPLY("Bitmap %x%x\n", bitmap0, bitmap1);
+        ret = iwl_grab_nic_access(priv);
+        if (ret)
+                return ret;
+
+        iwl4965_tx_queue_stop_scheduler(priv, txq_id);
 
+        iwl_clear_bits_prph(priv, IWL49_SCD_QUEUECHAIN_SEL, (1 << txq_id));
+
+        priv->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
+        priv->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
+        /* supposes that ssn_idx is valid (!= 0xFFF) */
+        iwl4965_set_wr_ptrs(priv, txq_id, ssn_idx);
+
+        iwl_clear_bits_prph(priv, IWL49_SCD_INTERRUPT_MASK, (1 << txq_id));
+        iwl4965_txq_ctx_deactivate(priv, txq_id);
+        iwl4965_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 0);
+
+        iwl_release_nic_access(priv);
+
+        return 0;
+}
+
+int iwl4965_check_empty_hw_queue(struct iwl_priv *priv, int sta_id,
+                                         u8 tid, int txq_id)
+{
+        struct iwl4965_queue *q = &priv->txq[txq_id].q;
+        u8 *addr = priv->stations[sta_id].sta.sta.addr;
+        struct iwl4965_tid_data *tid_data = &priv->stations[sta_id].tid[tid];
+
+        switch (priv->stations[sta_id].tid[tid].agg.state) {
+        case IWL_EMPTYING_HW_QUEUE_DELBA:
+                /* We are reclaiming the last packet of the */
+                /* aggregated HW queue */
+                if (txq_id  == tid_data->agg.txq_id &&
+                    q->read_ptr == q->write_ptr) {
+                        u16 ssn = SEQ_TO_SN(tid_data->seq_number);
+                        int tx_fifo = default_tid_to_tx_fifo[tid];
+                        IWL_DEBUG_HT("HW queue empty: continue DELBA flow\n");
+                        iwl4965_tx_queue_agg_disable(priv, txq_id,
+                                                     ssn, tx_fifo);
+                        tid_data->agg.state = IWL_AGG_OFF;
+                        ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, addr, tid);
+                }
+                break;
+        case IWL_EMPTYING_HW_QUEUE_ADDBA:
+                /* We are reclaiming the last packet of the queue */
+                if (tid_data->tfds_in_queue == 0) {
+                        IWL_DEBUG_HT("HW queue empty: continue ADDBA flow\n");
+                        tid_data->agg.state = IWL_AGG_ON;
+                        ieee80211_start_tx_ba_cb_irqsafe(priv->hw, addr, tid);
+                }
+                break;
+        }
         return 0;
 }
 
@@ -4285,7 +4345,7 @@ static inline int iwl4965_queue_dec_wrap(int index, int n_bd)
  * Handles block-acknowledge notification from device, which reports success
  * of frames sent via aggregation.
  */
-static void iwl4965_rx_reply_compressed_ba(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,
                                            struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -4293,48 +4353,43 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl4965_priv *priv,
         int index;
         struct iwl4965_tx_queue *txq = NULL;
         struct iwl4965_ht_agg *agg;
+        DECLARE_MAC_BUF(mac);
 
         /* "flow" corresponds to Tx queue */
-        u16 ba_resp_scd_flow = le16_to_cpu(ba_resp->scd_flow);
+        u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
 
         /* "ssn" is start of block-ack Tx window, corresponds to index
          * (in Tx queue's circular buffer) of first TFD/frame in window */
         u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);
 
-        if (ba_resp_scd_flow >= ARRAY_SIZE(priv->txq)) {
+        if (scd_flow >= priv->hw_params.max_txq_num) {
                 IWL_ERROR("BUG_ON scd_flow is bigger than number of queues");
                 return;
         }
 
-        txq = &priv->txq[ba_resp_scd_flow];
+        txq = &priv->txq[scd_flow];
         agg = &priv->stations[ba_resp->sta_id].tid[ba_resp->tid].agg;
 
         /* Find index just before block-ack window */
         index = iwl4965_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd);
 
         /* TODO: Need to get this copy more safely - now good for debug */
-/*
-        {
-        DECLARE_MAC_BUF(mac);
+
         IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %s, "
                            "sta_id = %d\n",
                            agg->wait_for_ba,
                            print_mac(mac, (u8*) &ba_resp->sta_addr_lo32),
                            ba_resp->sta_id);
-        IWL_DEBUG_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%X%X, scd_flow = "
+        IWL_DEBUG_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%llx, scd_flow = "
                            "%d, scd_ssn = %d\n",
                            ba_resp->tid,
-                           ba_resp->ba_seq_ctl,
-                           ba_resp->ba_bitmap1,
-                           ba_resp->ba_bitmap0,
+                           ba_resp->seq_ctl,
+                           (unsigned long long)le64_to_cpu(ba_resp->bitmap),
                            ba_resp->scd_flow,
                            ba_resp->scd_ssn);
-        IWL_DEBUG_TX_REPLY("DAT start_idx = %d, bitmap = 0x%X%X \n",
+        IWL_DEBUG_TX_REPLY("DAT start_idx = %d, bitmap = 0x%llx \n",
                            agg->start_idx,
-                           agg->bitmap1,
-                           agg->bitmap0);
-        }
-*/
+                           (unsigned long long)agg->bitmap);
 
         /* Update driver's record of ACK vs. not for each frame in window */
         iwl4965_tx_status_reply_compressed_ba(priv, agg, ba_resp);
@@ -4342,29 +4397,23 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl4965_priv *priv,
         /* Release all TFDs before the SSN, i.e. all TFDs in front of
          * block-ack window (we assume that they've been successfully
          * transmitted ... if not, it's too late anyway). */
-        if (txq->q.read_ptr != (ba_resp_scd_ssn & 0xff))
-                iwl4965_tx_queue_reclaim(priv, ba_resp_scd_flow, index);
-
-}
-
-
-/**
- * iwl4965_tx_queue_stop_scheduler - Stop queue, but keep configuration
- */
-static void iwl4965_tx_queue_stop_scheduler(struct iwl4965_priv *priv, u16 txq_id)
-{
-        /* Simply stop the queue, but don't change any configuration;
-         * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */
-        iwl4965_write_prph(priv,
-                KDR_SCD_QUEUE_STATUS_BITS(txq_id),
-                (0 << SCD_QUEUE_STTS_REG_POS_ACTIVE)|
-                (1 << SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
+        if (txq->q.read_ptr != (ba_resp_scd_ssn & 0xff)) {
+                int freed = iwl4965_tx_queue_reclaim(priv, scd_flow, index);
+                priv->stations[ba_resp->sta_id].
+                        tid[ba_resp->tid].tfds_in_queue -= freed;
+                if (iwl4965_queue_space(&txq->q) > txq->q.low_mark &&
+                        priv->mac80211_registered &&
+                        agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)
+                        ieee80211_wake_queue(priv->hw, scd_flow);
+                iwl4965_check_empty_hw_queue(priv, ba_resp->sta_id,
+                        ba_resp->tid, scd_flow);
+        }
 }
 
 /**
  * iwl4965_tx_queue_set_q2ratid - Map unique receiver/tid combination to a queue
  */
-static int iwl4965_tx_queue_set_q2ratid(struct iwl4965_priv *priv, u16 ra_tid,
+static int iwl4965_tx_queue_set_q2ratid(struct iwl_priv *priv, u16 ra_tid,
                                         u16 txq_id)
 {
         u32 tbl_dw_addr;
@@ -4376,25 +4425,26 @@ static int iwl4965_tx_queue_set_q2ratid(struct iwl4965_priv *priv, u16 ra_tid,
         tbl_dw_addr = priv->scd_base_addr +
                         SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id);
 
-        tbl_dw = iwl4965_read_targ_mem(priv, tbl_dw_addr);
+        tbl_dw = iwl_read_targ_mem(priv, tbl_dw_addr);
 
         if (txq_id & 0x1)
                 tbl_dw = (scd_q2ratid << 16) | (tbl_dw & 0x0000FFFF);
         else
                 tbl_dw = scd_q2ratid | (tbl_dw & 0xFFFF0000);
 
-        iwl4965_write_targ_mem(priv, tbl_dw_addr, tbl_dw);
+        iwl_write_targ_mem(priv, tbl_dw_addr, tbl_dw);
 
         return 0;
 }
 
+
 /**
  * iwl4965_tx_queue_agg_enable - Set up & enable aggregation for selected queue
  *
  * NOTE:  txq_id must be greater than IWL_BACK_QUEUE_FIRST_ID,
  *        i.e. it must be one of the higher queues used for aggregation
  */
-static int iwl4965_tx_queue_agg_enable(struct iwl4965_priv *priv, int txq_id,
+static int iwl4965_tx_queue_agg_enable(struct iwl_priv *priv, int txq_id,
                                        int tx_fifo, int sta_id, int tid,
                                        u16 ssn_idx)
 {
@@ -4412,7 +4462,7 @@ static int iwl4965_tx_queue_agg_enable(struct iwl4965_priv *priv, int txq_id,
         iwl4965_sta_modify_enable_tid_tx(priv, sta_id, tid);
 
         spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc) {
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return rc;
@@ -4425,7 +4475,7 @@ static int iwl4965_tx_queue_agg_enable(struct iwl4965_priv *priv, int txq_id,
         iwl4965_tx_queue_set_q2ratid(priv, ra_tid, txq_id);
 
         /* Set this queue as a chain-building queue */
-        iwl4965_set_bits_prph(priv, KDR_SCD_QUEUECHAIN_SEL, (1 << txq_id));
+        iwl_set_bits_prph(priv, IWL49_SCD_QUEUECHAIN_SEL, (1 << txq_id));
 
         /* Place first TFD at index corresponding to start sequence number.
          * Assumes that ssn_idx is valid (!= 0xFFF) */
@@ -4434,69 +4484,27 @@ static int iwl4965_tx_queue_agg_enable(struct iwl4965_priv *priv, int txq_id,
         iwl4965_set_wr_ptrs(priv, txq_id, ssn_idx);
 
         /* Set up Tx window size and frame limit for this queue */
-        iwl4965_write_targ_mem(priv,
+        iwl_write_targ_mem(priv,
                         priv->scd_base_addr + SCD_CONTEXT_QUEUE_OFFSET(txq_id),
                         (SCD_WIN_SIZE << SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &
                         SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
 
-        iwl4965_write_targ_mem(priv, priv->scd_base_addr +
+        iwl_write_targ_mem(priv, priv->scd_base_addr +
                         SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
                         (SCD_FRAME_LIMIT << SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS)
                         & SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
 
-        iwl4965_set_bits_prph(priv, KDR_SCD_INTERRUPT_MASK, (1 << txq_id));
+        iwl_set_bits_prph(priv, IWL49_SCD_INTERRUPT_MASK, (1 << txq_id));
 
         /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */
         iwl4965_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 1);
 
-        iwl4965_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        return 0;
-}
-
-/**
- * txq_id must be greater than IWL_BACK_QUEUE_FIRST_ID
- */
-static int iwl4965_tx_queue_agg_disable(struct iwl4965_priv *priv, u16 txq_id,
-                                        u16 ssn_idx, u8 tx_fifo)
-{
-        unsigned long flags;
-        int rc;
-
-        if (IWL_BACK_QUEUE_FIRST_ID > txq_id) {
-                IWL_WARNING("queue number too small: %d, must be > %d\n",
-                                txq_id, IWL_BACK_QUEUE_FIRST_ID);
-                return -EINVAL;
-        }
-
-        spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl4965_grab_nic_access(priv);
-        if (rc) {
-                spin_unlock_irqrestore(&priv->lock, flags);
-                return rc;
-        }
-
-        iwl4965_tx_queue_stop_scheduler(priv, txq_id);
-
-        iwl4965_clear_bits_prph(priv, KDR_SCD_QUEUECHAIN_SEL, (1 << txq_id));
-
-        priv->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
-        priv->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
-        /* supposes that ssn_idx is valid (!= 0xFFF) */
-        iwl4965_set_wr_ptrs(priv, txq_id, ssn_idx);
-
-        iwl4965_clear_bits_prph(priv, KDR_SCD_INTERRUPT_MASK, (1 << txq_id));
-        iwl4965_txq_ctx_deactivate(priv, txq_id);
-        iwl4965_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 0);
-
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
-#endif/* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 
 /**
@@ -4513,10 +4521,10 @@ static int iwl4965_tx_queue_agg_disable(struct iwl4965_priv *priv, u16 txq_id,
  *       calling this function (which runs REPLY_TX_LINK_QUALITY_CMD,
  *       which requires station table entry to exist).
  */
-void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr, int is_ap)
+void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
         int i, r;
-        struct iwl4965_link_quality_cmd link_cmd = {
+        struct iwl_link_quality_cmd link_cmd = {
                 .reserved1 = 0,
         };
         u16 rate_flags;
@@ -4525,7 +4533,7 @@ void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr, int is_ap)
          * all the way down to 1M in IEEE order, and then spin on 1M */
         if (is_ap)
                 r = IWL_RATE_54M_INDEX;
-        else if (priv->phymode == MODE_IEEE80211A)
+        else if (priv->band == IEEE80211_BAND_5GHZ)
                 r = IWL_RATE_6M_INDEX;
         else
                 r = IWL_RATE_1M_INDEX;
@@ -4550,24 +4558,25 @@ void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr, int is_ap)
         link_cmd.agg_params.agg_time_limit = cpu_to_le16(4000);
 
         /* Update the rate scaling for control frame Tx to AP */
-        link_cmd.sta_id = is_ap ? IWL_AP_ID : IWL4965_BROADCAST_ID;
+        link_cmd.sta_id = is_ap ? IWL_AP_ID : priv->hw_params.bcast_sta_id;
 
-        iwl4965_send_cmd_pdu(priv, REPLY_TX_LINK_QUALITY_CMD, sizeof(link_cmd),
-                         &link_cmd);
+        iwl_send_cmd_pdu_async(priv, REPLY_TX_LINK_QUALITY_CMD,
+                               sizeof(link_cmd), &link_cmd, NULL);
 }
 
 #ifdef CONFIG_IWL4965_HT
 
-static u8 iwl4965_is_channel_extension(struct iwl4965_priv *priv, int phymode,
-                                   u16 channel, u8 extension_chan_offset)
+static u8 iwl4965_is_channel_extension(struct iwl_priv *priv,
+                                       enum ieee80211_band band,
+                                       u16 channel, u8 extension_chan_offset)
 {
-        const struct iwl4965_channel_info *ch_info;
+        const struct iwl_channel_info *ch_info;
 
-        ch_info = iwl4965_get_channel_info(priv, phymode, channel);
+        ch_info = iwl_get_channel_info(priv, band, channel);
         if (!is_channel_valid(ch_info))
                 return 0;
 
-        if (extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_AUTO)
+        if (extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_NONE)
                 return 0;
 
         if ((ch_info->fat_extension_channel == extension_chan_offset) ||
@@ -4577,14 +4586,14 @@ static u8 iwl4965_is_channel_extension(struct iwl4965_priv *priv, int phymode,
         return 0;
 }
 
-static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
+static u8 iwl4965_is_fat_tx_allowed(struct iwl_priv *priv,
                                 struct ieee80211_ht_info *sta_ht_inf)
 {
         struct iwl_ht_info *iwl_ht_conf = &priv->current_ht_config;
 
         if ((!iwl_ht_conf->is_ht) ||
            (iwl_ht_conf->supported_chan_width != IWL_CHANNEL_WIDTH_40MHZ) ||
-           (iwl_ht_conf->extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_AUTO))
+           (iwl_ht_conf->extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_NONE))
                 return 0;
 
         if (sta_ht_inf) {
@@ -4593,12 +4602,12 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
                         return 0;
         }
 
-        return (iwl4965_is_channel_extension(priv, priv->phymode,
+        return (iwl4965_is_channel_extension(priv, priv->band,
                                          iwl_ht_conf->control_channel,
                                          iwl_ht_conf->extension_chan_offset));
 }
 
-void iwl4965_set_rxon_ht(struct iwl4965_priv *priv, struct iwl_ht_info *ht_info)
+void iwl4965_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info)
 {
         struct iwl4965_rxon_cmd *rxon = &priv->staging_rxon;
         u32 val;
@@ -4629,9 +4638,7 @@ void iwl4965_set_rxon_ht(struct iwl4965_priv *priv, struct iwl_ht_info *ht_info)
         case IWL_EXT_CHANNEL_OFFSET_BELOW:
                 rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
                 break;
-        case IWL_EXT_CHANNEL_OFFSET_AUTO:
-                rxon->flags &= ~RXON_FLG_CHANNEL_MODE_MIXED_MSK;
-                break;
+        case IWL_EXT_CHANNEL_OFFSET_NONE:
         default:
                 rxon->flags &= ~RXON_FLG_CHANNEL_MODE_MIXED_MSK;
                 break;
@@ -4654,7 +4661,7 @@ void iwl4965_set_rxon_ht(struct iwl4965_priv *priv, struct iwl_ht_info *ht_info)
         return;
 }
 
-void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,
+void iwl4965_set_ht_add_station(struct iwl_priv *priv, u8 index,
                                 struct ieee80211_ht_info *sta_ht_inf)
 {
         __le32 sta_flags;
@@ -4699,7 +4706,7 @@ void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,
         return;
 }
 
-static void iwl4965_sta_modify_add_ba_tid(struct iwl4965_priv *priv,
+static void iwl4965_sta_modify_add_ba_tid(struct iwl_priv *priv,
                                           int sta_id, int tid, u16 ssn)
 {
         unsigned long flags;
@@ -4715,7 +4722,7 @@ static void iwl4965_sta_modify_add_ba_tid(struct iwl4965_priv *priv,
         iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
 }
 
-static void iwl4965_sta_modify_del_ba_tid(struct iwl4965_priv *priv,
+static void iwl4965_sta_modify_del_ba_tid(struct iwl_priv *priv,
                                           int sta_id, int tid)
 {
         unsigned long flags;
@@ -4730,136 +4737,94 @@ static void iwl4965_sta_modify_del_ba_tid(struct iwl4965_priv *priv,
         iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
 }
 
-int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
-                             enum ieee80211_ampdu_mlme_action action,
-                             const u8 *addr, u16 tid, u16 ssn)
-{
-        struct iwl4965_priv *priv = hw->priv;
-        int sta_id;
-        DECLARE_MAC_BUF(mac);
-
-        IWL_DEBUG_HT("A-MPDU action on da=%s tid=%d ",
-                        print_mac(mac, addr), tid);
-        sta_id = iwl4965_hw_find_station(priv, addr);
-        switch (action) {
-        case IEEE80211_AMPDU_RX_START:
-                IWL_DEBUG_HT("start Rx\n");
-                iwl4965_sta_modify_add_ba_tid(priv, sta_id, tid, ssn);
-                break;
-        case IEEE80211_AMPDU_RX_STOP:
-                IWL_DEBUG_HT("stop Rx\n");
-                iwl4965_sta_modify_del_ba_tid(priv, sta_id, tid);
-                break;
-        default:
-                IWL_DEBUG_HT("unknown\n");
-                return -EINVAL;
-                break;
-        }
-        return 0;
-}
-
-#ifdef CONFIG_IWL4965_HT_AGG
-
-static const u16 default_tid_to_tx_fifo[] = {
-        IWL_TX_FIFO_AC1,
-        IWL_TX_FIFO_AC0,
-        IWL_TX_FIFO_AC0,
-        IWL_TX_FIFO_AC1,
-        IWL_TX_FIFO_AC2,
-        IWL_TX_FIFO_AC2,
-        IWL_TX_FIFO_AC3,
-        IWL_TX_FIFO_AC3,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_NONE,
-        IWL_TX_FIFO_AC3
-};
-
 /*
  * Find first available (lowest unused) Tx Queue, mark it "active".
  * Called only when finding queue for aggregation.
  * Should never return anything < 7, because they should already
  * be in use as EDCA AC (0-3), Command (4), HCCA (5, 6).
  */
-static int iwl4965_txq_ctx_activate_free(struct iwl4965_priv *priv)
+static int iwl4965_txq_ctx_activate_free(struct iwl_priv *priv)
 {
         int txq_id;
 
-        for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++)
+        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++)
                 if (!test_and_set_bit(txq_id, &priv->txq_ctx_active_msk))
                         return txq_id;
         return -1;
 }
 
-int iwl4965_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da, u16 tid,
-                            u16 *start_seq_num)
+static int iwl4965_mac_ht_tx_agg_start(struct ieee80211_hw *hw, const u8 *da,
+                                       u16 tid, u16 *start_seq_num)
 {
-
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         int sta_id;
         int tx_fifo;
         int txq_id;
         int ssn = -1;
+        int ret = 0;
         unsigned long flags;
         struct iwl4965_tid_data *tid_data;
         DECLARE_MAC_BUF(mac);
 
-        /* Determine Tx DMA/FIFO channel for this Traffic ID */
         if (likely(tid < ARRAY_SIZE(default_tid_to_tx_fifo)))
                 tx_fifo = default_tid_to_tx_fifo[tid];
         else
                 return -EINVAL;
 
-        IWL_WARNING("iwl-AGG iwl4965_mac_ht_tx_agg_start on da=%s"
-                    " tid=%d\n", print_mac(mac, da), tid);
+        IWL_WARNING("%s on da = %s tid = %d\n",
+                        __func__, print_mac(mac, da), tid);
 
-        /* Get index into station table */
         sta_id = iwl4965_hw_find_station(priv, da);
         if (sta_id == IWL_INVALID_STATION)
                 return -ENXIO;
 
-        /* Find available Tx queue for aggregation */
+        if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_OFF) {
+                IWL_ERROR("Start AGG when state is not IWL_AGG_OFF !\n");
+                return -ENXIO;
+        }
+
         txq_id = iwl4965_txq_ctx_activate_free(priv);
         if (txq_id == -1)
                 return -ENXIO;
 
         spin_lock_irqsave(&priv->sta_lock, flags);
         tid_data = &priv->stations[sta_id].tid[tid];
-
-        /* Get starting sequence number for 1st frame in block ack window.
-         * We'll use least signif byte as 1st frame's index into Tx queue. */
         ssn = SEQ_TO_SN(tid_data->seq_number);
         tid_data->agg.txq_id = txq_id;
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
         *start_seq_num = ssn;
+        ret = iwl4965_tx_queue_agg_enable(priv, txq_id, tx_fifo,
+                                          sta_id, tid, ssn);
+        if (ret)
+                return ret;
 
-        /* Update driver's link quality manager */
-        iwl4965_ba_status(priv, tid, BA_STATUS_ACTIVE);
-
-        /* Set up and enable aggregation for selected Tx queue and FIFO */
-        return iwl4965_tx_queue_agg_enable(priv, txq_id, tx_fifo,
-                                           sta_id, tid, ssn);
+        ret = 0;
+        if (tid_data->tfds_in_queue == 0) {
+                printk(KERN_ERR "HW queue is empty\n");
+                tid_data->agg.state = IWL_AGG_ON;
+                ieee80211_start_tx_ba_cb_irqsafe(hw, da, tid);
+        } else {
+                IWL_DEBUG_HT("HW queue is NOT empty: %d packets in HW queue\n",
+                                tid_data->tfds_in_queue);
+                tid_data->agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;
+        }
+        return ret;
 }
 
-
-int iwl4965_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da, u16 tid,
-                           int generator)
+static int iwl4965_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, const u8 *da,
+                                      u16 tid)
 {
 
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         int tx_fifo_id, txq_id, sta_id, ssn = -1;
         struct iwl4965_tid_data *tid_data;
-        int rc;
+        int ret, write_ptr, read_ptr;
+        unsigned long flags;
         DECLARE_MAC_BUF(mac);
 
         if (!da) {
-                IWL_ERROR("%s: da = NULL\n", __func__);
+                IWL_ERROR("da = NULL\n");
                 return -EINVAL;
         }
 
@@ -4873,31 +4838,82 @@ int iwl4965_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da, u16 tid,
         if (sta_id == IWL_INVALID_STATION)
                 return -ENXIO;
 
+        if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_ON)
+                IWL_WARNING("Stopping AGG while state not IWL_AGG_ON\n");
+
         tid_data = &priv->stations[sta_id].tid[tid];
         ssn = (tid_data->seq_number & IEEE80211_SCTL_SEQ) >> 4;
         txq_id = tid_data->agg.txq_id;
+        write_ptr = priv->txq[txq_id].q.write_ptr;
+        read_ptr = priv->txq[txq_id].q.read_ptr;
+
+        /* The queue is not empty */
+        if (write_ptr != read_ptr) {
+                IWL_DEBUG_HT("Stopping a non empty AGG HW QUEUE\n");
+                priv->stations[sta_id].tid[tid].agg.state =
+                                IWL_EMPTYING_HW_QUEUE_DELBA;
+                return 0;
+        }
 
-        rc = iwl4965_tx_queue_agg_disable(priv, txq_id, ssn, tx_fifo_id);
-        /* FIXME: need more safe way to handle error condition */
-        if (rc)
-                return rc;
+        IWL_DEBUG_HT("HW queue empty\n");;
+        priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
+
+        spin_lock_irqsave(&priv->lock, flags);
+        ret = iwl4965_tx_queue_agg_disable(priv, txq_id, ssn, tx_fifo_id);
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        if (ret)
+                return ret;
+
+        ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, da, tid);
 
-        iwl4965_ba_status(priv, tid, BA_STATUS_INITIATOR_DELBA);
         IWL_DEBUG_INFO("iwl4965_mac_ht_tx_agg_stop on da=%s tid=%d\n",
-                       print_mac(mac, da), tid);
+                        print_mac(mac, da), tid);
 
         return 0;
 }
 
+int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
+                             enum ieee80211_ampdu_mlme_action action,
+                             const u8 *addr, u16 tid, u16 *ssn)
+{
+        struct iwl_priv *priv = hw->priv;
+        int sta_id;
+        DECLARE_MAC_BUF(mac);
+
+        IWL_DEBUG_HT("A-MPDU action on da=%s tid=%d ",
+                        print_mac(mac, addr), tid);
+        sta_id = iwl4965_hw_find_station(priv, addr);
+        switch (action) {
+        case IEEE80211_AMPDU_RX_START:
+                IWL_DEBUG_HT("start Rx\n");
+                iwl4965_sta_modify_add_ba_tid(priv, sta_id, tid, *ssn);
+                break;
+        case IEEE80211_AMPDU_RX_STOP:
+                IWL_DEBUG_HT("stop Rx\n");
+                iwl4965_sta_modify_del_ba_tid(priv, sta_id, tid);
+                break;
+        case IEEE80211_AMPDU_TX_START:
+                IWL_DEBUG_HT("start Tx\n");
+                return iwl4965_mac_ht_tx_agg_start(hw, addr, tid, ssn);
+        case IEEE80211_AMPDU_TX_STOP:
+                IWL_DEBUG_HT("stop Tx\n");
+                return iwl4965_mac_ht_tx_agg_stop(hw, addr, tid);
+        default:
+                IWL_DEBUG_HT("unknown\n");
+                return -EINVAL;
+                break;
+        }
+        return 0;
+}
 
-#endif /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 
 /* Set up 4965-specific Rx frame reply handlers */
-void iwl4965_hw_rx_handler_setup(struct iwl4965_priv *priv)
+void iwl4965_hw_rx_handler_setup(struct iwl_priv *priv)
 {
         /* Legacy Rx frames */
-        priv->rx_handlers[REPLY_4965_RX] = iwl4965_rx_reply_rx;
+        priv->rx_handlers[REPLY_RX] = iwl4965_rx_reply_rx;
 
         /* High-throughput (HT) Rx frames */
         priv->rx_handlers[REPLY_RX_PHY_CMD] = iwl4965_rx_reply_rx_phy;
@@ -4907,71 +4923,85 @@ void iwl4965_hw_rx_handler_setup(struct iwl4965_priv *priv)
             iwl4965_rx_missed_beacon_notif;
 
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
         priv->rx_handlers[REPLY_COMPRESSED_BA] = iwl4965_rx_reply_compressed_ba;
-#endif /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 }
 
-void iwl4965_hw_setup_deferred_work(struct iwl4965_priv *priv)
+void iwl4965_hw_setup_deferred_work(struct iwl_priv *priv)
 {
         INIT_WORK(&priv->txpower_work, iwl4965_bg_txpower_work);
-        INIT_WORK(&priv->statistics_work, iwl4965_bg_statistics_work);
 #ifdef CONFIG_IWL4965_SENSITIVITY
         INIT_WORK(&priv->sensitivity_work, iwl4965_bg_sensitivity_work);
 #endif
-#ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
-        INIT_WORK(&priv->agg_work, iwl4965_bg_agg_work);
-#endif /* CONFIG_IWL4965_HT_AGG */
-#endif /* CONFIG_IWL4965_HT */
         init_timer(&priv->statistics_periodic);
         priv->statistics_periodic.data = (unsigned long)priv;
         priv->statistics_periodic.function = iwl4965_bg_statistics_periodic;
 }
 
-void iwl4965_hw_cancel_deferred_work(struct iwl4965_priv *priv)
+void iwl4965_hw_cancel_deferred_work(struct iwl_priv *priv)
 {
         del_timer_sync(&priv->statistics_periodic);
 
         cancel_delayed_work(&priv->init_alive_start);
 }
 
-struct pci_device_id iwl4965_hw_card_ids[] = {
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4229)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4230)},
-        {0}
+
+static struct iwl_hcmd_ops iwl4965_hcmd = {
+        .rxon_assoc = iwl4965_send_rxon_assoc,
 };
 
-/*
- * The device's EEPROM semaphore prevents conflicts between driver and uCode
- * when accessing the EEPROM; each access is a series of pulses to/from the
- * EEPROM chip, not a single event, so even reads could conflict if they
- * weren't arbitrated by the semaphore.
- */
-int iwl4965_eeprom_acquire_semaphore(struct iwl4965_priv *priv)
-{
-        u16 count;
-        int rc;
+static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {
+        .enqueue_hcmd = iwl4965_enqueue_hcmd,
+};
 
-        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
-                /* Request semaphore */
-                iwl4965_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                        CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
-
-                /* See if we got it */
-                rc = iwl4965_poll_bit(priv, CSR_HW_IF_CONFIG_REG,
-                                        CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
-                                        CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
-                                        EEPROM_SEM_TIMEOUT);
-                if (rc >= 0) {
-                        IWL_DEBUG_IO("Acquired semaphore after %d tries.\n",
-                                count+1);
-                        return rc;
-                }
-        }
+static struct iwl_lib_ops iwl4965_lib = {
+        .init_drv = iwl4965_init_drv,
+        .set_hw_params = iwl4965_hw_set_hw_params,
+        .txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,
+        .hw_nic_init = iwl4965_hw_nic_init,
+        .is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,
+        .alive_notify = iwl4965_alive_notify,
+        .load_ucode = iwl4965_load_bsm,
+        .eeprom_ops = {
+                .verify_signature  = iwlcore_eeprom_verify_signature,
+                .acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
+                .release_semaphore = iwlcore_eeprom_release_semaphore,
+        },
+        .radio_kill_sw = iwl4965_radio_kill_sw,
+};
 
-        return rc;
-}
+static struct iwl_ops iwl4965_ops = {
+        .lib = &iwl4965_lib,
+        .hcmd = &iwl4965_hcmd,
+        .utils = &iwl4965_hcmd_utils,
+};
+
+struct iwl_cfg iwl4965_agn_cfg = {
+        .name = "4965AGN",
+        .fw_name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode",
+        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl4965_ops,
+        .mod_params = &iwl4965_mod_params,
+};
+
+module_param_named(antenna, iwl4965_mod_params.antenna, int, 0444);
+MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");
+module_param_named(disable, iwl4965_mod_params.disable, int, 0444);
+MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
+module_param_named(swcrypto, iwl4965_mod_params.sw_crypto, int, 0444);
+MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])\n");
+module_param_named(debug, iwl4965_mod_params.debug, int, 0444);
+MODULE_PARM_DESC(debug, "debug output mask");
+module_param_named(
+        disable_hw_scan, iwl4965_mod_params.disable_hw_scan, int, 0444);
+MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");
+
+module_param_named(queues_num, iwl4965_mod_params.num_of_queues, int, 0444);
+MODULE_PARM_DESC(queues_num, "number of hw queues.");
+
+/* QoS */
+module_param_named(qos_enable, iwl4965_mod_params.enable_qos, int, 0444);
+MODULE_PARM_DESC(qos_enable, "enable all QoS functionality");
+module_param_named(amsdu_size_8K, iwl4965_mod_params.amsdu_size_8K, int, 0444);
+MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");
 
-MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids);
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 9cb82be0ff80..9ed13cb0a2a9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -36,13 +36,24 @@
 #include <linux/kernel.h>
 #include <net/ieee80211_radiotap.h>
 
-/* Hardware specific file defines the PCI IDs table for that hardware module */
-extern struct pci_device_id iwl4965_hw_card_ids[];
-
 #define DRV_NAME        "iwl4965"
+#include "iwl-rfkill.h"
+#include "iwl-eeprom.h"
 #include "iwl-4965-hw.h"
+#include "iwl-csr.h"
 #include "iwl-prph.h"
-#include "iwl-4965-debug.h"
+#include "iwl-debug.h"
+#include "iwl-led.h"
+
+/* configuration for the iwl4965 */
+extern struct iwl_cfg iwl4965_agn_cfg;
+
+/* Change firmware file name, using "-" and incrementing number,
+ *   *only* when uCode interface or architecture changes so that it
+ *   is not compatible with earlier drivers.
+ * This number will also appear in << 8 position of 1st dword of uCode file */
+#define IWL4965_UCODE_API "-1"
+
 
 /* Default noise level to report when noise measurement is not available.
  *   This may be because we're:
@@ -57,11 +68,6 @@ extern struct pci_device_id iwl4965_hw_card_ids[];
  *   averages within an s8's (used in some apps) range of negative values. */
 #define IWL_NOISE_MEAS_NOT_AVAILABLE (-127)
 
-/* Module parameters accessible from iwl-*.c */
-extern int iwl4965_param_hwcrypto;
-extern int iwl4965_param_queues_num;
-extern int iwl4965_param_amsdu_size_8K;
-
 enum iwl4965_antenna {
         IWL_ANTENNA_DIVERSITY,
         IWL_ANTENNA_MAIN,
@@ -133,7 +139,7 @@ struct iwl4965_tx_info {
 struct iwl4965_tx_queue {
         struct iwl4965_queue q;
         struct iwl4965_tfd_frame *bd;
-        struct iwl4965_cmd *cmd;
+        struct iwl_cmd *cmd;
         dma_addr_t dma_addr_cmd;
         struct iwl4965_tx_info *txb;
         int need_update;
@@ -190,7 +196,7 @@ enum {
  */
 #define IWL4965_MAX_RATE (33)
 
-struct iwl4965_channel_info {
+struct iwl_channel_info {
         struct iwl4965_channel_tgd_info tgd;
         struct iwl4965_channel_tgh_info tgh;
         struct iwl4965_eeprom_channel eeprom;     /* EEPROM regulatory limit */
@@ -206,7 +212,7 @@ struct iwl4965_channel_info {
 
         u8 group_index;   /* 0-4, maps channel to group1/2/3/4/5 */
         u8 band_index;    /* 0-4, maps channel to band1/2/3/4/5 */
-        u8 phymode;       /* MODE_IEEE80211{A,B,G} */
+        enum ieee80211_band band;
 
         /* Radio/DSP gain settings for each "normal" data Tx rate.
          * These include, in addition to RF and DSP gain, a few fields for
@@ -288,8 +294,8 @@ struct iwl4965_frame {
 
 #define SEQ_TO_QUEUE(x)  ((x >> 8) & 0xbf)
 #define QUEUE_TO_SEQ(x)  ((x & 0xbf) << 8)
-#define SEQ_TO_INDEX(x) (x & 0xff)
-#define INDEX_TO_SEQ(x) (x & 0xff)
+#define SEQ_TO_INDEX(x) ((u8)(x & 0xff))
+#define INDEX_TO_SEQ(x) ((u8)(x & 0xff))
 #define SEQ_HUGE_FRAME  (0x4000)
 #define SEQ_RX_FRAME    __constant_cpu_to_le16(0x8000)
 #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
@@ -305,15 +311,15 @@ enum {
         CMD_WANT_SKB = (1 << 2),
 };
 
-struct iwl4965_cmd;
-struct iwl4965_priv;
+struct iwl_cmd;
+struct iwl_priv;
 
-struct iwl4965_cmd_meta {
-        struct iwl4965_cmd_meta *source;
+struct iwl_cmd_meta {
+        struct iwl_cmd_meta *source;
         union {
                 struct sk_buff *skb;
-                int (*callback)(struct iwl4965_priv *priv,
-                                struct iwl4965_cmd *cmd, struct sk_buff *skb);
+                int (*callback)(struct iwl_priv *priv,
+                                struct iwl_cmd *cmd, struct sk_buff *skb);
         } __attribute__ ((packed)) u;
 
         /* The CMD_SIZE_HUGE flag bit indicates that the command
@@ -323,15 +329,15 @@ struct iwl4965_cmd_meta {
 } __attribute__ ((packed));
 
 /**
- * struct iwl4965_cmd
+ * struct iwl_cmd
  *
  * For allocation of the command and tx queues, this establishes the overall
  * size of the largest command we send to uCode, except for a scan command
  * (which is relatively huge; space is allocated separately).
  */
-struct iwl4965_cmd {
-        struct iwl4965_cmd_meta meta;   /* driver data */
-        struct iwl4965_cmd_header hdr;  /* uCode API */
+struct iwl_cmd {
+        struct iwl_cmd_meta meta;       /* driver data */
+        struct iwl_cmd_header hdr;      /* uCode API */
         union {
                 struct iwl4965_addsta_cmd addsta;
                 struct iwl4965_led_cmd led;
@@ -351,15 +357,15 @@ struct iwl4965_cmd {
         } __attribute__ ((packed)) cmd;
 } __attribute__ ((packed));
 
-struct iwl4965_host_cmd {
+struct iwl_host_cmd {
         u8 id;
         u16 len;
-        struct iwl4965_cmd_meta meta;
+        struct iwl_cmd_meta meta;
         const void *data;
 };
 
-#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl4965_cmd) - \
-                              sizeof(struct iwl4965_cmd_meta))
+#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_cmd) - \
+                              sizeof(struct iwl_cmd_meta))
 
 /*
  * RX related structures and functions
@@ -408,32 +414,12 @@ struct iwl4965_rx_queue {
 #define MAX_B_CHANNELS  14
 #define MIN_B_CHANNELS  1
 
-#define STATUS_HCMD_ACTIVE      0       /* host command in progress */
-#define STATUS_INT_ENABLED      1
-#define STATUS_RF_KILL_HW       2
-#define STATUS_RF_KILL_SW       3
-#define STATUS_INIT             4
-#define STATUS_ALIVE            5
-#define STATUS_READY            6
-#define STATUS_TEMPERATURE      7
-#define STATUS_GEO_CONFIGURED   8
-#define STATUS_EXIT_PENDING     9
-#define STATUS_IN_SUSPEND       10
-#define STATUS_STATISTICS       11
-#define STATUS_SCANNING         12
-#define STATUS_SCAN_ABORTING    13
-#define STATUS_SCAN_HW          14
-#define STATUS_POWER_PMI        15
-#define STATUS_FW_ERROR         16
-#define STATUS_CONF_PENDING     17
-
 #define MAX_TID_COUNT        9
 
 #define IWL_INVALID_RATE     0xFF
 #define IWL_INVALID_VALUE    -1
 
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
 /**
  * struct iwl4965_ht_agg -- aggregation status while waiting for block-ack
  * @txq_id: Tx queue used for Tx attempt
@@ -453,25 +439,30 @@ struct iwl4965_ht_agg {
         u16 frame_count;
         u16 wait_for_ba;
         u16 start_idx;
-        u32 bitmap0;
-        u32 bitmap1;
+        u64 bitmap;
         u32 rate_n_flags;
+#define IWL_AGG_OFF 0
+#define IWL_AGG_ON 1
+#define IWL_EMPTYING_HW_QUEUE_ADDBA 2
+#define IWL_EMPTYING_HW_QUEUE_DELBA 3
+        u8 state;
 };
-#endif /* CONFIG_IWL4965_HT_AGG */
+
 #endif /* CONFIG_IWL4965_HT */
 
 struct iwl4965_tid_data {
         u16 seq_number;
+        u16 tfds_in_queue;
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
         struct iwl4965_ht_agg agg;
-#endif  /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 };
 
 struct iwl4965_hw_key {
         enum ieee80211_key_alg alg;
         int keylen;
+        u8 keyidx;
+        struct ieee80211_key_conf *conf;
         u8 key[32];
 };
 
@@ -508,8 +499,6 @@ struct iwl_ht_info {
 };
 #endif                          /*CONFIG_IWL4965_HT */
 
-#ifdef CONFIG_IWL4965_QOS
-
 union iwl4965_qos_capabity {
         struct {
                 u8 edca_count:4;        /* bit 0-3 */
@@ -537,7 +526,6 @@ struct iwl4965_qos_info {
         union iwl4965_qos_capabity qos_cap;
         struct iwl4965_qosparam_cmd def_qos_parm;
 };
-#endif /*CONFIG_IWL4965_QOS */
 
 #define STA_PS_STATUS_WAKE             0
 #define STA_PS_STATUS_SLEEP            1
@@ -579,30 +567,29 @@ struct iwl4965_ibss_seq {
 };
 
 /**
- * struct iwl4965_driver_hw_info
+ * struct iwl_hw_params
  * @max_txq_num: Max # Tx queues supported
- * @ac_queue_count: # Tx queues for EDCA Access Categories (AC)
  * @tx_cmd_len: Size of Tx command (but not including frame itself)
+ * @tx_ant_num: Number of TX antennas
  * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)
  * @rx_buffer_size:
  * @max_rxq_log: Log-base-2 of max_rxq_size
  * @max_stations:
  * @bcast_sta_id:
- * @shared_virt: Pointer to driver/uCode shared Tx Byte Counts and Rx status
- * @shared_phys: Physical Pointer to Tx Byte Counts and Rx status
  */
-struct iwl4965_driver_hw_info {
+struct iwl_hw_params {
         u16 max_txq_num;
-        u16 ac_queue_count;
         u16 tx_cmd_len;
+        u8  tx_chains_num;
+        u8  rx_chains_num;
+        u8  valid_tx_ant;
+        u8  valid_rx_ant;
         u16 max_rxq_size;
+        u16 max_rxq_log;
         u32 rx_buf_size;
         u32 max_pkt_size;
-        u16 max_rxq_log;
         u8  max_stations;
         u8  bcast_sta_id;
-        void *shared_virt;
-        dma_addr_t shared_phys;
 };
 
 #define HT_SHORT_GI_20MHZ_ONLY          (1 << 0)
@@ -626,62 +613,49 @@ struct iwl4965_driver_hw_info {
  *
  *****************************************************************************/
 struct iwl4965_addsta_cmd;
-extern int iwl4965_send_add_station(struct iwl4965_priv *priv,
+extern int iwl4965_send_add_station(struct iwl_priv *priv,
                                 struct iwl4965_addsta_cmd *sta, u8 flags);
-extern u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
+extern u8 iwl4965_add_station_flags(struct iwl_priv *priv, const u8 *addr,
                           int is_ap, u8 flags, void *ht_data);
-extern int iwl4965_is_network_packet(struct iwl4965_priv *priv,
+extern int iwl4965_is_network_packet(struct iwl_priv *priv,
                                  struct ieee80211_hdr *header);
-extern int iwl4965_power_init_handle(struct iwl4965_priv *priv);
-extern int iwl4965_eeprom_init(struct iwl4965_priv *priv);
-#ifdef CONFIG_IWL4965_DEBUG
-extern void iwl4965_report_frame(struct iwl4965_priv *priv,
-                             struct iwl4965_rx_packet *pkt,
-                             struct ieee80211_hdr *header, int group100);
-#else
-static inline void iwl4965_report_frame(struct iwl4965_priv *priv,
-                                    struct iwl4965_rx_packet *pkt,
-                                    struct ieee80211_hdr *header,
-                                    int group100) {}
-#endif
-extern void iwl4965_handle_data_packet_monitor(struct iwl4965_priv *priv,
+extern int iwl4965_power_init_handle(struct iwl_priv *priv);
+extern void iwl4965_handle_data_packet_monitor(struct iwl_priv *priv,
                                            struct iwl4965_rx_mem_buffer *rxb,
                                            void *data, short len,
                                            struct ieee80211_rx_status *stats,
                                            u16 phy_flags);
-extern int iwl4965_is_duplicate_packet(struct iwl4965_priv *priv,
+extern int iwl4965_is_duplicate_packet(struct iwl_priv *priv,
                                        struct ieee80211_hdr *header);
-extern int iwl4965_rx_queue_alloc(struct iwl4965_priv *priv);
-extern void iwl4965_rx_queue_reset(struct iwl4965_priv *priv,
+extern int iwl4965_rx_queue_alloc(struct iwl_priv *priv);
+extern void iwl4965_rx_queue_reset(struct iwl_priv *priv,
                                struct iwl4965_rx_queue *rxq);
 extern int iwl4965_calc_db_from_ratio(int sig_ratio);
 extern int iwl4965_calc_sig_qual(int rssi_dbm, int noise_dbm);
-extern int iwl4965_tx_queue_init(struct iwl4965_priv *priv,
+extern int iwl4965_tx_queue_init(struct iwl_priv *priv,
                              struct iwl4965_tx_queue *txq, int count, u32 id);
 extern void iwl4965_rx_replenish(void *data);
-extern void iwl4965_tx_queue_free(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq);
-extern int iwl4965_send_cmd_pdu(struct iwl4965_priv *priv, u8 id, u16 len,
-                            const void *data);
-extern int __must_check iwl4965_send_cmd(struct iwl4965_priv *priv,
-                struct iwl4965_host_cmd *cmd);
-extern unsigned int iwl4965_fill_beacon_frame(struct iwl4965_priv *priv,
+extern void iwl4965_tx_queue_free(struct iwl_priv *priv, struct iwl4965_tx_queue *txq);
+extern unsigned int iwl4965_fill_beacon_frame(struct iwl_priv *priv,
                                         struct ieee80211_hdr *hdr,
                                         const u8 *dest, int left);
-extern int iwl4965_rx_queue_update_write_ptr(struct iwl4965_priv *priv,
+extern int iwl4965_rx_queue_update_write_ptr(struct iwl_priv *priv,
                                          struct iwl4965_rx_queue *q);
-extern int iwl4965_send_statistics_request(struct iwl4965_priv *priv);
-extern void iwl4965_set_decrypted_flag(struct iwl4965_priv *priv, struct sk_buff *skb,
+extern void iwl4965_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,
                                    u32 decrypt_res,
                                    struct ieee80211_rx_status *stats);
 extern __le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr);
+int iwl4965_init_geos(struct iwl_priv *priv);
+void iwl4965_free_geos(struct iwl_priv *priv);
 
 extern const u8 iwl4965_broadcast_addr[ETH_ALEN];
+int iwl4965_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);
 
 /*
  * Currently used by iwl-3945-rs... look at restructuring so that it doesn't
  * call this... todo... fix that.
 */
-extern u8 iwl4965_sync_station(struct iwl4965_priv *priv, int sta_id,
+extern u8 iwl4965_sync_station(struct iwl_priv *priv, int sta_id,
                            u16 tx_rate, u8 flags);
 
 /******************************************************************************
@@ -700,36 +674,36 @@ extern u8 iwl4965_sync_station(struct iwl4965_priv *priv, int sta_id,
  * iwl4965_mac_     <-- mac80211 callback
  *
  ****************************************************************************/
-extern void iwl4965_hw_rx_handler_setup(struct iwl4965_priv *priv);
-extern void iwl4965_hw_setup_deferred_work(struct iwl4965_priv *priv);
-extern void iwl4965_hw_cancel_deferred_work(struct iwl4965_priv *priv);
-extern int iwl4965_hw_rxq_stop(struct iwl4965_priv *priv);
-extern int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv);
-extern int iwl4965_hw_nic_init(struct iwl4965_priv *priv);
-extern int iwl4965_hw_nic_stop_master(struct iwl4965_priv *priv);
-extern void iwl4965_hw_txq_ctx_free(struct iwl4965_priv *priv);
-extern void iwl4965_hw_txq_ctx_stop(struct iwl4965_priv *priv);
-extern int iwl4965_hw_nic_reset(struct iwl4965_priv *priv);
-extern int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl4965_priv *priv, void *tfd,
+extern void iwl4965_hw_rx_handler_setup(struct iwl_priv *priv);
+extern void iwl4965_hw_setup_deferred_work(struct iwl_priv *priv);
+extern void iwl4965_hw_cancel_deferred_work(struct iwl_priv *priv);
+extern int iwl4965_hw_rxq_stop(struct iwl_priv *priv);
+extern int iwl4965_hw_set_hw_params(struct iwl_priv *priv);
+extern int iwl4965_hw_nic_init(struct iwl_priv *priv);
+extern int iwl4965_hw_nic_stop_master(struct iwl_priv *priv);
+extern void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv);
+extern void iwl4965_hw_txq_ctx_stop(struct iwl_priv *priv);
+extern int iwl4965_hw_nic_reset(struct iwl_priv *priv);
+extern int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd,
                                         dma_addr_t addr, u16 len);
-extern int iwl4965_hw_txq_free_tfd(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq);
-extern int iwl4965_hw_get_temperature(struct iwl4965_priv *priv);
-extern int iwl4965_hw_tx_queue_init(struct iwl4965_priv *priv,
+extern int iwl4965_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl4965_tx_queue *txq);
+extern int iwl4965_hw_get_temperature(struct iwl_priv *priv);
+extern int iwl4965_hw_tx_queue_init(struct iwl_priv *priv,
                                 struct iwl4965_tx_queue *txq);
-extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl4965_priv *priv,
+extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,
                                  struct iwl4965_frame *frame, u8 rate);
-extern int iwl4965_hw_get_rx_read(struct iwl4965_priv *priv);
-extern void iwl4965_hw_build_tx_cmd_rate(struct iwl4965_priv *priv,
-                                     struct iwl4965_cmd *cmd,
+extern int iwl4965_hw_get_rx_read(struct iwl_priv *priv);
+extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv,
+                                     struct iwl_cmd *cmd,
                                      struct ieee80211_tx_control *ctrl,
                                      struct ieee80211_hdr *hdr,
                                      int sta_id, int tx_id);
-extern int iwl4965_hw_reg_send_txpower(struct iwl4965_priv *priv);
-extern int iwl4965_hw_reg_set_txpower(struct iwl4965_priv *priv, s8 power);
-extern void iwl4965_hw_rx_statistics(struct iwl4965_priv *priv,
+extern int iwl4965_hw_reg_send_txpower(struct iwl_priv *priv);
+extern int iwl4965_hw_reg_set_txpower(struct iwl_priv *priv, s8 power);
+extern void iwl4965_hw_rx_statistics(struct iwl_priv *priv,
                                  struct iwl4965_rx_mem_buffer *rxb);
-extern void iwl4965_disable_events(struct iwl4965_priv *priv);
-extern int iwl4965_get_temperature(const struct iwl4965_priv *priv);
+extern void iwl4965_disable_events(struct iwl_priv *priv);
+extern int iwl4965_get_temperature(const struct iwl_priv *priv);
 
 /**
  * iwl4965_hw_find_station - Find station id for a given BSSID
@@ -739,54 +713,51 @@ extern int iwl4965_get_temperature(const struct iwl4965_priv *priv);
  * not yet been merged into a single common layer for managing the
  * station tables.
  */
-extern u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *bssid);
+extern u8 iwl4965_hw_find_station(struct iwl_priv *priv, const u8 *bssid);
 
-extern int iwl4965_hw_channel_switch(struct iwl4965_priv *priv, u16 channel);
-extern int iwl4965_tx_queue_reclaim(struct iwl4965_priv *priv, int txq_id, int index);
-
-struct iwl4965_priv;
+extern int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel);
+extern int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);
+extern int iwl4965_queue_space(const struct iwl4965_queue *q);
+struct iwl_priv;
 
+extern void iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio);
 /*
  * Forward declare iwl-4965.c functions for iwl-base.c
  */
-extern int iwl4965_eeprom_acquire_semaphore(struct iwl4965_priv *priv);
-
-extern int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,
+extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv,
                                           struct iwl4965_tx_queue *txq,
                                           u16 byte_cnt);
-extern void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr,
+extern void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr,
                                 int is_ap);
-extern void iwl4965_set_rxon_chain(struct iwl4965_priv *priv);
-extern int iwl4965_alive_notify(struct iwl4965_priv *priv);
-extern void iwl4965_update_rate_scaling(struct iwl4965_priv *priv, u8 mode);
-extern void iwl4965_chain_noise_reset(struct iwl4965_priv *priv);
-extern void iwl4965_init_sensitivity(struct iwl4965_priv *priv, u8 flags,
+extern void iwl4965_set_rxon_chain(struct iwl_priv *priv);
+extern int iwl4965_alive_notify(struct iwl_priv *priv);
+extern void iwl4965_update_rate_scaling(struct iwl_priv *priv, u8 mode);
+extern void iwl4965_chain_noise_reset(struct iwl_priv *priv);
+extern void iwl4965_init_sensitivity(struct iwl_priv *priv, u8 flags,
                                      u8 force);
-extern int iwl4965_set_fat_chan_info(struct iwl4965_priv *priv, int phymode,
-                                u16 channel,
-                                const struct iwl4965_eeprom_channel *eeprom_ch,
-                                u8 fat_extension_channel);
-extern void iwl4965_rf_kill_ct_config(struct iwl4965_priv *priv);
+extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv);
+extern void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv,
+                                         u32 rate_n_flags,
+                                         struct ieee80211_tx_control *control);
 
 #ifdef CONFIG_IWL4965_HT
-extern void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info,
-                                        int mode);
-extern void iwl4965_set_rxon_ht(struct iwl4965_priv *priv,
-                                struct iwl_ht_info *ht_info);
-extern void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,
+void iwl4965_init_ht_hw_capab(struct iwl_priv *priv,
+                              struct ieee80211_ht_info *ht_info,
+                              enum ieee80211_band band);
+void iwl4965_set_rxon_ht(struct iwl_priv *priv,
+                         struct iwl_ht_info *ht_info);
+void iwl4965_set_ht_add_station(struct iwl_priv *priv, u8 index,
                                 struct ieee80211_ht_info *sta_ht_inf);
-extern int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
+int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
                                     enum ieee80211_ampdu_mlme_action action,
-                                    const u8 *addr, u16 tid, u16 ssn);
-#ifdef CONFIG_IWL4965_HT_AGG
-extern int iwl4965_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da,
-                                   u16 tid, u16 *start_seq_num);
-extern int iwl4965_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da,
-                                  u16 tid, int generator);
-extern void iwl4965_turn_off_agg(struct iwl4965_priv *priv, u8 tid);
-extern void iwl4965_tl_get_stats(struct iwl4965_priv *priv,
-                                struct ieee80211_hdr *hdr);
-#endif /* CONFIG_IWL4965_HT_AGG */
+                                    const u8 *addr, u16 tid, u16 *ssn);
+int iwl4965_check_empty_hw_queue(struct iwl_priv *priv, int sta_id,
+                                        u8 tid, int txq_id);
+#else
+static inline void iwl4965_init_ht_hw_capab(struct iwl_priv *priv,
+                                            struct ieee80211_ht_info *ht_info,
+                                            enum ieee80211_band band) {}
+
 #endif /*CONFIG_IWL4965_HT */
 /* Structures, enum, and defines specific to the 4965 */
 
@@ -798,18 +769,6 @@ struct iwl4965_kw {
         size_t size;
 };
 
-#define TID_QUEUE_CELL_SPACING 50       /*mS */
-#define TID_QUEUE_MAX_SIZE     20
-#define TID_ROUND_VALUE        5        /* mS */
-#define TID_MAX_LOAD_COUNT     8
-
-#define TID_MAX_TIME_DIFF ((TID_QUEUE_MAX_SIZE - 1) * TID_QUEUE_CELL_SPACING)
-#define TIME_WRAP_AROUND(x, y) (((y) > (x)) ? (y) - (x) : (0-(x)) + (y))
-
-#define TID_ALL_ENABLED         0x7f
-#define TID_ALL_SPECIFIED       0xff
-#define TID_AGG_TPT_THREHOLD    0x0
-
 #define IWL_CHANNEL_WIDTH_20MHZ   0
 #define IWL_CHANNEL_WIDTH_40MHZ   1
 
@@ -823,48 +782,17 @@ struct iwl4965_kw {
 #define IWL_OPERATION_MODE_MIXED    2
 #define IWL_OPERATION_MODE_20MHZ    3
 
-#define IWL_EXT_CHANNEL_OFFSET_AUTO   0
-#define IWL_EXT_CHANNEL_OFFSET_ABOVE  1
-#define IWL_EXT_CHANNEL_OFFSET_       2
-#define IWL_EXT_CHANNEL_OFFSET_BELOW  3
-#define IWL_EXT_CHANNEL_OFFSET_MAX    4
+#define IWL_EXT_CHANNEL_OFFSET_NONE      0
+#define IWL_EXT_CHANNEL_OFFSET_ABOVE     1
+#define IWL_EXT_CHANNEL_OFFSET_RESERVE1  2
+#define IWL_EXT_CHANNEL_OFFSET_BELOW     3
 
 #define NRG_NUM_PREV_STAT_L     20
 #define NUM_RX_CHAINS           (3)
 
 #define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000
 
-struct iwl4965_traffic_load {
-        unsigned long time_stamp;
-        u32 packet_count[TID_QUEUE_MAX_SIZE];
-        u8 queue_count;
-        u8 head;
-        u32 total;
-};
-
-#ifdef CONFIG_IWL4965_HT_AGG
-/**
- * struct iwl4965_agg_control
- * @requested_ba: bit map of tids requesting aggregation/block-ack
- * @granted_ba: bit map of tids granted aggregation/block-ack
- */
-struct iwl4965_agg_control {
-        unsigned long next_retry;
-        u32 wait_for_agg_status;
-        u32 tid_retry;
-        u32 requested_ba;
-        u32 granted_ba;
-        u8 auto_agg;
-        u32 tid_traffic_load_threshold;
-        u32 ba_timeout;
-        struct iwl4965_traffic_load traffic_load[TID_MAX_LOAD_COUNT];
-};
-#endif                          /*CONFIG_IWL4965_HT_AGG */
-
 struct iwl4965_lq_mngr {
-#ifdef CONFIG_IWL4965_HT_AGG
-        struct iwl4965_agg_control agg_ctrl;
-#endif
         spinlock_t lock;
         s32 max_window_size;
         s32 *expected_tpt;
@@ -877,7 +805,6 @@ struct iwl4965_lq_mngr {
         u8 lq_ready;
 };
 
-
 /* Sensitivity and chain noise calibration */
 #define INTERFERENCE_DATA_AVAILABLE     __constant_cpu_to_le32(1)
 #define INITIALIZATION_VALUE            0xFFFF
@@ -1014,25 +941,28 @@ enum {
 
 #endif
 
-struct iwl4965_priv {
+#define IWL_MAX_NUM_QUEUES      20 /* FIXME: do dynamic allocation */
+
+struct iwl_priv {
 
         /* ieee device used by generic ieee processing code */
         struct ieee80211_hw *hw;
         struct ieee80211_channel *ieee_channels;
         struct ieee80211_rate *ieee_rates;
+        struct iwl_cfg *cfg;
 
         /* temporary frame storage list */
         struct list_head free_frames;
         int frames_count;
 
-        u8 phymode;
+        enum ieee80211_band band;
         int alloc_rxb_skb;
         bool add_radiotap;
 
-        void (*rx_handlers[REPLY_MAX])(struct iwl4965_priv *priv,
+        void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
                                        struct iwl4965_rx_mem_buffer *rxb);
 
-        const struct ieee80211_hw_mode *modes;
+        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
 
 #ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT
         /* spectrum measurement report caching */
@@ -1044,7 +974,7 @@ struct iwl4965_priv {
 
         /* we allocate array of iwl4965_channel_info for NIC's valid channels.
          *    Access via channel # using indirect index array */
-        struct iwl4965_channel_info *channel_info;      /* channel info array */
+        struct iwl_channel_info *channel_info;  /* channel info array */
         u8 channel_count;       /* # of channels */
 
         /* each calibration channel group in the EEPROM has a derived
@@ -1104,18 +1034,21 @@ struct iwl4965_priv {
          * 4965's initialize alive response contains some calibration data. */
         struct iwl4965_init_alive_resp card_alive_init;
         struct iwl4965_alive_resp card_alive;
+#ifdef CONFIG_IWLWIFI_RFKILL
+        struct iwl_rfkill_mngr rfkill_mngr;
+#endif
 
-#ifdef LED
-        /* LED related variables */
-        struct iwl4965_activity_blink activity;
-        unsigned long led_packets;
-        int led_state;
+#ifdef CONFIG_IWLWIFI_LEDS
+        struct iwl4965_led led[IWL_LED_TRG_MAX];
+        unsigned long last_blink_time;
+        u8 last_blink_rate;
+        u8 allow_blinking;
+        u64 led_tpt;
 #endif
 
         u16 active_rate;
         u16 active_rate_basic;
 
-        u8 call_post_assoc_from_beacon;
         u8 assoc_station_added;
         u8 use_ant_b_for_management_frame;      /* Tx antenna selection */
         u8 valid_antenna;       /* Bit mask of antennas actually connected */
@@ -1150,11 +1083,16 @@ struct iwl4965_priv {
         u32 scd_base_addr;      /* scheduler sram base address */
 
         unsigned long status;
-        u32 config;
 
         int last_rx_rssi;       /* From Rx packet statisitics */
         int last_rx_noise;      /* From beacon statistics */
 
+        /* counts mgmt, ctl, and data packets */
+        struct traffic_stats {
+                u32 cnt;
+                u64 bytes;
+        } tx_stats[3], rx_stats[3];
+
         struct iwl4965_power_mgr power_data;
 
         struct iwl4965_notif_statistics statistics;
@@ -1175,12 +1113,15 @@ struct iwl4965_priv {
         spinlock_t sta_lock;
         int num_stations;
         struct iwl4965_station_entry stations[IWL_STATION_COUNT];
+        struct iwl_wep_key wep_keys[WEP_KEYS_MAX];
+        u8 default_wep_key;
+        u8 key_mapping_key;
+        unsigned long ucode_key_table;
 
         /* Indication if ieee80211_ops->open has been called */
-        int is_open;
+        u8 is_open;
 
         u8 mac80211_registered;
-        int is_abg;
 
         u32 notif_missed_beacons;
 
@@ -1199,26 +1140,28 @@ struct iwl4965_priv {
         /* eeprom */
         struct iwl4965_eeprom eeprom;
 
-        int iw_mode;
+        enum ieee80211_if_types iw_mode;
 
         struct sk_buff *ibss_beacon;
 
         /* Last Rx'd beacon timestamp */
-        u32 timestamp0;
-        u32 timestamp1;
+        u64 timestamp;
         u16 beacon_int;
-        struct iwl4965_driver_hw_info hw_setting;
         struct ieee80211_vif *vif;
 
+        struct iwl_hw_params hw_params;
+        /* driver/uCode shared Tx Byte Counts and Rx status */
+        void *shared_virt;
+        /* Physical Pointer to Tx Byte Counts and Rx status */
+        dma_addr_t shared_phys;
+
         /* Current association information needed to configure the
          * hardware */
         u16 assoc_id;
         u16 assoc_capability;
         u8 ps_mode;
 
-#ifdef CONFIG_IWL4965_QOS
         struct iwl4965_qos_info qos_data;
-#endif /*CONFIG_IWL4965_QOS */
 
         struct workqueue_struct *workqueue;
 
@@ -1253,71 +1196,68 @@ struct iwl4965_priv {
         u32 pm_state[16];
 #endif
 
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
         /* debugging info */
         u32 framecnt_to_us;
         atomic_t restrict_refcnt;
-#endif
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+        /* debugfs */
+        struct iwl_debugfs *dbgfs;
+#endif /* CONFIG_IWLWIFI_DEBUGFS */
+#endif /* CONFIG_IWLWIFI_DEBUG */
 
         struct work_struct txpower_work;
 #ifdef CONFIG_IWL4965_SENSITIVITY
         struct work_struct sensitivity_work;
 #endif
-        struct work_struct statistics_work;
         struct timer_list statistics_periodic;
+}; /*iwl_priv */
 
-#ifdef CONFIG_IWL4965_HT_AGG
-        struct work_struct agg_work;
-#endif
-};                              /*iwl4965_priv */
-
-static inline int iwl4965_is_associated(struct iwl4965_priv *priv)
+static inline int iwl_is_associated(struct iwl_priv *priv)
 {
         return (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
 }
 
-static inline int is_channel_valid(const struct iwl4965_channel_info *ch_info)
+static inline int is_channel_valid(const struct iwl_channel_info *ch_info)
 {
         if (ch_info == NULL)
                 return 0;
         return (ch_info->flags & EEPROM_CHANNEL_VALID) ? 1 : 0;
 }
 
-static inline int is_channel_narrow(const struct iwl4965_channel_info *ch_info)
+static inline int is_channel_narrow(const struct iwl_channel_info *ch_info)
 {
         return (ch_info->flags & EEPROM_CHANNEL_NARROW) ? 1 : 0;
 }
 
-static inline int is_channel_radar(const struct iwl4965_channel_info *ch_info)
+static inline int is_channel_radar(const struct iwl_channel_info *ch_info)
 {
         return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;
 }
 
-static inline u8 is_channel_a_band(const struct iwl4965_channel_info *ch_info)
+static inline u8 is_channel_a_band(const struct iwl_channel_info *ch_info)
 {
-        return ch_info->phymode == MODE_IEEE80211A;
+        return ch_info->band == IEEE80211_BAND_5GHZ;
 }
 
-static inline u8 is_channel_bg_band(const struct iwl4965_channel_info *ch_info)
+static inline u8 is_channel_bg_band(const struct iwl_channel_info *ch_info)
 {
-        return ((ch_info->phymode == MODE_IEEE80211B) ||
-                (ch_info->phymode == MODE_IEEE80211G));
+        return ch_info->band == IEEE80211_BAND_2GHZ;
 }
 
-static inline int is_channel_passive(const struct iwl4965_channel_info *ch)
+static inline int is_channel_passive(const struct iwl_channel_info *ch)
 {
         return (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;
 }
 
-static inline int is_channel_ibss(const struct iwl4965_channel_info *ch)
+static inline int is_channel_ibss(const struct iwl_channel_info *ch)
 {
         return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
 }
 
-extern const struct iwl4965_channel_info *iwl4965_get_channel_info(
-        const struct iwl4965_priv *priv, int phymode, u16 channel);
+extern const struct iwl_channel_info *iwl_get_channel_info(
+        const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);
 
-/* Requires full declaration of iwl4965_priv before including */
-#include "iwl-4965-io.h"
+/* Requires full declaration of iwl_priv before including */
 
 #endif                          /* __iwl4965_4965_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
new file mode 100644
index 000000000000..2dfd982d7d1f
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -0,0 +1,292 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Tomas Winkler <tomas.winkler@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <net/mac80211.h>
+
+struct iwl_priv; /* FIXME: remove */
+#include "iwl-debug.h"
+#include "iwl-eeprom.h"
+#include "iwl-4965.h" /* FIXME: remove */
+#include "iwl-core.h"
+#include "iwl-rfkill.h"
+
+
+MODULE_DESCRIPTION("iwl core");
+MODULE_VERSION(IWLWIFI_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+u32 iwl_debug_level;
+EXPORT_SYMBOL(iwl_debug_level);
+#endif
+
+/* This function both allocates and initializes hw and priv. */
+struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,
+                struct ieee80211_ops *hw_ops)
+{
+        struct iwl_priv *priv;
+
+        /* mac80211 allocates memory for this device instance, including
+         *   space for this driver's private structure */
+        struct ieee80211_hw *hw =
+                ieee80211_alloc_hw(sizeof(struct iwl_priv), hw_ops);
+        if (hw == NULL) {
+                IWL_ERROR("Can not allocate network device\n");
+                goto out;
+        }
+
+        priv = hw->priv;
+        priv->hw = hw;
+
+out:
+        return hw;
+}
+EXPORT_SYMBOL(iwl_alloc_all);
+
+/**
+ * iwlcore_clear_stations_table - Clear the driver's station table
+ *
+ * NOTE:  This does not clear or otherwise alter the device's station table.
+ */
+void iwlcore_clear_stations_table(struct iwl_priv *priv)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+
+        priv->num_stations = 0;
+        memset(priv->stations, 0, sizeof(priv->stations));
+
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+}
+EXPORT_SYMBOL(iwlcore_clear_stations_table);
+
+void iwlcore_reset_qos(struct iwl_priv *priv)
+{
+        u16 cw_min = 15;
+        u16 cw_max = 1023;
+        u8 aifs = 2;
+        u8 is_legacy = 0;
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&priv->lock, flags);
+        priv->qos_data.qos_active = 0;
+
+        if (priv->iw_mode == IEEE80211_IF_TYPE_IBSS) {
+                if (priv->qos_data.qos_enable)
+                        priv->qos_data.qos_active = 1;
+                if (!(priv->active_rate & 0xfff0)) {
+                        cw_min = 31;
+                        is_legacy = 1;
+                }
+        } else if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
+                if (priv->qos_data.qos_enable)
+                        priv->qos_data.qos_active = 1;
+        } else if (!(priv->staging_rxon.flags & RXON_FLG_SHORT_SLOT_MSK)) {
+                cw_min = 31;
+                is_legacy = 1;
+        }
+
+        if (priv->qos_data.qos_active)
+                aifs = 3;
+
+        priv->qos_data.def_qos_parm.ac[0].cw_min = cpu_to_le16(cw_min);
+        priv->qos_data.def_qos_parm.ac[0].cw_max = cpu_to_le16(cw_max);
+        priv->qos_data.def_qos_parm.ac[0].aifsn = aifs;
+        priv->qos_data.def_qos_parm.ac[0].edca_txop = 0;
+        priv->qos_data.def_qos_parm.ac[0].reserved1 = 0;
+
+        if (priv->qos_data.qos_active) {
+                i = 1;
+                priv->qos_data.def_qos_parm.ac[i].cw_min = cpu_to_le16(cw_min);
+                priv->qos_data.def_qos_parm.ac[i].cw_max = cpu_to_le16(cw_max);
+                priv->qos_data.def_qos_parm.ac[i].aifsn = 7;
+                priv->qos_data.def_qos_parm.ac[i].edca_txop = 0;
+                priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
+
+                i = 2;
+                priv->qos_data.def_qos_parm.ac[i].cw_min =
+                        cpu_to_le16((cw_min + 1) / 2 - 1);
+                priv->qos_data.def_qos_parm.ac[i].cw_max =
+                        cpu_to_le16(cw_max);
+                priv->qos_data.def_qos_parm.ac[i].aifsn = 2;
+                if (is_legacy)
+                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
+                                cpu_to_le16(6016);
+                else
+                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
+                                cpu_to_le16(3008);
+                priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
+
+                i = 3;
+                priv->qos_data.def_qos_parm.ac[i].cw_min =
+                        cpu_to_le16((cw_min + 1) / 4 - 1);
+                priv->qos_data.def_qos_parm.ac[i].cw_max =
+                        cpu_to_le16((cw_max + 1) / 2 - 1);
+                priv->qos_data.def_qos_parm.ac[i].aifsn = 2;
+                priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
+                if (is_legacy)
+                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
+                                cpu_to_le16(3264);
+                else
+                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
+                                cpu_to_le16(1504);
+        } else {
+                for (i = 1; i < 4; i++) {
+                        priv->qos_data.def_qos_parm.ac[i].cw_min =
+                                cpu_to_le16(cw_min);
+                        priv->qos_data.def_qos_parm.ac[i].cw_max =
+                                cpu_to_le16(cw_max);
+                        priv->qos_data.def_qos_parm.ac[i].aifsn = aifs;
+                        priv->qos_data.def_qos_parm.ac[i].edca_txop = 0;
+                        priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
+                }
+        }
+        IWL_DEBUG_QOS("set QoS to default \n");
+
+        spin_unlock_irqrestore(&priv->lock, flags);
+}
+EXPORT_SYMBOL(iwlcore_reset_qos);
+
+/**
+ * iwlcore_set_rxon_channel - Set the phymode and channel values in staging RXON
+ * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
+ * @channel: Any channel valid for the requested phymode
+
+ * In addition to setting the staging RXON, priv->phymode is also set.
+ *
+ * NOTE:  Does not commit to the hardware; it sets appropriate bit fields
+ * in the staging RXON flag structure based on the phymode
+ */
+int iwlcore_set_rxon_channel(struct iwl_priv *priv,
+                                enum ieee80211_band band,
+                                u16 channel)
+{
+        if (!iwl_get_channel_info(priv, band, channel)) {
+                IWL_DEBUG_INFO("Could not set channel to %d [%d]\n",
+                               channel, band);
+                return -EINVAL;
+        }
+
+        if ((le16_to_cpu(priv->staging_rxon.channel) == channel) &&
+            (priv->band == band))
+                return 0;
+
+        priv->staging_rxon.channel = cpu_to_le16(channel);
+        if (band == IEEE80211_BAND_5GHZ)
+                priv->staging_rxon.flags &= ~RXON_FLG_BAND_24G_MSK;
+        else
+                priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
+
+        priv->band = band;
+
+        IWL_DEBUG_INFO("Staging channel set to %d [%d]\n", channel, band);
+
+        return 0;
+}
+EXPORT_SYMBOL(iwlcore_set_rxon_channel);
+
+static void iwlcore_init_hw(struct iwl_priv *priv)
+{
+        struct ieee80211_hw *hw = priv->hw;
+        hw->rate_control_algorithm = "iwl-4965-rs";
+
+        /* Tell mac80211 and its clients (e.g. Wireless Extensions)
+         *       the range of signal quality values that we'll provide.
+         * Negative values for level/noise indicate that we'll provide dBm.
+         * For WE, at least, non-0 values here *enable* display of values
+         *       in app (iwconfig). */
+        hw->max_rssi = -20; /* signal level, negative indicates dBm */
+        hw->max_noise = -20;    /* noise level, negative indicates dBm */
+        hw->max_signal = 100;   /* link quality indication (%) */
+
+        /* Tell mac80211 our Tx characteristics */
+        hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE;
+
+        /* Default value; 4 EDCA QOS priorities */
+        hw->queues = 4;
+#ifdef CONFIG_IWL4965_HT
+        /* Enhanced value; more queues, to support 11n aggregation */
+        hw->queues = 16;
+#endif /* CONFIG_IWL4965_HT */
+}
+
+int iwl_setup(struct iwl_priv *priv)
+{
+        int ret = 0;
+        iwlcore_init_hw(priv);
+        ret = priv->cfg->ops->lib->init_drv(priv);
+        return ret;
+}
+EXPORT_SYMBOL(iwl_setup);
+
+/* Low level driver call this function to update iwlcore with
+ * driver status.
+ */
+int iwlcore_low_level_notify(struct iwl_priv *priv,
+                              enum iwlcore_card_notify notify)
+{
+        int ret;
+        switch (notify) {
+        case IWLCORE_INIT_EVT:
+                ret = iwl_rfkill_init(priv);
+                if (ret)
+                        IWL_ERROR("Unable to initialize RFKILL system. "
+                                  "Ignoring error: %d\n", ret);
+                break;
+        case IWLCORE_START_EVT:
+                break;
+        case IWLCORE_STOP_EVT:
+                break;
+        case IWLCORE_REMOVE_EVT:
+                iwl_rfkill_unregister(priv);
+                break;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(iwlcore_low_level_notify);
+
+int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags)
+{
+        u32 stat_flags = 0;
+        struct iwl_host_cmd cmd = {
+                .id = REPLY_STATISTICS_CMD,
+                .meta.flags = flags,
+                .len = sizeof(stat_flags),
+                .data = (u8 *) &stat_flags,
+        };
+        return iwl_send_cmd(priv, &cmd);
+}
+EXPORT_SYMBOL(iwl_send_statistics_request);
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
new file mode 100644
index 000000000000..7193d97630dc
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -0,0 +1,246 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Tomas Winkler <tomas.winkler@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#ifndef __iwl_core_h__
+#define __iwl_core_h__
+
+/************************
+ * forward declarations *
+ ************************/
+struct iwl_host_cmd;
+struct iwl_cmd;
+
+
+#define IWLWIFI_VERSION "1.2.26k"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2008 Intel Corporation"
+
+#define IWL_PCI_DEVICE(dev, subdev, cfg) \
+        .vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \
+        .subvendor = PCI_ANY_ID, .subdevice = (subdev), \
+        .driver_data = (kernel_ulong_t)&(cfg)
+
+#define IWL_SKU_G       0x1
+#define IWL_SKU_A       0x2
+#define IWL_SKU_N       0x8
+
+struct iwl_hcmd_ops {
+        int (*rxon_assoc)(struct iwl_priv *priv);
+};
+struct iwl_hcmd_utils_ops {
+        int (*enqueue_hcmd)(struct iwl_priv *priv, struct iwl_host_cmd *cmd);
+};
+
+struct iwl_lib_ops {
+        /* iwlwifi driver (priv) init */
+        int (*init_drv)(struct iwl_priv *priv);
+        /* set hw dependant perameters */
+        int (*set_hw_params)(struct iwl_priv *priv);
+
+        void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,
+                                        struct iwl4965_tx_queue *txq,
+                                        u16 byte_cnt);
+        /* nic init */
+        int (*hw_nic_init)(struct iwl_priv *priv);
+        /* alive notification */
+        int (*alive_notify)(struct iwl_priv *priv);
+        /* check validity of rtc data address */
+        int (*is_valid_rtc_data_addr)(u32 addr);
+        /* 1st ucode load */
+        int (*load_ucode)(struct iwl_priv *priv);
+        /* rfkill */
+        void (*radio_kill_sw)(struct iwl_priv *priv, int disable_radio);
+        /* eeprom operations (as defined in iwl-eeprom.h) */
+        struct iwl_eeprom_ops eeprom_ops;
+};
+
+struct iwl_ops {
+        const struct iwl_lib_ops *lib;
+        const struct iwl_hcmd_ops *hcmd;
+        const struct iwl_hcmd_utils_ops *utils;
+};
+
+struct iwl_mod_params {
+        int disable;            /* def: 0 = enable radio */
+        int sw_crypto;          /* def: 0 = using hardware encryption */
+        int debug;              /* def: 0 = minimal debug log messages */
+        int disable_hw_scan;    /* def: 0 = use h/w scan */
+        int num_of_queues;      /* def: HW dependent */
+        int enable_qos;         /* def: 1 = use quality of service */
+        int amsdu_size_8K;      /* def: 1 = enable 8K amsdu size */
+        int antenna;            /* def: 0 = both antennas (use diversity) */
+};
+
+struct iwl_cfg {
+        const char *name;
+        const char *fw_name;
+        unsigned int sku;
+        const struct iwl_ops *ops;
+        const struct iwl_mod_params *mod_params;
+};
+
+/***************************
+ *   L i b                 *
+ ***************************/
+
+struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,
+                struct ieee80211_ops *hw_ops);
+
+void iwlcore_clear_stations_table(struct iwl_priv *priv);
+void iwlcore_reset_qos(struct iwl_priv *priv);
+int iwlcore_set_rxon_channel(struct iwl_priv *priv,
+                                enum ieee80211_band band,
+                                u16 channel);
+
+int iwl_setup(struct iwl_priv *priv);
+
+/*****************************************************
+ *   S e n d i n g     H o s t     C o m m a n d s   *
+ *****************************************************/
+
+const char *get_cmd_string(u8 cmd);
+int __must_check iwl_send_cmd_sync(struct iwl_priv *priv,
+                                   struct iwl_host_cmd *cmd);
+int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);
+int __must_check iwl_send_cmd_pdu(struct iwl_priv *priv, u8 id,
+                                  u16 len, const void *data);
+int iwl_send_cmd_pdu_async(struct iwl_priv *priv, u8 id, u16 len,
+                           const void *data,
+                           int (*callback)(struct iwl_priv *priv,
+                                           struct iwl_cmd *cmd,
+                                           struct sk_buff *skb));
+/*************** DRIVER STATUS FUNCTIONS   *****/
+
+#define STATUS_HCMD_ACTIVE      0       /* host command in progress */
+#define STATUS_HCMD_SYNC_ACTIVE 1       /* sync host command in progress */
+#define STATUS_INT_ENABLED      2
+#define STATUS_RF_KILL_HW       3
+#define STATUS_RF_KILL_SW       4
+#define STATUS_INIT             5
+#define STATUS_ALIVE            6
+#define STATUS_READY            7
+#define STATUS_TEMPERATURE      8
+#define STATUS_GEO_CONFIGURED   9
+#define STATUS_EXIT_PENDING     10
+#define STATUS_IN_SUSPEND       11
+#define STATUS_STATISTICS       12
+#define STATUS_SCANNING         13
+#define STATUS_SCAN_ABORTING    14
+#define STATUS_SCAN_HW          15
+#define STATUS_POWER_PMI        16
+#define STATUS_FW_ERROR         17
+#define STATUS_CONF_PENDING     18
+
+
+static inline int iwl_is_ready(struct iwl_priv *priv)
+{
+        /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
+         * set but EXIT_PENDING is not */
+        return test_bit(STATUS_READY, &priv->status) &&
+               test_bit(STATUS_GEO_CONFIGURED, &priv->status) &&
+               !test_bit(STATUS_EXIT_PENDING, &priv->status);
+}
+
+static inline int iwl_is_alive(struct iwl_priv *priv)
+{
+        return test_bit(STATUS_ALIVE, &priv->status);
+}
+
+static inline int iwl_is_init(struct iwl_priv *priv)
+{
+        return test_bit(STATUS_INIT, &priv->status);
+}
+
+static inline int iwl_is_rfkill(struct iwl_priv *priv)
+{
+        return test_bit(STATUS_RF_KILL_HW, &priv->status) ||
+               test_bit(STATUS_RF_KILL_SW, &priv->status);
+}
+
+static inline int iwl_is_ready_rf(struct iwl_priv *priv)
+{
+
+        if (iwl_is_rfkill(priv))
+                return 0;
+
+        return iwl_is_ready(priv);
+}
+
+
+enum iwlcore_card_notify {
+        IWLCORE_INIT_EVT = 0,
+        IWLCORE_START_EVT = 1,
+        IWLCORE_STOP_EVT = 2,
+        IWLCORE_REMOVE_EVT = 3,
+};
+
+int iwlcore_low_level_notify(struct iwl_priv *priv,
+                             enum iwlcore_card_notify notify);
+extern int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags);
+int iwl_send_lq_cmd(struct iwl_priv *priv,
+                    struct iwl_link_quality_cmd *lq, u8 flags);
+
+static inline int iwl_send_rxon_assoc(struct iwl_priv *priv)
+{
+        return priv->cfg->ops->hcmd->rxon_assoc(priv);
+}
+
+#endif /* __iwl_core_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
new file mode 100644
index 000000000000..12725796ea5f
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -0,0 +1,265 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+/*=== CSR (control and status registers) ===*/
+#define CSR_BASE    (0x000)
+
+#define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000) /* hardware interface config */
+#define CSR_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */
+#define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */
+#define CSR_INT_MASK            (CSR_BASE+0x00c) /* host interrupt enable */
+#define CSR_FH_INT_STATUS       (CSR_BASE+0x010) /* busmaster int status/ack*/
+#define CSR_GPIO_IN             (CSR_BASE+0x018) /* read external chip pins */
+#define CSR_RESET               (CSR_BASE+0x020) /* busmaster enable, NMI, etc*/
+#define CSR_GP_CNTRL            (CSR_BASE+0x024)
+
+/*
+ * Hardware revision info
+ * Bit fields:
+ * 31-8:  Reserved
+ *  7-4:  Type of device:  0x0 = 4965, 0xd = 3945
+ *  3-2:  Revision step:  0 = A, 1 = B, 2 = C, 3 = D
+ *  1-0:  "Dash" value, as in A-1, etc.
+ *
+ * NOTE:  Revision step affects calculation of CCK txpower for 4965.
+ */
+#define CSR_HW_REV              (CSR_BASE+0x028)
+
+/* EEPROM reads */
+#define CSR_EEPROM_REG          (CSR_BASE+0x02c)
+#define CSR_EEPROM_GP           (CSR_BASE+0x030)
+#define CSR_GP_UCODE            (CSR_BASE+0x044)
+#define CSR_UCODE_DRV_GP1       (CSR_BASE+0x054)
+#define CSR_UCODE_DRV_GP1_SET   (CSR_BASE+0x058)
+#define CSR_UCODE_DRV_GP1_CLR   (CSR_BASE+0x05c)
+#define CSR_UCODE_DRV_GP2       (CSR_BASE+0x060)
+#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)
+#define CSR_LED_REG             (CSR_BASE+0x094)
+
+/* Analog phase-lock-loop configuration (3945 only)
+ * Set bit 24. */
+#define CSR_ANA_PLL_CFG         (CSR_BASE+0x20c)
+/*
+ * Indicates hardware rev, to determine CCK backoff for txpower calculation.
+ * Bit fields:
+ *  3-2:  0 = A, 1 = B, 2 = C, 3 = D step
+ */
+#define CSR_HW_REV_WA_REG       (CSR_BASE+0x22C)
+
+/* Bits for CSR_HW_IF_CONFIG_REG */
+#define CSR49_HW_IF_CONFIG_REG_BIT_4965_R       (0x00000010)
+#define CSR49_HW_IF_CONFIG_REG_MSK_BOARD_VER    (0x00000C00)
+#define CSR49_HW_IF_CONFIG_REG_BIT_MAC_SI               (0x00000100)
+#define CSR49_HW_IF_CONFIG_REG_BIT_RADIO_SI     (0x00000200)
+
+#define CSR39_HW_IF_CONFIG_REG_BIT_3945_MB         (0x00000100)
+#define CSR39_HW_IF_CONFIG_REG_BIT_3945_MM         (0x00000200)
+#define CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC            (0x00000400)
+#define CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE         (0x00000800)
+#define CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A    (0x00000000)
+#define CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B    (0x00001000)
+
+#define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM     (0x00200000)
+
+/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
+ * acknowledged (reset) by host writing "1" to flagged bits. */
+#define CSR_INT_BIT_FH_RX        (1 << 31) /* Rx DMA, cmd responses, FH_INT[17:16] */
+#define CSR_INT_BIT_HW_ERR       (1 << 29) /* DMA hardware error FH_INT[31] */
+#define CSR_INT_BIT_DNLD         (1 << 28) /* uCode Download */
+#define CSR_INT_BIT_FH_TX        (1 << 27) /* Tx DMA FH_INT[1:0] */
+#define CSR_INT_BIT_SCD          (1 << 26) /* TXQ pointer advanced */
+#define CSR_INT_BIT_SW_ERR       (1 << 25) /* uCode error */
+#define CSR_INT_BIT_RF_KILL      (1 << 7)  /* HW RFKILL switch GP_CNTRL[27] toggled */
+#define CSR_INT_BIT_CT_KILL      (1 << 6)  /* Critical temp (chip too hot) rfkill */
+#define CSR_INT_BIT_SW_RX        (1 << 3)  /* Rx, command responses, 3945 */
+#define CSR_INT_BIT_WAKEUP       (1 << 1)  /* NIC controller waking up (pwr mgmt) */
+#define CSR_INT_BIT_ALIVE        (1 << 0)  /* uCode interrupts once it initializes */
+
+#define CSR_INI_SET_MASK        (CSR_INT_BIT_FH_RX   | \
+                                 CSR_INT_BIT_HW_ERR  | \
+                                 CSR_INT_BIT_FH_TX   | \
+                                 CSR_INT_BIT_SW_ERR  | \
+                                 CSR_INT_BIT_RF_KILL | \
+                                 CSR_INT_BIT_SW_RX   | \
+                                 CSR_INT_BIT_WAKEUP  | \
+                                 CSR_INT_BIT_ALIVE)
+
+/* interrupt flags in FH (flow handler) (PCI busmaster DMA) */
+#define CSR_FH_INT_BIT_ERR       (1 << 31) /* Error */
+#define CSR_FH_INT_BIT_HI_PRIOR  (1 << 30) /* High priority Rx, bypass coalescing */
+#define CSR39_FH_INT_BIT_RX_CHNL2  (1 << 18) /* Rx channel 2 (3945 only) */
+#define CSR_FH_INT_BIT_RX_CHNL1  (1 << 17) /* Rx channel 1 */
+#define CSR_FH_INT_BIT_RX_CHNL0  (1 << 16) /* Rx channel 0 */
+#define CSR39_FH_INT_BIT_TX_CHNL6  (1 << 6)  /* Tx channel 6 (3945 only) */
+#define CSR_FH_INT_BIT_TX_CHNL1  (1 << 1)  /* Tx channel 1 */
+#define CSR_FH_INT_BIT_TX_CHNL0  (1 << 0)  /* Tx channel 0 */
+
+#define CSR39_FH_INT_RX_MASK    (CSR_FH_INT_BIT_HI_PRIOR | \
+                                 CSR39_FH_INT_BIT_RX_CHNL2 | \
+                                 CSR_FH_INT_BIT_RX_CHNL1 | \
+                                 CSR_FH_INT_BIT_RX_CHNL0)
+
+
+#define CSR39_FH_INT_TX_MASK    (CSR39_FH_INT_BIT_TX_CHNL6 | \
+                                 CSR_FH_INT_BIT_TX_CHNL1 | \
+                                 CSR_FH_INT_BIT_TX_CHNL0)
+
+#define CSR49_FH_INT_RX_MASK    (CSR_FH_INT_BIT_HI_PRIOR | \
+                                 CSR_FH_INT_BIT_RX_CHNL1 | \
+                                 CSR_FH_INT_BIT_RX_CHNL0)
+
+#define CSR49_FH_INT_TX_MASK    (CSR_FH_INT_BIT_TX_CHNL1 | \
+                                 CSR_FH_INT_BIT_TX_CHNL0)
+
+
+/* RESET */
+#define CSR_RESET_REG_FLAG_NEVO_RESET                (0x00000001)
+#define CSR_RESET_REG_FLAG_FORCE_NMI                 (0x00000002)
+#define CSR_RESET_REG_FLAG_SW_RESET                  (0x00000080)
+#define CSR_RESET_REG_FLAG_MASTER_DISABLED           (0x00000100)
+#define CSR_RESET_REG_FLAG_STOP_MASTER               (0x00000200)
+
+/* GP (general purpose) CONTROL */
+#define CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY        (0x00000001)
+#define CSR_GP_CNTRL_REG_FLAG_INIT_DONE              (0x00000004)
+#define CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ         (0x00000008)
+#define CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP         (0x00000010)
+
+#define CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN           (0x00000001)
+
+#define CSR_GP_CNTRL_REG_MSK_POWER_SAVE_TYPE         (0x07000000)
+#define CSR_GP_CNTRL_REG_FLAG_MAC_POWER_SAVE         (0x04000000)
+#define CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW          (0x08000000)
+
+
+/* EEPROM REG */
+#define CSR_EEPROM_REG_READ_VALID_MSK   (0x00000001)
+#define CSR_EEPROM_REG_BIT_CMD          (0x00000002)
+
+/* EEPROM GP */
+#define CSR_EEPROM_GP_VALID_MSK         (0x00000006)
+#define CSR_EEPROM_GP_BAD_SIGNATURE     (0x00000000)
+#define CSR_EEPROM_GP_IF_OWNER_MSK      (0x00000180)
+
+/* UCODE DRV GP */
+#define CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP             (0x00000001)
+#define CSR_UCODE_SW_BIT_RFKILL                     (0x00000002)
+#define CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED           (0x00000004)
+#define CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT      (0x00000008)
+
+/* GPIO */
+#define CSR_GPIO_IN_BIT_AUX_POWER                   (0x00000200)
+#define CSR_GPIO_IN_VAL_VAUX_PWR_SRC                (0x00000000)
+#define CSR_GPIO_IN_VAL_VMAIN_PWR_SRC           CSR_GPIO_IN_BIT_AUX_POWER
+
+/* GI Chicken Bits */
+#define CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX  (0x00800000)
+#define CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER  (0x20000000)
+
+/* LED */
+#define CSR_LED_BSM_CTRL_MSK (0xFFFFFFDF)
+#define CSR_LED_REG_TRUN_ON (0x78)
+#define CSR_LED_REG_TRUN_OFF (0x38)
+
+/*=== HBUS (Host-side Bus) ===*/
+#define HBUS_BASE       (0x400)
+/*
+ * Registers for accessing device's internal SRAM memory (e.g. SCD SRAM
+ * structures, error log, event log, verifying uCode load).
+ * First write to address register, then read from or write to data register
+ * to complete the job.  Once the address register is set up, accesses to
+ * data registers auto-increment the address by one dword.
+ * Bit usage for address registers (read or write):
+ *  0-31:  memory address within device
+ */
+#define HBUS_TARG_MEM_RADDR     (HBUS_BASE+0x00c)
+#define HBUS_TARG_MEM_WADDR     (HBUS_BASE+0x010)
+#define HBUS_TARG_MEM_WDAT      (HBUS_BASE+0x018)
+#define HBUS_TARG_MEM_RDAT      (HBUS_BASE+0x01c)
+
+/*
+ * Registers for accessing device's internal peripheral registers
+ * (e.g. SCD, BSM, etc.).  First write to address register,
+ * then read from or write to data register to complete the job.
+ * Bit usage for address registers (read or write):
+ *  0-15:  register address (offset) within device
+ * 24-25:  (# bytes - 1) to read or write (e.g. 3 for dword)
+ */
+#define HBUS_TARG_PRPH_WADDR    (HBUS_BASE+0x044)
+#define HBUS_TARG_PRPH_RADDR    (HBUS_BASE+0x048)
+#define HBUS_TARG_PRPH_WDAT     (HBUS_BASE+0x04c)
+#define HBUS_TARG_PRPH_RDAT     (HBUS_BASE+0x050)
+
+/*
+ * Per-Tx-queue write pointer (index, really!) (3945 and 4965).
+ * Indicates index to next TFD that driver will fill (1 past latest filled).
+ * Bit usage:
+ *  0-7:  queue write index
+ * 11-8:  queue selector
+ */
+#define HBUS_TARG_WRPTR         (HBUS_BASE+0x060)
+#define HBUS_TARG_MBX_C         (HBUS_BASE+0x030)
+
+#define HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED         (0x00000004)
+
+
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index 36696bbf170c..c60724c21db8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
@@ -26,20 +26,49 @@
  *
  *****************************************************************************/
 
-#ifndef __iwl4965_debug_h__
-#define __iwl4965_debug_h__
+#ifndef __iwl_debug_h__
+#define __iwl_debug_h__
 
-#ifdef CONFIG_IWL4965_DEBUG
-extern u32 iwl4965_debug_level;
+#ifdef CONFIG_IWLWIFI_DEBUG
+extern u32 iwl_debug_level;
 #define IWL_DEBUG(level, fmt, args...) \
-do { if (iwl4965_debug_level & (level)) \
+do { if (iwl_debug_level & (level)) \
   printk(KERN_ERR DRV_NAME": %c %s " fmt, \
          in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
 
 #define IWL_DEBUG_LIMIT(level, fmt, args...) \
-do { if ((iwl4965_debug_level & (level)) && net_ratelimit()) \
+do { if ((iwl_debug_level & (level)) && net_ratelimit()) \
   printk(KERN_ERR DRV_NAME": %c %s " fmt, \
          in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
+
+static inline void iwl_print_hex_dump(int level, void *p, u32 len)
+{
+        if (!(iwl_debug_level & level))
+                return;
+
+        print_hex_dump(KERN_DEBUG, "iwl data: ", DUMP_PREFIX_OFFSET, 16, 1,
+                        p, len, 1);
+}
+
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+struct iwl_debugfs {
+        const char *name;
+        struct dentry *dir_drv;
+        struct dentry *dir_data;
+        struct dir_data_files{
+                struct dentry *file_sram;
+                struct dentry *file_stations;
+                struct dentry *file_rx_statistics;
+                struct dentry *file_tx_statistics;
+        } dbgfs_data_files;
+        u32 sram_offset;
+        u32 sram_len;
+};
+
+int iwl_dbgfs_register(struct iwl_priv *priv, const char *name);
+void iwl_dbgfs_unregister(struct iwl_priv *priv);
+#endif
+
 #else
 static inline void IWL_DEBUG(int level, const char *fmt, ...)
 {
@@ -47,7 +76,22 @@ static inline void IWL_DEBUG(int level, const char *fmt, ...)
 static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
 {
 }
-#endif                          /* CONFIG_IWL4965_DEBUG */
+static inline void iwl_print_hex_dump(int level, void *p, u32 len)
+{
+}
+#endif                          /* CONFIG_IWLWIFI_DEBUG */
+
+
+
+#ifndef CONFIG_IWLWIFI_DEBUGFS
+static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
+{
+        return 0;
+}
+static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
+{
+}
+#endif                          /* CONFIG_IWLWIFI_DEBUGFS */
 
 /*
  * To use the debug system;
@@ -68,10 +112,10 @@ static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
  *
  * % cat /proc/net/iwl/debug_level
  *
- * you simply need to add your entry to the iwl4965_debug_levels array.
+ * you simply need to add your entry to the iwl_debug_levels array.
  *
  * If you do not see debug_level in /proc/net/iwl then you do not have
- * CONFIG_IWL4965_DEBUG defined in your kernel configuration
+ * CONFIG_IWLWIFI_DEBUG defined in your kernel configuration
  *
  */
 
@@ -143,6 +187,7 @@ static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
         IWL_DEBUG_LIMIT(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
 #define IWL_DEBUG_HT(f, a...) IWL_DEBUG(IWL_DL_HT, f, ## a)
 #define IWL_DEBUG_STATS(f, a...) IWL_DEBUG(IWL_DL_STATS, f, ## a)
+#define IWL_DEBUG_STATS_LIMIT(f, a...) IWL_DEBUG_LIMIT(IWL_DL_STATS, f, ## a)
 #define IWL_DEBUG_TX_REPLY(f, a...) IWL_DEBUG(IWL_DL_TX_REPLY, f, ## a)
 #define IWL_DEBUG_QOS(f, a...)   IWL_DEBUG(IWL_DL_QOS, f, ## a)
 #define IWL_DEBUG_RADIO(f, a...)  IWL_DEBUG(IWL_DL_RADIO, f, ## a)
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
new file mode 100644
index 000000000000..0f16f2606f29
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -0,0 +1,335 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Tomas Winkler <tomas.winkler@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/debugfs.h>
+
+#include <linux/ieee80211.h>
+#include <net/mac80211.h>
+
+
+#include "iwl-4965.h"
+#include "iwl-debug.h"
+#include "iwl-core.h"
+#include "iwl-io.h"
+
+
+/* create and remove of files */
+#define DEBUGFS_ADD_DIR(name, parent) do {                              \
+        dbgfs->dir_##name = debugfs_create_dir(#name, parent);          \
+        if (!(dbgfs->dir_##name))                                       \
+                goto err;                                               \
+} while (0)
+
+#define DEBUGFS_ADD_FILE(name, parent) do {                             \
+        dbgfs->dbgfs_##parent##_files.file_##name =                     \
+        debugfs_create_file(#name, 0644, dbgfs->dir_##parent, priv,     \
+                                &iwl_dbgfs_##name##_ops);               \
+        if (!(dbgfs->dbgfs_##parent##_files.file_##name))               \
+                goto err;                                               \
+} while (0)
+
+#define DEBUGFS_REMOVE(name)  do {              \
+        debugfs_remove(name);                   \
+        name = NULL;                            \
+} while (0);
+
+/* file operation */
+#define DEBUGFS_READ_FUNC(name)                                         \
+static ssize_t iwl_dbgfs_##name##_read(struct file *file,               \
+                                        char __user *user_buf,          \
+                                        size_t count, loff_t *ppos);
+
+#define DEBUGFS_WRITE_FUNC(name)                                        \
+static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \
+                                        const char __user *user_buf,    \
+                                        size_t count, loff_t *ppos);
+
+
+static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+#define DEBUGFS_READ_FILE_OPS(name)                                     \
+        DEBUGFS_READ_FUNC(name);                                        \
+static const struct file_operations iwl_dbgfs_##name##_ops = {          \
+        .read = iwl_dbgfs_##name##_read,                                \
+        .open = iwl_dbgfs_open_file_generic,                            \
+};
+
+#define DEBUGFS_READ_WRITE_FILE_OPS(name)                               \
+        DEBUGFS_READ_FUNC(name);                                        \
+        DEBUGFS_WRITE_FUNC(name);                                       \
+static const struct file_operations iwl_dbgfs_##name##_ops = {          \
+        .write = iwl_dbgfs_##name##_write,                              \
+        .read = iwl_dbgfs_##name##_read,                                \
+        .open = iwl_dbgfs_open_file_generic,                            \
+};
+
+
+static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,
+                                                char __user *user_buf,
+                                                size_t count, loff_t *ppos) {
+
+        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        char buf[256];
+        int pos = 0;
+        const size_t bufsz = sizeof(buf);
+
+        pos += scnprintf(buf + pos, bufsz - pos, "mgmt: %u\n",
+                                                priv->tx_stats[0].cnt);
+        pos += scnprintf(buf + pos, bufsz - pos, "ctrl: %u\n",
+                                                priv->tx_stats[1].cnt);
+        pos += scnprintf(buf + pos, bufsz - pos, "data: %u\n",
+                                                priv->tx_stats[2].cnt);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t iwl_dbgfs_rx_statistics_read(struct file *file,
+                                                char __user *user_buf,
+                                                size_t count, loff_t *ppos) {
+
+        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        char buf[256];
+        int pos = 0;
+        const size_t bufsz = sizeof(buf);
+
+        pos += scnprintf(buf + pos, bufsz - pos, "mgmt: %u\n",
+                                                priv->rx_stats[0].cnt);
+        pos += scnprintf(buf + pos, bufsz - pos, "ctrl: %u\n",
+                                                priv->rx_stats[1].cnt);
+        pos += scnprintf(buf + pos, bufsz - pos, "data: %u\n",
+                                                priv->rx_stats[2].cnt);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+#define BYTE1_MASK 0x000000ff;
+#define BYTE2_MASK 0x0000ffff;
+#define BYTE3_MASK 0x00ffffff;
+static ssize_t iwl_dbgfs_sram_read(struct file *file,
+                                        char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+        u32 val;
+        char buf[1024];
+        ssize_t ret;
+        int i;
+        int pos = 0;
+        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        const size_t bufsz = sizeof(buf);
+
+        printk(KERN_DEBUG "offset is: 0x%x\tlen is: 0x%x\n",
+        priv->dbgfs->sram_offset, priv->dbgfs->sram_len);
+
+        iwl_grab_nic_access(priv);
+        for (i = priv->dbgfs->sram_len; i > 0; i -= 4) {
+                val = iwl_read_targ_mem(priv, priv->dbgfs->sram_offset + \
+                                        priv->dbgfs->sram_len - i);
+                if (i < 4) {
+                        switch (i) {
+                        case 1:
+                                val &= BYTE1_MASK;
+                                break;
+                        case 2:
+                                val &= BYTE2_MASK;
+                                break;
+                        case 3:
+                                val &= BYTE3_MASK;
+                                break;
+                        }
+                }
+                pos += scnprintf(buf + pos, bufsz - pos, "0x%08x ", val);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+        iwl_release_nic_access(priv);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        return ret;
+}
+
+static ssize_t iwl_dbgfs_sram_write(struct file *file,
+                                        const char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = file->private_data;
+        char buf[64];
+        int buf_size;
+        u32 offset, len;
+
+        memset(buf, 0, sizeof(buf));
+        buf_size = min(count, sizeof(buf) -  1);
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+
+        if (sscanf(buf, "%x,%x", &offset, &len) == 2) {
+                priv->dbgfs->sram_offset = offset;
+                priv->dbgfs->sram_len = len;
+        } else {
+                priv->dbgfs->sram_offset = 0;
+                priv->dbgfs->sram_len = 0;
+        }
+
+        return count;
+}
+
+static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        struct iwl4965_station_entry *station;
+        int max_sta = priv->hw_params.max_stations;
+        char *buf;
+        int i, j, pos = 0;
+        ssize_t ret;
+        /* Add 30 for initial string */
+        const size_t bufsz = 30 + sizeof(char) * 500 * (priv->num_stations);
+        DECLARE_MAC_BUF(mac);
+
+        buf = kmalloc(bufsz, GFP_KERNEL);
+        if(!buf)
+                return -ENOMEM;
+
+        pos += scnprintf(buf + pos, bufsz - pos, "num of stations: %d\n\n",
+                        priv->num_stations);
+
+        for (i = 0; i < max_sta; i++) {
+                station = &priv->stations[i];
+                if (station->used) {
+                        pos += scnprintf(buf + pos, bufsz - pos,
+                                        "station %d:\ngeneral data:\n", i+1);
+                        print_mac(mac, station->sta.sta.addr);
+                        pos += scnprintf(buf + pos, bufsz - pos, "id: %u\n",
+                                        station->sta.sta.sta_id);
+                        pos += scnprintf(buf + pos, bufsz - pos, "mode: %u\n",
+                                        station->sta.mode);
+                        pos += scnprintf(buf + pos, bufsz - pos,
+                                        "flags: 0x%x\n",
+                                        station->sta.station_flags_msk);
+                        pos += scnprintf(buf + pos, bufsz - pos,
+                                        "ps_status: %u\n", station->ps_status);
+                        pos += scnprintf(buf + pos, bufsz - pos, "tid data:\n");
+                        pos += scnprintf(buf + pos, bufsz - pos,
+                                        "seq_num\t\ttxq_id\t");
+                        pos += scnprintf(buf + pos, bufsz - pos,
+                                        "frame_count\twait_for_ba\t");
+                        pos += scnprintf(buf + pos, bufsz - pos,
+                                        "start_idx\tbitmap0\t");
+                        pos += scnprintf(buf + pos, bufsz - pos,
+                                        "bitmap1\trate_n_flags\n");
+
+                        for (j = 0; j < MAX_TID_COUNT; j++) {
+                                pos += scnprintf(buf + pos, bufsz - pos,
+                                                "[%d]:\t\t%u\t", j,
+                                                station->tid[j].seq_number);
+                                pos += scnprintf(buf + pos, bufsz - pos,
+                                                "%u\t\t%u\t\t%u\t\t",
+                                                station->tid[j].agg.txq_id,
+                                                station->tid[j].agg.frame_count,
+                                                station->tid[j].agg.wait_for_ba);
+                                pos += scnprintf(buf + pos, bufsz - pos,
+                                                "%u\t%llu\t%u\n",
+                                                station->tid[j].agg.start_idx,
+                                                (unsigned long long)station->tid[j].agg.bitmap,
+                                                station->tid[j].agg.rate_n_flags);
+                        }
+                        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+                }
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+
+DEBUGFS_READ_WRITE_FILE_OPS(sram);
+DEBUGFS_READ_FILE_OPS(stations);
+DEBUGFS_READ_FILE_OPS(rx_statistics);
+DEBUGFS_READ_FILE_OPS(tx_statistics);
+
+/*
+ * Create the debugfs files and directories
+ *
+ */
+int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
+{
+        struct iwl_debugfs *dbgfs;
+
+        dbgfs = kzalloc(sizeof(struct iwl_debugfs), GFP_KERNEL);
+        if (!dbgfs) {
+                goto err;
+        }
+
+        priv->dbgfs = dbgfs;
+        dbgfs->name = name;
+        dbgfs->dir_drv = debugfs_create_dir(name, NULL);
+        if (!dbgfs->dir_drv || IS_ERR(dbgfs->dir_drv)){
+                goto err;
+        }
+
+        DEBUGFS_ADD_DIR(data, dbgfs->dir_drv);
+        DEBUGFS_ADD_FILE(sram, data);
+        DEBUGFS_ADD_FILE(stations, data);
+        DEBUGFS_ADD_FILE(rx_statistics, data);
+        DEBUGFS_ADD_FILE(tx_statistics, data);
+
+        return 0;
+
+err:
+        IWL_ERROR("Can't open the debugfs directory\n");
+        iwl_dbgfs_unregister(priv);
+        return -ENOENT;
+}
+EXPORT_SYMBOL(iwl_dbgfs_register);
+
+/**
+ * Remove the debugfs files and directories
+ *
+ */
+void iwl_dbgfs_unregister(struct iwl_priv *priv)
+{
+        if (!(priv->dbgfs))
+                return;
+
+        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_rx_statistics);
+        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_tx_statistics);
+        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_sram);
+        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_stations);
+        DEBUGFS_REMOVE(priv->dbgfs->dir_data);
+        DEBUGFS_REMOVE(priv->dbgfs->dir_drv);
+        kfree(priv->dbgfs);
+        priv->dbgfs = NULL;
+}
+EXPORT_SYMBOL(iwl_dbgfs_unregister);
+
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
new file mode 100644
index 000000000000..a07d5dcb7abc
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -0,0 +1,561 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Tomas Winkler <tomas.winkler@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+
+#include <net/mac80211.h>
+
+#include "iwl-4965-commands.h"
+#include "iwl-4965.h"
+#include "iwl-core.h"
+#include "iwl-debug.h"
+#include "iwl-eeprom.h"
+#include "iwl-io.h"
+
+/************************** EEPROM BANDS ****************************
+ *
+ * The iwl_eeprom_band definitions below provide the mapping from the
+ * EEPROM contents to the specific channel number supported for each
+ * band.
+ *
+ * For example, iwl_priv->eeprom.band_3_channels[4] from the band_3
+ * definition below maps to physical channel 42 in the 5.2GHz spectrum.
+ * The specific geography and calibration information for that channel
+ * is contained in the eeprom map itself.
+ *
+ * During init, we copy the eeprom information and channel map
+ * information into priv->channel_info_24/52 and priv->channel_map_24/52
+ *
+ * channel_map_24/52 provides the index in the channel_info array for a
+ * given channel.  We have to have two separate maps as there is channel
+ * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and
+ * band_2
+ *
+ * A value of 0xff stored in the channel_map indicates that the channel
+ * is not supported by the hardware at all.
+ *
+ * A value of 0xfe in the channel_map indicates that the channel is not
+ * valid for Tx with the current hardware.  This means that
+ * while the system can tune and receive on a given channel, it may not
+ * be able to associate or transmit any frames on that
+ * channel.  There is no corresponding channel information for that
+ * entry.
+ *
+ *********************************************************************/
+
+/* 2.4 GHz */
+const u8 iwl_eeprom_band_1[14] = {
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+};
+
+/* 5.2 GHz bands */
+static const u8 iwl_eeprom_band_2[] = { /* 4915-5080MHz */
+        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
+};
+
+static const u8 iwl_eeprom_band_3[] = { /* 5170-5320MHz */
+        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
+};
+
+static const u8 iwl_eeprom_band_4[] = { /* 5500-5700MHz */
+        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
+};
+
+static const u8 iwl_eeprom_band_5[] = { /* 5725-5825MHz */
+        145, 149, 153, 157, 161, 165
+};
+
+static const u8 iwl_eeprom_band_6[] = {       /* 2.4 FAT channel */
+        1, 2, 3, 4, 5, 6, 7
+};
+
+static const u8 iwl_eeprom_band_7[] = {       /* 5.2 FAT channel */
+        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
+};
+
+/******************************************************************************
+ *
+ * EEPROM related functions
+ *
+******************************************************************************/
+
+int iwlcore_eeprom_verify_signature(struct iwl_priv *priv)
+{
+        u32 gp = iwl_read32(priv, CSR_EEPROM_GP);
+        if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
+                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp);
+                return -ENOENT;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(iwlcore_eeprom_verify_signature);
+
+/*
+ * The device's EEPROM semaphore prevents conflicts between driver and uCode
+ * when accessing the EEPROM; each access is a series of pulses to/from the
+ * EEPROM chip, not a single event, so even reads could conflict if they
+ * weren't arbitrated by the semaphore.
+ */
+int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv)
+{
+        u16 count;
+        int ret;
+
+        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
+                /* Request semaphore */
+                iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
+                            CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+
+                /* See if we got it */
+                ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,
+                                   CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
+                                   CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
+                                   EEPROM_SEM_TIMEOUT);
+                if (ret >= 0) {
+                        IWL_DEBUG_IO("Acquired semaphore after %d tries.\n",
+                                count+1);
+                        return ret;
+                }
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL(iwlcore_eeprom_acquire_semaphore);
+
+void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv)
+{
+        iwl_clear_bit(priv, CSR_HW_IF_CONFIG_REG,
+                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+
+}
+EXPORT_SYMBOL(iwlcore_eeprom_release_semaphore);
+
+
+/**
+ * iwl_eeprom_init - read EEPROM contents
+ *
+ * Load the EEPROM contents from adapter into priv->eeprom
+ *
+ * NOTE:  This routine uses the non-debug IO access functions.
+ */
+int iwl_eeprom_init(struct iwl_priv *priv)
+{
+        u16 *e = (u16 *)&priv->eeprom;
+        u32 gp = iwl_read32(priv, CSR_EEPROM_GP);
+        u32 r;
+        int sz = sizeof(priv->eeprom);
+        int ret;
+        int i;
+        u16 addr;
+
+        /* The EEPROM structure has several padding buffers within it
+         * and when adding new EEPROM maps is subject to programmer errors
+         * which may be very difficult to identify without explicitly
+         * checking the resulting size of the eeprom map. */
+        BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE);
+
+        if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
+                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp);
+                return -ENOENT;
+        }
+
+        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
+        ret = priv->cfg->ops->lib->eeprom_ops.acquire_semaphore(priv);
+        if (ret < 0) {
+                IWL_ERROR("Failed to acquire EEPROM semaphore.\n");
+                return -ENOENT;
+        }
+
+        /* eeprom is an array of 16bit values */
+        for (addr = 0; addr < sz; addr += sizeof(u16)) {
+                _iwl_write32(priv, CSR_EEPROM_REG, addr << 1);
+                _iwl_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);
+
+                for (i = 0; i < IWL_EEPROM_ACCESS_TIMEOUT;
+                                        i += IWL_EEPROM_ACCESS_DELAY) {
+                        r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
+                        if (r & CSR_EEPROM_REG_READ_VALID_MSK)
+                                break;
+                        udelay(IWL_EEPROM_ACCESS_DELAY);
+                }
+
+                if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {
+                        IWL_ERROR("Time out reading EEPROM[%d]", addr);
+                        ret = -ETIMEDOUT;
+                        goto done;
+                }
+                e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
+        }
+        ret = 0;
+
+done:
+        priv->cfg->ops->lib->eeprom_ops.release_semaphore(priv);
+        return ret;
+}
+EXPORT_SYMBOL(iwl_eeprom_init);
+
+
+void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)
+{
+        memcpy(mac, priv->eeprom.mac_address, 6);
+}
+EXPORT_SYMBOL(iwl_eeprom_get_mac);
+
+static void iwl_init_band_reference(const struct iwl_priv *priv,
+                                    int band,
+                                    int *eeprom_ch_count,
+                                    const struct iwl4965_eeprom_channel
+                                    **eeprom_ch_info,
+                                    const u8 **eeprom_ch_index)
+{
+        switch (band) {
+        case 1:         /* 2.4GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);
+                *eeprom_ch_info = priv->eeprom.band_1_channels;
+                *eeprom_ch_index = iwl_eeprom_band_1;
+                break;
+        case 2:         /* 4.9GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_2);
+                *eeprom_ch_info = priv->eeprom.band_2_channels;
+                *eeprom_ch_index = iwl_eeprom_band_2;
+                break;
+        case 3:         /* 5.2GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_3);
+                *eeprom_ch_info = priv->eeprom.band_3_channels;
+                *eeprom_ch_index = iwl_eeprom_band_3;
+                break;
+        case 4:         /* 5.5GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_4);
+                *eeprom_ch_info = priv->eeprom.band_4_channels;
+                *eeprom_ch_index = iwl_eeprom_band_4;
+                break;
+        case 5:         /* 5.7GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_5);
+                *eeprom_ch_info = priv->eeprom.band_5_channels;
+                *eeprom_ch_index = iwl_eeprom_band_5;
+                break;
+        case 6:         /* 2.4GHz FAT channels */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);
+                *eeprom_ch_info = priv->eeprom.band_24_channels;
+                *eeprom_ch_index = iwl_eeprom_band_6;
+                break;
+        case 7:         /* 5 GHz FAT channels */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);
+                *eeprom_ch_info = priv->eeprom.band_52_channels;
+                *eeprom_ch_index = iwl_eeprom_band_7;
+                break;
+        default:
+                BUG();
+                return;
+        }
+}
+
+#define CHECK_AND_PRINT(x) ((eeprom_ch->flags & EEPROM_CHANNEL_##x) \
+                            ? # x " " : "")
+
+/**
+ * iwl4965_set_fat_chan_info - Copy fat channel info into driver's priv.
+ *
+ * Does not set up a command, or touch hardware.
+ */
+static int iwl4965_set_fat_chan_info(struct iwl_priv *priv,
+                              enum ieee80211_band band, u16 channel,
+                              const struct iwl4965_eeprom_channel *eeprom_ch,
+                              u8 fat_extension_channel)
+{
+        struct iwl_channel_info *ch_info;
+
+        ch_info = (struct iwl_channel_info *)
+                        iwl_get_channel_info(priv, band, channel);
+
+        if (!is_channel_valid(ch_info))
+                return -1;
+
+        IWL_DEBUG_INFO("FAT Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x"
+                        " %ddBm): Ad-Hoc %ssupported\n",
+                        ch_info->channel,
+                        is_channel_a_band(ch_info) ?
+                        "5.2" : "2.4",
+                        CHECK_AND_PRINT(IBSS),
+                        CHECK_AND_PRINT(ACTIVE),
+                        CHECK_AND_PRINT(RADAR),
+                        CHECK_AND_PRINT(WIDE),
+                        CHECK_AND_PRINT(NARROW),
+                        CHECK_AND_PRINT(DFS),
+                        eeprom_ch->flags,
+                        eeprom_ch->max_power_avg,
+                        ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS)
+                         && !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ?
+                        "" : "not ");
+
+        ch_info->fat_eeprom = *eeprom_ch;
+        ch_info->fat_max_power_avg = eeprom_ch->max_power_avg;
+        ch_info->fat_curr_txpow = eeprom_ch->max_power_avg;
+        ch_info->fat_min_power = 0;
+        ch_info->fat_scan_power = eeprom_ch->max_power_avg;
+        ch_info->fat_flags = eeprom_ch->flags;
+        ch_info->fat_extension_channel = fat_extension_channel;
+
+        return 0;
+}
+
+#define CHECK_AND_PRINT_I(x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \
+                            ? # x " " : "")
+
+/**
+ * iwl_init_channel_map - Set up driver's info for all possible channels
+ */
+int iwl_init_channel_map(struct iwl_priv *priv)
+{
+        int eeprom_ch_count = 0;
+        const u8 *eeprom_ch_index = NULL;
+        const struct iwl4965_eeprom_channel *eeprom_ch_info = NULL;
+        int band, ch;
+        struct iwl_channel_info *ch_info;
+
+        if (priv->channel_count) {
+                IWL_DEBUG_INFO("Channel map already initialized.\n");
+                return 0;
+        }
+
+        if (priv->eeprom.version < 0x2f) {
+                IWL_WARNING("Unsupported EEPROM version: 0x%04X\n",
+                            priv->eeprom.version);
+                return -EINVAL;
+        }
+
+        IWL_DEBUG_INFO("Initializing regulatory info from EEPROM\n");
+
+        priv->channel_count =
+            ARRAY_SIZE(iwl_eeprom_band_1) +
+            ARRAY_SIZE(iwl_eeprom_band_2) +
+            ARRAY_SIZE(iwl_eeprom_band_3) +
+            ARRAY_SIZE(iwl_eeprom_band_4) +
+            ARRAY_SIZE(iwl_eeprom_band_5);
+
+        IWL_DEBUG_INFO("Parsing data for %d channels.\n", priv->channel_count);
+
+        priv->channel_info = kzalloc(sizeof(struct iwl_channel_info) *
+                                     priv->channel_count, GFP_KERNEL);
+        if (!priv->channel_info) {
+                IWL_ERROR("Could not allocate channel_info\n");
+                priv->channel_count = 0;
+                return -ENOMEM;
+        }
+
+        ch_info = priv->channel_info;
+
+        /* Loop through the 5 EEPROM bands adding them in order to the
+         * channel map we maintain (that contains additional information than
+         * what just in the EEPROM) */
+        for (band = 1; band <= 5; band++) {
+
+                iwl_init_band_reference(priv, band, &eeprom_ch_count,
+                                        &eeprom_ch_info, &eeprom_ch_index);
+
+                /* Loop through each band adding each of the channels */
+                for (ch = 0; ch < eeprom_ch_count; ch++) {
+                        ch_info->channel = eeprom_ch_index[ch];
+                        ch_info->band = (band == 1) ? IEEE80211_BAND_2GHZ :
+                            IEEE80211_BAND_5GHZ;
+
+                        /* permanently store EEPROM's channel regulatory flags
+                         *   and max power in channel info database. */
+                        ch_info->eeprom = eeprom_ch_info[ch];
+
+                        /* Copy the run-time flags so they are there even on
+                         * invalid channels */
+                        ch_info->flags = eeprom_ch_info[ch].flags;
+
+                        if (!(is_channel_valid(ch_info))) {
+                                IWL_DEBUG_INFO("Ch. %d Flags %x [%sGHz] - "
+                                               "No traffic\n",
+                                               ch_info->channel,
+                                               ch_info->flags,
+                                               is_channel_a_band(ch_info) ?
+                                               "5.2" : "2.4");
+                                ch_info++;
+                                continue;
+                        }
+
+                        /* Initialize regulatory-based run-time data */
+                        ch_info->max_power_avg = ch_info->curr_txpow =
+                            eeprom_ch_info[ch].max_power_avg;
+                        ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;
+                        ch_info->min_power = 0;
+
+                        IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s%s(0x%02x"
+                                       " %ddBm): Ad-Hoc %ssupported\n",
+                                       ch_info->channel,
+                                       is_channel_a_band(ch_info) ?
+                                       "5.2" : "2.4",
+                                       CHECK_AND_PRINT_I(VALID),
+                                       CHECK_AND_PRINT_I(IBSS),
+                                       CHECK_AND_PRINT_I(ACTIVE),
+                                       CHECK_AND_PRINT_I(RADAR),
+                                       CHECK_AND_PRINT_I(WIDE),
+                                       CHECK_AND_PRINT_I(NARROW),
+                                       CHECK_AND_PRINT_I(DFS),
+                                       eeprom_ch_info[ch].flags,
+                                       eeprom_ch_info[ch].max_power_avg,
+                                       ((eeprom_ch_info[ch].
+                                         flags & EEPROM_CHANNEL_IBSS)
+                                        && !(eeprom_ch_info[ch].
+                                             flags & EEPROM_CHANNEL_RADAR))
+                                       ? "" : "not ");
+
+                        /* Set the user_txpower_limit to the highest power
+                         * supported by any channel */
+                        if (eeprom_ch_info[ch].max_power_avg >
+                            priv->user_txpower_limit)
+                                priv->user_txpower_limit =
+                                    eeprom_ch_info[ch].max_power_avg;
+
+                        ch_info++;
+                }
+        }
+
+        /* Two additional EEPROM bands for 2.4 and 5 GHz FAT channels */
+        for (band = 6; band <= 7; band++) {
+                enum ieee80211_band ieeeband;
+                u8 fat_extension_chan;
+
+                iwl_init_band_reference(priv, band, &eeprom_ch_count,
+                                        &eeprom_ch_info, &eeprom_ch_index);
+
+                /* EEPROM band 6 is 2.4, band 7 is 5 GHz */
+                ieeeband =
+                        (band == 6) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+
+                /* Loop through each band adding each of the channels */
+                for (ch = 0; ch < eeprom_ch_count; ch++) {
+
+                        if ((band == 6) &&
+                            ((eeprom_ch_index[ch] == 5) ||
+                            (eeprom_ch_index[ch] == 6) ||
+                            (eeprom_ch_index[ch] == 7)))
+                               fat_extension_chan = HT_IE_EXT_CHANNEL_MAX;
+                        else
+                                fat_extension_chan = HT_IE_EXT_CHANNEL_ABOVE;
+
+                        /* Set up driver's info for lower half */
+                        iwl4965_set_fat_chan_info(priv, ieeeband,
+                                                  eeprom_ch_index[ch],
+                                                  &(eeprom_ch_info[ch]),
+                                                  fat_extension_chan);
+
+                        /* Set up driver's info for upper half */
+                        iwl4965_set_fat_chan_info(priv, ieeeband,
+                                                  (eeprom_ch_index[ch] + 4),
+                                                  &(eeprom_ch_info[ch]),
+                                                  HT_IE_EXT_CHANNEL_BELOW);
+                }
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(iwl_init_channel_map);
+
+/*
+ * iwl_free_channel_map - undo allocations in iwl4965_init_channel_map
+ */
+void iwl_free_channel_map(struct iwl_priv *priv)
+{
+        kfree(priv->channel_info);
+        priv->channel_count = 0;
+}
+EXPORT_SYMBOL(iwl_free_channel_map);
+
+/**
+ * iwl_get_channel_info - Find driver's private channel info
+ *
+ * Based on band and channel number.
+ */
+const struct iwl_channel_info *iwl_get_channel_info(
+                const struct iwl_priv *priv,
+                enum ieee80211_band band, u16 channel)
+{
+        int i;
+
+        switch (band) {
+        case IEEE80211_BAND_5GHZ:
+                for (i = 14; i < priv->channel_count; i++) {
+                        if (priv->channel_info[i].channel == channel)
+                                return &priv->channel_info[i];
+                }
+                break;
+        case IEEE80211_BAND_2GHZ:
+                if (channel >= 1 && channel <= 14)
+                        return &priv->channel_info[channel - 1];
+                break;
+        default:
+                BUG();
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL(iwl_get_channel_info);
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
new file mode 100644
index 000000000000..bd0a042ca77f
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -0,0 +1,375 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Tomas Winkler <tomas.winkler@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#ifndef __iwl_eeprom_h__
+#define __iwl_eeprom_h__
+
+struct iwl_priv;
+
+/*
+ * EEPROM access time values:
+ *
+ * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG,
+ *   then clearing (with subsequent read/modify/write) CSR_EEPROM_REG bit
+ *   CSR_EEPROM_REG_BIT_CMD (0x2).
+ * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).
+ * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.
+ * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.
+ */
+#define IWL_EEPROM_ACCESS_TIMEOUT       5000 /* uSec */
+#define IWL_EEPROM_ACCESS_DELAY         10   /* uSec */
+
+#define IWL_EEPROM_SEM_TIMEOUT          10   /* milliseconds */
+#define IWL_EEPROM_SEM_RETRY_LIMIT      1000 /* number of attempts (not time) */
+
+
+/*
+ * Regulatory channel usage flags in EEPROM struct iwl4965_eeprom_channel.flags.
+ *
+ * IBSS and/or AP operation is allowed *only* on those channels with
+ * (VALID && IBSS && ACTIVE && !RADAR).  This restriction is in place because
+ * RADAR detection is not supported by the 4965 driver, but is a
+ * requirement for establishing a new network for legal operation on channels
+ * requiring RADAR detection or restricting ACTIVE scanning.
+ *
+ * NOTE:  "WIDE" flag does not indicate anything about "FAT" 40 MHz channels.
+ *        It only indicates that 20 MHz channel use is supported; FAT channel
+ *        usage is indicated by a separate set of regulatory flags for each
+ *        FAT channel pair.
+ *
+ * NOTE:  Using a channel inappropriately will result in a uCode error!
+ */
+#define IWL_NUM_TX_CALIB_GROUPS 5
+enum {
+        EEPROM_CHANNEL_VALID = (1 << 0),        /* usable for this SKU/geo */
+        EEPROM_CHANNEL_IBSS = (1 << 1),         /* usable as an IBSS channel */
+        /* Bit 2 Reserved */
+        EEPROM_CHANNEL_ACTIVE = (1 << 3),       /* active scanning allowed */
+        EEPROM_CHANNEL_RADAR = (1 << 4),        /* radar detection required */
+        EEPROM_CHANNEL_WIDE = (1 << 5),         /* 20 MHz channel okay */
+        EEPROM_CHANNEL_NARROW = (1 << 6),       /* 10 MHz channel (not used) */
+        EEPROM_CHANNEL_DFS = (1 << 7),  /* dynamic freq selection candidate */
+};
+
+/* SKU Capabilities */
+#define EEPROM_SKU_CAP_SW_RF_KILL_ENABLE                (1 << 0)
+#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE                (1 << 1)
+
+/* *regulatory* channel data format in eeprom, one for each channel.
+ * There are separate entries for FAT (40 MHz) vs. normal (20 MHz) channels. */
+struct iwl4965_eeprom_channel {
+        u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
+        s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
+} __attribute__ ((packed));
+
+/* 4965 has two radio transmitters (and 3 radio receivers) */
+#define EEPROM_TX_POWER_TX_CHAINS      (2)
+
+/* 4965 has room for up to 8 sets of txpower calibration data */
+#define EEPROM_TX_POWER_BANDS          (8)
+
+/* 4965 factory calibration measures txpower gain settings for
+ * each of 3 target output levels */
+#define EEPROM_TX_POWER_MEASUREMENTS   (3)
+
+#define EEPROM_4965_TX_POWER_VERSION        (2)
+
+/* 4965 driver does not work with txpower calibration version < 5.
+ * Look for this in calib_version member of struct iwl4965_eeprom. */
+#define EEPROM_TX_POWER_VERSION_NEW    (5)
+
+/* 2.4 GHz */
+extern const u8 iwl_eeprom_band_1[14];
+
+/*
+ * 4965 factory calibration data for one txpower level, on one channel,
+ * measured on one of the 2 tx chains (radio transmitter and associated
+ * antenna).  EEPROM contains:
+ *
+ * 1)  Temperature (degrees Celsius) of device when measurement was made.
+ *
+ * 2)  Gain table index used to achieve the target measurement power.
+ *     This refers to the "well-known" gain tables (see iwl-4965-hw.h).
+ *
+ * 3)  Actual measured output power, in half-dBm ("34" = 17 dBm).
+ *
+ * 4)  RF power amplifier detector level measurement (not used).
+ */
+struct iwl4965_eeprom_calib_measure {
+        u8 temperature;         /* Device temperature (Celsius) */
+        u8 gain_idx;            /* Index into gain table */
+        u8 actual_pow;          /* Measured RF output power, half-dBm */
+        s8 pa_det;              /* Power amp detector level (not used) */
+} __attribute__ ((packed));
+
+
+/*
+ * 4965 measurement set for one channel.  EEPROM contains:
+ *
+ * 1)  Channel number measured
+ *
+ * 2)  Measurements for each of 3 power levels for each of 2 radio transmitters
+ *     (a.k.a. "tx chains") (6 measurements altogether)
+ */
+struct iwl4965_eeprom_calib_ch_info {
+        u8 ch_num;
+        struct iwl4965_eeprom_calib_measure
+                measurements[EEPROM_TX_POWER_TX_CHAINS]
+                        [EEPROM_TX_POWER_MEASUREMENTS];
+} __attribute__ ((packed));
+
+/*
+ * 4965 txpower subband info.
+ *
+ * For each frequency subband, EEPROM contains the following:
+ *
+ * 1)  First and last channels within range of the subband.  "0" values
+ *     indicate that this sample set is not being used.
+ *
+ * 2)  Sample measurement sets for 2 channels close to the range endpoints.
+ */
+struct iwl4965_eeprom_calib_subband_info {
+        u8 ch_from;     /* channel number of lowest channel in subband */
+        u8 ch_to;       /* channel number of highest channel in subband */
+        struct iwl4965_eeprom_calib_ch_info ch1;
+        struct iwl4965_eeprom_calib_ch_info ch2;
+} __attribute__ ((packed));
+
+
+/*
+ * 4965 txpower calibration info.  EEPROM contains:
+ *
+ * 1)  Factory-measured saturation power levels (maximum levels at which
+ *     tx power amplifier can output a signal without too much distortion).
+ *     There is one level for 2.4 GHz band and one for 5 GHz band.  These
+ *     values apply to all channels within each of the bands.
+ *
+ * 2)  Factory-measured power supply voltage level.  This is assumed to be
+ *     constant (i.e. same value applies to all channels/bands) while the
+ *     factory measurements are being made.
+ *
+ * 3)  Up to 8 sets of factory-measured txpower calibration values.
+ *     These are for different frequency ranges, since txpower gain
+ *     characteristics of the analog radio circuitry vary with frequency.
+ *
+ *     Not all sets need to be filled with data;
+ *     struct iwl4965_eeprom_calib_subband_info contains range of channels
+ *     (0 if unused) for each set of data.
+ */
+struct iwl4965_eeprom_calib_info {
+        u8 saturation_power24;  /* half-dBm (e.g. "34" = 17 dBm) */
+        u8 saturation_power52;  /* half-dBm */
+        s16 voltage;            /* signed */
+        struct iwl4965_eeprom_calib_subband_info
+                band_info[EEPROM_TX_POWER_BANDS];
+} __attribute__ ((packed));
+
+
+
+/*
+ * 4965 EEPROM map
+ */
+struct iwl4965_eeprom {
+        u8 reserved0[16];
+        u16 device_id;          /* abs.ofs: 16 */
+        u8 reserved1[2];
+        u16 pmc;                /* abs.ofs: 20 */
+        u8 reserved2[20];
+        u8 mac_address[6];      /* abs.ofs: 42 */
+        u8 reserved3[58];
+        u16 board_revision;     /* abs.ofs: 106 */
+        u8 reserved4[11];
+        u8 board_pba_number[9]; /* abs.ofs: 119 */
+        u8 reserved5[8];
+        u16 version;            /* abs.ofs: 136 */
+        u8 sku_cap;             /* abs.ofs: 138 */
+        u8 leds_mode;           /* abs.ofs: 139 */
+        u16 oem_mode;
+        u16 wowlan_mode;        /* abs.ofs: 142 */
+        u16 leds_time_interval; /* abs.ofs: 144 */
+        u8 leds_off_time;       /* abs.ofs: 146 */
+        u8 leds_on_time;        /* abs.ofs: 147 */
+        u8 almgor_m_version;    /* abs.ofs: 148 */
+        u8 antenna_switch_type; /* abs.ofs: 149 */
+        u8 reserved6[8];
+        u16 board_revision_4965;        /* abs.ofs: 158 */
+        u8 reserved7[13];
+        u8 board_pba_number_4965[9];    /* abs.ofs: 173 */
+        u8 reserved8[10];
+        u8 sku_id[4];           /* abs.ofs: 192 */
+
+/*
+ * Per-channel regulatory data.
+ *
+ * Each channel that *might* be supported by 3945 or 4965 has a fixed location
+ * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory
+ * txpower (MSB).
+ *
+ * Entries immediately below are for 20 MHz channel width.  FAT (40 MHz)
+ * channels (only for 4965, not supported by 3945) appear later in the EEPROM.
+ *
+ * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+ */
+        u16 band_1_count;       /* abs.ofs: 196 */
+        struct iwl4965_eeprom_channel band_1_channels[14]; /* abs.ofs: 196 */
+
+/*
+ * 4.9 GHz channels 183, 184, 185, 187, 188, 189, 192, 196,
+ * 5.0 GHz channels 7, 8, 11, 12, 16
+ * (4915-5080MHz) (none of these is ever supported)
+ */
+        u16 band_2_count;       /* abs.ofs: 226 */
+        struct iwl4965_eeprom_channel band_2_channels[13]; /* abs.ofs: 228 */
+
+/*
+ * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
+ * (5170-5320MHz)
+ */
+        u16 band_3_count;       /* abs.ofs: 254 */
+        struct iwl4965_eeprom_channel band_3_channels[12]; /* abs.ofs: 256 */
+
+/*
+ * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
+ * (5500-5700MHz)
+ */
+        u16 band_4_count;       /* abs.ofs: 280 */
+        struct iwl4965_eeprom_channel band_4_channels[11]; /* abs.ofs: 282 */
+
+/*
+ * 5.7 GHz channels 145, 149, 153, 157, 161, 165
+ * (5725-5825MHz)
+ */
+        u16 band_5_count;       /* abs.ofs: 304 */
+        struct iwl4965_eeprom_channel band_5_channels[6]; /* abs.ofs: 306 */
+
+        u8 reserved10[2];
+
+
+/*
+ * 2.4 GHz FAT channels 1 (5), 2 (6), 3 (7), 4 (8), 5 (9), 6 (10), 7 (11)
+ *
+ * The channel listed is the center of the lower 20 MHz half of the channel.
+ * The overall center frequency is actually 2 channels (10 MHz) above that,
+ * and the upper half of each FAT channel is centered 4 channels (20 MHz) away
+ * from the lower half; e.g. the upper half of FAT channel 1 is channel 5,
+ * and the overall FAT channel width centers on channel 3.
+ *
+ * NOTE:  The RXON command uses 20 MHz channel numbers to specify the
+ *        control channel to which to tune.  RXON also specifies whether the
+ *        control channel is the upper or lower half of a FAT channel.
+ *
+ * NOTE:  4965 does not support FAT channels on 2.4 GHz.
+ */
+        struct iwl4965_eeprom_channel band_24_channels[7]; /* abs.ofs: 320 */
+        u8 reserved11[2];
+
+/*
+ * 5.2 GHz FAT channels 36 (40), 44 (48), 52 (56), 60 (64),
+ * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161)
+ */
+        struct iwl4965_eeprom_channel band_52_channels[11]; /* abs.ofs: 336 */
+        u8 reserved12[6];
+
+/*
+ * 4965 driver requires txpower calibration format version 5 or greater.
+ * Driver does not work with txpower calibration version < 5.
+ * This value is simply a 16-bit number, no major/minor versions here.
+ */
+        u16 calib_version;      /* abs.ofs: 364 */
+        u8 reserved13[2];
+        u8 reserved14[96];      /* abs.ofs: 368 */
+
+/*
+ * 4965 Txpower calibration data.
+ */
+        struct iwl4965_eeprom_calib_info calib_info;    /* abs.ofs: 464 */
+
+        u8 reserved16[140];     /* fill out to full 1024 byte block */
+
+
+} __attribute__ ((packed));
+
+#define IWL_EEPROM_IMAGE_SIZE 1024
+
+/* End of EEPROM */
+
+struct iwl_eeprom_ops {
+        int (*verify_signature) (struct iwl_priv *priv);
+        int (*acquire_semaphore) (struct iwl_priv *priv);
+        void (*release_semaphore) (struct iwl_priv *priv);
+};
+
+
+void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);
+int iwl_eeprom_init(struct iwl_priv *priv);
+
+int iwlcore_eeprom_verify_signature(struct iwl_priv *priv);
+int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv);
+void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv);
+
+int iwl_init_channel_map(struct iwl_priv *priv);
+void iwl_free_channel_map(struct iwl_priv *priv);
+const struct iwl_channel_info *iwl_get_channel_info(
+                const struct iwl_priv *priv,
+                enum ieee80211_band band, u16 channel);
+
+#endif  /* __iwl_eeprom_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
new file mode 100644
index 000000000000..fdb27f1cdc08
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -0,0 +1,278 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Tomas Winkler <tomas.winkler@intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <net/mac80211.h>
+
+#include "iwl-4965.h" /* FIXME: remove */
+#include "iwl-debug.h"
+#include "iwl-eeprom.h"
+#include "iwl-core.h"
+
+
+#define IWL_CMD(x) case x : return #x
+
+const char *get_cmd_string(u8 cmd)
+{
+        switch (cmd) {
+                IWL_CMD(REPLY_ALIVE);
+                IWL_CMD(REPLY_ERROR);
+                IWL_CMD(REPLY_RXON);
+                IWL_CMD(REPLY_RXON_ASSOC);
+                IWL_CMD(REPLY_QOS_PARAM);
+                IWL_CMD(REPLY_RXON_TIMING);
+                IWL_CMD(REPLY_ADD_STA);
+                IWL_CMD(REPLY_REMOVE_STA);
+                IWL_CMD(REPLY_REMOVE_ALL_STA);
+                IWL_CMD(REPLY_WEPKEY);
+                IWL_CMD(REPLY_TX);
+                IWL_CMD(REPLY_RATE_SCALE);
+                IWL_CMD(REPLY_LEDS_CMD);
+                IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);
+                IWL_CMD(RADAR_NOTIFICATION);
+                IWL_CMD(REPLY_QUIET_CMD);
+                IWL_CMD(REPLY_CHANNEL_SWITCH);
+                IWL_CMD(CHANNEL_SWITCH_NOTIFICATION);
+                IWL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);
+                IWL_CMD(SPECTRUM_MEASURE_NOTIFICATION);
+                IWL_CMD(POWER_TABLE_CMD);
+                IWL_CMD(PM_SLEEP_NOTIFICATION);
+                IWL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);
+                IWL_CMD(REPLY_SCAN_CMD);
+                IWL_CMD(REPLY_SCAN_ABORT_CMD);
+                IWL_CMD(SCAN_START_NOTIFICATION);
+                IWL_CMD(SCAN_RESULTS_NOTIFICATION);
+                IWL_CMD(SCAN_COMPLETE_NOTIFICATION);
+                IWL_CMD(BEACON_NOTIFICATION);
+                IWL_CMD(REPLY_TX_BEACON);
+                IWL_CMD(WHO_IS_AWAKE_NOTIFICATION);
+                IWL_CMD(QUIET_NOTIFICATION);
+                IWL_CMD(REPLY_TX_PWR_TABLE_CMD);
+                IWL_CMD(MEASURE_ABORT_NOTIFICATION);
+                IWL_CMD(REPLY_BT_CONFIG);
+                IWL_CMD(REPLY_STATISTICS_CMD);
+                IWL_CMD(STATISTICS_NOTIFICATION);
+                IWL_CMD(REPLY_CARD_STATE_CMD);
+                IWL_CMD(CARD_STATE_NOTIFICATION);
+                IWL_CMD(MISSED_BEACONS_NOTIFICATION);
+                IWL_CMD(REPLY_CT_KILL_CONFIG_CMD);
+                IWL_CMD(SENSITIVITY_CMD);
+                IWL_CMD(REPLY_PHY_CALIBRATION_CMD);
+                IWL_CMD(REPLY_RX_PHY_CMD);
+                IWL_CMD(REPLY_RX_MPDU_CMD);
+                IWL_CMD(REPLY_RX);
+                IWL_CMD(REPLY_COMPRESSED_BA);
+        default:
+                return "UNKNOWN";
+
+        }
+}
+EXPORT_SYMBOL(get_cmd_string);
+
+#define HOST_COMPLETE_TIMEOUT (HZ / 2)
+
+static int iwl_generic_cmd_callback(struct iwl_priv *priv,
+                                    struct iwl_cmd *cmd, struct sk_buff *skb)
+{
+        struct iwl4965_rx_packet *pkt = NULL;
+
+        if (!skb) {
+                IWL_ERROR("Error: Response NULL in %s.\n",
+                                get_cmd_string(cmd->hdr.cmd));
+                return 1;
+        }
+
+        pkt = (struct iwl4965_rx_packet *)skb->data;
+        if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
+                IWL_ERROR("Bad return from %s (0x%08X)\n",
+                        get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
+                return 1;
+        }
+
+        IWL_DEBUG_HC("back from %s (0x%08X)\n",
+                        get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
+
+        /* Let iwl_tx_complete free the response skb */
+        return 1;
+}
+
+static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+{
+        int ret;
+
+        BUG_ON(!(cmd->meta.flags & CMD_ASYNC));
+
+        /* An asynchronous command can not expect an SKB to be set. */
+        BUG_ON(cmd->meta.flags & CMD_WANT_SKB);
+
+        /* Assign a generic callback if one is not provided */
+        if (!cmd->meta.u.callback)
+                cmd->meta.u.callback = iwl_generic_cmd_callback;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return -EBUSY;
+
+        ret = priv->cfg->ops->utils->enqueue_hcmd(priv, cmd);
+        if (ret < 0) {
+                IWL_ERROR("Error sending %s: enqueue_hcmd failed: %d\n",
+                          get_cmd_string(cmd->id), ret);
+                return ret;
+        }
+        return 0;
+}
+
+int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+{
+        int cmd_idx;
+        int ret;
+
+        BUG_ON(cmd->meta.flags & CMD_ASYNC);
+
+         /* A synchronous command can not have a callback set. */
+        BUG_ON(cmd->meta.u.callback != NULL);
+
+        if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) {
+                IWL_ERROR("Error sending %s: Already sending a host command\n",
+                          get_cmd_string(cmd->id));
+                ret = -EBUSY;
+                goto out;
+        }
+
+        set_bit(STATUS_HCMD_ACTIVE, &priv->status);
+
+        if (cmd->meta.flags & CMD_WANT_SKB)
+                cmd->meta.source = &cmd->meta;
+
+        cmd_idx = priv->cfg->ops->utils->enqueue_hcmd(priv, cmd);
+        if (cmd_idx < 0) {
+                ret = cmd_idx;
+                IWL_ERROR("Error sending %s: enqueue_hcmd failed: %d\n",
+                          get_cmd_string(cmd->id), ret);
+                goto out;
+        }
+
+        ret = wait_event_interruptible_timeout(priv->wait_command_queue,
+                        !test_bit(STATUS_HCMD_ACTIVE, &priv->status),
+                        HOST_COMPLETE_TIMEOUT);
+        if (!ret) {
+                if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {
+                        IWL_ERROR("Error sending %s: time out after %dms.\n",
+                                  get_cmd_string(cmd->id),
+                                  jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
+
+                        clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
+                        ret = -ETIMEDOUT;
+                        goto cancel;
+                }
+        }
+
+        if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {
+                IWL_DEBUG_INFO("Command %s aborted: RF KILL Switch\n",
+                               get_cmd_string(cmd->id));
+                ret = -ECANCELED;
+                goto fail;
+        }
+        if (test_bit(STATUS_FW_ERROR, &priv->status)) {
+                IWL_DEBUG_INFO("Command %s failed: FW Error\n",
+                               get_cmd_string(cmd->id));
+                ret = -EIO;
+                goto fail;
+        }
+        if ((cmd->meta.flags & CMD_WANT_SKB) && !cmd->meta.u.skb) {
+                IWL_ERROR("Error: Response NULL in '%s'\n",
+                          get_cmd_string(cmd->id));
+                ret = -EIO;
+                goto out;
+        }
+
+        ret = 0;
+        goto out;
+
+cancel:
+        if (cmd->meta.flags & CMD_WANT_SKB) {
+                struct iwl_cmd *qcmd;
+
+                /* Cancel the CMD_WANT_SKB flag for the cmd in the
+                 * TX cmd queue. Otherwise in case the cmd comes
+                 * in later, it will possibly set an invalid
+                 * address (cmd->meta.source). */
+                qcmd = &priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_idx];
+                qcmd->meta.flags &= ~CMD_WANT_SKB;
+        }
+fail:
+        if (cmd->meta.u.skb) {
+                dev_kfree_skb_any(cmd->meta.u.skb);
+                cmd->meta.u.skb = NULL;
+        }
+out:
+        clear_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status);
+        return ret;
+}
+EXPORT_SYMBOL(iwl_send_cmd_sync);
+
+int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+{
+        if (cmd->meta.flags & CMD_ASYNC)
+                return iwl_send_cmd_async(priv, cmd);
+
+        return iwl_send_cmd_sync(priv, cmd);
+}
+EXPORT_SYMBOL(iwl_send_cmd);
+
+int iwl_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len, const void *data)
+{
+        struct iwl_host_cmd cmd = {
+                .id = id,
+                .len = len,
+                .data = data,
+        };
+
+        return iwl_send_cmd_sync(priv, &cmd);
+}
+EXPORT_SYMBOL(iwl_send_cmd_pdu);
+
+int iwl_send_cmd_pdu_async(struct iwl_priv *priv,
+                           u8 id, u16 len, const void *data,
+                           int (*callback)(struct iwl_priv *priv,
+                                           struct iwl_cmd *cmd,
+                                           struct sk_buff *skb))
+{
+        struct iwl_host_cmd cmd = {
+                .id = id,
+                .len = len,
+                .data = data,
+        };
+
+        cmd.meta.flags |= CMD_ASYNC;
+        cmd.meta.u.callback = callback;
+
+        return iwl_send_cmd_async(priv, &cmd);
+}
+EXPORT_SYMBOL(iwl_send_cmd_pdu_async);
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h
index 8993cca81b40..a443472bea62 100644
--- a/drivers/net/wireless/iwlwifi/iwl-helpers.h
+++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -254,6 +254,26 @@ static inline u8 iwl_get_dma_hi_address(dma_addr_t addr)
         return sizeof(addr) > sizeof(u32) ? (addr >> 16) >> 16 : 0;
 }
 
+/**
+ * iwl_queue_inc_wrap - increment queue index, wrap back to beginning
+ * @index -- current index
+ * @n_bd -- total number of entries in queue (must be power of 2)
+ */
+static inline int iwl_queue_inc_wrap(int index, int n_bd)
+{
+        return ++index & (n_bd - 1);
+}
+
+/**
+ * iwl_queue_dec_wrap - decrement queue index, wrap back to end
+ * @index -- current index
+ * @n_bd -- total number of entries in queue (must be power of 2)
+ */
+static inline int iwl_queue_dec_wrap(int index, int n_bd)
+{
+        return --index & (n_bd - 1);
+}
+
 /* TODO: Move fw_desc functions to iwl-pci.ko */
 static inline void iwl_free_fw_desc(struct pci_dev *pci_dev,
                                     struct fw_desc *desc)
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
new file mode 100644
index 000000000000..5bc3df432d2d
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -0,0 +1,429 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * Portions of this file are derived from the ipw3945 project.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#ifndef __iwl_io_h__
+#define __iwl_io_h__
+
+#include <linux/io.h>
+
+#include "iwl-debug.h"
+
+/*
+ * IO, register, and NIC memory access functions
+ *
+ * NOTE on naming convention and macro usage for these
+ *
+ * A single _ prefix before a an access function means that no state
+ * check or debug information is printed when that function is called.
+ *
+ * A double __ prefix before an access function means that state is checked
+ * and the current line number and caller function name are printed in addition
+ * to any other debug output.
+ *
+ * The non-prefixed name is the #define that maps the caller into a
+ * #define that provides the caller's name and __LINE__ to the double
+ * prefix version.
+ *
+ * If you wish to call the function without any debug or state checking,
+ * you should use the single _ prefix version (as is used by dependent IO
+ * routines, for example _iwl_read_direct32 calls the non-check version of
+ * _iwl_read32.)
+ *
+ * These declarations are *extremely* useful in quickly isolating code deltas
+ * which result in misconfiguring of the hardware I/O.  In combination with
+ * git-bisect and the IO debug level you can quickly determine the specific
+ * commit which breaks the IO sequence to the hardware.
+ *
+ */
+
+#define _iwl_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs))
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *priv,
+                                 u32 ofs, u32 val)
+{
+        IWL_DEBUG_IO("write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);
+        _iwl_write32(priv, ofs, val);
+}
+#define iwl_write32(priv, ofs, val) \
+        __iwl_write32(__FILE__, __LINE__, priv, ofs, val)
+#else
+#define iwl_write32(priv, ofs, val) _iwl_write32(priv, ofs, val)
+#endif
+
+#define _iwl_read32(priv, ofs) readl((priv)->hw_base + (ofs))
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)
+{
+        IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);
+        return _iwl_read32(priv, ofs);
+}
+#define iwl_read32(priv, ofs) __iwl_read32(__FILE__, __LINE__, priv, ofs)
+#else
+#define iwl_read32(p, o) _iwl_read32(p, o)
+#endif
+
+static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
+                                u32 bits, u32 mask, int timeout)
+{
+        int i = 0;
+
+        do {
+                if ((_iwl_read32(priv, addr) & mask) == (bits & mask))
+                        return i;
+                mdelay(10);
+                i += 10;
+        } while (i < timeout);
+
+        return -ETIMEDOUT;
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline int __iwl_poll_bit(const char *f, u32 l,
+                                 struct iwl_priv *priv, u32 addr,
+                                 u32 bits, u32 mask, int timeout)
+{
+        int ret = _iwl_poll_bit(priv, addr, bits, mask, timeout);
+        IWL_DEBUG_IO("poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n",
+                     addr, bits, mask,
+                     unlikely(ret  == -ETIMEDOUT)?"timeout":"", f, l);
+        return ret;
+}
+#define iwl_poll_bit(priv, addr, bits, mask, timeout) \
+        __iwl_poll_bit(__FILE__, __LINE__, priv, addr, bits, mask, timeout)
+#else
+#define iwl_poll_bit(p, a, b, m, t) _iwl_poll_bit(p, a, b, m, t)
+#endif
+
+static inline void _iwl_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)
+{
+        _iwl_write32(priv, reg, _iwl_read32(priv, reg) | mask);
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline void __iwl_set_bit(const char *f, u32 l,
+                                 struct iwl_priv *priv, u32 reg, u32 mask)
+{
+        u32 val = _iwl_read32(priv, reg) | mask;
+        IWL_DEBUG_IO("set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
+        _iwl_write32(priv, reg, val);
+}
+#define iwl_set_bit(p, r, m) __iwl_set_bit(__FILE__, __LINE__, p, r, m)
+#else
+#define iwl_set_bit(p, r, m) _iwl_set_bit(p, r, m)
+#endif
+
+static inline void _iwl_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)
+{
+        _iwl_write32(priv, reg, _iwl_read32(priv, reg) & ~mask);
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline void __iwl_clear_bit(const char *f, u32 l,
+                                   struct iwl_priv *priv, u32 reg, u32 mask)
+{
+        u32 val = _iwl_read32(priv, reg) & ~mask;
+        IWL_DEBUG_IO("clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
+        _iwl_write32(priv, reg, val);
+}
+#define iwl_clear_bit(p, r, m) __iwl_clear_bit(__FILE__, __LINE__, p, r, m)
+#else
+#define iwl_clear_bit(p, r, m) _iwl_clear_bit(p, r, m)
+#endif
+
+static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
+{
+        int ret;
+        u32 gp_ctl;
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (atomic_read(&priv->restrict_refcnt))
+                return 0;
+#endif
+        if (test_bit(STATUS_RF_KILL_HW, &priv->status) ||
+            test_bit(STATUS_RF_KILL_SW, &priv->status)) {
+                IWL_WARNING("WARNING: Requesting MAC access during RFKILL "
+                        "wakes up NIC\n");
+
+                /* 10 msec allows time for NIC to complete its data save */
+                gp_ctl = _iwl_read32(priv, CSR_GP_CNTRL);
+                if (gp_ctl & CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY) {
+                        IWL_DEBUG_RF_KILL("Wait for complete power-down, "
+                                "gpctl = 0x%08x\n", gp_ctl);
+                        mdelay(10);
+                } else
+                        IWL_DEBUG_RF_KILL("power-down complete, "
+                                          "gpctl = 0x%08x\n", gp_ctl);
+        }
+
+        /* this bit wakes up the NIC */
+        _iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+        ret = _iwl_poll_bit(priv, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,
+                           (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |
+                            CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 50);
+        if (ret < 0) {
+                IWL_ERROR("MAC is in deep sleep!\n");
+                return -EIO;
+        }
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        atomic_inc(&priv->restrict_refcnt);
+#endif
+        return 0;
+}
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline int __iwl_grab_nic_access(const char *f, u32 l,
+                                               struct iwl_priv *priv)
+{
+        if (atomic_read(&priv->restrict_refcnt))
+                IWL_ERROR("Grabbing access while already held %s %d.\n", f, l);
+
+        IWL_DEBUG_IO("grabbing nic access - %s %d\n", f, l);
+        return _iwl_grab_nic_access(priv);
+}
+#define iwl_grab_nic_access(priv) \
+        __iwl_grab_nic_access(__FILE__, __LINE__, priv)
+#else
+#define iwl_grab_nic_access(priv) \
+        _iwl_grab_nic_access(priv)
+#endif
+
+static inline void _iwl_release_nic_access(struct iwl_priv *priv)
+{
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (atomic_dec_and_test(&priv->restrict_refcnt))
+#endif
+                _iwl_clear_bit(priv, CSR_GP_CNTRL,
+                               CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline void __iwl_release_nic_access(const char *f, u32 l,
+                                            struct iwl_priv *priv)
+{
+        if (atomic_read(&priv->restrict_refcnt) <= 0)
+                IWL_ERROR("Release unheld nic access at line %s %d.\n", f, l);
+
+        IWL_DEBUG_IO("releasing nic access - %s %d\n", f, l);
+        _iwl_release_nic_access(priv);
+}
+#define iwl_release_nic_access(priv) \
+        __iwl_release_nic_access(__FILE__, __LINE__, priv)
+#else
+#define iwl_release_nic_access(priv) \
+        _iwl_release_nic_access(priv)
+#endif
+
+static inline u32 _iwl_read_direct32(struct iwl_priv *priv, u32 reg)
+{
+        return _iwl_read32(priv, reg);
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline u32 __iwl_read_direct32(const char *f, u32 l,
+                                        struct iwl_priv *priv, u32 reg)
+{
+        u32 value = _iwl_read_direct32(priv, reg);
+        if (!atomic_read(&priv->restrict_refcnt))
+                IWL_ERROR("Nic access not held from %s %d\n", f, l);
+        IWL_DEBUG_IO("read_direct32(0x%4X) = 0x%08x - %s %d \n", reg, value,
+                     f, l);
+        return value;
+}
+#define iwl_read_direct32(priv, reg) \
+        __iwl_read_direct32(__FILE__, __LINE__, priv, reg)
+#else
+#define iwl_read_direct32 _iwl_read_direct32
+#endif
+
+static inline void _iwl_write_direct32(struct iwl_priv *priv,
+                                         u32 reg, u32 value)
+{
+        _iwl_write32(priv, reg, value);
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static void __iwl_write_direct32(const char *f , u32 line,
+                                   struct iwl_priv *priv, u32 reg, u32 value)
+{
+        if (!atomic_read(&priv->restrict_refcnt))
+                IWL_ERROR("Nic access not held from %s line %d\n", f, line);
+        _iwl_write_direct32(priv, reg, value);
+}
+#define iwl_write_direct32(priv, reg, value) \
+        __iwl_write_direct32(__func__, __LINE__, priv, reg, value)
+#else
+#define iwl_write_direct32 _iwl_write_direct32
+#endif
+
+static inline void iwl_write_reg_buf(struct iwl_priv *priv,
+                                               u32 reg, u32 len, u32 *values)
+{
+        u32 count = sizeof(u32);
+
+        if ((priv != NULL) && (values != NULL)) {
+                for (; 0 < len; len -= count, reg += count, values++)
+                        _iwl_write_direct32(priv, reg, *values);
+        }
+}
+
+static inline int _iwl_poll_direct_bit(struct iwl_priv *priv,
+                                           u32 addr, u32 mask, int timeout)
+{
+        int i = 0;
+
+        do {
+                if ((_iwl_read_direct32(priv, addr) & mask) == mask)
+                        return i;
+                mdelay(10);
+                i += 10;
+        } while (i < timeout);
+
+        return -ETIMEDOUT;
+}
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline int __iwl_poll_direct_bit(const char *f, u32 l,
+                                            struct iwl_priv *priv,
+                                            u32 addr, u32 mask, int timeout)
+{
+        int ret  = _iwl_poll_direct_bit(priv, addr, mask, timeout);
+
+        if (unlikely(ret == -ETIMEDOUT))
+                IWL_DEBUG_IO("poll_direct_bit(0x%08X, 0x%08X) - "
+                             "timedout - %s %d\n", addr, mask, f, l);
+        else
+                IWL_DEBUG_IO("poll_direct_bit(0x%08X, 0x%08X) = 0x%08X "
+                             "- %s %d\n", addr, mask, ret, f, l);
+        return ret;
+}
+#define iwl_poll_direct_bit(priv, addr, mask, timeout) \
+        __iwl_poll_direct_bit(__FILE__, __LINE__, priv, addr, mask, timeout)
+#else
+#define iwl_poll_direct_bit _iwl_poll_direct_bit
+#endif
+
+static inline u32 _iwl_read_prph(struct iwl_priv *priv, u32 reg)
+{
+        _iwl_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
+        return _iwl_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline u32 __iwl_read_prph(const char *f, u32 line,
+                                  struct iwl_priv *priv, u32 reg)
+{
+        if (!atomic_read(&priv->restrict_refcnt))
+                IWL_ERROR("Nic access not held from %s line %d\n", f, line);
+        return _iwl_read_prph(priv, reg);
+}
+
+#define iwl_read_prph(priv, reg) \
+        __iwl_read_prph(__func__, __LINE__, priv, reg)
+#else
+#define iwl_read_prph _iwl_read_prph
+#endif
+
+static inline void _iwl_write_prph(struct iwl_priv *priv,
+                                             u32 addr, u32 val)
+{
+        _iwl_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
+                              ((addr & 0x0000FFFF) | (3 << 24)));
+        _iwl_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
+}
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline void __iwl_write_prph(const char *f, u32 line,
+                                    struct iwl_priv *priv, u32 addr, u32 val)
+{
+        if (!atomic_read(&priv->restrict_refcnt))
+                IWL_ERROR("Nic access not held from %s line %d\n", f, line);
+        _iwl_write_prph(priv, addr, val);
+}
+
+#define iwl_write_prph(priv, addr, val) \
+        __iwl_write_prph(__func__, __LINE__, priv, addr, val);
+#else
+#define iwl_write_prph _iwl_write_prph
+#endif
+
+#define _iwl_set_bits_prph(priv, reg, mask) \
+        _iwl_write_prph(priv, reg, (_iwl_read_prph(priv, reg) | mask))
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline void __iwl_set_bits_prph(const char *f, u32 line,
+                                       struct iwl_priv *priv,
+                                       u32 reg, u32 mask)
+{
+        if (!atomic_read(&priv->restrict_refcnt))
+                IWL_ERROR("Nic access not held from %s line %d\n", f, line);
+
+        _iwl_set_bits_prph(priv, reg, mask);
+}
+#define iwl_set_bits_prph(priv, reg, mask) \
+        __iwl_set_bits_prph(__func__, __LINE__, priv, reg, mask)
+#else
+#define iwl_set_bits_prph _iwl_set_bits_prph
+#endif
+
+#define _iwl_set_bits_mask_prph(priv, reg, bits, mask) \
+        _iwl_write_prph(priv, reg, ((_iwl_read_prph(priv, reg) & mask) | bits))
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+static inline void __iwl_set_bits_mask_prph(const char *f, u32 line,
+                struct iwl_priv *priv, u32 reg, u32 bits, u32 mask)
+{
+        if (!atomic_read(&priv->restrict_refcnt))
+                IWL_ERROR("Nic access not held from %s line %d\n", f, line);
+        _iwl_set_bits_mask_prph(priv, reg, bits, mask);
+}
+#define iwl_set_bits_mask_prph(priv, reg, bits, mask) \
+        __iwl_set_bits_mask_prph(__func__, __LINE__, priv, reg, bits, mask)
+#else
+#define iwl_set_bits_mask_prph _iwl_set_bits_mask_prph
+#endif
+
+static inline void iwl_clear_bits_prph(struct iwl_priv
+                                                 *priv, u32 reg, u32 mask)
+{
+        u32 val = _iwl_read_prph(priv, reg);
+        _iwl_write_prph(priv, reg, (val & ~mask));
+}
+
+static inline u32 iwl_read_targ_mem(struct iwl_priv *priv, u32 addr)
+{
+        iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);
+        return iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
+}
+
+static inline void iwl_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val)
+{
+        iwl_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
+        iwl_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);
+}
+
+static inline void iwl_write_targ_mem_buf(struct iwl_priv *priv, u32 addr,
+                                          u32 len, u32 *values)
+{
+        iwl_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
+        for (; 0 < len; len -= sizeof(u32), values++)
+                iwl_write_direct32(priv, HBUS_TARG_MEM_WDAT, *values);
+}
+#endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
new file mode 100644
index 000000000000..03fdf5b434a1
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -0,0 +1,449 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <net/mac80211.h>
+#include <linux/etherdevice.h>
+#include <asm/unaligned.h>
+
+#include "iwl-4965.h"
+#include "iwl-core.h"
+#include "iwl-io.h"
+#include "iwl-helpers.h"
+
+#define IWL_1MB_RATE (128 * 1024)
+#define IWL_LED_THRESHOLD (16)
+#define IWL_MAX_BLINK_TBL (10)
+
+static const struct {
+        u16 tpt;
+        u8 on_time;
+        u8 of_time;
+} blink_tbl[] =
+{
+        {300, 25, 25},
+        {200, 40, 40},
+        {100, 55, 55},
+        {70, 65, 65},
+        {50, 75, 75},
+        {20, 85, 85},
+        {15, 95, 95 },
+        {10, 110, 110},
+        {5, 130, 130},
+        {0, 167, 167}
+};
+
+static int iwl_led_cmd_callback(struct iwl_priv *priv,
+                                struct iwl_cmd *cmd, struct sk_buff *skb)
+{
+        return 1;
+}
+
+
+/* Send led command */
+static int iwl_send_led_cmd(struct iwl_priv *priv,
+                            struct iwl4965_led_cmd *led_cmd)
+{
+        struct iwl_host_cmd cmd = {
+                .id = REPLY_LEDS_CMD,
+                .len = sizeof(struct iwl4965_led_cmd),
+                .data = led_cmd,
+                .meta.flags = CMD_ASYNC,
+                .meta.u.callback = iwl_led_cmd_callback
+        };
+        u32 reg;
+
+        reg = iwl_read32(priv, CSR_LED_REG);
+        if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
+                iwl_write32(priv, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK);
+
+        return iwl_send_cmd(priv, &cmd);
+}
+
+
+/* Set led on command */
+static int iwl4965_led_on(struct iwl_priv *priv, int led_id)
+{
+        struct iwl4965_led_cmd led_cmd = {
+                .id = led_id,
+                .on = IWL_LED_SOLID,
+                .off = 0,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+
+/* Set led on command */
+static int iwl4965_led_pattern(struct iwl_priv *priv, int led_id,
+                               enum led_brightness brightness)
+{
+        struct iwl4965_led_cmd led_cmd = {
+                .id = led_id,
+                .on = brightness,
+                .off = brightness,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+        if (brightness == LED_FULL) {
+                led_cmd.on = IWL_LED_SOLID;
+                led_cmd.off = 0;
+        }
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+
+/* Set led register off */
+static int iwl4965_led_on_reg(struct iwl_priv *priv, int led_id)
+{
+        IWL_DEBUG_LED("led on %d\n", led_id);
+        iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
+        return 0;
+}
+
+#if 0
+/* Set led off command */
+int iwl4965_led_off(struct iwl_priv *priv, int led_id)
+{
+        struct iwl4965_led_cmd led_cmd = {
+                .id = led_id,
+                .on = 0,
+                .off = 0,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+        IWL_DEBUG_LED("led off %d\n", led_id);
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+#endif
+
+
+/* Set led register off */
+static int iwl4965_led_off_reg(struct iwl_priv *priv, int led_id)
+{
+        IWL_DEBUG_LED("radio off\n");
+        iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_OFF);
+        return 0;
+}
+
+/* Set led blink command */
+static int iwl4965_led_not_solid(struct iwl_priv *priv, int led_id,
+                               u8 brightness)
+{
+        struct iwl4965_led_cmd led_cmd = {
+                .id = led_id,
+                .on = brightness,
+                .off = brightness,
+                .interval = IWL_DEF_LED_INTRVL
+        };
+
+        return iwl_send_led_cmd(priv, &led_cmd);
+}
+
+
+/*
+ * brightness call back function for Tx/Rx LED
+ */
+static int iwl4965_led_associated(struct iwl_priv *priv, int led_id)
+{
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
+            !test_bit(STATUS_READY, &priv->status))
+                return 0;
+
+
+        /* start counting Tx/Rx bytes */
+        if (!priv->last_blink_time && priv->allow_blinking)
+                priv->last_blink_time = jiffies;
+        return 0;
+}
+
+/*
+ * brightness call back for association and radio
+ */
+static void iwl4965_led_brightness_set(struct led_classdev *led_cdev,
+                                       enum led_brightness brightness)
+{
+        struct iwl4965_led *led = container_of(led_cdev,
+                                               struct iwl4965_led, led_dev);
+        struct iwl_priv *priv = led->priv;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return;
+
+        switch (brightness) {
+        case LED_FULL:
+                if (led->type == IWL_LED_TRG_ASSOC)
+                        priv->allow_blinking = 1;
+
+                if (led->led_on)
+                        led->led_on(priv, IWL_LED_LINK);
+                break;
+        case LED_OFF:
+                if (led->type == IWL_LED_TRG_ASSOC)
+                        priv->allow_blinking = 0;
+
+                if (led->led_off)
+                        led->led_off(priv, IWL_LED_LINK);
+                break;
+        default:
+                if (led->led_pattern)
+                        led->led_pattern(priv, IWL_LED_LINK, brightness);
+                break;
+        }
+}
+
+
+
+/*
+ * Register led class with the system
+ */
+static int iwl_leds_register_led(struct iwl_priv *priv,
+                                   struct iwl4965_led *led,
+                                   enum led_type type, u8 set_led,
+                                   const char *name, char *trigger)
+{
+        struct device *device = wiphy_dev(priv->hw->wiphy);
+        int ret;
+
+        led->led_dev.name = name;
+        led->led_dev.brightness_set = iwl4965_led_brightness_set;
+        led->led_dev.default_trigger = trigger;
+
+        led->priv = priv;
+        led->type = type;
+
+        ret = led_classdev_register(device, &led->led_dev);
+        if (ret) {
+                IWL_ERROR("Error: failed to register led handler.\n");
+                return ret;
+        }
+
+        led->registered = 1;
+
+        if (set_led && led->led_on)
+                led->led_on(priv, IWL_LED_LINK);
+
+        return 0;
+}
+
+
+/*
+ * calculate blink rate according to last 2 sec Tx/Rx activities
+ */
+static inline u8 get_blink_rate(struct iwl_priv *priv)
+{
+        int i;
+        u8 blink_rate;
+        u64 current_tpt = priv->tx_stats[2].bytes + priv->rx_stats[2].bytes;
+        s64 tpt = current_tpt - priv->led_tpt;
+
+        if (tpt < 0) /* wrapparound */
+                tpt = -tpt;
+
+        priv->led_tpt = current_tpt;
+
+        if (tpt < IWL_LED_THRESHOLD) {
+                i = IWL_MAX_BLINK_TBL;
+        } else {
+                for (i = 0; i < IWL_MAX_BLINK_TBL; i++)
+                        if (tpt  > (blink_tbl[i].tpt * IWL_1MB_RATE))
+                                break;
+        }
+        /* if 0 frame is transfered */
+        if ((i == IWL_MAX_BLINK_TBL) || !priv->allow_blinking)
+                blink_rate = IWL_LED_SOLID;
+        else
+                blink_rate = blink_tbl[i].on_time;
+
+        return blink_rate;
+}
+
+static inline int is_rf_kill(struct iwl_priv *priv)
+{
+        return test_bit(STATUS_RF_KILL_HW, &priv->status) ||
+                test_bit(STATUS_RF_KILL_SW, &priv->status);
+}
+
+/*
+ * this function called from handler. Since setting Led command can
+ * happen very frequent we postpone led command to be called from
+ * REPLY handler so we know ucode is up
+ */
+void iwl_leds_background(struct iwl_priv *priv)
+{
+        u8 blink_rate;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
+                priv->last_blink_time = 0;
+                return;
+        }
+        if (is_rf_kill(priv)) {
+                priv->last_blink_time = 0;
+                return;
+        }
+
+        if (!priv->allow_blinking) {
+                priv->last_blink_time = 0;
+                if (priv->last_blink_rate != IWL_LED_SOLID) {
+                        priv->last_blink_rate = IWL_LED_SOLID;
+                        iwl4965_led_on(priv, IWL_LED_LINK);
+                }
+                return;
+        }
+        if (!priv->last_blink_time ||
+            !time_after(jiffies, priv->last_blink_time +
+                        msecs_to_jiffies(1000)))
+                return;
+
+        blink_rate = get_blink_rate(priv);
+
+        /* call only if blink rate change */
+        if (blink_rate != priv->last_blink_rate) {
+                if (blink_rate != IWL_LED_SOLID) {
+                        priv->last_blink_time = jiffies +
+                                                msecs_to_jiffies(1000);
+                        iwl4965_led_not_solid(priv, IWL_LED_LINK, blink_rate);
+                } else {
+                        priv->last_blink_time = 0;
+                        iwl4965_led_on(priv, IWL_LED_LINK);
+                }
+        }
+
+        priv->last_blink_rate = blink_rate;
+}
+EXPORT_SYMBOL(iwl_leds_background);
+
+/* Register all led handler */
+int iwl_leds_register(struct iwl_priv *priv)
+{
+        char *trigger;
+        char name[32];
+        int ret;
+
+        priv->last_blink_rate = 0;
+        priv->led_tpt = 0;
+        priv->last_blink_time = 0;
+        priv->allow_blinking = 0;
+
+        trigger = ieee80211_get_radio_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:radio",
+                 wiphy_name(priv->hw->wiphy));
+
+        priv->led[IWL_LED_TRG_RADIO].led_on = iwl4965_led_on_reg;
+        priv->led[IWL_LED_TRG_RADIO].led_off = iwl4965_led_off_reg;
+        priv->led[IWL_LED_TRG_RADIO].led_pattern = NULL;
+
+        ret = iwl_leds_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_RADIO],
+                                   IWL_LED_TRG_RADIO, 1,
+                                   name, trigger);
+        if (ret)
+                goto exit_fail;
+
+        trigger = ieee80211_get_assoc_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:assoc",
+                 wiphy_name(priv->hw->wiphy));
+
+        ret = iwl_leds_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_ASSOC],
+                                   IWL_LED_TRG_ASSOC, 0,
+                                   name, trigger);
+        /* for assoc always turn led on */
+        priv->led[IWL_LED_TRG_ASSOC].led_on = iwl4965_led_on_reg;
+        priv->led[IWL_LED_TRG_ASSOC].led_off = iwl4965_led_on_reg;
+        priv->led[IWL_LED_TRG_ASSOC].led_pattern = NULL;
+
+        if (ret)
+                goto exit_fail;
+
+        trigger = ieee80211_get_rx_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:RX",
+                 wiphy_name(priv->hw->wiphy));
+
+
+        ret = iwl_leds_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_RX],
+                                   IWL_LED_TRG_RX, 0,
+                                   name, trigger);
+
+        priv->led[IWL_LED_TRG_RX].led_on = iwl4965_led_associated;
+        priv->led[IWL_LED_TRG_RX].led_off = iwl4965_led_associated;
+        priv->led[IWL_LED_TRG_RX].led_pattern = iwl4965_led_pattern;
+
+        if (ret)
+                goto exit_fail;
+
+        trigger = ieee80211_get_tx_led_name(priv->hw);
+        snprintf(name, sizeof(name), "iwl-%s:TX",
+                 wiphy_name(priv->hw->wiphy));
+        ret = iwl_leds_register_led(priv,
+                                   &priv->led[IWL_LED_TRG_TX],
+                                   IWL_LED_TRG_TX, 0,
+                                   name, trigger);
+        priv->led[IWL_LED_TRG_TX].led_on = iwl4965_led_associated;
+        priv->led[IWL_LED_TRG_TX].led_off = iwl4965_led_associated;
+        priv->led[IWL_LED_TRG_TX].led_pattern = iwl4965_led_pattern;
+
+        if (ret)
+                goto exit_fail;
+
+        return 0;
+
+exit_fail:
+        iwl_leds_unregister(priv);
+        return ret;
+}
+EXPORT_SYMBOL(iwl_leds_register);
+
+/* unregister led class */
+static void iwl_leds_unregister_led(struct iwl4965_led *led, u8 set_led)
+{
+        if (!led->registered)
+                return;
+
+        led_classdev_unregister(&led->led_dev);
+
+        if (set_led)
+                led->led_dev.brightness_set(&led->led_dev, LED_OFF);
+        led->registered = 0;
+}
+
+/* Unregister all led handlers */
+void iwl_leds_unregister(struct iwl_priv *priv)
+{
+        iwl_leds_unregister_led(&priv->led[IWL_LED_TRG_ASSOC], 0);
+        iwl_leds_unregister_led(&priv->led[IWL_LED_TRG_RX], 0);
+        iwl_leds_unregister_led(&priv->led[IWL_LED_TRG_TX], 0);
+        iwl_leds_unregister_led(&priv->led[IWL_LED_TRG_RADIO], 1);
+}
+EXPORT_SYMBOL(iwl_leds_unregister);
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/iwl-led.h
new file mode 100644
index 000000000000..5bb04128cd65
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-led.h
@@ -0,0 +1,82 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#ifndef __iwl_leds_h__
+#define __iwl_leds_h__
+
+
+struct iwl_priv;
+
+#ifdef CONFIG_IWLWIFI_LEDS
+#include <linux/leds.h>
+
+#define IWL_LED_SOLID 11
+#define IWL_LED_NAME_LEN 31
+#define IWL_DEF_LED_INTRVL __constant_cpu_to_le32(1000)
+
+#define IWL_LED_ACTIVITY       (0<<1)
+#define IWL_LED_LINK           (1<<1)
+
+enum led_type {
+        IWL_LED_TRG_TX,
+        IWL_LED_TRG_RX,
+        IWL_LED_TRG_ASSOC,
+        IWL_LED_TRG_RADIO,
+        IWL_LED_TRG_MAX,
+};
+
+
+struct iwl4965_led {
+        struct iwl_priv *priv;
+        struct led_classdev led_dev;
+
+        int (*led_on) (struct iwl_priv *priv, int led_id);
+        int (*led_off) (struct iwl_priv *priv, int led_id);
+        int (*led_pattern) (struct iwl_priv *priv, int led_id,
+                            enum led_brightness brightness);
+
+        enum led_type type;
+        unsigned int registered;
+};
+
+int iwl_leds_register(struct iwl_priv *priv);
+void iwl_leds_unregister(struct iwl_priv *priv);
+void iwl_leds_background(struct iwl_priv *priv);
+
+#else
+static inline int iwl_leds_register(struct iwl_priv *priv)
+{
+        return 0;
+}
+static inline void iwl_leds_unregister(struct iwl_priv *priv)
+{
+}
+static inline void iwl_leds_background(struct iwl_priv *priv)
+{
+}
+
+#endif /* CONFIG_IWLWIFI_LEDS */
+#endif /* __iwl_leds_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 4ba121634877..c9cf8eef1a90 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -243,44 +243,48 @@
  * 4965 Tx Scheduler registers.
  * Details are documented in iwl-4965-hw.h
  */
-#define KDR_SCD_BASE            (PRPH_BASE + 0xa02c00)
+#define IWL49_SCD_BASE          (PRPH_BASE + 0xa02c00)
 
-#define KDR_SCD_SRAM_BASE_ADDR         (KDR_SCD_BASE + 0x0)
-#define KDR_SCD_EMPTY_BITS             (KDR_SCD_BASE + 0x4)
-#define KDR_SCD_DRAM_BASE_ADDR         (KDR_SCD_BASE + 0x10)
-#define KDR_SCD_AIT                    (KDR_SCD_BASE + 0x18)
-#define KDR_SCD_TXFACT                 (KDR_SCD_BASE + 0x1c)
-#define KDR_SCD_QUEUE_WRPTR(x)         (KDR_SCD_BASE + 0x24 + (x) * 4)
-#define KDR_SCD_QUEUE_RDPTR(x)         (KDR_SCD_BASE + 0x64 + (x) * 4)
-#define KDR_SCD_SETQUEUENUM            (KDR_SCD_BASE + 0xa4)
-#define KDR_SCD_SET_TXSTAT_TXED        (KDR_SCD_BASE + 0xa8)
-#define KDR_SCD_SET_TXSTAT_DONE        (KDR_SCD_BASE + 0xac)
-#define KDR_SCD_SET_TXSTAT_NOT_SCHD    (KDR_SCD_BASE + 0xb0)
-#define KDR_SCD_DECREASE_CREDIT        (KDR_SCD_BASE + 0xb4)
-#define KDR_SCD_DECREASE_SCREDIT       (KDR_SCD_BASE + 0xb8)
-#define KDR_SCD_LOAD_CREDIT            (KDR_SCD_BASE + 0xbc)
-#define KDR_SCD_LOAD_SCREDIT           (KDR_SCD_BASE + 0xc0)
-#define KDR_SCD_BAR                    (KDR_SCD_BASE + 0xc4)
-#define KDR_SCD_BAR_DW0                (KDR_SCD_BASE + 0xc8)
-#define KDR_SCD_BAR_DW1                (KDR_SCD_BASE + 0xcc)
-#define KDR_SCD_QUEUECHAIN_SEL         (KDR_SCD_BASE + 0xd0)
-#define KDR_SCD_QUERY_REQ              (KDR_SCD_BASE + 0xd8)
-#define KDR_SCD_QUERY_RES              (KDR_SCD_BASE + 0xdc)
-#define KDR_SCD_PENDING_FRAMES         (KDR_SCD_BASE + 0xe0)
-#define KDR_SCD_INTERRUPT_MASK         (KDR_SCD_BASE + 0xe4)
-#define KDR_SCD_INTERRUPT_THRESHOLD    (KDR_SCD_BASE + 0xe8)
-#define KDR_SCD_QUERY_MIN_FRAME_SIZE   (KDR_SCD_BASE + 0x100)
-#define KDR_SCD_QUEUE_STATUS_BITS(x)   (KDR_SCD_BASE + 0x104 + (x) * 4)
+#define IWL49_SCD_SRAM_BASE_ADDR         (IWL49_SCD_BASE + 0x0)
+#define IWL49_SCD_EMPTY_BITS             (IWL49_SCD_BASE + 0x4)
+#define IWL49_SCD_DRAM_BASE_ADDR         (IWL49_SCD_BASE + 0x10)
+#define IWL49_SCD_AIT                    (IWL49_SCD_BASE + 0x18)
+#define IWL49_SCD_TXFACT                 (IWL49_SCD_BASE + 0x1c)
+#define IWL49_SCD_QUEUE_WRPTR(x)         (IWL49_SCD_BASE + 0x24 + (x) * 4)
+#define IWL49_SCD_QUEUE_RDPTR(x)         (IWL49_SCD_BASE + 0x64 + (x) * 4)
+#define IWL49_SCD_SETQUEUENUM            (IWL49_SCD_BASE + 0xa4)
+#define IWL49_SCD_SET_TXSTAT_TXED        (IWL49_SCD_BASE + 0xa8)
+#define IWL49_SCD_SET_TXSTAT_DONE        (IWL49_SCD_BASE + 0xac)
+#define IWL49_SCD_SET_TXSTAT_NOT_SCHD    (IWL49_SCD_BASE + 0xb0)
+#define IWL49_SCD_DECREASE_CREDIT        (IWL49_SCD_BASE + 0xb4)
+#define IWL49_SCD_DECREASE_SCREDIT       (IWL49_SCD_BASE + 0xb8)
+#define IWL49_SCD_LOAD_CREDIT            (IWL49_SCD_BASE + 0xbc)
+#define IWL49_SCD_LOAD_SCREDIT           (IWL49_SCD_BASE + 0xc0)
+#define IWL49_SCD_BAR                    (IWL49_SCD_BASE + 0xc4)
+#define IWL49_SCD_BAR_DW0                (IWL49_SCD_BASE + 0xc8)
+#define IWL49_SCD_BAR_DW1                (IWL49_SCD_BASE + 0xcc)
+#define IWL49_SCD_QUEUECHAIN_SEL         (IWL49_SCD_BASE + 0xd0)
+#define IWL49_SCD_QUERY_REQ              (IWL49_SCD_BASE + 0xd8)
+#define IWL49_SCD_QUERY_RES              (IWL49_SCD_BASE + 0xdc)
+#define IWL49_SCD_PENDING_FRAMES         (IWL49_SCD_BASE + 0xe0)
+#define IWL49_SCD_INTERRUPT_MASK         (IWL49_SCD_BASE + 0xe4)
+#define IWL49_SCD_INTERRUPT_THRESHOLD    (IWL49_SCD_BASE + 0xe8)
+#define IWL49_SCD_QUERY_MIN_FRAME_SIZE   (IWL49_SCD_BASE + 0x100)
+#define IWL49_SCD_QUEUE_STATUS_BITS(x)   (IWL49_SCD_BASE + 0x104 + (x) * 4)
 
 /* SP SCD */
-#define SHL_SCD_BASE                    (PRPH_BASE + 0xa02c00)
+#define IWL50_SCD_BASE                  (PRPH_BASE + 0xa02c00)
 
-#define SHL_SCD_AIT                    (SHL_SCD_BASE + 0x0c)
-#define SHL_SCD_TXFACT                 (SHL_SCD_BASE + 0x10)
-#define SHL_SCD_QUEUE_WRPTR(x)         (SHL_SCD_BASE + 0x18 + (x) * 4)
-#define SHL_SCD_QUEUE_RDPTR(x)         (SHL_SCD_BASE + 0x68 + (x) * 4)
-#define SHL_SCD_QUEUECHAIN_SEL         (SHL_SCD_BASE + 0xe8)
-#define SHL_SCD_AGGR_SEL               (SHL_SCD_BASE + 0x248)
-#define SHL_SCD_INTERRUPT_MASK         (SHL_SCD_BASE + 0x108)
+#define IWL50_SCD_SRAM_BASE_ADDR         (IWL50_SCD_BASE + 0x0)
+#define IWL50_SCD_DRAM_BASE_ADDR         (IWL50_SCD_BASE + 0x8)
+#define IWL50_SCD_AIT                    (IWL50_SCD_BASE + 0x0c)
+#define IWL50_SCD_TXFACT                 (IWL50_SCD_BASE + 0x10)
+#define IWL50_SCD_ACTIVE                 (IWL50_SCD_BASE + 0x14)
+#define IWL50_SCD_QUEUE_WRPTR(x)         (IWL50_SCD_BASE + 0x18 + (x) * 4)
+#define IWL50_SCD_QUEUE_RDPTR(x)         (IWL50_SCD_BASE + 0x68 + (x) * 4)
+#define IWL50_SCD_QUEUECHAIN_SEL         (IWL50_SCD_BASE + 0xe8)
+#define IWL50_SCD_AGGR_SEL               (IWL50_SCD_BASE + 0x248)
+#define IWL50_SCD_INTERRUPT_MASK         (IWL50_SCD_BASE + 0x108)
+#define IWL50_SCD_QUEUE_STATUS_BITS(x)   (IWL50_SCD_BASE + 0x10c + (x) * 4)
 
 #endif                          /* __iwl_prph_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
new file mode 100644
index 000000000000..5980a5621cb8
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -0,0 +1,173 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * Portions of this file are derived from the ipw3945 project, as well
+ * as portions of the ieee80211 subsystem header files.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+
+#include <net/mac80211.h>
+
+#include "iwl-eeprom.h"
+#include "iwl-4965.h"
+#include "iwl-core.h"
+#include "iwl-helpers.h"
+
+
+/* software rf-kill from user */
+static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
+{
+        struct iwl_priv *priv = data;
+        int err = 0;
+
+        if (!priv->rfkill_mngr.rfkill)
+                return 0;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return 0;
+
+        IWL_DEBUG_RF_KILL("we recieved soft RFKILL set to state %d\n", state);
+        mutex_lock(&priv->mutex);
+
+        switch (state) {
+        case RFKILL_STATE_ON:
+                priv->cfg->ops->lib->radio_kill_sw(priv, 0);
+                /* if HW rf-kill is set dont allow ON state */
+                if (iwl_is_rfkill(priv))
+                        err = -EBUSY;
+                break;
+        case RFKILL_STATE_OFF:
+                priv->cfg->ops->lib->radio_kill_sw(priv, 1);
+                if (!iwl_is_rfkill(priv))
+                        err = -EBUSY;
+                break;
+        }
+        mutex_unlock(&priv->mutex);
+
+        return err;
+}
+
+int iwl_rfkill_init(struct iwl_priv *priv)
+{
+        struct device *device = wiphy_dev(priv->hw->wiphy);
+        int ret = 0;
+
+        BUG_ON(device == NULL);
+
+        IWL_DEBUG_RF_KILL("Initializing RFKILL.\n");
+        priv->rfkill_mngr.rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
+        if (!priv->rfkill_mngr.rfkill) {
+                IWL_ERROR("Unable to allocate rfkill device.\n");
+                ret = -ENOMEM;
+                goto error;
+        }
+
+        priv->rfkill_mngr.rfkill->name = priv->cfg->name;
+        priv->rfkill_mngr.rfkill->data = priv;
+        priv->rfkill_mngr.rfkill->state = RFKILL_STATE_ON;
+        priv->rfkill_mngr.rfkill->toggle_radio = iwl_rfkill_soft_rf_kill;
+        priv->rfkill_mngr.rfkill->user_claim_unsupported = 1;
+
+        priv->rfkill_mngr.rfkill->dev.class->suspend = NULL;
+        priv->rfkill_mngr.rfkill->dev.class->resume = NULL;
+
+        priv->rfkill_mngr.input_dev = input_allocate_device();
+        if (!priv->rfkill_mngr.input_dev) {
+                IWL_ERROR("Unable to allocate rfkill input device.\n");
+                ret = -ENOMEM;
+                goto freed_rfkill;
+        }
+
+        priv->rfkill_mngr.input_dev->name = priv->cfg->name;
+        priv->rfkill_mngr.input_dev->phys = wiphy_name(priv->hw->wiphy);
+        priv->rfkill_mngr.input_dev->id.bustype = BUS_HOST;
+        priv->rfkill_mngr.input_dev->id.vendor = priv->pci_dev->vendor;
+        priv->rfkill_mngr.input_dev->dev.parent = device;
+        priv->rfkill_mngr.input_dev->evbit[0] = BIT(EV_KEY);
+        set_bit(KEY_WLAN, priv->rfkill_mngr.input_dev->keybit);
+
+        ret = rfkill_register(priv->rfkill_mngr.rfkill);
+        if (ret) {
+                IWL_ERROR("Unable to register rfkill: %d\n", ret);
+                goto free_input_dev;
+        }
+
+        ret = input_register_device(priv->rfkill_mngr.input_dev);
+        if (ret) {
+                IWL_ERROR("Unable to register rfkill input device: %d\n", ret);
+                goto unregister_rfkill;
+        }
+
+        IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
+        return ret;
+
+unregister_rfkill:
+        rfkill_unregister(priv->rfkill_mngr.rfkill);
+        priv->rfkill_mngr.rfkill = NULL;
+
+free_input_dev:
+        input_free_device(priv->rfkill_mngr.input_dev);
+        priv->rfkill_mngr.input_dev = NULL;
+
+freed_rfkill:
+        if (priv->rfkill_mngr.rfkill != NULL)
+                rfkill_free(priv->rfkill_mngr.rfkill);
+        priv->rfkill_mngr.rfkill = NULL;
+
+error:
+        IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
+        return ret;
+}
+EXPORT_SYMBOL(iwl_rfkill_init);
+
+void iwl_rfkill_unregister(struct iwl_priv *priv)
+{
+
+        if (priv->rfkill_mngr.input_dev)
+                input_unregister_device(priv->rfkill_mngr.input_dev);
+
+        if (priv->rfkill_mngr.rfkill)
+                rfkill_unregister(priv->rfkill_mngr.rfkill);
+
+        priv->rfkill_mngr.input_dev = NULL;
+        priv->rfkill_mngr.rfkill = NULL;
+}
+EXPORT_SYMBOL(iwl_rfkill_unregister);
+
+/* set rf-kill to the right state. */
+void iwl_rfkill_set_hw_state(struct iwl_priv *priv)
+{
+
+        if (!priv->rfkill_mngr.rfkill)
+                return;
+
+        if (!iwl_is_rfkill(priv))
+                priv->rfkill_mngr.rfkill->state = RFKILL_STATE_ON;
+        else
+                priv->rfkill_mngr.rfkill->state = RFKILL_STATE_OFF;
+}
+EXPORT_SYMBOL(iwl_rfkill_set_hw_state);
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.h b/drivers/net/wireless/iwlwifi/iwl-rfkill.h
new file mode 100644
index 000000000000..a7f04b855403
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.h
@@ -0,0 +1,54 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2008 Intel Corporation. All rights reserved.
+ *
+ * Portions of this file are derived from the ipw3945 project, as well
+ * as portions of the ieee80211 subsystem header files.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+#ifndef __iwl_rf_kill_h__
+#define __iwl_rf_kill_h__
+
+struct iwl_priv;
+
+#include <linux/rfkill.h>
+#include <linux/input.h>
+
+
+#ifdef CONFIG_IWLWIFI_RFKILL
+struct iwl_rfkill_mngr {
+        struct rfkill *rfkill;
+        struct input_dev *input_dev;
+};
+
+void iwl_rfkill_set_hw_state(struct iwl_priv *priv);
+void iwl_rfkill_unregister(struct iwl_priv *priv);
+int iwl_rfkill_init(struct iwl_priv *priv);
+#else
+static inline void iwl_rfkill_set_hw_state(struct iwl_priv *priv) {}
+static inline void iwl_rfkill_unregister(struct iwl_priv *priv) {}
+static inline int iwl_rfkill_init(struct iwl_priv *priv) { return 0; }
+#endif
+
+
+
+#endif  /* __iwl_rf_kill_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-spectrum.h b/drivers/net/wireless/iwlwifi/iwl-spectrum.h
index b576ff24eb4f..a40a2174df98 100644
--- a/drivers/net/wireless/iwlwifi/iwl-spectrum.h
+++ b/drivers/net/wireless/iwlwifi/iwl-spectrum.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ieee80211 subsystem header files.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
new file mode 100644
index 000000000000..e4fdfaa2b9b2
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -0,0 +1,355 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * Portions of this file are derived from the ipw3945 project, as well
+ * as portions of the ieee80211 subsystem header files.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#include <net/mac80211.h>
+
+#include "iwl-eeprom.h"
+#include "iwl-4965.h"
+#include "iwl-core.h"
+#include "iwl-sta.h"
+#include "iwl-io.h"
+#include "iwl-helpers.h"
+#include "iwl-4965.h"
+#include "iwl-sta.h"
+
+int iwl_get_free_ucode_key_index(struct iwl_priv *priv)
+{
+        int i;
+
+        for (i = 0; i < STA_KEY_MAX_NUM; i++)
+                if (!test_and_set_bit(i, &priv->ucode_key_table))
+                        return i;
+
+        return -1;
+}
+
+int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty)
+{
+        int i, not_empty = 0;
+        u8 buff[sizeof(struct iwl_wep_cmd) +
+                sizeof(struct iwl_wep_key) * WEP_KEYS_MAX];
+        struct iwl_wep_cmd *wep_cmd = (struct iwl_wep_cmd *)buff;
+        size_t cmd_size  = sizeof(struct iwl_wep_cmd);
+        struct iwl_host_cmd cmd = {
+                .id = REPLY_WEPKEY,
+                .data = wep_cmd,
+                .meta.flags = CMD_ASYNC,
+        };
+
+        memset(wep_cmd, 0, cmd_size +
+                        (sizeof(struct iwl_wep_key) * WEP_KEYS_MAX));
+
+        for (i = 0; i < WEP_KEYS_MAX ; i++) {
+                wep_cmd->key[i].key_index = i;
+                if (priv->wep_keys[i].key_size) {
+                        wep_cmd->key[i].key_offset = i;
+                        not_empty = 1;
+                } else {
+                        wep_cmd->key[i].key_offset = WEP_INVALID_OFFSET;
+                }
+
+                wep_cmd->key[i].key_size = priv->wep_keys[i].key_size;
+                memcpy(&wep_cmd->key[i].key[3], priv->wep_keys[i].key,
+                                priv->wep_keys[i].key_size);
+        }
+
+        wep_cmd->global_key_type = WEP_KEY_WEP_TYPE;
+        wep_cmd->num_keys = WEP_KEYS_MAX;
+
+        cmd_size += sizeof(struct iwl_wep_key) * WEP_KEYS_MAX;
+
+        cmd.len = cmd_size;
+
+        if (not_empty || send_if_empty)
+                return iwl_send_cmd(priv, &cmd);
+        else
+                return 0;
+}
+
+int iwl_remove_default_wep_key(struct iwl_priv *priv,
+                               struct ieee80211_key_conf *keyconf)
+{
+        int ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+
+        if (!test_and_clear_bit(keyconf->keyidx, &priv->ucode_key_table))
+                IWL_ERROR("index %d not used in uCode key table.\n",
+                          keyconf->keyidx);
+
+        priv->default_wep_key--;
+        memset(&priv->wep_keys[keyconf->keyidx], 0, sizeof(priv->wep_keys[0]));
+        ret = iwl_send_static_wepkey_cmd(priv, 1);
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        return ret;
+}
+
+int iwl_set_default_wep_key(struct iwl_priv *priv,
+                            struct ieee80211_key_conf *keyconf)
+{
+        int ret;
+        unsigned long flags;
+
+        keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
+        keyconf->hw_key_idx = keyconf->keyidx;
+        priv->stations[IWL_AP_ID].keyinfo.alg = ALG_WEP;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+        priv->default_wep_key++;
+
+        if (test_and_set_bit(keyconf->keyidx, &priv->ucode_key_table))
+                IWL_ERROR("index %d already used in uCode key table.\n",
+                        keyconf->keyidx);
+
+        priv->wep_keys[keyconf->keyidx].key_size = keyconf->keylen;
+        memcpy(&priv->wep_keys[keyconf->keyidx].key, &keyconf->key,
+                                                        keyconf->keylen);
+
+        ret = iwl_send_static_wepkey_cmd(priv, 0);
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        return ret;
+}
+
+static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv,
+                                struct ieee80211_key_conf *keyconf,
+                                u8 sta_id)
+{
+        unsigned long flags;
+        __le16 key_flags = 0;
+        int ret;
+
+        keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
+        keyconf->hw_key_idx = keyconf->keyidx;
+
+        key_flags |= (STA_KEY_FLG_WEP | STA_KEY_FLG_MAP_KEY_MSK);
+        key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
+        key_flags &= ~STA_KEY_FLG_INVALID;
+
+        if (keyconf->keylen == WEP_KEY_LEN_128)
+                key_flags |= STA_KEY_FLG_KEY_SIZE_MSK;
+
+        if (sta_id == priv->hw_params.bcast_sta_id)
+                key_flags |= STA_KEY_MULTICAST_MSK;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+
+        priv->stations[sta_id].keyinfo.alg = keyconf->alg;
+        priv->stations[sta_id].keyinfo.keylen = keyconf->keylen;
+        priv->stations[sta_id].keyinfo.keyidx = keyconf->keyidx;
+
+        memcpy(priv->stations[sta_id].keyinfo.key,
+                                keyconf->key, keyconf->keylen);
+
+        memcpy(&priv->stations[sta_id].sta.key.key[3],
+                                keyconf->key, keyconf->keylen);
+
+        priv->stations[sta_id].sta.key.key_offset =
+                                 iwl_get_free_ucode_key_index(priv);
+        priv->stations[sta_id].sta.key.key_flags = key_flags;
+
+        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        ret = iwl4965_send_add_station(priv,
+                &priv->stations[sta_id].sta, CMD_ASYNC);
+
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        return ret;
+}
+
+static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
+                                   struct ieee80211_key_conf *keyconf,
+                                   u8 sta_id)
+{
+        unsigned long flags;
+        __le16 key_flags = 0;
+
+        key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);
+        key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
+        key_flags &= ~STA_KEY_FLG_INVALID;
+
+        if (sta_id == priv->hw_params.bcast_sta_id)
+                key_flags |= STA_KEY_MULTICAST_MSK;
+
+        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+        keyconf->hw_key_idx = keyconf->keyidx;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+        priv->stations[sta_id].keyinfo.alg = keyconf->alg;
+        priv->stations[sta_id].keyinfo.keylen = keyconf->keylen;
+
+        memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key,
+               keyconf->keylen);
+
+        memcpy(priv->stations[sta_id].sta.key.key, keyconf->key,
+               keyconf->keylen);
+
+        priv->stations[sta_id].sta.key.key_offset =
+                                iwl_get_free_ucode_key_index(priv);
+        priv->stations[sta_id].sta.key.key_flags = key_flags;
+        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        IWL_DEBUG_INFO("hwcrypto: modify ucode station key info\n");
+        return iwl4965_send_add_station(priv,
+                                &priv->stations[sta_id].sta, CMD_ASYNC);
+}
+
+static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv,
+                                   struct ieee80211_key_conf *keyconf,
+                                   u8 sta_id)
+{
+        unsigned long flags;
+        int ret = 0;
+
+        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+        keyconf->hw_key_idx = keyconf->keyidx;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+
+        priv->stations[sta_id].keyinfo.alg = keyconf->alg;
+        priv->stations[sta_id].keyinfo.conf = keyconf;
+        priv->stations[sta_id].keyinfo.keylen = 16;
+        priv->stations[sta_id].sta.key.key_offset =
+                                 iwl_get_free_ucode_key_index(priv);
+
+        /* This copy is acutally not needed: we get the key with each TX */
+        memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16);
+
+        memcpy(priv->stations[sta_id].sta.key.key, keyconf->key, 16);
+
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        return ret;
+}
+
+int iwl_remove_dynamic_key(struct iwl_priv *priv, u8 sta_id)
+{
+        unsigned long flags;
+
+        priv->key_mapping_key = 0;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+        if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset,
+                &priv->ucode_key_table))
+                IWL_ERROR("index %d not used in uCode key table.\n",
+                        priv->stations[sta_id].sta.key.key_offset);
+        memset(&priv->stations[sta_id].keyinfo, 0,
+                                        sizeof(struct iwl4965_hw_key));
+        memset(&priv->stations[sta_id].sta.key, 0,
+                                        sizeof(struct iwl4965_keyinfo));
+        priv->stations[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC;
+        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        IWL_DEBUG_INFO("hwcrypto: clear ucode station key info\n");
+        return iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, 0);
+}
+
+int iwl_set_dynamic_key(struct iwl_priv *priv,
+                                struct ieee80211_key_conf *key, u8 sta_id)
+{
+        int ret;
+
+        priv->key_mapping_key = 1;
+
+        switch (key->alg) {
+        case ALG_CCMP:
+                ret = iwl_set_ccmp_dynamic_key_info(priv, key, sta_id);
+                break;
+        case ALG_TKIP:
+                ret = iwl_set_tkip_dynamic_key_info(priv, key, sta_id);
+                break;
+        case ALG_WEP:
+                ret = iwl_set_wep_dynamic_key_info(priv, key, sta_id);
+                break;
+        default:
+                IWL_ERROR("Unknown alg: %s alg = %d\n", __func__, key->alg);
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+static void iwl_dump_lq_cmd(struct iwl_priv *priv,
+                           struct iwl_link_quality_cmd *lq)
+{
+        int i;
+        IWL_DEBUG_RATE("lq station id 0x%x\n", lq->sta_id);
+        IWL_DEBUG_RATE("lq dta 0x%X 0x%X\n",
+                       lq->general_params.single_stream_ant_msk,
+                       lq->general_params.dual_stream_ant_msk);
+
+        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
+                IWL_DEBUG_RATE("lq index %d 0x%X\n",
+                               i, lq->rs_table[i].rate_n_flags);
+}
+#else
+static inline void iwl_dump_lq_cmd(struct iwl_priv *priv,
+                                   struct iwl_link_quality_cmd *lq)
+{
+}
+#endif
+
+int iwl_send_lq_cmd(struct iwl_priv *priv,
+                    struct iwl_link_quality_cmd *lq, u8 flags)
+{
+        struct iwl_host_cmd cmd = {
+                .id = REPLY_TX_LINK_QUALITY_CMD,
+                .len = sizeof(struct iwl_link_quality_cmd),
+                .meta.flags = flags,
+                .data = lq,
+        };
+
+        if ((lq->sta_id == 0xFF) &&
+            (priv->iw_mode == IEEE80211_IF_TYPE_IBSS))
+                return -EINVAL;
+
+        if (lq->sta_id == 0xFF)
+                lq->sta_id = IWL_AP_ID;
+
+        iwl_dump_lq_cmd(priv,lq);
+
+        if (iwl_is_associated(priv) && priv->assoc_station_added &&
+            priv->lq_mngr.lq_ready)
+                return  iwl_send_cmd(priv, &cmd);
+
+        return 0;
+}
+EXPORT_SYMBOL(iwl_send_lq_cmd);
+
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h
new file mode 100644
index 000000000000..44f272ecc827
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.h
@@ -0,0 +1,49 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ *
+ * Portions of this file are derived from the ipw3945 project, as well
+ * as portions of the ieee80211 subsystem header files.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * James P. Ketrenos <ipw2100-admin@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+#ifndef __iwl_sta_h__
+#define __iwl_sta_h__
+
+#include <net/mac80211.h>
+
+#include "iwl-eeprom.h"
+#include "iwl-core.h"
+#include "iwl-4965.h"
+#include "iwl-io.h"
+#include "iwl-helpers.h"
+
+int iwl_get_free_ucode_key_index(struct iwl_priv *priv);
+int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty);
+int iwl_remove_default_wep_key(struct iwl_priv *priv,
+                                struct ieee80211_key_conf *key);
+int iwl_set_default_wep_key(struct iwl_priv *priv,
+                                struct ieee80211_key_conf *key);
+int iwl_remove_dynamic_key(struct iwl_priv *priv, u8 sta_id);
+int iwl_set_dynamic_key(struct iwl_priv *priv,
+                                struct ieee80211_key_conf *key, u8 sta_id);
+#endif /* __iwl_sta_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index cbaeaf186494..1a5678fe4224 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -46,6 +46,7 @@
 
 #include <asm/div64.h>
 
+#include "iwl-3945-core.h"
 #include "iwl-3945.h"
 #include "iwl-helpers.h"
 
@@ -69,7 +70,7 @@ static int iwl3945_param_disable;  /* def: 0 = enable radio */
 static int iwl3945_param_antenna;  /* def: 0 = both antennas (use diversity) */
 int iwl3945_param_hwcrypto;        /* def: 0 = use software encryption */
 static int iwl3945_param_qos_enable = 1; /* def: 1 = use quality of service */
-int iwl3945_param_queues_num = IWL_MAX_NUM_QUEUES; /* def: 8 Tx queues */
+int iwl3945_param_queues_num = IWL39_MAX_NUM_QUEUES; /* def: 8 Tx queues */
 
 /*
  * module name, copyright, version, etc.
@@ -91,15 +92,10 @@ int iwl3945_param_queues_num = IWL_MAX_NUM_QUEUES; /* def: 8 Tx queues */
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "1.2.23k" VD VS
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2007 Intel Corporation"
+#define IWLWIFI_VERSION "1.2.26k" VD VS
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2008 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
-/* Change firmware file name, using "-" and incrementing number,
- *   *only* when uCode interface or architecture changes so that it
- *   is not compatible with earlier drivers.
- * This number will also appear in << 8 position of 1st dword of uCode file */
-#define IWL3945_UCODE_API "-1"
 
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_VERSION(DRV_VERSION);
@@ -116,16 +112,10 @@ static __le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr)
         return NULL;
 }
 
-static const struct ieee80211_hw_mode *iwl3945_get_hw_mode(
-                struct iwl3945_priv *priv, int mode)
+static const struct ieee80211_supported_band *iwl3945_get_band(
+                struct iwl3945_priv *priv, enum ieee80211_band band)
 {
-        int i;
-
-        for (i = 0; i < 3; i++)
-                if (priv->modes[i].mode == mode)
-                        return &priv->modes[i];
-
-        return NULL;
+        return priv->hw->wiphy->bands[band];
 }
 
 static int iwl3945_is_empty_essid(const char *essid, int essid_len)
@@ -168,17 +158,6 @@ static const char *iwl3945_escape_essid(const char *essid, u8 essid_len)
         return escaped;
 }
 
-static void iwl3945_print_hex_dump(int level, void *p, u32 len)
-{
-#ifdef CONFIG_IWL3945_DEBUG
-        if (!(iwl3945_debug_level & level))
-                return;
-
-        print_hex_dump(KERN_DEBUG, "iwl data: ", DUMP_PREFIX_OFFSET, 16, 1,
-                        p, len, 1);
-#endif
-}
-
 /*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****
  * DMA services
  *
@@ -204,7 +183,7 @@ static void iwl3945_print_hex_dump(int level, void *p, u32 len)
  * (#0-3) for data tx via EDCA.  An additional 2 HCCA queues are unused.
  ***************************************************/
 
-static int iwl3945_queue_space(const struct iwl3945_queue *q)
+int iwl3945_queue_space(const struct iwl3945_queue *q)
 {
         int s = q->read_ptr - q->write_ptr;
 
@@ -220,33 +199,14 @@ static int iwl3945_queue_space(const struct iwl3945_queue *q)
         return s;
 }
 
-/**
- * iwl3945_queue_inc_wrap - increment queue index, wrap back to beginning
- * @index -- current index
- * @n_bd -- total number of entries in queue (must be power of 2)
- */
-static inline int iwl3945_queue_inc_wrap(int index, int n_bd)
-{
-        return ++index & (n_bd - 1);
-}
-
-/**
- * iwl3945_queue_dec_wrap - increment queue index, wrap back to end
- * @index -- current index
- * @n_bd -- total number of entries in queue (must be power of 2)
- */
-static inline int iwl3945_queue_dec_wrap(int index, int n_bd)
-{
-        return --index & (n_bd - 1);
-}
-
-static inline int x2_queue_used(const struct iwl3945_queue *q, int i)
+int iwl3945_x2_queue_used(const struct iwl3945_queue *q, int i)
 {
         return q->write_ptr > q->read_ptr ?
                 (i >= q->read_ptr && i < q->write_ptr) :
                 !(i < q->read_ptr && i >= q->write_ptr);
 }
 
+
 static inline u8 get_cmd_index(struct iwl3945_queue *q, u32 index, int is_huge)
 {
         /* This is for scan command, the big buffer at end of command array */
@@ -267,8 +227,8 @@ static int iwl3945_queue_init(struct iwl3945_priv *priv, struct iwl3945_queue *q
         q->n_window = slots_num;
         q->id = id;
 
-        /* count must be power-of-two size, otherwise iwl3945_queue_inc_wrap
-         * and iwl3945_queue_dec_wrap are broken. */
+        /* count must be power-of-two size, otherwise iwl_queue_inc_wrap
+         * and iwl_queue_dec_wrap are broken. */
         BUG_ON(!is_power_of_2(count));
 
         /* slots_num must be power-of-two size, otherwise
@@ -368,7 +328,7 @@ int iwl3945_tx_queue_init(struct iwl3945_priv *priv,
         txq->need_update = 0;
 
         /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
-         * iwl3945_queue_inc_wrap and iwl3945_queue_dec_wrap are broken. */
+         * iwl_queue_inc_wrap and iwl_queue_dec_wrap are broken. */
         BUILD_BUG_ON(TFD_QUEUE_SIZE_MAX & (TFD_QUEUE_SIZE_MAX - 1));
 
         /* Initialize queue high/low-water, head/tail indexes */
@@ -399,7 +359,7 @@ void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *t
 
         /* first, empty all BD's */
         for (; q->write_ptr != q->read_ptr;
-             q->read_ptr = iwl3945_queue_inc_wrap(q->read_ptr, q->n_bd))
+             q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd))
                 iwl3945_hw_txq_free_tfd(priv, txq);
 
         len = sizeof(struct iwl3945_cmd) * q->n_window;
@@ -547,7 +507,7 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
         station->sta.sta.sta_id = index;
         station->sta.station_flags = 0;
 
-        if (priv->phymode == MODE_IEEE80211A)
+        if (priv->band == IEEE80211_BAND_5GHZ)
                 rate = IWL_RATE_6M_PLCP;
         else
                 rate =  IWL_RATE_1M_PLCP;
@@ -738,7 +698,7 @@ static int iwl3945_enqueue_hcmd(struct iwl3945_priv *priv, struct iwl3945_host_c
         txq->need_update = 1;
 
         /* Increment and update queue's write index */
-        q->write_ptr = iwl3945_queue_inc_wrap(q->write_ptr, q->n_bd);
+        q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
         ret = iwl3945_tx_queue_update_write_ptr(priv, txq);
 
         spin_unlock_irqrestore(&priv->hcmd_lock, flags);
@@ -773,17 +733,17 @@ static int iwl3945_send_cmd_sync(struct iwl3945_priv *priv, struct iwl3945_host_
 {
         int cmd_idx;
         int ret;
-        static atomic_t entry = ATOMIC_INIT(0); /* reentrance protection */
 
         BUG_ON(cmd->meta.flags & CMD_ASYNC);
 
          /* A synchronous command can not have a callback set. */
         BUG_ON(cmd->meta.u.callback != NULL);
 
-        if (atomic_xchg(&entry, 1)) {
+        if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) {
                 IWL_ERROR("Error sending %s: Already sending a host command\n",
                           get_cmd_string(cmd->id));
-                return -EBUSY;
+                ret = -EBUSY;
+                goto out;
         }
 
         set_bit(STATUS_HCMD_ACTIVE, &priv->status);
@@ -853,7 +813,7 @@ fail:
                 cmd->meta.u.skb = NULL;
         }
 out:
-        atomic_set(&entry, 0);
+        clear_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status);
         return ret;
 }
 
@@ -894,35 +854,37 @@ int iwl3945_send_statistics_request(struct iwl3945_priv *priv)
 
 /**
  * iwl3945_set_rxon_channel - Set the phymode and channel values in staging RXON
- * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
- * @channel: Any channel valid for the requested phymode
+ * @band: 2.4 or 5 GHz band
+ * @channel: Any channel valid for the requested band
 
- * In addition to setting the staging RXON, priv->phymode is also set.
+ * In addition to setting the staging RXON, priv->band is also set.
  *
  * NOTE:  Does not commit to the hardware; it sets appropriate bit fields
- * in the staging RXON flag structure based on the phymode
+ * in the staging RXON flag structure based on the band
  */
-static int iwl3945_set_rxon_channel(struct iwl3945_priv *priv, u8 phymode, u16 channel)
+static int iwl3945_set_rxon_channel(struct iwl3945_priv *priv,
+                                    enum ieee80211_band band,
+                                    u16 channel)
 {
-        if (!iwl3945_get_channel_info(priv, phymode, channel)) {
+        if (!iwl3945_get_channel_info(priv, band, channel)) {
                 IWL_DEBUG_INFO("Could not set channel to %d [%d]\n",
-                               channel, phymode);
+                               channel, band);
                 return -EINVAL;
         }
 
         if ((le16_to_cpu(priv->staging_rxon.channel) == channel) &&
-            (priv->phymode == phymode))
+            (priv->band == band))
                 return 0;
 
         priv->staging_rxon.channel = cpu_to_le16(channel);
-        if (phymode == MODE_IEEE80211A)
+        if (band == IEEE80211_BAND_5GHZ)
                 priv->staging_rxon.flags &= ~RXON_FLG_BAND_24G_MSK;
         else
                 priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
 
-        priv->phymode = phymode;
+        priv->band = band;
 
-        IWL_DEBUG_INFO("Staging channel set to %d [%d]\n", channel, phymode);
+        IWL_DEBUG_INFO("Staging channel set to %d [%d]\n", channel, band);
 
         return 0;
 }
@@ -1210,8 +1172,7 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
                         return -EIO;
                 }
 
-        /* Init the hardware's rate fallback order based on the
-         * phymode */
+        /* Init the hardware's rate fallback order based on the band */
         rc = iwl3945_init_hw_rate_table(priv);
         if (rc) {
                 IWL_ERROR("Error setting HW rate table: %02X\n", rc);
@@ -1635,151 +1596,6 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)
         return 0;
 }
 
-/******************************************************************************
- *
- * Misc. internal state and helper functions
- *
- ******************************************************************************/
-#ifdef CONFIG_IWL3945_DEBUG
-
-/**
- * iwl3945_report_frame - dump frame to syslog during debug sessions
- *
- * You may hack this function to show different aspects of received frames,
- * including selective frame dumps.
- * group100 parameter selects whether to show 1 out of 100 good frames.
- */
-void iwl3945_report_frame(struct iwl3945_priv *priv,
-                      struct iwl3945_rx_packet *pkt,
-                      struct ieee80211_hdr *header, int group100)
-{
-        u32 to_us;
-        u32 print_summary = 0;
-        u32 print_dump = 0;     /* set to 1 to dump all frames' contents */
-        u32 hundred = 0;
-        u32 dataframe = 0;
-        u16 fc;
-        u16 seq_ctl;
-        u16 channel;
-        u16 phy_flags;
-        int rate_sym;
-        u16 length;
-        u16 status;
-        u16 bcn_tmr;
-        u32 tsf_low;
-        u64 tsf;
-        u8 rssi;
-        u8 agc;
-        u16 sig_avg;
-        u16 noise_diff;
-        struct iwl3945_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);
-        struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
-        struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);
-        u8 *data = IWL_RX_DATA(pkt);
-
-        /* MAC header */
-        fc = le16_to_cpu(header->frame_control);
-        seq_ctl = le16_to_cpu(header->seq_ctrl);
-
-        /* metadata */
-        channel = le16_to_cpu(rx_hdr->channel);
-        phy_flags = le16_to_cpu(rx_hdr->phy_flags);
-        rate_sym = rx_hdr->rate;
-        length = le16_to_cpu(rx_hdr->len);
-
-        /* end-of-frame status and timestamp */
-        status = le32_to_cpu(rx_end->status);
-        bcn_tmr = le32_to_cpu(rx_end->beacon_timestamp);
-        tsf_low = le64_to_cpu(rx_end->timestamp) & 0x0ffffffff;
-        tsf = le64_to_cpu(rx_end->timestamp);
-
-        /* signal statistics */
-        rssi = rx_stats->rssi;
-        agc = rx_stats->agc;
-        sig_avg = le16_to_cpu(rx_stats->sig_avg);
-        noise_diff = le16_to_cpu(rx_stats->noise_diff);
-
-        to_us = !compare_ether_addr(header->addr1, priv->mac_addr);
-
-        /* if data frame is to us and all is good,
-         *   (optionally) print summary for only 1 out of every 100 */
-        if (to_us && (fc & ~IEEE80211_FCTL_PROTECTED) ==
-            (IEEE80211_FCTL_FROMDS | IEEE80211_FTYPE_DATA)) {
-                dataframe = 1;
-                if (!group100)
-                        print_summary = 1;      /* print each frame */
-                else if (priv->framecnt_to_us < 100) {
-                        priv->framecnt_to_us++;
-                        print_summary = 0;
-                } else {
-                        priv->framecnt_to_us = 0;
-                        print_summary = 1;
-                        hundred = 1;
-                }
-        } else {
-                /* print summary for all other frames */
-                print_summary = 1;
-        }
-
-        if (print_summary) {
-                char *title;
-                u32 rate;
-
-                if (hundred)
-                        title = "100Frames";
-                else if (fc & IEEE80211_FCTL_RETRY)
-                        title = "Retry";
-                else if (ieee80211_is_assoc_response(fc))
-                        title = "AscRsp";
-                else if (ieee80211_is_reassoc_response(fc))
-                        title = "RasRsp";
-                else if (ieee80211_is_probe_response(fc)) {
-                        title = "PrbRsp";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_beacon(fc)) {
-                        title = "Beacon";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_atim(fc))
-                        title = "ATIM";
-                else if (ieee80211_is_auth(fc))
-                        title = "Auth";
-                else if (ieee80211_is_deauth(fc))
-                        title = "DeAuth";
-                else if (ieee80211_is_disassoc(fc))
-                        title = "DisAssoc";
-                else
-                        title = "Frame";
-
-                rate = iwl3945_rate_index_from_plcp(rate_sym);
-                if (rate == -1)
-                        rate = 0;
-                else
-                        rate = iwl3945_rates[rate].ieee / 2;
-
-                /* print frame summary.
-                 * MAC addresses show just the last byte (for brevity),
-                 *    but you can hack it to show more, if you'd like to. */
-                if (dataframe)
-                        IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "
-                                     "len=%u, rssi=%d, chnl=%d, rate=%u, \n",
-                                     title, fc, header->addr1[5],
-                                     length, rssi, channel, rate);
-                else {
-                        /* src/dst addresses assume managed mode */
-                        IWL_DEBUG_RX("%s: 0x%04x, dst=0x%02x, "
-                                     "src=0x%02x, rssi=%u, tim=%lu usec, "
-                                     "phy=0x%02x, chnl=%d\n",
-                                     title, fc, header->addr1[5],
-                                     header->addr3[5], rssi,
-                                     tsf_low - priv->scan_start_tsf,
-                                     phy_flags, channel);
-                }
-        }
-        if (print_dump)
-                iwl3945_print_hex_dump(IWL_DL_RX, data, length);
-}
-#endif
-
 static void iwl3945_unset_hw_setting(struct iwl3945_priv *priv)
 {
         if (priv->hw_setting.shared_virt)
@@ -1915,7 +1731,6 @@ static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv,
 /*
  * QoS  support
 */
-#ifdef CONFIG_IWL3945_QOS
 static int iwl3945_send_qos_params_command(struct iwl3945_priv *priv,
                                        struct iwl3945_qosparam_cmd *qos)
 {
@@ -2044,7 +1859,6 @@ static void iwl3945_activate_qos(struct iwl3945_priv *priv, u8 force)
         }
 }
 
-#endif /* CONFIG_IWL3945_QOS */
 /*
  * Power management (not Tx power!) functions
  */
@@ -2244,39 +2058,13 @@ int iwl3945_is_network_packet(struct iwl3945_priv *priv, struct ieee80211_hdr *h
                         return !compare_ether_addr(header->addr2, priv->bssid);
                 /* packets to our adapter go through */
                 return !compare_ether_addr(header->addr1, priv->mac_addr);
+        default:
+                return 1;
         }
 
         return 1;
 }
 
-#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x
-
-static const char *iwl3945_get_tx_fail_reason(u32 status)
-{
-        switch (status & TX_STATUS_MSK) {
-        case TX_STATUS_SUCCESS:
-                return "SUCCESS";
-                TX_STATUS_ENTRY(SHORT_LIMIT);
-                TX_STATUS_ENTRY(LONG_LIMIT);
-                TX_STATUS_ENTRY(FIFO_UNDERRUN);
-                TX_STATUS_ENTRY(MGMNT_ABORT);
-                TX_STATUS_ENTRY(NEXT_FRAG);
-                TX_STATUS_ENTRY(LIFE_EXPIRE);
-                TX_STATUS_ENTRY(DEST_PS);
-                TX_STATUS_ENTRY(ABORTED);
-                TX_STATUS_ENTRY(BT_RETRY);
-                TX_STATUS_ENTRY(STA_INVALID);
-                TX_STATUS_ENTRY(FRAG_DROPPED);
-                TX_STATUS_ENTRY(TID_DISABLE);
-                TX_STATUS_ENTRY(FRAME_FLUSHED);
-                TX_STATUS_ENTRY(INSUFFICIENT_CF_POLL);
-                TX_STATUS_ENTRY(TX_LOCKED);
-                TX_STATUS_ENTRY(NO_BEACON_ON_RADAR);
-        }
-
-        return "UNKNOWN";
-}
-
 /**
  * iwl3945_scan_cancel - Cancel any currently executing HW scan
  *
@@ -2461,9 +2249,10 @@ static int iwl3945_set_rxon_hwcrypto(struct iwl3945_priv *priv, int hw_decrypt)
         return 0;
 }
 
-static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv, u8 phymode)
+static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv,
+                                          enum ieee80211_band band)
 {
-        if (phymode == MODE_IEEE80211A) {
+        if (band == IEEE80211_BAND_5GHZ) {
                 priv->staging_rxon.flags &=
                     ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
                       | RXON_FLG_CCK_MSK);
@@ -2515,6 +2304,9 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)
                 priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
                     RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
                 break;
+        default:
+                IWL_ERROR("Unsupported interface type %d\n", priv->iw_mode);
+                break;
         }
 
 #if 0
@@ -2526,7 +2318,7 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)
                 priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
 #endif
 
-        ch_info = iwl3945_get_channel_info(priv, priv->phymode,
+        ch_info = iwl3945_get_channel_info(priv, priv->band,
                                        le16_to_cpu(priv->staging_rxon.channel));
 
         if (!ch_info)
@@ -2542,11 +2334,11 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)
 
         priv->staging_rxon.channel = cpu_to_le16(ch_info->channel);
         if (is_channel_a_band(ch_info))
-                priv->phymode = MODE_IEEE80211A;
+                priv->band = IEEE80211_BAND_5GHZ;
         else
-                priv->phymode = MODE_IEEE80211G;
+                priv->band = IEEE80211_BAND_2GHZ;
 
-        iwl3945_set_flags_for_phymode(priv, priv->phymode);
+        iwl3945_set_flags_for_phymode(priv, priv->band);
 
         priv->staging_rxon.ofdm_basic_rates =
             (IWL_OFDM_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
@@ -2560,7 +2352,7 @@ static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode)
                 const struct iwl3945_channel_info *ch_info;
 
                 ch_info = iwl3945_get_channel_info(priv,
-                        priv->phymode,
+                        priv->band,
                         le16_to_cpu(priv->staging_rxon.channel));
 
                 if (!ch_info || !is_channel_ibss(ch_info)) {
@@ -2694,8 +2486,12 @@ static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv,
                         cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(3);
                 else
                         cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(2);
-        } else
+        } else {
                 cmd->cmd.tx.timeout.pm_frame_timeout = 0;
+#ifdef CONFIG_IWL3945_LEDS
+                priv->rxtxpackets += le16_to_cpu(cmd->cmd.tx.len);
+#endif
+        }
 
         cmd->cmd.tx.driver_txop = 0;
         cmd->cmd.tx.tx_flags = tx_flags;
@@ -2792,7 +2588,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv,
                 goto drop_unlock;
         }
 
-        if ((ctl->tx_rate & 0xFF) == IWL_INVALID_RATE) {
+        if ((ctl->tx_rate->hw_value & 0xFF) == IWL_INVALID_RATE) {
                 IWL_ERROR("ERROR: No TX rate available.\n");
                 goto drop_unlock;
         }
@@ -2963,7 +2759,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv,
                            ieee80211_get_hdrlen(fc));
 
         /* Tell device the write index *just past* this latest filled TFD */
-        q->write_ptr = iwl3945_queue_inc_wrap(q->write_ptr, q->n_bd);
+        q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
         rc = iwl3945_tx_queue_update_write_ptr(priv, txq);
         spin_unlock_irqrestore(&priv->lock, flags);
 
@@ -2992,12 +2788,12 @@ drop:
 
 static void iwl3945_set_rate(struct iwl3945_priv *priv)
 {
-        const struct ieee80211_hw_mode *hw = NULL;
+        const struct ieee80211_supported_band *sband = NULL;
         struct ieee80211_rate *rate;
         int i;
 
-        hw = iwl3945_get_hw_mode(priv, priv->phymode);
-        if (!hw) {
+        sband = iwl3945_get_band(priv, priv->band);
+        if (!sband) {
                 IWL_ERROR("Failed to set rate: unable to get hw mode\n");
                 return;
         }
@@ -3005,24 +2801,17 @@ static void iwl3945_set_rate(struct iwl3945_priv *priv)
         priv->active_rate = 0;
         priv->active_rate_basic = 0;
 
-        IWL_DEBUG_RATE("Setting rates for 802.11%c\n",
-                       hw->mode == MODE_IEEE80211A ?
-                       'a' : ((hw->mode == MODE_IEEE80211B) ? 'b' : 'g'));
-
-        for (i = 0; i < hw->num_rates; i++) {
-                rate = &(hw->rates[i]);
-                if ((rate->val < IWL_RATE_COUNT) &&
-                    (rate->flags & IEEE80211_RATE_SUPPORTED)) {
-                        IWL_DEBUG_RATE("Adding rate index %d (plcp %d)%s\n",
-                                       rate->val, iwl3945_rates[rate->val].plcp,
-                                       (rate->flags & IEEE80211_RATE_BASIC) ?
-                                       "*" : "");
-                        priv->active_rate |= (1 << rate->val);
-                        if (rate->flags & IEEE80211_RATE_BASIC)
-                                priv->active_rate_basic |= (1 << rate->val);
-                } else
-                        IWL_DEBUG_RATE("Not adding rate %d (plcp %d)\n",
-                                       rate->val, iwl3945_rates[rate->val].plcp);
+        IWL_DEBUG_RATE("Setting rates for %s GHz\n",
+                       sband->band == IEEE80211_BAND_2GHZ ? "2.4" : "5");
+
+        for (i = 0; i < sband->n_bitrates; i++) {
+                rate = &sband->bitrates[i];
+                if ((rate->hw_value < IWL_RATE_COUNT) &&
+                    !(rate->flags & IEEE80211_CHAN_DISABLED)) {
+                        IWL_DEBUG_RATE("Adding rate index %d (plcp %d)\n",
+                                       rate->hw_value, iwl3945_rates[rate->hw_value].plcp);
+                        priv->active_rate |= (1 << rate->hw_value);
+                }
         }
 
         IWL_DEBUG_RATE("Set active_rate = %0x, active_rate_basic = %0x\n",
@@ -3330,127 +3119,6 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv,
 }
 #endif
 
-static void iwl3945_txstatus_to_ieee(struct iwl3945_priv *priv,
-                                 struct iwl3945_tx_info *tx_sta)
-{
-
-        tx_sta->status.ack_signal = 0;
-        tx_sta->status.excessive_retries = 0;
-        tx_sta->status.queue_length = 0;
-        tx_sta->status.queue_number = 0;
-
-        if (in_interrupt())
-                ieee80211_tx_status_irqsafe(priv->hw,
-                                            tx_sta->skb[0], &(tx_sta->status));
-        else
-                ieee80211_tx_status(priv->hw,
-                                    tx_sta->skb[0], &(tx_sta->status));
-
-        tx_sta->skb[0] = NULL;
-}
-
-/**
- * iwl3945_tx_queue_reclaim - Reclaim Tx queue entries already Tx'd
- *
- * When FW advances 'R' index, all entries between old and new 'R' index
- * need to be reclaimed. As result, some free space forms. If there is
- * enough free space (> low mark), wake the stack that feeds us.
- */
-static int iwl3945_tx_queue_reclaim(struct iwl3945_priv *priv, int txq_id, int index)
-{
-        struct iwl3945_tx_queue *txq = &priv->txq[txq_id];
-        struct iwl3945_queue *q = &txq->q;
-        int nfreed = 0;
-
-        if ((index >= q->n_bd) || (x2_queue_used(q, index) == 0)) {
-                IWL_ERROR("Read index for DMA queue txq id (%d), index %d, "
-                          "is out of range [0-%d] %d %d.\n", txq_id,
-                          index, q->n_bd, q->write_ptr, q->read_ptr);
-                return 0;
-        }
-
-        for (index = iwl3945_queue_inc_wrap(index, q->n_bd);
-                q->read_ptr != index;
-                q->read_ptr = iwl3945_queue_inc_wrap(q->read_ptr, q->n_bd)) {
-                if (txq_id != IWL_CMD_QUEUE_NUM) {
-                        iwl3945_txstatus_to_ieee(priv,
-                                        &(txq->txb[txq->q.read_ptr]));
-                        iwl3945_hw_txq_free_tfd(priv, txq);
-                } else if (nfreed > 1) {
-                        IWL_ERROR("HCMD skipped: index (%d) %d %d\n", index,
-                                        q->write_ptr, q->read_ptr);
-                        queue_work(priv->workqueue, &priv->restart);
-                }
-                nfreed++;
-        }
-
-        if (iwl3945_queue_space(q) > q->low_mark && (txq_id >= 0) &&
-                        (txq_id != IWL_CMD_QUEUE_NUM) &&
-                        priv->mac80211_registered)
-                ieee80211_wake_queue(priv->hw, txq_id);
-
-
-        return nfreed;
-}
-
-static int iwl3945_is_tx_success(u32 status)
-{
-        return (status & 0xFF) == 0x1;
-}
-
-/******************************************************************************
- *
- * Generic RX handler implementations
- *
- ******************************************************************************/
-/**
- * iwl3945_rx_reply_tx - Handle Tx response
- */
-static void iwl3945_rx_reply_tx(struct iwl3945_priv *priv,
-                            struct iwl3945_rx_mem_buffer *rxb)
-{
-        struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data;
-        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
-        int txq_id = SEQ_TO_QUEUE(sequence);
-        int index = SEQ_TO_INDEX(sequence);
-        struct iwl3945_tx_queue *txq = &priv->txq[txq_id];
-        struct ieee80211_tx_status *tx_status;
-        struct iwl3945_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
-        u32  status = le32_to_cpu(tx_resp->status);
-
-        if ((index >= txq->q.n_bd) || (x2_queue_used(&txq->q, index) == 0)) {
-                IWL_ERROR("Read index for DMA queue txq_id (%d) index %d "
-                          "is out of range [0-%d] %d %d\n", txq_id,
-                          index, txq->q.n_bd, txq->q.write_ptr,
-                          txq->q.read_ptr);
-                return;
-        }
-
-        tx_status = &(txq->txb[txq->q.read_ptr].status);
-
-        tx_status->retry_count = tx_resp->failure_frame;
-        tx_status->queue_number = status;
-        tx_status->queue_length = tx_resp->bt_kill_count;
-        tx_status->queue_length |= tx_resp->failure_rts;
-
-        tx_status->flags =
-            iwl3945_is_tx_success(status) ? IEEE80211_TX_STATUS_ACK : 0;
-
-        tx_status->control.tx_rate = iwl3945_rate_index_from_plcp(tx_resp->rate);
-
-        IWL_DEBUG_TX("Tx queue %d Status %s (0x%08x) plcp rate %d retries %d\n",
-                        txq_id, iwl3945_get_tx_fail_reason(status), status,
-                        tx_resp->rate, tx_resp->failure_frame);
-
-        IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index);
-        if (index != -1)
-                iwl3945_tx_queue_reclaim(priv, txq_id, index);
-
-        if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
-                IWL_ERROR("TODO:  Implement Tx ABORT REQUIRED!!!\n");
-}
-
-
 static void iwl3945_rx_reply_alive(struct iwl3945_priv *priv,
                                struct iwl3945_rx_mem_buffer *rxb)
 {
@@ -3797,13 +3465,44 @@ static void iwl3945_setup_rx_handlers(struct iwl3945_priv *priv)
         priv->rx_handlers[SCAN_COMPLETE_NOTIFICATION] =
             iwl3945_rx_scan_complete_notif;
         priv->rx_handlers[CARD_STATE_NOTIFICATION] = iwl3945_rx_card_state_notif;
-        priv->rx_handlers[REPLY_TX] = iwl3945_rx_reply_tx;
 
         /* Set up hardware specific Rx handlers */
         iwl3945_hw_rx_handler_setup(priv);
 }
 
 /**
+ * iwl3945_cmd_queue_reclaim - Reclaim CMD queue entries
+ * When FW advances 'R' index, all entries between old and new 'R' index
+ * need to be reclaimed.
+ */
+static void iwl3945_cmd_queue_reclaim(struct iwl3945_priv *priv,
+                                      int txq_id, int index)
+{
+        struct iwl3945_tx_queue *txq = &priv->txq[txq_id];
+        struct iwl3945_queue *q = &txq->q;
+        int nfreed = 0;
+
+        if ((index >= q->n_bd) || (iwl3945_x2_queue_used(q, index) == 0)) {
+                IWL_ERROR("Read index for DMA queue txq id (%d), index %d, "
+                          "is out of range [0-%d] %d %d.\n", txq_id,
+                          index, q->n_bd, q->write_ptr, q->read_ptr);
+                return;
+        }
+
+        for (index = iwl_queue_inc_wrap(index, q->n_bd); q->read_ptr != index;
+                q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
+                if (nfreed > 1) {
+                        IWL_ERROR("HCMD skipped: index (%d) %d %d\n", index,
+                                        q->write_ptr, q->read_ptr);
+                        queue_work(priv->workqueue, &priv->restart);
+                        break;
+                }
+                nfreed++;
+        }
+}
+
+
+/**
  * iwl3945_tx_cmd_complete - Pull unused buffers off the queue and reclaim them
  * @rxb: Rx buffer to reclaim
  *
@@ -3822,12 +3521,6 @@ static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv,
         int cmd_index;
         struct iwl3945_cmd *cmd;
 
-        /* If a Tx command is being handled and it isn't in the actual
-         * command queue then there a command routing bug has been introduced
-         * in the queue management code. */
-        if (txq_id != IWL_CMD_QUEUE_NUM)
-                IWL_ERROR("Error wrong command queue %d command id 0x%X\n",
-                          txq_id, pkt->hdr.cmd);
         BUG_ON(txq_id != IWL_CMD_QUEUE_NUM);
 
         cmd_index = get_cmd_index(&priv->txq[IWL_CMD_QUEUE_NUM].q, index, huge);
@@ -3841,7 +3534,7 @@ static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv,
                    !cmd->meta.u.callback(priv, cmd, rxb->skb))
                 rxb->skb = NULL;
 
-        iwl3945_tx_queue_reclaim(priv, txq_id, index);
+        iwl3945_cmd_queue_reclaim(priv, txq_id, index);
 
         if (!(cmd->meta.flags & CMD_ASYNC)) {
                 clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
@@ -4460,6 +4153,16 @@ static void iwl3945_enable_interrupts(struct iwl3945_priv *priv)
         iwl3945_write32(priv, CSR_INT_MASK, CSR_INI_SET_MASK);
 }
 
+
+/* call this function to flush any scheduled tasklet */
+static inline void iwl_synchronize_irq(struct iwl3945_priv *priv)
+{
+        /* wait to make sure we flush pedding tasklet*/
+        synchronize_irq(priv->pci_dev->irq);
+        tasklet_kill(&priv->irq_tasklet);
+}
+
+
 static inline void iwl3945_disable_interrupts(struct iwl3945_priv *priv)
 {
         clear_bit(STATUS_INT_ENABLED, &priv->status);
@@ -4521,8 +4224,7 @@ static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv)
 
         if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
                 IWL_ERROR("Start IWL Error Log Dump:\n");
-                IWL_ERROR("Status: 0x%08lX, Config: %08X count: %d\n",
-                          priv->status, priv->config, count);
+                IWL_ERROR("Status: 0x%08lX, count: %d\n", priv->status, count);
         }
 
         IWL_ERROR("Desc       Time       asrtPC  blink2 "
@@ -4742,9 +4444,9 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
          * atomic, make sure that inta covers all the interrupts that
          * we've discovered, even if FH interrupt came in just after
          * reading CSR_INT. */
-        if (inta_fh & CSR_FH_INT_RX_MASK)
+        if (inta_fh & CSR39_FH_INT_RX_MASK)
                 inta |= CSR_INT_BIT_FH_RX;
-        if (inta_fh & CSR_FH_INT_TX_MASK)
+        if (inta_fh & CSR39_FH_INT_TX_MASK)
                 inta |= CSR_INT_BIT_FH_TX;
 
         /* Now service all interrupt bits discovered above. */
@@ -4792,7 +4494,7 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
                 /* Queue restart only if RF_KILL switch was set to "kill"
                  *   when we loaded driver, and is now set to "enable".
                  * After we're Alive, RF_KILL gets handled by
-                 *   iwl_rx_card_state_notif() */
+                 *   iwl3945_rx_card_state_notif() */
                 if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
                         clear_bit(STATUS_RF_KILL_HW, &priv->status);
                         queue_work(priv->workqueue, &priv->restart);
@@ -4860,7 +4562,9 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
         }
 
         /* Re-enable all interrupts */
-        iwl3945_enable_interrupts(priv);
+        /* only Re-enable if disabled by irq */
+        if (test_bit(STATUS_INT_ENABLED, &priv->status))
+                iwl3945_enable_interrupts(priv);
 
 #ifdef CONFIG_IWL3945_DEBUG
         if (iwl3945_debug_level & (IWL_DL_ISR)) {
@@ -4924,7 +4628,9 @@ unplugged:
 
  none:
         /* re-enable interrupts here since we don't have anything to service. */
-        iwl3945_enable_interrupts(priv);
+        /* only Re-enable if disabled by irq */
+        if (test_bit(STATUS_INT_ENABLED, &priv->status))
+                iwl3945_enable_interrupts(priv);
         spin_unlock(&priv->lock);
         return IRQ_NONE;
 }
@@ -5026,24 +4732,24 @@ static void iwl3945_init_band_reference(const struct iwl3945_priv *priv, int ban
  * Based on band and channel number.
  */
 const struct iwl3945_channel_info *iwl3945_get_channel_info(const struct iwl3945_priv *priv,
-                                                    int phymode, u16 channel)
+                                                    enum ieee80211_band band, u16 channel)
 {
         int i;
 
-        switch (phymode) {
-        case MODE_IEEE80211A:
+        switch (band) {
+        case IEEE80211_BAND_5GHZ:
                 for (i = 14; i < priv->channel_count; i++) {
                         if (priv->channel_info[i].channel == channel)
                                 return &priv->channel_info[i];
                 }
                 break;
 
-        case MODE_IEEE80211B:
-        case MODE_IEEE80211G:
+        case IEEE80211_BAND_2GHZ:
                 if (channel >= 1 && channel <= 14)
                         return &priv->channel_info[channel - 1];
                 break;
-
+        case IEEE80211_NUM_BANDS:
+                WARN_ON(1);
         }
 
         return NULL;
@@ -5106,8 +4812,8 @@ static int iwl3945_init_channel_map(struct iwl3945_priv *priv)
                 /* Loop through each band adding each of the channels */
                 for (ch = 0; ch < eeprom_ch_count; ch++) {
                         ch_info->channel = eeprom_ch_index[ch];
-                        ch_info->phymode = (band == 1) ? MODE_IEEE80211B :
-                            MODE_IEEE80211A;
+                        ch_info->band = (band == 1) ? IEEE80211_BAND_2GHZ :
+                            IEEE80211_BAND_5GHZ;
 
                         /* permanently store EEPROM's channel regulatory flags
                          *   and max power in channel info database. */
@@ -5134,11 +4840,12 @@ static int iwl3945_init_channel_map(struct iwl3945_priv *priv)
                         ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;
                         ch_info->min_power = 0;
 
-                        IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x"
+                        IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s%s(0x%02x"
                                        " %ddBm): Ad-Hoc %ssupported\n",
                                        ch_info->channel,
                                        is_channel_a_band(ch_info) ?
                                        "5.2" : "2.4",
+                                       CHECK_AND_PRINT(VALID),
                                        CHECK_AND_PRINT(IBSS),
                                        CHECK_AND_PRINT(ACTIVE),
                                        CHECK_AND_PRINT(RADAR),
@@ -5203,18 +4910,20 @@ static void iwl3945_free_channel_map(struct iwl3945_priv *priv)
 #define IWL_PASSIVE_DWELL_BASE      (100)
 #define IWL_CHANNEL_TUNE_TIME       5
 
-static inline u16 iwl3945_get_active_dwell_time(struct iwl3945_priv *priv, int phymode)
+static inline u16 iwl3945_get_active_dwell_time(struct iwl3945_priv *priv,
+                                                enum ieee80211_band band)
 {
-        if (phymode == MODE_IEEE80211A)
+        if (band == IEEE80211_BAND_5GHZ)
                 return IWL_ACTIVE_DWELL_TIME_52;
         else
                 return IWL_ACTIVE_DWELL_TIME_24;
 }
 
-static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv, int phymode)
+static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv,
+                                          enum ieee80211_band band)
 {
-        u16 active = iwl3945_get_active_dwell_time(priv, phymode);
-        u16 passive = (phymode != MODE_IEEE80211A) ?
+        u16 active = iwl3945_get_active_dwell_time(priv, band);
+        u16 passive = (band == IEEE80211_BAND_2GHZ) ?
             IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :
             IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;
 
@@ -5234,28 +4943,32 @@ static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv, int phymode
         return passive;
 }
 
-static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, int phymode,
+static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
+                                         enum ieee80211_band band,
                                      u8 is_active, u8 direct_mask,
                                      struct iwl3945_scan_channel *scan_ch)
 {
         const struct ieee80211_channel *channels = NULL;
-        const struct ieee80211_hw_mode *hw_mode;
+        const struct ieee80211_supported_band *sband;
         const struct iwl3945_channel_info *ch_info;
         u16 passive_dwell = 0;
         u16 active_dwell = 0;
         int added, i;
 
-        hw_mode = iwl3945_get_hw_mode(priv, phymode);
-        if (!hw_mode)
+        sband = iwl3945_get_band(priv, band);
+        if (!sband)
                 return 0;
 
-        channels = hw_mode->channels;
+        channels = sband->channels;
 
-        active_dwell = iwl3945_get_active_dwell_time(priv, phymode);
-        passive_dwell = iwl3945_get_passive_dwell_time(priv, phymode);
+        active_dwell = iwl3945_get_active_dwell_time(priv, band);
+        passive_dwell = iwl3945_get_passive_dwell_time(priv, band);
+
+        for (i = 0, added = 0; i < sband->n_channels; i++) {
+                if (channels[i].flags & IEEE80211_CHAN_DISABLED)
+                        continue;
 
-        for (i = 0, added = 0; i < hw_mode->num_channels; i++) {
-                if (channels[i].chan ==
+                if (channels[i].hw_value ==
                     le16_to_cpu(priv->active_rxon.channel)) {
                         if (iwl3945_is_associated(priv)) {
                                 IWL_DEBUG_SCAN
@@ -5266,9 +4979,9 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, int phymode,
                 } else if (priv->only_active_channel)
                         continue;
 
-                scan_ch->channel = channels[i].chan;
+                scan_ch->channel = channels[i].hw_value;
 
-                ch_info = iwl3945_get_channel_info(priv, phymode, scan_ch->channel);
+                ch_info = iwl3945_get_channel_info(priv, band, scan_ch->channel);
                 if (!is_channel_valid(ch_info)) {
                         IWL_DEBUG_SCAN("Channel %d is INVALID for this SKU.\n",
                                        scan_ch->channel);
@@ -5276,7 +4989,7 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, int phymode,
                 }
 
                 if (!is_active || is_channel_passive(ch_info) ||
-                    !(channels[i].flag & IEEE80211_CHAN_W_ACTIVE_SCAN))
+                    (channels[i].flags & IEEE80211_CHAN_PASSIVE_SCAN))
                         scan_ch->type = 0;      /* passive */
                 else
                         scan_ch->type = 1;      /* active */
@@ -5295,7 +5008,7 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, int phymode,
                 /* scan_pwr_info->tpc.dsp_atten; */
 
                 /*scan_pwr_info->tpc.tx_gain; */
-                if (phymode == MODE_IEEE80211A)
+                if (band == IEEE80211_BAND_5GHZ)
                         scan_ch->tpc.tx_gain = ((1 << 5) | (3 << 3)) | 3;
                 else {
                         scan_ch->tpc.tx_gain = ((1 << 5) | (5 << 3));
@@ -5319,41 +5032,23 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, int phymode,
         return added;
 }
 
-static void iwl3945_reset_channel_flag(struct iwl3945_priv *priv)
-{
-        int i, j;
-        for (i = 0; i < 3; i++) {
-                struct ieee80211_hw_mode *hw_mode = (void *)&priv->modes[i];
-                for (j = 0; j < hw_mode->num_channels; j++)
-                        hw_mode->channels[j].flag = hw_mode->channels[j].val;
-        }
-}
-
 static void iwl3945_init_hw_rates(struct iwl3945_priv *priv,
                               struct ieee80211_rate *rates)
 {
         int i;
 
         for (i = 0; i < IWL_RATE_COUNT; i++) {
-                rates[i].rate = iwl3945_rates[i].ieee * 5;
-                rates[i].val = i; /* Rate scaling will work on indexes */
-                rates[i].val2 = i;
-                rates[i].flags = IEEE80211_RATE_SUPPORTED;
-                /* Only OFDM have the bits-per-symbol set */
-                if ((i <= IWL_LAST_OFDM_RATE) && (i >= IWL_FIRST_OFDM_RATE))
-                        rates[i].flags |= IEEE80211_RATE_OFDM;
-                else {
+                rates[i].bitrate = iwl3945_rates[i].ieee * 5;
+                rates[i].hw_value = i; /* Rate scaling will work on indexes */
+                rates[i].hw_value_short = i;
+                rates[i].flags = 0;
+                if ((i > IWL_LAST_OFDM_RATE) || (i < IWL_FIRST_OFDM_RATE)) {
                         /*
-                         * If CCK 1M then set rate flag to CCK else CCK_2
-                         * which is CCK | PREAMBLE2
+                         * If CCK != 1M then set short preamble rate flag.
                          */
                         rates[i].flags |= (iwl3945_rates[i].plcp == 10) ?
-                                IEEE80211_RATE_CCK : IEEE80211_RATE_CCK_2;
+                                0 : IEEE80211_RATE_SHORT_PREAMBLE;
                 }
-
-                /* Set up which ones are basic rates... */
-                if (IWL_BASIC_RATES_MASK & (1 << i))
-                        rates[i].flags |= IEEE80211_RATE_BASIC;
         }
 }
 
@@ -5363,143 +5058,117 @@ static void iwl3945_init_hw_rates(struct iwl3945_priv *priv,
 static int iwl3945_init_geos(struct iwl3945_priv *priv)
 {
         struct iwl3945_channel_info *ch;
-        struct ieee80211_hw_mode *modes;
+        struct ieee80211_supported_band *sband;
         struct ieee80211_channel *channels;
         struct ieee80211_channel *geo_ch;
         struct ieee80211_rate *rates;
         int i = 0;
-        enum {
-                A = 0,
-                B = 1,
-                G = 2,
-        };
-        int mode_count = 3;
 
-        if (priv->modes) {
+        if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
+            priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
                 IWL_DEBUG_INFO("Geography modes already initialized.\n");
                 set_bit(STATUS_GEO_CONFIGURED, &priv->status);
                 return 0;
         }
 
-        modes = kzalloc(sizeof(struct ieee80211_hw_mode) * mode_count,
-                        GFP_KERNEL);
-        if (!modes)
-                return -ENOMEM;
-
         channels = kzalloc(sizeof(struct ieee80211_channel) *
                            priv->channel_count, GFP_KERNEL);
-        if (!channels) {
-                kfree(modes);
+        if (!channels)
                 return -ENOMEM;
-        }
 
-        rates = kzalloc((sizeof(struct ieee80211_rate) * (IWL_MAX_RATES + 1)),
+        rates = kzalloc((sizeof(struct ieee80211_rate) * (IWL_RATE_COUNT + 1)),
                         GFP_KERNEL);
         if (!rates) {
-                kfree(modes);
                 kfree(channels);
                 return -ENOMEM;
         }
 
-        /* 0 = 802.11a
-         * 1 = 802.11b
-         * 2 = 802.11g
-         */
-
         /* 5.2GHz channels start after the 2.4GHz channels */
-        modes[A].mode = MODE_IEEE80211A;
-        modes[A].channels = &channels[ARRAY_SIZE(iwl3945_eeprom_band_1)];
-        modes[A].rates = &rates[4];
-        modes[A].num_rates = 8; /* just OFDM */
-        modes[A].num_channels = 0;
-
-        modes[B].mode = MODE_IEEE80211B;
-        modes[B].channels = channels;
-        modes[B].rates = rates;
-        modes[B].num_rates = 4; /* just CCK */
-        modes[B].num_channels = 0;
-
-        modes[G].mode = MODE_IEEE80211G;
-        modes[G].channels = channels;
-        modes[G].rates = rates;
-        modes[G].num_rates = 12;        /* OFDM & CCK */
-        modes[G].num_channels = 0;
+        sband = &priv->bands[IEEE80211_BAND_5GHZ];
+        sband->channels = &channels[ARRAY_SIZE(iwl3945_eeprom_band_1)];
+        /* just OFDM */
+        sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
+        sband->n_bitrates = IWL_RATE_COUNT - IWL_FIRST_OFDM_RATE;
+
+        sband = &priv->bands[IEEE80211_BAND_2GHZ];
+        sband->channels = channels;
+        /* OFDM & CCK */
+        sband->bitrates = rates;
+        sband->n_bitrates = IWL_RATE_COUNT;
 
         priv->ieee_channels = channels;
         priv->ieee_rates = rates;
 
         iwl3945_init_hw_rates(priv, rates);
 
-        for (i = 0, geo_ch = channels; i < priv->channel_count; i++) {
+        for (i = 0;  i < priv->channel_count; i++) {
                 ch = &priv->channel_info[i];
 
-                if (!is_channel_valid(ch)) {
-                        IWL_DEBUG_INFO("Channel %d [%sGHz] is restricted -- "
-                                    "skipping.\n",
-                                    ch->channel, is_channel_a_band(ch) ?
-                                    "5.2" : "2.4");
+                /* FIXME: might be removed if scan is OK*/
+                if (!is_channel_valid(ch))
                         continue;
-                }
 
                 if (is_channel_a_band(ch))
-                        geo_ch = &modes[A].channels[modes[A].num_channels++];
-                else {
-                        geo_ch = &modes[B].channels[modes[B].num_channels++];
-                        modes[G].num_channels++;
-                }
+                        sband =  &priv->bands[IEEE80211_BAND_5GHZ];
+                else
+                        sband =  &priv->bands[IEEE80211_BAND_2GHZ];
+
+                geo_ch = &sband->channels[sband->n_channels++];
 
-                geo_ch->freq = ieee80211chan2mhz(ch->channel);
-                geo_ch->chan = ch->channel;
-                geo_ch->power_level = ch->max_power_avg;
-                geo_ch->antenna_max = 0xff;
+                geo_ch->center_freq = ieee80211_channel_to_frequency(ch->channel);
+                geo_ch->max_power = ch->max_power_avg;
+                geo_ch->max_antenna_gain = 0xff;
+                geo_ch->hw_value = ch->channel;
 
                 if (is_channel_valid(ch)) {
-                        geo_ch->flag = IEEE80211_CHAN_W_SCAN;
-                        if (ch->flags & EEPROM_CHANNEL_IBSS)
-                                geo_ch->flag |= IEEE80211_CHAN_W_IBSS;
+                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
 
-                        if (ch->flags & EEPROM_CHANNEL_ACTIVE)
-                                geo_ch->flag |= IEEE80211_CHAN_W_ACTIVE_SCAN;
+                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
+                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
 
                         if (ch->flags & EEPROM_CHANNEL_RADAR)
-                                geo_ch->flag |= IEEE80211_CHAN_W_RADAR_DETECT;
+                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
 
                         if (ch->max_power_avg > priv->max_channel_txpower_limit)
                                 priv->max_channel_txpower_limit =
                                     ch->max_power_avg;
+                } else {
+                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
                 }
 
-                geo_ch->val = geo_ch->flag;
+                /* Save flags for reg domain usage */
+                geo_ch->orig_flags = geo_ch->flags;
+
+                IWL_DEBUG_INFO("Channel %d Freq=%d[%sGHz] %s flag=0%X\n",
+                                ch->channel, geo_ch->center_freq,
+                                is_channel_a_band(ch) ?  "5.2" : "2.4",
+                                geo_ch->flags & IEEE80211_CHAN_DISABLED ?
+                                "restricted" : "valid",
+                                 geo_ch->flags);
         }
 
-        if ((modes[A].num_channels == 0) && priv->is_abg) {
+        if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
+             priv->cfg->sku & IWL_SKU_A) {
                 printk(KERN_INFO DRV_NAME
                        ": Incorrectly detected BG card as ABG.  Please send "
                        "your PCI ID 0x%04X:0x%04X to maintainer.\n",
                        priv->pci_dev->device, priv->pci_dev->subsystem_device);
-                priv->is_abg = 0;
+                 priv->cfg->sku &= ~IWL_SKU_A;
         }
 
         printk(KERN_INFO DRV_NAME
                ": Tunable channels: %d 802.11bg, %d 802.11a channels\n",
-               modes[G].num_channels, modes[A].num_channels);
-
-        /*
-         * NOTE:  We register these in preference of order -- the
-         * stack doesn't currently (as of 7.0.6 / Apr 24 '07) pick
-         * a phymode based on rates or AP capabilities but seems to
-         * configure it purely on if the channel being configured
-         * is supported by a mode -- and the first match is taken
-         */
+               priv->bands[IEEE80211_BAND_2GHZ].n_channels,
+               priv->bands[IEEE80211_BAND_5GHZ].n_channels);
 
-        if (modes[G].num_channels)
-                ieee80211_register_hwmode(priv->hw, &modes[G]);
-        if (modes[B].num_channels)
-                ieee80211_register_hwmode(priv->hw, &modes[B]);
-        if (modes[A].num_channels)
-                ieee80211_register_hwmode(priv->hw, &modes[A]);
+        if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)
+                priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+                        &priv->bands[IEEE80211_BAND_2GHZ];
+        if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)
+                priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                        &priv->bands[IEEE80211_BAND_5GHZ];
 
-        priv->modes = modes;
         set_bit(STATUS_GEO_CONFIGURED, &priv->status);
 
         return 0;
@@ -5510,7 +5179,6 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
  */
 static void iwl3945_free_geos(struct iwl3945_priv *priv)
 {
-        kfree(priv->modes);
         kfree(priv->ieee_channels);
         kfree(priv->ieee_rates);
         clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
@@ -5837,7 +5505,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
         int ret = 0;
         const struct firmware *ucode_raw;
         /* firmware file name contains uCode/driver compatibility version */
-        const char *name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode";
+        const char *name = priv->cfg->fw_name;
         u8 *src;
         size_t len;
         u32 ver, inst_size, data_size, init_size, init_data_size, boot_size;
@@ -6209,6 +5877,8 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
 
         iwl3945_reg_txpower_periodic(priv);
 
+        iwl3945_led_register(priv);
+
         IWL_DEBUG_INFO("ALIVE processing complete.\n");
         set_bit(STATUS_READY, &priv->status);
         wake_up_interruptible(&priv->wait_command_queue);
@@ -6216,6 +5886,7 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
         if (priv->error_recovering)
                 iwl3945_error_recovery(priv);
 
+        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
         return;
 
  restart:
@@ -6237,6 +5908,7 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
         if (!exit_pending)
                 set_bit(STATUS_EXIT_PENDING, &priv->status);
 
+        iwl3945_led_unregister(priv);
         iwl3945_clear_stations_table(priv);
 
         /* Unblock any waiting calls */
@@ -6251,7 +5923,10 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
         iwl3945_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
 
         /* tell the device to stop sending interrupts */
+        spin_lock_irqsave(&priv->lock, flags);
         iwl3945_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->lock, flags);
+        iwl_synchronize_irq(priv);
 
         if (priv->mac80211_registered)
                 ieee80211_stop_queues(priv->hw);
@@ -6519,7 +6194,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
         struct iwl3945_scan_cmd *scan;
         struct ieee80211_conf *conf = NULL;
         u8 direct_mask;
-        int phymode;
+        enum ieee80211_band band;
 
         conf = ieee80211_get_hw_conf(priv->hw);
 
@@ -6651,13 +6326,13 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
                 scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
                 scan->tx_cmd.rate = IWL_RATE_1M_PLCP;
                 scan->good_CRC_th = 0;
-                phymode = MODE_IEEE80211G;
+                band = IEEE80211_BAND_2GHZ;
                 break;
 
         case 1:
                 scan->tx_cmd.rate = IWL_RATE_6M_PLCP;
                 scan->good_CRC_th = IWL_GOOD_CRC_TH;
-                phymode = MODE_IEEE80211A;
+                band = IEEE80211_BAND_5GHZ;
                 break;
 
         default:
@@ -6671,18 +6346,23 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
         if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR)
                 scan->filter_flags = RXON_FILTER_PROMISC_MSK;
 
-        if (direct_mask)
+        if (direct_mask) {
                 IWL_DEBUG_SCAN
                     ("Initiating direct scan for %s.\n",
                      iwl3945_escape_essid(priv->essid, priv->essid_len));
-        else
+                scan->channel_count =
+                        iwl3945_get_channels_for_scan(
+                                priv, band, 1, /* active */
+                                direct_mask,
+                                (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
+        } else {
                 IWL_DEBUG_SCAN("Initiating indirect scan.\n");
-
-        scan->channel_count =
-                iwl3945_get_channels_for_scan(
-                        priv, phymode, 1, /* active */
-                        direct_mask,
-                        (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
+                scan->channel_count =
+                        iwl3945_get_channels_for_scan(
+                                priv, band, 0, /* passive */
+                                direct_mask,
+                                (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
+        }
 
         cmd.len += le16_to_cpu(scan->tx_cmd.len) +
             scan->channel_count * sizeof(struct iwl3945_scan_channel);
@@ -6825,7 +6505,7 @@ static void iwl3945_bg_post_associate(struct work_struct *data)
                 iwl3945_add_station(priv, iwl3945_broadcast_addr, 0, 0);
                 iwl3945_add_station(priv, priv->bssid, 0, 0);
                 iwl3945_sync_sta(priv, IWL_STA_ID,
-                                 (priv->phymode == MODE_IEEE80211A)?
+                                 (priv->band == IEEE80211_BAND_5GHZ) ?
                                  IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
                                  CMD_ASYNC);
                 iwl3945_rate_scale_init(priv->hw, IWL_STA_ID);
@@ -6841,9 +6521,8 @@ static void iwl3945_bg_post_associate(struct work_struct *data)
 
         iwl3945_sequence_reset(priv);
 
-#ifdef CONFIG_IWL3945_QOS
         iwl3945_activate_qos(priv, 0);
-#endif /* CONFIG_IWL3945_QOS */
+
         /* we have just associated, don't start scan too early */
         priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;
         mutex_unlock(&priv->mutex);
@@ -7020,7 +6699,7 @@ static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         }
 
         IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
-                     ctl->tx_rate);
+                     ctl->tx_rate->bitrate);
 
         if (iwl3945_tx_skb(priv, skb, ctl))
                 dev_kfree_skb_any(skb);
@@ -7079,7 +6758,7 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
         int ret = 0;
 
         mutex_lock(&priv->mutex);
-        IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel);
+        IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel->hw_value);
 
         priv->add_radiotap = !!(conf->flags & IEEE80211_CONF_RADIOTAP);
 
@@ -7099,19 +6778,20 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        ch_info = iwl3945_get_channel_info(priv, conf->phymode, conf->channel);
+        ch_info = iwl3945_get_channel_info(priv, conf->channel->band,
+                                           conf->channel->hw_value);
         if (!is_channel_valid(ch_info)) {
                 IWL_DEBUG_SCAN("Channel %d [%d] is INVALID for this SKU.\n",
-                               conf->channel, conf->phymode);
+                               conf->channel->hw_value, conf->channel->band);
                 IWL_DEBUG_MAC80211("leave - invalid channel\n");
                 spin_unlock_irqrestore(&priv->lock, flags);
                 ret = -EINVAL;
                 goto out;
         }
 
-        iwl3945_set_rxon_channel(priv, conf->phymode, conf->channel);
+        iwl3945_set_rxon_channel(priv, conf->channel->band, conf->channel->hw_value);
 
-        iwl3945_set_flags_for_phymode(priv, conf->phymode);
+        iwl3945_set_flags_for_phymode(priv, conf->channel->band);
 
         /* The list of supported rates and rate mask can be different
          * for each phymode; since the phymode may have changed, reset
@@ -7225,6 +6905,12 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
         if (conf == NULL)
                 return -EIO;
 
+        if (priv->vif != vif) {
+                IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");
+                mutex_unlock(&priv->mutex);
+                return 0;
+        }
+
         /* XXX: this MUST use conf->mac_addr */
 
         if ((priv->iw_mode == IEEE80211_IF_TYPE_AP) &&
@@ -7249,17 +6935,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
         if (unlikely(test_bit(STATUS_SCANNING, &priv->status)) &&
             !(priv->hw->flags & IEEE80211_HW_NO_PROBE_FILTERING)) {
  */
-        if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) {
-                IWL_DEBUG_MAC80211("leave - scanning\n");
-                mutex_unlock(&priv->mutex);
-                return 0;
-        }
-
-        if (priv->vif != vif) {
-                IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");
-                mutex_unlock(&priv->mutex);
-                return 0;
-        }
 
         if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
                 if (!conf->bssid) {
@@ -7487,10 +7162,8 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,
                            const struct ieee80211_tx_queue_params *params)
 {
         struct iwl3945_priv *priv = hw->priv;
-#ifdef CONFIG_IWL3945_QOS
         unsigned long flags;
         int q;
-#endif /* CONFIG_IWL3945_QOS */
 
         IWL_DEBUG_MAC80211("enter\n");
 
@@ -7504,7 +7177,6 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,
                 return 0;
         }
 
-#ifdef CONFIG_IWL3945_QOS
         if (!priv->qos_data.qos_enable) {
                 priv->qos_data.qos_active = 0;
                 IWL_DEBUG_MAC80211("leave - qos not enabled\n");
@@ -7518,7 +7190,7 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,
         priv->qos_data.def_qos_parm.ac[q].cw_max = cpu_to_le16(params->cw_max);
         priv->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
         priv->qos_data.def_qos_parm.ac[q].edca_txop =
-                        cpu_to_le16((params->burst_time * 100));
+                        cpu_to_le16((params->txop * 32));
 
         priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
         priv->qos_data.qos_active = 1;
@@ -7533,8 +7205,6 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,
 
         mutex_unlock(&priv->mutex);
 
-#endif /*CONFIG_IWL3945_QOS */
-
         IWL_DEBUG_MAC80211("leave\n");
         return 0;
 }
@@ -7599,9 +7269,8 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
         mutex_lock(&priv->mutex);
         IWL_DEBUG_MAC80211("enter\n");
 
-#ifdef CONFIG_IWL3945_QOS
         iwl3945_reset_qos(priv);
-#endif
+
         cancel_delayed_work(&priv->post_associate);
 
         spin_lock_irqsave(&priv->lock, flags);
@@ -7689,9 +7358,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
         IWL_DEBUG_MAC80211("leave\n");
         spin_unlock_irqrestore(&priv->lock, flags);
 
-#ifdef CONFIG_IWL3945_QOS
         iwl3945_reset_qos(priv);
-#endif
 
         queue_work(priv->workqueue, &priv->post_associate.work);
 
@@ -7892,65 +7559,6 @@ static ssize_t store_filter_flags(struct device *d,
 static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags,
                    store_filter_flags);
 
-static ssize_t show_tune(struct device *d,
-                         struct device_attribute *attr, char *buf)
-{
-        struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data;
-
-        return sprintf(buf, "0x%04X\n",
-                       (priv->phymode << 8) |
-                        le16_to_cpu(priv->active_rxon.channel));
-}
-
-static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv, u8 phymode);
-
-static ssize_t store_tune(struct device *d,
-                          struct device_attribute *attr,
-                          const char *buf, size_t count)
-{
-        struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data;
-        char *p = (char *)buf;
-        u16 tune = simple_strtoul(p, &p, 0);
-        u8 phymode = (tune >> 8) & 0xff;
-        u16 channel = tune & 0xff;
-
-        IWL_DEBUG_INFO("Tune request to:%d channel:%d\n", phymode, channel);
-
-        mutex_lock(&priv->mutex);
-        if ((le16_to_cpu(priv->staging_rxon.channel) != channel) ||
-            (priv->phymode != phymode)) {
-                const struct iwl3945_channel_info *ch_info;
-
-                ch_info = iwl3945_get_channel_info(priv, phymode, channel);
-                if (!ch_info) {
-                        IWL_WARNING("Requested invalid phymode/channel "
-                                    "combination: %d %d\n", phymode, channel);
-                        mutex_unlock(&priv->mutex);
-                        return -EINVAL;
-                }
-
-                /* Cancel any currently running scans... */
-                if (iwl3945_scan_cancel_timeout(priv, 100))
-                        IWL_WARNING("Could not cancel scan.\n");
-                else {
-                        IWL_DEBUG_INFO("Committing phymode and "
-                                       "rxon.channel = %d %d\n",
-                                       phymode, channel);
-
-                        iwl3945_set_rxon_channel(priv, phymode, channel);
-                        iwl3945_set_flags_for_phymode(priv, phymode);
-
-                        iwl3945_set_rate(priv);
-                        iwl3945_commit_rxon(priv);
-                }
-        }
-        mutex_unlock(&priv->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(tune, S_IWUSR | S_IRUGO, show_tune, store_tune);
-
 #ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
 
 static ssize_t show_measurement(struct device *d,
@@ -8024,31 +7632,6 @@ static DEVICE_ATTR(measurement, S_IRUSR | S_IWUSR,
                    show_measurement, store_measurement);
 #endif /* CONFIG_IWL3945_SPECTRUM_MEASUREMENT */
 
-static ssize_t show_rate(struct device *d,
-                         struct device_attribute *attr, char *buf)
-{
-        struct iwl3945_priv *priv = dev_get_drvdata(d);
-        unsigned long flags;
-        int i;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        if (priv->iw_mode == IEEE80211_IF_TYPE_STA)
-                i = priv->stations[IWL_AP_ID].current_rate.s.rate;
-        else
-                i = priv->stations[IWL_STA_ID].current_rate.s.rate;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        i = iwl3945_rate_index_from_plcp(i);
-        if (i == -1)
-                return sprintf(buf, "0\n");
-
-        return sprintf(buf, "%d%s\n",
-                       (iwl3945_rates[i].ieee >> 1),
-                       (iwl3945_rates[i].ieee & 0x1) ? ".5" : "");
-}
-
-static DEVICE_ATTR(rate, S_IRUSR, show_rate, NULL);
-
 static ssize_t store_retry_rate(struct device *d,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
@@ -8165,73 +7748,8 @@ static DEVICE_ATTR(power_level, S_IWUSR | S_IRUSR, show_power_level,
 static ssize_t show_channels(struct device *d,
                              struct device_attribute *attr, char *buf)
 {
-        struct iwl3945_priv *priv = dev_get_drvdata(d);
-        int len = 0, i;
-        struct ieee80211_channel *channels = NULL;
-        const struct ieee80211_hw_mode *hw_mode = NULL;
-        int count = 0;
-
-        if (!iwl3945_is_ready(priv))
-                return -EAGAIN;
-
-        hw_mode = iwl3945_get_hw_mode(priv, MODE_IEEE80211G);
-        if (!hw_mode)
-                hw_mode = iwl3945_get_hw_mode(priv, MODE_IEEE80211B);
-        if (hw_mode) {
-                channels = hw_mode->channels;
-                count = hw_mode->num_channels;
-        }
-
-        len +=
-            sprintf(&buf[len],
-                    "Displaying %d channels in 2.4GHz band "
-                    "(802.11bg):\n", count);
-
-        for (i = 0; i < count; i++)
-                len += sprintf(&buf[len], "%d: %ddBm: BSS%s%s, %s.\n",
-                               channels[i].chan,
-                               channels[i].power_level,
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_RADAR_DETECT ?
-                               " (IEEE 802.11h required)" : "",
-                               (!(channels[i].flag & IEEE80211_CHAN_W_IBSS)
-                                || (channels[i].
-                                    flag &
-                                    IEEE80211_CHAN_W_RADAR_DETECT)) ? "" :
-                               ", IBSS",
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_ACTIVE_SCAN ?
-                               "active/passive" : "passive only");
-
-        hw_mode = iwl3945_get_hw_mode(priv, MODE_IEEE80211A);
-        if (hw_mode) {
-                channels = hw_mode->channels;
-                count = hw_mode->num_channels;
-        } else {
-                channels = NULL;
-                count = 0;
-        }
-
-        len += sprintf(&buf[len], "Displaying %d channels in 5.2GHz band "
-                       "(802.11a):\n", count);
-
-        for (i = 0; i < count; i++)
-                len += sprintf(&buf[len], "%d: %ddBm: BSS%s%s, %s.\n",
-                               channels[i].chan,
-                               channels[i].power_level,
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_RADAR_DETECT ?
-                               " (IEEE 802.11h required)" : "",
-                               (!(channels[i].flag & IEEE80211_CHAN_W_IBSS)
-                                || (channels[i].
-                                    flag &
-                                    IEEE80211_CHAN_W_RADAR_DETECT)) ? "" :
-                               ", IBSS",
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_ACTIVE_SCAN ?
-                               "active/passive" : "passive only");
-
-        return len;
+        /* all this shit doesn't belong into sysfs anyway */
+        return 0;
 }
 
 static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);
@@ -8404,14 +7922,12 @@ static struct attribute *iwl3945_sysfs_entries[] = {
         &dev_attr_measurement.attr,
 #endif
         &dev_attr_power_level.attr,
-        &dev_attr_rate.attr,
         &dev_attr_retry_rate.attr,
         &dev_attr_rf_kill.attr,
         &dev_attr_rs_window.attr,
         &dev_attr_statistics.attr,
         &dev_attr_status.attr,
         &dev_attr_temperature.attr,
-        &dev_attr_tune.attr,
         &dev_attr_tx_power.attr,
 
         NULL
@@ -8444,10 +7960,11 @@ static struct ieee80211_ops iwl3945_hw_ops = {
 static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int err = 0;
-        u32 pci_id;
         struct iwl3945_priv *priv;
         struct ieee80211_hw *hw;
+        struct iwl_3945_cfg *cfg = (struct iwl_3945_cfg *)(ent->driver_data);
         int i;
+        unsigned long flags;
         DECLARE_MAC_BUF(mac);
 
         /* Disabling hardware scan means that mac80211 will perform scans
@@ -8457,10 +7974,10 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
                 iwl3945_hw_ops.hw_scan = NULL;
         }
 
-        if ((iwl3945_param_queues_num > IWL_MAX_NUM_QUEUES) ||
+        if ((iwl3945_param_queues_num > IWL39_MAX_NUM_QUEUES) ||
             (iwl3945_param_queues_num < IWL_MIN_NUM_QUEUES)) {
                 IWL_ERROR("invalid queues_num, should be between %d and %d\n",
-                          IWL_MIN_NUM_QUEUES, IWL_MAX_NUM_QUEUES);
+                          IWL_MIN_NUM_QUEUES, IWL39_MAX_NUM_QUEUES);
                 err = -EINVAL;
                 goto out;
         }
@@ -8482,6 +7999,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         priv->hw = hw;
 
         priv->pci_dev = pdev;
+        priv->cfg = cfg;
 
         /* Select antenna (may be helpful if only one antenna is connected) */
         priv->antenna = (enum iwl3945_antenna)iwl3945_param_antenna;
@@ -8532,7 +8050,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         priv->data_retry_limit = -1;
         priv->ieee_channels = NULL;
         priv->ieee_rates = NULL;
-        priv->phymode = -1;
+        priv->band = IEEE80211_BAND_2GHZ;
 
         err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         if (!err)
@@ -8571,32 +8089,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
         priv->iw_mode = IEEE80211_IF_TYPE_STA;
 
-        pci_id =
-            (priv->pci_dev->device << 16) | priv->pci_dev->subsystem_device;
-
-        switch (pci_id) {
-        case 0x42221005:        /* 0x4222 0x8086 0x1005 is BG SKU */
-        case 0x42221034:        /* 0x4222 0x8086 0x1034 is BG SKU */
-        case 0x42271014:        /* 0x4227 0x8086 0x1014 is BG SKU */
-        case 0x42221044:        /* 0x4222 0x8086 0x1044 is BG SKU */
-                priv->is_abg = 0;
-                break;
-
-        /*
-         * Rest are assumed ABG SKU -- if this is not the
-         * case then the card will get the wrong 'Detected'
-         * line in the kernel log however the code that
-         * initializes the GEO table will detect no A-band
-         * channels and remove the is_abg mask.
-         */
-        default:
-                priv->is_abg = 1;
-                break;
-        }
-
         printk(KERN_INFO DRV_NAME
-               ": Detected Intel PRO/Wireless 3945%sBG Network Connection\n",
-               priv->is_abg ? "A" : "");
+                ": Detected Intel Wireless WiFi Link %s\n", priv->cfg->name);
 
         /* Device-specific setup */
         if (iwl3945_hw_set_hw_setting(priv)) {
@@ -8604,7 +8098,6 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
                 goto out_iounmap;
         }
 
-#ifdef CONFIG_IWL3945_QOS
         if (iwl3945_param_qos_enable)
                 priv->qos_data.qos_enable = 1;
 
@@ -8612,9 +8105,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
         priv->qos_data.qos_active = 0;
         priv->qos_data.qos_cap.val = 0;
-#endif /* CONFIG_IWL3945_QOS */
 
-        iwl3945_set_rxon_channel(priv, MODE_IEEE80211G, 6);
+        iwl3945_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6);
         iwl3945_setup_deferred_work(priv);
         iwl3945_setup_rx_handlers(priv);
 
@@ -8623,7 +8115,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         priv->power_mode = IWL_POWER_AC;
         priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
 
+        spin_lock_irqsave(&priv->lock, flags);
         iwl3945_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group);
         if (err) {
@@ -8665,9 +8159,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
                 IWL_ERROR("initializing geos failed: %d\n", err);
                 goto out_free_channel_map;
         }
-        iwl3945_reset_channel_flag(priv);
 
-        iwl3945_rate_control_register(priv->hw);
         err = ieee80211_register_hw(priv->hw);
         if (err) {
                 IWL_ERROR("Failed to register network device (error %d)\n", err);
@@ -8711,6 +8203,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
         struct iwl3945_priv *priv = pci_get_drvdata(pdev);
         struct list_head *p, *q;
         int i;
+        unsigned long flags;
 
         if (!priv)
                 return;
@@ -8721,6 +8214,15 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 
         iwl3945_down(priv);
 
+        /* make sure we flush any pending irq or
+         * tasklet for the driver
+         */
+        spin_lock_irqsave(&priv->lock, flags);
+        iwl3945_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        iwl_synchronize_irq(priv);
+
         /* Free MAC hash list for ADHOC */
         for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++) {
                 list_for_each_safe(p, q, &priv->ibss_mac_hash[i]) {
@@ -8742,7 +8244,6 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 
         if (priv->mac80211_registered) {
                 ieee80211_unregister_hw(priv->hw);
-                iwl3945_rate_control_unregister(priv->hw);
         }
 
         /*netif_stop_queue(dev); */
@@ -8823,21 +8324,35 @@ static int __init iwl3945_init(void)
         int ret;
         printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
         printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
+
+        ret = iwl3945_rate_control_register();
+        if (ret) {
+                IWL_ERROR("Unable to register rate control algorithm: %d\n", ret);
+                return ret;
+        }
+
         ret = pci_register_driver(&iwl3945_driver);
         if (ret) {
                 IWL_ERROR("Unable to initialize PCI module\n");
-                return ret;
+                goto error_register;
         }
 #ifdef CONFIG_IWL3945_DEBUG
         ret = driver_create_file(&iwl3945_driver.driver, &driver_attr_debug_level);
         if (ret) {
                 IWL_ERROR("Unable to create driver sysfs file\n");
-                pci_unregister_driver(&iwl3945_driver);
-                return ret;
+                goto error_debug;
         }
 #endif
 
         return ret;
+
+#ifdef CONFIG_IWL3945_DEBUG
+error_debug:
+        pci_unregister_driver(&iwl3945_driver);
+#endif
+error_register:
+        iwl3945_rate_control_unregister();
+        return ret;
 }
 
 static void __exit iwl3945_exit(void)
@@ -8846,6 +8361,7 @@ static void __exit iwl3945_exit(void)
         driver_remove_file(&iwl3945_driver.driver, &driver_attr_debug_level);
 #endif
         pci_unregister_driver(&iwl3945_driver);
+        iwl3945_rate_control_unregister();
 }
 
 module_param_named(antenna, iwl3945_param_antenna, int, 0444);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 60ec29eab85a..d7e2358a213a 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -45,14 +45,14 @@
 
 #include <asm/div64.h>
 
+#include "iwl-eeprom.h"
 #include "iwl-4965.h"
+#include "iwl-core.h"
+#include "iwl-io.h"
 #include "iwl-helpers.h"
+#include "iwl-sta.h"
 
-#ifdef CONFIG_IWL4965_DEBUG
-u32 iwl4965_debug_level;
-#endif
-
-static int iwl4965_tx_queue_update_write_ptr(struct iwl4965_priv *priv,
+static int iwl4965_tx_queue_update_write_ptr(struct iwl_priv *priv,
                                   struct iwl4965_tx_queue *txq);
 
 /******************************************************************************
@@ -61,16 +61,6 @@ static int iwl4965_tx_queue_update_write_ptr(struct iwl4965_priv *priv,
  *
  ******************************************************************************/
 
-/* module parameters */
-static int iwl4965_param_disable_hw_scan; /* def: 0 = use 4965's h/w scan */
-static int iwl4965_param_debug;    /* def: 0 = minimal debug log messages */
-static int iwl4965_param_disable;  /* def: enable radio */
-static int iwl4965_param_antenna;  /* def: 0 = both antennas (use diversity) */
-int iwl4965_param_hwcrypto;        /* def: using software encryption */
-static int iwl4965_param_qos_enable = 1; /* def: 1 = use quality of service */
-int iwl4965_param_queues_num = IWL_MAX_NUM_QUEUES; /* def: 16 Tx queues */
-int iwl4965_param_amsdu_size_8K;   /* def: enable 8K amsdu size */
-
 /*
  * module name, copyright, version, etc.
  * NOTE: DRV_NAME is defined in iwlwifi.h for use by iwl-debug.h and printk
@@ -78,7 +68,7 @@ int iwl4965_param_amsdu_size_8K;   /* def: enable 8K amsdu size */
 
 #define DRV_DESCRIPTION "Intel(R) Wireless WiFi Link 4965AGN driver for Linux"
 
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
 #define VD "d"
 #else
 #define VD
@@ -90,15 +80,8 @@ int iwl4965_param_amsdu_size_8K;   /* def: enable 8K amsdu size */
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "1.2.23k" VD VS
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2007 Intel Corporation"
-#define DRV_VERSION     IWLWIFI_VERSION
+#define DRV_VERSION     IWLWIFI_VERSION VD VS
 
-/* Change firmware file name, using "-" and incrementing number,
- *   *only* when uCode interface or architecture changes so that it
- *   is not compatible with earlier drivers.
- * This number will also appear in << 8 position of 1st dword of uCode file */
-#define IWL4965_UCODE_API "-1"
 
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_VERSION(DRV_VERSION);
@@ -115,16 +98,10 @@ __le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr)
         return NULL;
 }
 
-static const struct ieee80211_hw_mode *iwl4965_get_hw_mode(
-                struct iwl4965_priv *priv, int mode)
+static const struct ieee80211_supported_band *iwl4965_get_hw_mode(
+                struct iwl_priv *priv, enum ieee80211_band band)
 {
-        int i;
-
-        for (i = 0; i < 3; i++)
-                if (priv->modes[i].mode == mode)
-                        return &priv->modes[i];
-
-        return NULL;
+        return priv->hw->wiphy->bands[band];
 }
 
 static int iwl4965_is_empty_essid(const char *essid, int essid_len)
@@ -167,17 +144,6 @@ static const char *iwl4965_escape_essid(const char *essid, u8 essid_len)
         return escaped;
 }
 
-static void iwl4965_print_hex_dump(int level, void *p, u32 len)
-{
-#ifdef CONFIG_IWL4965_DEBUG
-        if (!(iwl4965_debug_level & level))
-                return;
-
-        print_hex_dump(KERN_DEBUG, "iwl data: ", DUMP_PREFIX_OFFSET, 16, 1,
-                        p, len, 1);
-#endif
-}
-
 /*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****
  * DMA services
  *
@@ -205,7 +171,7 @@ static void iwl4965_print_hex_dump(int level, void *p, u32 len)
  * See more detailed info in iwl-4965-hw.h.
  ***************************************************/
 
-static int iwl4965_queue_space(const struct iwl4965_queue *q)
+int iwl4965_queue_space(const struct iwl4965_queue *q)
 {
         int s = q->read_ptr - q->write_ptr;
 
@@ -221,25 +187,6 @@ static int iwl4965_queue_space(const struct iwl4965_queue *q)
         return s;
 }
 
-/**
- * iwl4965_queue_inc_wrap - increment queue index, wrap back to beginning
- * @index -- current index
- * @n_bd -- total number of entries in queue (must be power of 2)
- */
-static inline int iwl4965_queue_inc_wrap(int index, int n_bd)
-{
-        return ++index & (n_bd - 1);
-}
-
-/**
- * iwl4965_queue_dec_wrap - decrement queue index, wrap back to end
- * @index -- current index
- * @n_bd -- total number of entries in queue (must be power of 2)
- */
-static inline int iwl4965_queue_dec_wrap(int index, int n_bd)
-{
-        return --index & (n_bd - 1);
-}
 
 static inline int x2_queue_used(const struct iwl4965_queue *q, int i)
 {
@@ -261,15 +208,15 @@ static inline u8 get_cmd_index(struct iwl4965_queue *q, u32 index, int is_huge)
 /**
  * iwl4965_queue_init - Initialize queue's high/low-water and read/write indexes
  */
-static int iwl4965_queue_init(struct iwl4965_priv *priv, struct iwl4965_queue *q,
+static int iwl4965_queue_init(struct iwl_priv *priv, struct iwl4965_queue *q,
                           int count, int slots_num, u32 id)
 {
         q->n_bd = count;
         q->n_window = slots_num;
         q->id = id;
 
-        /* count must be power-of-two size, otherwise iwl4965_queue_inc_wrap
-         * and iwl4965_queue_dec_wrap are broken. */
+        /* count must be power-of-two size, otherwise iwl_queue_inc_wrap
+         * and iwl_queue_dec_wrap are broken. */
         BUG_ON(!is_power_of_2(count));
 
         /* slots_num must be power-of-two size, otherwise
@@ -292,7 +239,7 @@ static int iwl4965_queue_init(struct iwl4965_priv *priv, struct iwl4965_queue *q
 /**
  * iwl4965_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue
  */
-static int iwl4965_tx_queue_alloc(struct iwl4965_priv *priv,
+static int iwl4965_tx_queue_alloc(struct iwl_priv *priv,
                               struct iwl4965_tx_queue *txq, u32 id)
 {
         struct pci_dev *dev = priv->pci_dev;
@@ -337,7 +284,7 @@ static int iwl4965_tx_queue_alloc(struct iwl4965_priv *priv,
 /**
  * iwl4965_tx_queue_init - Allocate and initialize one tx/cmd queue
  */
-int iwl4965_tx_queue_init(struct iwl4965_priv *priv,
+int iwl4965_tx_queue_init(struct iwl_priv *priv,
                       struct iwl4965_tx_queue *txq, int slots_num, u32 txq_id)
 {
         struct pci_dev *dev = priv->pci_dev;
@@ -352,7 +299,7 @@ int iwl4965_tx_queue_init(struct iwl4965_priv *priv,
          * For normal Tx queues (all other queues), no super-size command
          * space is needed.
          */
-        len = sizeof(struct iwl4965_cmd) * slots_num;
+        len = sizeof(struct iwl_cmd) * slots_num;
         if (txq_id == IWL_CMD_QUEUE_NUM)
                 len +=  IWL_MAX_SCAN_SIZE;
         txq->cmd = pci_alloc_consistent(dev, len, &txq->dma_addr_cmd);
@@ -369,7 +316,7 @@ int iwl4965_tx_queue_init(struct iwl4965_priv *priv,
         txq->need_update = 0;
 
         /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
-         * iwl4965_queue_inc_wrap and iwl4965_queue_dec_wrap are broken. */
+         * iwl_queue_inc_wrap and iwl_queue_dec_wrap are broken. */
         BUILD_BUG_ON(TFD_QUEUE_SIZE_MAX & (TFD_QUEUE_SIZE_MAX - 1));
 
         /* Initialize queue's high/low-water marks, and head/tail indexes */
@@ -389,7 +336,7 @@ int iwl4965_tx_queue_init(struct iwl4965_priv *priv,
  * Free all buffers.
  * 0-fill, but do not free "txq" descriptor structure.
  */
-void iwl4965_tx_queue_free(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq)
+void iwl4965_tx_queue_free(struct iwl_priv *priv, struct iwl4965_tx_queue *txq)
 {
         struct iwl4965_queue *q = &txq->q;
         struct pci_dev *dev = priv->pci_dev;
@@ -400,10 +347,10 @@ void iwl4965_tx_queue_free(struct iwl4965_priv *priv, struct iwl4965_tx_queue *t
 
         /* first, empty all BD's */
         for (; q->write_ptr != q->read_ptr;
-             q->read_ptr = iwl4965_queue_inc_wrap(q->read_ptr, q->n_bd))
+             q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd))
                 iwl4965_hw_txq_free_tfd(priv, txq);
 
-        len = sizeof(struct iwl4965_cmd) * q->n_window;
+        len = sizeof(struct iwl_cmd) * q->n_window;
         if (q->id == IWL_CMD_QUEUE_NUM)
                 len += IWL_MAX_SCAN_SIZE;
 
@@ -440,7 +387,7 @@ const u8 iwl4965_broadcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
  *
  * NOTE:  This does not remove station from device's station table.
  */
-static u8 iwl4965_remove_station(struct iwl4965_priv *priv, const u8 *addr, int is_ap)
+static u8 iwl4965_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
         int index = IWL_INVALID_STATION;
         int i;
@@ -451,9 +398,9 @@ static u8 iwl4965_remove_station(struct iwl4965_priv *priv, const u8 *addr, int
         if (is_ap)
                 index = IWL_AP_ID;
         else if (is_broadcast_ether_addr(addr))
-                index = priv->hw_setting.bcast_sta_id;
+                index = priv->hw_params.bcast_sta_id;
         else
-                for (i = IWL_STA_ID; i < priv->hw_setting.max_stations; i++)
+                for (i = IWL_STA_ID; i < priv->hw_params.max_stations; i++)
                         if (priv->stations[i].used &&
                             !compare_ether_addr(priv->stations[i].sta.sta.addr,
                                                 addr)) {
@@ -478,26 +425,9 @@ out:
 #endif
 
 /**
- * iwl4965_clear_stations_table - Clear the driver's station table
- *
- * NOTE:  This does not clear or otherwise alter the device's station table.
- */
-static void iwl4965_clear_stations_table(struct iwl4965_priv *priv)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-
-        priv->num_stations = 0;
-        memset(priv->stations, 0, sizeof(priv->stations));
-
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-}
-
-/**
  * iwl4965_add_station_flags - Add station to tables in driver and device
  */
-u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
+u8 iwl4965_add_station_flags(struct iwl_priv *priv, const u8 *addr,
                                 int is_ap, u8 flags, void *ht_data)
 {
         int i;
@@ -510,9 +440,9 @@ u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
         if (is_ap)
                 index = IWL_AP_ID;
         else if (is_broadcast_ether_addr(addr))
-                index = priv->hw_setting.bcast_sta_id;
+                index = priv->hw_params.bcast_sta_id;
         else
-                for (i = IWL_STA_ID; i < priv->hw_setting.max_stations; i++) {
+                for (i = IWL_STA_ID; i < priv->hw_params.max_stations; i++) {
                         if (!compare_ether_addr(priv->stations[i].sta.sta.addr,
                                                 addr)) {
                                 index = i;
@@ -553,7 +483,7 @@ u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
 
 #ifdef CONFIG_IWL4965_HT
         /* BCAST station and IBSS stations do not work in HT mode */
-        if (index != priv->hw_setting.bcast_sta_id &&
+        if (index != priv->hw_params.bcast_sta_id &&
             priv->iw_mode != IEEE80211_IF_TYPE_IBSS)
                 iwl4965_set_ht_add_station(priv, index,
                                  (struct ieee80211_ht_info *) ht_data);
@@ -567,103 +497,10 @@ u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
 
 }
 
-/*************** DRIVER STATUS FUNCTIONS   *****/
-
-static inline int iwl4965_is_ready(struct iwl4965_priv *priv)
-{
-        /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
-         * set but EXIT_PENDING is not */
-        return test_bit(STATUS_READY, &priv->status) &&
-               test_bit(STATUS_GEO_CONFIGURED, &priv->status) &&
-               !test_bit(STATUS_EXIT_PENDING, &priv->status);
-}
-
-static inline int iwl4965_is_alive(struct iwl4965_priv *priv)
-{
-        return test_bit(STATUS_ALIVE, &priv->status);
-}
-
-static inline int iwl4965_is_init(struct iwl4965_priv *priv)
-{
-        return test_bit(STATUS_INIT, &priv->status);
-}
-
-static inline int iwl4965_is_rfkill(struct iwl4965_priv *priv)
-{
-        return test_bit(STATUS_RF_KILL_HW, &priv->status) ||
-               test_bit(STATUS_RF_KILL_SW, &priv->status);
-}
-
-static inline int iwl4965_is_ready_rf(struct iwl4965_priv *priv)
-{
-
-        if (iwl4965_is_rfkill(priv))
-                return 0;
 
-        return iwl4965_is_ready(priv);
-}
 
 /*************** HOST COMMAND QUEUE FUNCTIONS   *****/
 
-#define IWL_CMD(x) case x : return #x
-
-static const char *get_cmd_string(u8 cmd)
-{
-        switch (cmd) {
-                IWL_CMD(REPLY_ALIVE);
-                IWL_CMD(REPLY_ERROR);
-                IWL_CMD(REPLY_RXON);
-                IWL_CMD(REPLY_RXON_ASSOC);
-                IWL_CMD(REPLY_QOS_PARAM);
-                IWL_CMD(REPLY_RXON_TIMING);
-                IWL_CMD(REPLY_ADD_STA);
-                IWL_CMD(REPLY_REMOVE_STA);
-                IWL_CMD(REPLY_REMOVE_ALL_STA);
-                IWL_CMD(REPLY_TX);
-                IWL_CMD(REPLY_RATE_SCALE);
-                IWL_CMD(REPLY_LEDS_CMD);
-                IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);
-                IWL_CMD(RADAR_NOTIFICATION);
-                IWL_CMD(REPLY_QUIET_CMD);
-                IWL_CMD(REPLY_CHANNEL_SWITCH);
-                IWL_CMD(CHANNEL_SWITCH_NOTIFICATION);
-                IWL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);
-                IWL_CMD(SPECTRUM_MEASURE_NOTIFICATION);
-                IWL_CMD(POWER_TABLE_CMD);
-                IWL_CMD(PM_SLEEP_NOTIFICATION);
-                IWL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);
-                IWL_CMD(REPLY_SCAN_CMD);
-                IWL_CMD(REPLY_SCAN_ABORT_CMD);
-                IWL_CMD(SCAN_START_NOTIFICATION);
-                IWL_CMD(SCAN_RESULTS_NOTIFICATION);
-                IWL_CMD(SCAN_COMPLETE_NOTIFICATION);
-                IWL_CMD(BEACON_NOTIFICATION);
-                IWL_CMD(REPLY_TX_BEACON);
-                IWL_CMD(WHO_IS_AWAKE_NOTIFICATION);
-                IWL_CMD(QUIET_NOTIFICATION);
-                IWL_CMD(REPLY_TX_PWR_TABLE_CMD);
-                IWL_CMD(MEASURE_ABORT_NOTIFICATION);
-                IWL_CMD(REPLY_BT_CONFIG);
-                IWL_CMD(REPLY_STATISTICS_CMD);
-                IWL_CMD(STATISTICS_NOTIFICATION);
-                IWL_CMD(REPLY_CARD_STATE_CMD);
-                IWL_CMD(CARD_STATE_NOTIFICATION);
-                IWL_CMD(MISSED_BEACONS_NOTIFICATION);
-                IWL_CMD(REPLY_CT_KILL_CONFIG_CMD);
-                IWL_CMD(SENSITIVITY_CMD);
-                IWL_CMD(REPLY_PHY_CALIBRATION_CMD);
-                IWL_CMD(REPLY_RX_PHY_CMD);
-                IWL_CMD(REPLY_RX_MPDU_CMD);
-                IWL_CMD(REPLY_4965_RX);
-                IWL_CMD(REPLY_COMPRESSED_BA);
-        default:
-                return "UNKNOWN";
-
-        }
-}
-
-#define HOST_COMPLETE_TIMEOUT (HZ / 2)
-
 /**
  * iwl4965_enqueue_hcmd - enqueue a uCode command
  * @priv: device private data point
@@ -673,13 +510,13 @@ static const char *get_cmd_string(u8 cmd)
  * failed. On success, it turns the index (> 0) of command in the
  * command queue.
  */
-static int iwl4965_enqueue_hcmd(struct iwl4965_priv *priv, struct iwl4965_host_cmd *cmd)
+int iwl4965_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
 {
         struct iwl4965_tx_queue *txq = &priv->txq[IWL_CMD_QUEUE_NUM];
         struct iwl4965_queue *q = &txq->q;
         struct iwl4965_tfd_frame *tfd;
         u32 *control_flags;
-        struct iwl4965_cmd *out_cmd;
+        struct iwl_cmd *out_cmd;
         u32 idx;
         u16 fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr));
         dma_addr_t phys_addr;
@@ -692,7 +529,7 @@ static int iwl4965_enqueue_hcmd(struct iwl4965_priv *priv, struct iwl4965_host_c
         BUG_ON((fix_size > TFD_MAX_PAYLOAD_SIZE) &&
                !(cmd->meta.flags & CMD_SIZE_HUGE));
 
-        if (iwl4965_is_rfkill(priv)) {
+        if (iwl_is_rfkill(priv)) {
                 IWL_DEBUG_INFO("Not sending command - RF KILL");
                 return -EIO;
         }
@@ -726,7 +563,7 @@ static int iwl4965_enqueue_hcmd(struct iwl4965_priv *priv, struct iwl4965_host_c
                 out_cmd->hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME);
 
         phys_addr = txq->dma_addr_cmd + sizeof(txq->cmd[0]) * idx +
-                        offsetof(struct iwl4965_cmd, hdr);
+                        offsetof(struct iwl_cmd, hdr);
         iwl4965_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, fix_size);
 
         IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "
@@ -738,161 +575,25 @@ static int iwl4965_enqueue_hcmd(struct iwl4965_priv *priv, struct iwl4965_host_c
         txq->need_update = 1;
 
         /* Set up entry in queue's byte count circular buffer */
-        ret = iwl4965_tx_queue_update_wr_ptr(priv, txq, 0);
+        priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, 0);
 
         /* Increment and update queue's write index */
-        q->write_ptr = iwl4965_queue_inc_wrap(q->write_ptr, q->n_bd);
-        iwl4965_tx_queue_update_write_ptr(priv, txq);
+        q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
+        ret = iwl4965_tx_queue_update_write_ptr(priv, txq);
 
         spin_unlock_irqrestore(&priv->hcmd_lock, flags);
         return ret ? ret : idx;
 }
 
-static int iwl4965_send_cmd_async(struct iwl4965_priv *priv, struct iwl4965_host_cmd *cmd)
+static void iwl4965_set_rxon_hwcrypto(struct iwl_priv *priv, int hw_decrypt)
 {
-        int ret;
-
-        BUG_ON(!(cmd->meta.flags & CMD_ASYNC));
-
-        /* An asynchronous command can not expect an SKB to be set. */
-        BUG_ON(cmd->meta.flags & CMD_WANT_SKB);
-
-        /* An asynchronous command MUST have a callback. */
-        BUG_ON(!cmd->meta.u.callback);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return -EBUSY;
-
-        ret = iwl4965_enqueue_hcmd(priv, cmd);
-        if (ret < 0) {
-                IWL_ERROR("Error sending %s: iwl4965_enqueue_hcmd failed: %d\n",
-                          get_cmd_string(cmd->id), ret);
-                return ret;
-        }
-        return 0;
-}
-
-static int iwl4965_send_cmd_sync(struct iwl4965_priv *priv, struct iwl4965_host_cmd *cmd)
-{
-        int cmd_idx;
-        int ret;
-        static atomic_t entry = ATOMIC_INIT(0); /* reentrance protection */
-
-        BUG_ON(cmd->meta.flags & CMD_ASYNC);
-
-         /* A synchronous command can not have a callback set. */
-        BUG_ON(cmd->meta.u.callback != NULL);
-
-        if (atomic_xchg(&entry, 1)) {
-                IWL_ERROR("Error sending %s: Already sending a host command\n",
-                          get_cmd_string(cmd->id));
-                return -EBUSY;
-        }
-
-        set_bit(STATUS_HCMD_ACTIVE, &priv->status);
-
-        if (cmd->meta.flags & CMD_WANT_SKB)
-                cmd->meta.source = &cmd->meta;
-
-        cmd_idx = iwl4965_enqueue_hcmd(priv, cmd);
-        if (cmd_idx < 0) {
-                ret = cmd_idx;
-                IWL_ERROR("Error sending %s: iwl4965_enqueue_hcmd failed: %d\n",
-                          get_cmd_string(cmd->id), ret);
-                goto out;
-        }
-
-        ret = wait_event_interruptible_timeout(priv->wait_command_queue,
-                        !test_bit(STATUS_HCMD_ACTIVE, &priv->status),
-                        HOST_COMPLETE_TIMEOUT);
-        if (!ret) {
-                if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {
-                        IWL_ERROR("Error sending %s: time out after %dms.\n",
-                                  get_cmd_string(cmd->id),
-                                  jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
-
-                        clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
-                        ret = -ETIMEDOUT;
-                        goto cancel;
-                }
-        }
-
-        if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {
-                IWL_DEBUG_INFO("Command %s aborted: RF KILL Switch\n",
-                               get_cmd_string(cmd->id));
-                ret = -ECANCELED;
-                goto fail;
-        }
-        if (test_bit(STATUS_FW_ERROR, &priv->status)) {
-                IWL_DEBUG_INFO("Command %s failed: FW Error\n",
-                               get_cmd_string(cmd->id));
-                ret = -EIO;
-                goto fail;
-        }
-        if ((cmd->meta.flags & CMD_WANT_SKB) && !cmd->meta.u.skb) {
-                IWL_ERROR("Error: Response NULL in '%s'\n",
-                          get_cmd_string(cmd->id));
-                ret = -EIO;
-                goto out;
-        }
-
-        ret = 0;
-        goto out;
-
-cancel:
-        if (cmd->meta.flags & CMD_WANT_SKB) {
-                struct iwl4965_cmd *qcmd;
-
-                /* Cancel the CMD_WANT_SKB flag for the cmd in the
-                 * TX cmd queue. Otherwise in case the cmd comes
-                 * in later, it will possibly set an invalid
-                 * address (cmd->meta.source). */
-                qcmd = &priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_idx];
-                qcmd->meta.flags &= ~CMD_WANT_SKB;
-        }
-fail:
-        if (cmd->meta.u.skb) {
-                dev_kfree_skb_any(cmd->meta.u.skb);
-                cmd->meta.u.skb = NULL;
-        }
-out:
-        atomic_set(&entry, 0);
-        return ret;
-}
-
-int iwl4965_send_cmd(struct iwl4965_priv *priv, struct iwl4965_host_cmd *cmd)
-{
-        if (cmd->meta.flags & CMD_ASYNC)
-                return iwl4965_send_cmd_async(priv, cmd);
-
-        return iwl4965_send_cmd_sync(priv, cmd);
-}
-
-int iwl4965_send_cmd_pdu(struct iwl4965_priv *priv, u8 id, u16 len, const void *data)
-{
-        struct iwl4965_host_cmd cmd = {
-                .id = id,
-                .len = len,
-                .data = data,
-        };
-
-        return iwl4965_send_cmd_sync(priv, &cmd);
-}
-
-static int __must_check iwl4965_send_cmd_u32(struct iwl4965_priv *priv, u8 id, u32 val)
-{
-        struct iwl4965_host_cmd cmd = {
-                .id = id,
-                .len = sizeof(val),
-                .data = &val,
-        };
+        struct iwl4965_rxon_cmd *rxon = &priv->staging_rxon;
 
-        return iwl4965_send_cmd_sync(priv, &cmd);
-}
+        if (hw_decrypt)
+                rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
+        else
+                rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
 
-int iwl4965_send_statistics_request(struct iwl4965_priv *priv)
-{
-        return iwl4965_send_cmd_u32(priv, REPLY_STATISTICS_CMD, 0);
 }
 
 /**
@@ -901,7 +602,7 @@ int iwl4965_send_statistics_request(struct iwl4965_priv *priv)
  * there is only one AP station with id= IWL_AP_ID
  * NOTE: mutex must be held before calling this fnction
  */
-static int iwl4965_rxon_add_station(struct iwl4965_priv *priv,
+static int iwl4965_rxon_add_station(struct iwl_priv *priv,
                                 const u8 *addr, int is_ap)
 {
         u8 sta_id;
@@ -928,42 +629,6 @@ static int iwl4965_rxon_add_station(struct iwl4965_priv *priv,
 }
 
 /**
- * iwl4965_set_rxon_channel - Set the phymode and channel values in staging RXON
- * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
- * @channel: Any channel valid for the requested phymode
-
- * In addition to setting the staging RXON, priv->phymode is also set.
- *
- * NOTE:  Does not commit to the hardware; it sets appropriate bit fields
- * in the staging RXON flag structure based on the phymode
- */
-static int iwl4965_set_rxon_channel(struct iwl4965_priv *priv, u8 phymode,
-                                 u16 channel)
-{
-        if (!iwl4965_get_channel_info(priv, phymode, channel)) {
-                IWL_DEBUG_INFO("Could not set channel to %d [%d]\n",
-                               channel, phymode);
-                return -EINVAL;
-        }
-
-        if ((le16_to_cpu(priv->staging_rxon.channel) == channel) &&
-            (priv->phymode == phymode))
-                return 0;
-
-        priv->staging_rxon.channel = cpu_to_le16(channel);
-        if (phymode == MODE_IEEE80211A)
-                priv->staging_rxon.flags &= ~RXON_FLG_BAND_24G_MSK;
-        else
-                priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
-
-        priv->phymode = phymode;
-
-        IWL_DEBUG_INFO("Staging channel set to %d [%d]\n", channel, phymode);
-
-        return 0;
-}
-
-/**
  * iwl4965_check_rxon_cmd - validate RXON structure is valid
  *
  * NOTE:  This is really only useful during development and can eventually
@@ -1044,7 +709,7 @@ static int iwl4965_check_rxon_cmd(struct iwl4965_rxon_cmd *rxon)
  * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
  * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
  */
-static int iwl4965_full_rxon_required(struct iwl4965_priv *priv)
+static int iwl4965_full_rxon_required(struct iwl_priv *priv)
 {
 
         /* These items are only settable from the full RXON command */
@@ -1084,60 +749,6 @@ static int iwl4965_full_rxon_required(struct iwl4965_priv *priv)
         return 0;
 }
 
-static int iwl4965_send_rxon_assoc(struct iwl4965_priv *priv)
-{
-        int rc = 0;
-        struct iwl4965_rx_packet *res = NULL;
-        struct iwl4965_rxon_assoc_cmd rxon_assoc;
-        struct iwl4965_host_cmd cmd = {
-                .id = REPLY_RXON_ASSOC,
-                .len = sizeof(rxon_assoc),
-                .meta.flags = CMD_WANT_SKB,
-                .data = &rxon_assoc,
-        };
-        const struct iwl4965_rxon_cmd *rxon1 = &priv->staging_rxon;
-        const struct iwl4965_rxon_cmd *rxon2 = &priv->active_rxon;
-
-        if ((rxon1->flags == rxon2->flags) &&
-            (rxon1->filter_flags == rxon2->filter_flags) &&
-            (rxon1->cck_basic_rates == rxon2->cck_basic_rates) &&
-            (rxon1->ofdm_ht_single_stream_basic_rates ==
-             rxon2->ofdm_ht_single_stream_basic_rates) &&
-            (rxon1->ofdm_ht_dual_stream_basic_rates ==
-             rxon2->ofdm_ht_dual_stream_basic_rates) &&
-            (rxon1->rx_chain == rxon2->rx_chain) &&
-            (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) {
-                IWL_DEBUG_INFO("Using current RXON_ASSOC.  Not resending.\n");
-                return 0;
-        }
-
-        rxon_assoc.flags = priv->staging_rxon.flags;
-        rxon_assoc.filter_flags = priv->staging_rxon.filter_flags;
-        rxon_assoc.ofdm_basic_rates = priv->staging_rxon.ofdm_basic_rates;
-        rxon_assoc.cck_basic_rates = priv->staging_rxon.cck_basic_rates;
-        rxon_assoc.reserved = 0;
-        rxon_assoc.ofdm_ht_single_stream_basic_rates =
-            priv->staging_rxon.ofdm_ht_single_stream_basic_rates;
-        rxon_assoc.ofdm_ht_dual_stream_basic_rates =
-            priv->staging_rxon.ofdm_ht_dual_stream_basic_rates;
-        rxon_assoc.rx_chain_select_flags = priv->staging_rxon.rx_chain;
-
-        rc = iwl4965_send_cmd_sync(priv, &cmd);
-        if (rc)
-                return rc;
-
-        res = (struct iwl4965_rx_packet *)cmd.meta.u.skb->data;
-        if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERROR("Bad return from REPLY_RXON_ASSOC command\n");
-                rc = -EIO;
-        }
-
-        priv->alloc_rxb_skb--;
-        dev_kfree_skb_any(cmd.meta.u.skb);
-
-        return rc;
-}
-
 /**
  * iwl4965_commit_rxon - commit staging_rxon to hardware
  *
@@ -1146,14 +757,14 @@ static int iwl4965_send_rxon_assoc(struct iwl4965_priv *priv)
  * function correctly transitions out of the RXON_ASSOC_MSK state if
  * a HW tune is required based on the RXON structure changes.
  */
-static int iwl4965_commit_rxon(struct iwl4965_priv *priv)
+static int iwl4965_commit_rxon(struct iwl_priv *priv)
 {
         /* cast away the const for active_rxon in this function */
         struct iwl4965_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
         DECLARE_MAC_BUF(mac);
         int rc = 0;
 
-        if (!iwl4965_is_alive(priv))
+        if (!iwl_is_alive(priv))
                 return -1;
 
         /* always get timestamp with Rx frame */
@@ -1169,7 +780,7 @@ static int iwl4965_commit_rxon(struct iwl4965_priv *priv)
          * iwl4965_rxon_assoc_cmd which is used to reconfigure filter
          * and other flags for the current radio configuration. */
         if (!iwl4965_full_rxon_required(priv)) {
-                rc = iwl4965_send_rxon_assoc(priv);
+                rc = iwl_send_rxon_assoc(priv);
                 if (rc) {
                         IWL_ERROR("Error setting RXON_ASSOC "
                                   "configuration (%d).\n", rc);
@@ -1196,12 +807,12 @@ static int iwl4965_commit_rxon(struct iwl4965_priv *priv)
          * an RXON_ASSOC and the new config wants the associated mask enabled,
          * we must clear the associated from the active configuration
          * before we apply the new config */
-        if (iwl4965_is_associated(priv) &&
+        if (iwl_is_associated(priv) &&
             (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK)) {
                 IWL_DEBUG_INFO("Toggling associated bit on current RXON\n");
                 active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 
-                rc = iwl4965_send_cmd_pdu(priv, REPLY_RXON,
+                rc = iwl_send_cmd_pdu(priv, REPLY_RXON,
                                       sizeof(struct iwl4965_rxon_cmd),
                                       &priv->active_rxon);
 
@@ -1224,15 +835,16 @@ static int iwl4965_commit_rxon(struct iwl4965_priv *priv)
                        le16_to_cpu(priv->staging_rxon.channel),
                        print_mac(mac, priv->staging_rxon.bssid_addr));
 
+        iwl4965_set_rxon_hwcrypto(priv, !priv->cfg->mod_params->sw_crypto);
         /* Apply the new configuration */
-        rc = iwl4965_send_cmd_pdu(priv, REPLY_RXON,
+        rc = iwl_send_cmd_pdu(priv, REPLY_RXON,
                               sizeof(struct iwl4965_rxon_cmd), &priv->staging_rxon);
         if (rc) {
                 IWL_ERROR("Error setting new configuration (%d).\n", rc);
                 return rc;
         }
 
-        iwl4965_clear_stations_table(priv);
+        iwlcore_clear_stations_table(priv);
 
 #ifdef CONFIG_IWL4965_SENSITIVITY
         if (!priv->error_recovering)
@@ -1261,7 +873,7 @@ static int iwl4965_commit_rxon(struct iwl4965_priv *priv)
 
         /* If we have set the ASSOC_MSK and we are in BSS mode then
          * add the IWL_AP_ID to the station rate table */
-        if (iwl4965_is_associated(priv) &&
+        if (iwl_is_associated(priv) &&
             (priv->iw_mode == IEEE80211_IF_TYPE_STA)) {
                 if (iwl4965_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
                     == IWL_INVALID_STATION) {
@@ -1269,12 +881,15 @@ static int iwl4965_commit_rxon(struct iwl4965_priv *priv)
                         return -EIO;
                 }
                 priv->assoc_station_added = 1;
+                if (priv->default_wep_key &&
+                    iwl_send_static_wepkey_cmd(priv, 0))
+                        IWL_ERROR("Could not send WEP static key.\n");
         }
 
         return 0;
 }
 
-static int iwl4965_send_bt_config(struct iwl4965_priv *priv)
+static int iwl4965_send_bt_config(struct iwl_priv *priv)
 {
         struct iwl4965_bt_cmd bt_cmd = {
                 .flags = 3,
@@ -1284,15 +899,15 @@ static int iwl4965_send_bt_config(struct iwl4965_priv *priv)
                 .kill_cts_mask = 0,
         };
 
-        return iwl4965_send_cmd_pdu(priv, REPLY_BT_CONFIG,
+        return iwl_send_cmd_pdu(priv, REPLY_BT_CONFIG,
                                 sizeof(struct iwl4965_bt_cmd), &bt_cmd);
 }
 
-static int iwl4965_send_scan_abort(struct iwl4965_priv *priv)
+static int iwl4965_send_scan_abort(struct iwl_priv *priv)
 {
         int rc = 0;
         struct iwl4965_rx_packet *res;
-        struct iwl4965_host_cmd cmd = {
+        struct iwl_host_cmd cmd = {
                 .id = REPLY_SCAN_ABORT_CMD,
                 .meta.flags = CMD_WANT_SKB,
         };
@@ -1305,7 +920,7 @@ static int iwl4965_send_scan_abort(struct iwl4965_priv *priv)
                 return 0;
         }
 
-        rc = iwl4965_send_cmd_sync(priv, &cmd);
+        rc = iwl_send_cmd_sync(priv, &cmd);
         if (rc) {
                 clear_bit(STATUS_SCAN_ABORTING, &priv->status);
                 return rc;
@@ -1329,8 +944,8 @@ static int iwl4965_send_scan_abort(struct iwl4965_priv *priv)
         return rc;
 }
 
-static int iwl4965_card_state_sync_callback(struct iwl4965_priv *priv,
-                                        struct iwl4965_cmd *cmd,
+static int iwl4965_card_state_sync_callback(struct iwl_priv *priv,
+                                        struct iwl_cmd *cmd,
                                         struct sk_buff *skb)
 {
         return 1;
@@ -1346,9 +961,9 @@ static int iwl4965_card_state_sync_callback(struct iwl4965_priv *priv,
  * When in the 'halt' state, the card is shut down and must be fully
  * restarted to come back on.
  */
-static int iwl4965_send_card_state(struct iwl4965_priv *priv, u32 flags, u8 meta_flag)
+static int iwl4965_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_flag)
 {
-        struct iwl4965_host_cmd cmd = {
+        struct iwl_host_cmd cmd = {
                 .id = REPLY_CARD_STATE_CMD,
                 .len = sizeof(u32),
                 .data = &flags,
@@ -1358,11 +973,11 @@ static int iwl4965_send_card_state(struct iwl4965_priv *priv, u32 flags, u8 meta
         if (meta_flag & CMD_ASYNC)
                 cmd.meta.u.callback = iwl4965_card_state_sync_callback;
 
-        return iwl4965_send_cmd(priv, &cmd);
+        return iwl_send_cmd(priv, &cmd);
 }
 
-static int iwl4965_add_sta_sync_callback(struct iwl4965_priv *priv,
-                                     struct iwl4965_cmd *cmd, struct sk_buff *skb)
+static int iwl4965_add_sta_sync_callback(struct iwl_priv *priv,
+                                     struct iwl_cmd *cmd, struct sk_buff *skb)
 {
         struct iwl4965_rx_packet *res = NULL;
 
@@ -1389,12 +1004,12 @@ static int iwl4965_add_sta_sync_callback(struct iwl4965_priv *priv,
         return 1;
 }
 
-int iwl4965_send_add_station(struct iwl4965_priv *priv,
+int iwl4965_send_add_station(struct iwl_priv *priv,
                          struct iwl4965_addsta_cmd *sta, u8 flags)
 {
         struct iwl4965_rx_packet *res = NULL;
         int rc = 0;
-        struct iwl4965_host_cmd cmd = {
+        struct iwl_host_cmd cmd = {
                 .id = REPLY_ADD_STA,
                 .len = sizeof(struct iwl4965_addsta_cmd),
                 .meta.flags = flags,
@@ -1406,7 +1021,7 @@ int iwl4965_send_add_station(struct iwl4965_priv *priv,
         else
                 cmd.meta.flags |= CMD_WANT_SKB;
 
-        rc = iwl4965_send_cmd(priv, &cmd);
+        rc = iwl_send_cmd(priv, &cmd);
 
         if (rc || (flags & CMD_ASYNC))
                 return rc;
@@ -1436,62 +1051,7 @@ int iwl4965_send_add_station(struct iwl4965_priv *priv,
         return rc;
 }
 
-static int iwl4965_update_sta_key_info(struct iwl4965_priv *priv,
-                                   struct ieee80211_key_conf *keyconf,
-                                   u8 sta_id)
-{
-        unsigned long flags;
-        __le16 key_flags = 0;
-
-        switch (keyconf->alg) {
-        case ALG_CCMP:
-                key_flags |= STA_KEY_FLG_CCMP;
-                key_flags |= cpu_to_le16(
-                                keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
-                key_flags &= ~STA_KEY_FLG_INVALID;
-                break;
-        case ALG_TKIP:
-        case ALG_WEP:
-        default:
-                return -EINVAL;
-        }
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].keyinfo.alg = keyconf->alg;
-        priv->stations[sta_id].keyinfo.keylen = keyconf->keylen;
-        memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key,
-               keyconf->keylen);
-
-        memcpy(priv->stations[sta_id].sta.key.key, keyconf->key,
-               keyconf->keylen);
-        priv->stations[sta_id].sta.key.key_flags = key_flags;
-        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
-        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
-
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        IWL_DEBUG_INFO("hwcrypto: modify ucode station key info\n");
-        iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, 0);
-        return 0;
-}
-
-static int iwl4965_clear_sta_key_info(struct iwl4965_priv *priv, u8 sta_id)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        memset(&priv->stations[sta_id].keyinfo, 0, sizeof(struct iwl4965_hw_key));
-        memset(&priv->stations[sta_id].sta.key, 0, sizeof(struct iwl4965_keyinfo));
-        priv->stations[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC;
-        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
-        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        IWL_DEBUG_INFO("hwcrypto: clear ucode station key info\n");
-        iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, 0);
-        return 0;
-}
-
-static void iwl4965_clear_free_frames(struct iwl4965_priv *priv)
+static void iwl4965_clear_free_frames(struct iwl_priv *priv)
 {
         struct list_head *element;
 
@@ -1512,7 +1072,7 @@ static void iwl4965_clear_free_frames(struct iwl4965_priv *priv)
         }
 }
 
-static struct iwl4965_frame *iwl4965_get_free_frame(struct iwl4965_priv *priv)
+static struct iwl4965_frame *iwl4965_get_free_frame(struct iwl_priv *priv)
 {
         struct iwl4965_frame *frame;
         struct list_head *element;
@@ -1532,18 +1092,18 @@ static struct iwl4965_frame *iwl4965_get_free_frame(struct iwl4965_priv *priv)
         return list_entry(element, struct iwl4965_frame, list);
 }
 
-static void iwl4965_free_frame(struct iwl4965_priv *priv, struct iwl4965_frame *frame)
+static void iwl4965_free_frame(struct iwl_priv *priv, struct iwl4965_frame *frame)
 {
         memset(frame, 0, sizeof(*frame));
         list_add(&frame->list, &priv->free_frames);
 }
 
-unsigned int iwl4965_fill_beacon_frame(struct iwl4965_priv *priv,
+unsigned int iwl4965_fill_beacon_frame(struct iwl_priv *priv,
                                 struct ieee80211_hdr *hdr,
                                 const u8 *dest, int left)
 {
 
-        if (!iwl4965_is_associated(priv) || !priv->ibss_beacon ||
+        if (!iwl_is_associated(priv) || !priv->ibss_beacon ||
             ((priv->iw_mode != IEEE80211_IF_TYPE_IBSS) &&
              (priv->iw_mode != IEEE80211_IF_TYPE_AP)))
                 return 0;
@@ -1556,34 +1116,6 @@ unsigned int iwl4965_fill_beacon_frame(struct iwl4965_priv *priv,
         return priv->ibss_beacon->len;
 }
 
-int iwl4965_rate_index_from_plcp(int plcp)
-{
-        int i = 0;
-
-        /* 4965 HT rate format */
-        if (plcp & RATE_MCS_HT_MSK) {
-                i = (plcp & 0xff);
-
-                if (i >= IWL_RATE_MIMO_6M_PLCP)
-                        i = i - IWL_RATE_MIMO_6M_PLCP;
-
-                i += IWL_FIRST_OFDM_RATE;
-                /* skip 9M not supported in ht*/
-                if (i >= IWL_RATE_9M_INDEX)
-                        i += 1;
-                if ((i >= IWL_FIRST_OFDM_RATE) &&
-                    (i <= IWL_LAST_OFDM_RATE))
-                        return i;
-
-        /* 4965 legacy rate format, search for match in table */
-        } else {
-                for (i = 0; i < ARRAY_SIZE(iwl4965_rates); i++)
-                        if (iwl4965_rates[i].plcp == (plcp &0xFF))
-                                return i;
-        }
-        return -1;
-}
-
 static u8 iwl4965_rate_get_lowest_plcp(int rate_mask)
 {
         u8 i;
@@ -1597,7 +1129,7 @@ static u8 iwl4965_rate_get_lowest_plcp(int rate_mask)
         return IWL_RATE_INVALID;
 }
 
-static int iwl4965_send_beacon_cmd(struct iwl4965_priv *priv)
+static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)
 {
         struct iwl4965_frame *frame;
         unsigned int frame_size;
@@ -1625,7 +1157,7 @@ static int iwl4965_send_beacon_cmd(struct iwl4965_priv *priv)
 
         frame_size = iwl4965_hw_get_beacon_cmd(priv, frame, rate);
 
-        rc = iwl4965_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,
+        rc = iwl_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,
                               &frame->u.cmd[0]);
 
         iwl4965_free_frame(priv, frame);
@@ -1635,238 +1167,17 @@ static int iwl4965_send_beacon_cmd(struct iwl4965_priv *priv)
 
 /******************************************************************************
  *
- * EEPROM related functions
- *
- ******************************************************************************/
-
-static void get_eeprom_mac(struct iwl4965_priv *priv, u8 *mac)
-{
-        memcpy(mac, priv->eeprom.mac_address, 6);
-}
-
-static inline void iwl4965_eeprom_release_semaphore(struct iwl4965_priv *priv)
-{
-        iwl4965_clear_bit(priv, CSR_HW_IF_CONFIG_REG,
-                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
-}
-
-/**
- * iwl4965_eeprom_init - read EEPROM contents
- *
- * Load the EEPROM contents from adapter into priv->eeprom
- *
- * NOTE:  This routine uses the non-debug IO access functions.
- */
-int iwl4965_eeprom_init(struct iwl4965_priv *priv)
-{
-        u16 *e = (u16 *)&priv->eeprom;
-        u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP);
-        u32 r;
-        int sz = sizeof(priv->eeprom);
-        int rc;
-        int i;
-        u16 addr;
-
-        /* The EEPROM structure has several padding buffers within it
-         * and when adding new EEPROM maps is subject to programmer errors
-         * which may be very difficult to identify without explicitly
-         * checking the resulting size of the eeprom map. */
-        BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE);
-
-        if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
-                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp);
-                return -ENOENT;
-        }
-
-        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
-        rc = iwl4965_eeprom_acquire_semaphore(priv);
-        if (rc < 0) {
-                IWL_ERROR("Failed to acquire EEPROM semaphore.\n");
-                return -ENOENT;
-        }
-
-        /* eeprom is an array of 16bit values */
-        for (addr = 0; addr < sz; addr += sizeof(u16)) {
-                _iwl4965_write32(priv, CSR_EEPROM_REG, addr << 1);
-                _iwl4965_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);
-
-                for (i = 0; i < IWL_EEPROM_ACCESS_TIMEOUT;
-                                        i += IWL_EEPROM_ACCESS_DELAY) {
-                        r = _iwl4965_read_direct32(priv, CSR_EEPROM_REG);
-                        if (r & CSR_EEPROM_REG_READ_VALID_MSK)
-                                break;
-                        udelay(IWL_EEPROM_ACCESS_DELAY);
-                }
-
-                if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {
-                        IWL_ERROR("Time out reading EEPROM[%d]", addr);
-                        rc = -ETIMEDOUT;
-                        goto done;
-                }
-                e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
-        }
-        rc = 0;
-
-done:
-        iwl4965_eeprom_release_semaphore(priv);
-        return rc;
-}
-
-/******************************************************************************
- *
  * Misc. internal state and helper functions
  *
  ******************************************************************************/
-#ifdef CONFIG_IWL4965_DEBUG
-
-/**
- * iwl4965_report_frame - dump frame to syslog during debug sessions
- *
- * You may hack this function to show different aspects of received frames,
- * including selective frame dumps.
- * group100 parameter selects whether to show 1 out of 100 good frames.
- *
- * TODO:  This was originally written for 3945, need to audit for
- *        proper operation with 4965.
- */
-void iwl4965_report_frame(struct iwl4965_priv *priv,
-                      struct iwl4965_rx_packet *pkt,
-                      struct ieee80211_hdr *header, int group100)
-{
-        u32 to_us;
-        u32 print_summary = 0;
-        u32 print_dump = 0;     /* set to 1 to dump all frames' contents */
-        u32 hundred = 0;
-        u32 dataframe = 0;
-        u16 fc;
-        u16 seq_ctl;
-        u16 channel;
-        u16 phy_flags;
-        int rate_sym;
-        u16 length;
-        u16 status;
-        u16 bcn_tmr;
-        u32 tsf_low;
-        u64 tsf;
-        u8 rssi;
-        u8 agc;
-        u16 sig_avg;
-        u16 noise_diff;
-        struct iwl4965_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);
-        struct iwl4965_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
-        struct iwl4965_rx_frame_end *rx_end = IWL_RX_END(pkt);
-        u8 *data = IWL_RX_DATA(pkt);
-
-        /* MAC header */
-        fc = le16_to_cpu(header->frame_control);
-        seq_ctl = le16_to_cpu(header->seq_ctrl);
-
-        /* metadata */
-        channel = le16_to_cpu(rx_hdr->channel);
-        phy_flags = le16_to_cpu(rx_hdr->phy_flags);
-        rate_sym = rx_hdr->rate;
-        length = le16_to_cpu(rx_hdr->len);
-
-        /* end-of-frame status and timestamp */
-        status = le32_to_cpu(rx_end->status);
-        bcn_tmr = le32_to_cpu(rx_end->beacon_timestamp);
-        tsf_low = le64_to_cpu(rx_end->timestamp) & 0x0ffffffff;
-        tsf = le64_to_cpu(rx_end->timestamp);
-
-        /* signal statistics */
-        rssi = rx_stats->rssi;
-        agc = rx_stats->agc;
-        sig_avg = le16_to_cpu(rx_stats->sig_avg);
-        noise_diff = le16_to_cpu(rx_stats->noise_diff);
-
-        to_us = !compare_ether_addr(header->addr1, priv->mac_addr);
-
-        /* if data frame is to us and all is good,
-         *   (optionally) print summary for only 1 out of every 100 */
-        if (to_us && (fc & ~IEEE80211_FCTL_PROTECTED) ==
-            (IEEE80211_FCTL_FROMDS | IEEE80211_FTYPE_DATA)) {
-                dataframe = 1;
-                if (!group100)
-                        print_summary = 1;      /* print each frame */
-                else if (priv->framecnt_to_us < 100) {
-                        priv->framecnt_to_us++;
-                        print_summary = 0;
-                } else {
-                        priv->framecnt_to_us = 0;
-                        print_summary = 1;
-                        hundred = 1;
-                }
-        } else {
-                /* print summary for all other frames */
-                print_summary = 1;
-        }
-
-        if (print_summary) {
-                char *title;
-                u32 rate;
-
-                if (hundred)
-                        title = "100Frames";
-                else if (fc & IEEE80211_FCTL_RETRY)
-                        title = "Retry";
-                else if (ieee80211_is_assoc_response(fc))
-                        title = "AscRsp";
-                else if (ieee80211_is_reassoc_response(fc))
-                        title = "RasRsp";
-                else if (ieee80211_is_probe_response(fc)) {
-                        title = "PrbRsp";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_beacon(fc)) {
-                        title = "Beacon";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_atim(fc))
-                        title = "ATIM";
-                else if (ieee80211_is_auth(fc))
-                        title = "Auth";
-                else if (ieee80211_is_deauth(fc))
-                        title = "DeAuth";
-                else if (ieee80211_is_disassoc(fc))
-                        title = "DisAssoc";
-                else
-                        title = "Frame";
 
-                rate = iwl4965_rate_index_from_plcp(rate_sym);
-                if (rate == -1)
-                        rate = 0;
-                else
-                        rate = iwl4965_rates[rate].ieee / 2;
-
-                /* print frame summary.
-                 * MAC addresses show just the last byte (for brevity),
-                 *    but you can hack it to show more, if you'd like to. */
-                if (dataframe)
-                        IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "
-                                     "len=%u, rssi=%d, chnl=%d, rate=%u, \n",
-                                     title, fc, header->addr1[5],
-                                     length, rssi, channel, rate);
-                else {
-                        /* src/dst addresses assume managed mode */
-                        IWL_DEBUG_RX("%s: 0x%04x, dst=0x%02x, "
-                                     "src=0x%02x, rssi=%u, tim=%lu usec, "
-                                     "phy=0x%02x, chnl=%d\n",
-                                     title, fc, header->addr1[5],
-                                     header->addr3[5], rssi,
-                                     tsf_low - priv->scan_start_tsf,
-                                     phy_flags, channel);
-                }
-        }
-        if (print_dump)
-                iwl4965_print_hex_dump(IWL_DL_RX, data, length);
-}
-#endif
-
-static void iwl4965_unset_hw_setting(struct iwl4965_priv *priv)
+static void iwl4965_unset_hw_params(struct iwl_priv *priv)
 {
-        if (priv->hw_setting.shared_virt)
+        if (priv->shared_virt)
                 pci_free_consistent(priv->pci_dev,
                                     sizeof(struct iwl4965_shared),
-                                    priv->hw_setting.shared_virt,
-                                    priv->hw_setting.shared_phys);
+                                    priv->shared_virt,
+                                    priv->shared_phys);
 }
 
 /**
@@ -1898,24 +1209,20 @@ static u16 iwl4965_supported_rate_to_ie(u8 *ie, u16 supported_rate,
         return ret_rates;
 }
 
-#ifdef CONFIG_IWL4965_HT
-void static iwl4965_set_ht_capab(struct ieee80211_hw *hw,
-                             struct ieee80211_ht_cap *ht_cap,
-                             u8 use_current_config);
-#endif
-
 /**
  * iwl4965_fill_probe_req - fill in all required fields and IE for probe request
  */
-static u16 iwl4965_fill_probe_req(struct iwl4965_priv *priv,
-                              struct ieee80211_mgmt *frame,
-                              int left, int is_direct)
+static u16 iwl4965_fill_probe_req(struct iwl_priv *priv,
+                                  enum ieee80211_band band,
+                                  struct ieee80211_mgmt *frame,
+                                  int left, int is_direct)
 {
         int len = 0;
         u8 *pos = NULL;
         u16 active_rates, ret_rates, cck_rates, active_rate_basic;
 #ifdef CONFIG_IWL4965_HT
-        struct ieee80211_hw_mode *mode;
+        const struct ieee80211_supported_band *sband =
+                                                iwl4965_get_hw_mode(priv, band);
 #endif /* CONFIG_IWL4965_HT */
 
         /* Make sure there is enough space for the probe request,
@@ -2000,13 +1307,18 @@ static u16 iwl4965_fill_probe_req(struct iwl4965_priv *priv,
                 len += 2 + *pos;
 
 #ifdef CONFIG_IWL4965_HT
-        mode = priv->hw->conf.mode;
-        if (mode->ht_info.ht_supported) {
+        if (sband && sband->ht_info.ht_supported) {
+                struct ieee80211_ht_cap *ht_cap;
                 pos += (*pos) + 1;
                 *pos++ = WLAN_EID_HT_CAPABILITY;
                 *pos++ = sizeof(struct ieee80211_ht_cap);
-                iwl4965_set_ht_capab(priv->hw,
-                                (struct ieee80211_ht_cap *)pos, 0);
+                ht_cap = (struct ieee80211_ht_cap *)pos;
+                ht_cap->cap_info = cpu_to_le16(sband->ht_info.cap);
+                memcpy(ht_cap->supp_mcs_set, sband->ht_info.supp_mcs_set, 16);
+                ht_cap->ampdu_params_info =(sband->ht_info.ampdu_factor &
+                                            IEEE80211_HT_CAP_AMPDU_FACTOR) |
+                                            ((sband->ht_info.ampdu_density << 2) &
+                                            IEEE80211_HT_CAP_AMPDU_DENSITY);
                 len += 2 + sizeof(struct ieee80211_ht_cap);
         }
 #endif  /*CONFIG_IWL4965_HT */
@@ -2018,103 +1330,15 @@ static u16 iwl4965_fill_probe_req(struct iwl4965_priv *priv,
 /*
  * QoS  support
 */
-#ifdef CONFIG_IWL4965_QOS
-static int iwl4965_send_qos_params_command(struct iwl4965_priv *priv,
+static int iwl4965_send_qos_params_command(struct iwl_priv *priv,
                                        struct iwl4965_qosparam_cmd *qos)
 {
 
-        return iwl4965_send_cmd_pdu(priv, REPLY_QOS_PARAM,
+        return iwl_send_cmd_pdu(priv, REPLY_QOS_PARAM,
                                 sizeof(struct iwl4965_qosparam_cmd), qos);
 }
 
-static void iwl4965_reset_qos(struct iwl4965_priv *priv)
-{
-        u16 cw_min = 15;
-        u16 cw_max = 1023;
-        u8 aifs = 2;
-        u8 is_legacy = 0;
-        unsigned long flags;
-        int i;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        priv->qos_data.qos_active = 0;
-
-        if (priv->iw_mode == IEEE80211_IF_TYPE_IBSS) {
-                if (priv->qos_data.qos_enable)
-                        priv->qos_data.qos_active = 1;
-                if (!(priv->active_rate & 0xfff0)) {
-                        cw_min = 31;
-                        is_legacy = 1;
-                }
-        } else if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
-                if (priv->qos_data.qos_enable)
-                        priv->qos_data.qos_active = 1;
-        } else if (!(priv->staging_rxon.flags & RXON_FLG_SHORT_SLOT_MSK)) {
-                cw_min = 31;
-                is_legacy = 1;
-        }
-
-        if (priv->qos_data.qos_active)
-                aifs = 3;
-
-        priv->qos_data.def_qos_parm.ac[0].cw_min = cpu_to_le16(cw_min);
-        priv->qos_data.def_qos_parm.ac[0].cw_max = cpu_to_le16(cw_max);
-        priv->qos_data.def_qos_parm.ac[0].aifsn = aifs;
-        priv->qos_data.def_qos_parm.ac[0].edca_txop = 0;
-        priv->qos_data.def_qos_parm.ac[0].reserved1 = 0;
-
-        if (priv->qos_data.qos_active) {
-                i = 1;
-                priv->qos_data.def_qos_parm.ac[i].cw_min = cpu_to_le16(cw_min);
-                priv->qos_data.def_qos_parm.ac[i].cw_max = cpu_to_le16(cw_max);
-                priv->qos_data.def_qos_parm.ac[i].aifsn = 7;
-                priv->qos_data.def_qos_parm.ac[i].edca_txop = 0;
-                priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
-
-                i = 2;
-                priv->qos_data.def_qos_parm.ac[i].cw_min =
-                        cpu_to_le16((cw_min + 1) / 2 - 1);
-                priv->qos_data.def_qos_parm.ac[i].cw_max =
-                        cpu_to_le16(cw_max);
-                priv->qos_data.def_qos_parm.ac[i].aifsn = 2;
-                if (is_legacy)
-                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
-                                cpu_to_le16(6016);
-                else
-                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
-                                cpu_to_le16(3008);
-                priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
-
-                i = 3;
-                priv->qos_data.def_qos_parm.ac[i].cw_min =
-                        cpu_to_le16((cw_min + 1) / 4 - 1);
-                priv->qos_data.def_qos_parm.ac[i].cw_max =
-                        cpu_to_le16((cw_max + 1) / 2 - 1);
-                priv->qos_data.def_qos_parm.ac[i].aifsn = 2;
-                priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
-                if (is_legacy)
-                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
-                                cpu_to_le16(3264);
-                else
-                        priv->qos_data.def_qos_parm.ac[i].edca_txop =
-                                cpu_to_le16(1504);
-        } else {
-                for (i = 1; i < 4; i++) {
-                        priv->qos_data.def_qos_parm.ac[i].cw_min =
-                                cpu_to_le16(cw_min);
-                        priv->qos_data.def_qos_parm.ac[i].cw_max =
-                                cpu_to_le16(cw_max);
-                        priv->qos_data.def_qos_parm.ac[i].aifsn = aifs;
-                        priv->qos_data.def_qos_parm.ac[i].edca_txop = 0;
-                        priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
-                }
-        }
-        IWL_DEBUG_QOS("set QoS to default \n");
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-}
-
-static void iwl4965_activate_qos(struct iwl4965_priv *priv, u8 force)
+static void iwl4965_activate_qos(struct iwl_priv *priv, u8 force)
 {
         unsigned long flags;
 
@@ -2142,7 +1366,7 @@ static void iwl4965_activate_qos(struct iwl4965_priv *priv, u8 force)
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        if (force || iwl4965_is_associated(priv)) {
+        if (force || iwl_is_associated(priv)) {
                 IWL_DEBUG_QOS("send QoS cmd with Qos active=%d FLAGS=0x%X\n",
                                 priv->qos_data.qos_active,
                                 priv->qos_data.def_qos_parm.qos_flags);
@@ -2152,7 +1376,6 @@ static void iwl4965_activate_qos(struct iwl4965_priv *priv, u8 force)
         }
 }
 
-#endif /* CONFIG_IWL4965_QOS */
 /*
  * Power management (not Tx power!) functions
  */
@@ -2193,7 +1416,7 @@ static struct iwl4965_power_vec_entry range_1[IWL_POWER_AC] = {
                  SLP_VEC(4, 7, 10, 10, 0xFF)}, 0}
 };
 
-int iwl4965_power_init_handle(struct iwl4965_priv *priv)
+int iwl4965_power_init_handle(struct iwl_priv *priv)
 {
         int rc = 0, i;
         struct iwl4965_power_mgr *pow_data;
@@ -2232,7 +1455,7 @@ int iwl4965_power_init_handle(struct iwl4965_priv *priv)
         return rc;
 }
 
-static int iwl4965_update_power_cmd(struct iwl4965_priv *priv,
+static int iwl4965_update_power_cmd(struct iwl_priv *priv,
                                 struct iwl4965_powertable_cmd *cmd, u32 mode)
 {
         int rc = 0, i;
@@ -2296,7 +1519,7 @@ static int iwl4965_update_power_cmd(struct iwl4965_priv *priv,
         return rc;
 }
 
-static int iwl4965_send_power_mode(struct iwl4965_priv *priv, u32 mode)
+static int iwl4965_send_power_mode(struct iwl_priv *priv, u32 mode)
 {
         u32 uninitialized_var(final_mode);
         int rc;
@@ -2321,7 +1544,7 @@ static int iwl4965_send_power_mode(struct iwl4965_priv *priv, u32 mode)
 
         iwl4965_update_power_cmd(priv, &cmd, final_mode);
 
-        rc = iwl4965_send_cmd_pdu(priv, POWER_TABLE_CMD, sizeof(cmd), &cmd);
+        rc = iwl_send_cmd_pdu(priv, POWER_TABLE_CMD, sizeof(cmd), &cmd);
 
         if (final_mode == IWL_POWER_MODE_CAM)
                 clear_bit(STATUS_POWER_PMI, &priv->status);
@@ -2331,7 +1554,7 @@ static int iwl4965_send_power_mode(struct iwl4965_priv *priv, u32 mode)
         return rc;
 }
 
-int iwl4965_is_network_packet(struct iwl4965_priv *priv, struct ieee80211_hdr *header)
+int iwl4965_is_network_packet(struct iwl_priv *priv, struct ieee80211_hdr *header)
 {
         /* Filter incoming packets to determine if they are targeted toward
          * this network, discarding packets coming from ourselves */
@@ -2354,6 +1577,8 @@ int iwl4965_is_network_packet(struct iwl4965_priv *priv, struct ieee80211_hdr *h
                         return !compare_ether_addr(header->addr2, priv->bssid);
                 /* packets to our adapter go through */
                 return !compare_ether_addr(header->addr1, priv->mac_addr);
+        default:
+                break;
         }
 
         return 1;
@@ -2392,7 +1617,7 @@ static const char *iwl4965_get_tx_fail_reason(u32 status)
  *
  * NOTE: priv->mutex is not required before calling this function
  */
-static int iwl4965_scan_cancel(struct iwl4965_priv *priv)
+static int iwl4965_scan_cancel(struct iwl_priv *priv)
 {
         if (!test_bit(STATUS_SCAN_HW, &priv->status)) {
                 clear_bit(STATUS_SCANNING, &priv->status);
@@ -2420,7 +1645,7 @@ static int iwl4965_scan_cancel(struct iwl4965_priv *priv)
  *
  * NOTE: priv->mutex must be held before calling this function
  */
-static int iwl4965_scan_cancel_timeout(struct iwl4965_priv *priv, unsigned long ms)
+static int iwl4965_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms)
 {
         unsigned long now = jiffies;
         int ret;
@@ -2439,7 +1664,7 @@ static int iwl4965_scan_cancel_timeout(struct iwl4965_priv *priv, unsigned long
         return ret;
 }
 
-static void iwl4965_sequence_reset(struct iwl4965_priv *priv)
+static void iwl4965_sequence_reset(struct iwl_priv *priv)
 {
         /* Reset ieee stats */
 
@@ -2469,7 +1694,7 @@ static __le16 iwl4965_adjust_beacon_interval(u16 beacon_val)
         return cpu_to_le16(new_val);
 }
 
-static void iwl4965_setup_rxon_timing(struct iwl4965_priv *priv)
+static void iwl4965_setup_rxon_timing(struct iwl_priv *priv)
 {
         u64 interval_tm_unit;
         u64 tsf, result;
@@ -2480,13 +1705,13 @@ static void iwl4965_setup_rxon_timing(struct iwl4965_priv *priv)
         conf = ieee80211_get_hw_conf(priv->hw);
 
         spin_lock_irqsave(&priv->lock, flags);
-        priv->rxon_timing.timestamp.dw[1] = cpu_to_le32(priv->timestamp1);
-        priv->rxon_timing.timestamp.dw[0] = cpu_to_le32(priv->timestamp0);
+        priv->rxon_timing.timestamp.dw[1] = cpu_to_le32(priv->timestamp >> 32);
+        priv->rxon_timing.timestamp.dw[0] =
+                                cpu_to_le32(priv->timestamp & 0xFFFFFFFF);
 
         priv->rxon_timing.listen_interval = INTEL_CONN_LISTEN_INTERVAL;
 
-        tsf = priv->timestamp1;
-        tsf = ((tsf << 32) | priv->timestamp0);
+        tsf = priv->timestamp;
 
         beacon_int = priv->beacon_int;
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -2525,14 +1750,14 @@ static void iwl4965_setup_rxon_timing(struct iwl4965_priv *priv)
                 le16_to_cpu(priv->rxon_timing.atim_window));
 }
 
-static int iwl4965_scan_initiate(struct iwl4965_priv *priv)
+static int iwl4965_scan_initiate(struct iwl_priv *priv)
 {
         if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
                 IWL_ERROR("APs don't scan.\n");
                 return 0;
         }
 
-        if (!iwl4965_is_ready_rf(priv)) {
+        if (!iwl_is_ready_rf(priv)) {
                 IWL_DEBUG_SCAN("Aborting scan due to not ready.\n");
                 return -EIO;
         }
@@ -2559,27 +1784,17 @@ static int iwl4965_scan_initiate(struct iwl4965_priv *priv)
         return 0;
 }
 
-static int iwl4965_set_rxon_hwcrypto(struct iwl4965_priv *priv, int hw_decrypt)
-{
-        struct iwl4965_rxon_cmd *rxon = &priv->staging_rxon;
 
-        if (hw_decrypt)
-                rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
-        else
-                rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
-
-        return 0;
-}
-
-static void iwl4965_set_flags_for_phymode(struct iwl4965_priv *priv, u8 phymode)
+static void iwl4965_set_flags_for_phymode(struct iwl_priv *priv,
+                                          enum ieee80211_band band)
 {
-        if (phymode == MODE_IEEE80211A) {
+        if (band == IEEE80211_BAND_5GHZ) {
                 priv->staging_rxon.flags &=
                     ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
                       | RXON_FLG_CCK_MSK);
                 priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
         } else {
-                /* Copied from iwl4965_bg_post_associate() */
+                /* Copied from iwl4965_post_associate() */
                 if (priv->assoc_capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
                         priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
                 else
@@ -2597,9 +1812,9 @@ static void iwl4965_set_flags_for_phymode(struct iwl4965_priv *priv, u8 phymode)
 /*
  * initialize rxon structure with default values from eeprom
  */
-static void iwl4965_connection_init_rx_config(struct iwl4965_priv *priv)
+static void iwl4965_connection_init_rx_config(struct iwl_priv *priv)
 {
-        const struct iwl4965_channel_info *ch_info;
+        const struct iwl_channel_info *ch_info;
 
         memset(&priv->staging_rxon, 0, sizeof(priv->staging_rxon));
 
@@ -2625,6 +1840,9 @@ static void iwl4965_connection_init_rx_config(struct iwl4965_priv *priv)
                 priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
                     RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
                 break;
+        default:
+                IWL_ERROR("Unsupported interface type %d\n", priv->iw_mode);
+                break;
         }
 
 #if 0
@@ -2636,7 +1854,7 @@ static void iwl4965_connection_init_rx_config(struct iwl4965_priv *priv)
                 priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
 #endif
 
-        ch_info = iwl4965_get_channel_info(priv, priv->phymode,
+        ch_info = iwl_get_channel_info(priv, priv->band,
                                        le16_to_cpu(priv->staging_rxon.channel));
 
         if (!ch_info)
@@ -2651,12 +1869,9 @@ static void iwl4965_connection_init_rx_config(struct iwl4965_priv *priv)
                 ch_info = &priv->channel_info[0];
 
         priv->staging_rxon.channel = cpu_to_le16(ch_info->channel);
-        if (is_channel_a_band(ch_info))
-                priv->phymode = MODE_IEEE80211A;
-        else
-                priv->phymode = MODE_IEEE80211G;
+        priv->band = ch_info->band;
 
-        iwl4965_set_flags_for_phymode(priv, priv->phymode);
+        iwl4965_set_flags_for_phymode(priv, priv->band);
 
         priv->staging_rxon.ofdm_basic_rates =
             (IWL_OFDM_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
@@ -2672,13 +1887,13 @@ static void iwl4965_connection_init_rx_config(struct iwl4965_priv *priv)
         iwl4965_set_rxon_chain(priv);
 }
 
-static int iwl4965_set_mode(struct iwl4965_priv *priv, int mode)
+static int iwl4965_set_mode(struct iwl_priv *priv, int mode)
 {
         if (mode == IEEE80211_IF_TYPE_IBSS) {
-                const struct iwl4965_channel_info *ch_info;
+                const struct iwl_channel_info *ch_info;
 
-                ch_info = iwl4965_get_channel_info(priv,
-                        priv->phymode,
+                ch_info = iwl_get_channel_info(priv,
+                        priv->band,
                         le16_to_cpu(priv->staging_rxon.channel));
 
                 if (!ch_info || !is_channel_ibss(ch_info)) {
@@ -2693,10 +1908,10 @@ static int iwl4965_set_mode(struct iwl4965_priv *priv, int mode)
         iwl4965_connection_init_rx_config(priv);
         memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
 
-        iwl4965_clear_stations_table(priv);
+        iwlcore_clear_stations_table(priv);
 
         /* dont commit rxon if rf-kill is on*/
-        if (!iwl4965_is_ready_rf(priv))
+        if (!iwl_is_ready_rf(priv))
                 return -EAGAIN;
 
         cancel_delayed_work(&priv->scan_check);
@@ -2711,44 +1926,58 @@ static int iwl4965_set_mode(struct iwl4965_priv *priv, int mode)
         return 0;
 }
 
-static void iwl4965_build_tx_cmd_hwcrypto(struct iwl4965_priv *priv,
+static void iwl4965_build_tx_cmd_hwcrypto(struct iwl_priv *priv,
                                       struct ieee80211_tx_control *ctl,
-                                      struct iwl4965_cmd *cmd,
+                                      struct iwl_cmd *cmd,
                                       struct sk_buff *skb_frag,
-                                      int last_frag)
+                                      int sta_id)
 {
-        struct iwl4965_hw_key *keyinfo = &priv->stations[ctl->key_idx].keyinfo;
+        struct iwl4965_hw_key *keyinfo = &priv->stations[sta_id].keyinfo;
+        struct iwl_wep_key *wepkey;
+        int keyidx = 0;
+
+        BUG_ON(ctl->key_idx > 3);
 
         switch (keyinfo->alg) {
         case ALG_CCMP:
                 cmd->cmd.tx.sec_ctl = TX_CMD_SEC_CCM;
                 memcpy(cmd->cmd.tx.key, keyinfo->key, keyinfo->keylen);
+                if (ctl->flags & IEEE80211_TXCTL_AMPDU)
+                        cmd->cmd.tx.tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;
                 IWL_DEBUG_TX("tx_cmd with aes hwcrypto\n");
                 break;
 
         case ALG_TKIP:
-#if 0
                 cmd->cmd.tx.sec_ctl = TX_CMD_SEC_TKIP;
-
-                if (last_frag)
-                        memcpy(cmd->cmd.tx.tkip_mic.byte, skb_frag->tail - 8,
-                               8);
-                else
-                        memset(cmd->cmd.tx.tkip_mic.byte, 0, 8);
-#endif
+                ieee80211_get_tkip_key(keyinfo->conf, skb_frag,
+                        IEEE80211_TKIP_P2_KEY, cmd->cmd.tx.key);
+                IWL_DEBUG_TX("tx_cmd with tkip hwcrypto\n");
                 break;
 
         case ALG_WEP:
-                cmd->cmd.tx.sec_ctl = TX_CMD_SEC_WEP |
-                        (ctl->key_idx & TX_CMD_SEC_MSK) << TX_CMD_SEC_SHIFT;
-
-                if (keyinfo->keylen == 13)
-                        cmd->cmd.tx.sec_ctl |= TX_CMD_SEC_KEY128;
+                wepkey = &priv->wep_keys[ctl->key_idx];
+                cmd->cmd.tx.sec_ctl = 0;
+                if (priv->default_wep_key) {
+                        /* the WEP key was sent as static */
+                        keyidx = ctl->key_idx;
+                        memcpy(&cmd->cmd.tx.key[3], wepkey->key,
+                                                        wepkey->key_size);
+                        if (wepkey->key_size == WEP_KEY_LEN_128)
+                                cmd->cmd.tx.sec_ctl |= TX_CMD_SEC_KEY128;
+                } else {
+                        /* the WEP key was sent as dynamic */
+                        keyidx = keyinfo->keyidx;
+                        memcpy(&cmd->cmd.tx.key[3], keyinfo->key,
+                                                        keyinfo->keylen);
+                        if (keyinfo->keylen == WEP_KEY_LEN_128)
+                                cmd->cmd.tx.sec_ctl |= TX_CMD_SEC_KEY128;
+                }
 
-                memcpy(&cmd->cmd.tx.key[3], keyinfo->key, keyinfo->keylen);
+                cmd->cmd.tx.sec_ctl |= (TX_CMD_SEC_WEP |
+                        (keyidx & TX_CMD_SEC_MSK) << TX_CMD_SEC_SHIFT);
 
                 IWL_DEBUG_TX("Configuring packet for WEP encryption "
-                             "with key %d\n", ctl->key_idx);
+                             "with key %d\n", keyidx);
                 break;
 
         default:
@@ -2760,8 +1989,8 @@ static void iwl4965_build_tx_cmd_hwcrypto(struct iwl4965_priv *priv,
 /*
  * handle build REPLY_TX command notification.
  */
-static void iwl4965_build_tx_cmd_basic(struct iwl4965_priv *priv,
-                                  struct iwl4965_cmd *cmd,
+static void iwl4965_build_tx_cmd_basic(struct iwl_priv *priv,
+                                  struct iwl_cmd *cmd,
                                   struct ieee80211_tx_control *ctrl,
                                   struct ieee80211_hdr *hdr,
                                   int is_unicast, u8 std_id)
@@ -2816,20 +2045,27 @@ static void iwl4965_build_tx_cmd_basic(struct iwl4965_priv *priv,
                         cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(3);
                 else
                         cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(2);
-        } else
+        } else {
                 cmd->cmd.tx.timeout.pm_frame_timeout = 0;
+        }
 
         cmd->cmd.tx.driver_txop = 0;
         cmd->cmd.tx.tx_flags = tx_flags;
         cmd->cmd.tx.next_frame_len = 0;
 }
-
+static void iwl_update_tx_stats(struct iwl_priv *priv, u16 fc, u16 len)
+{
+        /* 0 - mgmt, 1 - cnt, 2 - data */
+        int idx = (fc & IEEE80211_FCTL_FTYPE) >> 2;
+        priv->tx_stats[idx].cnt++;
+        priv->tx_stats[idx].bytes += len;
+}
 /**
  * iwl4965_get_sta_id - Find station's index within station table
  *
  * If new IBSS station, create new entry in station table
  */
-static int iwl4965_get_sta_id(struct iwl4965_priv *priv,
+static int iwl4965_get_sta_id(struct iwl_priv *priv,
                                 struct ieee80211_hdr *hdr)
 {
         int sta_id;
@@ -2839,7 +2075,7 @@ static int iwl4965_get_sta_id(struct iwl4965_priv *priv,
         /* If this frame is broadcast or management, use broadcast station id */
         if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) ||
             is_multicast_ether_addr(hdr->addr1))
-                return priv->hw_setting.bcast_sta_id;
+                return priv->hw_params.bcast_sta_id;
 
         switch (priv->iw_mode) {
 
@@ -2853,7 +2089,7 @@ static int iwl4965_get_sta_id(struct iwl4965_priv *priv,
                 sta_id = iwl4965_hw_find_station(priv, hdr->addr1);
                 if (sta_id != IWL_INVALID_STATION)
                         return sta_id;
-                return priv->hw_setting.bcast_sta_id;
+                return priv->hw_params.bcast_sta_id;
 
         /* If this frame is going out to an IBSS network, find the station,
          * or create a new station table entry */
@@ -2872,19 +2108,19 @@ static int iwl4965_get_sta_id(struct iwl4965_priv *priv,
                 IWL_DEBUG_DROP("Station %s not in station map. "
                                "Defaulting to broadcast...\n",
                                print_mac(mac, hdr->addr1));
-                iwl4965_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
-                return priv->hw_setting.bcast_sta_id;
+                iwl_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
+                return priv->hw_params.bcast_sta_id;
 
         default:
                 IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode);
-                return priv->hw_setting.bcast_sta_id;
+                return priv->hw_params.bcast_sta_id;
         }
 }
 
 /*
  * start REPLY_TX command process
  */
-static int iwl4965_tx_skb(struct iwl4965_priv *priv,
+static int iwl4965_tx_skb(struct iwl_priv *priv,
                       struct sk_buff *skb, struct ieee80211_tx_control *ctl)
 {
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
@@ -2896,7 +2132,7 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
         dma_addr_t phys_addr;
         dma_addr_t txcmd_phys;
         dma_addr_t scratch_phys;
-        struct iwl4965_cmd *out_cmd = NULL;
+        struct iwl_cmd *out_cmd = NULL;
         u16 len, idx, len_org;
         u8 id, hdr_len, unicast;
         u8 sta_id;
@@ -2908,7 +2144,7 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
         int rc;
 
         spin_lock_irqsave(&priv->lock, flags);
-        if (iwl4965_is_rfkill(priv)) {
+        if (iwl_is_rfkill(priv)) {
                 IWL_DEBUG_DROP("Dropping - RF KILL\n");
                 goto drop_unlock;
         }
@@ -2918,7 +2154,7 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
                 goto drop_unlock;
         }
 
-        if ((ctl->tx_rate & 0xFF) == IWL_INVALID_RATE) {
+        if ((ctl->tx_rate->hw_value & 0xFF) == IWL_INVALID_RATE) {
                 IWL_ERROR("ERROR: No TX rate available.\n");
                 goto drop_unlock;
         }
@@ -2928,7 +2164,7 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
 
         fc = le16_to_cpu(hdr->frame_control);
 
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
         if (ieee80211_is_auth(fc))
                 IWL_DEBUG_TX("Sending AUTH frame\n");
         else if (ieee80211_is_assoc_request(fc))
@@ -2939,10 +2175,10 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
 
         /* drop all data frame if we are not associated */
         if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
-           (!iwl4965_is_associated(priv) ||
+           (!iwl_is_associated(priv) ||
             ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && !priv->assoc_id) ||
             !priv->assoc_station_added)) {
-                IWL_DEBUG_DROP("Dropping - !iwl4965_is_associated\n");
+                IWL_DEBUG_DROP("Dropping - !iwl_is_associated\n");
                 goto drop_unlock;
         }
 
@@ -2972,11 +2208,10 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
                                 __constant_cpu_to_le16(IEEE80211_SCTL_FRAG));
                 seq_number += 0x10;
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
                 /* aggregation is on for this <sta,tid> */
-                if (ctl->flags & IEEE80211_TXCTL_HT_MPDU_AGG)
+                if (ctl->flags & IEEE80211_TXCTL_AMPDU)
                         txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
-#endif /* CONFIG_IWL4965_HT_AGG */
+                priv->stations[sta_id].tid[tid].tfds_in_queue++;
 #endif /* CONFIG_IWL4965_HT */
         }
 
@@ -3025,8 +2260,8 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
          * of the MAC header (device reads on dword boundaries).
          * We'll tell device about this padding later.
          */
-        len = priv->hw_setting.tx_cmd_len +
-                sizeof(struct iwl4965_cmd_header) + hdr_len;
+        len = priv->hw_params.tx_cmd_len +
+                sizeof(struct iwl_cmd_header) + hdr_len;
 
         len_org = len;
         len = (len + 3) & ~3;
@@ -3038,15 +2273,15 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
 
         /* Physical address of this Tx command's header (not MAC header!),
          * within command buffer array. */
-        txcmd_phys = txq->dma_addr_cmd + sizeof(struct iwl4965_cmd) * idx +
-                     offsetof(struct iwl4965_cmd, hdr);
+        txcmd_phys = txq->dma_addr_cmd + sizeof(struct iwl_cmd) * idx +
+                     offsetof(struct iwl_cmd, hdr);
 
         /* Add buffer containing Tx command and MAC(!) header to TFD's
          * first entry */
         iwl4965_hw_txq_attach_buf_to_tfd(priv, tfd, txcmd_phys, len);
 
         if (!(ctl->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT))
-                iwl4965_build_tx_cmd_hwcrypto(priv, ctl, out_cmd, skb, 0);
+                iwl4965_build_tx_cmd_hwcrypto(priv, ctl, out_cmd, skb, sta_id);
 
         /* Set up TFD's 2nd entry to point directly to remainder of skb,
          * if any (802.11 null frames have no payload). */
@@ -3071,19 +2306,13 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
         /* set is_hcca to 0; it probably will never be implemented */
         iwl4965_hw_build_tx_cmd_rate(priv, out_cmd, ctl, hdr, sta_id, 0);
 
-        scratch_phys = txcmd_phys + sizeof(struct iwl4965_cmd_header) +
+        iwl_update_tx_stats(priv, fc, len);
+
+        scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +
                 offsetof(struct iwl4965_tx_cmd, scratch);
         out_cmd->cmd.tx.dram_lsb_ptr = cpu_to_le32(scratch_phys);
         out_cmd->cmd.tx.dram_msb_ptr = iwl_get_dma_hi_address(scratch_phys);
 
-#ifdef CONFIG_IWL4965_HT_AGG
-#ifdef CONFIG_IWL4965_HT
-        /* TODO: move this functionality to rate scaling */
-        iwl4965_tl_get_stats(priv, hdr);
-#endif /* CONFIG_IWL4965_HT_AGG */
-#endif /*CONFIG_IWL4965_HT */
-
-
         if (!ieee80211_get_morefrag(hdr)) {
                 txq->need_update = 1;
                 if (qc) {
@@ -3095,17 +2324,17 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
                 txq->need_update = 0;
         }
 
-        iwl4965_print_hex_dump(IWL_DL_TX, out_cmd->cmd.payload,
+        iwl_print_hex_dump(IWL_DL_TX, out_cmd->cmd.payload,
                            sizeof(out_cmd->cmd.tx));
 
-        iwl4965_print_hex_dump(IWL_DL_TX, (u8 *)out_cmd->cmd.tx.hdr,
+        iwl_print_hex_dump(IWL_DL_TX, (u8 *)out_cmd->cmd.tx.hdr,
                            ieee80211_get_hdrlen(fc));
 
         /* Set up entry for this TFD in Tx byte-count array */
-        iwl4965_tx_queue_update_wr_ptr(priv, txq, len);
+        priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, len);
 
         /* Tell device the write index *just past* this latest filled TFD */
-        q->write_ptr = iwl4965_queue_inc_wrap(q->write_ptr, q->n_bd);
+        q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
         rc = iwl4965_tx_queue_update_write_ptr(priv, txq);
         spin_unlock_irqrestore(&priv->lock, flags);
 
@@ -3132,13 +2361,13 @@ drop:
         return -1;
 }
 
-static void iwl4965_set_rate(struct iwl4965_priv *priv)
+static void iwl4965_set_rate(struct iwl_priv *priv)
 {
-        const struct ieee80211_hw_mode *hw = NULL;
+        const struct ieee80211_supported_band *hw = NULL;
         struct ieee80211_rate *rate;
         int i;
 
-        hw = iwl4965_get_hw_mode(priv, priv->phymode);
+        hw = iwl4965_get_hw_mode(priv, priv->band);
         if (!hw) {
                 IWL_ERROR("Failed to set rate: unable to get hw mode\n");
                 return;
@@ -3147,24 +2376,10 @@ static void iwl4965_set_rate(struct iwl4965_priv *priv)
         priv->active_rate = 0;
         priv->active_rate_basic = 0;
 
-        IWL_DEBUG_RATE("Setting rates for 802.11%c\n",
-                       hw->mode == MODE_IEEE80211A ?
-                       'a' : ((hw->mode == MODE_IEEE80211B) ? 'b' : 'g'));
-
-        for (i = 0; i < hw->num_rates; i++) {
-                rate = &(hw->rates[i]);
-                if ((rate->val < IWL_RATE_COUNT) &&
-                    (rate->flags & IEEE80211_RATE_SUPPORTED)) {
-                        IWL_DEBUG_RATE("Adding rate index %d (plcp %d)%s\n",
-                                       rate->val, iwl4965_rates[rate->val].plcp,
-                                       (rate->flags & IEEE80211_RATE_BASIC) ?
-                                       "*" : "");
-                        priv->active_rate |= (1 << rate->val);
-                        if (rate->flags & IEEE80211_RATE_BASIC)
-                                priv->active_rate_basic |= (1 << rate->val);
-                } else
-                        IWL_DEBUG_RATE("Not adding rate %d (plcp %d)\n",
-                                       rate->val, iwl4965_rates[rate->val].plcp);
+        for (i = 0; i < hw->n_bitrates; i++) {
+                rate = &(hw->bitrates[i]);
+                if (rate->hw_value < IWL_RATE_COUNT)
+                        priv->active_rate |= (1 << rate->hw_value);
         }
 
         IWL_DEBUG_RATE("Set active_rate = %0x, active_rate_basic = %0x\n",
@@ -3193,7 +2408,7 @@ static void iwl4965_set_rate(struct iwl4965_priv *priv)
                    (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
 }
 
-static void iwl4965_radio_kill_sw(struct iwl4965_priv *priv, int disable_radio)
+void iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio)
 {
         unsigned long flags;
 
@@ -3208,17 +2423,26 @@ static void iwl4965_radio_kill_sw(struct iwl4965_priv *priv, int disable_radio)
                 /* FIXME: This is a workaround for AP */
                 if (priv->iw_mode != IEEE80211_IF_TYPE_AP) {
                         spin_lock_irqsave(&priv->lock, flags);
-                        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_SET,
+                        iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
                                     CSR_UCODE_SW_BIT_RFKILL);
                         spin_unlock_irqrestore(&priv->lock, flags);
-                        iwl4965_send_card_state(priv, CARD_STATE_CMD_DISABLE, 0);
+                        /* call the host command only if no hw rf-kill set */
+                        if (!test_bit(STATUS_RF_KILL_HW, &priv->status) &&
+                            iwl_is_ready(priv))
+                                iwl4965_send_card_state(priv,
+                                                        CARD_STATE_CMD_DISABLE,
+                                                        0);
                         set_bit(STATUS_RF_KILL_SW, &priv->status);
+
+                        /* make sure mac80211 stop sending Tx frame */
+                        if (priv->mac80211_registered)
+                                ieee80211_stop_queues(priv->hw);
                 }
                 return;
         }
 
         spin_lock_irqsave(&priv->lock, flags);
-        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
 
         clear_bit(STATUS_RF_KILL_SW, &priv->status);
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -3227,9 +2451,9 @@ static void iwl4965_radio_kill_sw(struct iwl4965_priv *priv, int disable_radio)
         msleep(10);
 
         spin_lock_irqsave(&priv->lock, flags);
-        iwl4965_read32(priv, CSR_UCODE_DRV_GP1);
-        if (!iwl4965_grab_nic_access(priv))
-                iwl4965_release_nic_access(priv);
+        iwl_read32(priv, CSR_UCODE_DRV_GP1);
+        if (!iwl_grab_nic_access(priv))
+                iwl_release_nic_access(priv);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {
@@ -3242,7 +2466,7 @@ static void iwl4965_radio_kill_sw(struct iwl4965_priv *priv, int disable_radio)
         return;
 }
 
-void iwl4965_set_decrypted_flag(struct iwl4965_priv *priv, struct sk_buff *skb,
+void iwl4965_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,
                             u32 decrypt_res, struct ieee80211_rx_status *stats)
 {
         u16 fc =
@@ -3257,6 +2481,12 @@ void iwl4965_set_decrypted_flag(struct iwl4965_priv *priv, struct sk_buff *skb,
         IWL_DEBUG_RX("decrypt_res:0x%x\n", decrypt_res);
         switch (decrypt_res & RX_RES_STATUS_SEC_TYPE_MSK) {
         case RX_RES_STATUS_SEC_TYPE_TKIP:
+                /* The uCode has got a bad phase 1 Key, pushes the packet.
+                 * Decryption will be done in SW. */
+                if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
+                    RX_RES_STATUS_BAD_KEY_TTAK)
+                        break;
+
                 if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
                     RX_RES_STATUS_BAD_ICV_MIC)
                         stats->flag |= RX_FLAG_MMIC_ERROR;
@@ -3277,7 +2507,7 @@ void iwl4965_set_decrypted_flag(struct iwl4965_priv *priv, struct sk_buff *skb,
 
 #define IWL_PACKET_RETRY_TIME HZ
 
-int iwl4965_is_duplicate_packet(struct iwl4965_priv *priv, struct ieee80211_hdr *header)
+int iwl4965_is_duplicate_packet(struct iwl_priv *priv, struct ieee80211_hdr *header)
 {
         u16 sc = le16_to_cpu(header->seq_ctrl);
         u16 seq = (sc & IEEE80211_SCTL_SEQ) >> 4;
@@ -3394,13 +2624,13 @@ static __le32 iwl4965_add_beacon_time(u32 base, u32 addon, u32 beacon_interval)
         return cpu_to_le32(res);
 }
 
-static int iwl4965_get_measurement(struct iwl4965_priv *priv,
+static int iwl4965_get_measurement(struct iwl_priv *priv,
                                struct ieee80211_measurement_params *params,
                                u8 type)
 {
         struct iwl4965_spectrum_cmd spectrum;
         struct iwl4965_rx_packet *res;
-        struct iwl4965_host_cmd cmd = {
+        struct iwl_host_cmd cmd = {
                 .id = REPLY_SPECTRUM_MEASUREMENT_CMD,
                 .data = (void *)&spectrum,
                 .meta.flags = CMD_WANT_SKB,
@@ -3410,7 +2640,7 @@ static int iwl4965_get_measurement(struct iwl4965_priv *priv,
         int spectrum_resp_status;
         int duration = le16_to_cpu(params->duration);
 
-        if (iwl4965_is_associated(priv))
+        if (iwl_is_associated(priv))
                 add_time =
                     iwl4965_usecs_to_beacons(
                         le64_to_cpu(params->start_time) - priv->last_tsf,
@@ -3425,7 +2655,7 @@ static int iwl4965_get_measurement(struct iwl4965_priv *priv,
         cmd.len = sizeof(spectrum);
         spectrum.len = cpu_to_le16(cmd.len - sizeof(spectrum.len));
 
-        if (iwl4965_is_associated(priv))
+        if (iwl_is_associated(priv))
                 spectrum.start_time =
                     iwl4965_add_beacon_time(priv->last_beacon_time,
                                 add_time,
@@ -3440,7 +2670,7 @@ static int iwl4965_get_measurement(struct iwl4965_priv *priv,
                 spectrum.flags |= RXON_FLG_BAND_24G_MSK |
                     RXON_FLG_AUTO_DETECT_MSK | RXON_FLG_TGG_PROTECT_MSK;
 
-        rc = iwl4965_send_cmd_sync(priv, &cmd);
+        rc = iwl_send_cmd_sync(priv, &cmd);
         if (rc)
                 return rc;
 
@@ -3474,7 +2704,7 @@ static int iwl4965_get_measurement(struct iwl4965_priv *priv,
 }
 #endif
 
-static void iwl4965_txstatus_to_ieee(struct iwl4965_priv *priv,
+static void iwl4965_txstatus_to_ieee(struct iwl_priv *priv,
                                  struct iwl4965_tx_info *tx_sta)
 {
 
@@ -3500,7 +2730,7 @@ static void iwl4965_txstatus_to_ieee(struct iwl4965_priv *priv,
  * need to be reclaimed. As result, some free space forms.  If there is
  * enough free space (> low mark), wake the stack that feeds us.
  */
-int iwl4965_tx_queue_reclaim(struct iwl4965_priv *priv, int txq_id, int index)
+int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
 {
         struct iwl4965_tx_queue *txq = &priv->txq[txq_id];
         struct iwl4965_queue *q = &txq->q;
@@ -3513,9 +2743,9 @@ int iwl4965_tx_queue_reclaim(struct iwl4965_priv *priv, int txq_id, int index)
                 return 0;
         }
 
-        for (index = iwl4965_queue_inc_wrap(index, q->n_bd);
+        for (index = iwl_queue_inc_wrap(index, q->n_bd);
                 q->read_ptr != index;
-                q->read_ptr = iwl4965_queue_inc_wrap(q->read_ptr, q->n_bd)) {
+                q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
                 if (txq_id != IWL_CMD_QUEUE_NUM) {
                         iwl4965_txstatus_to_ieee(priv,
                                         &(txq->txb[txq->q.read_ptr]));
@@ -3528,10 +2758,10 @@ int iwl4965_tx_queue_reclaim(struct iwl4965_priv *priv, int txq_id, int index)
                 nfreed++;
         }
 
-        if (iwl4965_queue_space(q) > q->low_mark && (txq_id >= 0) &&
+/*      if (iwl4965_queue_space(q) > q->low_mark && (txq_id >= 0) &&
                         (txq_id != IWL_CMD_QUEUE_NUM) &&
                         priv->mac80211_registered)
-                ieee80211_wake_queue(priv->hw, txq_id);
+                ieee80211_wake_queue(priv->hw, txq_id); */
 
 
         return nfreed;
@@ -3550,9 +2780,8 @@ static int iwl4965_is_tx_success(u32 status)
  *
  ******************************************************************************/
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
 
-static inline int iwl4965_get_ra_sta_id(struct iwl4965_priv *priv,
+static inline int iwl4965_get_ra_sta_id(struct iwl_priv *priv,
                                     struct ieee80211_hdr *hdr)
 {
         if (priv->iw_mode == IEEE80211_IF_TYPE_STA)
@@ -3564,7 +2793,7 @@ static inline int iwl4965_get_ra_sta_id(struct iwl4965_priv *priv,
 }
 
 static struct ieee80211_hdr *iwl4965_tx_queue_get_hdr(
-        struct iwl4965_priv *priv, int txq_id, int idx)
+        struct iwl_priv *priv, int txq_id, int idx)
 {
         if (priv->txq[txq_id].txb[idx].skb[0])
                 return (struct ieee80211_hdr *)priv->txq[txq_id].
@@ -3583,13 +2812,13 @@ static inline u32 iwl4965_get_scd_ssn(struct iwl4965_tx_resp *tx_resp)
 /**
  * iwl4965_tx_status_reply_tx - Handle Tx rspnse for frames in aggregation queue
  */
-static int iwl4965_tx_status_reply_tx(struct iwl4965_priv *priv,
+static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv,
                                       struct iwl4965_ht_agg *agg,
-                                      struct iwl4965_tx_resp *tx_resp,
+                                      struct iwl4965_tx_resp_agg *tx_resp,
                                       u16 start_idx)
 {
-        u32 status;
-        __le32 *frame_status = &tx_resp->status;
+        u16 status;
+        struct agg_tx_status *frame_status = &tx_resp->status;
         struct ieee80211_tx_status *tx_status = NULL;
         struct ieee80211_hdr *hdr = NULL;
         int i, sh;
@@ -3602,30 +2831,30 @@ static int iwl4965_tx_status_reply_tx(struct iwl4965_priv *priv,
         agg->frame_count = tx_resp->frame_count;
         agg->start_idx = start_idx;
         agg->rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags);
-        agg->bitmap0 = agg->bitmap1 = 0;
+        agg->bitmap = 0;
 
         /* # frames attempted by Tx command */
         if (agg->frame_count == 1) {
                 /* Only one frame was attempted; no block-ack will arrive */
-                struct iwl4965_tx_queue *txq ;
-                status = le32_to_cpu(frame_status[0]);
+                status = le16_to_cpu(frame_status[0].status);
+                seq  = le16_to_cpu(frame_status[0].sequence);
+                idx = SEQ_TO_INDEX(seq);
+                txq_id = SEQ_TO_QUEUE(seq);
 
-                txq_id = agg->txq_id;
-                txq = &priv->txq[txq_id];
                 /* FIXME: code repetition */
-                IWL_DEBUG_TX_REPLY("FrameCnt = %d, StartIdx=%d \n",
-                                   agg->frame_count, agg->start_idx);
+                IWL_DEBUG_TX_REPLY("FrameCnt = %d, StartIdx=%d idx=%d\n",
+                                   agg->frame_count, agg->start_idx, idx);
 
-                tx_status = &(priv->txq[txq_id].txb[txq->q.read_ptr].status);
+                tx_status = &(priv->txq[txq_id].txb[idx].status);
                 tx_status->retry_count = tx_resp->failure_frame;
                 tx_status->queue_number = status & 0xff;
-                tx_status->queue_length = tx_resp->bt_kill_count;
-                tx_status->queue_length |= tx_resp->failure_rts;
-
+                tx_status->queue_length = tx_resp->failure_rts;
+                tx_status->control.flags &= ~IEEE80211_TXCTL_AMPDU;
                 tx_status->flags = iwl4965_is_tx_success(status)?
                         IEEE80211_TX_STATUS_ACK : 0;
-                tx_status->control.tx_rate =
-                                iwl4965_hw_get_rate_n_flags(tx_resp->rate_n_flags);
+                iwl4965_hwrate_to_tx_control(priv,
+                                             le32_to_cpu(tx_resp->rate_n_flags),
+                                             &tx_status->control);
                 /* FIXME: code repetition end */
 
                 IWL_DEBUG_TX_REPLY("1 Frame 0x%x failure :%d\n",
@@ -3642,8 +2871,8 @@ static int iwl4965_tx_status_reply_tx(struct iwl4965_priv *priv,
                 /* Construct bit-map of pending frames within Tx window */
                 for (i = 0; i < agg->frame_count; i++) {
                         u16 sc;
-                        status = le32_to_cpu(frame_status[i]);
-                        seq  = status >> 16;
+                        status = le16_to_cpu(frame_status[i].status);
+                        seq  = le16_to_cpu(frame_status[i].sequence);
                         idx = SEQ_TO_INDEX(seq);
                         txq_id = SEQ_TO_QUEUE(seq);
 
@@ -3687,13 +2916,12 @@ static int iwl4965_tx_status_reply_tx(struct iwl4965_priv *priv,
                                            start, (u32)(bitmap & 0xFFFFFFFF));
                 }
 
-                agg->bitmap0 = bitmap & 0xFFFFFFFF;
-                agg->bitmap1 = bitmap >> 32;
+                agg->bitmap = bitmap;
                 agg->start_idx = start;
                 agg->rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags);
-                IWL_DEBUG_TX_REPLY("Frames %d start_idx=%d bitmap=0x%x\n",
+                IWL_DEBUG_TX_REPLY("Frames %d start_idx=%d bitmap=0x%llx\n",
                                    agg->frame_count, agg->start_idx,
-                                   agg->bitmap0);
+                                   (unsigned long long)agg->bitmap);
 
                 if (bitmap)
                         agg->wait_for_ba = 1;
@@ -3701,12 +2929,11 @@ static int iwl4965_tx_status_reply_tx(struct iwl4965_priv *priv,
         return 0;
 }
 #endif
-#endif
 
 /**
  * iwl4965_rx_reply_tx - Handle standard (non-aggregation) Tx response
  */
-static void iwl4965_rx_reply_tx(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
                             struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -3718,9 +2945,9 @@ static void iwl4965_rx_reply_tx(struct iwl4965_priv *priv,
         struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
         u32  status = le32_to_cpu(tx_resp->status);
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
-        int tid, sta_id;
-#endif
+        int tid = MAX_TID_COUNT, sta_id = IWL_INVALID_STATION;
+        struct ieee80211_hdr *hdr;
+        __le16 *qc;
 #endif
 
         if ((index >= txq->q.n_bd) || (x2_queue_used(&txq->q, index) == 0)) {
@@ -3732,44 +2959,51 @@ static void iwl4965_rx_reply_tx(struct iwl4965_priv *priv,
         }
 
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
+        hdr = iwl4965_tx_queue_get_hdr(priv, txq_id, index);
+        qc = ieee80211_get_qos_ctrl(hdr);
+
+        if (qc)
+                tid = le16_to_cpu(*qc) & 0xf;
+
+        sta_id = iwl4965_get_ra_sta_id(priv, hdr);
+        if (txq->sched_retry && unlikely(sta_id == IWL_INVALID_STATION)) {
+                IWL_ERROR("Station not known\n");
+                return;
+        }
+
         if (txq->sched_retry) {
                 const u32 scd_ssn = iwl4965_get_scd_ssn(tx_resp);
-                struct ieee80211_hdr *hdr =
-                        iwl4965_tx_queue_get_hdr(priv, txq_id, index);
                 struct iwl4965_ht_agg *agg = NULL;
-                __le16 *qc = ieee80211_get_qos_ctrl(hdr);
 
-                if (qc == NULL) {
-                        IWL_ERROR("BUG_ON qc is null!!!!\n");
+                if (!qc)
                         return;
-                }
-
-                tid = le16_to_cpu(*qc) & 0xf;
-
-                sta_id = iwl4965_get_ra_sta_id(priv, hdr);
-                if (unlikely(sta_id == IWL_INVALID_STATION)) {
-                        IWL_ERROR("Station not known for\n");
-                        return;
-                }
 
                 agg = &priv->stations[sta_id].tid[tid].agg;
 
-                iwl4965_tx_status_reply_tx(priv, agg, tx_resp, index);
+                iwl4965_tx_status_reply_tx(priv, agg,
+                                (struct iwl4965_tx_resp_agg *)tx_resp, index);
 
                 if ((tx_resp->frame_count == 1) &&
                     !iwl4965_is_tx_success(status)) {
                         /* TODO: send BAR */
                 }
 
-                if ((txq->q.read_ptr != (scd_ssn & 0xff))) {
-                        index = iwl4965_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);
+                if (txq->q.read_ptr != (scd_ssn & 0xff)) {
+                        int freed;
+                        index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);
                         IWL_DEBUG_TX_REPLY("Retry scheduler reclaim scd_ssn "
                                            "%d index %d\n", scd_ssn , index);
-                        iwl4965_tx_queue_reclaim(priv, txq_id, index);
+                        freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);
+                        priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
+
+                        if (iwl4965_queue_space(&txq->q) > txq->q.low_mark &&
+                            txq_id >= 0 && priv->mac80211_registered &&
+                            agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)
+                                ieee80211_wake_queue(priv->hw, txq_id);
+
+                        iwl4965_check_empty_hw_queue(priv, sta_id, tid, txq_id);
                 }
         } else {
-#endif /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
         tx_status = &(txq->txb[txq->q.read_ptr].status);
 
@@ -3777,12 +3011,10 @@ static void iwl4965_rx_reply_tx(struct iwl4965_priv *priv,
         tx_status->queue_number = status;
         tx_status->queue_length = tx_resp->bt_kill_count;
         tx_status->queue_length |= tx_resp->failure_rts;
-
         tx_status->flags =
             iwl4965_is_tx_success(status) ? IEEE80211_TX_STATUS_ACK : 0;
-
-        tx_status->control.tx_rate =
-                iwl4965_hw_get_rate_n_flags(tx_resp->rate_n_flags);
+        iwl4965_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),
+                                     &tx_status->control);
 
         IWL_DEBUG_TX("Tx queue %d Status %s (0x%08x) rate_n_flags 0x%x "
                      "retries %d\n", txq_id, iwl4965_get_tx_fail_reason(status),
@@ -3790,12 +3022,21 @@ static void iwl4965_rx_reply_tx(struct iwl4965_priv *priv,
                      tx_resp->failure_frame);
 
         IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index);
-        if (index != -1)
-                iwl4965_tx_queue_reclaim(priv, txq_id, index);
+        if (index != -1) {
+                int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);
+#ifdef CONFIG_IWL4965_HT
+                if (tid != MAX_TID_COUNT)
+                        priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
+                if (iwl4965_queue_space(&txq->q) > txq->q.low_mark &&
+                        (txq_id >= 0) &&
+                        priv->mac80211_registered)
+                        ieee80211_wake_queue(priv->hw, txq_id);
+                if (tid != MAX_TID_COUNT)
+                        iwl4965_check_empty_hw_queue(priv, sta_id, tid, txq_id);
+#endif
+        }
 #ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
         }
-#endif /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 
         if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
@@ -3803,7 +3044,7 @@ static void iwl4965_rx_reply_tx(struct iwl4965_priv *priv,
 }
 
 
-static void iwl4965_rx_reply_alive(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_alive(struct iwl_priv *priv,
                                struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -3839,7 +3080,7 @@ static void iwl4965_rx_reply_alive(struct iwl4965_priv *priv,
                 IWL_WARNING("uCode did not respond OK.\n");
 }
 
-static void iwl4965_rx_reply_add_sta(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_add_sta(struct iwl_priv *priv,
                                  struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -3848,7 +3089,7 @@ static void iwl4965_rx_reply_add_sta(struct iwl4965_priv *priv,
         return;
 }
 
-static void iwl4965_rx_reply_error(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_error(struct iwl_priv *priv,
                                struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -3864,7 +3105,7 @@ static void iwl4965_rx_reply_error(struct iwl4965_priv *priv,
 
 #define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x
 
-static void iwl4965_rx_csa(struct iwl4965_priv *priv, struct iwl4965_rx_mem_buffer *rxb)
+static void iwl4965_rx_csa(struct iwl_priv *priv, struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
         struct iwl4965_rxon_cmd *rxon = (void *)&priv->active_rxon;
@@ -3875,7 +3116,7 @@ static void iwl4965_rx_csa(struct iwl4965_priv *priv, struct iwl4965_rx_mem_buff
         priv->staging_rxon.channel = csa->channel;
 }
 
-static void iwl4965_rx_spectrum_measure_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_spectrum_measure_notif(struct iwl_priv *priv,
                                           struct iwl4965_rx_mem_buffer *rxb)
 {
 #ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT
@@ -3893,10 +3134,10 @@ static void iwl4965_rx_spectrum_measure_notif(struct iwl4965_priv *priv,
 #endif
 }
 
-static void iwl4965_rx_pm_sleep_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_pm_sleep_notif(struct iwl_priv *priv,
                                   struct iwl4965_rx_mem_buffer *rxb)
 {
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
         struct iwl4965_sleep_notification *sleep = &(pkt->u.sleep_notif);
         IWL_DEBUG_RX("sleep mode: %d, src: %d\n",
@@ -3904,20 +3145,20 @@ static void iwl4965_rx_pm_sleep_notif(struct iwl4965_priv *priv,
 #endif
 }
 
-static void iwl4965_rx_pm_debug_statistics_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_pm_debug_statistics_notif(struct iwl_priv *priv,
                                              struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
         IWL_DEBUG_RADIO("Dumping %d bytes of unhandled "
                         "notification for %s:\n",
                         le32_to_cpu(pkt->len), get_cmd_string(pkt->hdr.cmd));
-        iwl4965_print_hex_dump(IWL_DL_RADIO, pkt->u.raw, le32_to_cpu(pkt->len));
+        iwl_print_hex_dump(IWL_DL_RADIO, pkt->u.raw, le32_to_cpu(pkt->len));
 }
 
 static void iwl4965_bg_beacon_update(struct work_struct *work)
 {
-        struct iwl4965_priv *priv =
-                container_of(work, struct iwl4965_priv, beacon_update);
+        struct iwl_priv *priv =
+                container_of(work, struct iwl_priv, beacon_update);
         struct sk_buff *beacon;
 
         /* Pull updated AP beacon from mac80211. will fail if not in AP mode */
@@ -3939,10 +3180,10 @@ static void iwl4965_bg_beacon_update(struct work_struct *work)
         iwl4965_send_beacon_cmd(priv);
 }
 
-static void iwl4965_rx_beacon_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_beacon_notif(struct iwl_priv *priv,
                                 struct iwl4965_rx_mem_buffer *rxb)
 {
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
         struct iwl4965_beacon_notif *beacon = &(pkt->u.beacon_status);
         u8 rate = iwl4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);
@@ -3962,10 +3203,10 @@ static void iwl4965_rx_beacon_notif(struct iwl4965_priv *priv,
 }
 
 /* Service response to REPLY_SCAN_CMD (0x80) */
-static void iwl4965_rx_reply_scan(struct iwl4965_priv *priv,
+static void iwl4965_rx_reply_scan(struct iwl_priv *priv,
                               struct iwl4965_rx_mem_buffer *rxb)
 {
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
         struct iwl4965_scanreq_notification *notif =
             (struct iwl4965_scanreq_notification *)pkt->u.raw;
@@ -3975,7 +3216,7 @@ static void iwl4965_rx_reply_scan(struct iwl4965_priv *priv,
 }
 
 /* Service SCAN_START_NOTIFICATION (0x82) */
-static void iwl4965_rx_scan_start_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_scan_start_notif(struct iwl_priv *priv,
                                     struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -3992,7 +3233,7 @@ static void iwl4965_rx_scan_start_notif(struct iwl4965_priv *priv,
 }
 
 /* Service SCAN_RESULTS_NOTIFICATION (0x83) */
-static void iwl4965_rx_scan_results_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_scan_results_notif(struct iwl_priv *priv,
                                       struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -4017,7 +3258,7 @@ static void iwl4965_rx_scan_results_notif(struct iwl4965_priv *priv,
 }
 
 /* Service SCAN_COMPLETE_NOTIFICATION (0x84) */
-static void iwl4965_rx_scan_complete_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_scan_complete_notif(struct iwl_priv *priv,
                                        struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -4075,7 +3316,7 @@ reschedule:
 
 /* Handle notification from uCode that card's power state is changing
  * due to software, hardware, or critical temperature RFKILL */
-static void iwl4965_rx_card_state_notif(struct iwl4965_priv *priv,
+static void iwl4965_rx_card_state_notif(struct iwl_priv *priv,
                                     struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
@@ -4089,35 +3330,35 @@ static void iwl4965_rx_card_state_notif(struct iwl4965_priv *priv,
         if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED |
                      RF_CARD_DISABLED)) {
 
-                iwl4965_write32(priv, CSR_UCODE_DRV_GP1_SET,
+                iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
                             CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
 
-                if (!iwl4965_grab_nic_access(priv)) {
-                        iwl4965_write_direct32(
+                if (!iwl_grab_nic_access(priv)) {
+                        iwl_write_direct32(
                                 priv, HBUS_TARG_MBX_C,
                                 HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
 
-                        iwl4965_release_nic_access(priv);
+                        iwl_release_nic_access(priv);
                 }
 
                 if (!(flags & RXON_CARD_DISABLED)) {
-                        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_CLR,
+                        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
                                     CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
-                        if (!iwl4965_grab_nic_access(priv)) {
-                                iwl4965_write_direct32(
+                        if (!iwl_grab_nic_access(priv)) {
+                                iwl_write_direct32(
                                         priv, HBUS_TARG_MBX_C,
                                         HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
 
-                                iwl4965_release_nic_access(priv);
+                                iwl_release_nic_access(priv);
                         }
                 }
 
                 if (flags & RF_CARD_DISABLED) {
-                        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_SET,
+                        iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
                                     CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
-                        iwl4965_read32(priv, CSR_UCODE_DRV_GP1);
-                        if (!iwl4965_grab_nic_access(priv))
-                                iwl4965_release_nic_access(priv);
+                        iwl_read32(priv, CSR_UCODE_DRV_GP1);
+                        if (!iwl_grab_nic_access(priv))
+                                iwl_release_nic_access(priv);
                 }
         }
 
@@ -4153,7 +3394,7 @@ static void iwl4965_rx_card_state_notif(struct iwl4965_priv *priv,
  * This function chains into the hardware specific files for them to setup
  * any hardware specific handlers as well.
  */
-static void iwl4965_setup_rx_handlers(struct iwl4965_priv *priv)
+static void iwl4965_setup_rx_handlers(struct iwl_priv *priv)
 {
         priv->rx_handlers[REPLY_ALIVE] = iwl4965_rx_reply_alive;
         priv->rx_handlers[REPLY_ADD_STA] = iwl4965_rx_reply_add_sta;
@@ -4195,7 +3436,7 @@ static void iwl4965_setup_rx_handlers(struct iwl4965_priv *priv)
  * will be executed.  The attached skb (if present) will only be freed
  * if the callback returns 1
  */
-static void iwl4965_tx_cmd_complete(struct iwl4965_priv *priv,
+static void iwl4965_tx_cmd_complete(struct iwl_priv *priv,
                                 struct iwl4965_rx_mem_buffer *rxb)
 {
         struct iwl4965_rx_packet *pkt = (struct iwl4965_rx_packet *)rxb->skb->data;
@@ -4204,7 +3445,7 @@ static void iwl4965_tx_cmd_complete(struct iwl4965_priv *priv,
         int index = SEQ_TO_INDEX(sequence);
         int huge = sequence & SEQ_HUGE_FRAME;
         int cmd_index;
-        struct iwl4965_cmd *cmd;
+        struct iwl_cmd *cmd;
 
         /* If a Tx command is being handled and it isn't in the actual
          * command queue then there a command routing bug has been introduced
@@ -4318,7 +3559,7 @@ static int iwl4965_rx_queue_space(const struct iwl4965_rx_queue *q)
 /**
  * iwl4965_rx_queue_update_write_ptr - Update the write pointer for the RX queue
  */
-int iwl4965_rx_queue_update_write_ptr(struct iwl4965_priv *priv, struct iwl4965_rx_queue *q)
+int iwl4965_rx_queue_update_write_ptr(struct iwl_priv *priv, struct iwl4965_rx_queue *q)
 {
         u32 reg = 0;
         int rc = 0;
@@ -4331,27 +3572,27 @@ int iwl4965_rx_queue_update_write_ptr(struct iwl4965_priv *priv, struct iwl4965_
 
         /* If power-saving is in use, make sure device is awake */
         if (test_bit(STATUS_POWER_PMI, &priv->status)) {
-                reg = iwl4965_read32(priv, CSR_UCODE_DRV_GP1);
+                reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);
 
                 if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
-                        iwl4965_set_bit(priv, CSR_GP_CNTRL,
+                        iwl_set_bit(priv, CSR_GP_CNTRL,
                                     CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
                         goto exit_unlock;
                 }
 
-                rc = iwl4965_grab_nic_access(priv);
+                rc = iwl_grab_nic_access(priv);
                 if (rc)
                         goto exit_unlock;
 
                 /* Device expects a multiple of 8 */
-                iwl4965_write_direct32(priv, FH_RSCSR_CHNL0_WPTR,
+                iwl_write_direct32(priv, FH_RSCSR_CHNL0_WPTR,
                                      q->write & ~0x7);
-                iwl4965_release_nic_access(priv);
+                iwl_release_nic_access(priv);
 
         /* Else device is assumed to be awake */
         } else
                 /* Device expects a multiple of 8 */
-                iwl4965_write32(priv, FH_RSCSR_CHNL0_WPTR, q->write & ~0x7);
+                iwl_write32(priv, FH_RSCSR_CHNL0_WPTR, q->write & ~0x7);
 
 
         q->need_update = 0;
@@ -4364,7 +3605,7 @@ int iwl4965_rx_queue_update_write_ptr(struct iwl4965_priv *priv, struct iwl4965_
 /**
  * iwl4965_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
  */
-static inline __le32 iwl4965_dma_addr2rbd_ptr(struct iwl4965_priv *priv,
+static inline __le32 iwl4965_dma_addr2rbd_ptr(struct iwl_priv *priv,
                                           dma_addr_t dma_addr)
 {
         return cpu_to_le32((u32)(dma_addr >> 8));
@@ -4382,7 +3623,7 @@ static inline __le32 iwl4965_dma_addr2rbd_ptr(struct iwl4965_priv *priv,
  * also updates the memory address in the firmware to reference the new
  * target buffer.
  */
-static int iwl4965_rx_queue_restock(struct iwl4965_priv *priv)
+static int iwl4965_rx_queue_restock(struct iwl_priv *priv)
 {
         struct iwl4965_rx_queue *rxq = &priv->rxq;
         struct list_head *element;
@@ -4434,7 +3675,7 @@ static int iwl4965_rx_queue_restock(struct iwl4965_priv *priv)
  * Also restock the Rx queue via iwl4965_rx_queue_restock.
  * This is called as a scheduled work item (except for during initialization)
  */
-static void iwl4965_rx_allocate(struct iwl4965_priv *priv)
+static void iwl4965_rx_allocate(struct iwl_priv *priv)
 {
         struct iwl4965_rx_queue *rxq = &priv->rxq;
         struct list_head *element;
@@ -4447,7 +3688,7 @@ static void iwl4965_rx_allocate(struct iwl4965_priv *priv)
 
                 /* Alloc a new receive buffer */
                 rxb->skb =
-                    alloc_skb(priv->hw_setting.rx_buf_size,
+                    alloc_skb(priv->hw_params.rx_buf_size,
                                 __GFP_NOWARN | GFP_ATOMIC);
                 if (!rxb->skb) {
                         if (net_ratelimit())
@@ -4464,7 +3705,7 @@ static void iwl4965_rx_allocate(struct iwl4965_priv *priv)
                 /* Get physical address of RB/SKB */
                 rxb->dma_addr =
                     pci_map_single(priv->pci_dev, rxb->skb->data,
-                           priv->hw_setting.rx_buf_size, PCI_DMA_FROMDEVICE);
+                           priv->hw_params.rx_buf_size, PCI_DMA_FROMDEVICE);
                 list_add_tail(&rxb->list, &rxq->rx_free);
                 rxq->free_count++;
         }
@@ -4476,7 +3717,7 @@ static void iwl4965_rx_allocate(struct iwl4965_priv *priv)
 */
 static void __iwl4965_rx_replenish(void *data)
 {
-        struct iwl4965_priv *priv = data;
+        struct iwl_priv *priv = data;
 
         iwl4965_rx_allocate(priv);
         iwl4965_rx_queue_restock(priv);
@@ -4485,7 +3726,7 @@ static void __iwl4965_rx_replenish(void *data)
 
 void iwl4965_rx_replenish(void *data)
 {
-        struct iwl4965_priv *priv = data;
+        struct iwl_priv *priv = data;
         unsigned long flags;
 
         iwl4965_rx_allocate(priv);
@@ -4500,14 +3741,14 @@ void iwl4965_rx_replenish(void *data)
  * This free routine walks the list of POOL entries and if SKB is set to
  * non NULL it is unmapped and freed
  */
-static void iwl4965_rx_queue_free(struct iwl4965_priv *priv, struct iwl4965_rx_queue *rxq)
+static void iwl4965_rx_queue_free(struct iwl_priv *priv, struct iwl4965_rx_queue *rxq)
 {
         int i;
         for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
                 if (rxq->pool[i].skb != NULL) {
                         pci_unmap_single(priv->pci_dev,
                                          rxq->pool[i].dma_addr,
-                                         priv->hw_setting.rx_buf_size,
+                                         priv->hw_params.rx_buf_size,
                                          PCI_DMA_FROMDEVICE);
                         dev_kfree_skb(rxq->pool[i].skb);
                 }
@@ -4518,7 +3759,7 @@ static void iwl4965_rx_queue_free(struct iwl4965_priv *priv, struct iwl4965_rx_q
         rxq->bd = NULL;
 }
 
-int iwl4965_rx_queue_alloc(struct iwl4965_priv *priv)
+int iwl4965_rx_queue_alloc(struct iwl_priv *priv)
 {
         struct iwl4965_rx_queue *rxq = &priv->rxq;
         struct pci_dev *dev = priv->pci_dev;
@@ -4545,7 +3786,7 @@ int iwl4965_rx_queue_alloc(struct iwl4965_priv *priv)
         return 0;
 }
 
-void iwl4965_rx_queue_reset(struct iwl4965_priv *priv, struct iwl4965_rx_queue *rxq)
+void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl4965_rx_queue *rxq)
 {
         unsigned long flags;
         int i;
@@ -4559,7 +3800,7 @@ void iwl4965_rx_queue_reset(struct iwl4965_priv *priv, struct iwl4965_rx_queue *
                 if (rxq->pool[i].skb != NULL) {
                         pci_unmap_single(priv->pci_dev,
                                          rxq->pool[i].dma_addr,
-                                         priv->hw_setting.rx_buf_size,
+                                         priv->hw_params.rx_buf_size,
                                          PCI_DMA_FROMDEVICE);
                         priv->alloc_rxb_skb--;
                         dev_kfree_skb(rxq->pool[i].skb);
@@ -4660,7 +3901,7 @@ int iwl4965_calc_sig_qual(int rssi_dbm, int noise_dbm)
  * the appropriate handlers, including command responses,
  * frame-received notifications, and other notifications.
  */
-static void iwl4965_rx_handle(struct iwl4965_priv *priv)
+static void iwl4965_rx_handle(struct iwl_priv *priv)
 {
         struct iwl4965_rx_mem_buffer *rxb;
         struct iwl4965_rx_packet *pkt;
@@ -4694,7 +3935,7 @@ static void iwl4965_rx_handle(struct iwl4965_priv *priv)
                 rxq->queue[i] = NULL;
 
                 pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->dma_addr,
-                                            priv->hw_setting.rx_buf_size,
+                                            priv->hw_params.rx_buf_size,
                                             PCI_DMA_FROMDEVICE);
                 pkt = (struct iwl4965_rx_packet *)rxb->skb->data;
 
@@ -4706,7 +3947,7 @@ static void iwl4965_rx_handle(struct iwl4965_priv *priv)
                  *   but apparently a few don't get set; catch them here. */
                 reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
                         (pkt->hdr.cmd != REPLY_RX_PHY_CMD) &&
-                        (pkt->hdr.cmd != REPLY_4965_RX) &&
+                        (pkt->hdr.cmd != REPLY_RX) &&
                         (pkt->hdr.cmd != REPLY_COMPRESSED_BA) &&
                         (pkt->hdr.cmd != STATISTICS_NOTIFICATION) &&
                         (pkt->hdr.cmd != REPLY_TX);
@@ -4729,7 +3970,7 @@ static void iwl4965_rx_handle(struct iwl4965_priv *priv)
 
                 if (reclaim) {
                         /* Invoke any callbacks, transfer the skb to caller, and
-                         * fire off the (possibly) blocking iwl4965_send_cmd()
+                         * fire off the (possibly) blocking iwl_send_cmd()
                          * as we reclaim the driver command queue */
                         if (rxb && rxb->skb)
                                 iwl4965_tx_cmd_complete(priv, rxb);
@@ -4747,7 +3988,7 @@ static void iwl4965_rx_handle(struct iwl4965_priv *priv)
                 }
 
                 pci_unmap_single(priv->pci_dev, rxb->dma_addr,
-                                 priv->hw_setting.rx_buf_size,
+                                 priv->hw_params.rx_buf_size,
                                  PCI_DMA_FROMDEVICE);
                 spin_lock_irqsave(&rxq->lock, flags);
                 list_add_tail(&rxb->list, &priv->rxq.rx_used);
@@ -4773,7 +4014,7 @@ static void iwl4965_rx_handle(struct iwl4965_priv *priv)
 /**
  * iwl4965_tx_queue_update_write_ptr - Send new write index to hardware
  */
-static int iwl4965_tx_queue_update_write_ptr(struct iwl4965_priv *priv,
+static int iwl4965_tx_queue_update_write_ptr(struct iwl_priv *priv,
                                   struct iwl4965_tx_queue *txq)
 {
         u32 reg = 0;
@@ -4788,27 +4029,27 @@ static int iwl4965_tx_queue_update_write_ptr(struct iwl4965_priv *priv,
                 /* wake up nic if it's powered down ...
                  * uCode will wake up, and interrupt us again, so next
                  * time we'll skip this part. */
-                reg = iwl4965_read32(priv, CSR_UCODE_DRV_GP1);
+                reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);
 
                 if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
                         IWL_DEBUG_INFO("Requesting wakeup, GP1 = 0x%x\n", reg);
-                        iwl4965_set_bit(priv, CSR_GP_CNTRL,
+                        iwl_set_bit(priv, CSR_GP_CNTRL,
                                     CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
                         return rc;
                 }
 
                 /* restore this queue's parameters in nic hardware. */
-                rc = iwl4965_grab_nic_access(priv);
+                rc = iwl_grab_nic_access(priv);
                 if (rc)
                         return rc;
-                iwl4965_write_direct32(priv, HBUS_TARG_WRPTR,
+                iwl_write_direct32(priv, HBUS_TARG_WRPTR,
                                      txq->q.write_ptr | (txq_id << 8));
-                iwl4965_release_nic_access(priv);
+                iwl_release_nic_access(priv);
 
         /* else not in power-save mode, uCode will never sleep when we're
          * trying to tx (during RFKILL, we're not trying to tx). */
         } else
-                iwl4965_write32(priv, HBUS_TARG_WRPTR,
+                iwl_write32(priv, HBUS_TARG_WRPTR,
                             txq->q.write_ptr | (txq_id << 8));
 
         txq->need_update = 0;
@@ -4816,13 +4057,13 @@ static int iwl4965_tx_queue_update_write_ptr(struct iwl4965_priv *priv,
         return rc;
 }
 
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
 static void iwl4965_print_rx_config_cmd(struct iwl4965_rxon_cmd *rxon)
 {
         DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_RADIO("RX CONFIG:\n");
-        iwl4965_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
+        iwl_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
         IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
         IWL_DEBUG_RADIO("u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags));
         IWL_DEBUG_RADIO("u32 filter_flags: 0x%08x\n",
@@ -4839,24 +4080,32 @@ static void iwl4965_print_rx_config_cmd(struct iwl4965_rxon_cmd *rxon)
 }
 #endif
 
-static void iwl4965_enable_interrupts(struct iwl4965_priv *priv)
+static void iwl4965_enable_interrupts(struct iwl_priv *priv)
 {
         IWL_DEBUG_ISR("Enabling interrupts\n");
         set_bit(STATUS_INT_ENABLED, &priv->status);
-        iwl4965_write32(priv, CSR_INT_MASK, CSR_INI_SET_MASK);
+        iwl_write32(priv, CSR_INT_MASK, CSR_INI_SET_MASK);
+}
+
+/* call this function to flush any scheduled tasklet */
+static inline void iwl_synchronize_irq(struct iwl_priv *priv)
+{
+        /* wait to make sure we flush pedding tasklet*/
+        synchronize_irq(priv->pci_dev->irq);
+        tasklet_kill(&priv->irq_tasklet);
 }
 
-static inline void iwl4965_disable_interrupts(struct iwl4965_priv *priv)
+static inline void iwl4965_disable_interrupts(struct iwl_priv *priv)
 {
         clear_bit(STATUS_INT_ENABLED, &priv->status);
 
         /* disable interrupts from uCode/NIC to host */
-        iwl4965_write32(priv, CSR_INT_MASK, 0x00000000);
+        iwl_write32(priv, CSR_INT_MASK, 0x00000000);
 
         /* acknowledge/clear/reset any interrupts still pending
          * from uCode or flow handler (Rx/Tx DMA) */
-        iwl4965_write32(priv, CSR_INT, 0xffffffff);
-        iwl4965_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);
+        iwl_write32(priv, CSR_INT, 0xffffffff);
+        iwl_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);
         IWL_DEBUG_ISR("Disabled interrupts\n");
 }
 
@@ -4883,7 +4132,7 @@ static const char *desc_lookup(int i)
 #define ERROR_START_OFFSET  (1 * sizeof(u32))
 #define ERROR_ELEM_SIZE     (7 * sizeof(u32))
 
-static void iwl4965_dump_nic_error_log(struct iwl4965_priv *priv)
+static void iwl4965_dump_nic_error_log(struct iwl_priv *priv)
 {
         u32 data2, line;
         u32 desc, time, count, base, data1;
@@ -4892,34 +4141,33 @@ static void iwl4965_dump_nic_error_log(struct iwl4965_priv *priv)
 
         base = le32_to_cpu(priv->card_alive.error_event_table_ptr);
 
-        if (!iwl4965_hw_valid_rtc_data_addr(base)) {
+        if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
                 IWL_ERROR("Not valid error log pointer 0x%08X\n", base);
                 return;
         }
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc) {
                 IWL_WARNING("Can not read from adapter at this time.\n");
                 return;
         }
 
-        count = iwl4965_read_targ_mem(priv, base);
+        count = iwl_read_targ_mem(priv, base);
 
         if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
                 IWL_ERROR("Start IWL Error Log Dump:\n");
-                IWL_ERROR("Status: 0x%08lX, Config: %08X count: %d\n",
-                          priv->status, priv->config, count);
+                IWL_ERROR("Status: 0x%08lX, count: %d\n", priv->status, count);
         }
 
-        desc = iwl4965_read_targ_mem(priv, base + 1 * sizeof(u32));
-        blink1 = iwl4965_read_targ_mem(priv, base + 3 * sizeof(u32));
-        blink2 = iwl4965_read_targ_mem(priv, base + 4 * sizeof(u32));
-        ilink1 = iwl4965_read_targ_mem(priv, base + 5 * sizeof(u32));
-        ilink2 = iwl4965_read_targ_mem(priv, base + 6 * sizeof(u32));
-        data1 = iwl4965_read_targ_mem(priv, base + 7 * sizeof(u32));
-        data2 = iwl4965_read_targ_mem(priv, base + 8 * sizeof(u32));
-        line = iwl4965_read_targ_mem(priv, base + 9 * sizeof(u32));
-        time = iwl4965_read_targ_mem(priv, base + 11 * sizeof(u32));
+        desc = iwl_read_targ_mem(priv, base + 1 * sizeof(u32));
+        blink1 = iwl_read_targ_mem(priv, base + 3 * sizeof(u32));
+        blink2 = iwl_read_targ_mem(priv, base + 4 * sizeof(u32));
+        ilink1 = iwl_read_targ_mem(priv, base + 5 * sizeof(u32));
+        ilink2 = iwl_read_targ_mem(priv, base + 6 * sizeof(u32));
+        data1 = iwl_read_targ_mem(priv, base + 7 * sizeof(u32));
+        data2 = iwl_read_targ_mem(priv, base + 8 * sizeof(u32));
+        line = iwl_read_targ_mem(priv, base + 9 * sizeof(u32));
+        time = iwl_read_targ_mem(priv, base + 11 * sizeof(u32));
 
         IWL_ERROR("Desc               Time       "
                   "data1      data2      line\n");
@@ -4929,7 +4177,7 @@ static void iwl4965_dump_nic_error_log(struct iwl4965_priv *priv)
         IWL_ERROR("0x%05X 0x%05X 0x%05X 0x%05X\n", blink1, blink2,
                   ilink1, ilink2);
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
 }
 
 #define EVENT_START_OFFSET  (4 * sizeof(u32))
@@ -4937,9 +4185,9 @@ static void iwl4965_dump_nic_error_log(struct iwl4965_priv *priv)
 /**
  * iwl4965_print_event_log - Dump error event log to syslog
  *
- * NOTE: Must be called with iwl4965_grab_nic_access() already obtained!
+ * NOTE: Must be called with iwl_grab_nic_access() already obtained!
  */
-static void iwl4965_print_event_log(struct iwl4965_priv *priv, u32 start_idx,
+static void iwl4965_print_event_log(struct iwl_priv *priv, u32 start_idx,
                                 u32 num_events, u32 mode)
 {
         u32 i;
@@ -4963,21 +4211,21 @@ static void iwl4965_print_event_log(struct iwl4965_priv *priv, u32 start_idx,
         /* "time" is actually "data" for mode 0 (no timestamp).
          * place event id # at far right for easier visual parsing. */
         for (i = 0; i < num_events; i++) {
-                ev = iwl4965_read_targ_mem(priv, ptr);
+                ev = iwl_read_targ_mem(priv, ptr);
                 ptr += sizeof(u32);
-                time = iwl4965_read_targ_mem(priv, ptr);
+                time = iwl_read_targ_mem(priv, ptr);
                 ptr += sizeof(u32);
                 if (mode == 0)
                         IWL_ERROR("0x%08x\t%04u\n", time, ev); /* data, ev */
                 else {
-                        data = iwl4965_read_targ_mem(priv, ptr);
+                        data = iwl_read_targ_mem(priv, ptr);
                         ptr += sizeof(u32);
                         IWL_ERROR("%010u\t0x%08x\t%04u\n", time, data, ev);
                 }
         }
 }
 
-static void iwl4965_dump_nic_event_log(struct iwl4965_priv *priv)
+static void iwl4965_dump_nic_event_log(struct iwl_priv *priv)
 {
         int rc;
         u32 base;       /* SRAM byte address of event log header */
@@ -4988,29 +4236,29 @@ static void iwl4965_dump_nic_event_log(struct iwl4965_priv *priv)
         u32 size;       /* # entries that we'll print */
 
         base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
-        if (!iwl4965_hw_valid_rtc_data_addr(base)) {
+        if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
                 IWL_ERROR("Invalid event log pointer 0x%08X\n", base);
                 return;
         }
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc) {
                 IWL_WARNING("Can not read from adapter at this time.\n");
                 return;
         }
 
         /* event log header */
-        capacity = iwl4965_read_targ_mem(priv, base);
-        mode = iwl4965_read_targ_mem(priv, base + (1 * sizeof(u32)));
-        num_wraps = iwl4965_read_targ_mem(priv, base + (2 * sizeof(u32)));
-        next_entry = iwl4965_read_targ_mem(priv, base + (3 * sizeof(u32)));
+        capacity = iwl_read_targ_mem(priv, base);
+        mode = iwl_read_targ_mem(priv, base + (1 * sizeof(u32)));
+        num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32)));
+        next_entry = iwl_read_targ_mem(priv, base + (3 * sizeof(u32)));
 
         size = num_wraps ? capacity : next_entry;
 
         /* bail out if nothing in log */
         if (size == 0) {
                 IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
-                iwl4965_release_nic_access(priv);
+                iwl_release_nic_access(priv);
                 return;
         }
 
@@ -5026,13 +4274,13 @@ static void iwl4965_dump_nic_event_log(struct iwl4965_priv *priv)
         /* (then/else) start at top of log */
         iwl4965_print_event_log(priv, 0, next_entry, mode);
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
 }
 
 /**
  * iwl4965_irq_handle_error - called for HW or SW error interrupt from card
  */
-static void iwl4965_irq_handle_error(struct iwl4965_priv *priv)
+static void iwl4965_irq_handle_error(struct iwl_priv *priv)
 {
         /* Set the FW error flag -- cleared on iwl4965_down */
         set_bit(STATUS_FW_ERROR, &priv->status);
@@ -5040,8 +4288,8 @@ static void iwl4965_irq_handle_error(struct iwl4965_priv *priv)
         /* Cancel currently queued command. */
         clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
 
-#ifdef CONFIG_IWL4965_DEBUG
-        if (iwl4965_debug_level & IWL_DL_FW_ERRORS) {
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (iwl_debug_level & IWL_DL_FW_ERRORS) {
                 iwl4965_dump_nic_error_log(priv);
                 iwl4965_dump_nic_event_log(priv);
                 iwl4965_print_rx_config_cmd(&priv->staging_rxon);
@@ -5058,7 +4306,7 @@ static void iwl4965_irq_handle_error(struct iwl4965_priv *priv)
                 IWL_DEBUG(IWL_DL_INFO | IWL_DL_FW_ERRORS,
                           "Restarting adapter due to uCode error.\n");
 
-                if (iwl4965_is_associated(priv)) {
+                if (iwl_is_associated(priv)) {
                         memcpy(&priv->recovery_rxon, &priv->active_rxon,
                                sizeof(priv->recovery_rxon));
                         priv->error_recovering = 1;
@@ -5067,7 +4315,7 @@ static void iwl4965_irq_handle_error(struct iwl4965_priv *priv)
         }
 }
 
-static void iwl4965_error_recovery(struct iwl4965_priv *priv)
+static void iwl4965_error_recovery(struct iwl_priv *priv)
 {
         unsigned long flags;
 
@@ -5084,12 +4332,12 @@ static void iwl4965_error_recovery(struct iwl4965_priv *priv)
         spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
+static void iwl4965_irq_tasklet(struct iwl_priv *priv)
 {
         u32 inta, handled = 0;
         u32 inta_fh;
         unsigned long flags;
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
         u32 inta_mask;
 #endif
 
@@ -5098,19 +4346,19 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
         /* Ack/clear/reset pending uCode interrupts.
          * Note:  Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,
          *  and will clear only when CSR_FH_INT_STATUS gets cleared. */
-        inta = iwl4965_read32(priv, CSR_INT);
-        iwl4965_write32(priv, CSR_INT, inta);
+        inta = iwl_read32(priv, CSR_INT);
+        iwl_write32(priv, CSR_INT, inta);
 
         /* Ack/clear/reset pending flow-handler (DMA) interrupts.
          * Any new interrupts that happen after this, either while we're
          * in this tasklet, or later, will show up in next ISR/tasklet. */
-        inta_fh = iwl4965_read32(priv, CSR_FH_INT_STATUS);
-        iwl4965_write32(priv, CSR_FH_INT_STATUS, inta_fh);
+        inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);
+        iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh);
 
-#ifdef CONFIG_IWL4965_DEBUG
-        if (iwl4965_debug_level & IWL_DL_ISR) {
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (iwl_debug_level & IWL_DL_ISR) {
                 /* just for debug */
-                inta_mask = iwl4965_read32(priv, CSR_INT_MASK);
+                inta_mask = iwl_read32(priv, CSR_INT_MASK);
                 IWL_DEBUG_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
                               inta, inta_mask, inta_fh);
         }
@@ -5120,9 +4368,9 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
          * atomic, make sure that inta covers all the interrupts that
          * we've discovered, even if FH interrupt came in just after
          * reading CSR_INT. */
-        if (inta_fh & CSR_FH_INT_RX_MASK)
+        if (inta_fh & CSR49_FH_INT_RX_MASK)
                 inta |= CSR_INT_BIT_FH_RX;
-        if (inta_fh & CSR_FH_INT_TX_MASK)
+        if (inta_fh & CSR49_FH_INT_TX_MASK)
                 inta |= CSR_INT_BIT_FH_TX;
 
         /* Now service all interrupt bits discovered above. */
@@ -5141,8 +4389,8 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
                 return;
         }
 
-#ifdef CONFIG_IWL4965_DEBUG
-        if (iwl4965_debug_level & (IWL_DL_ISR)) {
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (iwl_debug_level & (IWL_DL_ISR)) {
                 /* NIC fires this, but we don't use it, redundant with WAKEUP */
                 if (inta & CSR_INT_BIT_SCD)
                         IWL_DEBUG_ISR("Scheduler finished to transmit "
@@ -5159,7 +4407,7 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
         /* HW RF KILL switch toggled */
         if (inta & CSR_INT_BIT_RF_KILL) {
                 int hw_rf_kill = 0;
-                if (!(iwl4965_read32(priv, CSR_GP_CNTRL) &
+                if (!(iwl_read32(priv, CSR_GP_CNTRL) &
                                 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
                         hw_rf_kill = 1;
 
@@ -5170,7 +4418,7 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
                 /* Queue restart only if RF_KILL switch was set to "kill"
                  *   when we loaded driver, and is now set to "enable".
                  * After we're Alive, RF_KILL gets handled by
-                 *   iwl_rx_card_state_notif() */
+                 *   iwl4965_rx_card_state_notif() */
                 if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
                         clear_bit(STATUS_RF_KILL_HW, &priv->status);
                         queue_work(priv->workqueue, &priv->restart);
@@ -5230,13 +4478,15 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
         }
 
         /* Re-enable all interrupts */
-        iwl4965_enable_interrupts(priv);
-
-#ifdef CONFIG_IWL4965_DEBUG
-        if (iwl4965_debug_level & (IWL_DL_ISR)) {
-                inta = iwl4965_read32(priv, CSR_INT);
-                inta_mask = iwl4965_read32(priv, CSR_INT_MASK);
-                inta_fh = iwl4965_read32(priv, CSR_FH_INT_STATUS);
+        /* only Re-enable if diabled by irq */
+        if (test_bit(STATUS_INT_ENABLED, &priv->status))
+                iwl4965_enable_interrupts(priv);
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (iwl_debug_level & (IWL_DL_ISR)) {
+                inta = iwl_read32(priv, CSR_INT);
+                inta_mask = iwl_read32(priv, CSR_INT_MASK);
+                inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);
                 IWL_DEBUG_ISR("End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "
                         "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);
         }
@@ -5246,7 +4496,7 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
 
 static irqreturn_t iwl4965_isr(int irq, void *data)
 {
-        struct iwl4965_priv *priv = data;
+        struct iwl_priv *priv = data;
         u32 inta, inta_mask;
         u32 inta_fh;
         if (!priv)
@@ -5258,12 +4508,12 @@ static irqreturn_t iwl4965_isr(int irq, void *data)
          *    back-to-back ISRs and sporadic interrupts from our NIC.
          * If we have something to service, the tasklet will re-enable ints.
          * If we *don't* have something, we'll re-enable before leaving here. */
-        inta_mask = iwl4965_read32(priv, CSR_INT_MASK);  /* just for debug */
-        iwl4965_write32(priv, CSR_INT_MASK, 0x00000000);
+        inta_mask = iwl_read32(priv, CSR_INT_MASK);  /* just for debug */
+        iwl_write32(priv, CSR_INT_MASK, 0x00000000);
 
         /* Discover which interrupts are active/pending */
-        inta = iwl4965_read32(priv, CSR_INT);
-        inta_fh = iwl4965_read32(priv, CSR_FH_INT_STATUS);
+        inta = iwl_read32(priv, CSR_INT);
+        inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);
 
         /* Ignore interrupt if there's nothing in NIC to service.
          * This may be due to IRQ shared with another device,
@@ -5295,313 +4545,13 @@ static irqreturn_t iwl4965_isr(int irq, void *data)
 
  none:
         /* re-enable interrupts here since we don't have anything to service. */
-        iwl4965_enable_interrupts(priv);
+        /* only Re-enable if diabled by irq */
+        if (test_bit(STATUS_INT_ENABLED, &priv->status))
+                iwl4965_enable_interrupts(priv);
         spin_unlock(&priv->lock);
         return IRQ_NONE;
 }
 
-/************************** EEPROM BANDS ****************************
- *
- * The iwl4965_eeprom_band definitions below provide the mapping from the
- * EEPROM contents to the specific channel number supported for each
- * band.
- *
- * For example, iwl4965_priv->eeprom.band_3_channels[4] from the band_3
- * definition below maps to physical channel 42 in the 5.2GHz spectrum.
- * The specific geography and calibration information for that channel
- * is contained in the eeprom map itself.
- *
- * During init, we copy the eeprom information and channel map
- * information into priv->channel_info_24/52 and priv->channel_map_24/52
- *
- * channel_map_24/52 provides the index in the channel_info array for a
- * given channel.  We have to have two separate maps as there is channel
- * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and
- * band_2
- *
- * A value of 0xff stored in the channel_map indicates that the channel
- * is not supported by the hardware at all.
- *
- * A value of 0xfe in the channel_map indicates that the channel is not
- * valid for Tx with the current hardware.  This means that
- * while the system can tune and receive on a given channel, it may not
- * be able to associate or transmit any frames on that
- * channel.  There is no corresponding channel information for that
- * entry.
- *
- *********************************************************************/
-
-/* 2.4 GHz */
-static const u8 iwl4965_eeprom_band_1[14] = {
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
-};
-
-/* 5.2 GHz bands */
-static const u8 iwl4965_eeprom_band_2[] = {     /* 4915-5080MHz */
-        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
-};
-
-static const u8 iwl4965_eeprom_band_3[] = {     /* 5170-5320MHz */
-        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
-};
-
-static const u8 iwl4965_eeprom_band_4[] = {     /* 5500-5700MHz */
-        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
-};
-
-static const u8 iwl4965_eeprom_band_5[] = {     /* 5725-5825MHz */
-        145, 149, 153, 157, 161, 165
-};
-
-static u8 iwl4965_eeprom_band_6[] = {       /* 2.4 FAT channel */
-        1, 2, 3, 4, 5, 6, 7
-};
-
-static u8 iwl4965_eeprom_band_7[] = {       /* 5.2 FAT channel */
-        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
-};
-
-static void iwl4965_init_band_reference(const struct iwl4965_priv *priv,
-                                    int band,
-                                    int *eeprom_ch_count,
-                                    const struct iwl4965_eeprom_channel
-                                    **eeprom_ch_info,
-                                    const u8 **eeprom_ch_index)
-{
-        switch (band) {
-        case 1:         /* 2.4GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl4965_eeprom_band_1);
-                *eeprom_ch_info = priv->eeprom.band_1_channels;
-                *eeprom_ch_index = iwl4965_eeprom_band_1;
-                break;
-        case 2:         /* 4.9GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl4965_eeprom_band_2);
-                *eeprom_ch_info = priv->eeprom.band_2_channels;
-                *eeprom_ch_index = iwl4965_eeprom_band_2;
-                break;
-        case 3:         /* 5.2GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl4965_eeprom_band_3);
-                *eeprom_ch_info = priv->eeprom.band_3_channels;
-                *eeprom_ch_index = iwl4965_eeprom_band_3;
-                break;
-        case 4:         /* 5.5GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl4965_eeprom_band_4);
-                *eeprom_ch_info = priv->eeprom.band_4_channels;
-                *eeprom_ch_index = iwl4965_eeprom_band_4;
-                break;
-        case 5:         /* 5.7GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl4965_eeprom_band_5);
-                *eeprom_ch_info = priv->eeprom.band_5_channels;
-                *eeprom_ch_index = iwl4965_eeprom_band_5;
-                break;
-        case 6:         /* 2.4GHz FAT channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwl4965_eeprom_band_6);
-                *eeprom_ch_info = priv->eeprom.band_24_channels;
-                *eeprom_ch_index = iwl4965_eeprom_band_6;
-                break;
-        case 7:         /* 5 GHz FAT channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwl4965_eeprom_band_7);
-                *eeprom_ch_info = priv->eeprom.band_52_channels;
-                *eeprom_ch_index = iwl4965_eeprom_band_7;
-                break;
-        default:
-                BUG();
-                return;
-        }
-}
-
-/**
- * iwl4965_get_channel_info - Find driver's private channel info
- *
- * Based on band and channel number.
- */
-const struct iwl4965_channel_info *iwl4965_get_channel_info(const struct iwl4965_priv *priv,
-                                                    int phymode, u16 channel)
-{
-        int i;
-
-        switch (phymode) {
-        case MODE_IEEE80211A:
-                for (i = 14; i < priv->channel_count; i++) {
-                        if (priv->channel_info[i].channel == channel)
-                                return &priv->channel_info[i];
-                }
-                break;
-
-        case MODE_IEEE80211B:
-        case MODE_IEEE80211G:
-                if (channel >= 1 && channel <= 14)
-                        return &priv->channel_info[channel - 1];
-                break;
-
-        }
-
-        return NULL;
-}
-
-#define CHECK_AND_PRINT(x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-
-/**
- * iwl4965_init_channel_map - Set up driver's info for all possible channels
- */
-static int iwl4965_init_channel_map(struct iwl4965_priv *priv)
-{
-        int eeprom_ch_count = 0;
-        const u8 *eeprom_ch_index = NULL;
-        const struct iwl4965_eeprom_channel *eeprom_ch_info = NULL;
-        int band, ch;
-        struct iwl4965_channel_info *ch_info;
-
-        if (priv->channel_count) {
-                IWL_DEBUG_INFO("Channel map already initialized.\n");
-                return 0;
-        }
-
-        if (priv->eeprom.version < 0x2f) {
-                IWL_WARNING("Unsupported EEPROM version: 0x%04X\n",
-                            priv->eeprom.version);
-                return -EINVAL;
-        }
-
-        IWL_DEBUG_INFO("Initializing regulatory info from EEPROM\n");
-
-        priv->channel_count =
-            ARRAY_SIZE(iwl4965_eeprom_band_1) +
-            ARRAY_SIZE(iwl4965_eeprom_band_2) +
-            ARRAY_SIZE(iwl4965_eeprom_band_3) +
-            ARRAY_SIZE(iwl4965_eeprom_band_4) +
-            ARRAY_SIZE(iwl4965_eeprom_band_5);
-
-        IWL_DEBUG_INFO("Parsing data for %d channels.\n", priv->channel_count);
-
-        priv->channel_info = kzalloc(sizeof(struct iwl4965_channel_info) *
-                                     priv->channel_count, GFP_KERNEL);
-        if (!priv->channel_info) {
-                IWL_ERROR("Could not allocate channel_info\n");
-                priv->channel_count = 0;
-                return -ENOMEM;
-        }
-
-        ch_info = priv->channel_info;
-
-        /* Loop through the 5 EEPROM bands adding them in order to the
-         * channel map we maintain (that contains additional information than
-         * what just in the EEPROM) */
-        for (band = 1; band <= 5; band++) {
-
-                iwl4965_init_band_reference(priv, band, &eeprom_ch_count,
-                                        &eeprom_ch_info, &eeprom_ch_index);
-
-                /* Loop through each band adding each of the channels */
-                for (ch = 0; ch < eeprom_ch_count; ch++) {
-                        ch_info->channel = eeprom_ch_index[ch];
-                        ch_info->phymode = (band == 1) ? MODE_IEEE80211B :
-                            MODE_IEEE80211A;
-
-                        /* permanently store EEPROM's channel regulatory flags
-                         *   and max power in channel info database. */
-                        ch_info->eeprom = eeprom_ch_info[ch];
-
-                        /* Copy the run-time flags so they are there even on
-                         * invalid channels */
-                        ch_info->flags = eeprom_ch_info[ch].flags;
-
-                        if (!(is_channel_valid(ch_info))) {
-                                IWL_DEBUG_INFO("Ch. %d Flags %x [%sGHz] - "
-                                               "No traffic\n",
-                                               ch_info->channel,
-                                               ch_info->flags,
-                                               is_channel_a_band(ch_info) ?
-                                               "5.2" : "2.4");
-                                ch_info++;
-                                continue;
-                        }
-
-                        /* Initialize regulatory-based run-time data */
-                        ch_info->max_power_avg = ch_info->curr_txpow =
-                            eeprom_ch_info[ch].max_power_avg;
-                        ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;
-                        ch_info->min_power = 0;
-
-                        IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x"
-                                       " %ddBm): Ad-Hoc %ssupported\n",
-                                       ch_info->channel,
-                                       is_channel_a_band(ch_info) ?
-                                       "5.2" : "2.4",
-                                       CHECK_AND_PRINT(IBSS),
-                                       CHECK_AND_PRINT(ACTIVE),
-                                       CHECK_AND_PRINT(RADAR),
-                                       CHECK_AND_PRINT(WIDE),
-                                       CHECK_AND_PRINT(NARROW),
-                                       CHECK_AND_PRINT(DFS),
-                                       eeprom_ch_info[ch].flags,
-                                       eeprom_ch_info[ch].max_power_avg,
-                                       ((eeprom_ch_info[ch].
-                                         flags & EEPROM_CHANNEL_IBSS)
-                                        && !(eeprom_ch_info[ch].
-                                             flags & EEPROM_CHANNEL_RADAR))
-                                       ? "" : "not ");
-
-                        /* Set the user_txpower_limit to the highest power
-                         * supported by any channel */
-                        if (eeprom_ch_info[ch].max_power_avg >
-                            priv->user_txpower_limit)
-                                priv->user_txpower_limit =
-                                    eeprom_ch_info[ch].max_power_avg;
-
-                        ch_info++;
-                }
-        }
-
-        /* Two additional EEPROM bands for 2.4 and 5 GHz FAT channels */
-        for (band = 6; band <= 7; band++) {
-                int phymode;
-                u8 fat_extension_chan;
-
-                iwl4965_init_band_reference(priv, band, &eeprom_ch_count,
-                                        &eeprom_ch_info, &eeprom_ch_index);
-
-                /* EEPROM band 6 is 2.4, band 7 is 5 GHz */
-                phymode = (band == 6) ? MODE_IEEE80211B : MODE_IEEE80211A;
-
-                /* Loop through each band adding each of the channels */
-                for (ch = 0; ch < eeprom_ch_count; ch++) {
-
-                        if ((band == 6) &&
-                            ((eeprom_ch_index[ch] == 5) ||
-                            (eeprom_ch_index[ch] == 6) ||
-                            (eeprom_ch_index[ch] == 7)))
-                               fat_extension_chan = HT_IE_EXT_CHANNEL_MAX;
-                        else
-                                fat_extension_chan = HT_IE_EXT_CHANNEL_ABOVE;
-
-                        /* Set up driver's info for lower half */
-                        iwl4965_set_fat_chan_info(priv, phymode,
-                                                  eeprom_ch_index[ch],
-                                                  &(eeprom_ch_info[ch]),
-                                                  fat_extension_chan);
-
-                        /* Set up driver's info for upper half */
-                        iwl4965_set_fat_chan_info(priv, phymode,
-                                                  (eeprom_ch_index[ch] + 4),
-                                                  &(eeprom_ch_info[ch]),
-                                                  HT_IE_EXT_CHANNEL_BELOW);
-                }
-        }
-
-        return 0;
-}
-
-/*
- * iwl4965_free_channel_map - undo allocations in iwl4965_init_channel_map
- */
-static void iwl4965_free_channel_map(struct iwl4965_priv *priv)
-{
-        kfree(priv->channel_info);
-        priv->channel_count = 0;
-}
-
 /* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after
  * sending probe req.  This should be set long enough to hear probe responses
  * from more than one AP.  */
@@ -5625,22 +4575,24 @@ static void iwl4965_free_channel_map(struct iwl4965_priv *priv)
 #define IWL_PASSIVE_DWELL_BASE      (100)
 #define IWL_CHANNEL_TUNE_TIME       5
 
-static inline u16 iwl4965_get_active_dwell_time(struct iwl4965_priv *priv, int phymode)
+static inline u16 iwl4965_get_active_dwell_time(struct iwl_priv *priv,
+                                                enum ieee80211_band band)
 {
-        if (phymode == MODE_IEEE80211A)
+        if (band == IEEE80211_BAND_5GHZ)
                 return IWL_ACTIVE_DWELL_TIME_52;
         else
                 return IWL_ACTIVE_DWELL_TIME_24;
 }
 
-static u16 iwl4965_get_passive_dwell_time(struct iwl4965_priv *priv, int phymode)
+static u16 iwl4965_get_passive_dwell_time(struct iwl_priv *priv,
+                                          enum ieee80211_band band)
 {
-        u16 active = iwl4965_get_active_dwell_time(priv, phymode);
-        u16 passive = (phymode != MODE_IEEE80211A) ?
+        u16 active = iwl4965_get_active_dwell_time(priv, band);
+        u16 passive = (band != IEEE80211_BAND_5GHZ) ?
             IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :
             IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;
 
-        if (iwl4965_is_associated(priv)) {
+        if (iwl_is_associated(priv)) {
                 /* If we're associated, we clamp the maximum passive
                  * dwell time to be 98% of the beacon interval (minus
                  * 2 * channel tune time) */
@@ -5656,30 +4608,34 @@ static u16 iwl4965_get_passive_dwell_time(struct iwl4965_priv *priv, int phymode
         return passive;
 }
 
-static int iwl4965_get_channels_for_scan(struct iwl4965_priv *priv, int phymode,
+static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,
+                                         enum ieee80211_band band,
                                      u8 is_active, u8 direct_mask,
                                      struct iwl4965_scan_channel *scan_ch)
 {
         const struct ieee80211_channel *channels = NULL;
-        const struct ieee80211_hw_mode *hw_mode;
-        const struct iwl4965_channel_info *ch_info;
+        const struct ieee80211_supported_band *sband;
+        const struct iwl_channel_info *ch_info;
         u16 passive_dwell = 0;
         u16 active_dwell = 0;
         int added, i;
 
-        hw_mode = iwl4965_get_hw_mode(priv, phymode);
-        if (!hw_mode)
+        sband = iwl4965_get_hw_mode(priv, band);
+        if (!sband)
                 return 0;
 
-        channels = hw_mode->channels;
+        channels = sband->channels;
+
+        active_dwell = iwl4965_get_active_dwell_time(priv, band);
+        passive_dwell = iwl4965_get_passive_dwell_time(priv, band);
 
-        active_dwell = iwl4965_get_active_dwell_time(priv, phymode);
-        passive_dwell = iwl4965_get_passive_dwell_time(priv, phymode);
+        for (i = 0, added = 0; i < sband->n_channels; i++) {
+                if (channels[i].flags & IEEE80211_CHAN_DISABLED)
+                        continue;
 
-        for (i = 0, added = 0; i < hw_mode->num_channels; i++) {
-                if (channels[i].chan ==
+                if (ieee80211_frequency_to_channel(channels[i].center_freq) ==
                     le16_to_cpu(priv->active_rxon.channel)) {
-                        if (iwl4965_is_associated(priv)) {
+                        if (iwl_is_associated(priv)) {
                                 IWL_DEBUG_SCAN
                                     ("Skipping current channel %d\n",
                                      le16_to_cpu(priv->active_rxon.channel));
@@ -5688,9 +4644,9 @@ static int iwl4965_get_channels_for_scan(struct iwl4965_priv *priv, int phymode,
                 } else if (priv->only_active_channel)
                         continue;
 
-                scan_ch->channel = channels[i].chan;
+                scan_ch->channel = ieee80211_frequency_to_channel(channels[i].center_freq);
 
-                ch_info = iwl4965_get_channel_info(priv, phymode,
+                ch_info = iwl_get_channel_info(priv, band,
                                          scan_ch->channel);
                 if (!is_channel_valid(ch_info)) {
                         IWL_DEBUG_SCAN("Channel %d is INVALID for this SKU.\n",
@@ -5699,7 +4655,7 @@ static int iwl4965_get_channels_for_scan(struct iwl4965_priv *priv, int phymode,
                 }
 
                 if (!is_active || is_channel_passive(ch_info) ||
-                    !(channels[i].flag & IEEE80211_CHAN_W_ACTIVE_SCAN))
+                    (channels[i].flags & IEEE80211_CHAN_PASSIVE_SCAN))
                         scan_ch->type = 0;      /* passive */
                 else
                         scan_ch->type = 1;      /* active */
@@ -5718,7 +4674,7 @@ static int iwl4965_get_channels_for_scan(struct iwl4965_priv *priv, int phymode,
                 /* scan_pwr_info->tpc.dsp_atten; */
 
                 /*scan_pwr_info->tpc.tx_gain; */
-                if (phymode == MODE_IEEE80211A)
+                if (band == IEEE80211_BAND_5GHZ)
                         scan_ch->tpc.tx_gain = ((1 << 5) | (3 << 3)) | 3;
                 else {
                         scan_ch->tpc.tx_gain = ((1 << 5) | (5 << 3));
@@ -5742,194 +4698,148 @@ static int iwl4965_get_channels_for_scan(struct iwl4965_priv *priv, int phymode,
         return added;
 }
 
-static void iwl4965_reset_channel_flag(struct iwl4965_priv *priv)
-{
-        int i, j;
-        for (i = 0; i < 3; i++) {
-                struct ieee80211_hw_mode *hw_mode = (void *)&priv->modes[i];
-                for (j = 0; j < hw_mode->num_channels; j++)
-                        hw_mode->channels[j].flag = hw_mode->channels[j].val;
-        }
-}
-
-static void iwl4965_init_hw_rates(struct iwl4965_priv *priv,
+static void iwl4965_init_hw_rates(struct iwl_priv *priv,
                               struct ieee80211_rate *rates)
 {
         int i;
 
         for (i = 0; i < IWL_RATE_COUNT; i++) {
-                rates[i].rate = iwl4965_rates[i].ieee * 5;
-                rates[i].val = i; /* Rate scaling will work on indexes */
-                rates[i].val2 = i;
-                rates[i].flags = IEEE80211_RATE_SUPPORTED;
-                /* Only OFDM have the bits-per-symbol set */
-                if ((i <= IWL_LAST_OFDM_RATE) && (i >= IWL_FIRST_OFDM_RATE))
-                        rates[i].flags |= IEEE80211_RATE_OFDM;
-                else {
+                rates[i].bitrate = iwl4965_rates[i].ieee * 5;
+                rates[i].hw_value = i; /* Rate scaling will work on indexes */
+                rates[i].hw_value_short = i;
+                rates[i].flags = 0;
+                if ((i > IWL_LAST_OFDM_RATE) || (i < IWL_FIRST_OFDM_RATE)) {
                         /*
-                         * If CCK 1M then set rate flag to CCK else CCK_2
-                         * which is CCK | PREAMBLE2
+                         * If CCK != 1M then set short preamble rate flag.
                          */
-                        rates[i].flags |= (iwl4965_rates[i].plcp == 10) ?
-                                IEEE80211_RATE_CCK : IEEE80211_RATE_CCK_2;
+                        rates[i].flags |=
+                                (iwl4965_rates[i].plcp == IWL_RATE_1M_PLCP) ?
+                                        0 : IEEE80211_RATE_SHORT_PREAMBLE;
                 }
-
-                /* Set up which ones are basic rates... */
-                if (IWL_BASIC_RATES_MASK & (1 << i))
-                        rates[i].flags |= IEEE80211_RATE_BASIC;
         }
 }
 
 /**
  * iwl4965_init_geos - Initialize mac80211's geo/channel info based from eeprom
  */
-static int iwl4965_init_geos(struct iwl4965_priv *priv)
+int iwl4965_init_geos(struct iwl_priv *priv)
 {
-        struct iwl4965_channel_info *ch;
-        struct ieee80211_hw_mode *modes;
+        struct iwl_channel_info *ch;
+        struct ieee80211_supported_band *sband;
         struct ieee80211_channel *channels;
         struct ieee80211_channel *geo_ch;
         struct ieee80211_rate *rates;
         int i = 0;
-        enum {
-                A = 0,
-                B = 1,
-                G = 2,
-        };
-        int mode_count = 3;
 
-        if (priv->modes) {
+        if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
+            priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
                 IWL_DEBUG_INFO("Geography modes already initialized.\n");
                 set_bit(STATUS_GEO_CONFIGURED, &priv->status);
                 return 0;
         }
 
-        modes = kzalloc(sizeof(struct ieee80211_hw_mode) * mode_count,
-                        GFP_KERNEL);
-        if (!modes)
-                return -ENOMEM;
-
         channels = kzalloc(sizeof(struct ieee80211_channel) *
                            priv->channel_count, GFP_KERNEL);
-        if (!channels) {
-                kfree(modes);
+        if (!channels)
                 return -ENOMEM;
-        }
 
-        rates = kzalloc((sizeof(struct ieee80211_rate) * (IWL_MAX_RATES + 1)),
+        rates = kzalloc((sizeof(struct ieee80211_rate) * (IWL_RATE_COUNT + 1)),
                         GFP_KERNEL);
         if (!rates) {
-                kfree(modes);
                 kfree(channels);
                 return -ENOMEM;
         }
 
-        /* 0 = 802.11a
-         * 1 = 802.11b
-         * 2 = 802.11g
-         */
-
         /* 5.2GHz channels start after the 2.4GHz channels */
-        modes[A].mode = MODE_IEEE80211A;
-        modes[A].channels = &channels[ARRAY_SIZE(iwl4965_eeprom_band_1)];
-        modes[A].rates = rates;
-        modes[A].num_rates = 8; /* just OFDM */
-        modes[A].rates = &rates[4];
-        modes[A].num_channels = 0;
-#ifdef CONFIG_IWL4965_HT
-        iwl4965_init_ht_hw_capab(&modes[A].ht_info, MODE_IEEE80211A);
-#endif
+        sband = &priv->bands[IEEE80211_BAND_5GHZ];
+        sband->channels = &channels[ARRAY_SIZE(iwl_eeprom_band_1)];
+        /* just OFDM */
+        sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
+        sband->n_bitrates = IWL_RATE_COUNT - IWL_FIRST_OFDM_RATE;
 
-        modes[B].mode = MODE_IEEE80211B;
-        modes[B].channels = channels;
-        modes[B].rates = rates;
-        modes[B].num_rates = 4; /* just CCK */
-        modes[B].num_channels = 0;
-
-        modes[G].mode = MODE_IEEE80211G;
-        modes[G].channels = channels;
-        modes[G].rates = rates;
-        modes[G].num_rates = 12;        /* OFDM & CCK */
-        modes[G].num_channels = 0;
-#ifdef CONFIG_IWL4965_HT
-        iwl4965_init_ht_hw_capab(&modes[G].ht_info, MODE_IEEE80211G);
-#endif
+        iwl4965_init_ht_hw_capab(priv, &sband->ht_info, IEEE80211_BAND_5GHZ);
+
+        sband = &priv->bands[IEEE80211_BAND_2GHZ];
+        sband->channels = channels;
+        /* OFDM & CCK */
+        sband->bitrates = rates;
+        sband->n_bitrates = IWL_RATE_COUNT;
+
+        iwl4965_init_ht_hw_capab(priv, &sband->ht_info, IEEE80211_BAND_2GHZ);
 
         priv->ieee_channels = channels;
         priv->ieee_rates = rates;
 
         iwl4965_init_hw_rates(priv, rates);
 
-        for (i = 0, geo_ch = channels; i < priv->channel_count; i++) {
+        for (i = 0;  i < priv->channel_count; i++) {
                 ch = &priv->channel_info[i];
 
-                if (!is_channel_valid(ch)) {
-                        IWL_DEBUG_INFO("Channel %d [%sGHz] is restricted -- "
-                                    "skipping.\n",
-                                    ch->channel, is_channel_a_band(ch) ?
-                                    "5.2" : "2.4");
+                /* FIXME: might be removed if scan is OK */
+                if (!is_channel_valid(ch))
                         continue;
-                }
 
-                if (is_channel_a_band(ch)) {
-                        geo_ch = &modes[A].channels[modes[A].num_channels++];
-                } else {
-                        geo_ch = &modes[B].channels[modes[B].num_channels++];
-                        modes[G].num_channels++;
-                }
+                if (is_channel_a_band(ch))
+                        sband =  &priv->bands[IEEE80211_BAND_5GHZ];
+                else
+                        sband =  &priv->bands[IEEE80211_BAND_2GHZ];
 
-                geo_ch->freq = ieee80211chan2mhz(ch->channel);
-                geo_ch->chan = ch->channel;
-                geo_ch->power_level = ch->max_power_avg;
-                geo_ch->antenna_max = 0xff;
+                geo_ch = &sband->channels[sband->n_channels++];
+
+                geo_ch->center_freq = ieee80211_channel_to_frequency(ch->channel);
+                geo_ch->max_power = ch->max_power_avg;
+                geo_ch->max_antenna_gain = 0xff;
+                geo_ch->hw_value = ch->channel;
 
                 if (is_channel_valid(ch)) {
-                        geo_ch->flag = IEEE80211_CHAN_W_SCAN;
-                        if (ch->flags & EEPROM_CHANNEL_IBSS)
-                                geo_ch->flag |= IEEE80211_CHAN_W_IBSS;
+                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
 
-                        if (ch->flags & EEPROM_CHANNEL_ACTIVE)
-                                geo_ch->flag |= IEEE80211_CHAN_W_ACTIVE_SCAN;
+                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
+                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
 
                         if (ch->flags & EEPROM_CHANNEL_RADAR)
-                                geo_ch->flag |= IEEE80211_CHAN_W_RADAR_DETECT;
+                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
 
                         if (ch->max_power_avg > priv->max_channel_txpower_limit)
                                 priv->max_channel_txpower_limit =
                                     ch->max_power_avg;
+                } else {
+                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
                 }
 
-                geo_ch->val = geo_ch->flag;
+                /* Save flags for reg domain usage */
+                geo_ch->orig_flags = geo_ch->flags;
+
+                IWL_DEBUG_INFO("Channel %d Freq=%d[%sGHz] %s flag=0%X\n",
+                                ch->channel, geo_ch->center_freq,
+                                is_channel_a_band(ch) ?  "5.2" : "2.4",
+                                geo_ch->flags & IEEE80211_CHAN_DISABLED ?
+                                "restricted" : "valid",
+                                 geo_ch->flags);
         }
 
-        if ((modes[A].num_channels == 0) && priv->is_abg) {
+        if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
+             priv->cfg->sku & IWL_SKU_A) {
                 printk(KERN_INFO DRV_NAME
                        ": Incorrectly detected BG card as ABG.  Please send "
                        "your PCI ID 0x%04X:0x%04X to maintainer.\n",
                        priv->pci_dev->device, priv->pci_dev->subsystem_device);
-                priv->is_abg = 0;
+                priv->cfg->sku &= ~IWL_SKU_A;
         }
 
         printk(KERN_INFO DRV_NAME
                ": Tunable channels: %d 802.11bg, %d 802.11a channels\n",
-               modes[G].num_channels, modes[A].num_channels);
+               priv->bands[IEEE80211_BAND_2GHZ].n_channels,
+               priv->bands[IEEE80211_BAND_5GHZ].n_channels);
 
-        /*
-         * NOTE:  We register these in preference of order -- the
-         * stack doesn't currently (as of 7.0.6 / Apr 24 '07) pick
-         * a phymode based on rates or AP capabilities but seems to
-         * configure it purely on if the channel being configured
-         * is supported by a mode -- and the first match is taken
-         */
+        if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)
+                priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+                        &priv->bands[IEEE80211_BAND_2GHZ];
+        if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)
+                priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                        &priv->bands[IEEE80211_BAND_5GHZ];
 
-        if (modes[G].num_channels)
-                ieee80211_register_hwmode(priv->hw, &modes[G]);
-        if (modes[B].num_channels)
-                ieee80211_register_hwmode(priv->hw, &modes[B]);
-        if (modes[A].num_channels)
-                ieee80211_register_hwmode(priv->hw, &modes[A]);
-
-        priv->modes = modes;
         set_bit(STATUS_GEO_CONFIGURED, &priv->status);
 
         return 0;
@@ -5938,9 +4848,8 @@ static int iwl4965_init_geos(struct iwl4965_priv *priv)
 /*
  * iwl4965_free_geos - undo allocations in iwl4965_init_geos
  */
-static void iwl4965_free_geos(struct iwl4965_priv *priv)
+void iwl4965_free_geos(struct iwl_priv *priv)
 {
-        kfree(priv->modes);
         kfree(priv->ieee_channels);
         kfree(priv->ieee_rates);
         clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
@@ -5952,7 +4861,7 @@ static void iwl4965_free_geos(struct iwl4965_priv *priv)
  *
  ******************************************************************************/
 
-static void iwl4965_dealloc_ucode_pci(struct iwl4965_priv *priv)
+static void iwl4965_dealloc_ucode_pci(struct iwl_priv *priv)
 {
         iwl_free_fw_desc(priv->pci_dev, &priv->ucode_code);
         iwl_free_fw_desc(priv->pci_dev, &priv->ucode_data);
@@ -5966,7 +4875,7 @@ static void iwl4965_dealloc_ucode_pci(struct iwl4965_priv *priv)
  * iwl4965_verify_inst_full - verify runtime uCode image in card vs. host,
  *     looking at all data.
  */
-static int iwl4965_verify_inst_full(struct iwl4965_priv *priv, __le32 *image,
+static int iwl4965_verify_inst_full(struct iwl_priv *priv, __le32 *image,
                                  u32 len)
 {
         u32 val;
@@ -5976,18 +4885,18 @@ static int iwl4965_verify_inst_full(struct iwl4965_priv *priv, __le32 *image,
 
         IWL_DEBUG_INFO("ucode inst image size is %u\n", len);
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc)
                 return rc;
 
-        iwl4965_write_direct32(priv, HBUS_TARG_MEM_RADDR, RTC_INST_LOWER_BOUND);
+        iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, RTC_INST_LOWER_BOUND);
 
         errcnt = 0;
         for (; len > 0; len -= sizeof(u32), image++) {
                 /* read data comes through single port, auto-incr addr */
                 /* NOTE: Use the debugless read so we don't flood kernel log
                  * if IWL_DL_IO is set */
-                val = _iwl4965_read_direct32(priv, HBUS_TARG_MEM_RDAT);
+                val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
                 if (val != le32_to_cpu(*image)) {
                         IWL_ERROR("uCode INST section is invalid at "
                                   "offset 0x%x, is 0x%x, s/b 0x%x\n",
@@ -5999,7 +4908,7 @@ static int iwl4965_verify_inst_full(struct iwl4965_priv *priv, __le32 *image,
                 }
         }
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
 
         if (!errcnt)
                 IWL_DEBUG_INFO
@@ -6014,7 +4923,7 @@ static int iwl4965_verify_inst_full(struct iwl4965_priv *priv, __le32 *image,
  *   using sample data 100 bytes apart.  If these sample points are good,
  *   it's a pretty good bet that everything between them is good, too.
  */
-static int iwl4965_verify_inst_sparse(struct iwl4965_priv *priv, __le32 *image, u32 len)
+static int iwl4965_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len)
 {
         u32 val;
         int rc = 0;
@@ -6023,7 +4932,7 @@ static int iwl4965_verify_inst_sparse(struct iwl4965_priv *priv, __le32 *image,
 
         IWL_DEBUG_INFO("ucode inst image size is %u\n", len);
 
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc)
                 return rc;
 
@@ -6031,9 +4940,9 @@ static int iwl4965_verify_inst_sparse(struct iwl4965_priv *priv, __le32 *image,
                 /* read data comes through single port, auto-incr addr */
                 /* NOTE: Use the debugless read so we don't flood kernel log
                  * if IWL_DL_IO is set */
-                iwl4965_write_direct32(priv, HBUS_TARG_MEM_RADDR,
+                iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR,
                         i + RTC_INST_LOWER_BOUND);
-                val = _iwl4965_read_direct32(priv, HBUS_TARG_MEM_RDAT);
+                val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
                 if (val != le32_to_cpu(*image)) {
 #if 0 /* Enable this if you want to see details */
                         IWL_ERROR("uCode INST section is invalid at "
@@ -6047,7 +4956,7 @@ static int iwl4965_verify_inst_sparse(struct iwl4965_priv *priv, __le32 *image,
                 }
         }
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
 
         return rc;
 }
@@ -6057,7 +4966,7 @@ static int iwl4965_verify_inst_sparse(struct iwl4965_priv *priv, __le32 *image,
  * iwl4965_verify_ucode - determine which instruction image is in SRAM,
  *    and verify its contents
  */
-static int iwl4965_verify_ucode(struct iwl4965_priv *priv)
+static int iwl4965_verify_ucode(struct iwl_priv *priv)
 {
         __le32 *image;
         u32 len;
@@ -6102,160 +5011,10 @@ static int iwl4965_verify_ucode(struct iwl4965_priv *priv)
         return rc;
 }
 
-
-/* check contents of special bootstrap uCode SRAM */
-static int iwl4965_verify_bsm(struct iwl4965_priv *priv)
-{
-        __le32 *image = priv->ucode_boot.v_addr;
-        u32 len = priv->ucode_boot.len;
-        u32 reg;
-        u32 val;
-
-        IWL_DEBUG_INFO("Begin verify bsm\n");
-
-        /* verify BSM SRAM contents */
-        val = iwl4965_read_prph(priv, BSM_WR_DWCOUNT_REG);
-        for (reg = BSM_SRAM_LOWER_BOUND;
-             reg < BSM_SRAM_LOWER_BOUND + len;
-             reg += sizeof(u32), image ++) {
-                val = iwl4965_read_prph(priv, reg);
-                if (val != le32_to_cpu(*image)) {
-                        IWL_ERROR("BSM uCode verification failed at "
-                                  "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",
-                                  BSM_SRAM_LOWER_BOUND,
-                                  reg - BSM_SRAM_LOWER_BOUND, len,
-                                  val, le32_to_cpu(*image));
-                        return -EIO;
-                }
-        }
-
-        IWL_DEBUG_INFO("BSM bootstrap uCode image OK\n");
-
-        return 0;
-}
-
-/**
- * iwl4965_load_bsm - Load bootstrap instructions
- *
- * BSM operation:
- *
- * The Bootstrap State Machine (BSM) stores a short bootstrap uCode program
- * in special SRAM that does not power down during RFKILL.  When powering back
- * up after power-saving sleeps (or during initial uCode load), the BSM loads
- * the bootstrap program into the on-board processor, and starts it.
- *
- * The bootstrap program loads (via DMA) instructions and data for a new
- * program from host DRAM locations indicated by the host driver in the
- * BSM_DRAM_* registers.  Once the new program is loaded, it starts
- * automatically.
- *
- * When initializing the NIC, the host driver points the BSM to the
- * "initialize" uCode image.  This uCode sets up some internal data, then
- * notifies host via "initialize alive" that it is complete.
- *
- * The host then replaces the BSM_DRAM_* pointer values to point to the
- * normal runtime uCode instructions and a backup uCode data cache buffer
- * (filled initially with starting data values for the on-board processor),
- * then triggers the "initialize" uCode to load and launch the runtime uCode,
- * which begins normal operation.
- *
- * When doing a power-save shutdown, runtime uCode saves data SRAM into
- * the backup data cache in DRAM before SRAM is powered down.
- *
- * When powering back up, the BSM loads the bootstrap program.  This reloads
- * the runtime uCode instructions and the backup data cache into SRAM,
- * and re-launches the runtime uCode from where it left off.
- */
-static int iwl4965_load_bsm(struct iwl4965_priv *priv)
-{
-        __le32 *image = priv->ucode_boot.v_addr;
-        u32 len = priv->ucode_boot.len;
-        dma_addr_t pinst;
-        dma_addr_t pdata;
-        u32 inst_len;
-        u32 data_len;
-        int rc;
-        int i;
-        u32 done;
-        u32 reg_offset;
-
-        IWL_DEBUG_INFO("Begin load bsm\n");
-
-        /* make sure bootstrap program is no larger than BSM's SRAM size */
-        if (len > IWL_MAX_BSM_SIZE)
-                return -EINVAL;
-
-        /* Tell bootstrap uCode where to find the "Initialize" uCode
-         *   in host DRAM ... host DRAM physical address bits 35:4 for 4965.
-         * NOTE:  iwl4965_initialize_alive_start() will replace these values,
-         *        after the "initialize" uCode has run, to point to
-         *        runtime/protocol instructions and backup data cache. */
-        pinst = priv->ucode_init.p_addr >> 4;
-        pdata = priv->ucode_init_data.p_addr >> 4;
-        inst_len = priv->ucode_init.len;
-        data_len = priv->ucode_init_data.len;
-
-        rc = iwl4965_grab_nic_access(priv);
-        if (rc)
-                return rc;
-
-        iwl4965_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
-        iwl4965_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
-        iwl4965_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);
-        iwl4965_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG, data_len);
-
-        /* Fill BSM memory with bootstrap instructions */
-        for (reg_offset = BSM_SRAM_LOWER_BOUND;
-             reg_offset < BSM_SRAM_LOWER_BOUND + len;
-             reg_offset += sizeof(u32), image++)
-                _iwl4965_write_prph(priv, reg_offset,
-                                          le32_to_cpu(*image));
-
-        rc = iwl4965_verify_bsm(priv);
-        if (rc) {
-                iwl4965_release_nic_access(priv);
-                return rc;
-        }
-
-        /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
-        iwl4965_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);
-        iwl4965_write_prph(priv, BSM_WR_MEM_DST_REG,
-                                 RTC_INST_LOWER_BOUND);
-        iwl4965_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
-
-        /* Load bootstrap code into instruction SRAM now,
-         *   to prepare to load "initialize" uCode */
-        iwl4965_write_prph(priv, BSM_WR_CTRL_REG,
-                BSM_WR_CTRL_REG_BIT_START);
-
-        /* Wait for load of bootstrap uCode to finish */
-        for (i = 0; i < 100; i++) {
-                done = iwl4965_read_prph(priv, BSM_WR_CTRL_REG);
-                if (!(done & BSM_WR_CTRL_REG_BIT_START))
-                        break;
-                udelay(10);
-        }
-        if (i < 100)
-                IWL_DEBUG_INFO("BSM write complete, poll %d iterations\n", i);
-        else {
-                IWL_ERROR("BSM write did not complete!\n");
-                return -EIO;
-        }
-
-        /* Enable future boot loads whenever power management unit triggers it
-         *   (e.g. when powering back up after power-save shutdown) */
-        iwl4965_write_prph(priv, BSM_WR_CTRL_REG,
-                BSM_WR_CTRL_REG_BIT_START_EN);
-
-        iwl4965_release_nic_access(priv);
-
-        return 0;
-}
-
-static void iwl4965_nic_start(struct iwl4965_priv *priv)
+static void iwl4965_nic_start(struct iwl_priv *priv)
 {
         /* Remove all resets to allow NIC to operate */
-        iwl4965_write32(priv, CSR_RESET, 0);
+        iwl_write32(priv, CSR_RESET, 0);
 }
 
 
@@ -6264,12 +5023,12 @@ static void iwl4965_nic_start(struct iwl4965_priv *priv)
  *
  * Copy into buffers for card to fetch via bus-mastering
  */
-static int iwl4965_read_ucode(struct iwl4965_priv *priv)
+static int iwl4965_read_ucode(struct iwl_priv *priv)
 {
         struct iwl4965_ucode *ucode;
         int ret;
         const struct firmware *ucode_raw;
-        const char *name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode";
+        const char *name = priv->cfg->fw_name;
         u8 *src;
         size_t len;
         u32 ver, inst_size, data_size, init_size, init_data_size, boot_size;
@@ -6465,7 +5224,7 @@ static int iwl4965_read_ucode(struct iwl4965_priv *priv)
  * We need to replace them to load runtime uCode inst and data,
  * and to save runtime data when powering down.
  */
-static int iwl4965_set_ucode_ptrs(struct iwl4965_priv *priv)
+static int iwl4965_set_ucode_ptrs(struct iwl_priv *priv)
 {
         dma_addr_t pinst;
         dma_addr_t pdata;
@@ -6477,24 +5236,24 @@ static int iwl4965_set_ucode_ptrs(struct iwl4965_priv *priv)
         pdata = priv->ucode_data_backup.p_addr >> 4;
 
         spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl4965_grab_nic_access(priv);
+        rc = iwl_grab_nic_access(priv);
         if (rc) {
                 spin_unlock_irqrestore(&priv->lock, flags);
                 return rc;
         }
 
         /* Tell bootstrap uCode where to find image to load */
-        iwl4965_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
-        iwl4965_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
-        iwl4965_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,
+        iwl_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
+        iwl_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
+        iwl_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,
                                  priv->ucode_data.len);
 
         /* Inst bytecount must be last to set up, bit 31 signals uCode
          *   that all new ptr/size info is in place */
-        iwl4965_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,
+        iwl_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,
                                  priv->ucode_code.len | BSM_DRAM_INST_LOAD);
 
-        iwl4965_release_nic_access(priv);
+        iwl_release_nic_access(priv);
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
@@ -6514,7 +5273,7 @@ static int iwl4965_set_ucode_ptrs(struct iwl4965_priv *priv)
  *
  * Tell "initialize" uCode to go ahead and load the runtime uCode.
 */
-static void iwl4965_init_alive_start(struct iwl4965_priv *priv)
+static void iwl4965_init_alive_start(struct iwl_priv *priv)
 {
         /* Check alive response for "valid" sign from uCode */
         if (priv->card_alive_init.is_valid != UCODE_VALID_OK) {
@@ -6559,9 +5318,9 @@ static void iwl4965_init_alive_start(struct iwl4965_priv *priv)
  *                   from protocol/runtime uCode (initialization uCode's
  *                   Alive gets handled by iwl4965_init_alive_start()).
  */
-static void iwl4965_alive_start(struct iwl4965_priv *priv)
+static void iwl4965_alive_start(struct iwl_priv *priv)
 {
-        int rc = 0;
+        int ret = 0;
 
         IWL_DEBUG_INFO("Runtime Alive received.\n");
 
@@ -6582,12 +5341,12 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
                 goto restart;
         }
 
-        iwl4965_clear_stations_table(priv);
+        iwlcore_clear_stations_table(priv);
 
-        rc = iwl4965_alive_notify(priv);
-        if (rc) {
+        ret = priv->cfg->ops->lib->alive_notify(priv);
+        if (ret) {
                 IWL_WARNING("Could not complete ALIVE transition [ntf]: %d\n",
-                            rc);
+                            ret);
                 goto restart;
         }
 
@@ -6597,7 +5356,7 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
         /* Clear out the uCode error bit if it is set */
         clear_bit(STATUS_FW_ERROR, &priv->status);
 
-        if (iwl4965_is_rfkill(priv))
+        if (iwl_is_rfkill(priv))
                 return;
 
         ieee80211_start_queues(priv->hw);
@@ -6607,7 +5366,7 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
 
         iwl4965_send_power_mode(priv, IWL_POWER_LEVEL(priv->power_mode));
 
-        if (iwl4965_is_associated(priv)) {
+        if (iwl_is_associated(priv)) {
                 struct iwl4965_rxon_cmd *active_rxon =
                                 (struct iwl4965_rxon_cmd *)(&priv->active_rxon);
 
@@ -6631,6 +5390,8 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
 
         iwl4965_rf_kill_ct_config(priv);
 
+        iwl_leds_register(priv);
+
         IWL_DEBUG_INFO("ALIVE processing complete.\n");
         set_bit(STATUS_READY, &priv->status);
         wake_up_interruptible(&priv->wait_command_queue);
@@ -6638,15 +5399,17 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
         if (priv->error_recovering)
                 iwl4965_error_recovery(priv);
 
+        iwlcore_low_level_notify(priv, IWLCORE_START_EVT);
+        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
         return;
 
  restart:
         queue_work(priv->workqueue, &priv->restart);
 }
 
-static void iwl4965_cancel_deferred_work(struct iwl4965_priv *priv);
+static void iwl4965_cancel_deferred_work(struct iwl_priv *priv);
 
-static void __iwl4965_down(struct iwl4965_priv *priv)
+static void __iwl4965_down(struct iwl_priv *priv)
 {
         unsigned long flags;
         int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status);
@@ -6659,7 +5422,11 @@ static void __iwl4965_down(struct iwl4965_priv *priv)
         if (!exit_pending)
                 set_bit(STATUS_EXIT_PENDING, &priv->status);
 
-        iwl4965_clear_stations_table(priv);
+        iwl_leds_unregister(priv);
+
+        iwlcore_low_level_notify(priv, IWLCORE_STOP_EVT);
+
+        iwlcore_clear_stations_table(priv);
 
         /* Unblock any waiting calls */
         wake_up_interruptible_all(&priv->wait_command_queue);
@@ -6670,17 +5437,20 @@ static void __iwl4965_down(struct iwl4965_priv *priv)
                 clear_bit(STATUS_EXIT_PENDING, &priv->status);
 
         /* stop and reset the on-board processor */
-        iwl4965_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
+        iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
 
         /* tell the device to stop sending interrupts */
+        spin_lock_irqsave(&priv->lock, flags);
         iwl4965_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->lock, flags);
+        iwl_synchronize_irq(priv);
 
         if (priv->mac80211_registered)
                 ieee80211_stop_queues(priv->hw);
 
         /* If we have not previously called iwl4965_init() then
          * clear all bits but the RF Kill and SUSPEND bits and return */
-        if (!iwl4965_is_init(priv)) {
+        if (!iwl_is_init(priv)) {
                 priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) <<
                                         STATUS_RF_KILL_HW |
                                test_bit(STATUS_RF_KILL_SW, &priv->status) <<
@@ -6706,7 +5476,7 @@ static void __iwl4965_down(struct iwl4965_priv *priv)
                                 STATUS_FW_ERROR;
 
         spin_lock_irqsave(&priv->lock, flags);
-        iwl4965_clear_bit(priv, CSR_GP_CNTRL,
+        iwl_clear_bit(priv, CSR_GP_CNTRL,
                          CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
         spin_unlock_irqrestore(&priv->lock, flags);
 
@@ -6714,17 +5484,17 @@ static void __iwl4965_down(struct iwl4965_priv *priv)
         iwl4965_hw_rxq_stop(priv);
 
         spin_lock_irqsave(&priv->lock, flags);
-        if (!iwl4965_grab_nic_access(priv)) {
-                iwl4965_write_prph(priv, APMG_CLK_DIS_REG,
+        if (!iwl_grab_nic_access(priv)) {
+                iwl_write_prph(priv, APMG_CLK_DIS_REG,
                                          APMG_CLK_VAL_DMA_CLK_RQT);
-                iwl4965_release_nic_access(priv);
+                iwl_release_nic_access(priv);
         }
         spin_unlock_irqrestore(&priv->lock, flags);
 
         udelay(5);
 
         iwl4965_hw_nic_stop_master(priv);
-        iwl4965_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
+        iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
         iwl4965_hw_nic_reset(priv);
 
  exit:
@@ -6738,7 +5508,7 @@ static void __iwl4965_down(struct iwl4965_priv *priv)
         iwl4965_clear_free_frames(priv);
 }
 
-static void iwl4965_down(struct iwl4965_priv *priv)
+static void iwl4965_down(struct iwl_priv *priv)
 {
         mutex_lock(&priv->mutex);
         __iwl4965_down(priv);
@@ -6749,9 +5519,10 @@ static void iwl4965_down(struct iwl4965_priv *priv)
 
 #define MAX_HW_RESTARTS 5
 
-static int __iwl4965_up(struct iwl4965_priv *priv)
+static int __iwl4965_up(struct iwl_priv *priv)
 {
-        int rc, i;
+        int i;
+        int ret;
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
                 IWL_WARNING("Exit pending; will not bring the NIC up\n");
@@ -6761,6 +5532,7 @@ static int __iwl4965_up(struct iwl4965_priv *priv)
         if (test_bit(STATUS_RF_KILL_SW, &priv->status)) {
                 IWL_WARNING("Radio disabled by SW RF kill (module "
                             "parameter)\n");
+                iwl_rfkill_set_hw_state(priv);
                 return -ENODEV;
         }
 
@@ -6770,37 +5542,39 @@ static int __iwl4965_up(struct iwl4965_priv *priv)
         }
 
         /* If platform's RF_KILL switch is NOT set to KILL */
-        if (iwl4965_read32(priv, CSR_GP_CNTRL) &
+        if (iwl_read32(priv, CSR_GP_CNTRL) &
                                 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
                 clear_bit(STATUS_RF_KILL_HW, &priv->status);
         else {
                 set_bit(STATUS_RF_KILL_HW, &priv->status);
                 if (!test_bit(STATUS_IN_SUSPEND, &priv->status)) {
+                        iwl_rfkill_set_hw_state(priv);
                         IWL_WARNING("Radio disabled by HW RF Kill switch\n");
                         return -ENODEV;
                 }
         }
 
-        iwl4965_write32(priv, CSR_INT, 0xFFFFFFFF);
+        iwl_rfkill_set_hw_state(priv);
+        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
 
-        rc = iwl4965_hw_nic_init(priv);
-        if (rc) {
-                IWL_ERROR("Unable to int nic\n");
-                return rc;
+        ret = priv->cfg->ops->lib->hw_nic_init(priv);
+        if (ret) {
+                IWL_ERROR("Unable to init nic\n");
+                return ret;
         }
 
         /* make sure rfkill handshake bits are cleared */
-        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
-        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_CLR,
+        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
                     CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
 
         /* clear (again), then enable host interrupts */
-        iwl4965_write32(priv, CSR_INT, 0xFFFFFFFF);
+        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
         iwl4965_enable_interrupts(priv);
 
         /* really make sure rfkill handshake bits are cleared */
-        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
-        iwl4965_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
 
         /* Copy original ucode data image from disk into backup cache.
          * This will be used to initialize the on-board processor's
@@ -6814,15 +5588,15 @@ static int __iwl4965_up(struct iwl4965_priv *priv)
 
         for (i = 0; i < MAX_HW_RESTARTS; i++) {
 
-                iwl4965_clear_stations_table(priv);
+                iwlcore_clear_stations_table(priv);
 
                 /* load bootstrap state machine,
                  * load bootstrap program into processor's memory,
                  * prepare to load the "initialize" uCode */
-                rc = iwl4965_load_bsm(priv);
+                ret = priv->cfg->ops->lib->load_ucode(priv);
 
-                if (rc) {
-                        IWL_ERROR("Unable to set up bootstrap uCode: %d\n", rc);
+                if (ret) {
+                        IWL_ERROR("Unable to set up bootstrap uCode: %d\n", ret);
                         continue;
                 }
 
@@ -6852,8 +5626,8 @@ static int __iwl4965_up(struct iwl4965_priv *priv)
 
 static void iwl4965_bg_init_alive_start(struct work_struct *data)
 {
-        struct iwl4965_priv *priv =
-            container_of(data, struct iwl4965_priv, init_alive_start.work);
+        struct iwl_priv *priv =
+            container_of(data, struct iwl_priv, init_alive_start.work);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -6865,8 +5639,8 @@ static void iwl4965_bg_init_alive_start(struct work_struct *data)
 
 static void iwl4965_bg_alive_start(struct work_struct *data)
 {
-        struct iwl4965_priv *priv =
-            container_of(data, struct iwl4965_priv, alive_start.work);
+        struct iwl_priv *priv =
+            container_of(data, struct iwl_priv, alive_start.work);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -6878,7 +5652,7 @@ static void iwl4965_bg_alive_start(struct work_struct *data)
 
 static void iwl4965_bg_rf_kill(struct work_struct *work)
 {
-        struct iwl4965_priv *priv = container_of(work, struct iwl4965_priv, rf_kill);
+        struct iwl_priv *priv = container_of(work, struct iwl_priv, rf_kill);
 
         wake_up_interruptible(&priv->wait_command_queue);
 
@@ -6887,13 +5661,16 @@ static void iwl4965_bg_rf_kill(struct work_struct *work)
 
         mutex_lock(&priv->mutex);
 
-        if (!iwl4965_is_rfkill(priv)) {
+        if (!iwl_is_rfkill(priv)) {
                 IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL,
                           "HW and/or SW RF Kill no longer active, restarting "
                           "device\n");
                 if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
                         queue_work(priv->workqueue, &priv->restart);
         } else {
+                /* make sure mac80211 stop sending Tx frame */
+                if (priv->mac80211_registered)
+                        ieee80211_stop_queues(priv->hw);
 
                 if (!test_bit(STATUS_RF_KILL_HW, &priv->status))
                         IWL_DEBUG_RF_KILL("Can not turn radio back on - "
@@ -6903,6 +5680,8 @@ static void iwl4965_bg_rf_kill(struct work_struct *work)
                                     "Kill switch must be turned off for "
                                     "wireless networking to work.\n");
         }
+        iwl_rfkill_set_hw_state(priv);
+
         mutex_unlock(&priv->mutex);
 }
 
@@ -6910,8 +5689,8 @@ static void iwl4965_bg_rf_kill(struct work_struct *work)
 
 static void iwl4965_bg_scan_check(struct work_struct *data)
 {
-        struct iwl4965_priv *priv =
-            container_of(data, struct iwl4965_priv, scan_check.work);
+        struct iwl_priv *priv =
+            container_of(data, struct iwl_priv, scan_check.work);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -6931,24 +5710,25 @@ static void iwl4965_bg_scan_check(struct work_struct *data)
 
 static void iwl4965_bg_request_scan(struct work_struct *data)
 {
-        struct iwl4965_priv *priv =
-            container_of(data, struct iwl4965_priv, request_scan);
-        struct iwl4965_host_cmd cmd = {
+        struct iwl_priv *priv =
+            container_of(data, struct iwl_priv, request_scan);
+        struct iwl_host_cmd cmd = {
                 .id = REPLY_SCAN_CMD,
                 .len = sizeof(struct iwl4965_scan_cmd),
                 .meta.flags = CMD_SIZE_HUGE,
         };
-        int rc = 0;
         struct iwl4965_scan_cmd *scan;
         struct ieee80211_conf *conf = NULL;
+        u16 cmd_len;
+        enum ieee80211_band band;
         u8 direct_mask;
-        int phymode;
+        int ret = 0;
 
         conf = ieee80211_get_hw_conf(priv->hw);
 
         mutex_lock(&priv->mutex);
 
-        if (!iwl4965_is_ready(priv)) {
+        if (!iwl_is_ready(priv)) {
                 IWL_WARNING("request scan called when driver not ready.\n");
                 goto done;
         }
@@ -6963,7 +5743,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
         if (test_bit(STATUS_SCAN_HW, &priv->status)) {
                 IWL_DEBUG_INFO("Multiple concurrent scan requests in parallel. "
                                "Ignoring second request.\n");
-                rc = -EIO;
+                ret = -EIO;
                 goto done;
         }
 
@@ -6977,7 +5757,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
                 goto done;
         }
 
-        if (iwl4965_is_rfkill(priv)) {
+        if (iwl_is_rfkill(priv)) {
                 IWL_DEBUG_HC("Aborting scan due to RF Kill activation\n");
                 goto done;
         }
@@ -6996,7 +5776,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
                 priv->scan = kmalloc(sizeof(struct iwl4965_scan_cmd) +
                                      IWL_MAX_SCAN_SIZE, GFP_KERNEL);
                 if (!priv->scan) {
-                        rc = -ENOMEM;
+                        ret = -ENOMEM;
                         goto done;
                 }
         }
@@ -7006,7 +5786,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
         scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;
         scan->quiet_time = IWL_ACTIVE_QUIET_TIME;
 
-        if (iwl4965_is_associated(priv)) {
+        if (iwl_is_associated(priv)) {
                 u16 interval = 0;
                 u32 extra;
                 u32 suspend_time = 100;
@@ -7043,26 +5823,19 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
                 memcpy(scan->direct_scan[0].ssid,
                        priv->direct_ssid, priv->direct_ssid_len);
                 direct_mask = 1;
-        } else if (!iwl4965_is_associated(priv) && priv->essid_len) {
+        } else if (!iwl_is_associated(priv) && priv->essid_len) {
                 scan->direct_scan[0].id = WLAN_EID_SSID;
                 scan->direct_scan[0].len = priv->essid_len;
                 memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
                 direct_mask = 1;
-        } else
+        } else {
                 direct_mask = 0;
+        }
 
-        /* We don't build a direct scan probe request; the uCode will do
-         * that based on the direct_mask added to each channel entry */
-        scan->tx_cmd.len = cpu_to_le16(
-                iwl4965_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data,
-                        IWL_MAX_SCAN_SIZE - sizeof(*scan), 0));
         scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
-        scan->tx_cmd.sta_id = priv->hw_setting.bcast_sta_id;
+        scan->tx_cmd.sta_id = priv->hw_params.bcast_sta_id;
         scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
 
-        /* flags + rate selection */
-
-        scan->tx_cmd.tx_flags |= cpu_to_le32(0x200);
 
         switch (priv->scan_bands) {
         case 2:
@@ -7072,7 +5845,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
                                 RATE_MCS_ANT_B_MSK|RATE_MCS_CCK_MSK);
 
                 scan->good_CRC_th = 0;
-                phymode = MODE_IEEE80211G;
+                band = IEEE80211_BAND_2GHZ;
                 break;
 
         case 1:
@@ -7080,7 +5853,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
                                 iwl4965_hw_set_rate_n_flags(IWL_RATE_6M_PLCP,
                                 RATE_MCS_ANT_B_MSK);
                 scan->good_CRC_th = IWL_GOOD_CRC_TH;
-                phymode = MODE_IEEE80211A;
+                band = IEEE80211_BAND_5GHZ;
                 break;
 
         default:
@@ -7088,6 +5861,13 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
                 goto done;
         }
 
+        /* We don't build a direct scan probe request; the uCode will do
+         * that based on the direct_mask added to each channel entry */
+        cmd_len = iwl4965_fill_probe_req(priv, band,
+                                        (struct ieee80211_mgmt *)scan->data,
+                                        IWL_MAX_SCAN_SIZE - sizeof(*scan), 0);
+
+        scan->tx_cmd.len = cpu_to_le16(cmd_len);
         /* select Rx chains */
 
         /* Force use of chains B and C (0x6) for scan Rx.
@@ -7101,18 +5881,23 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
         if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR)
                 scan->filter_flags = RXON_FILTER_PROMISC_MSK;
 
-        if (direct_mask)
+        if (direct_mask) {
                 IWL_DEBUG_SCAN
                     ("Initiating direct scan for %s.\n",
                      iwl4965_escape_essid(priv->essid, priv->essid_len));
-        else
+                scan->channel_count =
+                        iwl4965_get_channels_for_scan(
+                                priv, band, 1, /* active */
+                                direct_mask,
+                                (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
+        } else {
                 IWL_DEBUG_SCAN("Initiating indirect scan.\n");
-
-        scan->channel_count =
-                iwl4965_get_channels_for_scan(
-                        priv, phymode, 1, /* active */
-                        direct_mask,
-                        (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
+                scan->channel_count =
+                        iwl4965_get_channels_for_scan(
+                                priv, band, 0, /* passive */
+                                direct_mask,
+                                (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
+        }
 
         cmd.len += le16_to_cpu(scan->tx_cmd.len) +
             scan->channel_count * sizeof(struct iwl4965_scan_channel);
@@ -7120,8 +5905,8 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
         scan->len = cpu_to_le16(cmd.len);
 
         set_bit(STATUS_SCAN_HW, &priv->status);
-        rc = iwl4965_send_cmd_sync(priv, &cmd);
-        if (rc)
+        ret = iwl_send_cmd_sync(priv, &cmd);
+        if (ret)
                 goto done;
 
         queue_delayed_work(priv->workqueue, &priv->scan_check,
@@ -7138,7 +5923,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data)
 
 static void iwl4965_bg_up(struct work_struct *data)
 {
-        struct iwl4965_priv *priv = container_of(data, struct iwl4965_priv, up);
+        struct iwl_priv *priv = container_of(data, struct iwl_priv, up);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -7150,7 +5935,7 @@ static void iwl4965_bg_up(struct work_struct *data)
 
 static void iwl4965_bg_restart(struct work_struct *data)
 {
-        struct iwl4965_priv *priv = container_of(data, struct iwl4965_priv, restart);
+        struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -7161,8 +5946,8 @@ static void iwl4965_bg_restart(struct work_struct *data)
 
 static void iwl4965_bg_rx_replenish(struct work_struct *data)
 {
-        struct iwl4965_priv *priv =
-            container_of(data, struct iwl4965_priv, rx_replenish);
+        struct iwl_priv *priv =
+            container_of(data, struct iwl_priv, rx_replenish);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -7174,13 +5959,10 @@ static void iwl4965_bg_rx_replenish(struct work_struct *data)
 
 #define IWL_DELAY_NEXT_SCAN (HZ*2)
 
-static void iwl4965_bg_post_associate(struct work_struct *data)
+static void iwl4965_post_associate(struct iwl_priv *priv)
 {
-        struct iwl4965_priv *priv = container_of(data, struct iwl4965_priv,
-                                             post_associate.work);
-
-        int rc = 0;
         struct ieee80211_conf *conf = NULL;
+        int ret = 0;
         DECLARE_MAC_BUF(mac);
 
         if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
@@ -7196,12 +5978,10 @@ static void iwl4965_bg_post_associate(struct work_struct *data)
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
 
-        mutex_lock(&priv->mutex);
 
-        if (!priv->vif || !priv->is_open) {
-                mutex_unlock(&priv->mutex);
+        if (!priv->vif || !priv->is_open)
                 return;
-        }
+
         iwl4965_scan_cancel_timeout(priv, 200);
 
         conf = ieee80211_get_hw_conf(priv->hw);
@@ -7211,9 +5991,9 @@ static void iwl4965_bg_post_associate(struct work_struct *data)
 
         memset(&priv->rxon_timing, 0, sizeof(struct iwl4965_rxon_time_cmd));
         iwl4965_setup_rxon_timing(priv);
-        rc = iwl4965_send_cmd_pdu(priv, REPLY_RXON_TIMING,
+        ret = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,
                               sizeof(priv->rxon_timing), &priv->rxon_timing);
-        if (rc)
+        if (ret)
                 IWL_WARNING("REPLY_RXON_TIMING failed - "
                             "Attempting to continue.\n");
 
@@ -7255,7 +6035,7 @@ static void iwl4965_bg_post_associate(struct work_struct *data)
         case IEEE80211_IF_TYPE_IBSS:
 
                 /* clear out the station table */
-                iwl4965_clear_stations_table(priv);
+                iwlcore_clear_stations_table(priv);
 
                 iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0);
                 iwl4965_rxon_add_station(priv, priv->bssid, 0);
@@ -7281,19 +6061,29 @@ static void iwl4965_bg_post_associate(struct work_struct *data)
         if (priv->iw_mode == IEEE80211_IF_TYPE_IBSS)
                 priv->assoc_station_added = 1;
 
-#ifdef CONFIG_IWL4965_QOS
         iwl4965_activate_qos(priv, 0);
-#endif /* CONFIG_IWL4965_QOS */
+
         /* we have just associated, don't start scan too early */
         priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;
+}
+
+
+static void iwl4965_bg_post_associate(struct work_struct *data)
+{
+        struct iwl_priv *priv = container_of(data, struct iwl_priv,
+                                             post_associate.work);
+
+        mutex_lock(&priv->mutex);
+        iwl4965_post_associate(priv);
         mutex_unlock(&priv->mutex);
+
 }
 
 static void iwl4965_bg_abort_scan(struct work_struct *work)
 {
-        struct iwl4965_priv *priv = container_of(work, struct iwl4965_priv, abort_scan);
+        struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan);
 
-        if (!iwl4965_is_ready(priv))
+        if (!iwl_is_ready(priv))
                 return;
 
         mutex_lock(&priv->mutex);
@@ -7308,8 +6098,8 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
 
 static void iwl4965_bg_scan_completed(struct work_struct *work)
 {
-        struct iwl4965_priv *priv =
-            container_of(work, struct iwl4965_priv, scan_completed);
+        struct iwl_priv *priv =
+            container_of(work, struct iwl_priv, scan_completed);
 
         IWL_DEBUG(IWL_DL_INFO | IWL_DL_SCAN, "SCAN complete scan\n");
 
@@ -7338,7 +6128,7 @@ static void iwl4965_bg_scan_completed(struct work_struct *work)
 
 static int iwl4965_mac_start(struct ieee80211_hw *hw)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         int ret;
 
         IWL_DEBUG_MAC80211("enter\n");
@@ -7415,7 +6205,7 @@ out_disable_msi:
 
 static void iwl4965_mac_stop(struct ieee80211_hw *hw)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
 
         IWL_DEBUG_MAC80211("enter\n");
 
@@ -7426,7 +6216,7 @@ static void iwl4965_mac_stop(struct ieee80211_hw *hw)
 
         priv->is_open = 0;
 
-        if (iwl4965_is_ready_rf(priv)) {
+        if (iwl_is_ready_rf(priv)) {
                 /* stop mac, cancel any scan request and clear
                  * RXON_FILTER_ASSOC_MSK BIT
                  */
@@ -7450,7 +6240,7 @@ static void iwl4965_mac_stop(struct ieee80211_hw *hw)
 static int iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
                       struct ieee80211_tx_control *ctl)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
 
         IWL_DEBUG_MAC80211("enter\n");
 
@@ -7460,7 +6250,7 @@ static int iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         }
 
         IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
-                     ctl->tx_rate);
+                     ctl->tx_rate->bitrate);
 
         if (iwl4965_tx_skb(priv, skb, ctl))
                 dev_kfree_skb_any(skb);
@@ -7472,7 +6262,7 @@ static int iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
 static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
                                  struct ieee80211_if_init_conf *conf)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         unsigned long flags;
         DECLARE_MAC_BUF(mac);
 
@@ -7495,7 +6285,7 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
                 memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
         }
 
-        if (iwl4965_is_ready(priv))
+        if (iwl_is_ready(priv))
                 iwl4965_set_mode(priv, conf->type);
 
         mutex_unlock(&priv->mutex);
@@ -7513,23 +6303,23 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
  */
 static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
 {
-        struct iwl4965_priv *priv = hw->priv;
-        const struct iwl4965_channel_info *ch_info;
+        struct iwl_priv *priv = hw->priv;
+        const struct iwl_channel_info *ch_info;
         unsigned long flags;
         int ret = 0;
 
         mutex_lock(&priv->mutex);
-        IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel);
+        IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel->hw_value);
 
         priv->add_radiotap = !!(conf->flags & IEEE80211_CONF_RADIOTAP);
 
-        if (!iwl4965_is_ready(priv)) {
+        if (!iwl_is_ready(priv)) {
                 IWL_DEBUG_MAC80211("leave - not ready\n");
                 ret = -EIO;
                 goto out;
         }
 
-        if (unlikely(!iwl4965_param_disable_hw_scan &&
+        if (unlikely(!priv->cfg->mod_params->disable_hw_scan &&
                      test_bit(STATUS_SCANNING, &priv->status))) {
                 IWL_DEBUG_MAC80211("leave - scanning\n");
                 set_bit(STATUS_CONF_PENDING, &priv->status);
@@ -7539,10 +6329,9 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        ch_info = iwl4965_get_channel_info(priv, conf->phymode, conf->channel);
+        ch_info = iwl_get_channel_info(priv, conf->channel->band,
+                        ieee80211_frequency_to_channel(conf->channel->center_freq));
         if (!is_channel_valid(ch_info)) {
-                IWL_DEBUG_SCAN("Channel %d [%d] is INVALID for this SKU.\n",
-                               conf->channel, conf->phymode);
                 IWL_DEBUG_MAC80211("leave - invalid channel\n");
                 spin_unlock_irqrestore(&priv->lock, flags);
                 ret = -EINVAL;
@@ -7550,10 +6339,10 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
         }
 
 #ifdef CONFIG_IWL4965_HT
-        /* if we are switching fron ht to 2.4 clear flags
+        /* if we are switching from ht to 2.4 clear flags
          * from any ht related info since 2.4 does not
          * support ht */
-        if ((le16_to_cpu(priv->staging_rxon.channel) != conf->channel)
+        if ((le16_to_cpu(priv->staging_rxon.channel) != conf->channel->hw_value)
 #ifdef IEEE80211_CONF_CHANNEL_SWITCH
             && !(conf->flags & IEEE80211_CONF_CHANNEL_SWITCH)
 #endif
@@ -7561,12 +6350,13 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
                 priv->staging_rxon.flags = 0;
 #endif /* CONFIG_IWL4965_HT */
 
-        iwl4965_set_rxon_channel(priv, conf->phymode, conf->channel);
+        iwlcore_set_rxon_channel(priv, conf->channel->band,
+                ieee80211_frequency_to_channel(conf->channel->center_freq));
 
-        iwl4965_set_flags_for_phymode(priv, conf->phymode);
+        iwl4965_set_flags_for_phymode(priv, conf->channel->band);
 
         /* The list of supported rates and rate mask can be different
-         * for each phymode; since the phymode may have changed, reset
+         * for each band; since the band may have changed, reset
          * the rate mask to what mac80211 lists */
         iwl4965_set_rate(priv);
 
@@ -7579,14 +6369,15 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
         }
 #endif
 
-        iwl4965_radio_kill_sw(priv, !conf->radio_enabled);
+        if (priv->cfg->ops->lib->radio_kill_sw)
+                priv->cfg->ops->lib->radio_kill_sw(priv, !conf->radio_enabled);
 
         if (!conf->radio_enabled) {
                 IWL_DEBUG_MAC80211("leave - radio disabled\n");
                 goto out;
         }
 
-        if (iwl4965_is_rfkill(priv)) {
+        if (iwl_is_rfkill(priv)) {
                 IWL_DEBUG_MAC80211("leave - RF kill\n");
                 ret = -EIO;
                 goto out;
@@ -7608,9 +6399,9 @@ out:
         return ret;
 }
 
-static void iwl4965_config_ap(struct iwl4965_priv *priv)
+static void iwl4965_config_ap(struct iwl_priv *priv)
 {
-        int rc = 0;
+        int ret = 0;
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -7625,9 +6416,9 @@ static void iwl4965_config_ap(struct iwl4965_priv *priv)
                 /* RXON Timing */
                 memset(&priv->rxon_timing, 0, sizeof(struct iwl4965_rxon_time_cmd));
                 iwl4965_setup_rxon_timing(priv);
-                rc = iwl4965_send_cmd_pdu(priv, REPLY_RXON_TIMING,
+                ret = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,
                                 sizeof(priv->rxon_timing), &priv->rxon_timing);
-                if (rc)
+                if (ret)
                         IWL_WARNING("REPLY_RXON_TIMING failed - "
                                         "Attempting to continue.\n");
 
@@ -7658,9 +6449,7 @@ static void iwl4965_config_ap(struct iwl4965_priv *priv)
                 /* restore RXON assoc */
                 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
                 iwl4965_commit_rxon(priv);
-#ifdef CONFIG_IWL4965_QOS
                 iwl4965_activate_qos(priv, 1);
-#endif
                 iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0);
         }
         iwl4965_send_beacon_cmd(priv);
@@ -7674,7 +6463,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif,
                                     struct ieee80211_if_conf *conf)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         DECLARE_MAC_BUF(mac);
         unsigned long flags;
         int rc;
@@ -7682,6 +6471,12 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
         if (conf == NULL)
                 return -EIO;
 
+        if (priv->vif != vif) {
+                IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");
+                mutex_unlock(&priv->mutex);
+                return 0;
+        }
+
         if ((priv->iw_mode == IEEE80211_IF_TYPE_AP) &&
             (!conf->beacon || !conf->ssid_len)) {
                 IWL_DEBUG_MAC80211
@@ -7689,7 +6484,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                 return 0;
         }
 
-        if (!iwl4965_is_alive(priv))
+        if (!iwl_is_alive(priv))
                 return -EAGAIN;
 
         mutex_lock(&priv->mutex);
@@ -7704,17 +6499,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
         if (unlikely(test_bit(STATUS_SCANNING, &priv->status)) &&
             !(priv->hw->flags & IEEE80211_HW_NO_PROBE_FILTERING)) {
  */
-        if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) {
-                IWL_DEBUG_MAC80211("leave - scanning\n");
-                mutex_unlock(&priv->mutex);
-                return 0;
-        }
-
-        if (priv->vif != vif) {
-                IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");
-                mutex_unlock(&priv->mutex);
-                return 0;
-        }
 
         if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
                 if (!conf->bssid) {
@@ -7729,7 +6513,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                 priv->ibss_beacon = conf->beacon;
         }
 
-        if (iwl4965_is_rfkill(priv))
+        if (iwl_is_rfkill(priv))
                 goto done;
 
         if (conf->bssid && !is_zero_ether_addr(conf->bssid) &&
@@ -7797,13 +6581,13 @@ static void iwl4965_configure_filter(struct ieee80211_hw *hw,
 static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,
                                      struct ieee80211_if_init_conf *conf)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
 
         IWL_DEBUG_MAC80211("enter\n");
 
         mutex_lock(&priv->mutex);
 
-        if (iwl4965_is_ready_rf(priv)) {
+        if (iwl_is_ready_rf(priv)) {
                 iwl4965_scan_cancel_timeout(priv, 100);
                 cancel_delayed_work(&priv->post_associate);
                 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
@@ -7821,14 +6605,77 @@ static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,
 
 }
 
+
+#ifdef CONFIG_IWL4965_HT
+static void iwl4965_ht_conf(struct iwl_priv *priv,
+                            struct ieee80211_bss_conf *bss_conf)
+{
+        struct ieee80211_ht_info *ht_conf = bss_conf->ht_conf;
+        struct ieee80211_ht_bss_info *ht_bss_conf = bss_conf->ht_bss_conf;
+        struct iwl_ht_info *iwl_conf = &priv->current_ht_config;
+
+        IWL_DEBUG_MAC80211("enter: \n");
+
+        iwl_conf->is_ht = bss_conf->assoc_ht;
+
+        if (!iwl_conf->is_ht)
+                return;
+
+        priv->ps_mode = (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2);
+
+        if (ht_conf->cap & IEEE80211_HT_CAP_SGI_20)
+                iwl_conf->sgf |= 0x1;
+        if (ht_conf->cap & IEEE80211_HT_CAP_SGI_40)
+                iwl_conf->sgf |= 0x2;
+
+        iwl_conf->is_green_field = !!(ht_conf->cap & IEEE80211_HT_CAP_GRN_FLD);
+        iwl_conf->max_amsdu_size =
+                !!(ht_conf->cap & IEEE80211_HT_CAP_MAX_AMSDU);
+
+        iwl_conf->supported_chan_width =
+                !!(ht_conf->cap & IEEE80211_HT_CAP_SUP_WIDTH);
+        iwl_conf->extension_chan_offset =
+                ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_SEC_OFFSET;
+        /* If no above or below channel supplied disable FAT channel */
+        if (iwl_conf->extension_chan_offset != IWL_EXT_CHANNEL_OFFSET_ABOVE &&
+            iwl_conf->extension_chan_offset != IWL_EXT_CHANNEL_OFFSET_BELOW)
+                iwl_conf->supported_chan_width = 0;
+
+        iwl_conf->tx_mimo_ps_mode =
+                (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2);
+        memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16);
+
+        iwl_conf->control_channel = ht_bss_conf->primary_channel;
+        iwl_conf->tx_chan_width =
+                !!(ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_WIDTH);
+        iwl_conf->ht_protection =
+                ht_bss_conf->bss_op_mode & IEEE80211_HT_IE_HT_PROTECTION;
+        iwl_conf->non_GF_STA_present =
+                !!(ht_bss_conf->bss_op_mode & IEEE80211_HT_IE_NON_GF_STA_PRSNT);
+
+        IWL_DEBUG_MAC80211("control channel %d\n", iwl_conf->control_channel);
+        IWL_DEBUG_MAC80211("leave\n");
+}
+#else
+static inline void iwl4965_ht_conf(struct iwl_priv *priv,
+                                   struct ieee80211_bss_conf *bss_conf)
+{
+}
+#endif
+
+#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
 static void iwl4965_bss_info_changed(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif,
                                      struct ieee80211_bss_conf *bss_conf,
                                      u32 changes)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
+
+        IWL_DEBUG_MAC80211("changes = 0x%X\n", changes);
 
         if (changes & BSS_CHANGED_ERP_PREAMBLE) {
+                IWL_DEBUG_MAC80211("ERP_PREAMBLE %d\n",
+                                   bss_conf->use_short_preamble);
                 if (bss_conf->use_short_preamble)
                         priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
                 else
@@ -7836,35 +6683,58 @@ static void iwl4965_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changes & BSS_CHANGED_ERP_CTS_PROT) {
-                if (bss_conf->use_cts_prot && (priv->phymode != MODE_IEEE80211A))
+                IWL_DEBUG_MAC80211("ERP_CTS %d\n", bss_conf->use_cts_prot);
+                if (bss_conf->use_cts_prot && (priv->band != IEEE80211_BAND_5GHZ))
                         priv->staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK;
                 else
                         priv->staging_rxon.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
         }
 
+        if (changes & BSS_CHANGED_HT) {
+                IWL_DEBUG_MAC80211("HT %d\n", bss_conf->assoc_ht);
+                iwl4965_ht_conf(priv, bss_conf);
+                iwl4965_set_rxon_chain(priv);
+        }
+
         if (changes & BSS_CHANGED_ASSOC) {
-                /*
-                 * TODO:
-                 * do stuff instead of sniffing assoc resp
-                 */
+                IWL_DEBUG_MAC80211("ASSOC %d\n", bss_conf->assoc);
+                /* This should never happen as this function should
+                 * never be called from interrupt context. */
+                if (WARN_ON_ONCE(in_interrupt()))
+                        return;
+                if (bss_conf->assoc) {
+                        priv->assoc_id = bss_conf->aid;
+                        priv->beacon_int = bss_conf->beacon_int;
+                        priv->timestamp = bss_conf->timestamp;
+                        priv->assoc_capability = bss_conf->assoc_capability;
+                        priv->next_scan_jiffies = jiffies +
+                                        IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;
+                        mutex_lock(&priv->mutex);
+                        iwl4965_post_associate(priv);
+                        mutex_unlock(&priv->mutex);
+                } else {
+                        priv->assoc_id = 0;
+                        IWL_DEBUG_MAC80211("DISASSOC %d\n", bss_conf->assoc);
+                }
+        } else if (changes && iwl_is_associated(priv) && priv->assoc_id) {
+                        IWL_DEBUG_MAC80211("Associated Changes %d\n", changes);
+                        iwl_send_rxon_assoc(priv);
         }
 
-        if (iwl4965_is_associated(priv))
-                iwl4965_send_rxon_assoc(priv);
 }
 
 static int iwl4965_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
 {
         int rc = 0;
         unsigned long flags;
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
 
         IWL_DEBUG_MAC80211("enter\n");
 
         mutex_lock(&priv->mutex);
         spin_lock_irqsave(&priv->lock, flags);
 
-        if (!iwl4965_is_ready_rf(priv)) {
+        if (!iwl_is_ready_rf(priv)) {
                 rc = -EIO;
                 IWL_DEBUG_MAC80211("leave - not ready or exit pending\n");
                 goto out_unlock;
@@ -7910,18 +6780,67 @@ out_unlock:
         return rc;
 }
 
+static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
+                        struct ieee80211_key_conf *keyconf, const u8 *addr,
+                        u32 iv32, u16 *phase1key)
+{
+        struct iwl_priv *priv = hw->priv;
+        u8 sta_id = IWL_INVALID_STATION;
+        unsigned long flags;
+        __le16 key_flags = 0;
+        int i;
+        DECLARE_MAC_BUF(mac);
+
+        IWL_DEBUG_MAC80211("enter\n");
+
+        sta_id = iwl4965_hw_find_station(priv, addr);
+        if (sta_id == IWL_INVALID_STATION) {
+                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
+                                   print_mac(mac, addr));
+                return;
+        }
+
+        iwl4965_scan_cancel_timeout(priv, 100);
+
+        key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
+        key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
+        key_flags &= ~STA_KEY_FLG_INVALID;
+
+        if (sta_id == priv->hw_params.bcast_sta_id)
+                key_flags |= STA_KEY_MULTICAST_MSK;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+
+        priv->stations[sta_id].sta.key.key_flags = key_flags;
+        priv->stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32;
+
+        for (i = 0; i < 5; i++)
+                priv->stations[sta_id].sta.key.tkip_rx_ttak[i] =
+                        cpu_to_le16(phase1key[i]);
+
+        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
+
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        IWL_DEBUG_MAC80211("leave\n");
+}
+
 static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                            const u8 *local_addr, const u8 *addr,
                            struct ieee80211_key_conf *key)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         DECLARE_MAC_BUF(mac);
-        int rc = 0;
-        u8 sta_id;
+        int ret = 0;
+        u8 sta_id = IWL_INVALID_STATION;
+        u8 is_default_wep_key = 0;
 
         IWL_DEBUG_MAC80211("enter\n");
 
-        if (!iwl4965_param_hwcrypto) {
+        if (priv->cfg->mod_params->sw_crypto) {
                 IWL_DEBUG_MAC80211("leave - hwcrypto disabled\n");
                 return -EOPNOTSUPP;
         }
@@ -7935,53 +6854,61 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
                                    print_mac(mac, addr));
                 return -EINVAL;
+
         }
 
         mutex_lock(&priv->mutex);
-
         iwl4965_scan_cancel_timeout(priv, 100);
+        mutex_unlock(&priv->mutex);
+
+        /* If we are getting WEP group key and we didn't receive any key mapping
+         * so far, we are in legacy wep mode (group key only), otherwise we are
+         * in 1X mode.
+         * In legacy wep mode, we use another host command to the uCode */
+        if (key->alg == ALG_WEP && sta_id == priv->hw_params.bcast_sta_id &&
+                priv->iw_mode != IEEE80211_IF_TYPE_AP) {
+                if (cmd == SET_KEY)
+                        is_default_wep_key = !priv->key_mapping_key;
+                else
+                        is_default_wep_key = priv->default_wep_key;
+        }
 
         switch (cmd) {
-        case  SET_KEY:
-                rc = iwl4965_update_sta_key_info(priv, key, sta_id);
-                if (!rc) {
-                        iwl4965_set_rxon_hwcrypto(priv, 1);
-                        iwl4965_commit_rxon(priv);
-                        key->hw_key_idx = sta_id;
-                        IWL_DEBUG_MAC80211("set_key success, using hwcrypto\n");
-                        key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-                }
+        case SET_KEY:
+                if (is_default_wep_key)
+                        ret = iwl_set_default_wep_key(priv, key);
+                else
+                        ret = iwl_set_dynamic_key(priv, key, sta_id);
+
+                IWL_DEBUG_MAC80211("enable hwcrypto key\n");
                 break;
         case DISABLE_KEY:
-                rc = iwl4965_clear_sta_key_info(priv, sta_id);
-                if (!rc) {
-                        iwl4965_set_rxon_hwcrypto(priv, 0);
-                        iwl4965_commit_rxon(priv);
-                        IWL_DEBUG_MAC80211("disable hwcrypto key\n");
-                }
+                if (is_default_wep_key)
+                        ret = iwl_remove_default_wep_key(priv, key);
+                else
+                        ret = iwl_remove_dynamic_key(priv, sta_id);
+
+                IWL_DEBUG_MAC80211("disable hwcrypto key\n");
                 break;
         default:
-                rc = -EINVAL;
+                ret = -EINVAL;
         }
 
         IWL_DEBUG_MAC80211("leave\n");
-        mutex_unlock(&priv->mutex);
 
-        return rc;
+        return ret;
 }
 
 static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
                            const struct ieee80211_tx_queue_params *params)
 {
-        struct iwl4965_priv *priv = hw->priv;
-#ifdef CONFIG_IWL4965_QOS
+        struct iwl_priv *priv = hw->priv;
         unsigned long flags;
         int q;
-#endif /* CONFIG_IWL4965_QOS */
 
         IWL_DEBUG_MAC80211("enter\n");
 
-        if (!iwl4965_is_ready_rf(priv)) {
+        if (!iwl_is_ready_rf(priv)) {
                 IWL_DEBUG_MAC80211("leave - RF not ready\n");
                 return -EIO;
         }
@@ -7991,7 +6918,6 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
                 return 0;
         }
 
-#ifdef CONFIG_IWL4965_QOS
         if (!priv->qos_data.qos_enable) {
                 priv->qos_data.qos_active = 0;
                 IWL_DEBUG_MAC80211("leave - qos not enabled\n");
@@ -8005,7 +6931,7 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
         priv->qos_data.def_qos_parm.ac[q].cw_max = cpu_to_le16(params->cw_max);
         priv->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
         priv->qos_data.def_qos_parm.ac[q].edca_txop =
-                        cpu_to_le16((params->burst_time * 100));
+                        cpu_to_le16((params->txop * 32));
 
         priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
         priv->qos_data.qos_active = 1;
@@ -8015,13 +6941,11 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
         mutex_lock(&priv->mutex);
         if (priv->iw_mode == IEEE80211_IF_TYPE_AP)
                 iwl4965_activate_qos(priv, 1);
-        else if (priv->assoc_id && iwl4965_is_associated(priv))
+        else if (priv->assoc_id && iwl_is_associated(priv))
                 iwl4965_activate_qos(priv, 0);
 
         mutex_unlock(&priv->mutex);
 
-#endif /*CONFIG_IWL4965_QOS */
-
         IWL_DEBUG_MAC80211("leave\n");
         return 0;
 }
@@ -8029,7 +6953,7 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
 static int iwl4965_mac_get_tx_stats(struct ieee80211_hw *hw,
                                 struct ieee80211_tx_queue_stats *stats)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         int i, avail;
         struct iwl4965_tx_queue *txq;
         struct iwl4965_queue *q;
@@ -8037,7 +6961,7 @@ static int iwl4965_mac_get_tx_stats(struct ieee80211_hw *hw,
 
         IWL_DEBUG_MAC80211("enter\n");
 
-        if (!iwl4965_is_ready_rf(priv)) {
+        if (!iwl_is_ready_rf(priv)) {
                 IWL_DEBUG_MAC80211("leave - RF not ready\n");
                 return -EIO;
         }
@@ -8080,7 +7004,7 @@ static u64 iwl4965_mac_get_tsf(struct ieee80211_hw *hw)
 
 static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         unsigned long flags;
 
         mutex_lock(&priv->mutex);
@@ -8091,30 +7015,15 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)
         spin_lock_irqsave(&priv->lock, flags);
         memset(&priv->current_ht_config, 0, sizeof(struct iwl_ht_info));
         spin_unlock_irqrestore(&priv->lock, flags);
-#ifdef CONFIG_IWL4965_HT_AGG
-/*      if (priv->lq_mngr.agg_ctrl.granted_ba)
-                iwl4965_turn_off_agg(priv, TID_ALL_SPECIFIED);*/
-
-        memset(&(priv->lq_mngr.agg_ctrl), 0, sizeof(struct iwl4965_agg_control));
-        priv->lq_mngr.agg_ctrl.tid_traffic_load_threshold = 10;
-        priv->lq_mngr.agg_ctrl.ba_timeout = 5000;
-        priv->lq_mngr.agg_ctrl.auto_agg = 1;
-
-        if (priv->lq_mngr.agg_ctrl.auto_agg)
-                priv->lq_mngr.agg_ctrl.requested_ba = TID_ALL_ENABLED;
-#endif /*CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
 
-#ifdef CONFIG_IWL4965_QOS
-        iwl4965_reset_qos(priv);
-#endif
+        iwlcore_reset_qos(priv);
 
         cancel_delayed_work(&priv->post_associate);
 
         spin_lock_irqsave(&priv->lock, flags);
         priv->assoc_id = 0;
         priv->assoc_capability = 0;
-        priv->call_post_assoc_from_beacon = 0;
         priv->assoc_station_added = 0;
 
         /* new association get rid of ibss beacon skb */
@@ -8124,14 +7033,13 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)
         priv->ibss_beacon = NULL;
 
         priv->beacon_int = priv->hw->conf.beacon_int;
-        priv->timestamp1 = 0;
-        priv->timestamp0 = 0;
+        priv->timestamp = 0;
         if ((priv->iw_mode == IEEE80211_IF_TYPE_STA))
                 priv->beacon_int = 0;
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        if (!iwl4965_is_ready_rf(priv)) {
+        if (!iwl_is_ready_rf(priv)) {
                 IWL_DEBUG_MAC80211("leave - not ready\n");
                 mutex_unlock(&priv->mutex);
                 return;
@@ -8166,13 +7074,13 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)
 static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
                                  struct ieee80211_tx_control *control)
 {
-        struct iwl4965_priv *priv = hw->priv;
+        struct iwl_priv *priv = hw->priv;
         unsigned long flags;
 
         mutex_lock(&priv->mutex);
         IWL_DEBUG_MAC80211("enter\n");
 
-        if (!iwl4965_is_ready_rf(priv)) {
+        if (!iwl_is_ready_rf(priv)) {
                 IWL_DEBUG_MAC80211("leave - RF not ready\n");
                 mutex_unlock(&priv->mutex);
                 return -EIO;
@@ -8196,9 +7104,7 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
         IWL_DEBUG_MAC80211("leave\n");
         spin_unlock_irqrestore(&priv->lock, flags);
 
-#ifdef CONFIG_IWL4965_QOS
-        iwl4965_reset_qos(priv);
-#endif
+        iwlcore_reset_qos(priv);
 
         queue_work(priv->workqueue, &priv->post_associate.work);
 
@@ -8207,111 +7113,13 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
         return 0;
 }
 
-#ifdef CONFIG_IWL4965_HT
-
-static void iwl4965_ht_info_fill(struct ieee80211_conf *conf,
-                                 struct iwl4965_priv *priv)
-{
-        struct iwl_ht_info *iwl_conf = &priv->current_ht_config;
-        struct ieee80211_ht_info *ht_conf = &conf->ht_conf;
-        struct ieee80211_ht_bss_info *ht_bss_conf = &conf->ht_bss_conf;
-
-        IWL_DEBUG_MAC80211("enter: \n");
-
-        if (!(conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE)) {
-                iwl_conf->is_ht = 0;
-                return;
-        }
-
-        iwl_conf->is_ht = 1;
-        priv->ps_mode = (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2);
-
-        if (ht_conf->cap & IEEE80211_HT_CAP_SGI_20)
-                iwl_conf->sgf |= 0x1;
-        if (ht_conf->cap & IEEE80211_HT_CAP_SGI_40)
-                iwl_conf->sgf |= 0x2;
-
-        iwl_conf->is_green_field = !!(ht_conf->cap & IEEE80211_HT_CAP_GRN_FLD);
-        iwl_conf->max_amsdu_size =
-                !!(ht_conf->cap & IEEE80211_HT_CAP_MAX_AMSDU);
-        iwl_conf->supported_chan_width =
-                !!(ht_conf->cap & IEEE80211_HT_CAP_SUP_WIDTH);
-        iwl_conf->tx_mimo_ps_mode =
-                (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2);
-        memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16);
-
-        iwl_conf->control_channel = ht_bss_conf->primary_channel;
-        iwl_conf->extension_chan_offset =
-                ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_SEC_OFFSET;
-        iwl_conf->tx_chan_width =
-                !!(ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_WIDTH);
-        iwl_conf->ht_protection =
-                ht_bss_conf->bss_op_mode & IEEE80211_HT_IE_HT_PROTECTION;
-        iwl_conf->non_GF_STA_present =
-                !!(ht_bss_conf->bss_op_mode & IEEE80211_HT_IE_NON_GF_STA_PRSNT);
-
-        IWL_DEBUG_MAC80211("control channel %d\n",
-                iwl_conf->control_channel);
-        IWL_DEBUG_MAC80211("leave\n");
-}
-
-static int iwl4965_mac_conf_ht(struct ieee80211_hw *hw,
-                               struct ieee80211_conf *conf)
-{
-        struct iwl4965_priv *priv = hw->priv;
-
-        IWL_DEBUG_MAC80211("enter: \n");
-
-        iwl4965_ht_info_fill(conf, priv);
-        iwl4965_set_rxon_chain(priv);
-
-        if (priv && priv->assoc_id &&
-            (priv->iw_mode == IEEE80211_IF_TYPE_STA)) {
-                unsigned long flags;
-
-                spin_lock_irqsave(&priv->lock, flags);
-                if (priv->beacon_int)
-                        queue_work(priv->workqueue, &priv->post_associate.work);
-                else
-                        priv->call_post_assoc_from_beacon = 1;
-                spin_unlock_irqrestore(&priv->lock, flags);
-        }
-
-        IWL_DEBUG_MAC80211("leave:\n");
-        return 0;
-}
-
-static void iwl4965_set_ht_capab(struct ieee80211_hw *hw,
-                        struct ieee80211_ht_cap *ht_cap,
-                        u8 use_current_config)
-{
-        struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_hw_mode *mode = conf->mode;
-
-        if (use_current_config) {
-                ht_cap->cap_info = cpu_to_le16(conf->ht_conf.cap);
-                memcpy(ht_cap->supp_mcs_set,
-                                conf->ht_conf.supp_mcs_set, 16);
-        } else {
-                ht_cap->cap_info = cpu_to_le16(mode->ht_info.cap);
-                memcpy(ht_cap->supp_mcs_set,
-                                mode->ht_info.supp_mcs_set, 16);
-        }
-        ht_cap->ampdu_params_info =
-                (mode->ht_info.ampdu_factor & IEEE80211_HT_CAP_AMPDU_FACTOR) |
-                ((mode->ht_info.ampdu_density << 2) &
-                                        IEEE80211_HT_CAP_AMPDU_DENSITY);
-}
-
-#endif /*CONFIG_IWL4965_HT*/
-
 /*****************************************************************************
  *
  * sysfs attributes
  *
  *****************************************************************************/
 
-#ifdef CONFIG_IWL4965_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUG
 
 /*
  * The following adds a new attribute to the sysfs representation
@@ -8323,7 +7131,7 @@ static void iwl4965_set_ht_capab(struct ieee80211_hw *hw,
 
 static ssize_t show_debug_level(struct device_driver *d, char *buf)
 {
-        return sprintf(buf, "0x%08X\n", iwl4965_debug_level);
+        return sprintf(buf, "0x%08X\n", iwl_debug_level);
 }
 static ssize_t store_debug_level(struct device_driver *d,
                                  const char *buf, size_t count)
@@ -8336,7 +7144,7 @@ static ssize_t store_debug_level(struct device_driver *d,
                 printk(KERN_INFO DRV_NAME
                        ": %s is not in hex or decimal form.\n", buf);
         else
-                iwl4965_debug_level = val;
+                iwl_debug_level = val;
 
         return strnlen(buf, count);
 }
@@ -8344,45 +7152,15 @@ static ssize_t store_debug_level(struct device_driver *d,
 static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
                    show_debug_level, store_debug_level);
 
-#endif /* CONFIG_IWL4965_DEBUG */
-
-static ssize_t show_rf_kill(struct device *d,
-                            struct device_attribute *attr, char *buf)
-{
-        /*
-         * 0 - RF kill not enabled
-         * 1 - SW based RF kill active (sysfs)
-         * 2 - HW based RF kill active
-         * 3 - Both HW and SW based RF kill active
-         */
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
-        int val = (test_bit(STATUS_RF_KILL_SW, &priv->status) ? 0x1 : 0x0) |
-                  (test_bit(STATUS_RF_KILL_HW, &priv->status) ? 0x2 : 0x0);
-
-        return sprintf(buf, "%i\n", val);
-}
+#endif /* CONFIG_IWLWIFI_DEBUG */
 
-static ssize_t store_rf_kill(struct device *d,
-                             struct device_attribute *attr,
-                             const char *buf, size_t count)
-{
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
-
-        mutex_lock(&priv->mutex);
-        iwl4965_radio_kill_sw(priv, buf[0] == '1');
-        mutex_unlock(&priv->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(rf_kill, S_IWUSR | S_IRUGO, show_rf_kill, store_rf_kill);
 
 static ssize_t show_temperature(struct device *d,
                                 struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
 
-        if (!iwl4965_is_alive(priv))
+        if (!iwl_is_alive(priv))
                 return -EAGAIN;
 
         return sprintf(buf, "%d\n", iwl4965_hw_get_temperature(priv));
@@ -8394,7 +7172,7 @@ static ssize_t show_rs_window(struct device *d,
                               struct device_attribute *attr,
                               char *buf)
 {
-        struct iwl4965_priv *priv = d->driver_data;
+        struct iwl_priv *priv = d->driver_data;
         return iwl4965_fill_rs_info(priv->hw, buf, IWL_AP_ID);
 }
 static DEVICE_ATTR(rs_window, S_IRUGO, show_rs_window, NULL);
@@ -8402,7 +7180,7 @@ static DEVICE_ATTR(rs_window, S_IRUGO, show_rs_window, NULL);
 static ssize_t show_tx_power(struct device *d,
                              struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
         return sprintf(buf, "%d\n", priv->user_txpower_limit);
 }
 
@@ -8410,7 +7188,7 @@ static ssize_t store_tx_power(struct device *d,
                               struct device_attribute *attr,
                               const char *buf, size_t count)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
         char *p = (char *)buf;
         u32 val;
 
@@ -8429,7 +7207,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power);
 static ssize_t show_flags(struct device *d,
                           struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
 
         return sprintf(buf, "0x%04X\n", priv->active_rxon.flags);
 }
@@ -8438,7 +7216,7 @@ static ssize_t store_flags(struct device *d,
                            struct device_attribute *attr,
                            const char *buf, size_t count)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
         u32 flags = simple_strtoul(buf, NULL, 0);
 
         mutex_lock(&priv->mutex);
@@ -8463,7 +7241,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IRUGO, show_flags, store_flags);
 static ssize_t show_filter_flags(struct device *d,
                                  struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
 
         return sprintf(buf, "0x%04X\n",
                 le32_to_cpu(priv->active_rxon.filter_flags));
@@ -8473,7 +7251,7 @@ static ssize_t store_filter_flags(struct device *d,
                                   struct device_attribute *attr,
                                   const char *buf, size_t count)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
         u32 filter_flags = simple_strtoul(buf, NULL, 0);
 
         mutex_lock(&priv->mutex);
@@ -8497,71 +7275,12 @@ static ssize_t store_filter_flags(struct device *d,
 static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags,
                    store_filter_flags);
 
-static ssize_t show_tune(struct device *d,
-                         struct device_attribute *attr, char *buf)
-{
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
-
-        return sprintf(buf, "0x%04X\n",
-                       (priv->phymode << 8) |
-                        le16_to_cpu(priv->active_rxon.channel));
-}
-
-static void iwl4965_set_flags_for_phymode(struct iwl4965_priv *priv, u8 phymode);
-
-static ssize_t store_tune(struct device *d,
-                          struct device_attribute *attr,
-                          const char *buf, size_t count)
-{
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
-        char *p = (char *)buf;
-        u16 tune = simple_strtoul(p, &p, 0);
-        u8 phymode = (tune >> 8) & 0xff;
-        u16 channel = tune & 0xff;
-
-        IWL_DEBUG_INFO("Tune request to:%d channel:%d\n", phymode, channel);
-
-        mutex_lock(&priv->mutex);
-        if ((le16_to_cpu(priv->staging_rxon.channel) != channel) ||
-            (priv->phymode != phymode)) {
-                const struct iwl4965_channel_info *ch_info;
-
-                ch_info = iwl4965_get_channel_info(priv, phymode, channel);
-                if (!ch_info) {
-                        IWL_WARNING("Requested invalid phymode/channel "
-                                    "combination: %d %d\n", phymode, channel);
-                        mutex_unlock(&priv->mutex);
-                        return -EINVAL;
-                }
-
-                /* Cancel any currently running scans... */
-                if (iwl4965_scan_cancel_timeout(priv, 100))
-                        IWL_WARNING("Could not cancel scan.\n");
-                else {
-                        IWL_DEBUG_INFO("Committing phymode and "
-                                       "rxon.channel = %d %d\n",
-                                       phymode, channel);
-
-                        iwl4965_set_rxon_channel(priv, phymode, channel);
-                        iwl4965_set_flags_for_phymode(priv, phymode);
-
-                        iwl4965_set_rate(priv);
-                        iwl4965_commit_rxon(priv);
-                }
-        }
-        mutex_unlock(&priv->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(tune, S_IWUSR | S_IRUGO, show_tune, store_tune);
-
 #ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT
 
 static ssize_t show_measurement(struct device *d,
                                 struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
         struct iwl4965_spectrum_notification measure_report;
         u32 size = sizeof(measure_report), len = 0, ofs = 0;
         u8 *data = (u8 *) & measure_report;
@@ -8594,7 +7313,7 @@ static ssize_t store_measurement(struct device *d,
                                  struct device_attribute *attr,
                                  const char *buf, size_t count)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
         struct ieee80211_measurement_params params = {
                 .channel = le16_to_cpu(priv->active_rxon.channel),
                 .start_time = cpu_to_le64(priv->last_tsf),
@@ -8633,7 +7352,7 @@ static ssize_t store_retry_rate(struct device *d,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
 
         priv->retry_rate = simple_strtoul(buf, NULL, 0);
         if (priv->retry_rate <= 0)
@@ -8645,7 +7364,7 @@ static ssize_t store_retry_rate(struct device *d,
 static ssize_t show_retry_rate(struct device *d,
                                struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
         return sprintf(buf, "%d", priv->retry_rate);
 }
 
@@ -8656,14 +7375,14 @@ static ssize_t store_power_level(struct device *d,
                                  struct device_attribute *attr,
                                  const char *buf, size_t count)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
         int rc;
         int mode;
 
         mode = simple_strtoul(buf, NULL, 0);
         mutex_lock(&priv->mutex);
 
-        if (!iwl4965_is_ready(priv)) {
+        if (!iwl_is_ready(priv)) {
                 rc = -EAGAIN;
                 goto out;
         }
@@ -8710,7 +7429,7 @@ static const s32 period_duration[] = {
 static ssize_t show_power_level(struct device *d,
                                 struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
         int level = IWL_POWER_LEVEL(priv->power_mode);
         char *p = buf;
 
@@ -8745,73 +7464,8 @@ static DEVICE_ATTR(power_level, S_IWUSR | S_IRUSR, show_power_level,
 static ssize_t show_channels(struct device *d,
                              struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
-        int len = 0, i;
-        struct ieee80211_channel *channels = NULL;
-        const struct ieee80211_hw_mode *hw_mode = NULL;
-        int count = 0;
-
-        if (!iwl4965_is_ready(priv))
-                return -EAGAIN;
-
-        hw_mode = iwl4965_get_hw_mode(priv, MODE_IEEE80211G);
-        if (!hw_mode)
-                hw_mode = iwl4965_get_hw_mode(priv, MODE_IEEE80211B);
-        if (hw_mode) {
-                channels = hw_mode->channels;
-                count = hw_mode->num_channels;
-        }
-
-        len +=
-            sprintf(&buf[len],
-                    "Displaying %d channels in 2.4GHz band "
-                    "(802.11bg):\n", count);
-
-        for (i = 0; i < count; i++)
-                len += sprintf(&buf[len], "%d: %ddBm: BSS%s%s, %s.\n",
-                               channels[i].chan,
-                               channels[i].power_level,
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_RADAR_DETECT ?
-                               " (IEEE 802.11h required)" : "",
-                               (!(channels[i].flag & IEEE80211_CHAN_W_IBSS)
-                                || (channels[i].
-                                    flag &
-                                    IEEE80211_CHAN_W_RADAR_DETECT)) ? "" :
-                               ", IBSS",
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_ACTIVE_SCAN ?
-                               "active/passive" : "passive only");
-
-        hw_mode = iwl4965_get_hw_mode(priv, MODE_IEEE80211A);
-        if (hw_mode) {
-                channels = hw_mode->channels;
-                count = hw_mode->num_channels;
-        } else {
-                channels = NULL;
-                count = 0;
-        }
-
-        len += sprintf(&buf[len], "Displaying %d channels in 5.2GHz band "
-                       "(802.11a):\n", count);
-
-        for (i = 0; i < count; i++)
-                len += sprintf(&buf[len], "%d: %ddBm: BSS%s%s, %s.\n",
-                               channels[i].chan,
-                               channels[i].power_level,
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_RADAR_DETECT ?
-                               " (IEEE 802.11h required)" : "",
-                               (!(channels[i].flag & IEEE80211_CHAN_W_IBSS)
-                                || (channels[i].
-                                    flag &
-                                    IEEE80211_CHAN_W_RADAR_DETECT)) ? "" :
-                               ", IBSS",
-                               channels[i].
-                               flag & IEEE80211_CHAN_W_ACTIVE_SCAN ?
-                               "active/passive" : "passive only");
-
-        return len;
+        /* all this shit doesn't belong into sysfs anyway */
+        return 0;
 }
 
 static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);
@@ -8819,17 +7473,17 @@ static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);
 static ssize_t show_statistics(struct device *d,
                                struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
         u32 size = sizeof(struct iwl4965_notif_statistics);
         u32 len = 0, ofs = 0;
         u8 *data = (u8 *) & priv->statistics;
         int rc = 0;
 
-        if (!iwl4965_is_alive(priv))
+        if (!iwl_is_alive(priv))
                 return -EAGAIN;
 
         mutex_lock(&priv->mutex);
-        rc = iwl4965_send_statistics_request(priv);
+        rc = iwl_send_statistics_request(priv, 0);
         mutex_unlock(&priv->mutex);
 
         if (rc) {
@@ -8857,9 +7511,9 @@ static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL);
 static ssize_t show_antenna(struct device *d,
                             struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
 
-        if (!iwl4965_is_alive(priv))
+        if (!iwl_is_alive(priv))
                 return -EAGAIN;
 
         return sprintf(buf, "%d\n", priv->antenna);
@@ -8870,7 +7524,7 @@ static ssize_t store_antenna(struct device *d,
                              const char *buf, size_t count)
 {
         int ant;
-        struct iwl4965_priv *priv = dev_get_drvdata(d);
+        struct iwl_priv *priv = dev_get_drvdata(d);
 
         if (count == 0)
                 return 0;
@@ -8895,8 +7549,8 @@ static DEVICE_ATTR(antenna, S_IWUSR | S_IRUGO, show_antenna, store_antenna);
 static ssize_t show_status(struct device *d,
                            struct device_attribute *attr, char *buf)
 {
-        struct iwl4965_priv *priv = (struct iwl4965_priv *)d->driver_data;
-        if (!iwl4965_is_alive(priv))
+        struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
+        if (!iwl_is_alive(priv))
                 return -EAGAIN;
         return sprintf(buf, "0x%08x\n", (int)priv->status);
 }
@@ -8910,7 +7564,7 @@ static ssize_t dump_error_log(struct device *d,
         char *p = (char *)buf;
 
         if (p[0] == '1')
-                iwl4965_dump_nic_error_log((struct iwl4965_priv *)d->driver_data);
+                iwl4965_dump_nic_error_log((struct iwl_priv *)d->driver_data);
 
         return strnlen(buf, count);
 }
@@ -8924,7 +7578,7 @@ static ssize_t dump_event_log(struct device *d,
         char *p = (char *)buf;
 
         if (p[0] == '1')
-                iwl4965_dump_nic_event_log((struct iwl4965_priv *)d->driver_data);
+                iwl4965_dump_nic_event_log((struct iwl_priv *)d->driver_data);
 
         return strnlen(buf, count);
 }
@@ -8937,7 +7591,7 @@ static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
  *
  *****************************************************************************/
 
-static void iwl4965_setup_deferred_work(struct iwl4965_priv *priv)
+static void iwl4965_setup_deferred_work(struct iwl_priv *priv)
 {
         priv->workqueue = create_workqueue(DRV_NAME);
 
@@ -8962,7 +7616,7 @@ static void iwl4965_setup_deferred_work(struct iwl4965_priv *priv)
                      iwl4965_irq_tasklet, (unsigned long)priv);
 }
 
-static void iwl4965_cancel_deferred_work(struct iwl4965_priv *priv)
+static void iwl4965_cancel_deferred_work(struct iwl_priv *priv)
 {
         iwl4965_hw_cancel_deferred_work(priv);
 
@@ -8985,12 +7639,10 @@ static struct attribute *iwl4965_sysfs_entries[] = {
 #endif
         &dev_attr_power_level.attr,
         &dev_attr_retry_rate.attr,
-        &dev_attr_rf_kill.attr,
         &dev_attr_rs_window.attr,
         &dev_attr_statistics.attr,
         &dev_attr_status.attr,
         &dev_attr_temperature.attr,
-        &dev_attr_tune.attr,
         &dev_attr_tx_power.attr,
 
         NULL
@@ -9011,6 +7663,7 @@ static struct ieee80211_ops iwl4965_hw_ops = {
         .config_interface = iwl4965_mac_config_interface,
         .configure_filter = iwl4965_configure_filter,
         .set_key = iwl4965_mac_set_key,
+        .update_tkip_key = iwl4965_mac_update_tkip_key,
         .get_stats = iwl4965_mac_get_stats,
         .get_tx_stats = iwl4965_mac_get_tx_stats,
         .conf_tx = iwl4965_mac_conf_tx,
@@ -9019,12 +7672,7 @@ static struct ieee80211_ops iwl4965_hw_ops = {
         .beacon_update = iwl4965_mac_beacon_update,
         .bss_info_changed = iwl4965_bss_info_changed,
 #ifdef CONFIG_IWL4965_HT
-        .conf_ht = iwl4965_mac_conf_ht,
         .ampdu_action = iwl4965_mac_ampdu_action,
-#ifdef CONFIG_IWL4965_HT_AGG
-        .ht_tx_agg_start = iwl4965_mac_ht_tx_agg_start,
-        .ht_tx_agg_stop = iwl4965_mac_ht_tx_agg_stop,
-#endif  /* CONFIG_IWL4965_HT_AGG */
 #endif  /* CONFIG_IWL4965_HT */
         .hw_scan = iwl4965_mac_hw_scan
 };
@@ -9032,85 +7680,45 @@ static struct ieee80211_ops iwl4965_hw_ops = {
 static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int err = 0;
-        struct iwl4965_priv *priv;
+        struct iwl_priv *priv;
         struct ieee80211_hw *hw;
-        int i;
+        struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
+        unsigned long flags;
         DECLARE_MAC_BUF(mac);
 
+        /************************
+         * 1. Allocating HW data
+         ************************/
+
         /* Disabling hardware scan means that mac80211 will perform scans
          * "the hard way", rather than using device's scan. */
-        if (iwl4965_param_disable_hw_scan) {
+        if (cfg->mod_params->disable_hw_scan) {
                 IWL_DEBUG_INFO("Disabling hw_scan\n");
                 iwl4965_hw_ops.hw_scan = NULL;
         }
 
-        if ((iwl4965_param_queues_num > IWL_MAX_NUM_QUEUES) ||
-            (iwl4965_param_queues_num < IWL_MIN_NUM_QUEUES)) {
-                IWL_ERROR("invalid queues_num, should be between %d and %d\n",
-                          IWL_MIN_NUM_QUEUES, IWL_MAX_NUM_QUEUES);
-                err = -EINVAL;
-                goto out;
-        }
-
-        /* mac80211 allocates memory for this device instance, including
-         *   space for this driver's private structure */
-        hw = ieee80211_alloc_hw(sizeof(struct iwl4965_priv), &iwl4965_hw_ops);
-        if (hw == NULL) {
-                IWL_ERROR("Can not allocate network device\n");
+        hw = iwl_alloc_all(cfg, &iwl4965_hw_ops);
+        if (!hw) {
                 err = -ENOMEM;
                 goto out;
         }
-        SET_IEEE80211_DEV(hw, &pdev->dev);
+        priv = hw->priv;
+        /* At this point both hw and priv are allocated. */
 
-        hw->rate_control_algorithm = "iwl-4965-rs";
+        SET_IEEE80211_DEV(hw, &pdev->dev);
 
         IWL_DEBUG_INFO("*** LOAD DRIVER ***\n");
-        priv = hw->priv;
-        priv->hw = hw;
-
+        priv->cfg = cfg;
         priv->pci_dev = pdev;
-        priv->antenna = (enum iwl4965_antenna)iwl4965_param_antenna;
-#ifdef CONFIG_IWL4965_DEBUG
-        iwl4965_debug_level = iwl4965_param_debug;
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        iwl_debug_level = priv->cfg->mod_params->debug;
         atomic_set(&priv->restrict_refcnt, 0);
 #endif
-        priv->retry_rate = 1;
-
-        priv->ibss_beacon = NULL;
-
-        /* Tell mac80211 and its clients (e.g. Wireless Extensions)
-         *   the range of signal quality values that we'll provide.
-         * Negative values for level/noise indicate that we'll provide dBm.
-         * For WE, at least, non-0 values here *enable* display of values
-         *   in app (iwconfig). */
-        hw->max_rssi = -20;     /* signal level, negative indicates dBm */
-        hw->max_noise = -20;    /* noise level, negative indicates dBm */
-        hw->max_signal = 100;   /* link quality indication (%) */
 
-        /* Tell mac80211 our Tx characteristics */
-        hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE;
-
-        /* Default value; 4 EDCA QOS priorities */
-        hw->queues = 4;
-#ifdef CONFIG_IWL4965_HT
-#ifdef CONFIG_IWL4965_HT_AGG
-        /* Enhanced value; more queues, to support 11n aggregation */
-        hw->queues = 16;
-#endif /* CONFIG_IWL4965_HT_AGG */
-#endif /* CONFIG_IWL4965_HT */
-
-        spin_lock_init(&priv->lock);
-        spin_lock_init(&priv->power_data.lock);
-        spin_lock_init(&priv->sta_lock);
-        spin_lock_init(&priv->hcmd_lock);
-        spin_lock_init(&priv->lq_mngr.lock);
-
-        for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++)
-                INIT_LIST_HEAD(&priv->ibss_mac_hash[i]);
-
-        INIT_LIST_HEAD(&priv->free_frames);
-
-        mutex_init(&priv->mutex);
+        /**************************
+         * 2. Initializing PCI bus
+         **************************/
         if (pci_enable_device(pdev)) {
                 err = -ENODEV;
                 goto out_ieee80211_free_hw;
@@ -9118,31 +7726,28 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
         pci_set_master(pdev);
 
-        /* Clear the driver's (not device's) station table */
-        iwl4965_clear_stations_table(priv);
-
-        priv->data_retry_limit = -1;
-        priv->ieee_channels = NULL;
-        priv->ieee_rates = NULL;
-        priv->phymode = -1;
-
         err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         if (!err)
                 err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
-        if (err) {
-                printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n");
-                goto out_pci_disable_device;
+                if (err) {
+                        printk(KERN_WARNING DRV_NAME
+                                ": No suitable DMA available.\n");
+                        goto out_pci_disable_device;
         }
 
-        pci_set_drvdata(pdev, priv);
         err = pci_request_regions(pdev, DRV_NAME);
         if (err)
                 goto out_pci_disable_device;
 
+        pci_set_drvdata(pdev, priv);
+
         /* We disable the RETRY_TIMEOUT register (0x41) to keep
          * PCI Tx retries from interfering with C3 CPU state */
         pci_write_config_byte(pdev, 0x41, 0x00);
 
+        /***********************
+         * 3. Read REV register
+         ***********************/
         priv->hw_base = pci_iomap(pdev, 0, 0);
         if (!priv->hw_base) {
                 err = -ENODEV;
@@ -9150,132 +7755,112 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         }
 
         IWL_DEBUG_INFO("pci_resource_len = 0x%08llx\n",
-                        (unsigned long long) pci_resource_len(pdev, 0));
+                (unsigned long long) pci_resource_len(pdev, 0));
         IWL_DEBUG_INFO("pci_resource_base = %p\n", priv->hw_base);
 
-        /* Initialize module parameter values here */
+        printk(KERN_INFO DRV_NAME
+                ": Detected Intel Wireless WiFi Link %s\n", priv->cfg->name);
 
-        /* Disable radio (SW RF KILL) via parameter when loading driver */
-        if (iwl4965_param_disable) {
-                set_bit(STATUS_RF_KILL_SW, &priv->status);
-                IWL_DEBUG_INFO("Radio disabled.\n");
+        /*****************
+         * 4. Read EEPROM
+         *****************/
+        /* nic init */
+        iwl_set_bit(priv, CSR_GIO_CHICKEN_BITS,
+                CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
+
+        iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+        err = iwl_poll_bit(priv, CSR_GP_CNTRL,
+                CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
+        if (err < 0) {
+                IWL_DEBUG_INFO("Failed to init the card\n");
+                goto out_iounmap;
         }
+        /* Read the EEPROM */
+        err = iwl_eeprom_init(priv);
+        if (err) {
+                IWL_ERROR("Unable to init EEPROM\n");
+                goto out_iounmap;
+        }
+        /* MAC Address location in EEPROM same for 3945/4965 */
+        iwl_eeprom_get_mac(priv, priv->mac_addr);
+        IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr));
+        SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
 
-        priv->iw_mode = IEEE80211_IF_TYPE_STA;
-
-        priv->ps_mode = 0;
-        priv->use_ant_b_for_management_frame = 1; /* start with ant B */
-        priv->valid_antenna = 0x7;      /* assume all 3 connected */
-        priv->ps_mode = IWL_MIMO_PS_NONE;
-
-        /* Choose which receivers/antennas to use */
-        iwl4965_set_rxon_chain(priv);
-
-        printk(KERN_INFO DRV_NAME
-               ": Detected Intel Wireless WiFi Link 4965AGN\n");
-
+        /************************
+         * 5. Setup HW constants
+         ************************/
         /* Device-specific setup */
-        if (iwl4965_hw_set_hw_setting(priv)) {
-                IWL_ERROR("failed to set hw settings\n");
+        if (priv->cfg->ops->lib->set_hw_params(priv)) {
+                IWL_ERROR("failed to set hw parameters\n");
                 goto out_iounmap;
         }
 
-#ifdef CONFIG_IWL4965_QOS
-        if (iwl4965_param_qos_enable)
-                priv->qos_data.qos_enable = 1;
+        /*******************
+         * 6. Setup hw/priv
+         *******************/
 
-        iwl4965_reset_qos(priv);
+        err = iwl_setup(priv);
+        if (err)
+                goto out_unset_hw_params;
+        /* At this point both hw and priv are initialized. */
 
-        priv->qos_data.qos_active = 0;
-        priv->qos_data.qos_cap.val = 0;
-#endif /* CONFIG_IWL4965_QOS */
+        /**********************************
+         * 7. Initialize module parameters
+         **********************************/
 
-        iwl4965_set_rxon_channel(priv, MODE_IEEE80211G, 6);
-        iwl4965_setup_deferred_work(priv);
-        iwl4965_setup_rx_handlers(priv);
+        /* Disable radio (SW RF KILL) via parameter when loading driver */
+        if (priv->cfg->mod_params->disable) {
+                set_bit(STATUS_RF_KILL_SW, &priv->status);
+                IWL_DEBUG_INFO("Radio disabled.\n");
+        }
 
-        priv->rates_mask = IWL_RATES_MASK;
-        /* If power management is turned on, default to AC mode */
-        priv->power_mode = IWL_POWER_AC;
-        priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
+        if (priv->cfg->mod_params->enable_qos)
+                priv->qos_data.qos_enable = 1;
 
+        /********************
+         * 8. Setup services
+         ********************/
+        spin_lock_irqsave(&priv->lock, flags);
         iwl4965_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         err = sysfs_create_group(&pdev->dev.kobj, &iwl4965_attribute_group);
         if (err) {
                 IWL_ERROR("failed to create sysfs device attributes\n");
-                goto out_release_irq;
-        }
-
-        /* nic init */
-        iwl4965_set_bit(priv, CSR_GIO_CHICKEN_BITS,
-                    CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
-
-        iwl4965_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-        err = iwl4965_poll_bit(priv, CSR_GP_CNTRL,
-                          CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                          CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
-        if (err < 0) {
-                IWL_DEBUG_INFO("Failed to init the card\n");
-                goto out_remove_sysfs;
-        }
-        /* Read the EEPROM */
-        err = iwl4965_eeprom_init(priv);
-        if (err) {
-                IWL_ERROR("Unable to init EEPROM\n");
-                goto out_remove_sysfs;
+                goto out_unset_hw_params;
         }
-        /* MAC Address location in EEPROM same for 3945/4965 */
-        get_eeprom_mac(priv, priv->mac_addr);
-        IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr));
-        SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
 
-        err = iwl4965_init_channel_map(priv);
+        err = iwl_dbgfs_register(priv, DRV_NAME);
         if (err) {
-                IWL_ERROR("initializing regulatory failed: %d\n", err);
+                IWL_ERROR("failed to create debugfs files\n");
                 goto out_remove_sysfs;
         }
 
-        err = iwl4965_init_geos(priv);
-        if (err) {
-                IWL_ERROR("initializing geos failed: %d\n", err);
-                goto out_free_channel_map;
-        }
-        iwl4965_reset_channel_flag(priv);
-
-        iwl4965_rate_control_register(priv->hw);
-        err = ieee80211_register_hw(priv->hw);
-        if (err) {
-                IWL_ERROR("Failed to register network device (error %d)\n", err);
-                goto out_free_geos;
-        }
+        iwl4965_setup_deferred_work(priv);
+        iwl4965_setup_rx_handlers(priv);
 
-        priv->hw->conf.beacon_int = 100;
-        priv->mac80211_registered = 1;
+        /********************
+         * 9. Conclude
+         ********************/
         pci_save_state(pdev);
         pci_disable_device(pdev);
 
+        /* notify iwlcore to init */
+        iwlcore_low_level_notify(priv, IWLCORE_INIT_EVT);
         return 0;
 
- out_free_geos:
-        iwl4965_free_geos(priv);
- out_free_channel_map:
-        iwl4965_free_channel_map(priv);
  out_remove_sysfs:
         sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group);
-
- out_release_irq:
-        destroy_workqueue(priv->workqueue);
-        priv->workqueue = NULL;
-        iwl4965_unset_hw_setting(priv);
-
+ out_unset_hw_params:
+        iwl4965_unset_hw_params(priv);
  out_iounmap:
         pci_iounmap(pdev, priv->hw_base);
  out_pci_release_regions:
         pci_release_regions(pdev);
+        pci_set_drvdata(pdev, NULL);
  out_pci_disable_device:
         pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
  out_ieee80211_free_hw:
         ieee80211_free_hw(priv->hw);
  out:
@@ -9284,19 +7869,34 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
 static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
 {
-        struct iwl4965_priv *priv = pci_get_drvdata(pdev);
+        struct iwl_priv *priv = pci_get_drvdata(pdev);
         struct list_head *p, *q;
         int i;
+        unsigned long flags;
 
         if (!priv)
                 return;
 
         IWL_DEBUG_INFO("*** UNLOAD DRIVER ***\n");
 
+        if (priv->mac80211_registered) {
+                ieee80211_unregister_hw(priv->hw);
+                priv->mac80211_registered = 0;
+        }
+
         set_bit(STATUS_EXIT_PENDING, &priv->status);
 
         iwl4965_down(priv);
 
+        /* make sure we flush any pending irq or
+         * tasklet for the driver
+         */
+        spin_lock_irqsave(&priv->lock, flags);
+        iwl4965_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        iwl_synchronize_irq(priv);
+
         /* Free MAC hash list for ADHOC */
         for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++) {
                 list_for_each_safe(p, q, &priv->ibss_mac_hash[i]) {
@@ -9305,6 +7905,8 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
                 }
         }
 
+        iwlcore_low_level_notify(priv, IWLCORE_REMOVE_EVT);
+        iwl_dbgfs_unregister(priv);
         sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group);
 
         iwl4965_dealloc_ucode_pci(priv);
@@ -9313,13 +7915,9 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
                 iwl4965_rx_queue_free(priv, &priv->rxq);
         iwl4965_hw_txq_ctx_free(priv);
 
-        iwl4965_unset_hw_setting(priv);
-        iwl4965_clear_stations_table(priv);
+        iwl4965_unset_hw_params(priv);
+        iwlcore_clear_stations_table(priv);
 
-        if (priv->mac80211_registered) {
-                ieee80211_unregister_hw(priv->hw);
-                iwl4965_rate_control_unregister(priv->hw);
-        }
 
         /*netif_stop_queue(dev); */
         flush_workqueue(priv->workqueue);
@@ -9335,7 +7933,7 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 
-        iwl4965_free_channel_map(priv);
+        iwl_free_channel_map(priv);
         iwl4965_free_geos(priv);
 
         if (priv->ibss_beacon)
@@ -9348,7 +7946,7 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
 
 static int iwl4965_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
-        struct iwl4965_priv *priv = pci_get_drvdata(pdev);
+        struct iwl_priv *priv = pci_get_drvdata(pdev);
 
         if (priv->is_open) {
                 set_bit(STATUS_IN_SUSPEND, &priv->status);
@@ -9363,7 +7961,7 @@ static int iwl4965_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 
 static int iwl4965_pci_resume(struct pci_dev *pdev)
 {
-        struct iwl4965_priv *priv = pci_get_drvdata(pdev);
+        struct iwl_priv *priv = pci_get_drvdata(pdev);
 
         pci_set_power_state(pdev, PCI_D0);
 
@@ -9382,9 +7980,17 @@ static int iwl4965_pci_resume(struct pci_dev *pdev)
  *
  *****************************************************************************/
 
-static struct pci_driver iwl4965_driver = {
+/* Hardware specific file defines the PCI IDs table for that hardware module */
+static struct pci_device_id iwl_hw_card_ids[] = {
+        {IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)},
+        {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)},
+        {0}
+};
+MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
+
+static struct pci_driver iwl_driver = {
         .name = DRV_NAME,
-        .id_table = iwl4965_hw_card_ids,
+        .id_table = iwl_hw_card_ids,
         .probe = iwl4965_pci_probe,
         .remove = __devexit_p(iwl4965_pci_remove),
 #ifdef CONFIG_PM
@@ -9399,51 +8005,45 @@ static int __init iwl4965_init(void)
         int ret;
         printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
         printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
-        ret = pci_register_driver(&iwl4965_driver);
+
+        ret = iwl4965_rate_control_register();
         if (ret) {
-                IWL_ERROR("Unable to initialize PCI module\n");
+                IWL_ERROR("Unable to register rate control algorithm: %d\n", ret);
                 return ret;
         }
-#ifdef CONFIG_IWL4965_DEBUG
-        ret = driver_create_file(&iwl4965_driver.driver, &driver_attr_debug_level);
+
+        ret = pci_register_driver(&iwl_driver);
+        if (ret) {
+                IWL_ERROR("Unable to initialize PCI module\n");
+                goto error_register;
+        }
+#ifdef CONFIG_IWLWIFI_DEBUG
+        ret = driver_create_file(&iwl_driver.driver, &driver_attr_debug_level);
         if (ret) {
                 IWL_ERROR("Unable to create driver sysfs file\n");
-                pci_unregister_driver(&iwl4965_driver);
-                return ret;
+                goto error_debug;
         }
 #endif
 
         return ret;
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+error_debug:
+        pci_unregister_driver(&iwl_driver);
+#endif
+error_register:
+        iwl4965_rate_control_unregister();
+        return ret;
 }
 
 static void __exit iwl4965_exit(void)
 {
-#ifdef CONFIG_IWL4965_DEBUG
-        driver_remove_file(&iwl4965_driver.driver, &driver_attr_debug_level);
+#ifdef CONFIG_IWLWIFI_DEBUG
+        driver_remove_file(&iwl_driver.driver, &driver_attr_debug_level);
 #endif
-        pci_unregister_driver(&iwl4965_driver);
-}
-
-module_param_named(antenna, iwl4965_param_antenna, int, 0444);
-MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");
-module_param_named(disable, iwl4965_param_disable, int, 0444);
-MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
-module_param_named(hwcrypto, iwl4965_param_hwcrypto, int, 0444);
-MODULE_PARM_DESC(hwcrypto,
-                 "using hardware crypto engine (default 0 [software])\n");
-module_param_named(debug, iwl4965_param_debug, int, 0444);
-MODULE_PARM_DESC(debug, "debug output mask");
-module_param_named(disable_hw_scan, iwl4965_param_disable_hw_scan, int, 0444);
-MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");
-
-module_param_named(queues_num, iwl4965_param_queues_num, int, 0444);
-MODULE_PARM_DESC(queues_num, "number of hw queues.");
-
-/* QoS */
-module_param_named(qos_enable, iwl4965_param_qos_enable, int, 0444);
-MODULE_PARM_DESC(qos_enable, "enable all QoS functionality");
-module_param_named(amsdu_size_8K, iwl4965_param_amsdu_size_8K, int, 0444);
-MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");
+        pci_unregister_driver(&iwl_driver);
+        iwl4965_rate_control_unregister();
+}
 
 module_exit(iwl4965_exit);
 module_init(iwl4965_init);
diff --git a/drivers/net/wireless/libertas/11d.c b/drivers/net/wireless/libertas/11d.c
index 5e10ce0d351c..4bc46a60ae2f 100644
--- a/drivers/net/wireless/libertas/11d.c
+++ b/drivers/net/wireless/libertas/11d.c
@@ -79,7 +79,7 @@ static u8 *lbs_code_2_region(u8 code)
  *  @param nrchan   number of channels
  *  @return           the nrchan-th chan number
 */
-static u8 lbs_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 *chan)
+static u8 lbs_get_chan_11d(u8 firstchan, u8 nrchan, u8 *chan)
 /*find the nrchan-th chan after the firstchan*/
 {
         u8 i;
@@ -134,7 +134,7 @@ static u8 lbs_channel_known_11d(u8 chan,
         return 0;
 }
 
-u32 lbs_chan_2_freq(u8 chan, u8 band)
+u32 lbs_chan_2_freq(u8 chan)
 {
         struct chan_freq_power *cf;
         u16 i;
@@ -264,7 +264,7 @@ static void lbs_generate_parsed_region_chan_11d(struct region_channel *region_ch
  *  @param chan                 chan
  *  @return                     TRUE;FALSE
 */
-static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan)
+static u8 lbs_region_chan_supported_11d(u8 region, u8 chan)
 {
         struct chan_freq_power *cfp;
         int cfp_no;
@@ -273,7 +273,7 @@ static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan)
 
         lbs_deb_enter(LBS_DEB_11D);
 
-        cfp = lbs_get_region_cfp_table(region, band, &cfp_no);
+        cfp = lbs_get_region_cfp_table(region, &cfp_no);
         if (cfp == NULL)
                 return 0;
 
@@ -367,7 +367,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
                 for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) {
                         /*step4: channel is supported? */
 
-                        if (!lbs_get_chan_11d(band, firstchan, i, &curchan)) {
+                        if (!lbs_get_chan_11d(firstchan, i, &curchan)) {
                                 /* Chan is not found in UN table */
                                 lbs_deb_11d("chan is not supported: %d \n", i);
                                 break;
@@ -375,8 +375,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
 
                         lastchan = curchan;
 
-                        if (lbs_region_chan_supported_11d
-                            (region, band, curchan)) {
+                        if (lbs_region_chan_supported_11d(region, curchan)) {
                                 /*step5: Check if curchan is supported by mrvl in region */
                                 parsed_region_chan->chanpwr[idx].chan = curchan;
                                 parsed_region_chan->chanpwr[idx].pwr =
@@ -554,8 +553,7 @@ done:
  *  @param resp    pointer to command response buffer
  *  @return        0; -1
  */
-int lbs_ret_802_11d_domain_info(struct lbs_private *priv,
-                                 struct cmd_ds_command *resp)
+int lbs_ret_802_11d_domain_info(struct cmd_ds_command *resp)
 {
         struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;
         struct mrvlietypes_domainparamset *domain = &domaininfo->domain;
diff --git a/drivers/net/wireless/libertas/11d.h b/drivers/net/wireless/libertas/11d.h
index 811eea2cfba3..4f4f47f0f878 100644
--- a/drivers/net/wireless/libertas/11d.h
+++ b/drivers/net/wireless/libertas/11d.h
@@ -83,7 +83,7 @@ struct lbs_private;
 u8 lbs_get_scan_type_11d(u8 chan,
                           struct parsed_region_chan_11d *parsed_region_chan);
 
-u32 lbs_chan_2_freq(u8 chan, u8 band);
+u32 lbs_chan_2_freq(u8 chan);
 
 void lbs_init_11d(struct lbs_private *priv);
 
@@ -93,8 +93,7 @@ int lbs_cmd_802_11d_domain_info(struct lbs_private *priv,
                                  struct cmd_ds_command *cmd, u16 cmdno,
                                  u16 cmdOption);
 
-int lbs_ret_802_11d_domain_info(struct lbs_private *priv,
-                                 struct cmd_ds_command *resp);
+int lbs_ret_802_11d_domain_info(struct cmd_ds_command *resp);
 
 struct bss_descriptor;
 int lbs_parse_dnld_countryinfo_11d(struct lbs_private *priv,
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
index 0e2787691f96..f0724e31adfd 100644
--- a/drivers/net/wireless/libertas/Makefile
+++ b/drivers/net/wireless/libertas/Makefile
@@ -1,7 +1,7 @@
 libertas-objs := main.o wext.o \
                 rx.o tx.o cmd.o           \
                 cmdresp.o scan.o          \
-                join.o 11d.o              \
+                11d.o             \
                 debugfs.o         \
                 ethtool.o assoc.o
 
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 6a24ed6067e0..c9c3640ce9fb 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -1,14 +1,11 @@
 /* Copyright (C) 2006, Red Hat, Inc. */
 
-#include <linux/bitops.h>
-#include <net/ieee80211.h>
 #include <linux/etherdevice.h>
 
 #include "assoc.h"
-#include "join.h"
 #include "decl.h"
-#include "hostcmd.h"
 #include "host.h"
+#include "scan.h"
 #include "cmd.h"
 
 
@@ -17,6 +14,428 @@ static const u8 bssid_any[ETH_ALEN]  __attribute__ ((aligned (2))) =
 static const u8 bssid_off[ETH_ALEN]  __attribute__ ((aligned (2))) =
         { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
+/* The firmware needs certain bits masked out of the beacon-derviced capability
+ * field when associating/joining to BSSs.
+ */
+#define CAPINFO_MASK    (~(0xda00))
+
+
+
+/**
+ *  @brief Associate to a specific BSS discovered in a scan
+ *
+ *  @param priv      A pointer to struct lbs_private structure
+ *  @param pbssdesc  Pointer to the BSS descriptor to associate with.
+ *
+ *  @return          0-success, otherwise fail
+ */
+static int lbs_associate(struct lbs_private *priv,
+        struct assoc_request *assoc_req)
+{
+        int ret;
+
+        lbs_deb_enter(LBS_DEB_ASSOC);
+
+        ret = lbs_prepare_and_send_command(priv, CMD_802_11_AUTHENTICATE,
+                                    0, CMD_OPTION_WAITFORRSP,
+                                    0, assoc_req->bss.bssid);
+
+        if (ret)
+                goto done;
+
+        /* set preamble to firmware */
+        if ((priv->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) &&
+            (assoc_req->bss.capability & WLAN_CAPABILITY_SHORT_PREAMBLE))
+                priv->preamble = CMD_TYPE_SHORT_PREAMBLE;
+        else
+                priv->preamble = CMD_TYPE_LONG_PREAMBLE;
+
+        lbs_set_radio_control(priv);
+
+        ret = lbs_prepare_and_send_command(priv, CMD_802_11_ASSOCIATE,
+                                    0, CMD_OPTION_WAITFORRSP, 0, assoc_req);
+
+done:
+        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
+        return ret;
+}
+
+/**
+ *  @brief Join an adhoc network found in a previous scan
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param pbssdesc     Pointer to a BSS descriptor found in a previous scan
+ *                      to attempt to join
+ *
+ *  @return             0--success, -1--fail
+ */
+static int lbs_join_adhoc_network(struct lbs_private *priv,
+        struct assoc_request *assoc_req)
+{
+        struct bss_descriptor *bss = &assoc_req->bss;
+        int ret = 0;
+
+        lbs_deb_join("current SSID '%s', ssid length %u\n",
+                escape_essid(priv->curbssparams.ssid,
+                priv->curbssparams.ssid_len),
+                priv->curbssparams.ssid_len);
+        lbs_deb_join("requested ssid '%s', ssid length %u\n",
+                escape_essid(bss->ssid, bss->ssid_len),
+                bss->ssid_len);
+
+        /* check if the requested SSID is already joined */
+        if (priv->curbssparams.ssid_len &&
+            !lbs_ssid_cmp(priv->curbssparams.ssid,
+                        priv->curbssparams.ssid_len,
+                        bss->ssid, bss->ssid_len) &&
+            (priv->mode == IW_MODE_ADHOC) &&
+            (priv->connect_status == LBS_CONNECTED)) {
+                union iwreq_data wrqu;
+
+                lbs_deb_join("ADHOC_J_CMD: New ad-hoc SSID is the same as "
+                        "current, not attempting to re-join");
+
+                /* Send the re-association event though, because the association
+                 * request really was successful, even if just a null-op.
+                 */
+                memset(&wrqu, 0, sizeof(wrqu));
+                memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid,
+                       ETH_ALEN);
+                wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+                wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+                goto out;
+        }
+
+        /* Use shortpreamble only when both creator and card supports
+           short preamble */
+        if (!(bss->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) ||
+            !(priv->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)) {
+                lbs_deb_join("AdhocJoin: Long preamble\n");
+                priv->preamble = CMD_TYPE_LONG_PREAMBLE;
+        } else {
+                lbs_deb_join("AdhocJoin: Short preamble\n");
+                priv->preamble = CMD_TYPE_SHORT_PREAMBLE;
+        }
+
+        lbs_set_radio_control(priv);
+
+        lbs_deb_join("AdhocJoin: channel = %d\n", assoc_req->channel);
+        lbs_deb_join("AdhocJoin: band = %c\n", assoc_req->band);
+
+        priv->adhoccreate = 0;
+
+        ret = lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_JOIN,
+                                    0, CMD_OPTION_WAITFORRSP,
+                                    OID_802_11_SSID, assoc_req);
+
+out:
+        return ret;
+}
+
+/**
+ *  @brief Start an Adhoc Network
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param adhocssid    The ssid of the Adhoc Network
+ *  @return             0--success, -1--fail
+ */
+static int lbs_start_adhoc_network(struct lbs_private *priv,
+        struct assoc_request *assoc_req)
+{
+        int ret = 0;
+
+        priv->adhoccreate = 1;
+
+        if (priv->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) {
+                lbs_deb_join("AdhocStart: Short preamble\n");
+                priv->preamble = CMD_TYPE_SHORT_PREAMBLE;
+        } else {
+                lbs_deb_join("AdhocStart: Long preamble\n");
+                priv->preamble = CMD_TYPE_LONG_PREAMBLE;
+        }
+
+        lbs_set_radio_control(priv);
+
+        lbs_deb_join("AdhocStart: channel = %d\n", assoc_req->channel);
+        lbs_deb_join("AdhocStart: band = %d\n", assoc_req->band);
+
+        ret = lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_START,
+                                    0, CMD_OPTION_WAITFORRSP, 0, assoc_req);
+
+        return ret;
+}
+
+int lbs_stop_adhoc_network(struct lbs_private *priv)
+{
+        return lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_STOP,
+                                     0, CMD_OPTION_WAITFORRSP, 0, NULL);
+}
+
+static inline int match_bss_no_security(struct lbs_802_11_security *secinfo,
+                                        struct bss_descriptor *match_bss)
+{
+        if (!secinfo->wep_enabled  && !secinfo->WPAenabled
+            && !secinfo->WPA2enabled
+            && match_bss->wpa_ie[0] != MFIE_TYPE_GENERIC
+            && match_bss->rsn_ie[0] != MFIE_TYPE_RSN
+            && !(match_bss->capability & WLAN_CAPABILITY_PRIVACY))
+                return 1;
+        else
+                return 0;
+}
+
+static inline int match_bss_static_wep(struct lbs_802_11_security *secinfo,
+                                       struct bss_descriptor *match_bss)
+{
+        if (secinfo->wep_enabled && !secinfo->WPAenabled
+            && !secinfo->WPA2enabled
+            && (match_bss->capability & WLAN_CAPABILITY_PRIVACY))
+                return 1;
+        else
+                return 0;
+}
+
+static inline int match_bss_wpa(struct lbs_802_11_security *secinfo,
+                                struct bss_descriptor *match_bss)
+{
+        if (!secinfo->wep_enabled && secinfo->WPAenabled
+            && (match_bss->wpa_ie[0] == MFIE_TYPE_GENERIC)
+            /* privacy bit may NOT be set in some APs like LinkSys WRT54G
+            && (match_bss->capability & WLAN_CAPABILITY_PRIVACY) */
+           )
+                return 1;
+        else
+                return 0;
+}
+
+static inline int match_bss_wpa2(struct lbs_802_11_security *secinfo,
+                                 struct bss_descriptor *match_bss)
+{
+        if (!secinfo->wep_enabled && secinfo->WPA2enabled &&
+            (match_bss->rsn_ie[0] == MFIE_TYPE_RSN)
+            /* privacy bit may NOT be set in some APs like LinkSys WRT54G
+            (match_bss->capability & WLAN_CAPABILITY_PRIVACY) */
+           )
+                return 1;
+        else
+                return 0;
+}
+
+static inline int match_bss_dynamic_wep(struct lbs_802_11_security *secinfo,
+                                        struct bss_descriptor *match_bss)
+{
+        if (!secinfo->wep_enabled && !secinfo->WPAenabled
+            && !secinfo->WPA2enabled
+            && (match_bss->wpa_ie[0] != MFIE_TYPE_GENERIC)
+            && (match_bss->rsn_ie[0] != MFIE_TYPE_RSN)
+            && (match_bss->capability & WLAN_CAPABILITY_PRIVACY))
+                return 1;
+        else
+                return 0;
+}
+
+/**
+ *  @brief Check if a scanned network compatible with the driver settings
+ *
+ *   WEP     WPA     WPA2    ad-hoc  encrypt                      Network
+ * enabled enabled  enabled   AES     mode   privacy  WPA  WPA2  Compatible
+ *    0       0        0       0      NONE      0      0    0   yes No security
+ *    1       0        0       0      NONE      1      0    0   yes Static WEP
+ *    0       1        0       0       x        1x     1    x   yes WPA
+ *    0       0        1       0       x        1x     x    1   yes WPA2
+ *    0       0        0       1      NONE      1      0    0   yes Ad-hoc AES
+ *    0       0        0       0     !=NONE     1      0    0   yes Dynamic WEP
+ *
+ *
+ *  @param priv A pointer to struct lbs_private
+ *  @param index   Index in scantable to check against current driver settings
+ *  @param mode    Network mode: Infrastructure or IBSS
+ *
+ *  @return        Index in scantable, or error code if negative
+ */
+static int is_network_compatible(struct lbs_private *priv,
+                                 struct bss_descriptor *bss, uint8_t mode)
+{
+        int matched = 0;
+
+        lbs_deb_enter(LBS_DEB_SCAN);
+
+        if (bss->mode != mode)
+                goto done;
+
+        matched = match_bss_no_security(&priv->secinfo, bss);
+        if (matched)
+                goto done;
+        matched = match_bss_static_wep(&priv->secinfo, bss);
+        if (matched)
+                goto done;
+        matched = match_bss_wpa(&priv->secinfo, bss);
+        if (matched) {
+                lbs_deb_scan("is_network_compatible() WPA: wpa_ie 0x%x "
+                             "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s "
+                             "privacy 0x%x\n", bss->wpa_ie[0], bss->rsn_ie[0],
+                             priv->secinfo.wep_enabled ? "e" : "d",
+                             priv->secinfo.WPAenabled ? "e" : "d",
+                             priv->secinfo.WPA2enabled ? "e" : "d",
+                             (bss->capability & WLAN_CAPABILITY_PRIVACY));
+                goto done;
+        }
+        matched = match_bss_wpa2(&priv->secinfo, bss);
+        if (matched) {
+                lbs_deb_scan("is_network_compatible() WPA2: wpa_ie 0x%x "
+                             "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s "
+                             "privacy 0x%x\n", bss->wpa_ie[0], bss->rsn_ie[0],
+                             priv->secinfo.wep_enabled ? "e" : "d",
+                             priv->secinfo.WPAenabled ? "e" : "d",
+                             priv->secinfo.WPA2enabled ? "e" : "d",
+                             (bss->capability & WLAN_CAPABILITY_PRIVACY));
+                goto done;
+        }
+        matched = match_bss_dynamic_wep(&priv->secinfo, bss);
+        if (matched) {
+                lbs_deb_scan("is_network_compatible() dynamic WEP: "
+                             "wpa_ie 0x%x wpa2_ie 0x%x privacy 0x%x\n",
+                             bss->wpa_ie[0], bss->rsn_ie[0],
+                             (bss->capability & WLAN_CAPABILITY_PRIVACY));
+                goto done;
+        }
+
+        /* bss security settings don't match those configured on card */
+        lbs_deb_scan("is_network_compatible() FAILED: wpa_ie 0x%x "
+                     "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s privacy 0x%x\n",
+                     bss->wpa_ie[0], bss->rsn_ie[0],
+                     priv->secinfo.wep_enabled ? "e" : "d",
+                     priv->secinfo.WPAenabled ? "e" : "d",
+                     priv->secinfo.WPA2enabled ? "e" : "d",
+                     (bss->capability & WLAN_CAPABILITY_PRIVACY));
+
+done:
+        lbs_deb_leave_args(LBS_DEB_SCAN, "matched: %d", matched);
+        return matched;
+}
+
+/**
+ *  @brief This function finds a specific compatible BSSID in the scan list
+ *
+ *  Used in association code
+ *
+ *  @param priv  A pointer to struct lbs_private
+ *  @param bssid    BSSID to find in the scan list
+ *  @param mode     Network mode: Infrastructure or IBSS
+ *
+ *  @return         index in BSSID list, or error return code (< 0)
+ */
+static struct bss_descriptor *lbs_find_bssid_in_list(struct lbs_private *priv,
+                                              uint8_t *bssid, uint8_t mode)
+{
+        struct bss_descriptor *iter_bss;
+        struct bss_descriptor *found_bss = NULL;
+
+        lbs_deb_enter(LBS_DEB_SCAN);
+
+        if (!bssid)
+                goto out;
+
+        lbs_deb_hex(LBS_DEB_SCAN, "looking for", bssid, ETH_ALEN);
+
+        /* Look through the scan table for a compatible match.  The loop will
+         *   continue past a matched bssid that is not compatible in case there
+         *   is an AP with multiple SSIDs assigned to the same BSSID
+         */
+        mutex_lock(&priv->lock);
+        list_for_each_entry(iter_bss, &priv->network_list, list) {
+                if (compare_ether_addr(iter_bss->bssid, bssid))
+                        continue; /* bssid doesn't match */
+                switch (mode) {
+                case IW_MODE_INFRA:
+                case IW_MODE_ADHOC:
+                        if (!is_network_compatible(priv, iter_bss, mode))
+                                break;
+                        found_bss = iter_bss;
+                        break;
+                default:
+                        found_bss = iter_bss;
+                        break;
+                }
+        }
+        mutex_unlock(&priv->lock);
+
+out:
+        lbs_deb_leave_args(LBS_DEB_SCAN, "found_bss %p", found_bss);
+        return found_bss;
+}
+
+/**
+ *  @brief This function finds ssid in ssid list.
+ *
+ *  Used in association code
+ *
+ *  @param priv  A pointer to struct lbs_private
+ *  @param ssid     SSID to find in the list
+ *  @param bssid    BSSID to qualify the SSID selection (if provided)
+ *  @param mode     Network mode: Infrastructure or IBSS
+ *
+ *  @return         index in BSSID list
+ */
+static struct bss_descriptor *lbs_find_ssid_in_list(struct lbs_private *priv,
+                                             uint8_t *ssid, uint8_t ssid_len,
+                                             uint8_t *bssid, uint8_t mode,
+                                             int channel)
+{
+        u32 bestrssi = 0;
+        struct bss_descriptor *iter_bss = NULL;
+        struct bss_descriptor *found_bss = NULL;
+        struct bss_descriptor *tmp_oldest = NULL;
+
+        lbs_deb_enter(LBS_DEB_SCAN);
+
+        mutex_lock(&priv->lock);
+
+        list_for_each_entry(iter_bss, &priv->network_list, list) {
+                if (!tmp_oldest ||
+                    (iter_bss->last_scanned < tmp_oldest->last_scanned))
+                        tmp_oldest = iter_bss;
+
+                if (lbs_ssid_cmp(iter_bss->ssid, iter_bss->ssid_len,
+                                 ssid, ssid_len) != 0)
+                        continue; /* ssid doesn't match */
+                if (bssid && compare_ether_addr(iter_bss->bssid, bssid) != 0)
+                        continue; /* bssid doesn't match */
+                if ((channel > 0) && (iter_bss->channel != channel))
+                        continue; /* channel doesn't match */
+
+                switch (mode) {
+                case IW_MODE_INFRA:
+                case IW_MODE_ADHOC:
+                        if (!is_network_compatible(priv, iter_bss, mode))
+                                break;
+
+                        if (bssid) {
+                                /* Found requested BSSID */
+                                found_bss = iter_bss;
+                                goto out;
+                        }
+
+                        if (SCAN_RSSI(iter_bss->rssi) > bestrssi) {
+                                bestrssi = SCAN_RSSI(iter_bss->rssi);
+                                found_bss = iter_bss;
+                        }
+                        break;
+                case IW_MODE_AUTO:
+                default:
+                        if (SCAN_RSSI(iter_bss->rssi) > bestrssi) {
+                                bestrssi = SCAN_RSSI(iter_bss->rssi);
+                                found_bss = iter_bss;
+                        }
+                        break;
+                }
+        }
+
+out:
+        mutex_unlock(&priv->lock);
+        lbs_deb_leave_args(LBS_DEB_SCAN, "found_bss %p", found_bss);
+        return found_bss;
+}
 
 static int assoc_helper_essid(struct lbs_private *priv,
                               struct assoc_request * assoc_req)
@@ -38,7 +457,7 @@ static int assoc_helper_essid(struct lbs_private *priv,
                       escape_essid(assoc_req->ssid, assoc_req->ssid_len));
         if (assoc_req->mode == IW_MODE_INFRA) {
                 lbs_send_specific_ssid_scan(priv, assoc_req->ssid,
-                        assoc_req->ssid_len, 0);
+                        assoc_req->ssid_len);
 
                 bss = lbs_find_ssid_in_list(priv, assoc_req->ssid,
                                 assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);
@@ -53,7 +472,7 @@ static int assoc_helper_essid(struct lbs_private *priv,
                  *   scan data will cause us to join a non-existant adhoc network
                  */
                 lbs_send_specific_ssid_scan(priv, assoc_req->ssid,
-                        assoc_req->ssid_len, 1);
+                        assoc_req->ssid_len);
 
                 /* Search for the requested SSID in the scan table */
                 bss = lbs_find_ssid_in_list(priv, assoc_req->ssid,
@@ -164,34 +583,6 @@ done:
         return ret;
 }
 
-
-int lbs_update_channel(struct lbs_private *priv)
-{
-        int ret;
-
-        /* the channel in f/w could be out of sync; get the current channel */
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        ret = lbs_get_channel(priv);
-        if (ret > 0) {
-                priv->curbssparams.channel = ret;
-                ret = 0;
-        }
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-void lbs_sync_channel(struct work_struct *work)
-{
-        struct lbs_private *priv = container_of(work, struct lbs_private,
-                sync_channel);
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-        if (lbs_update_channel(priv))
-                lbs_pr_info("Channel synchronization failed.");
-        lbs_deb_leave(LBS_DEB_ASSOC);
-}
-
 static int assoc_helper_channel(struct lbs_private *priv,
                                 struct assoc_request * assoc_req)
 {
@@ -279,13 +670,11 @@ static int assoc_helper_wep_keys(struct lbs_private *priv,
 
         /* enable/disable the MAC's WEP packet filter */
         if (assoc_req->secinfo.wep_enabled)
-                priv->currentpacketfilter |= CMD_ACT_MAC_WEP_ENABLE;
+                priv->mac_control |= CMD_ACT_MAC_WEP_ENABLE;
         else
-                priv->currentpacketfilter &= ~CMD_ACT_MAC_WEP_ENABLE;
+                priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;
 
-        ret = lbs_set_mac_packet_filter(priv);
-        if (ret)
-                goto out;
+        lbs_set_mac_control(priv);
 
         mutex_lock(&priv->lock);
 
@@ -315,9 +704,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv,
         memcpy(&priv->secinfo, &assoc_req->secinfo,
                 sizeof(struct lbs_802_11_security));
 
-        ret = lbs_set_mac_packet_filter(priv);
-        if (ret)
-                goto out;
+        lbs_set_mac_control(priv);
 
         /* If RSN is already enabled, don't try to enable it again, since
          * ENABLE_RSN resets internal state machines and will clobber the
@@ -360,11 +747,7 @@ static int assoc_helper_wpa_keys(struct lbs_private *priv,
 
         if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
                 clear_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
-                ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_KEY_MATERIAL,
-                                        CMD_ACT_SET,
-                                        CMD_OPTION_WAITFORRSP,
-                                        0, assoc_req);
+                ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
                 assoc_req->flags = flags;
         }
 
@@ -374,11 +757,7 @@ static int assoc_helper_wpa_keys(struct lbs_private *priv,
         if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
                 clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
 
-                ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_KEY_MATERIAL,
-                                        CMD_ACT_SET,
-                                        CMD_OPTION_WAITFORRSP,
-                                        0, assoc_req);
+                ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
                 assoc_req->flags = flags;
         }
 
@@ -413,11 +792,10 @@ static int should_deauth_infrastructure(struct lbs_private *priv,
 {
         int ret = 0;
 
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
         if (priv->connect_status != LBS_CONNECTED)
                 return 0;
 
+        lbs_deb_enter(LBS_DEB_ASSOC);
         if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
                 lbs_deb_assoc("Deauthenticating due to new SSID\n");
                 ret = 1;
@@ -456,7 +834,7 @@ static int should_deauth_infrastructure(struct lbs_private *priv,
 
 out:
         lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return 0;
+        return ret;
 }
 
 
@@ -489,6 +867,91 @@ static int should_stop_adhoc(struct lbs_private *priv,
 }
 
 
+/**
+ *  @brief This function finds the best SSID in the Scan List
+ *
+ *  Search the scan table for the best SSID that also matches the current
+ *   adapter network preference (infrastructure or adhoc)
+ *
+ *  @param priv  A pointer to struct lbs_private
+ *
+ *  @return         index in BSSID list
+ */
+static struct bss_descriptor *lbs_find_best_ssid_in_list(
+        struct lbs_private *priv, uint8_t mode)
+{
+        uint8_t bestrssi = 0;
+        struct bss_descriptor *iter_bss;
+        struct bss_descriptor *best_bss = NULL;
+
+        lbs_deb_enter(LBS_DEB_SCAN);
+
+        mutex_lock(&priv->lock);
+
+        list_for_each_entry(iter_bss, &priv->network_list, list) {
+                switch (mode) {
+                case IW_MODE_INFRA:
+                case IW_MODE_ADHOC:
+                        if (!is_network_compatible(priv, iter_bss, mode))
+                                break;
+                        if (SCAN_RSSI(iter_bss->rssi) <= bestrssi)
+                                break;
+                        bestrssi = SCAN_RSSI(iter_bss->rssi);
+                        best_bss = iter_bss;
+                        break;
+                case IW_MODE_AUTO:
+                default:
+                        if (SCAN_RSSI(iter_bss->rssi) <= bestrssi)
+                                break;
+                        bestrssi = SCAN_RSSI(iter_bss->rssi);
+                        best_bss = iter_bss;
+                        break;
+                }
+        }
+
+        mutex_unlock(&priv->lock);
+        lbs_deb_leave_args(LBS_DEB_SCAN, "best_bss %p", best_bss);
+        return best_bss;
+}
+
+/**
+ *  @brief Find the best AP
+ *
+ *  Used from association worker.
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param pSSID        A pointer to AP's ssid
+ *
+ *  @return             0--success, otherwise--fail
+ */
+static int lbs_find_best_network_ssid(struct lbs_private *priv,
+        uint8_t *out_ssid, uint8_t *out_ssid_len, uint8_t preferred_mode,
+        uint8_t *out_mode)
+{
+        int ret = -1;
+        struct bss_descriptor *found;
+
+        lbs_deb_enter(LBS_DEB_SCAN);
+
+        priv->scan_ssid_len = 0;
+        lbs_scan_networks(priv, 1);
+        if (priv->surpriseremoved)
+                goto out;
+
+        found = lbs_find_best_ssid_in_list(priv, preferred_mode);
+        if (found && (found->ssid_len > 0)) {
+                memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE);
+                *out_ssid_len = found->ssid_len;
+                *out_mode = found->mode;
+                ret = 0;
+        }
+
+out:
+        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
+        return ret;
+}
+
+
 void lbs_association_worker(struct work_struct *work)
 {
         struct lbs_private *priv = container_of(work, struct lbs_private,
@@ -643,17 +1106,11 @@ void lbs_association_worker(struct work_struct *work)
                 }
 
                 if (success) {
-                        lbs_deb_assoc("ASSOC: associated to '%s', %s\n",
-                                escape_essid(priv->curbssparams.ssid,
-                                             priv->curbssparams.ssid_len),
+                        lbs_deb_assoc("associated to %s\n",
                                 print_mac(mac, priv->curbssparams.bssid));
                         lbs_prepare_and_send_command(priv,
                                 CMD_802_11_RSSI,
                                 0, CMD_OPTION_WAITFORRSP, 0, NULL);
-
-                        lbs_prepare_and_send_command(priv,
-                                CMD_802_11_GET_LOG,
-                                0, CMD_OPTION_WAITFORRSP, 0, NULL);
                 } else {
                         ret = -1;
                 }
@@ -752,3 +1209,705 @@ struct assoc_request *lbs_get_association_request(struct lbs_private *priv)
         lbs_deb_leave(LBS_DEB_ASSOC);
         return assoc_req;
 }
+
+
+/**
+ *  @brief This function finds common rates between rate1 and card rates.
+ *
+ * It will fill common rates in rate1 as output if found.
+ *
+ * NOTE: Setting the MSB of the basic rates need to be taken
+ *   care, either before or after calling this function
+ *
+ *  @param priv     A pointer to struct lbs_private structure
+ *  @param rate1       the buffer which keeps input and output
+ *  @param rate1_size  the size of rate1 buffer; new size of buffer on return
+ *
+ *  @return            0 or -1
+ */
+static int get_common_rates(struct lbs_private *priv,
+        u8 *rates,
+        u16 *rates_size)
+{
+        u8 *card_rates = lbs_bg_rates;
+        size_t num_card_rates = sizeof(lbs_bg_rates);
+        int ret = 0, i, j;
+        u8 tmp[30];
+        size_t tmp_size = 0;
+
+        /* For each rate in card_rates that exists in rate1, copy to tmp */
+        for (i = 0; card_rates[i] && (i < num_card_rates); i++) {
+                for (j = 0; rates[j] && (j < *rates_size); j++) {
+                        if (rates[j] == card_rates[i])
+                                tmp[tmp_size++] = card_rates[i];
+                }
+        }
+
+        lbs_deb_hex(LBS_DEB_JOIN, "AP rates    ", rates, *rates_size);
+        lbs_deb_hex(LBS_DEB_JOIN, "card rates  ", card_rates, num_card_rates);
+        lbs_deb_hex(LBS_DEB_JOIN, "common rates", tmp, tmp_size);
+        lbs_deb_join("TX data rate 0x%02x\n", priv->cur_rate);
+
+        if (!priv->auto_rate) {
+                for (i = 0; i < tmp_size; i++) {
+                        if (tmp[i] == priv->cur_rate)
+                                goto done;
+                }
+                lbs_pr_alert("Previously set fixed data rate %#x isn't "
+                       "compatible with the network.\n", priv->cur_rate);
+                ret = -1;
+                goto done;
+        }
+        ret = 0;
+
+done:
+        memset(rates, 0, *rates_size);
+        *rates_size = min_t(int, tmp_size, *rates_size);
+        memcpy(rates, tmp, *rates_size);
+        return ret;
+}
+
+
+/**
+ *  @brief Sets the MSB on basic rates as the firmware requires
+ *
+ * Scan through an array and set the MSB for basic data rates.
+ *
+ *  @param rates     buffer of data rates
+ *  @param len       size of buffer
+ */
+static void lbs_set_basic_rate_flags(u8 *rates, size_t len)
+{
+        int i;
+
+        for (i = 0; i < len; i++) {
+                if (rates[i] == 0x02 || rates[i] == 0x04 ||
+                    rates[i] == 0x0b || rates[i] == 0x16)
+                        rates[i] |= 0x80;
+        }
+}
+
+/**
+ *  @brief Send Deauthentication Request
+ *
+ *  @param priv      A pointer to struct lbs_private structure
+ *  @return          0--success, -1--fail
+ */
+int lbs_send_deauthentication(struct lbs_private *priv)
+{
+        return lbs_prepare_and_send_command(priv, CMD_802_11_DEAUTHENTICATE,
+                                     0, CMD_OPTION_WAITFORRSP, 0, NULL);
+}
+
+/**
+ *  @brief This function prepares command of authenticate.
+ *
+ *  @param priv      A pointer to struct lbs_private structure
+ *  @param cmd       A pointer to cmd_ds_command structure
+ *  @param pdata_buf Void cast of pointer to a BSSID to authenticate with
+ *
+ *  @return         0 or -1
+ */
+int lbs_cmd_80211_authenticate(struct lbs_private *priv,
+                                 struct cmd_ds_command *cmd,
+                                 void *pdata_buf)
+{
+        struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth;
+        int ret = -1;
+        u8 *bssid = pdata_buf;
+        DECLARE_MAC_BUF(mac);
+
+        lbs_deb_enter(LBS_DEB_JOIN);
+
+        cmd->command = cpu_to_le16(CMD_802_11_AUTHENTICATE);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_authenticate)
+                        + S_DS_GEN);
+
+        /* translate auth mode to 802.11 defined wire value */
+        switch (priv->secinfo.auth_mode) {
+        case IW_AUTH_ALG_OPEN_SYSTEM:
+                pauthenticate->authtype = 0x00;
+                break;
+        case IW_AUTH_ALG_SHARED_KEY:
+                pauthenticate->authtype = 0x01;
+                break;
+        case IW_AUTH_ALG_LEAP:
+                pauthenticate->authtype = 0x80;
+                break;
+        default:
+                lbs_deb_join("AUTH_CMD: invalid auth alg 0x%X\n",
+                        priv->secinfo.auth_mode);
+                goto out;
+        }
+
+        memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
+
+        lbs_deb_join("AUTH_CMD: BSSID %s, auth 0x%x\n",
+                print_mac(mac, bssid), pauthenticate->authtype);
+        ret = 0;
+
+out:
+        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
+        return ret;
+}
+
+int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,
+                                   struct cmd_ds_command *cmd)
+{
+        struct cmd_ds_802_11_deauthenticate *dauth = &cmd->params.deauth;
+
+        lbs_deb_enter(LBS_DEB_JOIN);
+
+        cmd->command = cpu_to_le16(CMD_802_11_DEAUTHENTICATE);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_deauthenticate) +
+                             S_DS_GEN);
+
+        /* set AP MAC address */
+        memmove(dauth->macaddr, priv->curbssparams.bssid, ETH_ALEN);
+
+        /* Reason code 3 = Station is leaving */
+#define REASON_CODE_STA_LEAVING 3
+        dauth->reasoncode = cpu_to_le16(REASON_CODE_STA_LEAVING);
+
+        lbs_deb_leave(LBS_DEB_JOIN);
+        return 0;
+}
+
+int lbs_cmd_80211_associate(struct lbs_private *priv,
+                              struct cmd_ds_command *cmd, void *pdata_buf)
+{
+        struct cmd_ds_802_11_associate *passo = &cmd->params.associate;
+        int ret = 0;
+        struct assoc_request *assoc_req = pdata_buf;
+        struct bss_descriptor *bss = &assoc_req->bss;
+        u8 *pos;
+        u16 tmpcap, tmplen;
+        struct mrvlietypes_ssidparamset *ssid;
+        struct mrvlietypes_phyparamset *phy;
+        struct mrvlietypes_ssparamset *ss;
+        struct mrvlietypes_ratesparamset *rates;
+        struct mrvlietypes_rsnparamset *rsn;
+
+        lbs_deb_enter(LBS_DEB_ASSOC);
+
+        pos = (u8 *) passo;
+
+        if (!priv) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->command = cpu_to_le16(CMD_802_11_ASSOCIATE);
+
+        memcpy(passo->peerstaaddr, bss->bssid, sizeof(passo->peerstaaddr));
+        pos += sizeof(passo->peerstaaddr);
+
+        /* set the listen interval */
+        passo->listeninterval = cpu_to_le16(MRVDRV_DEFAULT_LISTEN_INTERVAL);
+
+        pos += sizeof(passo->capability);
+        pos += sizeof(passo->listeninterval);
+        pos += sizeof(passo->bcnperiod);
+        pos += sizeof(passo->dtimperiod);
+
+        ssid = (struct mrvlietypes_ssidparamset *) pos;
+        ssid->header.type = cpu_to_le16(TLV_TYPE_SSID);
+        tmplen = bss->ssid_len;
+        ssid->header.len = cpu_to_le16(tmplen);
+        memcpy(ssid->ssid, bss->ssid, tmplen);
+        pos += sizeof(ssid->header) + tmplen;
+
+        phy = (struct mrvlietypes_phyparamset *) pos;
+        phy->header.type = cpu_to_le16(TLV_TYPE_PHY_DS);
+        tmplen = sizeof(phy->fh_ds.dsparamset);
+        phy->header.len = cpu_to_le16(tmplen);
+        memcpy(&phy->fh_ds.dsparamset,
+               &bss->phyparamset.dsparamset.currentchan,
+               tmplen);
+        pos += sizeof(phy->header) + tmplen;
+
+        ss = (struct mrvlietypes_ssparamset *) pos;
+        ss->header.type = cpu_to_le16(TLV_TYPE_CF);
+        tmplen = sizeof(ss->cf_ibss.cfparamset);
+        ss->header.len = cpu_to_le16(tmplen);
+        pos += sizeof(ss->header) + tmplen;
+
+        rates = (struct mrvlietypes_ratesparamset *) pos;
+        rates->header.type = cpu_to_le16(TLV_TYPE_RATES);
+        memcpy(&rates->rates, &bss->rates, MAX_RATES);
+        tmplen = MAX_RATES;
+        if (get_common_rates(priv, rates->rates, &tmplen)) {
+                ret = -1;
+                goto done;
+        }
+        pos += sizeof(rates->header) + tmplen;
+        rates->header.len = cpu_to_le16(tmplen);
+        lbs_deb_assoc("ASSOC_CMD: num rates %u\n", tmplen);
+
+        /* Copy the infra. association rates into Current BSS state structure */
+        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
+        memcpy(&priv->curbssparams.rates, &rates->rates, tmplen);
+
+        /* Set MSB on basic rates as the firmware requires, but _after_
+         * copying to current bss rates.
+         */
+        lbs_set_basic_rate_flags(rates->rates, tmplen);
+
+        if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
+                rsn = (struct mrvlietypes_rsnparamset *) pos;
+                /* WPA_IE or WPA2_IE */
+                rsn->header.type = cpu_to_le16((u16) assoc_req->wpa_ie[0]);
+                tmplen = (u16) assoc_req->wpa_ie[1];
+                rsn->header.len = cpu_to_le16(tmplen);
+                memcpy(rsn->rsnie, &assoc_req->wpa_ie[2], tmplen);
+                lbs_deb_hex(LBS_DEB_JOIN, "ASSOC_CMD: RSN IE", (u8 *) rsn,
+                        sizeof(rsn->header) + tmplen);
+                pos += sizeof(rsn->header) + tmplen;
+        }
+
+        /* update curbssparams */
+        priv->curbssparams.channel = bss->phyparamset.dsparamset.currentchan;
+
+        if (lbs_parse_dnld_countryinfo_11d(priv, bss)) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->size = cpu_to_le16((u16) (pos - (u8 *) passo) + S_DS_GEN);
+
+        /* set the capability info */
+        tmpcap = (bss->capability & CAPINFO_MASK);
+        if (bss->mode == IW_MODE_INFRA)
+                tmpcap |= WLAN_CAPABILITY_ESS;
+        passo->capability = cpu_to_le16(tmpcap);
+        lbs_deb_assoc("ASSOC_CMD: capability 0x%04x\n", tmpcap);
+
+done:
+        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
+        return ret;
+}
+
+int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,
+                                 struct cmd_ds_command *cmd, void *pdata_buf)
+{
+        struct cmd_ds_802_11_ad_hoc_start *adhs = &cmd->params.ads;
+        int ret = 0;
+        int cmdappendsize = 0;
+        struct assoc_request *assoc_req = pdata_buf;
+        u16 tmpcap = 0;
+        size_t ratesize = 0;
+
+        lbs_deb_enter(LBS_DEB_JOIN);
+
+        if (!priv) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->command = cpu_to_le16(CMD_802_11_AD_HOC_START);
+
+        /*
+         * Fill in the parameters for 2 data structures:
+         *   1. cmd_ds_802_11_ad_hoc_start command
+         *   2. priv->scantable[i]
+         *
+         * Driver will fill up SSID, bsstype,IBSS param, Physical Param,
+         *   probe delay, and cap info.
+         *
+         * Firmware will fill up beacon period, DTIM, Basic rates
+         *   and operational rates.
+         */
+
+        memset(adhs->ssid, 0, IW_ESSID_MAX_SIZE);
+        memcpy(adhs->ssid, assoc_req->ssid, assoc_req->ssid_len);
+
+        lbs_deb_join("ADHOC_S_CMD: SSID '%s', ssid length %u\n",
+                escape_essid(assoc_req->ssid, assoc_req->ssid_len),
+                assoc_req->ssid_len);
+
+        /* set the BSS type */
+        adhs->bsstype = CMD_BSS_TYPE_IBSS;
+        priv->mode = IW_MODE_ADHOC;
+        if (priv->beacon_period == 0)
+                priv->beacon_period = MRVDRV_BEACON_INTERVAL;
+        adhs->beaconperiod = cpu_to_le16(priv->beacon_period);
+
+        /* set Physical param set */
+#define DS_PARA_IE_ID   3
+#define DS_PARA_IE_LEN  1
+
+        adhs->phyparamset.dsparamset.elementid = DS_PARA_IE_ID;
+        adhs->phyparamset.dsparamset.len = DS_PARA_IE_LEN;
+
+        WARN_ON(!assoc_req->channel);
+
+        lbs_deb_join("ADHOC_S_CMD: Creating ADHOC on channel %d\n",
+                     assoc_req->channel);
+
+        adhs->phyparamset.dsparamset.currentchan = assoc_req->channel;
+
+        /* set IBSS param set */
+#define IBSS_PARA_IE_ID   6
+#define IBSS_PARA_IE_LEN  2
+
+        adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
+        adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
+        adhs->ssparamset.ibssparamset.atimwindow = 0;
+
+        /* set capability info */
+        tmpcap = WLAN_CAPABILITY_IBSS;
+        if (assoc_req->secinfo.wep_enabled) {
+                lbs_deb_join("ADHOC_S_CMD: WEP enabled, "
+                        "setting privacy on\n");
+                tmpcap |= WLAN_CAPABILITY_PRIVACY;
+        } else {
+                lbs_deb_join("ADHOC_S_CMD: WEP disabled, "
+                        "setting privacy off\n");
+        }
+        adhs->capability = cpu_to_le16(tmpcap);
+
+        /* probedelay */
+        adhs->probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
+
+        memset(adhs->rates, 0, sizeof(adhs->rates));
+        ratesize = min(sizeof(adhs->rates), sizeof(lbs_bg_rates));
+        memcpy(adhs->rates, lbs_bg_rates, ratesize);
+
+        /* Copy the ad-hoc creating rates into Current BSS state structure */
+        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
+        memcpy(&priv->curbssparams.rates, &adhs->rates, ratesize);
+
+        /* Set MSB on basic rates as the firmware requires, but _after_
+         * copying to current bss rates.
+         */
+        lbs_set_basic_rate_flags(adhs->rates, ratesize);
+
+        lbs_deb_join("ADHOC_S_CMD: rates=%02x %02x %02x %02x \n",
+               adhs->rates[0], adhs->rates[1], adhs->rates[2], adhs->rates[3]);
+
+        lbs_deb_join("ADHOC_S_CMD: AD HOC Start command is ready\n");
+
+        if (lbs_create_dnld_countryinfo_11d(priv)) {
+                lbs_deb_join("ADHOC_S_CMD: dnld_countryinfo_11d failed\n");
+                ret = -1;
+                goto done;
+        }
+
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_start) +
+                                S_DS_GEN + cmdappendsize);
+
+        ret = 0;
+done:
+        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
+        return ret;
+}
+
+int lbs_cmd_80211_ad_hoc_stop(struct cmd_ds_command *cmd)
+{
+        cmd->command = cpu_to_le16(CMD_802_11_AD_HOC_STOP);
+        cmd->size = cpu_to_le16(S_DS_GEN);
+
+        return 0;
+}
+
+int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,
+                                struct cmd_ds_command *cmd, void *pdata_buf)
+{
+        struct cmd_ds_802_11_ad_hoc_join *join_cmd = &cmd->params.adj;
+        struct assoc_request *assoc_req = pdata_buf;
+        struct bss_descriptor *bss = &assoc_req->bss;
+        int cmdappendsize = 0;
+        int ret = 0;
+        u16 ratesize = 0;
+        DECLARE_MAC_BUF(mac);
+
+        lbs_deb_enter(LBS_DEB_JOIN);
+
+        cmd->command = cpu_to_le16(CMD_802_11_AD_HOC_JOIN);
+
+        join_cmd->bss.type = CMD_BSS_TYPE_IBSS;
+        join_cmd->bss.beaconperiod = cpu_to_le16(bss->beaconperiod);
+
+        memcpy(&join_cmd->bss.bssid, &bss->bssid, ETH_ALEN);
+        memcpy(&join_cmd->bss.ssid, &bss->ssid, bss->ssid_len);
+
+        memcpy(&join_cmd->bss.phyparamset, &bss->phyparamset,
+               sizeof(union ieeetypes_phyparamset));
+
+        memcpy(&join_cmd->bss.ssparamset, &bss->ssparamset,
+               sizeof(union IEEEtypes_ssparamset));
+
+        join_cmd->bss.capability = cpu_to_le16(bss->capability & CAPINFO_MASK);
+        lbs_deb_join("ADHOC_J_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",
+               bss->capability, CAPINFO_MASK);
+
+        /* information on BSSID descriptor passed to FW */
+        lbs_deb_join(
+               "ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",
+               print_mac(mac, join_cmd->bss.bssid),
+               join_cmd->bss.ssid);
+
+        /* failtimeout */
+        join_cmd->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
+
+        /* probedelay */
+        join_cmd->probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
+
+        priv->curbssparams.channel = bss->channel;
+
+        /* Copy Data rates from the rates recorded in scan response */
+        memset(join_cmd->bss.rates, 0, sizeof(join_cmd->bss.rates));
+        ratesize = min_t(u16, sizeof(join_cmd->bss.rates), MAX_RATES);
+        memcpy(join_cmd->bss.rates, bss->rates, ratesize);
+        if (get_common_rates(priv, join_cmd->bss.rates, &ratesize)) {
+                lbs_deb_join("ADHOC_J_CMD: get_common_rates returns error.\n");
+                ret = -1;
+                goto done;
+        }
+
+        /* Copy the ad-hoc creating rates into Current BSS state structure */
+        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
+        memcpy(&priv->curbssparams.rates, join_cmd->bss.rates, ratesize);
+
+        /* Set MSB on basic rates as the firmware requires, but _after_
+         * copying to current bss rates.
+         */
+        lbs_set_basic_rate_flags(join_cmd->bss.rates, ratesize);
+
+        join_cmd->bss.ssparamset.ibssparamset.atimwindow =
+            cpu_to_le16(bss->atimwindow);
+
+        if (assoc_req->secinfo.wep_enabled) {
+                u16 tmp = le16_to_cpu(join_cmd->bss.capability);
+                tmp |= WLAN_CAPABILITY_PRIVACY;
+                join_cmd->bss.capability = cpu_to_le16(tmp);
+        }
+
+        if (priv->psmode == LBS802_11POWERMODEMAX_PSP) {
+                /* wake up first */
+                __le32 Localpsmode;
+
+                Localpsmode = cpu_to_le32(LBS802_11POWERMODECAM);
+                ret = lbs_prepare_and_send_command(priv,
+                                            CMD_802_11_PS_MODE,
+                                            CMD_ACT_SET,
+                                            0, 0, &Localpsmode);
+
+                if (ret) {
+                        ret = -1;
+                        goto done;
+                }
+        }
+
+        if (lbs_parse_dnld_countryinfo_11d(priv, bss)) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_join) +
+                                S_DS_GEN + cmdappendsize);
+
+done:
+        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
+        return ret;
+}
+
+int lbs_ret_80211_associate(struct lbs_private *priv,
+                              struct cmd_ds_command *resp)
+{
+        int ret = 0;
+        union iwreq_data wrqu;
+        struct ieeetypes_assocrsp *passocrsp;
+        struct bss_descriptor *bss;
+        u16 status_code;
+
+        lbs_deb_enter(LBS_DEB_ASSOC);
+
+        if (!priv->in_progress_assoc_req) {
+                lbs_deb_assoc("ASSOC_RESP: no in-progress assoc request\n");
+                ret = -1;
+                goto done;
+        }
+        bss = &priv->in_progress_assoc_req->bss;
+
+        passocrsp = (struct ieeetypes_assocrsp *) &resp->params;
+
+        /*
+         * Older FW versions map the IEEE 802.11 Status Code in the association
+         * response to the following values returned in passocrsp->statuscode:
+         *
+         *    IEEE Status Code                Marvell Status Code
+         *    0                       ->      0x0000 ASSOC_RESULT_SUCCESS
+         *    13                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
+         *    14                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
+         *    15                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
+         *    16                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
+         *    others                  ->      0x0003 ASSOC_RESULT_REFUSED
+         *
+         * Other response codes:
+         *    0x0001 -> ASSOC_RESULT_INVALID_PARAMETERS (unused)
+         *    0x0002 -> ASSOC_RESULT_TIMEOUT (internal timer expired waiting for
+         *                                    association response from the AP)
+         */
+
+        status_code = le16_to_cpu(passocrsp->statuscode);
+        switch (status_code) {
+        case 0x00:
+                break;
+        case 0x01:
+                lbs_deb_assoc("ASSOC_RESP: invalid parameters\n");
+                break;
+        case 0x02:
+                lbs_deb_assoc("ASSOC_RESP: internal timer "
+                        "expired while waiting for the AP\n");
+                break;
+        case 0x03:
+                lbs_deb_assoc("ASSOC_RESP: association "
+                        "refused by AP\n");
+                break;
+        case 0x04:
+                lbs_deb_assoc("ASSOC_RESP: authentication "
+                        "refused by AP\n");
+                break;
+        default:
+                lbs_deb_assoc("ASSOC_RESP: failure reason 0x%02x "
+                        " unknown\n", status_code);
+                break;
+        }
+
+        if (status_code) {
+                lbs_mac_event_disconnected(priv);
+                ret = -1;
+                goto done;
+        }
+
+        lbs_deb_hex(LBS_DEB_ASSOC, "ASSOC_RESP", (void *)&resp->params,
+                le16_to_cpu(resp->size) - S_DS_GEN);
+
+        /* Send a Media Connected event, according to the Spec */
+        priv->connect_status = LBS_CONNECTED;
+
+        /* Update current SSID and BSSID */
+        memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE);
+        priv->curbssparams.ssid_len = bss->ssid_len;
+        memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
+
+        priv->SNR[TYPE_RXPD][TYPE_AVG] = 0;
+        priv->NF[TYPE_RXPD][TYPE_AVG] = 0;
+
+        memset(priv->rawSNR, 0x00, sizeof(priv->rawSNR));
+        memset(priv->rawNF, 0x00, sizeof(priv->rawNF));
+        priv->nextSNRNF = 0;
+        priv->numSNRNF = 0;
+
+        netif_carrier_on(priv->dev);
+        if (!priv->tx_pending_len)
+                netif_wake_queue(priv->dev);
+
+        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+
+done:
+        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
+        return ret;
+}
+
+int lbs_ret_80211_disassociate(struct lbs_private *priv)
+{
+        lbs_deb_enter(LBS_DEB_JOIN);
+
+        lbs_mac_event_disconnected(priv);
+
+        lbs_deb_leave(LBS_DEB_JOIN);
+        return 0;
+}
+
+int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,
+                                 struct cmd_ds_command *resp)
+{
+        int ret = 0;
+        u16 command = le16_to_cpu(resp->command);
+        u16 result = le16_to_cpu(resp->result);
+        struct cmd_ds_802_11_ad_hoc_result *padhocresult;
+        union iwreq_data wrqu;
+        struct bss_descriptor *bss;
+        DECLARE_MAC_BUF(mac);
+
+        lbs_deb_enter(LBS_DEB_JOIN);
+
+        padhocresult = &resp->params.result;
+
+        lbs_deb_join("ADHOC_RESP: size = %d\n", le16_to_cpu(resp->size));
+        lbs_deb_join("ADHOC_RESP: command = %x\n", command);
+        lbs_deb_join("ADHOC_RESP: result = %x\n", result);
+
+        if (!priv->in_progress_assoc_req) {
+                lbs_deb_join("ADHOC_RESP: no in-progress association "
+                        "request\n");
+                ret = -1;
+                goto done;
+        }
+        bss = &priv->in_progress_assoc_req->bss;
+
+        /*
+         * Join result code 0 --> SUCCESS
+         */
+        if (result) {
+                lbs_deb_join("ADHOC_RESP: failed\n");
+                if (priv->connect_status == LBS_CONNECTED)
+                        lbs_mac_event_disconnected(priv);
+                ret = -1;
+                goto done;
+        }
+
+        /*
+         * Now the join cmd should be successful
+         * If BSSID has changed use SSID to compare instead of BSSID
+         */
+        lbs_deb_join("ADHOC_RESP: associated to '%s'\n",
+                escape_essid(bss->ssid, bss->ssid_len));
+
+        /* Send a Media Connected event, according to the Spec */
+        priv->connect_status = LBS_CONNECTED;
+
+        if (command == CMD_RET(CMD_802_11_AD_HOC_START)) {
+                /* Update the created network descriptor with the new BSSID */
+                memcpy(bss->bssid, padhocresult->bssid, ETH_ALEN);
+        }
+
+        /* Set the BSSID from the joined/started descriptor */
+        memcpy(&priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
+
+        /* Set the new SSID to current SSID */
+        memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE);
+        priv->curbssparams.ssid_len = bss->ssid_len;
+
+        netif_carrier_on(priv->dev);
+        if (!priv->tx_pending_len)
+                netif_wake_queue(priv->dev);
+
+        memset(&wrqu, 0, sizeof(wrqu));
+        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+
+        lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");
+        lbs_deb_join("ADHOC_RESP: channel = %d\n", priv->curbssparams.channel);
+        lbs_deb_join("ADHOC_RESP: BSSID = %s\n",
+                     print_mac(mac, padhocresult->bssid));
+
+done:
+        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
+        return ret;
+}
+
+int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv)
+{
+        lbs_deb_enter(LBS_DEB_JOIN);
+
+        lbs_mac_event_disconnected(priv);
+
+        lbs_deb_leave(LBS_DEB_JOIN);
+        return 0;
+}
diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h
index 08372bbf3761..c516fbe518fd 100644
--- a/drivers/net/wireless/libertas/assoc.h
+++ b/drivers/net/wireless/libertas/assoc.h
@@ -7,6 +7,33 @@
 
 void lbs_association_worker(struct work_struct *work);
 struct assoc_request *lbs_get_association_request(struct lbs_private *priv);
-void lbs_sync_channel(struct work_struct *work);
+
+struct cmd_ds_command;
+int lbs_cmd_80211_authenticate(struct lbs_private *priv,
+                                        struct cmd_ds_command *cmd,
+                                        void *pdata_buf);
+int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,
+                                       struct cmd_ds_command *cmd,
+                                       void *pdata_buf);
+int lbs_cmd_80211_ad_hoc_stop(struct cmd_ds_command *cmd);
+int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,
+                                        struct cmd_ds_command *cmd,
+                                        void *pdata_buf);
+int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,
+                                          struct cmd_ds_command *cmd);
+int lbs_cmd_80211_associate(struct lbs_private *priv,
+                                     struct cmd_ds_command *cmd,
+                                     void *pdata_buf);
+
+int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,
+                                        struct cmd_ds_command *resp);
+int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv);
+int lbs_ret_80211_disassociate(struct lbs_private *priv);
+int lbs_ret_80211_associate(struct lbs_private *priv,
+                                     struct cmd_ds_command *resp);
+
+int lbs_stop_adhoc_network(struct lbs_private *priv);
+
+int lbs_send_deauthentication(struct lbs_private *priv);
 
 #endif /* _LBS_ASSOC_H */
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index b3c1acbcc655..6328b9593877 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -4,19 +4,57 @@
   */
 
 #include <net/iw_handler.h>
+#include <linux/kfifo.h>
 #include "host.h"
 #include "hostcmd.h"
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
-#include "join.h"
+#include "assoc.h"
 #include "wext.h"
 #include "cmd.h"
 
 static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv);
-static void lbs_set_cmd_ctrl_node(struct lbs_private *priv,
-                    struct cmd_ctrl_node *ptempnode,
-                    void *pdata_buf);
+
+
+/**
+ *  @brief Simple callback that copies response back into command
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param extra        A pointer to the original command structure for which
+ *                      'resp' is a response
+ *  @param resp         A pointer to the command response
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,
+                     struct cmd_header *resp)
+{
+        struct cmd_header *buf = (void *)extra;
+        uint16_t copy_len;
+
+        copy_len = min(le16_to_cpu(buf->size), le16_to_cpu(resp->size));
+        memcpy(buf, resp, copy_len);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(lbs_cmd_copyback);
+
+/**
+ *  @brief Simple callback that ignores the result. Use this if
+ *  you just want to send a command to the hardware, but don't
+ *  care for the result.
+ *
+ *  @param priv         ignored
+ *  @param extra        ignored
+ *  @param resp         ignored
+ *
+ *  @return             0 for success
+ */
+static int lbs_cmd_async_callback(struct lbs_private *priv, unsigned long extra,
+                     struct cmd_header *resp)
+{
+        return 0;
+}
 
 
 /**
@@ -143,8 +181,7 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria)
 }
 EXPORT_SYMBOL_GPL(lbs_host_sleep_cfg);
 
-static int lbs_cmd_802_11_ps_mode(struct lbs_private *priv,
-                                   struct cmd_ds_command *cmd,
+static int lbs_cmd_802_11_ps_mode(struct cmd_ds_command *cmd,
                                    u16 cmd_action)
 {
         struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
@@ -259,6 +296,7 @@ int lbs_cmd_802_11_set_wep(struct lbs_private *priv, uint16_t cmd_action,
 
         lbs_deb_enter(LBS_DEB_CMD);
 
+        memset(&cmd, 0, sizeof(cmd));
         cmd.hdr.command = cpu_to_le16(CMD_802_11_SET_WEP);
         cmd.hdr.size = cpu_to_le16(sizeof(cmd));
 
@@ -322,7 +360,9 @@ int lbs_cmd_802_11_enable_rsn(struct lbs_private *priv, uint16_t cmd_action,
         cmd.hdr.size = cpu_to_le16(sizeof(cmd));
         cmd.action = cpu_to_le16(cmd_action);
 
-        if (cmd_action == CMD_ACT_SET) {
+        if (cmd_action == CMD_ACT_GET)
+                cmd.enable = 0;
+        else {
                 if (*enable)
                         cmd.enable = cpu_to_le16(CMD_ENABLE_RSN);
                 else
@@ -338,81 +378,108 @@ int lbs_cmd_802_11_enable_rsn(struct lbs_private *priv, uint16_t cmd_action,
         return ret;
 }
 
-static void set_one_wpa_key(struct MrvlIEtype_keyParamSet * pkeyparamset,
-                            struct enc_key * pkey)
+static void set_one_wpa_key(struct MrvlIEtype_keyParamSet *keyparam,
+                            struct enc_key *key)
 {
         lbs_deb_enter(LBS_DEB_CMD);
 
-        if (pkey->flags & KEY_INFO_WPA_ENABLED) {
-                pkeyparamset->keyinfo |= cpu_to_le16(KEY_INFO_WPA_ENABLED);
-        }
-        if (pkey->flags & KEY_INFO_WPA_UNICAST) {
-                pkeyparamset->keyinfo |= cpu_to_le16(KEY_INFO_WPA_UNICAST);
-        }
-        if (pkey->flags & KEY_INFO_WPA_MCAST) {
-                pkeyparamset->keyinfo |= cpu_to_le16(KEY_INFO_WPA_MCAST);
-        }
+        if (key->flags & KEY_INFO_WPA_ENABLED)
+                keyparam->keyinfo |= cpu_to_le16(KEY_INFO_WPA_ENABLED);
+        if (key->flags & KEY_INFO_WPA_UNICAST)
+                keyparam->keyinfo |= cpu_to_le16(KEY_INFO_WPA_UNICAST);
+        if (key->flags & KEY_INFO_WPA_MCAST)
+                keyparam->keyinfo |= cpu_to_le16(KEY_INFO_WPA_MCAST);
 
-        pkeyparamset->type = cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
-        pkeyparamset->keytypeid = cpu_to_le16(pkey->type);
-        pkeyparamset->keylen = cpu_to_le16(pkey->len);
-        memcpy(pkeyparamset->key, pkey->key, pkey->len);
-        pkeyparamset->length = cpu_to_le16(  sizeof(pkeyparamset->keytypeid)
-                                                + sizeof(pkeyparamset->keyinfo)
-                                                + sizeof(pkeyparamset->keylen)
-                                                + sizeof(pkeyparamset->key));
+        keyparam->type = cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
+        keyparam->keytypeid = cpu_to_le16(key->type);
+        keyparam->keylen = cpu_to_le16(key->len);
+        memcpy(keyparam->key, key->key, key->len);
+
+        /* Length field doesn't include the {type,length} header */
+        keyparam->length = cpu_to_le16(sizeof(*keyparam) - 4);
         lbs_deb_leave(LBS_DEB_CMD);
 }
 
-static int lbs_cmd_802_11_key_material(struct lbs_private *priv,
-                                        struct cmd_ds_command *cmd,
-                                        u16 cmd_action,
-                                        u32 cmd_oid, void *pdata_buf)
+int lbs_cmd_802_11_key_material(struct lbs_private *priv, uint16_t cmd_action,
+                                struct assoc_request *assoc)
 {
-        struct cmd_ds_802_11_key_material *pkeymaterial =
-            &cmd->params.keymaterial;
-        struct assoc_request * assoc_req = pdata_buf;
+        struct cmd_ds_802_11_key_material cmd;
         int ret = 0;
         int index = 0;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        cmd->command = cpu_to_le16(CMD_802_11_KEY_MATERIAL);
-        pkeymaterial->action = cpu_to_le16(cmd_action);
+        cmd.action = cpu_to_le16(cmd_action);
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
 
         if (cmd_action == CMD_ACT_GET) {
-                cmd->size = cpu_to_le16(S_DS_GEN + sizeof (pkeymaterial->action));
-                ret = 0;
-                goto done;
-        }
+                cmd.hdr.size = cpu_to_le16(S_DS_GEN + 2);
+        } else {
+                memset(cmd.keyParamSet, 0, sizeof(cmd.keyParamSet));
 
-        memset(&pkeymaterial->keyParamSet, 0, sizeof(pkeymaterial->keyParamSet));
+                if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc->flags)) {
+                        set_one_wpa_key(&cmd.keyParamSet[index],
+                                        &assoc->wpa_unicast_key);
+                        index++;
+                }
 
-        if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
-                set_one_wpa_key(&pkeymaterial->keyParamSet[index],
-                                &assoc_req->wpa_unicast_key);
-                index++;
-        }
+                if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc->flags)) {
+                        set_one_wpa_key(&cmd.keyParamSet[index],
+                                        &assoc->wpa_mcast_key);
+                        index++;
+                }
 
-        if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
-                set_one_wpa_key(&pkeymaterial->keyParamSet[index],
-                                &assoc_req->wpa_mcast_key);
-                index++;
+                /* The common header and as many keys as we included */
+                cmd.hdr.size = cpu_to_le16(offsetof(typeof(cmd),
+                                                    keyParamSet[index]));
         }
+        ret = lbs_cmd_with_response(priv, CMD_802_11_KEY_MATERIAL, &cmd);
+        /* Copy the returned key to driver private data */
+        if (!ret && cmd_action == CMD_ACT_GET) {
+                void *buf_ptr = cmd.keyParamSet;
+                void *resp_end = &(&cmd)[1];
+
+                while (buf_ptr < resp_end) {
+                        struct MrvlIEtype_keyParamSet *keyparam = buf_ptr;
+                        struct enc_key *key;
+                        uint16_t param_set_len = le16_to_cpu(keyparam->length);
+                        uint16_t key_len = le16_to_cpu(keyparam->keylen);
+                        uint16_t key_flags = le16_to_cpu(keyparam->keyinfo);
+                        uint16_t key_type = le16_to_cpu(keyparam->keytypeid);
+                        void *end;
+
+                        end = (void *)keyparam + sizeof(keyparam->type)
+                                + sizeof(keyparam->length) + param_set_len;
+
+                        /* Make sure we don't access past the end of the IEs */
+                        if (end > resp_end)
+                                break;
+
+                        if (key_flags & KEY_INFO_WPA_UNICAST)
+                                key = &priv->wpa_unicast_key;
+                        else if (key_flags & KEY_INFO_WPA_MCAST)
+                                key = &priv->wpa_mcast_key;
+                        else
+                                break;
 
-        cmd->size = cpu_to_le16(  S_DS_GEN
-                                + sizeof (pkeymaterial->action)
-                                + (index * sizeof(struct MrvlIEtype_keyParamSet)));
+                        /* Copy returned key into driver */
+                        memset(key, 0, sizeof(struct enc_key));
+                        if (key_len > sizeof(key->key))
+                                break;
+                        key->type = key_type;
+                        key->flags = key_flags;
+                        key->len = key_len;
+                        memcpy(key->key, keyparam->key, key->len);
 
-        ret = 0;
+                        buf_ptr = end + 1;
+                }
+        }
 
-done:
         lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
         return ret;
 }
 
-static int lbs_cmd_802_11_reset(struct lbs_private *priv,
-                                 struct cmd_ds_command *cmd, int cmd_action)
+static int lbs_cmd_802_11_reset(struct cmd_ds_command *cmd, int cmd_action)
 {
         struct cmd_ds_802_11_reset *reset = &cmd->params.reset;
 
@@ -426,30 +493,6 @@ static int lbs_cmd_802_11_reset(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_cmd_802_11_get_log(struct lbs_private *priv,
-                                   struct cmd_ds_command *cmd)
-{
-        lbs_deb_enter(LBS_DEB_CMD);
-        cmd->command = cpu_to_le16(CMD_802_11_GET_LOG);
-        cmd->size =
-                cpu_to_le16(sizeof(struct cmd_ds_802_11_get_log) + S_DS_GEN);
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
-static int lbs_cmd_802_11_get_stat(struct lbs_private *priv,
-                                    struct cmd_ds_command *cmd)
-{
-        lbs_deb_enter(LBS_DEB_CMD);
-        cmd->command = cpu_to_le16(CMD_802_11_GET_STAT);
-        cmd->size =
-            cpu_to_le16(sizeof(struct cmd_ds_802_11_get_stat) + S_DS_GEN);
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_cmd_802_11_snmp_mib(struct lbs_private *priv,
                                     struct cmd_ds_command *cmd,
                                     int cmd_action,
@@ -570,8 +613,7 @@ static int lbs_cmd_802_11_snmp_mib(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_cmd_802_11_rf_tx_power(struct lbs_private *priv,
-                                       struct cmd_ds_command *cmd,
+static int lbs_cmd_802_11_rf_tx_power(struct cmd_ds_command *cmd,
                                        u16 cmd_action, void *pdata_buf)
 {
 
@@ -614,8 +656,7 @@ static int lbs_cmd_802_11_rf_tx_power(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_cmd_802_11_monitor_mode(struct lbs_private *priv,
-                                      struct cmd_ds_command *cmd,
+static int lbs_cmd_802_11_monitor_mode(struct cmd_ds_command *cmd,
                                       u16 cmd_action, void *pdata_buf)
 {
         struct cmd_ds_802_11_monitor_mode *monitor = &cmd->params.monitor;
@@ -773,6 +814,7 @@ int lbs_get_channel(struct lbs_private *priv)
 
         lbs_deb_enter(LBS_DEB_CMD);
 
+        memset(&cmd, 0, sizeof(cmd));
         cmd.hdr.size = cpu_to_le16(sizeof(cmd));
         cmd.action = cpu_to_le16(CMD_OPT_802_11_RF_CHANNEL_GET);
 
@@ -788,6 +830,22 @@ out:
         return ret;
 }
 
+int lbs_update_channel(struct lbs_private *priv)
+{
+        int ret;
+
+        /* the channel in f/w could be out of sync; get the current channel */
+        lbs_deb_enter(LBS_DEB_ASSOC);
+
+        ret = lbs_get_channel(priv);
+        if (ret > 0) {
+                priv->curbssparams.channel = ret;
+                ret = 0;
+        }
+        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
+        return ret;
+}
+
 /**
  *  @brief Set the radio channel
  *
@@ -804,6 +862,7 @@ int lbs_set_channel(struct lbs_private *priv, u8 channel)
 
         lbs_deb_enter(LBS_DEB_CMD);
 
+        memset(&cmd, 0, sizeof(cmd));
         cmd.hdr.size = cpu_to_le16(sizeof(cmd));
         cmd.action = cpu_to_le16(CMD_OPT_802_11_RF_CHANNEL_SET);
         cmd.channel = cpu_to_le16(channel);
@@ -842,8 +901,7 @@ static int lbs_cmd_802_11_rssi(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_cmd_reg_access(struct lbs_private *priv,
-                               struct cmd_ds_command *cmdptr,
+static int lbs_cmd_reg_access(struct cmd_ds_command *cmdptr,
                                u8 cmd_action, void *pdata_buf)
 {
         struct lbs_offset_value *offval;
@@ -917,53 +975,7 @@ static int lbs_cmd_reg_access(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_cmd_802_11_mac_address(struct lbs_private *priv,
-                                       struct cmd_ds_command *cmd,
-                                       u16 cmd_action)
-{
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        cmd->command = cpu_to_le16(CMD_802_11_MAC_ADDRESS);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_mac_address) +
-                             S_DS_GEN);
-        cmd->result = 0;
-
-        cmd->params.macadd.action = cpu_to_le16(cmd_action);
-
-        if (cmd_action == CMD_ACT_SET) {
-                memcpy(cmd->params.macadd.macadd,
-                       priv->current_addr, ETH_ALEN);
-                lbs_deb_hex(LBS_DEB_CMD, "SET_CMD: MAC addr", priv->current_addr, 6);
-        }
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
-static int lbs_cmd_802_11_eeprom_access(struct lbs_private *priv,
-                                         struct cmd_ds_command *cmd,
-                                         int cmd_action, void *pdata_buf)
-{
-        struct lbs_ioctl_regrdwr *ea = pdata_buf;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        cmd->command = cpu_to_le16(CMD_802_11_EEPROM_ACCESS);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) +
-                                S_DS_GEN);
-        cmd->result = 0;
-
-        cmd->params.rdeeprom.action = cpu_to_le16(ea->action);
-        cmd->params.rdeeprom.offset = cpu_to_le16(ea->offset);
-        cmd->params.rdeeprom.bytecount = cpu_to_le16(ea->NOB);
-        cmd->params.rdeeprom.value = 0;
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
-static int lbs_cmd_bt_access(struct lbs_private *priv,
-                               struct cmd_ds_command *cmd,
+static int lbs_cmd_bt_access(struct cmd_ds_command *cmd,
                                u16 cmd_action, void *pdata_buf)
 {
         struct cmd_ds_bt_access *bt_access = &cmd->params.bt;
@@ -1000,8 +1012,7 @@ static int lbs_cmd_bt_access(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_cmd_fwt_access(struct lbs_private *priv,
-                               struct cmd_ds_command *cmd,
+static int lbs_cmd_fwt_access(struct cmd_ds_command *cmd,
                                u16 cmd_action, void *pdata_buf)
 {
         struct cmd_ds_fwt_access *fwt_access = &cmd->params.fwt;
@@ -1153,9 +1164,9 @@ static void lbs_submit_command(struct lbs_private *priv,
             command == CMD_802_11_AUTHENTICATE)
                 timeo = 10 * HZ;
 
-        lbs_deb_host("DNLD_CMD: command 0x%04x, seq %d, size %d, jiffies %lu\n",
-                     command, le16_to_cpu(cmd->seqnum), cmdsize, jiffies);
-        lbs_deb_hex(LBS_DEB_HOST, "DNLD_CMD", (void *) cmdnode->cmdbuf, cmdsize);
+        lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d\n",
+                     command, le16_to_cpu(cmd->seqnum), cmdsize);
+        lbs_deb_hex(LBS_DEB_CMD, "DNLD_CMD", (void *) cmdnode->cmdbuf, cmdsize);
 
         ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) cmd, cmdsize);
 
@@ -1164,9 +1175,7 @@ static void lbs_submit_command(struct lbs_private *priv,
                 /* Let the timer kick in and retry, and potentially reset
                    the whole thing if the condition persists */
                 timeo = HZ;
-        } else
-                lbs_deb_cmd("DNLD_CMD: sent command 0x%04x, jiffies %lu\n",
-                            command, jiffies);
+        }
 
         /* Setup the timer after transmit command */
         mod_timer(&priv->command_timer, jiffies + timeo);
@@ -1174,24 +1183,6 @@ static void lbs_submit_command(struct lbs_private *priv,
         lbs_deb_leave(LBS_DEB_HOST);
 }
 
-static int lbs_cmd_mac_control(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd)
-{
-        struct cmd_ds_mac_control *mac = &cmd->params.macctrl;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        cmd->command = cpu_to_le16(CMD_MAC_CONTROL);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mac_control) + S_DS_GEN);
-        mac->action = cpu_to_le16(priv->currentpacketfilter);
-
-        lbs_deb_cmd("MAC_CONTROL: action 0x%x, size %d\n",
-                    le16_to_cpu(mac->action), le16_to_cpu(cmd->size));
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 /**
  *  This function inserts command node to cmdfreeq
  *  after cleans it. Requires priv->driver_lock held.
@@ -1234,7 +1225,7 @@ void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd,
         cmd->cmdwaitqwoken = 1;
         wake_up_interruptible(&cmd->cmdwait_q);
 
-        if (!cmd->callback)
+        if (!cmd->callback || cmd->callback == lbs_cmd_async_callback)
                 __lbs_cleanup_and_insert_cmd(priv, cmd);
         priv->cur_cmd = NULL;
 }
@@ -1278,18 +1269,20 @@ int lbs_set_radio_control(struct lbs_private *priv)
         return ret;
 }
 
-int lbs_set_mac_packet_filter(struct lbs_private *priv)
+void lbs_set_mac_control(struct lbs_private *priv)
 {
-        int ret = 0;
+        struct cmd_ds_mac_control cmd;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        /* Send MAC control command to station */
-        ret = lbs_prepare_and_send_command(priv,
-                                    CMD_MAC_CONTROL, 0, 0, 0, NULL);
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(priv->mac_control);
+        cmd.reserved = 0;
 
-        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
-        return ret;
+        lbs_cmd_async(priv, CMD_MAC_CONTROL,
+                &cmd.hdr, sizeof(cmd));
+
+        lbs_deb_leave(LBS_DEB_CMD);
 }
 
 /**
@@ -1338,7 +1331,8 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                 goto done;
         }
 
-        lbs_set_cmd_ctrl_node(priv, cmdnode, pdata_buf);
+        cmdnode->callback = NULL;
+        cmdnode->callback_arg = (unsigned long)pdata_buf;
 
         cmdptr = (struct cmd_ds_command *)cmdnode->cmdbuf;
 
@@ -1353,15 +1347,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
 
         switch (cmd_no) {
         case CMD_802_11_PS_MODE:
-                ret = lbs_cmd_802_11_ps_mode(priv, cmdptr, cmd_action);
-                break;
-
-        case CMD_802_11_SCAN:
-                ret = lbs_cmd_80211_scan(priv, cmdptr, pdata_buf);
-                break;
-
-        case CMD_MAC_CONTROL:
-                ret = lbs_cmd_mac_control(priv, cmdptr);
+                ret = lbs_cmd_802_11_ps_mode(cmdptr, cmd_action);
                 break;
 
         case CMD_802_11_ASSOCIATE:
@@ -1376,25 +1362,15 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
         case CMD_802_11_AD_HOC_START:
                 ret = lbs_cmd_80211_ad_hoc_start(priv, cmdptr, pdata_buf);
                 break;
-        case CMD_CODE_DNLD:
-                break;
 
         case CMD_802_11_RESET:
-                ret = lbs_cmd_802_11_reset(priv, cmdptr, cmd_action);
-                break;
-
-        case CMD_802_11_GET_LOG:
-                ret = lbs_cmd_802_11_get_log(priv, cmdptr);
+                ret = lbs_cmd_802_11_reset(cmdptr, cmd_action);
                 break;
 
         case CMD_802_11_AUTHENTICATE:
                 ret = lbs_cmd_80211_authenticate(priv, cmdptr, pdata_buf);
                 break;
 
-        case CMD_802_11_GET_STAT:
-                ret = lbs_cmd_802_11_get_stat(priv, cmdptr);
-                break;
-
         case CMD_802_11_SNMP_MIB:
                 ret = lbs_cmd_802_11_snmp_mib(priv, cmdptr,
                                                cmd_action, cmd_oid, pdata_buf);
@@ -1403,12 +1379,12 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
         case CMD_MAC_REG_ACCESS:
         case CMD_BBP_REG_ACCESS:
         case CMD_RF_REG_ACCESS:
-                ret = lbs_cmd_reg_access(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_reg_access(cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_802_11_RF_TX_POWER:
-                ret = lbs_cmd_802_11_rf_tx_power(priv, cmdptr,
-                                                  cmd_action, pdata_buf);
+                ret = lbs_cmd_802_11_rf_tx_power(cmdptr,
+                                                 cmd_action, pdata_buf);
                 break;
 
         case CMD_802_11_RATE_ADAPT_RATESET:
@@ -1421,7 +1397,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                 break;
 
         case CMD_802_11_MONITOR_MODE:
-                ret = lbs_cmd_802_11_monitor_mode(priv, cmdptr,
+                ret = lbs_cmd_802_11_monitor_mode(cmdptr,
                                           cmd_action, pdata_buf);
                 break;
 
@@ -1434,26 +1410,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                 break;
 
         case CMD_802_11_AD_HOC_STOP:
-                ret = lbs_cmd_80211_ad_hoc_stop(priv, cmdptr);
-                break;
-
-        case CMD_802_11_KEY_MATERIAL:
-                ret = lbs_cmd_802_11_key_material(priv, cmdptr, cmd_action,
-                                cmd_oid, pdata_buf);
-                break;
-
-        case CMD_802_11_PAIRWISE_TSC:
-                break;
-        case CMD_802_11_GROUP_TSC:
-                break;
-
-        case CMD_802_11_MAC_ADDRESS:
-                ret = lbs_cmd_802_11_mac_address(priv, cmdptr, cmd_action);
-                break;
-
-        case CMD_802_11_EEPROM_ACCESS:
-                ret = lbs_cmd_802_11_eeprom_access(priv, cmdptr,
-                                                    cmd_action, pdata_buf);
+                ret = lbs_cmd_80211_ad_hoc_stop(cmdptr);
                 break;
 
         case CMD_802_11_SET_AFC:
@@ -1509,22 +1466,12 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                         break;
                 }
 
-        case CMD_802_11_PWR_CFG:
-                cmdptr->command = cpu_to_le16(CMD_802_11_PWR_CFG);
-                cmdptr->size =
-                    cpu_to_le16(sizeof(struct cmd_ds_802_11_pwr_cfg) +
-                                     S_DS_GEN);
-                memmove(&cmdptr->params.pwrcfg, pdata_buf,
-                        sizeof(struct cmd_ds_802_11_pwr_cfg));
-
-                ret = 0;
-                break;
         case CMD_BT_ACCESS:
-                ret = lbs_cmd_bt_access(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_bt_access(cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_FWT_ACCESS:
-                ret = lbs_cmd_fwt_access(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_fwt_access(cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_GET_TSF:
@@ -1697,36 +1644,6 @@ static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv)
 }
 
 /**
- *  @brief This function cleans command node.
- *
- *  @param ptempnode    A pointer to cmdCtrlNode structure
- *  @return             n/a
- */
-
-/**
- *  @brief This function initializes the command node.
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param ptempnode    A pointer to cmd_ctrl_node structure
- *  @param pdata_buf    A pointer to informaion buffer
- *  @return             0 or -1
- */
-static void lbs_set_cmd_ctrl_node(struct lbs_private *priv,
-                                  struct cmd_ctrl_node *ptempnode,
-                                  void *pdata_buf)
-{
-        lbs_deb_enter(LBS_DEB_HOST);
-
-        if (!ptempnode)
-                return;
-
-        ptempnode->callback = NULL;
-        ptempnode->callback_arg = (unsigned long)pdata_buf;
-
-        lbs_deb_leave(LBS_DEB_HOST);
-}
-
-/**
  *  @brief This function executes next command in command
  *  pending queue. It will put fimware back to PS mode
  *  if applicable.
@@ -1741,9 +1658,9 @@ int lbs_execute_next_command(struct lbs_private *priv)
         unsigned long flags;
         int ret = 0;
 
-        // Debug group is LBS_DEB_THREAD and not LBS_DEB_HOST, because the
-        // only caller to us is lbs_thread() and we get even when a
-        // data packet is received
+        /* Debug group is LBS_DEB_THREAD and not LBS_DEB_HOST, because the
+         * only caller to us is lbs_thread() and we get even when a
+         * data packet is received */
         lbs_deb_enter(LBS_DEB_THREAD);
 
         spin_lock_irqsave(&priv->driver_lock, flags);
@@ -1907,44 +1824,32 @@ void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)
         lbs_deb_leave(LBS_DEB_WEXT);
 }
 
-static int sendconfirmsleep(struct lbs_private *priv, u8 *cmdptr, u16 size)
+static void lbs_send_confirmsleep(struct lbs_private *priv)
 {
         unsigned long flags;
-        int ret = 0;
+        int ret;
 
         lbs_deb_enter(LBS_DEB_HOST);
+        lbs_deb_hex(LBS_DEB_HOST, "sleep confirm", (u8 *) &confirm_sleep,
+                sizeof(confirm_sleep));
 
-        lbs_deb_host("SEND_SLEEPC_CMD: before download, cmd size %d\n",
-               size);
-
-        lbs_deb_hex(LBS_DEB_HOST, "sleep confirm command", cmdptr, size);
-
-        ret = priv->hw_host_to_card(priv, MVMS_CMD, cmdptr, size);
+        ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) &confirm_sleep,
+                sizeof(confirm_sleep));
+        if (ret) {
+                lbs_pr_alert("confirm_sleep failed\n");
+                goto out;
+        }
 
         spin_lock_irqsave(&priv->driver_lock, flags);
-        if (priv->intcounter || priv->currenttxskb)
-                lbs_deb_host("SEND_SLEEPC_CMD: intcounter %d, currenttxskb %p\n",
-                       priv->intcounter, priv->currenttxskb);
-        spin_unlock_irqrestore(&priv->driver_lock, flags);
 
-        if (ret) {
-                lbs_pr_alert(
-                       "SEND_SLEEPC_CMD: Host to Card failed for Confirm Sleep\n");
-        } else {
-                spin_lock_irqsave(&priv->driver_lock, flags);
-                if (!priv->intcounter) {
-                        priv->psstate = PS_STATE_SLEEP;
-                } else {
-                        lbs_deb_host("SEND_SLEEPC_CMD: after sent, intcounter %d\n",
-                               priv->intcounter);
-                }
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
+        /* If nothing to do, go back to sleep (?) */
+        if (!__kfifo_len(priv->event_fifo) && !priv->resp_len[priv->resp_idx])
+                priv->psstate = PS_STATE_SLEEP;
 
-                lbs_deb_host("SEND_SLEEPC_CMD: sent confirm sleep\n");
-        }
+        spin_unlock_irqrestore(&priv->driver_lock, flags);
 
-        lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
-        return ret;
+out:
+        lbs_deb_leave(LBS_DEB_HOST);
 }
 
 void lbs_ps_sleep(struct lbs_private *priv, int wait_option)
@@ -1992,10 +1897,10 @@ void lbs_ps_wakeup(struct lbs_private *priv, int wait_option)
  *  @param psmode       Power Saving mode
  *  @return             n/a
  */
-void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode)
+void lbs_ps_confirm_sleep(struct lbs_private *priv)
 {
         unsigned long flags =0;
-        u8 allowed = 1;
+        int allowed = 1;
 
         lbs_deb_enter(LBS_DEB_HOST);
 
@@ -2005,20 +1910,22 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode)
         }
 
         spin_lock_irqsave(&priv->driver_lock, flags);
+        /* In-progress command? */
         if (priv->cur_cmd) {
                 allowed = 0;
                 lbs_deb_host("cur_cmd was set\n");
         }
-        if (priv->intcounter > 0) {
+
+        /* Pending events or command responses? */
+        if (__kfifo_len(priv->event_fifo) || priv->resp_len[priv->resp_idx]) {
                 allowed = 0;
-                lbs_deb_host("intcounter %d\n", priv->intcounter);
+                lbs_deb_host("pending events or command responses\n");
         }
         spin_unlock_irqrestore(&priv->driver_lock, flags);
 
         if (allowed) {
                 lbs_deb_host("sending lbs_ps_confirm_sleep\n");
-                sendconfirmsleep(priv, (u8 *) & priv->lbs_ps_confirm_sleep,
-                                 sizeof(struct PS_CMD_ConfirmSleep));
+                lbs_send_confirmsleep(priv);
         } else {
                 lbs_deb_host("sleep confirm has been delayed\n");
         }
@@ -2027,39 +1934,10 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode)
 }
 
 
-/**
- *  @brief Simple callback that copies response back into command
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param extra        A pointer to the original command structure for which
- *                      'resp' is a response
- *  @param resp         A pointer to the command response
- *
- *  @return             0 on success, error on failure
- */
-int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,
-                     struct cmd_header *resp)
-{
-        struct cmd_header *buf = (void *)extra;
-        uint16_t copy_len;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        copy_len = min(le16_to_cpu(buf->size), le16_to_cpu(resp->size));
-        lbs_deb_cmd("Copying back %u bytes; command response was %u bytes, "
-                    "copy back buffer was %u bytes\n", copy_len,
-                    le16_to_cpu(resp->size), le16_to_cpu(buf->size));
-        memcpy(buf, resp, copy_len);
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(lbs_cmd_copyback);
-
-struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, uint16_t command,
-                                      struct cmd_header *in_cmd, int in_cmd_size,
-                                      int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),
-                                      unsigned long callback_arg)
+static struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv,
+        uint16_t command, struct cmd_header *in_cmd, int in_cmd_size,
+        int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),
+        unsigned long callback_arg)
 {
         struct cmd_ctrl_node *cmdnode;
 
@@ -2096,9 +1974,6 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, uint16_t command
 
         lbs_deb_host("PREP_CMD: command 0x%04x\n", command);
 
-        /* here was the big old switch() statement, which is now obsolete,
-         * because the caller of lbs_cmd() sets up all of *cmd for us. */
-
         cmdnode->cmdwaitqwoken = 0;
         lbs_queue_cmd(priv, cmdnode);
         wake_up_interruptible(&priv->waitq);
@@ -2108,6 +1983,15 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, uint16_t command
         return cmdnode;
 }
 
+void lbs_cmd_async(struct lbs_private *priv, uint16_t command,
+        struct cmd_header *in_cmd, int in_cmd_size)
+{
+        lbs_deb_enter(LBS_DEB_CMD);
+        __lbs_cmd_async(priv, command, in_cmd, in_cmd_size,
+                lbs_cmd_async_callback, 0);
+        lbs_deb_leave(LBS_DEB_CMD);
+}
+
 int __lbs_cmd(struct lbs_private *priv, uint16_t command,
               struct cmd_header *in_cmd, int in_cmd_size,
               int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),
diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h
index b9ab85cc7913..3dfc2d43c224 100644
--- a/drivers/net/wireless/libertas/cmd.h
+++ b/drivers/net/wireless/libertas/cmd.h
@@ -18,12 +18,9 @@
 #define lbs_cmd_with_response(priv, cmdnr, cmd) \
         lbs_cmd(priv, cmdnr, cmd, lbs_cmd_copyback, (unsigned long) (cmd))
 
-/* __lbs_cmd() will free the cmdnode and return success/failure.
-   __lbs_cmd_async() requires that the callback free the cmdnode */
-struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, uint16_t command,
-                                      struct cmd_header *in_cmd, int in_cmd_size,
-                                      int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),
-                                      unsigned long callback_arg);
+void lbs_cmd_async(struct lbs_private *priv, uint16_t command,
+        struct cmd_header *in_cmd, int in_cmd_size);
+
 int __lbs_cmd(struct lbs_private *priv, uint16_t command,
               struct cmd_header *in_cmd, int in_cmd_size,
               int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),
@@ -57,5 +54,7 @@ int lbs_cmd_802_11_set_wep(struct lbs_private *priv, uint16_t cmd_action,
                            struct assoc_request *assoc);
 int lbs_cmd_802_11_enable_rsn(struct lbs_private *priv, uint16_t cmd_action,
                               uint16_t *enable);
+int lbs_cmd_802_11_key_material(struct lbs_private *priv, uint16_t cmd_action,
+                                struct assoc_request *assoc);
 
 #endif /* _LBS_CMD_H */
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index f0ef7081bdeb..5abecb7673e6 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -12,7 +12,7 @@
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
-#include "join.h"
+#include "assoc.h"
 #include "wext.h"
 
 /**
@@ -74,7 +74,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
                 lbs_deb_cmd("disconnected, so exit PS mode\n");
                 lbs_ps_wakeup(priv, 0);
         }
-        lbs_deb_leave(LBS_DEB_CMD);
+        lbs_deb_leave(LBS_DEB_ASSOC);
 }
 
 /**
@@ -146,22 +146,6 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
         return ret;
 }
 
-static int lbs_ret_802_11_stat(struct lbs_private *priv,
-                                struct cmd_ds_command *resp)
-{
-        lbs_deb_enter(LBS_DEB_CMD);
-/*      currently priv->wlan802_11Stat is unused
-
-        struct cmd_ds_802_11_get_stat *p11Stat = &resp->params.gstat;
-
-        // TODO Convert it to Big endian befor copy
-        memcpy(&priv->wlan802_11Stat,
-               p11Stat, sizeof(struct cmd_ds_802_11_get_stat));
-*/
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
                                     struct cmd_ds_command *resp)
 {
@@ -204,74 +188,6 @@ static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_ret_802_11_key_material(struct lbs_private *priv,
-                                        struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_key_material *pkeymaterial =
-            &resp->params.keymaterial;
-        u16 action = le16_to_cpu(pkeymaterial->action);
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        /* Copy the returned key to driver private data */
-        if (action == CMD_ACT_GET) {
-                u8 * buf_ptr = (u8 *) &pkeymaterial->keyParamSet;
-                u8 * resp_end = (u8 *) (resp + le16_to_cpu(resp->size));
-
-                while (buf_ptr < resp_end) {
-                        struct MrvlIEtype_keyParamSet * pkeyparamset =
-                            (struct MrvlIEtype_keyParamSet *) buf_ptr;
-                        struct enc_key * pkey;
-                        u16 param_set_len = le16_to_cpu(pkeyparamset->length);
-                        u16 key_len = le16_to_cpu(pkeyparamset->keylen);
-                        u16 key_flags = le16_to_cpu(pkeyparamset->keyinfo);
-                        u16 key_type = le16_to_cpu(pkeyparamset->keytypeid);
-                        u8 * end;
-
-                        end = (u8 *) pkeyparamset + sizeof (pkeyparamset->type)
-                                                  + sizeof (pkeyparamset->length)
-                                                  + param_set_len;
-                        /* Make sure we don't access past the end of the IEs */
-                        if (end > resp_end)
-                                break;
-
-                        if (key_flags & KEY_INFO_WPA_UNICAST)
-                                pkey = &priv->wpa_unicast_key;
-                        else if (key_flags & KEY_INFO_WPA_MCAST)
-                                pkey = &priv->wpa_mcast_key;
-                        else
-                                break;
-
-                        /* Copy returned key into driver */
-                        memset(pkey, 0, sizeof(struct enc_key));
-                        if (key_len > sizeof(pkey->key))
-                                break;
-                        pkey->type = key_type;
-                        pkey->flags = key_flags;
-                        pkey->len = key_len;
-                        memcpy(pkey->key, pkeyparamset->key, pkey->len);
-
-                        buf_ptr = end + 1;
-                }
-        }
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        return 0;
-}
-
-static int lbs_ret_802_11_mac_address(struct lbs_private *priv,
-                                       struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_mac_address *macadd = &resp->params.macadd;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        memcpy(priv->current_addr, macadd->macadd, ETH_ALEN);
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv,
                                        struct cmd_ds_command *resp)
 {
@@ -333,45 +249,6 @@ static int lbs_ret_802_11_rssi(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_ret_802_11_eeprom_access(struct lbs_private *priv,
-                                  struct cmd_ds_command *resp)
-{
-        struct lbs_ioctl_regrdwr *pbuf;
-        pbuf = (struct lbs_ioctl_regrdwr *) priv->prdeeprom;
-
-        lbs_deb_enter_args(LBS_DEB_CMD, "len %d",
-               le16_to_cpu(resp->params.rdeeprom.bytecount));
-        if (pbuf->NOB < le16_to_cpu(resp->params.rdeeprom.bytecount)) {
-                pbuf->NOB = 0;
-                lbs_deb_cmd("EEPROM read length too big\n");
-                return -1;
-        }
-        pbuf->NOB = le16_to_cpu(resp->params.rdeeprom.bytecount);
-        if (pbuf->NOB > 0) {
-
-                memcpy(&pbuf->value, (u8 *) & resp->params.rdeeprom.value,
-                       le16_to_cpu(resp->params.rdeeprom.bytecount));
-                lbs_deb_hex(LBS_DEB_CMD, "EEPROM", (char *)&pbuf->value,
-                        le16_to_cpu(resp->params.rdeeprom.bytecount));
-        }
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
-static int lbs_ret_get_log(struct lbs_private *priv,
-                            struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_get_log *logmessage = &resp->params.glog;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        /* Stored little-endian */
-        memcpy(&priv->logmsg, logmessage, sizeof(struct cmd_ds_802_11_get_log));
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
                                         struct cmd_ds_command *resp)
 {
@@ -390,7 +267,6 @@ static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
 }
 
 static inline int handle_cmd_response(struct lbs_private *priv,
-                                      unsigned long dummy,
                                       struct cmd_header *cmd_response)
 {
         struct cmd_ds_command *resp = (struct cmd_ds_command *) cmd_response;
@@ -407,14 +283,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 ret = lbs_ret_reg_access(priv, respcmd, resp);
                 break;
 
-        case CMD_RET(CMD_802_11_SCAN):
-                ret = lbs_ret_80211_scan(priv, resp);
-                break;
-
-        case CMD_RET(CMD_802_11_GET_LOG):
-                ret = lbs_ret_get_log(priv, resp);
-                break;
-
         case CMD_RET_802_11_ASSOCIATE:
         case CMD_RET(CMD_802_11_ASSOCIATE):
         case CMD_RET(CMD_802_11_REASSOCIATE):
@@ -423,7 +291,7 @@ static inline int handle_cmd_response(struct lbs_private *priv,
 
         case CMD_RET(CMD_802_11_DISASSOCIATE):
         case CMD_RET(CMD_802_11_DEAUTHENTICATE):
-                ret = lbs_ret_80211_disassociate(priv, resp);
+                ret = lbs_ret_80211_disassociate(priv);
                 break;
 
         case CMD_RET(CMD_802_11_AD_HOC_START):
@@ -431,10 +299,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 ret = lbs_ret_80211_ad_hoc_start(priv, resp);
                 break;
 
-        case CMD_RET(CMD_802_11_GET_STAT):
-                ret = lbs_ret_802_11_stat(priv, resp);
-                break;
-
         case CMD_RET(CMD_802_11_SNMP_MIB):
                 ret = lbs_ret_802_11_snmp_mib(priv, resp);
                 break;
@@ -453,7 +317,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 break;
 
         case CMD_RET(CMD_MAC_MULTICAST_ADR):
-        case CMD_RET(CMD_MAC_CONTROL):
         case CMD_RET(CMD_802_11_RESET):
         case CMD_RET(CMD_802_11_AUTHENTICATE):
         case CMD_RET(CMD_802_11_BEACON_STOP):
@@ -467,24 +330,12 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 ret = lbs_ret_802_11_rssi(priv, resp);
                 break;
 
-        case CMD_RET(CMD_802_11_MAC_ADDRESS):
-                ret = lbs_ret_802_11_mac_address(priv, resp);
-                break;
-
         case CMD_RET(CMD_802_11_AD_HOC_STOP):
-                ret = lbs_ret_80211_ad_hoc_stop(priv, resp);
-                break;
-
-        case CMD_RET(CMD_802_11_KEY_MATERIAL):
-                ret = lbs_ret_802_11_key_material(priv, resp);
-                break;
-
-        case CMD_RET(CMD_802_11_EEPROM_ACCESS):
-                ret = lbs_ret_802_11_eeprom_access(priv, resp);
+                ret = lbs_ret_80211_ad_hoc_stop(priv);
                 break;
 
         case CMD_RET(CMD_802_11D_DOMAIN_INFO):
-                ret = lbs_ret_802_11d_domain_info(priv, resp);
+                ret = lbs_ret_802_11d_domain_info(resp);
                 break;
 
         case CMD_RET(CMD_802_11_TPC_CFG):
@@ -500,14 +351,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
                 break;
 
-        case CMD_RET(CMD_802_11_PWR_CFG):
-                spin_lock_irqsave(&priv->driver_lock, flags);
-                memmove((void *)priv->cur_cmd->callback_arg, &resp->params.pwrcfg,
-                        sizeof(struct cmd_ds_802_11_pwr_cfg));
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
-
-                break;
-
         case CMD_RET(CMD_GET_TSF):
                 spin_lock_irqsave(&priv->driver_lock, flags);
                 memcpy((void *)priv->cur_cmd->callback_arg,
@@ -541,7 +384,7 @@ static inline int handle_cmd_response(struct lbs_private *priv,
         return ret;
 }
 
-int lbs_process_rx_command(struct lbs_private *priv)
+int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
 {
         uint16_t respcmd, curcmd;
         struct cmd_header *resp;
@@ -561,14 +404,14 @@ int lbs_process_rx_command(struct lbs_private *priv)
                 goto done;
         }
 
-        resp = (void *)priv->upld_buf;
+        resp = (void *)data;
         curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command);
         respcmd = le16_to_cpu(resp->command);
         result = le16_to_cpu(resp->result);
 
-        lbs_deb_host("CMD_RESP: response 0x%04x, seq %d, size %d, jiffies %lu\n",
-                     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies);
-        lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len);
+        lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d\n",
+                     respcmd, le16_to_cpu(resp->seqnum), len);
+        lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, len);
 
         if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
                 lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n",
@@ -687,7 +530,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                 ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg,
                                 resp);
         } else
-                ret = handle_cmd_response(priv, 0, resp);
+                ret = handle_cmd_response(priv, resp);
 
         spin_lock_irqsave(&priv->driver_lock, flags);
 
@@ -705,21 +548,20 @@ done:
 
 static int lbs_send_confirmwake(struct lbs_private *priv)
 {
-        struct cmd_header *cmd = &priv->lbs_ps_confirm_wake;
+        struct cmd_header cmd;
         int ret = 0;
 
         lbs_deb_enter(LBS_DEB_HOST);
 
-        cmd->command = cpu_to_le16(CMD_802_11_WAKEUP_CONFIRM);
-        cmd->size = cpu_to_le16(sizeof(*cmd));
-        cmd->seqnum = cpu_to_le16(++priv->seqnum);
-        cmd->result = 0;
-
-        lbs_deb_host("SEND_WAKEC_CMD: before download\n");
+        cmd.command = cpu_to_le16(CMD_802_11_WAKEUP_CONFIRM);
+        cmd.size = cpu_to_le16(sizeof(cmd));
+        cmd.seqnum = cpu_to_le16(++priv->seqnum);
+        cmd.result = 0;
 
-        lbs_deb_hex(LBS_DEB_HOST, "wake confirm command", (void *)cmd, sizeof(*cmd));
+        lbs_deb_hex(LBS_DEB_HOST, "wake confirm", (u8 *) &cmd,
+                sizeof(cmd));
 
-        ret = priv->hw_host_to_card(priv, MVMS_CMD, (void *)cmd, sizeof(*cmd));
+        ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) &cmd, sizeof(cmd));
         if (ret)
                 lbs_pr_alert("SEND_WAKEC_CMD: Host to Card failed for Confirm Wake\n");
 
@@ -727,22 +569,15 @@ static int lbs_send_confirmwake(struct lbs_private *priv)
         return ret;
 }
 
-int lbs_process_event(struct lbs_private *priv)
+int lbs_process_event(struct lbs_private *priv, u32 event)
 {
         int ret = 0;
-        u32 eventcause;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        spin_lock_irq(&priv->driver_lock);
-        eventcause = priv->eventcause >> SBI_EVENT_CAUSE_SHIFT;
-        spin_unlock_irq(&priv->driver_lock);
-
-        lbs_deb_cmd("event cause %d\n", eventcause);
-
-        switch (eventcause) {
+        switch (event) {
         case MACREG_INT_CODE_LINK_SENSED:
-                lbs_deb_cmd("EVENT: MACREG_INT_CODE_LINK_SENSED\n");
+                lbs_deb_cmd("EVENT: link sensed\n");
                 break;
 
         case MACREG_INT_CODE_DEAUTHENTICATED:
@@ -761,7 +596,7 @@ int lbs_process_event(struct lbs_private *priv)
                 break;
 
         case MACREG_INT_CODE_PS_SLEEP:
-                lbs_deb_cmd("EVENT: sleep\n");
+                lbs_deb_cmd("EVENT: ps sleep\n");
 
                 /* handle unexpected PS SLEEP event */
                 if (priv->psstate == PS_STATE_FULL_POWER) {
@@ -771,17 +606,17 @@ int lbs_process_event(struct lbs_private *priv)
                 }
                 priv->psstate = PS_STATE_PRE_SLEEP;
 
-                lbs_ps_confirm_sleep(priv, (u16) priv->psmode);
+                lbs_ps_confirm_sleep(priv);
 
                 break;
 
         case MACREG_INT_CODE_HOST_AWAKE:
-                lbs_deb_cmd("EVENT: HOST_AWAKE\n");
+                lbs_deb_cmd("EVENT: host awake\n");
                 lbs_send_confirmwake(priv);
                 break;
 
         case MACREG_INT_CODE_PS_AWAKE:
-                lbs_deb_cmd("EVENT: awake\n");
+                lbs_deb_cmd("EVENT: ps awake\n");
                 /* handle unexpected PS AWAKE event */
                 if (priv->psstate == PS_STATE_FULL_POWER) {
                         lbs_deb_cmd(
@@ -812,14 +647,16 @@ int lbs_process_event(struct lbs_private *priv)
                 lbs_deb_cmd("EVENT: MULTICAST MIC ERROR\n");
                 handle_mic_failureevent(priv, MACREG_INT_CODE_MIC_ERR_MULTICAST);
                 break;
+
         case MACREG_INT_CODE_MIB_CHANGED:
+                lbs_deb_cmd("EVENT: MIB CHANGED\n");
+                break;
         case MACREG_INT_CODE_INIT_DONE:
+                lbs_deb_cmd("EVENT: INIT DONE\n");
                 break;
-
         case MACREG_INT_CODE_ADHOC_BCN_LOST:
                 lbs_deb_cmd("EVENT: ADHOC beacon lost\n");
                 break;
-
         case MACREG_INT_CODE_RSSI_LOW:
                 lbs_pr_alert("EVENT: rssi low\n");
                 break;
@@ -854,14 +691,10 @@ int lbs_process_event(struct lbs_private *priv)
                 break;
 
         default:
-                lbs_pr_alert("EVENT: unknown event id %d\n", eventcause);
+                lbs_pr_alert("EVENT: unknown event id %d\n", event);
                 break;
         }
 
-        spin_lock_irq(&priv->driver_lock);
-        priv->eventcause = 0;
-        spin_unlock_irq(&priv->driver_lock);
-
         lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
         return ret;
 }
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index fd67b770dd78..ad2fabca9116 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -19,7 +19,7 @@ static char *szStates[] = {
 };
 
 #ifdef PROC_DEBUG
-static void lbs_debug_init(struct lbs_private *priv, struct net_device *dev);
+static void lbs_debug_init(struct lbs_private *priv);
 #endif
 
 static int open_file_generic(struct inode *inode, struct file *file)
@@ -78,7 +78,7 @@ static ssize_t lbs_getscantable(struct file *file, char __user *userbuf,
                 u16 spectrum_mgmt = (iter_bss->capability & WLAN_CAPABILITY_SPECTRUM_MGMT);
 
                 pos += snprintf(buf+pos, len-pos,
-                        "%02u| %03d | %04ld | %s |",
+                        "%02u| %03d | %04d | %s |",
                         numscansdone, iter_bss->channel, iter_bss->rssi,
                         print_mac(mac, iter_bss->bssid));
                 pos += snprintf(buf+pos, len-pos, " %04x-", iter_bss->capability);
@@ -164,173 +164,6 @@ out_unlock:
         return ret;
 }
 
-static ssize_t lbs_extscan(struct file *file, const char __user *userbuf,
-                                  size_t count, loff_t *ppos)
-{
-        struct lbs_private *priv = file->private_data;
-        ssize_t res, buf_size;
-        union iwreq_data wrqu;
-        unsigned long addr = get_zeroed_page(GFP_KERNEL);
-        char *buf = (char *)addr;
-
-        buf_size = min(count, len - 1);
-        if (copy_from_user(buf, userbuf, buf_size)) {
-                res = -EFAULT;
-                goto out_unlock;
-        }
-
-        lbs_send_specific_ssid_scan(priv, buf, strlen(buf)-1, 0);
-
-        memset(&wrqu, 0, sizeof(union iwreq_data));
-        wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);
-
-out_unlock:
-        free_page(addr);
-        return count;
-}
-
-static void lbs_parse_bssid(char *buf, size_t count,
-        struct lbs_ioctl_user_scan_cfg *scan_cfg)
-{
-        char *hold;
-        unsigned int mac[ETH_ALEN];
-
-        hold = strstr(buf, "bssid=");
-        if (!hold)
-                return;
-        hold += 6;
-        sscanf(hold, "%02x:%02x:%02x:%02x:%02x:%02x",
-               mac, mac+1, mac+2, mac+3, mac+4, mac+5);
-        memcpy(scan_cfg->bssid, mac, ETH_ALEN);
-}
-
-static void lbs_parse_ssid(char *buf, size_t count,
-        struct lbs_ioctl_user_scan_cfg *scan_cfg)
-{
-        char *hold, *end;
-        ssize_t size;
-
-        hold = strstr(buf, "ssid=");
-        if (!hold)
-                return;
-        hold += 5;
-        end = strchr(hold, ' ');
-        if (!end)
-                end = buf + count - 1;
-
-        size = min((size_t)IW_ESSID_MAX_SIZE, (size_t) (end - hold));
-        strncpy(scan_cfg->ssid, hold, size);
-
-        return;
-}
-
-static int lbs_parse_clear(char *buf, size_t count, const char *tag)
-{
-        char *hold;
-        int val;
-
-        hold = strstr(buf, tag);
-        if (!hold)
-                return 0;
-        hold += strlen(tag);
-        sscanf(hold, "%d", &val);
-
-        if (val != 0)
-                val = 1;
-
-        return val;
-}
-
-static int lbs_parse_dur(char *buf, size_t count,
-        struct lbs_ioctl_user_scan_cfg *scan_cfg)
-{
-        char *hold;
-        int val;
-
-        hold = strstr(buf, "dur=");
-        if (!hold)
-                return 0;
-        hold += 4;
-        sscanf(hold, "%d", &val);
-
-        return val;
-}
-
-static void lbs_parse_type(char *buf, size_t count,
-        struct lbs_ioctl_user_scan_cfg *scan_cfg)
-{
-        char *hold;
-        int val;
-
-        hold = strstr(buf, "type=");
-        if (!hold)
-                return;
-        hold += 5;
-        sscanf(hold, "%d", &val);
-
-        /* type=1,2 or 3 */
-        if (val < 1 || val > 3)
-                return;
-
-        scan_cfg->bsstype = val;
-
-        return;
-}
-
-static ssize_t lbs_setuserscan(struct file *file,
-                                    const char __user *userbuf,
-                                    size_t count, loff_t *ppos)
-{
-        struct lbs_private *priv = file->private_data;
-        ssize_t res, buf_size;
-        struct lbs_ioctl_user_scan_cfg *scan_cfg;
-        union iwreq_data wrqu;
-        int dur;
-        char *buf = (char *)get_zeroed_page(GFP_KERNEL);
-
-        if (!buf)
-                return -ENOMEM;
-
-        buf_size = min(count, len - 1);
-        if (copy_from_user(buf, userbuf, buf_size)) {
-                res = -EFAULT;
-                goto out_buf;
-        }
-
-        scan_cfg = kzalloc(sizeof(struct lbs_ioctl_user_scan_cfg), GFP_KERNEL);
-        if (!scan_cfg) {
-                res = -ENOMEM;
-                goto out_buf;
-        }
-        res = count;
-
-        scan_cfg->bsstype = LBS_SCAN_BSS_TYPE_ANY;
-
-        dur = lbs_parse_dur(buf, count, scan_cfg);
-        lbs_parse_bssid(buf, count, scan_cfg);
-        scan_cfg->clear_bssid = lbs_parse_clear(buf, count, "clear_bssid=");
-        lbs_parse_ssid(buf, count, scan_cfg);
-        scan_cfg->clear_ssid = lbs_parse_clear(buf, count, "clear_ssid=");
-        lbs_parse_type(buf, count, scan_cfg);
-
-        lbs_scan_networks(priv, scan_cfg, 1);
-        wait_event_interruptible(priv->cmd_pending,
-                                 priv->surpriseremoved || !priv->last_scanned_channel);
-
-        if (priv->surpriseremoved)
-                goto out_scan_cfg;
-
-        memset(&wrqu, 0x00, sizeof(union iwreq_data));
-        wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);
-
- out_scan_cfg:
-        kfree(scan_cfg);
- out_buf:
-        free_page((unsigned long)buf);
-        return res;
-}
-
-
 /*
  * When calling CMD_802_11_SUBSCRIBE_EVENT with CMD_ACT_GET, me might
  * get a bunch of vendor-specific TLVs (a.k.a. IEs) back from the
@@ -857,8 +690,6 @@ static struct lbs_debugfs_files debugfs_files[] = {
                                         write_file_dummy), },
         { "sleepparams", 0644, FOPS(lbs_sleepparams_read,
                                 lbs_sleepparams_write), },
-        { "extscan", 0600, FOPS(NULL, lbs_extscan), },
-        { "setuserscan", 0600, FOPS(NULL, lbs_setuserscan), },
 };
 
 static struct lbs_debugfs_files debugfs_events_files[] = {
@@ -947,7 +778,7 @@ void lbs_debugfs_init_one(struct lbs_private *priv, struct net_device *dev)
         }
 
 #ifdef PROC_DEBUG
-        lbs_debug_init(priv, dev);
+        lbs_debug_init(priv);
 #endif
 exit:
         return;
@@ -993,7 +824,6 @@ struct debug_data {
 /* To debug any member of struct lbs_private, simply add one line here.
  */
 static struct debug_data items[] = {
-        {"intcounter", item_size(intcounter), item_addr(intcounter)},
         {"psmode", item_size(psmode), item_addr(psmode)},
         {"psstate", item_size(psstate), item_addr(psstate)},
 };
@@ -1121,7 +951,7 @@ static struct file_operations lbs_debug_fops = {
  *  @param dev     pointer net_device
  *  @return        N/A
  */
-static void lbs_debug_init(struct lbs_private *priv, struct net_device *dev)
+static void lbs_debug_init(struct lbs_private *priv)
 {
         int i;
 
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index 4e22341b4f3d..b652fa301e19 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -17,9 +17,9 @@ struct net_device;
 struct cmd_ctrl_node;
 struct cmd_ds_command;
 
-int lbs_set_mac_packet_filter(struct lbs_private *priv);
+void lbs_set_mac_control(struct lbs_private *priv);
 
-void lbs_send_tx_feedback(struct lbs_private *priv);
+void lbs_send_tx_feedback(struct lbs_private *priv, u32 try_count);
 
 int lbs_free_cmd_buffer(struct lbs_private *priv);
 
@@ -30,17 +30,16 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
 
 int lbs_allocate_cmd_buffer(struct lbs_private *priv);
 int lbs_execute_next_command(struct lbs_private *priv);
-int lbs_process_event(struct lbs_private *priv);
-void lbs_interrupt(struct lbs_private *priv);
+int lbs_process_event(struct lbs_private *priv, u32 event);
+void lbs_queue_event(struct lbs_private *priv, u32 event);
+void lbs_notify_command_response(struct lbs_private *priv, u8 resp_idx);
+
 int lbs_set_radio_control(struct lbs_private *priv);
 u32 lbs_fw_index_to_data_rate(u8 index);
 u8 lbs_data_rate_to_fw_index(u32 rate);
-void lbs_get_fwversion(struct lbs_private *priv,
-        char *fwversion,
-        int maxlen);
 
 /** The proc fs interface */
-int lbs_process_rx_command(struct lbs_private *priv);
+int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len);
 void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd,
                           int result);
 int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
@@ -49,7 +48,7 @@ int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band);
 int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *);
 
 void lbs_ps_sleep(struct lbs_private *priv, int wait_option);
-void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode);
+void lbs_ps_confirm_sleep(struct lbs_private *priv);
 void lbs_ps_wakeup(struct lbs_private *priv, int wait_option);
 
 struct chan_freq_power *lbs_find_cfp_by_band_and_channel(
@@ -63,7 +62,6 @@ void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str);
 
 /* main.c */
 struct chan_freq_power *lbs_get_region_cfp_table(u8 region,
-        u8 band,
         int *cfp_no);
 struct lbs_private *lbs_add_card(void *card, struct device *dmdev);
 int lbs_remove_card(struct lbs_private *priv);
@@ -72,4 +70,9 @@ int lbs_stop_card(struct lbs_private *priv);
 void lbs_host_to_card_done(struct lbs_private *priv);
 
 int lbs_update_channel(struct lbs_private *priv);
+
+#ifndef CONFIG_IEEE80211
+const char *escape_essid(const char *essid, u8 essid_len);
+#endif
+
 #endif
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index 3053cc2160bc..d39520111062 100644
--- a/drivers/net/wireless/libertas/defs.h
+++ b/drivers/net/wireless/libertas/defs.h
@@ -53,14 +53,14 @@ do { if ((lbs_debug & (grp)) == (grp)) \
 #endif
 
 #define lbs_deb_enter(grp) \
-  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s():%d\n", __FUNCTION__, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s()\n", __func__);
 #define lbs_deb_enter_args(grp, fmt, args...) \
-  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt "):%d\n", __FUNCTION__, ## args, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt ")\n", __func__, ## args);
 #define lbs_deb_leave(grp) \
-  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d\n", __FUNCTION__, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s()\n", __func__);
 #define lbs_deb_leave_args(grp, fmt, args...) \
-  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d, " fmt "\n", \
-  __FUNCTION__, __LINE__, ##args);
+  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s(), " fmt "\n", \
+  __func__, ##args);
 #define lbs_deb_main(fmt, args...)      LBS_DEB_LL(LBS_DEB_MAIN, " main", fmt, ##args)
 #define lbs_deb_net(fmt, args...)       LBS_DEB_LL(LBS_DEB_NET, " net", fmt, ##args)
 #define lbs_deb_mesh(fmt, args...)      LBS_DEB_LL(LBS_DEB_MESH, " mesh", fmt, ##args)
@@ -177,8 +177,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
 #define MRVDRV_CMD_UPLD_RDY             0x0008
 #define MRVDRV_CARDEVENT                0x0010
 
-#define SBI_EVENT_CAUSE_SHIFT           3
-
 /** TxPD status */
 
 /*      Station firmware use TxPD status field to report final Tx transmit
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 5a69f2b60865..0d9edb9b11f5 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -10,9 +10,10 @@
 #include <linux/wireless.h>
 #include <linux/ethtool.h>
 #include <linux/debugfs.h>
+#include <net/ieee80211.h>
 
 #include "defs.h"
-#include "scan.h"
+#include "hostcmd.h"
 
 extern struct ethtool_ops lbs_ethtool_ops;
 
@@ -128,10 +129,6 @@ struct lbs_private {
         u32 bbp_offset;
         u32 rf_offset;
 
-        /** Upload length */
-        u32 upld_len;
-        /* Upload buffer */
-        u8 upld_buf[LBS_UPLD_SIZE];
         /* Download sent:
            bit0 1/0=data_sent/data_tx_done,
            bit1 1/0=cmd_sent/cmd_tx_done,
@@ -143,27 +140,27 @@ struct lbs_private {
         wait_queue_head_t waitq;
         struct workqueue_struct *work_thread;
 
+        /** Scanning */
         struct delayed_work scan_work;
         struct delayed_work assoc_work;
         struct work_struct sync_channel;
+        /* remember which channel was scanned last, != 0 if currently scanning */
+        int scan_channel;
+        u8 scan_ssid[IW_ESSID_MAX_SIZE + 1];
+        u8 scan_ssid_len;
 
         /** Hardware access */
         int (*hw_host_to_card) (struct lbs_private *priv, u8 type, u8 *payload, u16 nb);
-        int (*hw_get_int_status) (struct lbs_private *priv, u8 *);
-        int (*hw_read_event_cause) (struct lbs_private *);
 
         /* Wake On LAN */
         uint32_t wol_criteria;
         uint8_t wol_gpio;
         uint8_t wol_gap;
 
-        /* was struct lbs_adapter from here... */
-
         /** Wlan adapter data structure*/
         /** STATUS variables */
         u32 fwrelease;
         u32 fwcapinfo;
-        /* protected with big lock */
 
         struct mutex lock;
 
@@ -175,7 +172,6 @@ struct lbs_private {
 
         /** command-related variables */
         u16 seqnum;
-        /* protected by big lock */
 
         struct cmd_ctrl_node *cmd_array;
         /** Current command */
@@ -188,12 +184,17 @@ struct lbs_private {
         struct list_head cmdpendingq;
 
         wait_queue_head_t cmd_pending;
-        /* command related variables protected by priv->driver_lock */
 
-        /** Async and Sync Event variables */
-        u32 intcounter;
-        u32 eventcause;
-        u8 nodename[16];        /* nickname */
+        /* Command responses sent from the hardware to the driver */
+        u8 resp_idx;
+        u8 resp_buf[2][LBS_UPLD_SIZE];
+        u32 resp_len[2];
+
+        /* Events sent from hardware to driver */
+        struct kfifo *event_fifo;
+
+        /* nickname */
+        u8 nodename[16];
 
         /** spin locks */
         spinlock_t driver_lock;
@@ -203,8 +204,6 @@ struct lbs_private {
         int nr_retries;
         int cmd_timed_out;
 
-        u8 hisregcpy;
-
         /** current ssid/bssid related parameters*/
         struct current_bss_params curbssparams;
 
@@ -247,7 +246,7 @@ struct lbs_private {
         struct sk_buff *currenttxskb;
 
         /** NIC Operation characteristics */
-        u16 currentpacketfilter;
+        u16 mac_control;
         u32 connect_status;
         u32 mesh_connect_status;
         u16 regioncode;
@@ -262,9 +261,6 @@ struct lbs_private {
         char ps_supported;
         u8 needtowakeup;
 
-        struct PS_CMD_ConfirmSleep lbs_ps_confirm_sleep;
-        struct cmd_header lbs_ps_confirm_wake;
-
         struct assoc_request * pending_assoc_req;
         struct assoc_request * in_progress_assoc_req;
 
@@ -315,16 +311,52 @@ struct lbs_private {
         u32 enable11d;
 
         /**     MISCELLANEOUS */
-        u8 *prdeeprom;
         struct lbs_offset_value offsetvalue;
 
-        struct cmd_ds_802_11_get_log logmsg;
-
         u32 monitormode;
-        int last_scanned_channel;
         u8 fw_ready;
 };
 
+extern struct cmd_confirm_sleep confirm_sleep;
+
+/**
+ *  @brief Structure used to store information for each beacon/probe response
+ */
+struct bss_descriptor {
+        u8 bssid[ETH_ALEN];
+
+        u8 ssid[IW_ESSID_MAX_SIZE + 1];
+        u8 ssid_len;
+
+        u16 capability;
+        u32 rssi;
+        u32 channel;
+        u16 beaconperiod;
+        u32 atimwindow;
+
+        /* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */
+        u8 mode;
+
+        /* zero-terminated array of supported data rates */
+        u8 rates[MAX_RATES + 1];
+
+        unsigned long last_scanned;
+
+        union ieeetypes_phyparamset phyparamset;
+        union IEEEtypes_ssparamset ssparamset;
+
+        struct ieeetypes_countryinfofullset countryinfo;
+
+        u8 wpa_ie[MAX_WPA_IE_LEN];
+        size_t wpa_ie_len;
+        u8 rsn_ie[MAX_WPA_IE_LEN];
+        size_t rsn_ie_len;
+
+        u8 mesh;
+
+        struct list_head list;
+};
+
 /** Association request
  *
  * Encapsulates all the options that describe a specific assocation request
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index 21e6f988ea81..dcfdb404678b 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -6,7 +6,6 @@
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
-#include "join.h"
 #include "wext.h"
 #include "cmd.h"
 
@@ -25,13 +24,14 @@ static void lbs_ethtool_get_drvinfo(struct net_device *dev,
                                          struct ethtool_drvinfo *info)
 {
         struct lbs_private *priv = (struct lbs_private *) dev->priv;
-        char fwver[32];
-
-        lbs_get_fwversion(priv, fwver, sizeof(fwver) - 1);
 
+        snprintf(info->fw_version, 32, "%u.%u.%u.p%u",
+                priv->fwrelease >> 24 & 0xff,
+                priv->fwrelease >> 16 & 0xff,
+                priv->fwrelease >>  8 & 0xff,
+                priv->fwrelease       & 0xff);
         strcpy(info->driver, "libertas");
         strcpy(info->version, lbs_driver_version);
-        strcpy(info->fw_version, fwver);
 }
 
 /* All 8388 parts have 16KiB EEPROM size at the time of writing.
@@ -48,61 +48,28 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev,
                                   struct ethtool_eeprom *eeprom, u8 * bytes)
 {
         struct lbs_private *priv = (struct lbs_private *) dev->priv;
-        struct lbs_ioctl_regrdwr regctrl;
-        char *ptr;
+        struct cmd_ds_802_11_eeprom_access cmd;
         int ret;
 
-        regctrl.action = 0;
-        regctrl.offset = eeprom->offset;
-        regctrl.NOB = eeprom->len;
-
-        if (eeprom->offset + eeprom->len > LBS_EEPROM_LEN)
-                return -EINVAL;
-
-//      mutex_lock(&priv->mutex);
-
-        priv->prdeeprom = kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
-        if (!priv->prdeeprom)
-                return -ENOMEM;
-        memcpy(priv->prdeeprom, &regctrl, sizeof(regctrl));
-
-        /* +14 is for action, offset, and NOB in
-         * response */
-        lbs_deb_ethtool("action:%d offset: %x NOB: %02x\n",
-               regctrl.action, regctrl.offset, regctrl.NOB);
+        lbs_deb_enter(LBS_DEB_ETHTOOL);
 
-        ret = lbs_prepare_and_send_command(priv,
-                                    CMD_802_11_EEPROM_ACCESS,
-                                    regctrl.action,
-                                    CMD_OPTION_WAITFORRSP, 0,
-                                    &regctrl);
-
-        if (ret) {
-                if (priv->prdeeprom)
-                        kfree(priv->prdeeprom);
-                goto done;
+        if (eeprom->offset + eeprom->len > LBS_EEPROM_LEN ||
+            eeprom->len > LBS_EEPROM_READ_LEN) {
+                ret = -EINVAL;
+                goto out;
         }
 
-        mdelay(10);
-
-        ptr = (char *)priv->prdeeprom;
-
-        /* skip the command header, but include the "value" u32 variable */
-        ptr = ptr + sizeof(struct lbs_ioctl_regrdwr) - 4;
-
-        /*
-         * Return the result back to the user
-         */
-        memcpy(bytes, ptr, eeprom->len);
-
-        if (priv->prdeeprom)
-                kfree(priv->prdeeprom);
-//      mutex_unlock(&priv->mutex);
-
-        ret = 0;
-
-done:
-        lbs_deb_enter_args(LBS_DEB_ETHTOOL, "ret %d", ret);
+        cmd.hdr.size = cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) -
+                LBS_EEPROM_READ_LEN + eeprom->len);
+        cmd.action = cpu_to_le16(CMD_ACT_GET);
+        cmd.offset = cpu_to_le16(eeprom->offset);
+        cmd.len    = cpu_to_le16(eeprom->len);
+        ret = lbs_cmd_with_response(priv, CMD_802_11_EEPROM_ACCESS, &cmd);
+        if (!ret)
+                memcpy(bytes, cmd.value, eeprom->len);
+
+out:
+        lbs_deb_leave_args(LBS_DEB_ETHTOOL, "ret %d", ret);
         return ret;
 }
 
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 1aa04076b1ac..3915c3144fad 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -33,7 +33,6 @@
 #define CMD_RET_802_11_ASSOCIATE                0x8012
 
 /* Command codes */
-#define CMD_CODE_DNLD                           0x0002
 #define CMD_GET_HW_SPEC                         0x0003
 #define CMD_EEPROM_UPDATE                       0x0004
 #define CMD_802_11_RESET                        0x0005
@@ -68,8 +67,6 @@
 #define CMD_802_11_AD_HOC_JOIN                  0x002c
 #define CMD_802_11_QUERY_TKIP_REPLY_CNTRS       0x002e
 #define CMD_802_11_ENABLE_RSN                   0x002f
-#define CMD_802_11_PAIRWISE_TSC                 0x0036
-#define CMD_802_11_GROUP_TSC                    0x0037
 #define CMD_802_11_SET_AFC                      0x003c
 #define CMD_802_11_GET_AFC                      0x003d
 #define CMD_802_11_AD_HOC_STOP                  0x0040
@@ -87,7 +84,6 @@
 #define CMD_802_11_INACTIVITY_TIMEOUT           0x0067
 #define CMD_802_11_SLEEP_PERIOD                 0x0068
 #define CMD_802_11_TPC_CFG                      0x0072
-#define CMD_802_11_PWR_CFG                      0x0073
 #define CMD_802_11_FW_WAKE_METHOD               0x0074
 #define CMD_802_11_SUBSCRIBE_EVENT              0x0075
 #define CMD_802_11_RATE_ADAPT_RATESET           0x0076
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index d35b015b6657..f29bc5bbda3e 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -174,9 +174,11 @@ struct cmd_ds_802_11_subscribe_event {
  * Define data structure for CMD_802_11_SCAN
  */
 struct cmd_ds_802_11_scan {
-        u8 bsstype;
-        u8 bssid[ETH_ALEN];
-        u8 tlvbuffer[1];
+        struct cmd_header hdr;
+
+        uint8_t bsstype;
+        uint8_t bssid[ETH_ALEN];
+        uint8_t tlvbuffer[0];
 #if 0
         mrvlietypes_ssidparamset_t ssidParamSet;
         mrvlietypes_chanlistparamset_t ChanListParamSet;
@@ -185,12 +187,16 @@ struct cmd_ds_802_11_scan {
 };
 
 struct cmd_ds_802_11_scan_rsp {
+        struct cmd_header hdr;
+
         __le16 bssdescriptsize;
-        u8 nr_sets;
-        u8 bssdesc_and_tlvbuffer[1];
+        uint8_t nr_sets;
+        uint8_t bssdesc_and_tlvbuffer[0];
 };
 
 struct cmd_ds_802_11_get_log {
+        struct cmd_header hdr;
+
         __le32 mcasttxframe;
         __le32 failed;
         __le32 retry;
@@ -207,8 +213,9 @@ struct cmd_ds_802_11_get_log {
 };
 
 struct cmd_ds_mac_control {
+        struct cmd_header hdr;
         __le16 action;
-        __le16 reserved;
+        u16 reserved;
 };
 
 struct cmd_ds_mac_multicast_adr {
@@ -420,6 +427,8 @@ struct cmd_ds_802_11_rssi_rsp {
 };
 
 struct cmd_ds_802_11_mac_address {
+        struct cmd_header hdr;
+
         __le16 action;
         u8 macadd[ETH_ALEN];
 };
@@ -471,14 +480,11 @@ struct cmd_ds_802_11_ps_mode {
         __le16 locallisteninterval;
 };
 
-struct PS_CMD_ConfirmSleep {
-        __le16 command;
-        __le16 size;
-        __le16 seqnum;
-        __le16 result;
+struct cmd_confirm_sleep {
+        struct cmd_header hdr;
 
         __le16 action;
-        __le16 reserved1;
+        __le16 nullpktinterval;
         __le16 multipledtim;
         __le16 reserved;
         __le16 locallisteninterval;
@@ -572,17 +578,20 @@ struct cmd_ds_host_sleep {
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_key_material {
+        struct cmd_header hdr;
+
         __le16 action;
         struct MrvlIEtype_keyParamSet keyParamSet[2];
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_eeprom_access {
+        struct cmd_header hdr;
         __le16 action;
-
-        /* multiple 4 */
         __le16 offset;
-        __le16 bytecount;
-        u8 value;
+        __le16 len;
+        /* firmware says it returns a maximum of 20 bytes */
+#define LBS_EEPROM_READ_LEN 20
+        u8 value[LBS_EEPROM_READ_LEN];
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_tpc_cfg {
@@ -600,14 +609,6 @@ struct cmd_ds_802_11_led_ctrl {
         u8 data[256];
 } __attribute__ ((packed));
 
-struct cmd_ds_802_11_pwr_cfg {
-        __le16 action;
-        u8 enable;
-        s8 PA_P0;
-        s8 PA_P1;
-        s8 PA_P2;
-} __attribute__ ((packed));
-
 struct cmd_ds_802_11_afc {
         __le16 afc_auto;
         union {
@@ -689,15 +690,11 @@ struct cmd_ds_command {
         /* command Body */
         union {
                 struct cmd_ds_802_11_ps_mode psmode;
-                struct cmd_ds_802_11_scan scan;
-                struct cmd_ds_802_11_scan_rsp scanresp;
-                struct cmd_ds_mac_control macctrl;
                 struct cmd_ds_802_11_associate associate;
                 struct cmd_ds_802_11_deauthenticate deauth;
                 struct cmd_ds_802_11_ad_hoc_start ads;
                 struct cmd_ds_802_11_reset reset;
                 struct cmd_ds_802_11_ad_hoc_result result;
-                struct cmd_ds_802_11_get_log glog;
                 struct cmd_ds_802_11_authenticate auth;
                 struct cmd_ds_802_11_get_stat gstat;
                 struct cmd_ds_802_3_get_stat gstat_8023;
@@ -711,18 +708,14 @@ struct cmd_ds_command {
                 struct cmd_ds_802_11_rssi rssi;
                 struct cmd_ds_802_11_rssi_rsp rssirsp;
                 struct cmd_ds_802_11_disassociate dassociate;
-                struct cmd_ds_802_11_mac_address macadd;
-                struct cmd_ds_802_11_key_material keymaterial;
                 struct cmd_ds_mac_reg_access macreg;
                 struct cmd_ds_bbp_reg_access bbpreg;
                 struct cmd_ds_rf_reg_access rfreg;
-                struct cmd_ds_802_11_eeprom_access rdeeprom;
 
                 struct cmd_ds_802_11d_domain_info domaininfo;
                 struct cmd_ds_802_11d_domain_info domaininforesp;
 
                 struct cmd_ds_802_11_tpc_cfg tpccfg;
-                struct cmd_ds_802_11_pwr_cfg pwrcfg;
                 struct cmd_ds_802_11_afc afc;
                 struct cmd_ds_802_11_led_ctrl ledgpio;
 
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 038c66a98f15..54280e292ea5 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -83,14 +83,14 @@ static inline unsigned int if_cs_read8(struct if_cs_card *card, uint reg)
 {
         unsigned int val = ioread8(card->iobase + reg);
         if (debug_output)
-                printk(KERN_INFO "##inb %08x<%02x\n", reg, val);
+                printk(KERN_INFO "inb %08x<%02x\n", reg, val);
         return val;
 }
 static inline unsigned int if_cs_read16(struct if_cs_card *card, uint reg)
 {
         unsigned int val = ioread16(card->iobase + reg);
         if (debug_output)
-                printk(KERN_INFO "##inw %08x<%04x\n", reg, val);
+                printk(KERN_INFO "inw %08x<%04x\n", reg, val);
         return val;
 }
 static inline void if_cs_read16_rep(
@@ -100,7 +100,7 @@ static inline void if_cs_read16_rep(
         unsigned long count)
 {
         if (debug_output)
-                printk(KERN_INFO "##insw %08x<(0x%lx words)\n",
+                printk(KERN_INFO "insw %08x<(0x%lx words)\n",
                         reg, count);
         ioread16_rep(card->iobase + reg, buf, count);
 }
@@ -108,14 +108,14 @@ static inline void if_cs_read16_rep(
 static inline void if_cs_write8(struct if_cs_card *card, uint reg, u8 val)
 {
         if (debug_output)
-                printk(KERN_INFO "##outb %08x>%02x\n", reg, val);
+                printk(KERN_INFO "outb %08x>%02x\n", reg, val);
         iowrite8(val, card->iobase + reg);
 }
 
 static inline void if_cs_write16(struct if_cs_card *card, uint reg, u16 val)
 {
         if (debug_output)
-                printk(KERN_INFO "##outw %08x>%04x\n", reg, val);
+                printk(KERN_INFO "outw %08x>%04x\n", reg, val);
         iowrite16(val, card->iobase + reg);
 }
 
@@ -126,7 +126,7 @@ static inline void if_cs_write16_rep(
         unsigned long count)
 {
         if (debug_output)
-                printk(KERN_INFO "##outsw %08x>(0x%lx words)\n",
+                printk(KERN_INFO "outsw %08x>(0x%lx words)\n",
                         reg, count);
         iowrite16_rep(card->iobase + reg, buf, count);
 }
@@ -199,17 +199,6 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r
 #define IF_CS_C_S_CARDEVENT             0x0010
 #define IF_CS_C_S_MASK                  0x001f
 #define IF_CS_C_S_STATUS_MASK           0x7f00
-/* The following definitions should be the same as the MRVDRV_ ones */
-
-#if MRVDRV_CMD_DNLD_RDY != IF_CS_C_S_CMD_DNLD_RDY
-#error MRVDRV_CMD_DNLD_RDY and IF_CS_C_S_CMD_DNLD_RDY not in sync
-#endif
-#if MRVDRV_CMD_UPLD_RDY != IF_CS_C_S_CMD_UPLD_RDY
-#error MRVDRV_CMD_UPLD_RDY and IF_CS_C_S_CMD_UPLD_RDY not in sync
-#endif
-#if MRVDRV_CARDEVENT != IF_CS_C_S_CARDEVENT
-#error MRVDRV_CARDEVENT and IF_CS_C_S_CARDEVENT not in sync
-#endif
 
 #define IF_CS_C_INT_CAUSE               0x00000022
 #define IF_CS_C_IC_MASK                 0x001f
@@ -226,55 +215,6 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r
 
 
 /********************************************************************/
-/* Interrupts                                                       */
-/********************************************************************/
-
-static inline void if_cs_enable_ints(struct if_cs_card *card)
-{
-        lbs_deb_enter(LBS_DEB_CS);
-        if_cs_write16(card, IF_CS_H_INT_MASK, 0);
-}
-
-static inline void if_cs_disable_ints(struct if_cs_card *card)
-{
-        lbs_deb_enter(LBS_DEB_CS);
-        if_cs_write16(card, IF_CS_H_INT_MASK, IF_CS_H_IM_MASK);
-}
-
-static irqreturn_t if_cs_interrupt(int irq, void *data)
-{
-        struct if_cs_card *card = data;
-        u16 int_cause;
-
-        lbs_deb_enter(LBS_DEB_CS);
-
-        int_cause = if_cs_read16(card, IF_CS_C_INT_CAUSE);
-        if (int_cause == 0x0) {
-                /* Not for us */
-                return IRQ_NONE;
-
-        } else if (int_cause == 0xffff) {
-                /* Read in junk, the card has probably been removed */
-                card->priv->surpriseremoved = 1;
-                return IRQ_HANDLED;
-        } else {
-                if (int_cause & IF_CS_H_IC_TX_OVER)
-                        lbs_host_to_card_done(card->priv);
-
-                /* clear interrupt */
-                if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK);
-        }
-        spin_lock(&card->priv->driver_lock);
-        lbs_interrupt(card->priv);
-        spin_unlock(&card->priv->driver_lock);
-
-        return IRQ_HANDLED;
-}
-
-
-
-
-/********************************************************************/
 /* I/O                                                              */
 /********************************************************************/
 
@@ -351,6 +291,7 @@ static void if_cs_send_data(struct lbs_private *priv, u8 *buf, u16 nb)
  */
 static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len)
 {
+        unsigned long flags;
         int ret = -1;
         u16 val;
 
@@ -378,6 +319,12 @@ static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len)
          * bytes */
         *len -= 8;
         ret = 0;
+
+        /* Clear this flag again */
+        spin_lock_irqsave(&priv->driver_lock, flags);
+        priv->dnld_sent = DNLD_RES_RECEIVED;
+        spin_unlock_irqrestore(&priv->driver_lock, flags);
+
 out:
         lbs_deb_leave_args(LBS_DEB_CS, "ret %d, len %d", ret, *len);
         return ret;
@@ -396,11 +343,9 @@ static struct sk_buff *if_cs_receive_data(struct lbs_private *priv)
         if (len == 0 || len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) {
                 lbs_pr_err("card data buffer has invalid # of bytes (%d)\n", len);
                 priv->stats.rx_dropped++;
-                printk(KERN_INFO "##HS %s:%d TODO\n", __FUNCTION__, __LINE__);
                 goto dat_err;
         }
 
-        //TODO: skb = dev_alloc_skb(len+ETH_FRAME_LEN+MRVDRV_SNAP_HEADER_LEN+EXTRA_LEN);
         skb = dev_alloc_skb(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE + 2);
         if (!skb)
                 goto out;
@@ -425,6 +370,96 @@ out:
 
 
 /********************************************************************/
+/* Interrupts                                                       */
+/********************************************************************/
+
+static inline void if_cs_enable_ints(struct if_cs_card *card)
+{
+        lbs_deb_enter(LBS_DEB_CS);
+        if_cs_write16(card, IF_CS_H_INT_MASK, 0);
+}
+
+static inline void if_cs_disable_ints(struct if_cs_card *card)
+{
+        lbs_deb_enter(LBS_DEB_CS);
+        if_cs_write16(card, IF_CS_H_INT_MASK, IF_CS_H_IM_MASK);
+}
+
+
+static irqreturn_t if_cs_interrupt(int irq, void *data)
+{
+        struct if_cs_card *card = data;
+        struct lbs_private *priv = card->priv;
+        u16 cause;
+
+        lbs_deb_enter(LBS_DEB_CS);
+
+        cause = if_cs_read16(card, IF_CS_C_INT_CAUSE);
+        if_cs_write16(card, IF_CS_C_INT_CAUSE, cause & IF_CS_C_IC_MASK);
+
+        lbs_deb_cs("cause 0x%04x\n", cause);
+        if (cause == 0) {
+                /* Not for us */
+                return IRQ_NONE;
+        }
+
+        if (cause == 0xffff) {
+                /* Read in junk, the card has probably been removed */
+                card->priv->surpriseremoved = 1;
+                return IRQ_HANDLED;
+        }
+
+        /* TODO: I'm not sure what the best ordering is */
+
+        cause = if_cs_read16(card, IF_CS_C_STATUS) & IF_CS_C_S_MASK;
+
+        if (cause & IF_CS_C_S_RX_UPLD_RDY) {
+                struct sk_buff *skb;
+                lbs_deb_cs("rx packet\n");
+                skb = if_cs_receive_data(priv);
+                if (skb)
+                        lbs_process_rxed_packet(priv, skb);
+        }
+
+        if (cause & IF_CS_H_IC_TX_OVER) {
+                lbs_deb_cs("tx over\n");
+                lbs_host_to_card_done(priv);
+        }
+
+        if (cause & IF_CS_C_S_CMD_UPLD_RDY) {
+                unsigned long flags;
+                u8 i;
+
+                lbs_deb_cs("cmd upload ready\n");
+                spin_lock_irqsave(&priv->driver_lock, flags);
+                i = (priv->resp_idx == 0) ? 1 : 0;
+                spin_unlock_irqrestore(&priv->driver_lock, flags);
+
+                BUG_ON(priv->resp_len[i]);
+                if_cs_receive_cmdres(priv, priv->resp_buf[i],
+                        &priv->resp_len[i]);
+
+                spin_lock_irqsave(&priv->driver_lock, flags);
+                lbs_notify_command_response(priv, i);
+                spin_unlock_irqrestore(&priv->driver_lock, flags);
+        }
+
+        if (cause & IF_CS_H_IC_HOST_EVENT) {
+                u16 event = if_cs_read16(priv->card, IF_CS_C_STATUS)
+                        & IF_CS_C_S_STATUS_MASK;
+                if_cs_write16(priv->card, IF_CS_H_INT_CAUSE,
+                        IF_CS_H_IC_HOST_EVENT);
+                lbs_deb_cs("eventcause 0x%04x\n", event);
+                lbs_queue_event(priv, event >> 8 & 0xff);
+        }
+
+        return IRQ_HANDLED;
+}
+
+
+
+
+/********************************************************************/
 /* Firmware                                                         */
 /********************************************************************/
 
@@ -476,8 +511,6 @@ static int if_cs_prog_helper(struct if_cs_card *card)
 
                 if (remain < count)
                         count = remain;
-                /* printk(KERN_INFO "//HS %d loading %d of %d bytes\n",
-                        __LINE__, sent, fw->size); */
 
                 /* "write the number of bytes to be sent to the I/O Command
                  * write length register" */
@@ -544,18 +577,12 @@ static int if_cs_prog_real(struct if_cs_card *card)
 
         ret = if_cs_poll_while_fw_download(card, IF_CS_C_SQ_READ_LOW, IF_CS_C_SQ_HELPER_OK);
         if (ret < 0) {
-                int i;
                 lbs_pr_err("helper firmware doesn't answer\n");
-                for (i = 0; i < 0x50; i += 2)
-                        printk(KERN_INFO "## HS %02x: %04x\n",
-                                i, if_cs_read16(card, i));
                 goto err_release;
         }
 
         for (sent = 0; sent < fw->size; sent += len) {
                 len = if_cs_read16(card, IF_CS_C_SQ_READ_LOW);
-                /* printk(KERN_INFO "//HS %d loading %d of %d bytes\n",
-                        __LINE__, sent, fw->size); */
                 if (len & 1) {
                         retry++;
                         lbs_pr_info("odd, need to retry this firmware block\n");
@@ -642,64 +669,6 @@ static int if_cs_host_to_card(struct lbs_private *priv,
 }
 
 
-static int if_cs_get_int_status(struct lbs_private *priv, u8 *ireg)
-{
-        struct if_cs_card *card = (struct if_cs_card *)priv->card;
-        int ret = 0;
-        u16 int_cause;
-        *ireg = 0;
-
-        lbs_deb_enter(LBS_DEB_CS);
-
-        if (priv->surpriseremoved)
-                goto out;
-
-        int_cause = if_cs_read16(card, IF_CS_C_INT_CAUSE) & IF_CS_C_IC_MASK;
-        if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause);
-
-        *ireg = if_cs_read16(card, IF_CS_C_STATUS) & IF_CS_C_S_MASK;
-
-        if (!*ireg)
-                goto sbi_get_int_status_exit;
-
-sbi_get_int_status_exit:
-
-        /* is there a data packet for us? */
-        if (*ireg & IF_CS_C_S_RX_UPLD_RDY) {
-                struct sk_buff *skb = if_cs_receive_data(priv);
-                lbs_process_rxed_packet(priv, skb);
-                *ireg &= ~IF_CS_C_S_RX_UPLD_RDY;
-        }
-
-        if (*ireg & IF_CS_C_S_TX_DNLD_RDY) {
-                priv->dnld_sent = DNLD_RES_RECEIVED;
-        }
-
-        /* Card has a command result for us */
-        if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
-                ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
-                if (ret < 0)
-                        lbs_pr_err("could not receive cmd from card\n");
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_CS, "ret %d, ireg 0x%x, hisregcpy 0x%x", ret, *ireg, priv->hisregcpy);
-        return ret;
-}
-
-
-static int if_cs_read_event_cause(struct lbs_private *priv)
-{
-        lbs_deb_enter(LBS_DEB_CS);
-
-        priv->eventcause = (if_cs_read16(priv->card, IF_CS_C_STATUS) & IF_CS_C_S_STATUS_MASK) >> 5;
-        if_cs_write16(priv->card, IF_CS_H_INT_CAUSE, IF_CS_H_IC_HOST_EVENT);
-
-        return 0;
-}
-
-
-
 /********************************************************************/
 /* Card Services                                                    */
 /********************************************************************/
@@ -852,13 +821,10 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
                 goto out2;
         }
 
-        /* Store pointers to our call-back functions */
+        /* Finish setting up fields in lbs_private */
         card->priv = priv;
         priv->card = card;
-        priv->hw_host_to_card     = if_cs_host_to_card;
-        priv->hw_get_int_status   = if_cs_get_int_status;
-        priv->hw_read_event_cause = if_cs_read_event_cause;
-
+        priv->hw_host_to_card = if_cs_host_to_card;
         priv->fw_ready = 1;
 
         /* Now actually get the IRQ */
@@ -880,6 +846,9 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
                 goto out3;
         }
 
+        /* The firmware for the CF card supports powersave */
+        priv->ps_supported = 1;
+
         ret = 0;
         goto out;
 
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index eed73204bcc9..51f664bbee9d 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -91,8 +91,6 @@ struct if_sdio_card {
         const char              *firmware;
 
         u8                      buffer[65536];
-        u8                      int_cause;
-        u32                     event;
 
         spinlock_t              lock;
         struct if_sdio_packet   *packets;
@@ -129,13 +127,13 @@ static u16 if_sdio_read_scratch(struct if_sdio_card *card, int *err)
 static int if_sdio_handle_cmd(struct if_sdio_card *card,
                 u8 *buffer, unsigned size)
 {
+        struct lbs_private *priv = card->priv;
         int ret;
         unsigned long flags;
+        u8 i;
 
         lbs_deb_enter(LBS_DEB_SDIO);
 
-        spin_lock_irqsave(&card->priv->driver_lock, flags);
-
         if (size > LBS_CMD_BUFFER_SIZE) {
                 lbs_deb_sdio("response packet too large (%d bytes)\n",
                         (int)size);
@@ -143,20 +141,20 @@ static int if_sdio_handle_cmd(struct if_sdio_card *card,
                 goto out;
         }
 
-        memcpy(card->priv->upld_buf, buffer, size);
-        card->priv->upld_len = size;
+        spin_lock_irqsave(&priv->driver_lock, flags);
 
-        card->int_cause |= MRVDRV_CMD_UPLD_RDY;
+        i = (priv->resp_idx == 0) ? 1 : 0;
+        BUG_ON(priv->resp_len[i]);
+        priv->resp_len[i] = size;
+        memcpy(priv->resp_buf[i], buffer, size);
+        lbs_notify_command_response(priv, i);
 
-        lbs_interrupt(card->priv);
+        spin_unlock_irqrestore(&card->priv->driver_lock, flags);
 
         ret = 0;
 
 out:
-        spin_unlock_irqrestore(&card->priv->driver_lock, flags);
-
         lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);
-
         return ret;
 }
 
@@ -202,7 +200,6 @@ static int if_sdio_handle_event(struct if_sdio_card *card,
                 u8 *buffer, unsigned size)
 {
         int ret;
-        unsigned long flags;
         u32 event;
 
         lbs_deb_enter(LBS_DEB_SDIO);
@@ -222,18 +219,9 @@ static int if_sdio_handle_event(struct if_sdio_card *card,
                 event |= buffer[2] << 16;
                 event |= buffer[1] << 8;
                 event |= buffer[0] << 0;
-                event <<= SBI_EVENT_CAUSE_SHIFT;
         }
 
-        spin_lock_irqsave(&card->priv->driver_lock, flags);
-
-        card->event = event;
-        card->int_cause |= MRVDRV_CARDEVENT;
-
-        lbs_interrupt(card->priv);
-
-        spin_unlock_irqrestore(&card->priv->driver_lock, flags);
-
+        lbs_queue_event(card->priv, event & 0xFF);
         ret = 0;
 
 out:
@@ -770,37 +758,6 @@ out:
         return ret;
 }
 
-static int if_sdio_get_int_status(struct lbs_private *priv, u8 *ireg)
-{
-        struct if_sdio_card *card;
-
-        lbs_deb_enter(LBS_DEB_SDIO);
-
-        card = priv->card;
-
-        *ireg = card->int_cause;
-        card->int_cause = 0;
-
-        lbs_deb_leave(LBS_DEB_SDIO);
-
-        return 0;
-}
-
-static int if_sdio_read_event_cause(struct lbs_private *priv)
-{
-        struct if_sdio_card *card;
-
-        lbs_deb_enter(LBS_DEB_SDIO);
-
-        card = priv->card;
-
-        priv->eventcause = card->event;
-
-        lbs_deb_leave(LBS_DEB_SDIO);
-
-        return 0;
-}
-
 /*******************************************************************/
 /* SDIO callbacks                                                  */
 /*******************************************************************/
@@ -953,8 +910,6 @@ static int if_sdio_probe(struct sdio_func *func,
 
         priv->card = card;
         priv->hw_host_to_card = if_sdio_host_to_card;
-        priv->hw_get_int_status = if_sdio_get_int_status;
-        priv->hw_read_event_cause = if_sdio_read_event_cause;
 
         priv->fw_ready = 1;
 
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 75aed9d07367..8032df72aaab 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -38,8 +38,6 @@ static void if_usb_receive_fwload(struct urb *urb);
 static int if_usb_prog_firmware(struct if_usb_card *cardp);
 static int if_usb_host_to_card(struct lbs_private *priv, uint8_t type,
                                uint8_t *payload, uint16_t nb);
-static int if_usb_get_int_status(struct lbs_private *priv, uint8_t *);
-static int if_usb_read_event_cause(struct lbs_private *);
 static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload,
                         uint16_t nb);
 static void if_usb_free(struct if_usb_card *cardp);
@@ -233,8 +231,6 @@ static int if_usb_probe(struct usb_interface *intf,
         cardp->priv->fw_ready = 1;
 
         priv->hw_host_to_card = if_usb_host_to_card;
-        priv->hw_get_int_status = if_usb_get_int_status;
-        priv->hw_read_event_cause = if_usb_read_event_cause;
         cardp->boot2_version = udev->descriptor.bcdDevice;
 
         if_usb_submit_rx_urb(cardp);
@@ -582,7 +578,6 @@ static inline void process_cmdtypedata(int recvlength, struct sk_buff *skb,
         skb_pull(skb, MESSAGE_HEADER_LEN);
 
         lbs_process_rxed_packet(priv, skb);
-        priv->upld_len = (recvlength - MESSAGE_HEADER_LEN);
 }
 
 static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff,
@@ -590,6 +585,8 @@ static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff,
                                       struct if_usb_card *cardp,
                                       struct lbs_private *priv)
 {
+        u8 i;
+
         if (recvlength > LBS_CMD_BUFFER_SIZE) {
                 lbs_deb_usbd(&cardp->udev->dev,
                              "The receive buffer is too large\n");
@@ -601,12 +598,15 @@ static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff,
                 BUG();
 
         spin_lock(&priv->driver_lock);
-        cardp->usb_int_cause |= MRVDRV_CMD_UPLD_RDY;
-        priv->upld_len = (recvlength - MESSAGE_HEADER_LEN);
-        memcpy(priv->upld_buf, recvbuff + MESSAGE_HEADER_LEN, priv->upld_len);
 
+        i = (priv->resp_idx == 0) ? 1 : 0;
+        BUG_ON(priv->resp_len[i]);
+        priv->resp_len[i] = (recvlength - MESSAGE_HEADER_LEN);
+        memcpy(priv->resp_buf[i], recvbuff + MESSAGE_HEADER_LEN,
+                priv->resp_len[i]);
         kfree_skb(skb);
-        lbs_interrupt(priv);
+        lbs_notify_command_response(priv, i);
+
         spin_unlock(&priv->driver_lock);
 
         lbs_deb_usbd(&cardp->udev->dev,
@@ -629,6 +629,7 @@ static void if_usb_receive(struct urb *urb)
         uint8_t *recvbuff = NULL;
         uint32_t recvtype = 0;
         __le32 *pkt = (__le32 *)(skb->data + IPFIELD_ALIGN_OFFSET);
+        uint32_t event;
 
         lbs_deb_enter(LBS_DEB_USB);
 
@@ -660,26 +661,20 @@ static void if_usb_receive(struct urb *urb)
                 break;
 
         case CMD_TYPE_INDICATION:
-                /* Event cause handling */
-                spin_lock(&priv->driver_lock);
+                /* Event handling */
+                event = le32_to_cpu(pkt[1]);
+                lbs_deb_usbd(&cardp->udev->dev, "**EVENT** 0x%X\n", event);
+                kfree_skb(skb);
 
-                cardp->usb_event_cause = le32_to_cpu(pkt[1]);
+                /* Icky undocumented magic special case */
+                if (event & 0xffff0000) {
+                        u32 trycount = (event & 0xffff0000) >> 16;
 
-                lbs_deb_usbd(&cardp->udev->dev,"**EVENT** 0x%X\n",
-                             cardp->usb_event_cause);
+                        lbs_send_tx_feedback(priv, trycount);
+                } else
+                        lbs_queue_event(priv, event & 0xFF);
+                break;
 
-                /* Icky undocumented magic special case */
-                if (cardp->usb_event_cause & 0xffff0000) {
-                        lbs_send_tx_feedback(priv);
-                        spin_unlock(&priv->driver_lock);
-                        break;
-                }
-                cardp->usb_event_cause <<= 3;
-                cardp->usb_int_cause |= MRVDRV_CARDEVENT;
-                kfree_skb(skb);
-                lbs_interrupt(priv);
-                spin_unlock(&priv->driver_lock);
-                goto rx_exit;
         default:
                 lbs_deb_usbd(&cardp->udev->dev, "Unknown command type 0x%X\n",
                              recvtype);
@@ -722,30 +717,6 @@ static int if_usb_host_to_card(struct lbs_private *priv, uint8_t type,
         return usb_tx_block(cardp, cardp->ep_out_buf, nb + MESSAGE_HEADER_LEN);
 }
 
-/* called with priv->driver_lock held */
-static int if_usb_get_int_status(struct lbs_private *priv, uint8_t *ireg)
-{
-        struct if_usb_card *cardp = priv->card;
-
-        *ireg = cardp->usb_int_cause;
-        cardp->usb_int_cause = 0;
-
-        lbs_deb_usbd(&cardp->udev->dev, "Int cause is 0x%X\n", *ireg);
-
-        return 0;
-}
-
-static int if_usb_read_event_cause(struct lbs_private *priv)
-{
-        struct if_usb_card *cardp = priv->card;
-
-        priv->eventcause = cardp->usb_event_cause;
-        /* Re-submit rx urb here to avoid event lost issue */
-        if_usb_submit_rx_urb(cardp);
-
-        return 0;
-}
-
 /**
  *  @brief This function issues Boot command to the Boot2 code
  *  @param ivalue   1:Boot from FW by USB-Download
diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
index e4829a391eb9..5771a83a43f0 100644
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -46,8 +46,6 @@ struct if_usb_card {
         struct lbs_private *priv;
 
         struct sk_buff *rx_skb;
-        uint32_t usb_event_cause;
-        uint8_t usb_int_cause;
 
         uint8_t ep_in;
         uint8_t ep_out;
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
deleted file mode 100644
index 2d4508048b68..000000000000
--- a/drivers/net/wireless/libertas/join.c
+++ /dev/null
@@ -1,895 +0,0 @@
-/**
-  *  Functions implementing wlan infrastructure and adhoc join routines,
-  *  IOCTL handlers as well as command preperation and response routines
-  *  for sending adhoc start, adhoc join, and association commands
-  *  to the firmware.
-  */
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/wireless.h>
-#include <linux/etherdevice.h>
-
-#include <net/iw_handler.h>
-
-#include "host.h"
-#include "decl.h"
-#include "join.h"
-#include "dev.h"
-#include "assoc.h"
-
-/* The firmware needs certain bits masked out of the beacon-derviced capability
- * field when associating/joining to BSSs.
- */
-#define CAPINFO_MASK    (~(0xda00))
-
-/**
- *  @brief This function finds common rates between rate1 and card rates.
- *
- * It will fill common rates in rate1 as output if found.
- *
- * NOTE: Setting the MSB of the basic rates need to be taken
- *   care, either before or after calling this function
- *
- *  @param priv     A pointer to struct lbs_private structure
- *  @param rate1       the buffer which keeps input and output
- *  @param rate1_size  the size of rate1 buffer; new size of buffer on return
- *
- *  @return            0 or -1
- */
-static int get_common_rates(struct lbs_private *priv,
-        u8 *rates,
-        u16 *rates_size)
-{
-        u8 *card_rates = lbs_bg_rates;
-        size_t num_card_rates = sizeof(lbs_bg_rates);
-        int ret = 0, i, j;
-        u8 tmp[30];
-        size_t tmp_size = 0;
-
-        /* For each rate in card_rates that exists in rate1, copy to tmp */
-        for (i = 0; card_rates[i] && (i < num_card_rates); i++) {
-                for (j = 0; rates[j] && (j < *rates_size); j++) {
-                        if (rates[j] == card_rates[i])
-                                tmp[tmp_size++] = card_rates[i];
-                }
-        }
-
-        lbs_deb_hex(LBS_DEB_JOIN, "AP rates    ", rates, *rates_size);
-        lbs_deb_hex(LBS_DEB_JOIN, "card rates  ", card_rates, num_card_rates);
-        lbs_deb_hex(LBS_DEB_JOIN, "common rates", tmp, tmp_size);
-        lbs_deb_join("TX data rate 0x%02x\n", priv->cur_rate);
-
-        if (!priv->auto_rate) {
-                for (i = 0; i < tmp_size; i++) {
-                        if (tmp[i] == priv->cur_rate)
-                                goto done;
-                }
-                lbs_pr_alert("Previously set fixed data rate %#x isn't "
-                       "compatible with the network.\n", priv->cur_rate);
-                ret = -1;
-                goto done;
-        }
-        ret = 0;
-
-done:
-        memset(rates, 0, *rates_size);
-        *rates_size = min_t(int, tmp_size, *rates_size);
-        memcpy(rates, tmp, *rates_size);
-        return ret;
-}
-
-
-/**
- *  @brief Sets the MSB on basic rates as the firmware requires
- *
- * Scan through an array and set the MSB for basic data rates.
- *
- *  @param rates     buffer of data rates
- *  @param len       size of buffer
- */
-static void lbs_set_basic_rate_flags(u8 *rates, size_t len)
-{
-        int i;
-
-        for (i = 0; i < len; i++) {
-                if (rates[i] == 0x02 || rates[i] == 0x04 ||
-                    rates[i] == 0x0b || rates[i] == 0x16)
-                        rates[i] |= 0x80;
-        }
-}
-
-/**
- *  @brief Unsets the MSB on basic rates
- *
- * Scan through an array and unset the MSB for basic data rates.
- *
- *  @param rates     buffer of data rates
- *  @param len       size of buffer
- */
-void lbs_unset_basic_rate_flags(u8 *rates, size_t len)
-{
-        int i;
-
-        for (i = 0; i < len; i++)
-                rates[i] &= 0x7f;
-}
-
-
-/**
- *  @brief Associate to a specific BSS discovered in a scan
- *
- *  @param priv      A pointer to struct lbs_private structure
- *  @param pbssdesc  Pointer to the BSS descriptor to associate with.
- *
- *  @return          0-success, otherwise fail
- */
-int lbs_associate(struct lbs_private *priv, struct assoc_request *assoc_req)
-{
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_AUTHENTICATE,
-                                    0, CMD_OPTION_WAITFORRSP,
-                                    0, assoc_req->bss.bssid);
-
-        if (ret)
-                goto done;
-
-        /* set preamble to firmware */
-        if (   (priv->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
-            && (assoc_req->bss.capability & WLAN_CAPABILITY_SHORT_PREAMBLE))
-                priv->preamble = CMD_TYPE_SHORT_PREAMBLE;
-        else
-                priv->preamble = CMD_TYPE_LONG_PREAMBLE;
-
-        lbs_set_radio_control(priv);
-
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_ASSOCIATE,
-                                    0, CMD_OPTION_WAITFORRSP, 0, assoc_req);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Start an Adhoc Network
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param adhocssid    The ssid of the Adhoc Network
- *  @return             0--success, -1--fail
- */
-int lbs_start_adhoc_network(struct lbs_private *priv,
-        struct assoc_request *assoc_req)
-{
-        int ret = 0;
-
-        priv->adhoccreate = 1;
-
-        if (priv->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) {
-                lbs_deb_join("AdhocStart: Short preamble\n");
-                priv->preamble = CMD_TYPE_SHORT_PREAMBLE;
-        } else {
-                lbs_deb_join("AdhocStart: Long preamble\n");
-                priv->preamble = CMD_TYPE_LONG_PREAMBLE;
-        }
-
-        lbs_set_radio_control(priv);
-
-        lbs_deb_join("AdhocStart: channel = %d\n", assoc_req->channel);
-        lbs_deb_join("AdhocStart: band = %d\n", assoc_req->band);
-
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_START,
-                                    0, CMD_OPTION_WAITFORRSP, 0, assoc_req);
-
-        return ret;
-}
-
-/**
- *  @brief Join an adhoc network found in a previous scan
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param pbssdesc     Pointer to a BSS descriptor found in a previous scan
- *                      to attempt to join
- *
- *  @return             0--success, -1--fail
- */
-int lbs_join_adhoc_network(struct lbs_private *priv,
-        struct assoc_request *assoc_req)
-{
-        struct bss_descriptor * bss = &assoc_req->bss;
-        int ret = 0;
-
-        lbs_deb_join("%s: Current SSID '%s', ssid length %u\n",
-                     __func__,
-                     escape_essid(priv->curbssparams.ssid,
-                                  priv->curbssparams.ssid_len),
-                     priv->curbssparams.ssid_len);
-        lbs_deb_join("%s: requested ssid '%s', ssid length %u\n",
-                     __func__, escape_essid(bss->ssid, bss->ssid_len),
-                     bss->ssid_len);
-
-        /* check if the requested SSID is already joined */
-        if (   priv->curbssparams.ssid_len
-            && !lbs_ssid_cmp(priv->curbssparams.ssid,
-                                  priv->curbssparams.ssid_len,
-                                  bss->ssid, bss->ssid_len)
-            && (priv->mode == IW_MODE_ADHOC)
-            && (priv->connect_status == LBS_CONNECTED)) {
-                union iwreq_data wrqu;
-
-                lbs_deb_join("ADHOC_J_CMD: New ad-hoc SSID is the same as "
-                             "current, not attempting to re-join");
-
-                /* Send the re-association event though, because the association
-                 * request really was successful, even if just a null-op.
-                 */
-                memset(&wrqu, 0, sizeof(wrqu));
-                memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid,
-                       ETH_ALEN);
-                wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-                wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
-                goto out;
-        }
-
-        /* Use shortpreamble only when both creator and card supports
-           short preamble */
-        if (   !(bss->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
-            || !(priv->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)) {
-                lbs_deb_join("AdhocJoin: Long preamble\n");
-                priv->preamble = CMD_TYPE_LONG_PREAMBLE;
-        } else {
-                lbs_deb_join("AdhocJoin: Short preamble\n");
-                priv->preamble = CMD_TYPE_SHORT_PREAMBLE;
-        }
-
-        lbs_set_radio_control(priv);
-
-        lbs_deb_join("AdhocJoin: channel = %d\n", assoc_req->channel);
-        lbs_deb_join("AdhocJoin: band = %c\n", assoc_req->band);
-
-        priv->adhoccreate = 0;
-
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_JOIN,
-                                    0, CMD_OPTION_WAITFORRSP,
-                                    OID_802_11_SSID, assoc_req);
-
-out:
-        return ret;
-}
-
-int lbs_stop_adhoc_network(struct lbs_private *priv)
-{
-        return lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_STOP,
-                                     0, CMD_OPTION_WAITFORRSP, 0, NULL);
-}
-
-/**
- *  @brief Send Deauthentication Request
- *
- *  @param priv      A pointer to struct lbs_private structure
- *  @return          0--success, -1--fail
- */
-int lbs_send_deauthentication(struct lbs_private *priv)
-{
-        return lbs_prepare_and_send_command(priv, CMD_802_11_DEAUTHENTICATE,
-                                     0, CMD_OPTION_WAITFORRSP, 0, NULL);
-}
-
-/**
- *  @brief This function prepares command of authenticate.
- *
- *  @param priv      A pointer to struct lbs_private structure
- *  @param cmd       A pointer to cmd_ds_command structure
- *  @param pdata_buf Void cast of pointer to a BSSID to authenticate with
- *
- *  @return         0 or -1
- */
-int lbs_cmd_80211_authenticate(struct lbs_private *priv,
-                                 struct cmd_ds_command *cmd,
-                                 void *pdata_buf)
-{
-        struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth;
-        int ret = -1;
-        u8 *bssid = pdata_buf;
-        DECLARE_MAC_BUF(mac);
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        cmd->command = cpu_to_le16(CMD_802_11_AUTHENTICATE);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_authenticate)
-                                + S_DS_GEN);
-
-        /* translate auth mode to 802.11 defined wire value */
-        switch (priv->secinfo.auth_mode) {
-        case IW_AUTH_ALG_OPEN_SYSTEM:
-                pauthenticate->authtype = 0x00;
-                break;
-        case IW_AUTH_ALG_SHARED_KEY:
-                pauthenticate->authtype = 0x01;
-                break;
-        case IW_AUTH_ALG_LEAP:
-                pauthenticate->authtype = 0x80;
-                break;
-        default:
-                lbs_deb_join("AUTH_CMD: invalid auth alg 0x%X\n",
-                             priv->secinfo.auth_mode);
-                goto out;
-        }
-
-        memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
-
-        lbs_deb_join("AUTH_CMD: BSSID %s, auth 0x%x\n",
-                     print_mac(mac, bssid), pauthenticate->authtype);
-        ret = 0;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
-        return ret;
-}
-
-int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,
-                                   struct cmd_ds_command *cmd)
-{
-        struct cmd_ds_802_11_deauthenticate *dauth = &cmd->params.deauth;
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        cmd->command = cpu_to_le16(CMD_802_11_DEAUTHENTICATE);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_deauthenticate) +
-                             S_DS_GEN);
-
-        /* set AP MAC address */
-        memmove(dauth->macaddr, priv->curbssparams.bssid, ETH_ALEN);
-
-        /* Reason code 3 = Station is leaving */
-#define REASON_CODE_STA_LEAVING 3
-        dauth->reasoncode = cpu_to_le16(REASON_CODE_STA_LEAVING);
-
-        lbs_deb_leave(LBS_DEB_JOIN);
-        return 0;
-}
-
-int lbs_cmd_80211_associate(struct lbs_private *priv,
-                              struct cmd_ds_command *cmd, void *pdata_buf)
-{
-        struct cmd_ds_802_11_associate *passo = &cmd->params.associate;
-        int ret = 0;
-        struct assoc_request * assoc_req = pdata_buf;
-        struct bss_descriptor * bss = &assoc_req->bss;
-        u8 *pos;
-        u16 tmpcap, tmplen;
-        struct mrvlietypes_ssidparamset *ssid;
-        struct mrvlietypes_phyparamset *phy;
-        struct mrvlietypes_ssparamset *ss;
-        struct mrvlietypes_ratesparamset *rates;
-        struct mrvlietypes_rsnparamset *rsn;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        pos = (u8 *) passo;
-
-        if (!priv) {
-                ret = -1;
-                goto done;
-        }
-
-        cmd->command = cpu_to_le16(CMD_802_11_ASSOCIATE);
-
-        memcpy(passo->peerstaaddr, bss->bssid, sizeof(passo->peerstaaddr));
-        pos += sizeof(passo->peerstaaddr);
-
-        /* set the listen interval */
-        passo->listeninterval = cpu_to_le16(MRVDRV_DEFAULT_LISTEN_INTERVAL);
-
-        pos += sizeof(passo->capability);
-        pos += sizeof(passo->listeninterval);
-        pos += sizeof(passo->bcnperiod);
-        pos += sizeof(passo->dtimperiod);
-
-        ssid = (struct mrvlietypes_ssidparamset *) pos;
-        ssid->header.type = cpu_to_le16(TLV_TYPE_SSID);
-        tmplen = bss->ssid_len;
-        ssid->header.len = cpu_to_le16(tmplen);
-        memcpy(ssid->ssid, bss->ssid, tmplen);
-        pos += sizeof(ssid->header) + tmplen;
-
-        phy = (struct mrvlietypes_phyparamset *) pos;
-        phy->header.type = cpu_to_le16(TLV_TYPE_PHY_DS);
-        tmplen = sizeof(phy->fh_ds.dsparamset);
-        phy->header.len = cpu_to_le16(tmplen);
-        memcpy(&phy->fh_ds.dsparamset,
-               &bss->phyparamset.dsparamset.currentchan,
-               tmplen);
-        pos += sizeof(phy->header) + tmplen;
-
-        ss = (struct mrvlietypes_ssparamset *) pos;
-        ss->header.type = cpu_to_le16(TLV_TYPE_CF);
-        tmplen = sizeof(ss->cf_ibss.cfparamset);
-        ss->header.len = cpu_to_le16(tmplen);
-        pos += sizeof(ss->header) + tmplen;
-
-        rates = (struct mrvlietypes_ratesparamset *) pos;
-        rates->header.type = cpu_to_le16(TLV_TYPE_RATES);
-        memcpy(&rates->rates, &bss->rates, MAX_RATES);
-        tmplen = MAX_RATES;
-        if (get_common_rates(priv, rates->rates, &tmplen)) {
-                ret = -1;
-                goto done;
-        }
-        pos += sizeof(rates->header) + tmplen;
-        rates->header.len = cpu_to_le16(tmplen);
-        lbs_deb_assoc("ASSOC_CMD: num rates %u\n", tmplen);
-
-        /* Copy the infra. association rates into Current BSS state structure */
-        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
-        memcpy(&priv->curbssparams.rates, &rates->rates, tmplen);
-
-        /* Set MSB on basic rates as the firmware requires, but _after_
-         * copying to current bss rates.
-         */
-        lbs_set_basic_rate_flags(rates->rates, tmplen);
-
-        if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
-                rsn = (struct mrvlietypes_rsnparamset *) pos;
-                /* WPA_IE or WPA2_IE */
-                rsn->header.type = cpu_to_le16((u16) assoc_req->wpa_ie[0]);
-                tmplen = (u16) assoc_req->wpa_ie[1];
-                rsn->header.len = cpu_to_le16(tmplen);
-                memcpy(rsn->rsnie, &assoc_req->wpa_ie[2], tmplen);
-                lbs_deb_hex(LBS_DEB_JOIN, "ASSOC_CMD: RSN IE", (u8 *) rsn,
-                        sizeof(rsn->header) + tmplen);
-                pos += sizeof(rsn->header) + tmplen;
-        }
-
-        /* update curbssparams */
-        priv->curbssparams.channel = bss->phyparamset.dsparamset.currentchan;
-
-        if (lbs_parse_dnld_countryinfo_11d(priv, bss)) {
-                ret = -1;
-                goto done;
-        }
-
-        cmd->size = cpu_to_le16((u16) (pos - (u8 *) passo) + S_DS_GEN);
-
-        /* set the capability info */
-        tmpcap = (bss->capability & CAPINFO_MASK);
-        if (bss->mode == IW_MODE_INFRA)
-                tmpcap |= WLAN_CAPABILITY_ESS;
-        passo->capability = cpu_to_le16(tmpcap);
-        lbs_deb_assoc("ASSOC_CMD: capability 0x%04x\n", tmpcap);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,
-                                 struct cmd_ds_command *cmd, void *pdata_buf)
-{
-        struct cmd_ds_802_11_ad_hoc_start *adhs = &cmd->params.ads;
-        int ret = 0;
-        int cmdappendsize = 0;
-        struct assoc_request * assoc_req = pdata_buf;
-        u16 tmpcap = 0;
-        size_t ratesize = 0;
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        if (!priv) {
-                ret = -1;
-                goto done;
-        }
-
-        cmd->command = cpu_to_le16(CMD_802_11_AD_HOC_START);
-
-        /*
-         * Fill in the parameters for 2 data structures:
-         *   1. cmd_ds_802_11_ad_hoc_start command
-         *   2. priv->scantable[i]
-         *
-         * Driver will fill up SSID, bsstype,IBSS param, Physical Param,
-         *   probe delay, and cap info.
-         *
-         * Firmware will fill up beacon period, DTIM, Basic rates
-         *   and operational rates.
-         */
-
-        memset(adhs->ssid, 0, IW_ESSID_MAX_SIZE);
-        memcpy(adhs->ssid, assoc_req->ssid, assoc_req->ssid_len);
-
-        lbs_deb_join("ADHOC_S_CMD: SSID '%s', ssid length %u\n",
-                     escape_essid(assoc_req->ssid, assoc_req->ssid_len),
-                     assoc_req->ssid_len);
-
-        /* set the BSS type */
-        adhs->bsstype = CMD_BSS_TYPE_IBSS;
-        priv->mode = IW_MODE_ADHOC;
-        if (priv->beacon_period == 0)
-                priv->beacon_period = MRVDRV_BEACON_INTERVAL;
-        adhs->beaconperiod = cpu_to_le16(priv->beacon_period);
-
-        /* set Physical param set */
-#define DS_PARA_IE_ID   3
-#define DS_PARA_IE_LEN  1
-
-        adhs->phyparamset.dsparamset.elementid = DS_PARA_IE_ID;
-        adhs->phyparamset.dsparamset.len = DS_PARA_IE_LEN;
-
-        WARN_ON(!assoc_req->channel);
-
-        lbs_deb_join("ADHOC_S_CMD: Creating ADHOC on channel %d\n",
-                     assoc_req->channel);
-
-        adhs->phyparamset.dsparamset.currentchan = assoc_req->channel;
-
-        /* set IBSS param set */
-#define IBSS_PARA_IE_ID   6
-#define IBSS_PARA_IE_LEN  2
-
-        adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
-        adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
-        adhs->ssparamset.ibssparamset.atimwindow = 0;
-
-        /* set capability info */
-        tmpcap = WLAN_CAPABILITY_IBSS;
-        if (assoc_req->secinfo.wep_enabled) {
-                lbs_deb_join("ADHOC_S_CMD: WEP enabled, setting privacy on\n");
-                tmpcap |= WLAN_CAPABILITY_PRIVACY;
-        } else {
-                lbs_deb_join("ADHOC_S_CMD: WEP disabled, setting privacy off\n");
-        }
-        adhs->capability = cpu_to_le16(tmpcap);
-
-        /* probedelay */
-        adhs->probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
-
-        memset(adhs->rates, 0, sizeof(adhs->rates));
-        ratesize = min(sizeof(adhs->rates), sizeof(lbs_bg_rates));
-        memcpy(adhs->rates, lbs_bg_rates, ratesize);
-
-        /* Copy the ad-hoc creating rates into Current BSS state structure */
-        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
-        memcpy(&priv->curbssparams.rates, &adhs->rates, ratesize);
-
-        /* Set MSB on basic rates as the firmware requires, but _after_
-         * copying to current bss rates.
-         */
-        lbs_set_basic_rate_flags(adhs->rates, ratesize);
-
-        lbs_deb_join("ADHOC_S_CMD: rates=%02x %02x %02x %02x \n",
-               adhs->rates[0], adhs->rates[1], adhs->rates[2], adhs->rates[3]);
-
-        lbs_deb_join("ADHOC_S_CMD: AD HOC Start command is ready\n");
-
-        if (lbs_create_dnld_countryinfo_11d(priv)) {
-                lbs_deb_join("ADHOC_S_CMD: dnld_countryinfo_11d failed\n");
-                ret = -1;
-                goto done;
-        }
-
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_start) +
-                                S_DS_GEN + cmdappendsize);
-
-        ret = 0;
-done:
-        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
-        return ret;
-}
-
-int lbs_cmd_80211_ad_hoc_stop(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd)
-{
-        cmd->command = cpu_to_le16(CMD_802_11_AD_HOC_STOP);
-        cmd->size = cpu_to_le16(S_DS_GEN);
-
-        return 0;
-}
-
-int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd, void *pdata_buf)
-{
-        struct cmd_ds_802_11_ad_hoc_join *join_cmd = &cmd->params.adj;
-        struct assoc_request * assoc_req = pdata_buf;
-        struct bss_descriptor *bss = &assoc_req->bss;
-        int cmdappendsize = 0;
-        int ret = 0;
-        u16 ratesize = 0;
-        DECLARE_MAC_BUF(mac);
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        cmd->command = cpu_to_le16(CMD_802_11_AD_HOC_JOIN);
-
-        join_cmd->bss.type = CMD_BSS_TYPE_IBSS;
-        join_cmd->bss.beaconperiod = cpu_to_le16(bss->beaconperiod);
-
-        memcpy(&join_cmd->bss.bssid, &bss->bssid, ETH_ALEN);
-        memcpy(&join_cmd->bss.ssid, &bss->ssid, bss->ssid_len);
-
-        memcpy(&join_cmd->bss.phyparamset, &bss->phyparamset,
-               sizeof(union ieeetypes_phyparamset));
-
-        memcpy(&join_cmd->bss.ssparamset, &bss->ssparamset,
-               sizeof(union IEEEtypes_ssparamset));
-
-        join_cmd->bss.capability = cpu_to_le16(bss->capability & CAPINFO_MASK);
-        lbs_deb_join("ADHOC_J_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",
-               bss->capability, CAPINFO_MASK);
-
-        /* information on BSSID descriptor passed to FW */
-        lbs_deb_join(
-               "ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",
-               print_mac(mac, join_cmd->bss.bssid),
-               join_cmd->bss.ssid);
-
-        /* failtimeout */
-        join_cmd->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
-
-        /* probedelay */
-        join_cmd->probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
-
-        priv->curbssparams.channel = bss->channel;
-
-        /* Copy Data rates from the rates recorded in scan response */
-        memset(join_cmd->bss.rates, 0, sizeof(join_cmd->bss.rates));
-        ratesize = min_t(u16, sizeof(join_cmd->bss.rates), MAX_RATES);
-        memcpy(join_cmd->bss.rates, bss->rates, ratesize);
-        if (get_common_rates(priv, join_cmd->bss.rates, &ratesize)) {
-                lbs_deb_join("ADHOC_J_CMD: get_common_rates returns error.\n");
-                ret = -1;
-                goto done;
-        }
-
-        /* Copy the ad-hoc creating rates into Current BSS state structure */
-        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
-        memcpy(&priv->curbssparams.rates, join_cmd->bss.rates, ratesize);
-
-        /* Set MSB on basic rates as the firmware requires, but _after_
-         * copying to current bss rates.
-         */
-        lbs_set_basic_rate_flags(join_cmd->bss.rates, ratesize);
-
-        join_cmd->bss.ssparamset.ibssparamset.atimwindow =
-            cpu_to_le16(bss->atimwindow);
-
-        if (assoc_req->secinfo.wep_enabled) {
-                u16 tmp = le16_to_cpu(join_cmd->bss.capability);
-                tmp |= WLAN_CAPABILITY_PRIVACY;
-                join_cmd->bss.capability = cpu_to_le16(tmp);
-        }
-
-        if (priv->psmode == LBS802_11POWERMODEMAX_PSP) {
-                /* wake up first */
-                __le32 Localpsmode;
-
-                Localpsmode = cpu_to_le32(LBS802_11POWERMODECAM);
-                ret = lbs_prepare_and_send_command(priv,
-                                            CMD_802_11_PS_MODE,
-                                            CMD_ACT_SET,
-                                            0, 0, &Localpsmode);
-
-                if (ret) {
-                        ret = -1;
-                        goto done;
-                }
-        }
-
-        if (lbs_parse_dnld_countryinfo_11d(priv, bss)) {
-                ret = -1;
-                goto done;
-        }
-
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_join) +
-                                S_DS_GEN + cmdappendsize);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
-        return ret;
-}
-
-int lbs_ret_80211_associate(struct lbs_private *priv,
-                              struct cmd_ds_command *resp)
-{
-        int ret = 0;
-        union iwreq_data wrqu;
-        struct ieeetypes_assocrsp *passocrsp;
-        struct bss_descriptor * bss;
-        u16 status_code;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        if (!priv->in_progress_assoc_req) {
-                lbs_deb_assoc("ASSOC_RESP: no in-progress assoc request\n");
-                ret = -1;
-                goto done;
-        }
-        bss = &priv->in_progress_assoc_req->bss;
-
-        passocrsp = (struct ieeetypes_assocrsp *) & resp->params;
-
-        /*
-         * Older FW versions map the IEEE 802.11 Status Code in the association
-         * response to the following values returned in passocrsp->statuscode:
-         *
-         *    IEEE Status Code                Marvell Status Code
-         *    0                       ->      0x0000 ASSOC_RESULT_SUCCESS
-         *    13                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    14                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    15                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    16                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    others                  ->      0x0003 ASSOC_RESULT_REFUSED
-         *
-         * Other response codes:
-         *    0x0001 -> ASSOC_RESULT_INVALID_PARAMETERS (unused)
-         *    0x0002 -> ASSOC_RESULT_TIMEOUT (internal timer expired waiting for
-         *                                    association response from the AP)
-         */
-
-        status_code = le16_to_cpu(passocrsp->statuscode);
-        switch (status_code) {
-        case 0x00:
-                break;
-        case 0x01:
-                lbs_deb_assoc("ASSOC_RESP: invalid parameters\n");
-                break;
-        case 0x02:
-                lbs_deb_assoc("ASSOC_RESP: internal timer "
-                        "expired while waiting for the AP\n");
-                break;
-        case 0x03:
-                lbs_deb_assoc("ASSOC_RESP: association "
-                        "refused by AP\n");
-                break;
-        case 0x04:
-                lbs_deb_assoc("ASSOC_RESP: authentication "
-                        "refused by AP\n");
-                break;
-        default:
-                lbs_deb_assoc("ASSOC_RESP: failure reason 0x%02x "
-                        " unknown\n", status_code);
-                break;
-        }
-
-        if (status_code) {
-                lbs_mac_event_disconnected(priv);
-                ret = -1;
-                goto done;
-        }
-
-        lbs_deb_hex(LBS_DEB_ASSOC, "ASSOC_RESP", (void *)&resp->params,
-                le16_to_cpu(resp->size) - S_DS_GEN);
-
-        /* Send a Media Connected event, according to the Spec */
-        priv->connect_status = LBS_CONNECTED;
-
-        /* Update current SSID and BSSID */
-        memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE);
-        priv->curbssparams.ssid_len = bss->ssid_len;
-        memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
-
-        lbs_deb_assoc("ASSOC_RESP: currentpacketfilter is 0x%x\n",
-                priv->currentpacketfilter);
-
-        priv->SNR[TYPE_RXPD][TYPE_AVG] = 0;
-        priv->NF[TYPE_RXPD][TYPE_AVG] = 0;
-
-        memset(priv->rawSNR, 0x00, sizeof(priv->rawSNR));
-        memset(priv->rawNF, 0x00, sizeof(priv->rawNF));
-        priv->nextSNRNF = 0;
-        priv->numSNRNF = 0;
-
-        netif_carrier_on(priv->dev);
-        if (!priv->tx_pending_len)
-                netif_wake_queue(priv->dev);
-
-        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
-        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-int lbs_ret_80211_disassociate(struct lbs_private *priv,
-                                 struct cmd_ds_command *resp)
-{
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        lbs_mac_event_disconnected(priv);
-
-        lbs_deb_leave(LBS_DEB_JOIN);
-        return 0;
-}
-
-int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,
-                                 struct cmd_ds_command *resp)
-{
-        int ret = 0;
-        u16 command = le16_to_cpu(resp->command);
-        u16 result = le16_to_cpu(resp->result);
-        struct cmd_ds_802_11_ad_hoc_result *padhocresult;
-        union iwreq_data wrqu;
-        struct bss_descriptor *bss;
-        DECLARE_MAC_BUF(mac);
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        padhocresult = &resp->params.result;
-
-        lbs_deb_join("ADHOC_RESP: size = %d\n", le16_to_cpu(resp->size));
-        lbs_deb_join("ADHOC_RESP: command = %x\n", command);
-        lbs_deb_join("ADHOC_RESP: result = %x\n", result);
-
-        if (!priv->in_progress_assoc_req) {
-                lbs_deb_join("ADHOC_RESP: no in-progress association request\n");
-                ret = -1;
-                goto done;
-        }
-        bss = &priv->in_progress_assoc_req->bss;
-
-        /*
-         * Join result code 0 --> SUCCESS
-         */
-        if (result) {
-                lbs_deb_join("ADHOC_RESP: failed\n");
-                if (priv->connect_status == LBS_CONNECTED) {
-                        lbs_mac_event_disconnected(priv);
-                }
-                ret = -1;
-                goto done;
-        }
-
-        /*
-         * Now the join cmd should be successful
-         * If BSSID has changed use SSID to compare instead of BSSID
-         */
-        lbs_deb_join("ADHOC_RESP: associated to '%s'\n",
-                     escape_essid(bss->ssid, bss->ssid_len));
-
-        /* Send a Media Connected event, according to the Spec */
-        priv->connect_status = LBS_CONNECTED;
-
-        if (command == CMD_RET(CMD_802_11_AD_HOC_START)) {
-                /* Update the created network descriptor with the new BSSID */
-                memcpy(bss->bssid, padhocresult->bssid, ETH_ALEN);
-        }
-
-        /* Set the BSSID from the joined/started descriptor */
-        memcpy(&priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
-
-        /* Set the new SSID to current SSID */
-        memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE);
-        priv->curbssparams.ssid_len = bss->ssid_len;
-
-        netif_carrier_on(priv->dev);
-        if (!priv->tx_pending_len)
-                netif_wake_queue(priv->dev);
-
-        memset(&wrqu, 0, sizeof(wrqu));
-        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
-        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
-
-        lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");
-        lbs_deb_join("ADHOC_RESP: channel = %d\n", priv->curbssparams.channel);
-        lbs_deb_join("ADHOC_RESP: BSSID = %s\n",
-                     print_mac(mac, padhocresult->bssid));
-
-done:
-        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
-        return ret;
-}
-
-int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv,
-                                struct cmd_ds_command *resp)
-{
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        lbs_mac_event_disconnected(priv);
-
-        lbs_deb_leave(LBS_DEB_JOIN);
-        return 0;
-}
diff --git a/drivers/net/wireless/libertas/join.h b/drivers/net/wireless/libertas/join.h
deleted file mode 100644
index c617d071f781..000000000000
--- a/drivers/net/wireless/libertas/join.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
-  * Interface for the wlan infrastructure and adhoc join routines
-  *
-  * Driver interface functions and type declarations for the join module
-  *   implemented in join.c.  Process all start/join requests for
-  *   both adhoc and infrastructure networks
-  */
-#ifndef _LBS_JOIN_H
-#define _LBS_JOIN_H
-
-#include "defs.h"
-#include "dev.h"
-
-struct cmd_ds_command;
-int lbs_cmd_80211_authenticate(struct lbs_private *priv,
-                                        struct cmd_ds_command *cmd,
-                                        void *pdata_buf);
-int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,
-                                       struct cmd_ds_command *cmd,
-                                       void *pdata_buf);
-int lbs_cmd_80211_ad_hoc_stop(struct lbs_private *priv,
-                                       struct cmd_ds_command *cmd);
-int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,
-                                        struct cmd_ds_command *cmd,
-                                        void *pdata_buf);
-int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,
-                                          struct cmd_ds_command *cmd);
-int lbs_cmd_80211_associate(struct lbs_private *priv,
-                                     struct cmd_ds_command *cmd,
-                                     void *pdata_buf);
-
-int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,
-                                        struct cmd_ds_command *resp);
-int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv,
-                                       struct cmd_ds_command *resp);
-int lbs_ret_80211_disassociate(struct lbs_private *priv,
-                                        struct cmd_ds_command *resp);
-int lbs_ret_80211_associate(struct lbs_private *priv,
-                                     struct cmd_ds_command *resp);
-
-int lbs_start_adhoc_network(struct lbs_private *priv,
-                             struct assoc_request * assoc_req);
-int lbs_join_adhoc_network(struct lbs_private *priv,
-                                struct assoc_request * assoc_req);
-int lbs_stop_adhoc_network(struct lbs_private *priv);
-
-int lbs_send_deauthentication(struct lbs_private *priv);
-
-int lbs_associate(struct lbs_private *priv, struct assoc_request *assoc_req);
-
-void lbs_unset_basic_rate_flags(u8 *rates, size_t len);
-
-#endif
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 4d4e2f3b66ac..406f54d40956 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -10,6 +10,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/kthread.h>
+#include <linux/kfifo.h>
 
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
@@ -19,8 +20,8 @@
 #include "dev.h"
 #include "wext.h"
 #include "debugfs.h"
+#include "scan.h"
 #include "assoc.h"
-#include "join.h"
 #include "cmd.h"
 
 #define DRIVER_RELEASE_VERSION "323.p0"
@@ -37,6 +38,11 @@ EXPORT_SYMBOL_GPL(lbs_debug);
 module_param_named(libertas_debug, lbs_debug, int, 0644);
 
 
+/* This global structure is used to send the confirm_sleep command as
+ * fast as possible down to the firmware. */
+struct cmd_confirm_sleep confirm_sleep;
+
+
 #define LBS_TX_PWR_DEFAULT              20      /*100mW */
 #define LBS_TX_PWR_US_DEFAULT           20      /*100mW */
 #define LBS_TX_PWR_JP_DEFAULT           16      /*50mW */
@@ -277,10 +283,10 @@ static ssize_t lbs_rtap_set(struct device *dev,
         struct lbs_private *priv = to_net_dev(dev)->priv;
 
         sscanf(buf, "%x", &monitor_mode);
-        if (monitor_mode != LBS_MONITOR_OFF) {
-                if(priv->monitormode == monitor_mode)
+        if (monitor_mode) {
+                if (priv->monitormode == monitor_mode)
                         return strlen(buf);
-                if (priv->monitormode == LBS_MONITOR_OFF) {
+                if (!priv->monitormode) {
                         if (priv->infra_open || priv->mesh_open)
                                 return -EBUSY;
                         if (priv->mode == IW_MODE_INFRA)
@@ -293,9 +299,9 @@ static ssize_t lbs_rtap_set(struct device *dev,
         }
 
         else {
-                if (priv->monitormode == LBS_MONITOR_OFF)
+                if (!priv->monitormode)
                         return strlen(buf);
-                priv->monitormode = LBS_MONITOR_OFF;
+                priv->monitormode = 0;
                 lbs_remove_rtap(priv);
 
                 if (priv->currenttxskb) {
@@ -392,7 +398,7 @@ static int lbs_dev_open(struct net_device *dev)
 
         spin_lock_irq(&priv->driver_lock);
 
-        if (priv->monitormode != LBS_MONITOR_OFF) {
+        if (priv->monitormode) {
                 ret = -EBUSY;
                 goto out;
         }
@@ -475,10 +481,9 @@ static void lbs_tx_timeout(struct net_device *dev)
 
         dev->trans_start = jiffies;
 
-        if (priv->currenttxskb) {
-                priv->eventcause = 0x01000000;
-                lbs_send_tx_feedback(priv);
-        }
+        if (priv->currenttxskb)
+                lbs_send_tx_feedback(priv, 0);
+
         /* XX: Shouldn't we also call into the hw-specific driver
            to kick it somehow? */
         lbs_host_to_card_done(priv);
@@ -531,34 +536,27 @@ static int lbs_set_mac_address(struct net_device *dev, void *addr)
         int ret = 0;
         struct lbs_private *priv = (struct lbs_private *) dev->priv;
         struct sockaddr *phwaddr = addr;
+        struct cmd_ds_802_11_mac_address cmd;
 
         lbs_deb_enter(LBS_DEB_NET);
 
         /* In case it was called from the mesh device */
-        dev = priv->dev ;
-
-        memset(priv->current_addr, 0, ETH_ALEN);
-
-        /* dev->dev_addr is 8 bytes */
-        lbs_deb_hex(LBS_DEB_NET, "dev->dev_addr", dev->dev_addr, ETH_ALEN);
-
-        lbs_deb_hex(LBS_DEB_NET, "addr", phwaddr->sa_data, ETH_ALEN);
-        memcpy(priv->current_addr, phwaddr->sa_data, ETH_ALEN);
+        dev = priv->dev;
 
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_MAC_ADDRESS,
-                                    CMD_ACT_SET,
-                                    CMD_OPTION_WAITFORRSP, 0, NULL);
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
+        memcpy(cmd.macadd, phwaddr->sa_data, ETH_ALEN);
 
+        ret = lbs_cmd_with_response(priv, CMD_802_11_MAC_ADDRESS, &cmd);
         if (ret) {
                 lbs_deb_net("set MAC address failed\n");
-                ret = -1;
                 goto done;
         }
 
-        lbs_deb_hex(LBS_DEB_NET, "priv->macaddr", priv->current_addr, ETH_ALEN);
-        memcpy(dev->dev_addr, priv->current_addr, ETH_ALEN);
+        memcpy(priv->current_addr, phwaddr->sa_data, ETH_ALEN);
+        memcpy(dev->dev_addr, phwaddr->sa_data, ETH_ALEN);
         if (priv->mesh_dev)
-                memcpy(priv->mesh_dev->dev_addr, priv->current_addr, ETH_ALEN);
+                memcpy(priv->mesh_dev->dev_addr, phwaddr->sa_data, ETH_ALEN);
 
 done:
         lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
@@ -581,45 +579,45 @@ static int lbs_copy_multicast_address(struct lbs_private *priv,
 static void lbs_set_multicast_list(struct net_device *dev)
 {
         struct lbs_private *priv = dev->priv;
-        int oldpacketfilter;
+        int old_mac_control;
         DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_NET);
 
-        oldpacketfilter = priv->currentpacketfilter;
+        old_mac_control = priv->mac_control;
 
         if (dev->flags & IFF_PROMISC) {
                 lbs_deb_net("enable promiscuous mode\n");
-                priv->currentpacketfilter |=
+                priv->mac_control |=
                     CMD_ACT_MAC_PROMISCUOUS_ENABLE;
-                priv->currentpacketfilter &=
+                priv->mac_control &=
                     ~(CMD_ACT_MAC_ALL_MULTICAST_ENABLE |
                       CMD_ACT_MAC_MULTICAST_ENABLE);
         } else {
                 /* Multicast */
-                priv->currentpacketfilter &=
+                priv->mac_control &=
                     ~CMD_ACT_MAC_PROMISCUOUS_ENABLE;
 
                 if (dev->flags & IFF_ALLMULTI || dev->mc_count >
                     MRVDRV_MAX_MULTICAST_LIST_SIZE) {
                         lbs_deb_net( "enabling all multicast\n");
-                        priv->currentpacketfilter |=
+                        priv->mac_control |=
                             CMD_ACT_MAC_ALL_MULTICAST_ENABLE;
-                        priv->currentpacketfilter &=
+                        priv->mac_control &=
                             ~CMD_ACT_MAC_MULTICAST_ENABLE;
                 } else {
-                        priv->currentpacketfilter &=
+                        priv->mac_control &=
                             ~CMD_ACT_MAC_ALL_MULTICAST_ENABLE;
 
                         if (!dev->mc_count) {
                                 lbs_deb_net("no multicast addresses, "
                                        "disabling multicast\n");
-                                priv->currentpacketfilter &=
+                                priv->mac_control &=
                                     ~CMD_ACT_MAC_MULTICAST_ENABLE;
                         } else {
                                 int i;
 
-                                priv->currentpacketfilter |=
+                                priv->mac_control |=
                                     CMD_ACT_MAC_MULTICAST_ENABLE;
 
                                 priv->nr_of_multicastmacaddr =
@@ -642,9 +640,8 @@ static void lbs_set_multicast_list(struct net_device *dev)
                 }
         }
 
-        if (priv->currentpacketfilter != oldpacketfilter) {
-                lbs_set_mac_packet_filter(priv);
-        }
+        if (priv->mac_control != old_mac_control)
+                lbs_set_mac_control(priv);
 
         lbs_deb_leave(LBS_DEB_NET);
 }
@@ -662,7 +659,6 @@ static int lbs_thread(void *data)
         struct net_device *dev = data;
         struct lbs_private *priv = dev->priv;
         wait_queue_t wait;
-        u8 ireg = 0;
 
         lbs_deb_enter(LBS_DEB_THREAD);
 
@@ -670,9 +666,10 @@ static int lbs_thread(void *data)
 
         for (;;) {
                 int shouldsleep;
+                u8 resp_idx;
 
-                lbs_deb_thread( "main-thread 111: intcounter=%d currenttxskb=%p dnld_sent=%d\n",
-                                priv->intcounter, priv->currenttxskb, priv->dnld_sent);
+                lbs_deb_thread("1: currenttxskb %p, dnld_sent %d\n",
+                                priv->currenttxskb, priv->dnld_sent);
 
                 add_wait_queue(&priv->waitq, &wait);
                 set_current_state(TASK_INTERRUPTIBLE);
@@ -684,8 +681,6 @@ static int lbs_thread(void *data)
                         shouldsleep = 1;        /* We need to wait until we're _told_ to die */
                 else if (priv->psstate == PS_STATE_SLEEP)
                         shouldsleep = 1;        /* Sleep mode. Nothing we can do till it wakes */
-                else if (priv->intcounter)
-                        shouldsleep = 0;        /* Interrupt pending. Deal with it now */
                 else if (priv->cmd_timed_out)
                         shouldsleep = 0;        /* Command timed out. Recover */
                 else if (!priv->fw_ready)
@@ -698,29 +693,34 @@ static int lbs_thread(void *data)
                         shouldsleep = 1;        /* Can't send a command; one already running */
                 else if (!list_empty(&priv->cmdpendingq))
                         shouldsleep = 0;        /* We have a command to send */
+                else if (__kfifo_len(priv->event_fifo))
+                        shouldsleep = 0;        /* We have an event to process */
+                else if (priv->resp_len[priv->resp_idx])
+                        shouldsleep = 0;        /* We have a command response */
                 else
                         shouldsleep = 1;        /* No command */
 
                 if (shouldsleep) {
-                        lbs_deb_thread("main-thread sleeping... Conn=%d IntC=%d PS_mode=%d PS_State=%d\n",
-                                       priv->connect_status, priv->intcounter,
-                                       priv->psmode, priv->psstate);
+                        lbs_deb_thread("sleeping, connect_status %d, "
+                                "ps_mode %d, ps_state %d\n",
+                                priv->connect_status,
+                                priv->psmode, priv->psstate);
                         spin_unlock_irq(&priv->driver_lock);
                         schedule();
                 } else
                         spin_unlock_irq(&priv->driver_lock);
 
-                lbs_deb_thread("main-thread 222 (waking up): intcounter=%d currenttxskb=%p dnld_sent=%d\n",
-                               priv->intcounter, priv->currenttxskb, priv->dnld_sent);
+                lbs_deb_thread("2: currenttxskb %p, dnld_send %d\n",
+                               priv->currenttxskb, priv->dnld_sent);
 
                 set_current_state(TASK_RUNNING);
                 remove_wait_queue(&priv->waitq, &wait);
 
-                lbs_deb_thread("main-thread 333: intcounter=%d currenttxskb=%p dnld_sent=%d\n",
-                               priv->intcounter, priv->currenttxskb, priv->dnld_sent);
+                lbs_deb_thread("3: currenttxskb %p, dnld_sent %d\n",
+                               priv->currenttxskb, priv->dnld_sent);
 
                 if (kthread_should_stop()) {
-                        lbs_deb_thread("main-thread: break from main thread\n");
+                        lbs_deb_thread("break from main thread\n");
                         break;
                 }
 
@@ -729,35 +729,23 @@ static int lbs_thread(void *data)
                         continue;
                 }
 
-                spin_lock_irq(&priv->driver_lock);
-
-                if (priv->intcounter) {
-                        u8 int_status;
-
-                        priv->intcounter = 0;
-                        int_status = priv->hw_get_int_status(priv, &ireg);
-
-                        if (int_status) {
-                                lbs_deb_thread("main-thread: reading HOST_INT_STATUS_REG failed\n");
-                                spin_unlock_irq(&priv->driver_lock);
-                                continue;
-                        }
-                        priv->hisregcpy |= ireg;
-                }
-
-                lbs_deb_thread("main-thread 444: intcounter=%d currenttxskb=%p dnld_sent=%d\n",
-                               priv->intcounter, priv->currenttxskb, priv->dnld_sent);
+                lbs_deb_thread("4: currenttxskb %p, dnld_sent %d\n",
+                       priv->currenttxskb, priv->dnld_sent);
 
-                /* command response? */
-                if (priv->hisregcpy & MRVDRV_CMD_UPLD_RDY) {
-                        lbs_deb_thread("main-thread: cmd response ready\n");
-
-                        priv->hisregcpy &= ~MRVDRV_CMD_UPLD_RDY;
+                spin_lock_irq(&priv->driver_lock);
+                /* Process any pending command response */
+                resp_idx = priv->resp_idx;
+                if (priv->resp_len[resp_idx]) {
                         spin_unlock_irq(&priv->driver_lock);
-                        lbs_process_rx_command(priv);
+                        lbs_process_command_response(priv,
+                                priv->resp_buf[resp_idx],
+                                priv->resp_len[resp_idx]);
                         spin_lock_irq(&priv->driver_lock);
+                        priv->resp_len[resp_idx] = 0;
                 }
+                spin_unlock_irq(&priv->driver_lock);
 
+                /* command timeout stuff */
                 if (priv->cmd_timed_out && priv->cur_cmd) {
                         struct cmd_ctrl_node *cmdnode = priv->cur_cmd;
 
@@ -778,21 +766,18 @@ static int lbs_thread(void *data)
                 }
                 priv->cmd_timed_out = 0;
 
-                /* Any Card Event */
-                if (priv->hisregcpy & MRVDRV_CARDEVENT) {
-                        lbs_deb_thread("main-thread: Card Event Activity\n");
-
-                        priv->hisregcpy &= ~MRVDRV_CARDEVENT;
+                /* Process hardware events, e.g. card removed, link lost */
+                spin_lock_irq(&priv->driver_lock);
+                while (__kfifo_len(priv->event_fifo)) {
+                        u32 event;
 
-                        if (priv->hw_read_event_cause(priv)) {
-                                lbs_pr_alert("main-thread: hw_read_event_cause failed\n");
-                                spin_unlock_irq(&priv->driver_lock);
-                                continue;
-                        }
-                        spin_unlock_irq(&priv->driver_lock);
-                        lbs_process_event(priv);
-                } else
+                        __kfifo_get(priv->event_fifo, (unsigned char *) &event,
+                                sizeof(event));
                         spin_unlock_irq(&priv->driver_lock);
+                        lbs_process_event(priv, event);
+                        spin_lock_irq(&priv->driver_lock);
+                }
+                spin_unlock_irq(&priv->driver_lock);
 
                 if (!priv->fw_ready)
                         continue;
@@ -801,10 +786,12 @@ static int lbs_thread(void *data)
                 if (priv->psstate == PS_STATE_PRE_SLEEP &&
                     !priv->dnld_sent && !priv->cur_cmd) {
                         if (priv->connect_status == LBS_CONNECTED) {
-                                lbs_deb_thread("main_thread: PRE_SLEEP--intcounter=%d currenttxskb=%p dnld_sent=%d cur_cmd=%p, confirm now\n",
-                                               priv->intcounter, priv->currenttxskb, priv->dnld_sent, priv->cur_cmd);
+                                lbs_deb_thread("pre-sleep, currenttxskb %p, "
+                                        "dnld_sent %d, cur_cmd %p\n",
+                                        priv->currenttxskb, priv->dnld_sent,
+                                        priv->cur_cmd);
 
-                                lbs_ps_confirm_sleep(priv, (u16) priv->psmode);
+                                lbs_ps_confirm_sleep(priv);
                         } else {
                                 /* workaround for firmware sending
                                  * deauth/linkloss event immediately
@@ -812,7 +799,8 @@ static int lbs_thread(void *data)
                                  * after firmware fixes it
                                  */
                                 priv->psstate = PS_STATE_AWAKE;
-                                lbs_pr_alert("main-thread: ignore PS_SleepConfirm in non-connected state\n");
+                                lbs_pr_alert("ignore PS_SleepConfirm in "
+                                        "non-connected state\n");
                         }
                 }
 
@@ -945,7 +933,7 @@ static int lbs_setup_firmware(struct lbs_private *priv)
                 goto done;
         }
 
-        lbs_set_mac_packet_filter(priv);
+        lbs_set_mac_control(priv);
 
         ret = lbs_get_data_rate(priv);
         if (ret < 0) {
@@ -985,6 +973,18 @@ out:
         lbs_deb_leave(LBS_DEB_CMD);
 }
 
+static void lbs_sync_channel_worker(struct work_struct *work)
+{
+        struct lbs_private *priv = container_of(work, struct lbs_private,
+                sync_channel);
+
+        lbs_deb_enter(LBS_DEB_MAIN);
+        if (lbs_update_channel(priv))
+                lbs_pr_info("Channel synchronization failed.");
+        lbs_deb_leave(LBS_DEB_MAIN);
+}
+
+
 static int lbs_init_adapter(struct lbs_private *priv)
 {
         size_t bufsize;
@@ -1009,14 +1009,6 @@ static int lbs_init_adapter(struct lbs_private *priv)
                               &priv->network_free_list);
         }
 
-        priv->lbs_ps_confirm_sleep.seqnum = cpu_to_le16(++priv->seqnum);
-        priv->lbs_ps_confirm_sleep.command =
-            cpu_to_le16(CMD_802_11_PS_MODE);
-        priv->lbs_ps_confirm_sleep.size =
-            cpu_to_le16(sizeof(struct PS_CMD_ConfirmSleep));
-        priv->lbs_ps_confirm_sleep.action =
-            cpu_to_le16(CMD_SUBCMD_SLEEP_CONFIRMED);
-
         memset(priv->current_addr, 0xff, ETH_ALEN);
 
         priv->connect_status = LBS_DISCONNECTED;
@@ -1024,7 +1016,7 @@ static int lbs_init_adapter(struct lbs_private *priv)
         priv->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
         priv->mode = IW_MODE_INFRA;
         priv->curbssparams.channel = DEFAULT_AD_HOC_CHANNEL;
-        priv->currentpacketfilter = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON;
+        priv->mac_control = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON;
         priv->radioon = RADIO_ON;
         priv->auto_rate = 1;
         priv->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;
@@ -1045,7 +1037,18 @@ static int lbs_init_adapter(struct lbs_private *priv)
         /* Allocate the command buffers */
         if (lbs_allocate_cmd_buffer(priv)) {
                 lbs_pr_err("Out of memory allocating command buffers\n");
-                ret = -1;
+                ret = -ENOMEM;
+                goto out;
+        }
+        priv->resp_idx = 0;
+        priv->resp_len[0] = priv->resp_len[1] = 0;
+
+        /* Create the event FIFO */
+        priv->event_fifo = kfifo_alloc(sizeof(u32) * 16, GFP_KERNEL, NULL);
+        if (IS_ERR(priv->event_fifo)) {
+                lbs_pr_err("Out of memory allocating event FIFO buffer\n");
+                ret = -ENOMEM;
+                goto out;
         }
 
 out:
@@ -1059,6 +1062,8 @@ static void lbs_free_adapter(struct lbs_private *priv)
         lbs_deb_enter(LBS_DEB_MAIN);
 
         lbs_free_cmd_buffer(priv);
+        if (priv->event_fifo)
+                kfifo_free(priv->event_fifo);
         del_timer(&priv->command_timer);
         kfree(priv->networks);
         priv->networks = NULL;
@@ -1128,7 +1133,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
         priv->work_thread = create_singlethread_workqueue("lbs_worker");
         INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker);
         INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
-        INIT_WORK(&priv->sync_channel, lbs_sync_channel);
+        INIT_WORK(&priv->sync_channel, lbs_sync_channel_worker);
 
         sprintf(priv->mesh_ssid, "mesh");
         priv->mesh_ssid_len = 4;
@@ -1380,7 +1385,7 @@ static void lbs_remove_mesh(struct lbs_private *priv)
  *  @param cfp_no  A pointer to CFP number
  *  @return        A pointer to CFP
  */
-struct chan_freq_power *lbs_get_region_cfp_table(u8 region, u8 band, int *cfp_no)
+struct chan_freq_power *lbs_get_region_cfp_table(u8 region, int *cfp_no)
 {
         int i, end;
 
@@ -1414,7 +1419,7 @@ int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band)
 
         memset(priv->region_channel, 0, sizeof(priv->region_channel));
 
-        cfp = lbs_get_region_cfp_table(region, band, &cfp_no);
+        cfp = lbs_get_region_cfp_table(region, &cfp_no);
         if (cfp != NULL) {
                 priv->region_channel[i].nrcfp = cfp_no;
                 priv->region_channel[i].CFP = cfp;
@@ -1433,31 +1438,49 @@ out:
         return ret;
 }
 
-/**
- *  @brief This function handles the interrupt. it will change PS
- *  state if applicable. it will wake up main_thread to handle
- *  the interrupt event as well.
- *
- *  @param dev     A pointer to net_device structure
- *  @return        n/a
- */
-void lbs_interrupt(struct lbs_private *priv)
+void lbs_queue_event(struct lbs_private *priv, u32 event)
+{
+        unsigned long flags;
+
+        lbs_deb_enter(LBS_DEB_THREAD);
+        spin_lock_irqsave(&priv->driver_lock, flags);
+
+        if (priv->psstate == PS_STATE_SLEEP)
+                priv->psstate = PS_STATE_AWAKE;
+
+        __kfifo_put(priv->event_fifo, (unsigned char *) &event, sizeof(u32));
+
+        wake_up_interruptible(&priv->waitq);
+
+        spin_unlock_irqrestore(&priv->driver_lock, flags);
+        lbs_deb_leave(LBS_DEB_THREAD);
+}
+EXPORT_SYMBOL_GPL(lbs_queue_event);
+
+void lbs_notify_command_response(struct lbs_private *priv, u8 resp_idx)
 {
         lbs_deb_enter(LBS_DEB_THREAD);
 
-        lbs_deb_thread("lbs_interrupt: intcounter=%d\n", priv->intcounter);
-        priv->intcounter++;
         if (priv->psstate == PS_STATE_SLEEP)
                 priv->psstate = PS_STATE_AWAKE;
+
+        /* Swap buffers by flipping the response index */
+        BUG_ON(resp_idx > 1);
+        priv->resp_idx = resp_idx;
+
         wake_up_interruptible(&priv->waitq);
 
         lbs_deb_leave(LBS_DEB_THREAD);
 }
-EXPORT_SYMBOL_GPL(lbs_interrupt);
+EXPORT_SYMBOL_GPL(lbs_notify_command_response);
 
 static int __init lbs_init_module(void)
 {
         lbs_deb_enter(LBS_DEB_MAIN);
+        memset(&confirm_sleep, 0, sizeof(confirm_sleep));
+        confirm_sleep.hdr.command = cpu_to_le16(CMD_802_11_PS_MODE);
+        confirm_sleep.hdr.size = cpu_to_le16(sizeof(confirm_sleep));
+        confirm_sleep.action = cpu_to_le16(CMD_SUBCMD_SLEEP_CONFIRMED);
         lbs_debugfs_init();
         lbs_deb_leave(LBS_DEB_MAIN);
         return 0;
@@ -1554,6 +1577,32 @@ out:
         return ret;
 }
 
+#ifndef CONFIG_IEEE80211
+const char *escape_essid(const char *essid, u8 essid_len)
+{
+        static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
+        const char *s = essid;
+        char *d = escaped;
+
+        if (ieee80211_is_empty_essid(essid, essid_len)) {
+                memcpy(escaped, "<hidden>", sizeof("<hidden>"));
+                return escaped;
+        }
+
+        essid_len = min(essid_len, (u8) IW_ESSID_MAX_SIZE);
+        while (essid_len--) {
+                if (*s == '\0') {
+                        *d++ = '\\';
+                        *d++ = '0';
+                        s++;
+                } else {
+                        *d++ = *s++;
+                }
+        }
+        *d = '\0';
+        return escaped;
+}
+#endif
 
 module_init(lbs_init_module);
 module_exit(lbs_exit_module);
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 149557a478ac..05af7316f698 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -145,17 +145,17 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
         struct net_device *dev = priv->dev;
         struct rxpackethdr *p_rx_pkt;
         struct rxpd *p_rx_pd;
-
         int hdrchop;
         struct ethhdr *p_ethhdr;
-
         const u8 rfc1042_eth_hdr[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 
         lbs_deb_enter(LBS_DEB_RX);
 
+        BUG_ON(!skb);
+
         skb->ip_summed = CHECKSUM_NONE;
 
-        if (priv->monitormode != LBS_MONITOR_OFF)
+        if (priv->monitormode)
                 return process_rxed_802_11_packet(priv, skb);
 
         p_rx_pkt = (struct rxpackethdr *) skb->data;
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 69f94c92b32d..e72c97a0d6c1 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -4,22 +4,14 @@
   * IOCTL handlers as well as command preperation and response routines
   *  for sending scan commands to the firmware.
   */
-#include <linux/ctype.h>
-#include <linux/if.h>
-#include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <linux/etherdevice.h>
-
-#include <net/ieee80211.h>
-#include <net/iw_handler.h>
-
 #include <asm/unaligned.h>
 
 #include "host.h"
 #include "decl.h"
 #include "dev.h"
 #include "scan.h"
-#include "join.h"
+#include "cmd.h"
 
 //! Approximate amount of data needed to pass a scan result back to iwlist
 #define MAX_SCAN_CELL_SIZE  (IW_EV_ADDR_LEN             \
@@ -39,10 +31,9 @@
 //! Memory needed to store a max number/size SSID TLV for a firmware scan
 #define SSID_TLV_MAX_SIZE  (1 * sizeof(struct mrvlietypes_ssidparamset))
 
-//! Maximum memory needed for a lbs_scan_cmd_config with all TLVs at max
-#define MAX_SCAN_CFG_ALLOC (sizeof(struct lbs_scan_cmd_config)  \
-                            + CHAN_TLV_MAX_SIZE                 \
-                            + SSID_TLV_MAX_SIZE)
+//! Maximum memory needed for a cmd_ds_802_11_scan with all TLVs at max
+#define MAX_SCAN_CFG_ALLOC (sizeof(struct cmd_ds_802_11_scan)   \
+                            + CHAN_TLV_MAX_SIZE + SSID_TLV_MAX_SIZE)
 
 //! The maximum number of channels the firmware can scan per command
 #define MRVDRV_MAX_CHANNELS_PER_SCAN   14
@@ -61,11 +52,8 @@
 //! Scan time specified in the channel TLV for each channel for active scans
 #define MRVDRV_ACTIVE_SCAN_CHAN_TIME   100
 
-static const u8 zeromac[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-static const u8 bcastmac[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
-
-
+static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
+                              struct cmd_header *resp);
 
 /*********************************************************************/
 /*                                                                   */
@@ -73,7 +61,24 @@ static const u8 bcastmac[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 /*                                                                   */
 /*********************************************************************/
 
-static inline void clear_bss_descriptor (struct bss_descriptor * bss)
+/**
+ *  @brief Unsets the MSB on basic rates
+ *
+ * Scan through an array and unset the MSB for basic data rates.
+ *
+ *  @param rates     buffer of data rates
+ *  @param len       size of buffer
+ */
+static void lbs_unset_basic_rate_flags(u8 *rates, size_t len)
+{
+        int i;
+
+        for (i = 0; i < len; i++)
+                rates[i] &= 0x7f;
+}
+
+
+static inline void clear_bss_descriptor(struct bss_descriptor *bss)
 {
         /* Don't blow away ->list, just BSS data */
         memset(bss, 0, offsetof(struct bss_descriptor, list));
@@ -87,7 +92,8 @@ static inline void clear_bss_descriptor (struct bss_descriptor * bss)
  *
  *  @return         0: ssid is same, otherwise is different
  */
-int lbs_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len)
+int lbs_ssid_cmp(uint8_t *ssid1, uint8_t ssid1_len, uint8_t *ssid2,
+                 uint8_t ssid2_len)
 {
         if (ssid1_len != ssid2_len)
                 return -1;
@@ -95,76 +101,6 @@ int lbs_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len)
         return memcmp(ssid1, ssid2, ssid1_len);
 }
 
-static inline int match_bss_no_security(struct lbs_802_11_security *secinfo,
-                        struct bss_descriptor * match_bss)
-{
-        if (   !secinfo->wep_enabled
-            && !secinfo->WPAenabled
-            && !secinfo->WPA2enabled
-            && match_bss->wpa_ie[0] != MFIE_TYPE_GENERIC
-            && match_bss->rsn_ie[0] != MFIE_TYPE_RSN
-            && !(match_bss->capability & WLAN_CAPABILITY_PRIVACY)) {
-                return 1;
-        }
-        return 0;
-}
-
-static inline int match_bss_static_wep(struct lbs_802_11_security *secinfo,
-                        struct bss_descriptor * match_bss)
-{
-        if ( secinfo->wep_enabled
-           && !secinfo->WPAenabled
-           && !secinfo->WPA2enabled
-           && (match_bss->capability & WLAN_CAPABILITY_PRIVACY)) {
-                return 1;
-        }
-        return 0;
-}
-
-static inline int match_bss_wpa(struct lbs_802_11_security *secinfo,
-                        struct bss_descriptor * match_bss)
-{
-        if (  !secinfo->wep_enabled
-           && secinfo->WPAenabled
-           && (match_bss->wpa_ie[0] == MFIE_TYPE_GENERIC)
-           /* privacy bit may NOT be set in some APs like LinkSys WRT54G
-              && (match_bss->capability & WLAN_CAPABILITY_PRIVACY)) {
-            */
-           ) {
-                return 1;
-        }
-        return 0;
-}
-
-static inline int match_bss_wpa2(struct lbs_802_11_security *secinfo,
-                        struct bss_descriptor * match_bss)
-{
-        if (  !secinfo->wep_enabled
-           && secinfo->WPA2enabled
-           && (match_bss->rsn_ie[0] == MFIE_TYPE_RSN)
-           /* privacy bit may NOT be set in some APs like LinkSys WRT54G
-              && (match_bss->capability & WLAN_CAPABILITY_PRIVACY)) {
-            */
-           ) {
-                return 1;
-        }
-        return 0;
-}
-
-static inline int match_bss_dynamic_wep(struct lbs_802_11_security *secinfo,
-                        struct bss_descriptor * match_bss)
-{
-        if (  !secinfo->wep_enabled
-           && !secinfo->WPAenabled
-           && !secinfo->WPA2enabled
-           && (match_bss->wpa_ie[0] != MFIE_TYPE_GENERIC)
-           && (match_bss->rsn_ie[0] != MFIE_TYPE_RSN)
-           && (match_bss->capability & WLAN_CAPABILITY_PRIVACY)) {
-                return 1;
-        }
-        return 0;
-}
-
 static inline int is_same_network(struct bss_descriptor *src,
                                   struct bss_descriptor *dst)
 {
@@ -177,83 +113,6 @@ static inline int is_same_network(struct bss_descriptor *src,
                 !memcmp(src->ssid, dst->ssid, src->ssid_len));
 }
 
-/**
- *  @brief Check if a scanned network compatible with the driver settings
- *
- *   WEP     WPA     WPA2    ad-hoc  encrypt                      Network
- * enabled enabled  enabled   AES     mode   privacy  WPA  WPA2  Compatible
- *    0       0        0       0      NONE      0      0    0   yes No security
- *    1       0        0       0      NONE      1      0    0   yes Static WEP
- *    0       1        0       0       x        1x     1    x   yes WPA
- *    0       0        1       0       x        1x     x    1   yes WPA2
- *    0       0        0       1      NONE      1      0    0   yes Ad-hoc AES
- *    0       0        0       0     !=NONE     1      0    0   yes Dynamic WEP
- *
- *
- *  @param priv A pointer to struct lbs_private
- *  @param index   Index in scantable to check against current driver settings
- *  @param mode    Network mode: Infrastructure or IBSS
- *
- *  @return        Index in scantable, or error code if negative
- */
-static int is_network_compatible(struct lbs_private *priv,
-                struct bss_descriptor * bss, u8 mode)
-{
-        int matched = 0;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        if (bss->mode != mode)
-                goto done;
-
-        if ((matched = match_bss_no_security(&priv->secinfo, bss))) {
-                goto done;
-        } else if ((matched = match_bss_static_wep(&priv->secinfo, bss))) {
-                goto done;
-        } else if ((matched = match_bss_wpa(&priv->secinfo, bss))) {
-                lbs_deb_scan(
-                       "is_network_compatible() WPA: wpa_ie 0x%x "
-                       "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s "
-                       "privacy 0x%x\n", bss->wpa_ie[0], bss->rsn_ie[0],
-                       priv->secinfo.wep_enabled ? "e" : "d",
-                       priv->secinfo.WPAenabled ? "e" : "d",
-                       priv->secinfo.WPA2enabled ? "e" : "d",
-                       (bss->capability & WLAN_CAPABILITY_PRIVACY));
-                goto done;
-        } else if ((matched = match_bss_wpa2(&priv->secinfo, bss))) {
-                lbs_deb_scan(
-                       "is_network_compatible() WPA2: wpa_ie 0x%x "
-                       "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s "
-                       "privacy 0x%x\n", bss->wpa_ie[0], bss->rsn_ie[0],
-                       priv->secinfo.wep_enabled ? "e" : "d",
-                       priv->secinfo.WPAenabled ? "e" : "d",
-                       priv->secinfo.WPA2enabled ? "e" : "d",
-                       (bss->capability & WLAN_CAPABILITY_PRIVACY));
-                goto done;
-        } else if ((matched = match_bss_dynamic_wep(&priv->secinfo, bss))) {
-                lbs_deb_scan(
-                       "is_network_compatible() dynamic WEP: "
-                       "wpa_ie 0x%x wpa2_ie 0x%x privacy 0x%x\n",
-                       bss->wpa_ie[0], bss->rsn_ie[0],
-                       (bss->capability & WLAN_CAPABILITY_PRIVACY));
-                goto done;
-        }
-
-        /* bss security settings don't match those configured on card */
-        lbs_deb_scan(
-               "is_network_compatible() FAILED: wpa_ie 0x%x "
-               "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s privacy 0x%x\n",
-               bss->wpa_ie[0], bss->rsn_ie[0],
-               priv->secinfo.wep_enabled ? "e" : "d",
-               priv->secinfo.WPAenabled ? "e" : "d",
-               priv->secinfo.WPA2enabled ? "e" : "d",
-               (bss->capability & WLAN_CAPABILITY_PRIVACY));
-
-done:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "matched: %d", matched);
-        return matched;
-}
-
 
 
 
@@ -263,17 +122,6 @@ done:
 /*                                                                   */
 /*********************************************************************/
 
-void lbs_scan_worker(struct work_struct *work)
-{
-        struct lbs_private *priv =
-                container_of(work, struct lbs_private, scan_work.work);
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-        lbs_scan_networks(priv, NULL, 0);
-        lbs_deb_leave(LBS_DEB_SCAN);
-}
-
-
 /**
  *  @brief Create a channel list for the driver to scan based on region info
  *
@@ -285,25 +133,18 @@ void lbs_scan_worker(struct work_struct *work)
  *
  *  @param priv          A pointer to struct lbs_private structure
  *  @param scanchanlist  Output parameter: resulting channel list to scan
- *  @param filteredscan  Flag indicating whether or not a BSSID or SSID filter
- *                       is being sent in the command to firmware.  Used to
- *                       increase the number of channels sent in a scan
- *                       command and to disable the firmware channel scan
- *                       filter.
  *
  *  @return              void
  */
 static int lbs_scan_create_channel_list(struct lbs_private *priv,
-                                          struct chanscanparamset * scanchanlist,
-                                          u8 filteredscan)
+                                        struct chanscanparamset *scanchanlist)
 {
-
         struct region_channel *scanregion;
         struct chan_freq_power *cfp;
         int rgnidx;
         int chanidx;
         int nextchan;
-        u8 scantype;
+        uint8_t scantype;
 
         chanidx = 0;
 
@@ -314,9 +155,8 @@ static int lbs_scan_create_channel_list(struct lbs_private *priv,
         scantype = CMD_SCAN_TYPE_ACTIVE;
 
         for (rgnidx = 0; rgnidx < ARRAY_SIZE(priv->region_channel); rgnidx++) {
-                if (priv->enable11d &&
-                    (priv->connect_status != LBS_CONNECTED) &&
-                    (priv->mesh_connect_status != LBS_CONNECTED)) {
+                if (priv->enable11d && (priv->connect_status != LBS_CONNECTED)
+                    && (priv->mesh_connect_status != LBS_CONNECTED)) {
                         /* Scan all the supported chan for the first scan */
                         if (!priv->universal_channel[rgnidx].valid)
                                 continue;
@@ -331,51 +171,32 @@ static int lbs_scan_create_channel_list(struct lbs_private *priv,
                         scanregion = &priv->region_channel[rgnidx];
                 }
 
-                for (nextchan = 0;
-                     nextchan < scanregion->nrcfp; nextchan++, chanidx++) {
+                for (nextchan = 0; nextchan < scanregion->nrcfp; nextchan++, chanidx++) {
+                        struct chanscanparamset *chan = &scanchanlist[chanidx];
 
                         cfp = scanregion->CFP + nextchan;
 
-                        if (priv->enable11d) {
-                                scantype =
-                                    lbs_get_scan_type_11d(cfp->channel,
-                                                           &priv->
-                                                           parsed_region_chan);
-                        }
+                        if (priv->enable11d)
+                                scantype = lbs_get_scan_type_11d(cfp->channel,
+                                                                 &priv->parsed_region_chan);
 
-                        switch (scanregion->band) {
-                        case BAND_B:
-                        case BAND_G:
-                        default:
-                                scanchanlist[chanidx].radiotype =
-                                    CMD_SCAN_RADIO_TYPE_BG;
-                                break;
-                        }
+                        if (scanregion->band == BAND_B || scanregion->band == BAND_G)
+                                chan->radiotype = CMD_SCAN_RADIO_TYPE_BG;
 
                         if (scantype == CMD_SCAN_TYPE_PASSIVE) {
-                                scanchanlist[chanidx].maxscantime =
-                                    cpu_to_le16(MRVDRV_PASSIVE_SCAN_CHAN_TIME);
-                                scanchanlist[chanidx].chanscanmode.passivescan =
-                                    1;
+                                chan->maxscantime = cpu_to_le16(MRVDRV_PASSIVE_SCAN_CHAN_TIME);
+                                chan->chanscanmode.passivescan = 1;
                         } else {
-                                scanchanlist[chanidx].maxscantime =
-                                    cpu_to_le16(MRVDRV_ACTIVE_SCAN_CHAN_TIME);
-                                scanchanlist[chanidx].chanscanmode.passivescan =
-                                    0;
+                                chan->maxscantime = cpu_to_le16(MRVDRV_ACTIVE_SCAN_CHAN_TIME);
+                                chan->chanscanmode.passivescan = 0;
                         }
 
-                        scanchanlist[chanidx].channumber = cfp->channel;
-
-                        if (filteredscan) {
-                                scanchanlist[chanidx].chanscanmode.
-                                    disablechanfilt = 1;
-                        }
+                        chan->channumber = cfp->channel;
                 }
         }
         return chanidx;
 }
 
-
 /*
  * Add SSID TLV of the form:
  *
@@ -383,18 +204,16 @@ static int lbs_scan_create_channel_list(struct lbs_private *priv,
  * length          06 00
  * ssid            4d 4e 54 45 53 54
  */
-static int lbs_scan_add_ssid_tlv(u8 *tlv,
-        const struct lbs_ioctl_user_scan_cfg *user_cfg)
+static int lbs_scan_add_ssid_tlv(struct lbs_private *priv, u8 *tlv)
 {
-        struct mrvlietypes_ssidparamset *ssid_tlv =
-                (struct mrvlietypes_ssidparamset *)tlv;
+        struct mrvlietypes_ssidparamset *ssid_tlv = (void *)tlv;
+
         ssid_tlv->header.type = cpu_to_le16(TLV_TYPE_SSID);
-        ssid_tlv->header.len = cpu_to_le16(user_cfg->ssid_len);
-        memcpy(ssid_tlv->ssid, user_cfg->ssid, user_cfg->ssid_len);
-        return sizeof(ssid_tlv->header) + user_cfg->ssid_len;
+        ssid_tlv->header.len = cpu_to_le16(priv->scan_ssid_len);
+        memcpy(ssid_tlv->ssid, priv->scan_ssid, priv->scan_ssid_len);
+        return sizeof(ssid_tlv->header) + priv->scan_ssid_len;
 }
 
-
 /*
  * Add CHANLIST TLV of the form
  *
@@ -420,13 +239,12 @@ static int lbs_scan_add_ssid_tlv(u8 *tlv,
  * channel 13      00 0d 00 00 00 64 00
  *
  */
-static int lbs_scan_add_chanlist_tlv(u8 *tlv,
-        struct chanscanparamset *chan_list,
-        int chan_count)
+static int lbs_scan_add_chanlist_tlv(uint8_t *tlv,
+                                     struct chanscanparamset *chan_list,
+                                     int chan_count)
 {
-        size_t size = sizeof(struct chanscanparamset) * chan_count;
-        struct mrvlietypes_chanlistparamset *chan_tlv =
-                (struct mrvlietypes_chanlistparamset *) tlv;
+        size_t size = sizeof(struct chanscanparamset) *chan_count;
+        struct mrvlietypes_chanlistparamset *chan_tlv = (void *)tlv;
 
         chan_tlv->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
         memcpy(chan_tlv->chanscanparam, chan_list, size);
@@ -434,7 +252,6 @@ static int lbs_scan_add_chanlist_tlv(u8 *tlv,
         return sizeof(chan_tlv->header) + size;
 }
 
-
 /*
  * Add RATES TLV of the form
  *
@@ -445,11 +262,10 @@ static int lbs_scan_add_chanlist_tlv(u8 *tlv,
  * The rates are in lbs_bg_rates[], but for the 802.11b
  * rates the high bit isn't set.
  */
-static int lbs_scan_add_rates_tlv(u8 *tlv)
+static int lbs_scan_add_rates_tlv(uint8_t *tlv)
 {
         int i;
-        struct mrvlietypes_ratesparamset *rate_tlv =
-                (struct mrvlietypes_ratesparamset *) tlv;
+        struct mrvlietypes_ratesparamset *rate_tlv = (void *)tlv;
 
         rate_tlv->header.type = cpu_to_le16(TLV_TYPE_RATES);
         tlv += sizeof(rate_tlv->header);
@@ -470,82 +286,74 @@ static int lbs_scan_add_rates_tlv(u8 *tlv)
         return sizeof(rate_tlv->header) + i;
 }
 
-
 /*
  * Generate the CMD_802_11_SCAN command with the proper tlv
  * for a bunch of channels.
  */
-static int lbs_do_scan(struct lbs_private *priv,
-        u8 bsstype,
-        struct chanscanparamset *chan_list,
-        int chan_count,
-        const struct lbs_ioctl_user_scan_cfg *user_cfg)
+static int lbs_do_scan(struct lbs_private *priv, uint8_t bsstype,
+                       struct chanscanparamset *chan_list, int chan_count)
 {
         int ret = -ENOMEM;
-        struct lbs_scan_cmd_config *scan_cmd;
-        u8 *tlv;    /* pointer into our current, growing TLV storage area */
+        struct cmd_ds_802_11_scan *scan_cmd;
+        uint8_t *tlv;   /* pointer into our current, growing TLV storage area */
 
-        lbs_deb_enter_args(LBS_DEB_SCAN, "bsstype %d, chanlist[].chan %d, "
-                "chan_count %d",
-                bsstype, chan_list[0].channumber, chan_count);
+        lbs_deb_enter_args(LBS_DEB_SCAN, "bsstype %d, chanlist[].chan %d, chan_count %d",
+                           bsstype, chan_list[0].channumber, chan_count);
 
         /* create the fixed part for scan command */
         scan_cmd = kzalloc(MAX_SCAN_CFG_ALLOC, GFP_KERNEL);
         if (scan_cmd == NULL)
                 goto out;
+
         tlv = scan_cmd->tlvbuffer;
-        if (user_cfg)
-                memcpy(scan_cmd->bssid, user_cfg->bssid, ETH_ALEN);
+        /* TODO: do we need to scan for a specific BSSID?
+        memcpy(scan_cmd->bssid, priv->scan_bssid, ETH_ALEN); */
         scan_cmd->bsstype = bsstype;
 
         /* add TLVs */
-        if (user_cfg && user_cfg->ssid_len)
-                tlv += lbs_scan_add_ssid_tlv(tlv, user_cfg);
+        if (priv->scan_ssid_len)
+                tlv += lbs_scan_add_ssid_tlv(priv, tlv);
         if (chan_list && chan_count)
                 tlv += lbs_scan_add_chanlist_tlv(tlv, chan_list, chan_count);
         tlv += lbs_scan_add_rates_tlv(tlv);
 
         /* This is the final data we are about to send */
-        scan_cmd->tlvbufferlen = tlv - scan_cmd->tlvbuffer;
-        lbs_deb_hex(LBS_DEB_SCAN, "SCAN_CMD", (void *)scan_cmd, 1+6);
+        scan_cmd->hdr.size = cpu_to_le16(tlv - (uint8_t *)scan_cmd);
+        lbs_deb_hex(LBS_DEB_SCAN, "SCAN_CMD", (void *)scan_cmd,
+                    sizeof(*scan_cmd));
         lbs_deb_hex(LBS_DEB_SCAN, "SCAN_TLV", scan_cmd->tlvbuffer,
-                scan_cmd->tlvbufferlen);
+                    tlv - scan_cmd->tlvbuffer);
+
+        ret = __lbs_cmd(priv, CMD_802_11_SCAN, &scan_cmd->hdr,
+                        le16_to_cpu(scan_cmd->hdr.size),
+                        lbs_ret_80211_scan, 0);
 
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, 0,
-                CMD_OPTION_WAITFORRSP, 0, scan_cmd);
 out:
         kfree(scan_cmd);
         lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
         return ret;
 }
 
-
 /**
  *  @brief Internal function used to start a scan based on an input config
  *
- *  Also used from debugfs
- *
  *  Use the input user scan configuration information when provided in
  *    order to send the appropriate scan commands to firmware to populate or
  *    update the internal driver scan table
  *
  *  @param priv          A pointer to struct lbs_private structure
- *  @param puserscanin   Pointer to the input configuration for the requested
- *                       scan.
+ *  @param full_scan     Do a full-scan (blocking)
  *
  *  @return              0 or < 0 if error
  */
-int lbs_scan_networks(struct lbs_private *priv,
-        const struct lbs_ioctl_user_scan_cfg *user_cfg,
-                       int full_scan)
+int lbs_scan_networks(struct lbs_private *priv, int full_scan)
 {
         int ret = -ENOMEM;
         struct chanscanparamset *chan_list;
         struct chanscanparamset *curr_chans;
         int chan_count;
-        u8 bsstype = CMD_BSS_TYPE_ANY;
+        uint8_t bsstype = CMD_BSS_TYPE_ANY;
         int numchannels = MRVDRV_CHANNELS_PER_SCAN_CMD;
-        int filteredscan = 0;
         union iwreq_data wrqu;
 #ifdef CONFIG_LIBERTAS_DEBUG
         struct bss_descriptor *iter;
@@ -553,8 +361,7 @@ int lbs_scan_networks(struct lbs_private *priv,
         DECLARE_MAC_BUF(mac);
 #endif
 
-        lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d",
-                full_scan);
+        lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan);
 
         /* Cancel any partial outstanding partial scans if this scan
          * is a full scan.
@@ -562,30 +369,27 @@ int lbs_scan_networks(struct lbs_private *priv,
         if (full_scan && delayed_work_pending(&priv->scan_work))
                 cancel_delayed_work(&priv->scan_work);
 
-        /* Determine same scan parameters */
+        /* User-specified bsstype or channel list
+        TODO: this can be implemented if some user-space application
+        need the feature. Formerly, it was accessible from debugfs,
+        but then nowhere used.
         if (user_cfg) {
                 if (user_cfg->bsstype)
-                        bsstype = user_cfg->bsstype;
-                if (compare_ether_addr(user_cfg->bssid, &zeromac[0]) != 0) {
-                        numchannels = MRVDRV_MAX_CHANNELS_PER_SCAN;
-                        filteredscan = 1;
-                }
-        }
-        lbs_deb_scan("numchannels %d, bsstype %d, "
-                "filteredscan %d\n",
-                numchannels, bsstype, filteredscan);
+                bsstype = user_cfg->bsstype;
+        } */
+
+        lbs_deb_scan("numchannels %d, bsstype %d\n", numchannels, bsstype);
 
         /* Create list of channels to scan */
         chan_list = kzalloc(sizeof(struct chanscanparamset) *
-                                LBS_IOCTL_USER_SCAN_CHAN_MAX, GFP_KERNEL);
+                            LBS_IOCTL_USER_SCAN_CHAN_MAX, GFP_KERNEL);
         if (!chan_list) {
                 lbs_pr_alert("SCAN: chan_list empty\n");
                 goto out;
         }
 
         /* We want to scan all channels */
-        chan_count = lbs_scan_create_channel_list(priv, chan_list,
-                filteredscan);
+        chan_count = lbs_scan_create_channel_list(priv, chan_list);
 
         netif_stop_queue(priv->dev);
         netif_carrier_off(priv->dev);
@@ -595,13 +399,13 @@ int lbs_scan_networks(struct lbs_private *priv,
         }
 
         /* Prepare to continue an interrupted scan */
-        lbs_deb_scan("chan_count %d, last_scanned_channel %d\n",
-                     chan_count, priv->last_scanned_channel);
+        lbs_deb_scan("chan_count %d, scan_channel %d\n",
+                     chan_count, priv->scan_channel);
         curr_chans = chan_list;
         /* advance channel list by already-scanned-channels */
-        if (priv->last_scanned_channel > 0) {
-                curr_chans += priv->last_scanned_channel;
-                chan_count -= priv->last_scanned_channel;
+        if (priv->scan_channel > 0) {
+                curr_chans += priv->scan_channel;
+                chan_count -= priv->scan_channel;
         }
 
         /* Send scan command(s)
@@ -612,9 +416,9 @@ int lbs_scan_networks(struct lbs_private *priv,
         while (chan_count) {
                 int to_scan = min(numchannels, chan_count);
                 lbs_deb_scan("scanning %d of %d channels\n",
-                        to_scan, chan_count);
+                             to_scan, chan_count);
                 ret = lbs_do_scan(priv, bsstype, curr_chans,
-                        to_scan, user_cfg);
+                                  to_scan);
                 if (ret) {
                         lbs_pr_err("SCAN_CMD failed\n");
                         goto out2;
@@ -623,17 +427,16 @@ int lbs_scan_networks(struct lbs_private *priv,
                 chan_count -= to_scan;
 
                 /* somehow schedule the next part of the scan */
-                if (chan_count &&
-                    !full_scan &&
+                if (chan_count && !full_scan &&
                     !priv->surpriseremoved) {
                         /* -1 marks just that we're currently scanning */
-                        if (priv->last_scanned_channel < 0)
-                                priv->last_scanned_channel = to_scan;
+                        if (priv->scan_channel < 0)
+                                priv->scan_channel = to_scan;
                         else
-                                priv->last_scanned_channel += to_scan;
+                                priv->scan_channel += to_scan;
                         cancel_delayed_work(&priv->scan_work);
                         queue_delayed_work(priv->work_thread, &priv->scan_work,
-                                msecs_to_jiffies(300));
+                                           msecs_to_jiffies(300));
                         /* skip over GIWSCAN event */
                         goto out;
                 }
@@ -648,13 +451,13 @@ int lbs_scan_networks(struct lbs_private *priv,
         lbs_deb_scan("scan table:\n");
         list_for_each_entry(iter, &priv->network_list, list)
                 lbs_deb_scan("%02d: BSSID %s, RSSI %d, SSID '%s'\n",
-                       i++, print_mac(mac, iter->bssid), (s32) iter->rssi,
-                       escape_essid(iter->ssid, iter->ssid_len));
+                             i++, print_mac(mac, iter->bssid), iter->rssi,
+                             escape_essid(iter->ssid, iter->ssid_len));
         mutex_unlock(&priv->lock);
 #endif
 
 out2:
-        priv->last_scanned_channel = 0;
+        priv->scan_channel = 0;
 
 out:
         if (priv->connect_status == LBS_CONNECTED) {
@@ -673,7 +476,15 @@ out:
         return ret;
 }
 
+void lbs_scan_worker(struct work_struct *work)
+{
+        struct lbs_private *priv =
+                container_of(work, struct lbs_private, scan_work.work);
 
+        lbs_deb_enter(LBS_DEB_SCAN);
+        lbs_scan_networks(priv, 0);
+        lbs_deb_leave(LBS_DEB_SCAN);
+}
 
 
 /*********************************************************************/
@@ -694,7 +505,7 @@ out:
  *  @return             0 or -1
  */
 static int lbs_process_bss(struct bss_descriptor *bss,
-                                u8 ** pbeaconinfo, int *bytesleft)
+                           uint8_t **pbeaconinfo, int *bytesleft)
 {
         struct ieeetypes_fhparamset *pFH;
         struct ieeetypes_dsparamset *pDS;
@@ -702,9 +513,9 @@ static int lbs_process_bss(struct bss_descriptor *bss,
         struct ieeetypes_ibssparamset *pibss;
         DECLARE_MAC_BUF(mac);
         struct ieeetypes_countryinfoset *pcountryinfo;
-        u8 *pos, *end, *p;
-        u8 n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
-        u16 beaconsize = 0;
+        uint8_t *pos, *end, *p;
+        uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
+        uint16_t beaconsize = 0;
         int ret;
 
         lbs_deb_enter(LBS_DEB_SCAN);
@@ -776,12 +587,11 @@ static int lbs_process_bss(struct bss_descriptor *bss,
 
         /* process variable IE */
         while (pos <= end - 2) {
-                struct ieee80211_info_element * elem =
-                        (struct ieee80211_info_element *) pos;
+                struct ieee80211_info_element * elem = (void *)pos;
 
                 if (pos + elem->len > end) {
                         lbs_deb_scan("process_bss: error in processing IE, "
-                               "bytes left < IE length\n");
+                                     "bytes left < IE length\n");
                         break;
                 }
 
@@ -795,7 +605,7 @@ static int lbs_process_bss(struct bss_descriptor *bss,
                         break;
 
                 case MFIE_TYPE_RATES:
-                        n_basic_rates = min_t(u8, MAX_RATES, elem->len);
+                        n_basic_rates = min_t(uint8_t, MAX_RATES, elem->len);
                         memcpy(bss->rates, elem->data, n_basic_rates);
                         got_basic_rates = 1;
                         lbs_deb_scan("got RATES IE\n");
@@ -836,19 +646,16 @@ static int lbs_process_bss(struct bss_descriptor *bss,
                         lbs_deb_scan("got COUNTRY IE\n");
                         if (pcountryinfo->len < sizeof(pcountryinfo->countrycode)
                             || pcountryinfo->len > 254) {
-                                lbs_deb_scan("process_bss: 11D- Err "
-                                       "CountryInfo len %d, min %zd, max 254\n",
-                                       pcountryinfo->len,
-                                       sizeof(pcountryinfo->countrycode));
+                                lbs_deb_scan("process_bss: 11D- Err CountryInfo len %d, min %zd, max 254\n",
+                                             pcountryinfo->len, sizeof(pcountryinfo->countrycode));
                                 ret = -1;
                                 goto done;
                         }
 
-                        memcpy(&bss->countryinfo,
-                               pcountryinfo, pcountryinfo->len + 2);
+                        memcpy(&bss->countryinfo, pcountryinfo, pcountryinfo->len + 2);
                         lbs_deb_hex(LBS_DEB_SCAN, "process_bss: 11d countryinfo",
-                                (u8 *) pcountryinfo,
-                                (u32) (pcountryinfo->len + 2));
+                                    (uint8_t *) pcountryinfo,
+                                    (int) (pcountryinfo->len + 2));
                         break;
 
                 case MFIE_TYPE_RATES_EX:
@@ -872,26 +679,19 @@ static int lbs_process_bss(struct bss_descriptor *bss,
 
                 case MFIE_TYPE_GENERIC:
                         if (elem->len >= 4 &&
-                            elem->data[0] == 0x00 &&
-                            elem->data[1] == 0x50 &&
-                            elem->data[2] == 0xf2 &&
-                            elem->data[3] == 0x01) {
-                                bss->wpa_ie_len = min(elem->len + 2,
-                                                      MAX_WPA_IE_LEN);
+                            elem->data[0] == 0x00 && elem->data[1] == 0x50 &&
+                            elem->data[2] == 0xf2 && elem->data[3] == 0x01) {
+                                bss->wpa_ie_len = min(elem->len + 2, MAX_WPA_IE_LEN);
                                 memcpy(bss->wpa_ie, elem, bss->wpa_ie_len);
                                 lbs_deb_scan("got WPA IE\n");
-                                lbs_deb_hex(LBS_DEB_SCAN, "WPA IE", bss->wpa_ie,
-                                            elem->len);
+                                lbs_deb_hex(LBS_DEB_SCAN, "WPA IE", bss->wpa_ie, elem->len);
                         } else if (elem->len >= MARVELL_MESH_IE_LENGTH &&
-                            elem->data[0] == 0x00 &&
-                            elem->data[1] == 0x50 &&
-                            elem->data[2] == 0x43 &&
-                            elem->data[3] == 0x04) {
+                                   elem->data[0] == 0x00 && elem->data[1] == 0x50 &&
+                                   elem->data[2] == 0x43 && elem->data[3] == 0x04) {
                                 lbs_deb_scan("got mesh IE\n");
                                 bss->mesh = 1;
                         } else {
-                                lbs_deb_scan("got generiec IE: "
-                                        "%02x:%02x:%02x:%02x, len %d\n",
+                                lbs_deb_scan("got generic IE: %02x:%02x:%02x:%02x, len %d\n",
                                         elem->data[0], elem->data[1],
                                         elem->data[2], elem->data[3],
                                         elem->len);
@@ -903,12 +703,12 @@ static int lbs_process_bss(struct bss_descriptor *bss,
                         bss->rsn_ie_len = min(elem->len + 2, MAX_WPA_IE_LEN);
                         memcpy(bss->rsn_ie, elem, bss->rsn_ie_len);
                         lbs_deb_hex(LBS_DEB_SCAN, "process_bss: RSN_IE",
-                                bss->rsn_ie, elem->len);
+                                    bss->rsn_ie, elem->len);
                         break;
 
                 default:
                         lbs_deb_scan("got IE 0x%04x, len %d\n",
-                                elem->id, elem->len);
+                                     elem->id, elem->len);
                         break;
                 }
 
@@ -927,213 +727,6 @@ done:
 }
 
 /**
- *  @brief This function finds a specific compatible BSSID in the scan list
- *
- *  Used in association code
- *
- *  @param priv  A pointer to struct lbs_private
- *  @param bssid    BSSID to find in the scan list
- *  @param mode     Network mode: Infrastructure or IBSS
- *
- *  @return         index in BSSID list, or error return code (< 0)
- */
-struct bss_descriptor *lbs_find_bssid_in_list(struct lbs_private *priv,
-                u8 * bssid, u8 mode)
-{
-        struct bss_descriptor * iter_bss;
-        struct bss_descriptor * found_bss = NULL;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        if (!bssid)
-                goto out;
-
-        lbs_deb_hex(LBS_DEB_SCAN, "looking for",
-                bssid, ETH_ALEN);
-
-        /* Look through the scan table for a compatible match.  The loop will
-         *   continue past a matched bssid that is not compatible in case there
-         *   is an AP with multiple SSIDs assigned to the same BSSID
-         */
-        mutex_lock(&priv->lock);
-        list_for_each_entry (iter_bss, &priv->network_list, list) {
-                if (compare_ether_addr(iter_bss->bssid, bssid))
-                        continue; /* bssid doesn't match */
-                switch (mode) {
-                case IW_MODE_INFRA:
-                case IW_MODE_ADHOC:
-                        if (!is_network_compatible(priv, iter_bss, mode))
-                                break;
-                        found_bss = iter_bss;
-                        break;
-                default:
-                        found_bss = iter_bss;
-                        break;
-                }
-        }
-        mutex_unlock(&priv->lock);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "found_bss %p", found_bss);
-        return found_bss;
-}
-
-/**
- *  @brief This function finds ssid in ssid list.
- *
- *  Used in association code
- *
- *  @param priv  A pointer to struct lbs_private
- *  @param ssid     SSID to find in the list
- *  @param bssid    BSSID to qualify the SSID selection (if provided)
- *  @param mode     Network mode: Infrastructure or IBSS
- *
- *  @return         index in BSSID list
- */
-struct bss_descriptor *lbs_find_ssid_in_list(struct lbs_private *priv,
-                   u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode,
-                   int channel)
-{
-        u8 bestrssi = 0;
-        struct bss_descriptor * iter_bss = NULL;
-        struct bss_descriptor * found_bss = NULL;
-        struct bss_descriptor * tmp_oldest = NULL;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        mutex_lock(&priv->lock);
-
-        list_for_each_entry (iter_bss, &priv->network_list, list) {
-                if (   !tmp_oldest
-                    || (iter_bss->last_scanned < tmp_oldest->last_scanned))
-                        tmp_oldest = iter_bss;
-
-                if (lbs_ssid_cmp(iter_bss->ssid, iter_bss->ssid_len,
-                                      ssid, ssid_len) != 0)
-                        continue; /* ssid doesn't match */
-                if (bssid && compare_ether_addr(iter_bss->bssid, bssid) != 0)
-                        continue; /* bssid doesn't match */
-                if ((channel > 0) && (iter_bss->channel != channel))
-                        continue; /* channel doesn't match */
-
-                switch (mode) {
-                case IW_MODE_INFRA:
-                case IW_MODE_ADHOC:
-                        if (!is_network_compatible(priv, iter_bss, mode))
-                                break;
-
-                        if (bssid) {
-                                /* Found requested BSSID */
-                                found_bss = iter_bss;
-                                goto out;
-                        }
-
-                        if (SCAN_RSSI(iter_bss->rssi) > bestrssi) {
-                                bestrssi = SCAN_RSSI(iter_bss->rssi);
-                                found_bss = iter_bss;
-                        }
-                        break;
-                case IW_MODE_AUTO:
-                default:
-                        if (SCAN_RSSI(iter_bss->rssi) > bestrssi) {
-                                bestrssi = SCAN_RSSI(iter_bss->rssi);
-                                found_bss = iter_bss;
-                        }
-                        break;
-                }
-        }
-
-out:
-        mutex_unlock(&priv->lock);
-        lbs_deb_leave_args(LBS_DEB_SCAN, "found_bss %p", found_bss);
-        return found_bss;
-}
-
-/**
- *  @brief This function finds the best SSID in the Scan List
- *
- *  Search the scan table for the best SSID that also matches the current
- *   adapter network preference (infrastructure or adhoc)
- *
- *  @param priv  A pointer to struct lbs_private
- *
- *  @return         index in BSSID list
- */
-static struct bss_descriptor *lbs_find_best_ssid_in_list(
-        struct lbs_private *priv,
-        u8 mode)
-{
-        u8 bestrssi = 0;
-        struct bss_descriptor * iter_bss;
-        struct bss_descriptor * best_bss = NULL;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        mutex_lock(&priv->lock);
-
-        list_for_each_entry (iter_bss, &priv->network_list, list) {
-                switch (mode) {
-                case IW_MODE_INFRA:
-                case IW_MODE_ADHOC:
-                        if (!is_network_compatible(priv, iter_bss, mode))
-                                break;
-                        if (SCAN_RSSI(iter_bss->rssi) <= bestrssi)
-                                break;
-                        bestrssi = SCAN_RSSI(iter_bss->rssi);
-                        best_bss = iter_bss;
-                        break;
-                case IW_MODE_AUTO:
-                default:
-                        if (SCAN_RSSI(iter_bss->rssi) <= bestrssi)
-                                break;
-                        bestrssi = SCAN_RSSI(iter_bss->rssi);
-                        best_bss = iter_bss;
-                        break;
-                }
-        }
-
-        mutex_unlock(&priv->lock);
-        lbs_deb_leave_args(LBS_DEB_SCAN, "best_bss %p", best_bss);
-        return best_bss;
-}
-
-/**
- *  @brief Find the AP with specific ssid in the scan list
- *
- *  Used from association worker.
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param pSSID        A pointer to AP's ssid
- *
- *  @return             0--success, otherwise--fail
- */
-int lbs_find_best_network_ssid(struct lbs_private *priv,
-                u8 *out_ssid, u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode)
-{
-        int ret = -1;
-        struct bss_descriptor * found;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        lbs_scan_networks(priv, NULL, 1);
-        if (priv->surpriseremoved)
-                goto out;
-
-        found = lbs_find_best_ssid_in_list(priv, preferred_mode);
-        if (found && (found->ssid_len > 0)) {
-                memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE);
-                *out_ssid_len = found->ssid_len;
-                *out_mode = found->mode;
-                ret = 0;
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
-        return ret;
-}
-
-
-/**
  *  @brief Send a scan command for all available channels filtered on a spec
  *
  *  Used in association code and from debugfs
@@ -1141,29 +734,24 @@ out:
  *  @param priv             A pointer to struct lbs_private structure
  *  @param ssid             A pointer to the SSID to scan for
  *  @param ssid_len         Length of the SSID
- *  @param clear_ssid       Should existing scan results with this SSID
- *                          be cleared?
  *
  *  @return                0-success, otherwise fail
  */
-int lbs_send_specific_ssid_scan(struct lbs_private *priv,
-                        u8 *ssid, u8 ssid_len, u8 clear_ssid)
+int lbs_send_specific_ssid_scan(struct lbs_private *priv, uint8_t *ssid,
+                                uint8_t ssid_len)
 {
-        struct lbs_ioctl_user_scan_cfg scancfg;
         int ret = 0;
 
-        lbs_deb_enter_args(LBS_DEB_SCAN, "SSID '%s', clear %d",
-                escape_essid(ssid, ssid_len), clear_ssid);
+        lbs_deb_enter_args(LBS_DEB_SCAN, "SSID '%s'\n",
+                           escape_essid(ssid, ssid_len));
 
         if (!ssid_len)
                 goto out;
 
-        memset(&scancfg, 0x00, sizeof(scancfg));
-        memcpy(scancfg.ssid, ssid, ssid_len);
-        scancfg.ssid_len = ssid_len;
-        scancfg.clear_ssid = clear_ssid;
+        memcpy(priv->scan_ssid, ssid, ssid_len);
+        priv->scan_ssid_len = ssid_len;
 
-        lbs_scan_networks(priv, &scancfg, 1);
+        lbs_scan_networks(priv, 1);
         if (priv->surpriseremoved) {
                 ret = -1;
                 goto out;
@@ -1187,17 +775,17 @@ out:
 #define MAX_CUSTOM_LEN 64
 
 static inline char *lbs_translate_scan(struct lbs_private *priv,
-                                        char *start, char *stop,
-                                        struct bss_descriptor *bss)
+                                       char *start, char *stop,
+                                       struct bss_descriptor *bss)
 {
         struct chan_freq_power *cfp;
         char *current_val;      /* For rates */
         struct iw_event iwe;    /* Temporary buffer */
         int j;
-#define PERFECT_RSSI ((u8)50)
-#define WORST_RSSI   ((u8)0)
-#define RSSI_DIFF    ((u8)(PERFECT_RSSI - WORST_RSSI))
-        u8 rssi;
+#define PERFECT_RSSI ((uint8_t)50)
+#define WORST_RSSI   ((uint8_t)0)
+#define RSSI_DIFF    ((uint8_t)(PERFECT_RSSI - WORST_RSSI))
+        uint8_t rssi;
 
         lbs_deb_enter(LBS_DEB_SCAN);
 
@@ -1217,7 +805,7 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
         /* SSID */
         iwe.cmd = SIOCGIWESSID;
         iwe.u.data.flags = 1;
-        iwe.u.data.length = min((u32) bss->ssid_len, (u32) IW_ESSID_MAX_SIZE);
+        iwe.u.data.length = min((uint32_t) bss->ssid_len, (uint32_t) IW_ESSID_MAX_SIZE);
         start = iwe_stream_add_point(start, stop, &iwe, bss->ssid);
 
         /* Mode */
@@ -1238,28 +826,26 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
 
         rssi = iwe.u.qual.level - MRVDRV_NF_DEFAULT_SCAN_VALUE;
         iwe.u.qual.qual =
-            (100 * RSSI_DIFF * RSSI_DIFF - (PERFECT_RSSI - rssi) *
-             (15 * (RSSI_DIFF) + 62 * (PERFECT_RSSI - rssi))) /
-            (RSSI_DIFF * RSSI_DIFF);
+                (100 * RSSI_DIFF * RSSI_DIFF - (PERFECT_RSSI - rssi) *
+                 (15 * (RSSI_DIFF) + 62 * (PERFECT_RSSI - rssi))) /
+                (RSSI_DIFF * RSSI_DIFF);
         if (iwe.u.qual.qual > 100)
                 iwe.u.qual.qual = 100;
 
         if (priv->NF[TYPE_BEACON][TYPE_NOAVG] == 0) {
                 iwe.u.qual.noise = MRVDRV_NF_DEFAULT_SCAN_VALUE;
         } else {
-                iwe.u.qual.noise =
-                    CAL_NF(priv->NF[TYPE_BEACON][TYPE_NOAVG]);
+                iwe.u.qual.noise = CAL_NF(priv->NF[TYPE_BEACON][TYPE_NOAVG]);
         }
 
         /* Locally created ad-hoc BSSs won't have beacons if this is the
          * only station in the adhoc network; so get signal strength
          * from receive statistics.
          */
-        if ((priv->mode == IW_MODE_ADHOC)
-            && priv->adhoccreate
+        if ((priv->mode == IW_MODE_ADHOC) && priv->adhoccreate
             && !lbs_ssid_cmp(priv->curbssparams.ssid,
-                                  priv->curbssparams.ssid_len,
-                                  bss->ssid, bss->ssid_len)) {
+                             priv->curbssparams.ssid_len,
+                             bss->ssid, bss->ssid_len)) {
                 int snr, nf;
                 snr = priv->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
                 nf = priv->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
@@ -1290,14 +876,13 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
                 current_val = iwe_stream_add_value(start, current_val,
                                          stop, &iwe, IW_EV_PARAM_LEN);
         }
-        if ((bss->mode == IW_MODE_ADHOC)
+        if ((bss->mode == IW_MODE_ADHOC) && priv->adhoccreate
             && !lbs_ssid_cmp(priv->curbssparams.ssid,
-                                  priv->curbssparams.ssid_len,
-                                  bss->ssid, bss->ssid_len)
-            && priv->adhoccreate) {
+                             priv->curbssparams.ssid_len,
+                             bss->ssid, bss->ssid_len)) {
                 iwe.u.bitrate.value = 22 * 500000;
                 current_val = iwe_stream_add_value(start, current_val,
-                                         stop, &iwe, IW_EV_PARAM_LEN);
+                                                   stop, &iwe, IW_EV_PARAM_LEN);
         }
         /* Check if we added any event */
         if((current_val - start) > IW_EV_LCP_LEN)
@@ -1326,8 +911,7 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
                 char *p = custom;
 
                 iwe.cmd = IWEVCUSTOM;
-                p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
-                              "mesh-type: olpc");
+                p += snprintf(p, MAX_CUSTOM_LEN, "mesh-type: olpc");
                 iwe.u.data.length = p - custom;
                 if (iwe.u.data.length)
                         start = iwe_stream_add_point(start, stop, &iwe, custom);
@@ -1350,39 +934,49 @@ out:
  *  @return             0 --success, otherwise fail
  */
 int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
-                  struct iw_param *wrqu, char *extra)
+                 union iwreq_data *wrqu, char *extra)
 {
         struct lbs_private *priv = dev->priv;
+        int ret = 0;
 
-        lbs_deb_enter(LBS_DEB_SCAN);
+        lbs_deb_enter(LBS_DEB_WEXT);
 
-        if (!netif_running(dev))
-                return -ENETDOWN;
+        if (!netif_running(dev)) {
+                ret = -ENETDOWN;
+                goto out;
+        }
 
         /* mac80211 does this:
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        if (sdata->type != IEEE80211_IF_TYPE_xxx)
-                return -EOPNOTSUPP;
+        if (sdata->type != IEEE80211_IF_TYPE_xxx) {
+                ret = -EOPNOTSUPP;
+                goto out;
+        }
+        */
 
         if (wrqu->data.length == sizeof(struct iw_scan_req) &&
             wrqu->data.flags & IW_SCAN_THIS_ESSID) {
-                req = (struct iw_scan_req *)extra;
-                        ssid = req->essid;
-                ssid_len = req->essid_len;
+                struct iw_scan_req *req = (struct iw_scan_req *)extra;
+                priv->scan_ssid_len = req->essid_len;
+                memcpy(priv->scan_ssid, req->essid, priv->scan_ssid_len);
+                lbs_deb_wext("set_scan, essid '%s'\n",
+                        escape_essid(priv->scan_ssid, priv->scan_ssid_len));
+        } else {
+                priv->scan_ssid_len = 0;
         }
-        */
 
         if (!delayed_work_pending(&priv->scan_work))
                 queue_delayed_work(priv->work_thread, &priv->scan_work,
-                        msecs_to_jiffies(50));
+                                   msecs_to_jiffies(50));
         /* set marker that currently a scan is taking place */
-        priv->last_scanned_channel = -1;
+        priv->scan_channel = -1;
 
         if (priv->surpriseremoved)
-                return -EIO;
+                ret = -EIO;
 
-        lbs_deb_leave(LBS_DEB_SCAN);
-        return 0;
+out:
+        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
+        return ret;
 }
 
 
@@ -1397,31 +991,30 @@ int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
  *  @return             0 --success, otherwise fail
  */
 int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
-                  struct iw_point *dwrq, char *extra)
+                 struct iw_point *dwrq, char *extra)
 {
 #define SCAN_ITEM_SIZE 128
         struct lbs_private *priv = dev->priv;
         int err = 0;
         char *ev = extra;
         char *stop = ev + dwrq->length;
-        struct bss_descriptor * iter_bss;
-        struct bss_descriptor * safe;
+        struct bss_descriptor *iter_bss;
+        struct bss_descriptor *safe;
 
-        lbs_deb_enter(LBS_DEB_SCAN);
+        lbs_deb_enter(LBS_DEB_WEXT);
 
         /* iwlist should wait until the current scan is finished */
-        if (priv->last_scanned_channel)
+        if (priv->scan_channel)
                 return -EAGAIN;
 
         /* Update RSSI if current BSS is a locally created ad-hoc BSS */
-        if ((priv->mode == IW_MODE_ADHOC) && priv->adhoccreate) {
+        if ((priv->mode == IW_MODE_ADHOC) && priv->adhoccreate)
                 lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
-                                        CMD_OPTION_WAITFORRSP, 0, NULL);
-        }
+                                             CMD_OPTION_WAITFORRSP, 0, NULL);
 
         mutex_lock(&priv->lock);
         list_for_each_entry_safe (iter_bss, safe, &priv->network_list, list) {
-                char * next_ev;
+                char *next_ev;
                 unsigned long stale_time;
 
                 if (stop - ev < SCAN_ITEM_SIZE) {
@@ -1436,8 +1029,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
                 /* Prune old an old scan result */
                 stale_time = iter_bss->last_scanned + DEFAULT_MAX_SCAN_AGE;
                 if (time_after(jiffies, stale_time)) {
-                        list_move_tail (&iter_bss->list,
-                                        &priv->network_free_list);
+                        list_move_tail(&iter_bss->list, &priv->network_free_list);
                         clear_bss_descriptor(iter_bss);
                         continue;
                 }
@@ -1453,7 +1045,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
         dwrq->length = (ev - extra);
         dwrq->flags = 0;
 
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", err);
+        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", err);
         return err;
 }
 
@@ -1468,44 +1060,6 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
 
 
 /**
- *  @brief Prepare a scan command to be sent to the firmware
- *
- *  Called via lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, ...)
- *  from cmd.c
- *
- *  Sends a fixed length data part (specifying the BSS type and BSSID filters)
- *  as well as a variable number/length of TLVs to the firmware.
- *
- *  @param priv       A pointer to struct lbs_private structure
- *  @param cmd        A pointer to cmd_ds_command structure to be sent to
- *                    firmware with the cmd_DS_801_11_SCAN structure
- *  @param pdata_buf  Void pointer cast of a lbs_scan_cmd_config struct used
- *                    to set the fields/TLVs for the command sent to firmware
- *
- *  @return           0 or -1
- */
-int lbs_cmd_80211_scan(struct lbs_private *priv,
-        struct cmd_ds_command *cmd, void *pdata_buf)
-{
-        struct cmd_ds_802_11_scan *pscan = &cmd->params.scan;
-        struct lbs_scan_cmd_config *pscancfg = pdata_buf;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        /* Set fixed field variables in scan command */
-        pscan->bsstype = pscancfg->bsstype;
-        memcpy(pscan->bssid, pscancfg->bssid, ETH_ALEN);
-        memcpy(pscan->tlvbuffer, pscancfg->tlvbuffer, pscancfg->tlvbufferlen);
-
-        /* size is equal to the sizeof(fixed portions) + the TLV len + header */
-        cmd->size = cpu_to_le16(sizeof(pscan->bsstype) + ETH_ALEN
-                                + pscancfg->tlvbufferlen + S_DS_GEN);
-
-        lbs_deb_leave(LBS_DEB_SCAN);
-        return 0;
-}
-
-/**
  *  @brief This function handles the command response of scan
  *
  *  Called from handle_cmd_response() in cmdrespc.
@@ -1531,13 +1085,14 @@ int lbs_cmd_80211_scan(struct lbs_private *priv,
  *
  *  @return        0 or -1
  */
-int lbs_ret_80211_scan(struct lbs_private *priv, struct cmd_ds_command *resp)
+static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
+                              struct cmd_header *resp)
 {
-        struct cmd_ds_802_11_scan_rsp *pscan;
-        struct bss_descriptor * iter_bss;
-        struct bss_descriptor * safe;
-        u8 *pbssinfo;
-        u16 scanrespsize;
+        struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp;
+        struct bss_descriptor *iter_bss;
+        struct bss_descriptor *safe;
+        uint8_t *bssinfo;
+        uint16_t scanrespsize;
         int bytesleft;
         int idx;
         int tlvbufsize;
@@ -1554,48 +1109,45 @@ int lbs_ret_80211_scan(struct lbs_private *priv, struct cmd_ds_command *resp)
                 clear_bss_descriptor(iter_bss);
         }
 
-        pscan = &resp->params.scanresp;
-
-        if (pscan->nr_sets > MAX_NETWORK_COUNT) {
-                lbs_deb_scan(
-                       "SCAN_RESP: too many scan results (%d, max %d)!!\n",
-                       pscan->nr_sets, MAX_NETWORK_COUNT);
+        if (scanresp->nr_sets > MAX_NETWORK_COUNT) {
+                lbs_deb_scan("SCAN_RESP: too many scan results (%d, max %d)\n",
+                             scanresp->nr_sets, MAX_NETWORK_COUNT);
                 ret = -1;
                 goto done;
         }
 
-        bytesleft = le16_to_cpu(pscan->bssdescriptsize);
+        bytesleft = le16_to_cpu(scanresp->bssdescriptsize);
         lbs_deb_scan("SCAN_RESP: bssdescriptsize %d\n", bytesleft);
 
         scanrespsize = le16_to_cpu(resp->size);
-        lbs_deb_scan("SCAN_RESP: scan results %d\n", pscan->nr_sets);
+        lbs_deb_scan("SCAN_RESP: scan results %d\n", scanresp->nr_sets);
 
-        pbssinfo = pscan->bssdesc_and_tlvbuffer;
+        bssinfo = scanresp->bssdesc_and_tlvbuffer;
 
         /* The size of the TLV buffer is equal to the entire command response
          *   size (scanrespsize) minus the fixed fields (sizeof()'s), the
          *   BSS Descriptions (bssdescriptsize as bytesLef) and the command
          *   response header (S_DS_GEN)
          */
-        tlvbufsize = scanrespsize - (bytesleft + sizeof(pscan->bssdescriptsize)
-                                     + sizeof(pscan->nr_sets)
+        tlvbufsize = scanrespsize - (bytesleft + sizeof(scanresp->bssdescriptsize)
+                                     + sizeof(scanresp->nr_sets)
                                      + S_DS_GEN);
 
         /*
-         *  Process each scan response returned (pscan->nr_sets).  Save
+         *  Process each scan response returned (scanresp->nr_sets). Save
          *    the information in the newbssentry and then insert into the
          *    driver scan table either as an update to an existing entry
          *    or as an addition at the end of the table
          */
-        for (idx = 0; idx < pscan->nr_sets && bytesleft; idx++) {
+        for (idx = 0; idx < scanresp->nr_sets && bytesleft; idx++) {
                 struct bss_descriptor new;
-                struct bss_descriptor * found = NULL;
-                struct bss_descriptor * oldest = NULL;
+                struct bss_descriptor *found = NULL;
+                struct bss_descriptor *oldest = NULL;
                 DECLARE_MAC_BUF(mac);
 
                 /* Process the data fields and IEs returned for this BSS */
                 memset(&new, 0, sizeof (struct bss_descriptor));
-                if (lbs_process_bss(&new, &pbssinfo, &bytesleft) != 0) {
+                if (lbs_process_bss(&new, &bssinfo, &bytesleft) != 0) {
                         /* error parsing the scan response, skipped */
                         lbs_deb_scan("SCAN_RESP: process_bss returned ERROR\n");
                         continue;
@@ -1630,8 +1182,7 @@ int lbs_ret_80211_scan(struct lbs_private *priv, struct cmd_ds_command *resp)
                         continue;
                 }
 
-                lbs_deb_scan("SCAN_RESP: BSSID %s\n",
-                             print_mac(mac, new.bssid));
+                lbs_deb_scan("SCAN_RESP: BSSID %s\n", print_mac(mac, new.bssid));
 
                 /* Copy the locally created newbssentry to the scan table */
                 memcpy(found, &new, offsetof(struct bss_descriptor, list));
diff --git a/drivers/net/wireless/libertas/scan.h b/drivers/net/wireless/libertas/scan.h
index 319f70dde350..9e07b0464a8e 100644
--- a/drivers/net/wireless/libertas/scan.h
+++ b/drivers/net/wireless/libertas/scan.h
@@ -7,198 +7,22 @@
 #ifndef _LBS_SCAN_H
 #define _LBS_SCAN_H
 
-#include <net/ieee80211.h>
-#include "hostcmd.h"
-
 /**
  *  @brief Maximum number of channels that can be sent in a setuserscan ioctl
- *
- *  @sa lbs_ioctl_user_scan_cfg
  */
 #define LBS_IOCTL_USER_SCAN_CHAN_MAX  50
 
-//! Infrastructure BSS scan type in lbs_scan_cmd_config
-#define LBS_SCAN_BSS_TYPE_BSS         1
-
-//! Adhoc BSS scan type in lbs_scan_cmd_config
-#define LBS_SCAN_BSS_TYPE_IBSS        2
-
-//! Adhoc or Infrastructure BSS scan type in lbs_scan_cmd_config, no filter
-#define LBS_SCAN_BSS_TYPE_ANY         3
-
-/**
- * @brief Structure used internally in the wlan driver to configure a scan.
- *
- * Sent to the command processing module to configure the firmware
- *   scan command prepared by lbs_cmd_80211_scan.
- *
- * @sa lbs_scan_networks
- *
- */
-struct lbs_scan_cmd_config {
-    /**
-     *  @brief BSS type to be sent in the firmware command
-     *
-     *  Field can be used to restrict the types of networks returned in the
-     *    scan.  valid settings are:
-     *
-     *   - LBS_SCAN_BSS_TYPE_BSS  (infrastructure)
-     *   - LBS_SCAN_BSS_TYPE_IBSS (adhoc)
-     *   - LBS_SCAN_BSS_TYPE_ANY  (unrestricted, adhoc and infrastructure)
-     */
-        u8 bsstype;
-
-    /**
-     *  @brief Specific BSSID used to filter scan results in the firmware
-     */
-        u8 bssid[ETH_ALEN];
-
-    /**
-     *  @brief length of TLVs sent in command starting at tlvBuffer
-     */
-        int tlvbufferlen;
-
-    /**
-     *  @brief SSID TLV(s) and ChanList TLVs to be sent in the firmware command
-     *
-     *  @sa TLV_TYPE_CHANLIST, mrvlietypes_chanlistparamset_t
-     *  @sa TLV_TYPE_SSID, mrvlietypes_ssidparamset_t
-     */
-        u8 tlvbuffer[1];        //!< SSID TLV(s) and ChanList TLVs are stored here
-};
-
-/**
- *  @brief IOCTL channel sub-structure sent in lbs_ioctl_user_scan_cfg
- *
- *  Multiple instances of this structure are included in the IOCTL command
- *   to configure a instance of a scan on the specific channel.
- */
-struct lbs_ioctl_user_scan_chan {
-        u8 channumber;          //!< channel Number to scan
-        u8 radiotype;           //!< Radio type: 'B/G' band = 0, 'A' band = 1
-        u8 scantype;            //!< Scan type: Active = 0, Passive = 1
-        u16 scantime;           //!< Scan duration in milliseconds; if 0 default used
-};
-
-/**
- *  @brief IOCTL input structure to configure an immediate scan cmd to firmware
- *
- *  Used in the setuserscan (LBS_SET_USER_SCAN) private ioctl.  Specifies
- *   a number of parameters to be used in general for the scan as well
- *   as a channel list (lbs_ioctl_user_scan_chan) for each scan period
- *   desired.
- *
- *  @sa lbs_set_user_scan_ioctl
- */
-struct lbs_ioctl_user_scan_cfg {
-    /**
-     *  @brief BSS type to be sent in the firmware command
-     *
-     *  Field can be used to restrict the types of networks returned in the
-     *    scan.  valid settings are:
-     *
-     *   - LBS_SCAN_BSS_TYPE_BSS  (infrastructure)
-     *   - LBS_SCAN_BSS_TYPE_IBSS (adhoc)
-     *   - LBS_SCAN_BSS_TYPE_ANY  (unrestricted, adhoc and infrastructure)
-     */
-        u8 bsstype;
-
-        /**
-         *  @brief BSSID filter sent in the firmware command to limit the results
-         */
-        u8 bssid[ETH_ALEN];
-
-        /* Clear existing scan results matching this BSSID */
-        u8 clear_bssid;
-
-        /**
-         *  @brief SSID filter sent in the firmware command to limit the results
-         */
-        char ssid[IW_ESSID_MAX_SIZE];
-        u8 ssid_len;
-
-        /* Clear existing scan results matching this SSID */
-        u8 clear_ssid;
-};
-
-/**
- *  @brief Structure used to store information for each beacon/probe response
- */
-struct bss_descriptor {
-        u8 bssid[ETH_ALEN];
-
-        u8 ssid[IW_ESSID_MAX_SIZE + 1];
-        u8 ssid_len;
-
-        u16 capability;
-
-        /* receive signal strength in dBm */
-        long rssi;
-
-        u32 channel;
-
-        u16 beaconperiod;
-
-        u32 atimwindow;
-
-        /* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */
-        u8 mode;
-
-        /* zero-terminated array of supported data rates */
-        u8 rates[MAX_RATES + 1];
-
-        unsigned long last_scanned;
-
-        union ieeetypes_phyparamset phyparamset;
-        union IEEEtypes_ssparamset ssparamset;
-
-        struct ieeetypes_countryinfofullset countryinfo;
-
-        u8 wpa_ie[MAX_WPA_IE_LEN];
-        size_t wpa_ie_len;
-        u8 rsn_ie[MAX_WPA_IE_LEN];
-        size_t rsn_ie_len;
-
-        u8 mesh;
-
-        struct list_head list;
-};
-
 int lbs_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
 
-struct bss_descriptor *lbs_find_ssid_in_list(struct lbs_private *priv,
-                u8 *ssid, u8 ssid_len, u8 *bssid, u8 mode,
-                int channel);
-
-struct bss_descriptor *lbs_find_bssid_in_list(struct lbs_private *priv,
-        u8 *bssid, u8 mode);
-
-int lbs_find_best_network_ssid(struct lbs_private *priv, u8 *out_ssid,
-                        u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode);
-
 int lbs_send_specific_ssid_scan(struct lbs_private *priv, u8 *ssid,
-                                u8 ssid_len, u8 clear_ssid);
+                                u8 ssid_len);
 
-int lbs_cmd_80211_scan(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd,
-                                void *pdata_buf);
-
-int lbs_ret_80211_scan(struct lbs_private *priv,
-                                struct cmd_ds_command *resp);
-
-int lbs_scan_networks(struct lbs_private *priv,
-        const struct lbs_ioctl_user_scan_cfg *puserscanin,
-                int full_scan);
-
-struct ifreq;
-
-struct iw_point;
-struct iw_param;
-struct iw_request_info;
 int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
                          struct iw_point *dwrq, char *extra);
 int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_param *vwrq, char *extra);
+                         union iwreq_data *wrqu, char *extra);
+
+int lbs_scan_networks(struct lbs_private *priv, int full_scan);
 
 void lbs_scan_worker(struct work_struct *work);
 
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index 00d95f75bd89..a4972fed2941 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -151,7 +151,7 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         dev->trans_start = jiffies;
 
-        if (priv->monitormode != LBS_MONITOR_OFF) {
+        if (priv->monitormode) {
                 /* Keep the skb to echo it back once Tx feedback is
                    received from FW */
                 skb_orphan(skb);
@@ -179,32 +179,17 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  *
  *  @returns void
  */
-void lbs_send_tx_feedback(struct lbs_private *priv)
+void lbs_send_tx_feedback(struct lbs_private *priv, u32 try_count)
 {
         struct tx_radiotap_hdr *radiotap_hdr;
-        u32 status = priv->eventcause;
-        int txfail;
-        int try_count;
 
-        if (priv->monitormode == LBS_MONITOR_OFF ||
-            priv->currenttxskb == NULL)
+        if (!priv->monitormode || priv->currenttxskb == NULL)
                 return;
 
         radiotap_hdr = (struct tx_radiotap_hdr *)priv->currenttxskb->data;
 
-        txfail = (status >> 24);
-
-#if 0
-        /* The version of roofnet that we've tested does not use this yet
-         * But it may be used in the future.
-         */
-        if (txfail)
-                radiotap_hdr->flags &= IEEE80211_RADIOTAP_F_TX_FAIL;
-#endif
-        try_count = (status >> 16) & 0xff;
-        radiotap_hdr->data_retries = (try_count) ?
-            (1 + priv->txretrycount - try_count) : 0;
-
+        radiotap_hdr->data_retries = try_count ?
+                (1 + priv->txretrycount - try_count) : 0;
 
         priv->currenttxskb->protocol = eth_type_trans(priv->currenttxskb,
                                                       priv->rtap_net_dev);
diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/libertas/types.h
index f0d57958b34b..4031be420862 100644
--- a/drivers/net/wireless/libertas/types.h
+++ b/drivers/net/wireless/libertas/types.h
@@ -239,4 +239,17 @@ struct mrvlietypes_ledgpio {
         struct led_pin ledpin[1];
 } __attribute__ ((packed));
 
+struct led_bhv {
+        uint8_t firmwarestate;
+        uint8_t led;
+        uint8_t ledstate;
+        uint8_t ledarg;
+} __attribute__ ((packed));
+
+
+struct mrvlietypes_ledbhv {
+        struct mrvlietypesheader header;
+        struct led_bhv ledbhv[1];
+} __attribute__ ((packed));
+
 #endif
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index e8bfc26b10a4..0973d015a520 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -16,8 +16,8 @@
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
-#include "join.h"
 #include "wext.h"
+#include "scan.h"
 #include "assoc.h"
 #include "cmd.h"
 
@@ -579,6 +579,9 @@ static int lbs_get_range(struct net_device *dev, struct iw_request_info *info,
                range->num_bitrates);
 
         range->num_frequency = 0;
+
+        range->scan_capa = IW_SCAN_CAPA_ESSID;
+
         if (priv->enable11d &&
             (priv->connect_status == LBS_CONNECTED ||
             priv->mesh_connect_status == LBS_CONNECTED)) {
@@ -602,7 +605,7 @@ static int lbs_get_range(struct net_device *dev, struct iw_request_info *info,
                         lbs_deb_wext("chan_no %d\n", chan_no);
                         range->freq[range->num_frequency].i = (long)chan_no;
                         range->freq[range->num_frequency].m =
-                            (long)lbs_chan_2_freq(chan_no, band) * 100000;
+                            (long)lbs_chan_2_freq(chan_no) * 100000;
                         range->freq[range->num_frequency].e = 1;
                         range->num_frequency++;
                 }
@@ -653,13 +656,10 @@ static int lbs_get_range(struct net_device *dev, struct iw_request_info *info,
         range->num_encoding_sizes = 2;
         range->max_encoding_tokens = 4;
 
-        range->min_pmp = 1000000;
-        range->max_pmp = 120000000;
-        range->min_pmt = 1000;
-        range->max_pmt = 1000000;
-        range->pmp_flags = IW_POWER_PERIOD;
-        range->pmt_flags = IW_POWER_TIMEOUT;
-        range->pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_ALL_R;
+        /*
+         * Right now we support only "iwconfig ethX power on|off"
+         */
+        range->pm_capa = IW_POWER_ON;
 
         /*
          * Minimum version we recommend
@@ -781,21 +781,14 @@ static int lbs_get_power(struct net_device *dev, struct iw_request_info *info,
                           struct iw_param *vwrq, char *extra)
 {
         struct lbs_private *priv = dev->priv;
-        int mode;
 
         lbs_deb_enter(LBS_DEB_WEXT);
 
-        mode = priv->psmode;
-
-        if ((vwrq->disabled = (mode == LBS802_11POWERMODECAM))
-            || priv->connect_status == LBS_DISCONNECTED)
-        {
-                goto out;
-        }
-
         vwrq->value = 0;
+        vwrq->flags = 0;
+        vwrq->disabled = priv->psmode == LBS802_11POWERMODECAM
+                || priv->connect_status == LBS_DISCONNECTED;
 
-out:
         lbs_deb_leave(LBS_DEB_WEXT);
         return 0;
 }
@@ -817,6 +810,7 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
         int stats_valid = 0;
         u8 rssi;
         u32 tx_retries;
+        struct cmd_ds_802_11_get_log log;
 
         lbs_deb_enter(LBS_DEB_WEXT);
 
@@ -860,7 +854,11 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
         /* Quality by TX errors */
         priv->wstats.discard.retries = priv->stats.tx_errors;
 
-        tx_retries = le32_to_cpu(priv->logmsg.retry);
+        memset(&log, 0, sizeof(log));
+        log.hdr.size = cpu_to_le16(sizeof(log));
+        lbs_cmd_with_response(priv, CMD_802_11_GET_LOG, &log);
+
+        tx_retries = le32_to_cpu(log.retry);
 
         if (tx_retries > 75)
                 tx_qual = (90 - tx_retries) * POOR / 15;
@@ -876,10 +874,9 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
                     (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
         quality = min(quality, tx_qual);
 
-        priv->wstats.discard.code = le32_to_cpu(priv->logmsg.wepundecryptable);
-        priv->wstats.discard.fragment = le32_to_cpu(priv->logmsg.rxfrag);
+        priv->wstats.discard.code = le32_to_cpu(log.wepundecryptable);
         priv->wstats.discard.retries = tx_retries;
-        priv->wstats.discard.misc = le32_to_cpu(priv->logmsg.ackfailure);
+        priv->wstats.discard.misc = le32_to_cpu(log.ackfailure);
 
         /* Calculate quality */
         priv->wstats.qual.qual = min_t(u8, quality, 100);
@@ -889,8 +886,6 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
         /* update stats asynchronously for future calls */
         lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
                                         0, 0, NULL);
-        lbs_prepare_and_send_command(priv, CMD_802_11_GET_LOG, 0,
-                                        0, 0, NULL);
 out:
         if (!stats_valid) {
                 priv->wstats.miss.beacon = 0;
@@ -2065,23 +2060,6 @@ static int lbs_set_wap(struct net_device *dev, struct iw_request_info *info,
         return ret;
 }
 
-void lbs_get_fwversion(struct lbs_private *priv, char *fwversion, int maxlen)
-{
-        char fwver[32];
-
-        mutex_lock(&priv->lock);
-
-        sprintf(fwver, "%u.%u.%u.p%u",
-                priv->fwrelease >> 24 & 0xff,
-                priv->fwrelease >> 16 & 0xff,
-                priv->fwrelease >>  8 & 0xff,
-                priv->fwrelease       & 0xff);
-
-        mutex_unlock(&priv->lock);
-        snprintf(fwversion, maxlen, fwver);
-}
-
-
 /*
  * iwconfig settable callbacks
  */
diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
index a563d9a231b6..4c08db497606 100644
--- a/drivers/net/wireless/libertas/wext.h
+++ b/drivers/net/wireless/libertas/wext.h
@@ -4,19 +4,6 @@
 #ifndef _LBS_WEXT_H_
 #define _LBS_WEXT_H_
 
-/** lbs_ioctl_regrdwr */
-struct lbs_ioctl_regrdwr {
-        /** Which register to access */
-        u16 whichreg;
-        /** Read or Write */
-        u16 action;
-        u32 offset;
-        u16 NOB;
-        u32 value;
-};
-
-#define LBS_MONITOR_OFF                 0
-
 extern struct iw_handler_def lbs_handler_def;
 extern struct iw_handler_def mesh_handler_def;
 
diff --git a/drivers/net/wireless/net2280.h b/drivers/net/wireless/net2280.h
deleted file mode 100644
index 120eb831b287..000000000000
--- a/drivers/net/wireless/net2280.h
+++ /dev/null
@@ -1,452 +0,0 @@
-#ifndef NET2280_H
-#define NET2280_H
-/*
- * NetChip 2280 high/full speed USB device controller.
- * Unlike many such controllers, this one talks PCI.
- */
-
-/*
- * Copyright (C) 2002 NetChip Technology, Inc. (http://www.netchip.com)
- * Copyright (C) 2003 David Brownell
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/*-------------------------------------------------------------------------*/
-
-/* NET2280 MEMORY MAPPED REGISTERS
- *
- * The register layout came from the chip documentation, and the bit
- * number definitions were extracted from chip specification.
- *
- * Use the shift operator ('<<') to build bit masks, with readl/writel
- * to access the registers through PCI.
- */
-
-/* main registers, BAR0 + 0x0000 */
-struct net2280_regs {
-        // offset 0x0000
-        __le32                  devinit;
-#define     LOCAL_CLOCK_FREQUENCY                               8
-#define     FORCE_PCI_RESET                                     7
-#define     PCI_ID                                              6
-#define     PCI_ENABLE                                          5
-#define     FIFO_SOFT_RESET                                     4
-#define     CFG_SOFT_RESET                                      3
-#define     PCI_SOFT_RESET                                      2
-#define     USB_SOFT_RESET                                      1
-#define     M8051_RESET                                         0
-        __le32                  eectl;
-#define     EEPROM_ADDRESS_WIDTH                                23
-#define     EEPROM_CHIP_SELECT_ACTIVE                           22
-#define     EEPROM_PRESENT                                      21
-#define     EEPROM_VALID                                        20
-#define     EEPROM_BUSY                                         19
-#define     EEPROM_CHIP_SELECT_ENABLE                           18
-#define     EEPROM_BYTE_READ_START                              17
-#define     EEPROM_BYTE_WRITE_START                             16
-#define     EEPROM_READ_DATA                                    8
-#define     EEPROM_WRITE_DATA                                   0
-        __le32                  eeclkfreq;
-        u32                     _unused0;
-        // offset 0x0010
-
-        __le32                  pciirqenb0;     /* interrupt PCI master ... */
-#define     SETUP_PACKET_INTERRUPT_ENABLE                       7
-#define     ENDPOINT_F_INTERRUPT_ENABLE                         6
-#define     ENDPOINT_E_INTERRUPT_ENABLE                         5
-#define     ENDPOINT_D_INTERRUPT_ENABLE                         4
-#define     ENDPOINT_C_INTERRUPT_ENABLE                         3
-#define     ENDPOINT_B_INTERRUPT_ENABLE                         2
-#define     ENDPOINT_A_INTERRUPT_ENABLE                         1
-#define     ENDPOINT_0_INTERRUPT_ENABLE                         0
-        __le32                  pciirqenb1;
-#define     PCI_INTERRUPT_ENABLE                                31
-#define     POWER_STATE_CHANGE_INTERRUPT_ENABLE                 27
-#define     PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                26
-#define     PCI_PARITY_ERROR_INTERRUPT_ENABLE                   25
-#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE          20
-#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE          19
-#define     PCI_TARGET_ABORT_ASSERTED_INTERRUPT_ENABLE          18
-#define     PCI_RETRY_ABORT_INTERRUPT_ENABLE                    17
-#define     PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE              16
-#define     GPIO_INTERRUPT_ENABLE                               13
-#define     DMA_D_INTERRUPT_ENABLE                              12
-#define     DMA_C_INTERRUPT_ENABLE                              11
-#define     DMA_B_INTERRUPT_ENABLE                              10
-#define     DMA_A_INTERRUPT_ENABLE                              9
-#define     EEPROM_DONE_INTERRUPT_ENABLE                        8
-#define     VBUS_INTERRUPT_ENABLE                               7
-#define     CONTROL_STATUS_INTERRUPT_ENABLE                     6
-#define     ROOT_PORT_RESET_INTERRUPT_ENABLE                    4
-#define     SUSPEND_REQUEST_INTERRUPT_ENABLE                    3
-#define     SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE             2
-#define     RESUME_INTERRUPT_ENABLE                             1
-#define     SOF_INTERRUPT_ENABLE                                0
-        __le32                  cpu_irqenb0;    /* ... or onboard 8051 */
-#define     SETUP_PACKET_INTERRUPT_ENABLE                       7
-#define     ENDPOINT_F_INTERRUPT_ENABLE                         6
-#define     ENDPOINT_E_INTERRUPT_ENABLE                         5
-#define     ENDPOINT_D_INTERRUPT_ENABLE                         4
-#define     ENDPOINT_C_INTERRUPT_ENABLE                         3
-#define     ENDPOINT_B_INTERRUPT_ENABLE                         2
-#define     ENDPOINT_A_INTERRUPT_ENABLE                         1
-#define     ENDPOINT_0_INTERRUPT_ENABLE                         0
-        __le32                  cpu_irqenb1;
-#define     CPU_INTERRUPT_ENABLE                                31
-#define     POWER_STATE_CHANGE_INTERRUPT_ENABLE                 27
-#define     PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                26
-#define     PCI_PARITY_ERROR_INTERRUPT_ENABLE                   25
-#define     PCI_INTA_INTERRUPT_ENABLE                           24
-#define     PCI_PME_INTERRUPT_ENABLE                            23
-#define     PCI_SERR_INTERRUPT_ENABLE                           22
-#define     PCI_PERR_INTERRUPT_ENABLE                           21
-#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE          20
-#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE          19
-#define     PCI_RETRY_ABORT_INTERRUPT_ENABLE                    17
-#define     PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE              16
-#define     GPIO_INTERRUPT_ENABLE                               13
-#define     DMA_D_INTERRUPT_ENABLE                              12
-#define     DMA_C_INTERRUPT_ENABLE                              11
-#define     DMA_B_INTERRUPT_ENABLE                              10
-#define     DMA_A_INTERRUPT_ENABLE                              9
-#define     EEPROM_DONE_INTERRUPT_ENABLE                        8
-#define     VBUS_INTERRUPT_ENABLE                               7
-#define     CONTROL_STATUS_INTERRUPT_ENABLE                     6
-#define     ROOT_PORT_RESET_INTERRUPT_ENABLE                    4
-#define     SUSPEND_REQUEST_INTERRUPT_ENABLE                    3
-#define     SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE             2
-#define     RESUME_INTERRUPT_ENABLE                             1
-#define     SOF_INTERRUPT_ENABLE                                0
-
-        // offset 0x0020
-        u32                     _unused1;
-        __le32                  usbirqenb1;
-#define     USB_INTERRUPT_ENABLE                                31
-#define     POWER_STATE_CHANGE_INTERRUPT_ENABLE                 27
-#define     PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                26
-#define     PCI_PARITY_ERROR_INTERRUPT_ENABLE                   25
-#define     PCI_INTA_INTERRUPT_ENABLE                           24
-#define     PCI_PME_INTERRUPT_ENABLE                            23
-#define     PCI_SERR_INTERRUPT_ENABLE                           22
-#define     PCI_PERR_INTERRUPT_ENABLE                           21
-#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE          20
-#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE          19
-#define     PCI_RETRY_ABORT_INTERRUPT_ENABLE                    17
-#define     PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE              16
-#define     GPIO_INTERRUPT_ENABLE                               13
-#define     DMA_D_INTERRUPT_ENABLE                              12
-#define     DMA_C_INTERRUPT_ENABLE                              11
-#define     DMA_B_INTERRUPT_ENABLE                              10
-#define     DMA_A_INTERRUPT_ENABLE                              9
-#define     EEPROM_DONE_INTERRUPT_ENABLE                        8
-#define     VBUS_INTERRUPT_ENABLE                               7
-#define     CONTROL_STATUS_INTERRUPT_ENABLE                     6
-#define     ROOT_PORT_RESET_INTERRUPT_ENABLE                    4
-#define     SUSPEND_REQUEST_INTERRUPT_ENABLE                    3
-#define     SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE             2
-#define     RESUME_INTERRUPT_ENABLE                             1
-#define     SOF_INTERRUPT_ENABLE                                0
-        __le32                  irqstat0;
-#define     INTA_ASSERTED                                       12
-#define     SETUP_PACKET_INTERRUPT                              7
-#define     ENDPOINT_F_INTERRUPT                                6
-#define     ENDPOINT_E_INTERRUPT                                5
-#define     ENDPOINT_D_INTERRUPT                                4
-#define     ENDPOINT_C_INTERRUPT                                3
-#define     ENDPOINT_B_INTERRUPT                                2
-#define     ENDPOINT_A_INTERRUPT                                1
-#define     ENDPOINT_0_INTERRUPT                                0
-        __le32                  irqstat1;
-#define     POWER_STATE_CHANGE_INTERRUPT                        27
-#define     PCI_ARBITER_TIMEOUT_INTERRUPT                       26
-#define     PCI_PARITY_ERROR_INTERRUPT                          25
-#define     PCI_INTA_INTERRUPT                                  24
-#define     PCI_PME_INTERRUPT                                   23
-#define     PCI_SERR_INTERRUPT                                  22
-#define     PCI_PERR_INTERRUPT                                  21
-#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT                 20
-#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT                 19
-#define     PCI_RETRY_ABORT_INTERRUPT                           17
-#define     PCI_MASTER_CYCLE_DONE_INTERRUPT                     16
-#define     GPIO_INTERRUPT                                      13
-#define     DMA_D_INTERRUPT                                     12
-#define     DMA_C_INTERRUPT                                     11
-#define     DMA_B_INTERRUPT                                     10
-#define     DMA_A_INTERRUPT                                     9
-#define     EEPROM_DONE_INTERRUPT                               8
-#define     VBUS_INTERRUPT                                      7
-#define     CONTROL_STATUS_INTERRUPT                            6
-#define     ROOT_PORT_RESET_INTERRUPT                           4
-#define     SUSPEND_REQUEST_INTERRUPT                           3
-#define     SUSPEND_REQUEST_CHANGE_INTERRUPT                    2
-#define     RESUME_INTERRUPT                                    1
-#define     SOF_INTERRUPT                                       0
-        // offset 0x0030
-        __le32                  idxaddr;
-        __le32                  idxdata;
-        __le32                  fifoctl;
-#define     PCI_BASE2_RANGE                                     16
-#define     IGNORE_FIFO_AVAILABILITY                            3
-#define     PCI_BASE2_SELECT                                    2
-#define     FIFO_CONFIGURATION_SELECT                           0
-        u32                     _unused2;
-        // offset 0x0040
-        __le32                  memaddr;
-#define     START                                               28
-#define     DIRECTION                                           27
-#define     FIFO_DIAGNOSTIC_SELECT                              24
-#define     MEMORY_ADDRESS                                      0
-        __le32                  memdata0;
-        __le32                  memdata1;
-        u32                     _unused3;
-        // offset 0x0050
-        __le32                  gpioctl;
-#define     GPIO3_LED_SELECT                                    12
-#define     GPIO3_INTERRUPT_ENABLE                              11
-#define     GPIO2_INTERRUPT_ENABLE                              10
-#define     GPIO1_INTERRUPT_ENABLE                              9
-#define     GPIO0_INTERRUPT_ENABLE                              8
-#define     GPIO3_OUTPUT_ENABLE                                 7
-#define     GPIO2_OUTPUT_ENABLE                                 6
-#define     GPIO1_OUTPUT_ENABLE                                 5
-#define     GPIO0_OUTPUT_ENABLE                                 4
-#define     GPIO3_DATA                                          3
-#define     GPIO2_DATA                                          2
-#define     GPIO1_DATA                                          1
-#define     GPIO0_DATA                                          0
-        __le32                  gpiostat;
-#define     GPIO3_INTERRUPT                                     3
-#define     GPIO2_INTERRUPT                                     2
-#define     GPIO1_INTERRUPT                                     1
-#define     GPIO0_INTERRUPT                                     0
-} __attribute__ ((packed));
-
-/* usb control, BAR0 + 0x0080 */
-struct net2280_usb_regs {
-        // offset 0x0080
-        __le32                  stdrsp;
-#define     STALL_UNSUPPORTED_REQUESTS                          31
-#define     SET_TEST_MODE                                       16
-#define     GET_OTHER_SPEED_CONFIGURATION                       15
-#define     GET_DEVICE_QUALIFIER                                14
-#define     SET_ADDRESS                                         13
-#define     ENDPOINT_SET_CLEAR_HALT                             12
-#define     DEVICE_SET_CLEAR_DEVICE_REMOTE_WAKEUP               11
-#define     GET_STRING_DESCRIPTOR_2                             10
-#define     GET_STRING_DESCRIPTOR_1                             9
-#define     GET_STRING_DESCRIPTOR_0                             8
-#define     GET_SET_INTERFACE                                   6
-#define     GET_SET_CONFIGURATION                               5
-#define     GET_CONFIGURATION_DESCRIPTOR                        4
-#define     GET_DEVICE_DESCRIPTOR                               3
-#define     GET_ENDPOINT_STATUS                                 2
-#define     GET_INTERFACE_STATUS                                1
-#define     GET_DEVICE_STATUS                                   0
-        __le32                  prodvendid;
-#define     PRODUCT_ID                                          16
-#define     VENDOR_ID                                           0
-        __le32                  relnum;
-        __le32                  usbctl;
-#define     SERIAL_NUMBER_INDEX                                 16
-#define     PRODUCT_ID_STRING_ENABLE                            13
-#define     VENDOR_ID_STRING_ENABLE                             12
-#define     USB_ROOT_PORT_WAKEUP_ENABLE                         11
-#define     VBUS_PIN                                            10
-#define     TIMED_DISCONNECT                                    9
-#define     SUSPEND_IMMEDIATELY                                 7
-#define     SELF_POWERED_USB_DEVICE                             6
-#define     REMOTE_WAKEUP_SUPPORT                               5
-#define     PME_POLARITY                                        4
-#define     USB_DETECT_ENABLE                                   3
-#define     PME_WAKEUP_ENABLE                                   2
-#define     DEVICE_REMOTE_WAKEUP_ENABLE                         1
-#define     SELF_POWERED_STATUS                                 0
-        // offset 0x0090
-        __le32                  usbstat;
-#define     HIGH_SPEED                                          7
-#define     FULL_SPEED                                          6
-#define     GENERATE_RESUME                                     5
-#define     GENERATE_DEVICE_REMOTE_WAKEUP                       4
-        __le32                  xcvrdiag;
-#define     FORCE_HIGH_SPEED_MODE                               31
-#define     FORCE_FULL_SPEED_MODE                               30
-#define     USB_TEST_MODE                                       24
-#define     LINE_STATE                                          16
-#define     TRANSCEIVER_OPERATION_MODE                          2
-#define     TRANSCEIVER_SELECT                                  1
-#define     TERMINATION_SELECT                                  0
-        __le32                  setup0123;
-        __le32                  setup4567;
-        // offset 0x0090
-        u32                     _unused0;
-        __le32                  ouraddr;
-#define     FORCE_IMMEDIATE                                     7
-#define     OUR_USB_ADDRESS                                     0
-        __le32                  ourconfig;
-} __attribute__ ((packed));
-
-/* pci control, BAR0 + 0x0100 */
-struct net2280_pci_regs {
-        // offset 0x0100
-        __le32                  pcimstctl;
-#define     PCI_ARBITER_PARK_SELECT                             13
-#define     PCI_MULTI LEVEL_ARBITER                             12
-#define     PCI_RETRY_ABORT_ENABLE                              11
-#define     DMA_MEMORY_WRITE_AND_INVALIDATE_ENABLE              10
-#define     DMA_READ_MULTIPLE_ENABLE                            9
-#define     DMA_READ_LINE_ENABLE                                8
-#define     PCI_MASTER_COMMAND_SELECT                           6
-#define         MEM_READ_OR_WRITE                                   0
-#define         IO_READ_OR_WRITE                                    1
-#define         CFG_READ_OR_WRITE                                   2
-#define     PCI_MASTER_START                                    5
-#define     PCI_MASTER_READ_WRITE                               4
-#define         PCI_MASTER_WRITE                                    0
-#define         PCI_MASTER_READ                                     1
-#define     PCI_MASTER_BYTE_WRITE_ENABLES                       0
-        __le32                  pcimstaddr;
-        __le32                  pcimstdata;
-        __le32                  pcimststat;
-#define     PCI_ARBITER_CLEAR                                   2
-#define     PCI_EXTERNAL_ARBITER                                1
-#define     PCI_HOST_MODE                                       0
-} __attribute__ ((packed));
-
-/* dma control, BAR0 + 0x0180 ... array of four structs like this,
- * for channels 0..3.  see also struct net2280_dma:  descriptor
- * that can be loaded into some of these registers.
- */
-struct net2280_dma_regs {       /* [11.7] */
-        // offset 0x0180, 0x01a0, 0x01c0, 0x01e0,
-        __le32                  dmactl;
-#define     DMA_SCATTER_GATHER_DONE_INTERRUPT_ENABLE            25
-#define     DMA_CLEAR_COUNT_ENABLE                              21
-#define     DESCRIPTOR_POLLING_RATE                             19
-#define         POLL_CONTINUOUS                                     0
-#define         POLL_1_USEC                                         1
-#define         POLL_100_USEC                                       2
-#define         POLL_1_MSEC                                         3
-#define     DMA_VALID_BIT_POLLING_ENABLE                        18
-#define     DMA_VALID_BIT_ENABLE                                17
-#define     DMA_SCATTER_GATHER_ENABLE                           16
-#define     DMA_OUT_AUTO_START_ENABLE                           4
-#define     DMA_PREEMPT_ENABLE                                  3
-#define     DMA_FIFO_VALIDATE                                   2
-#define     DMA_ENABLE                                          1
-#define     DMA_ADDRESS_HOLD                                    0
-        __le32                  dmastat;
-#define     DMA_SCATTER_GATHER_DONE_INTERRUPT                   25
-#define     DMA_TRANSACTION_DONE_INTERRUPT                      24
-#define     DMA_ABORT                                           1
-#define     DMA_START                                           0
-        u32                     _unused0[2];
-        // offset 0x0190, 0x01b0, 0x01d0, 0x01f0,
-        __le32                  dmacount;
-#define     VALID_BIT                                           31
-#define     DMA_DIRECTION                                       30
-#define     DMA_DONE_INTERRUPT_ENABLE                           29
-#define     END_OF_CHAIN                                        28
-#define         DMA_BYTE_COUNT_MASK                                 ((1<<24)-1)
-#define     DMA_BYTE_COUNT                                      0
-        __le32                  dmaaddr;
-        __le32                  dmadesc;
-        u32                     _unused1;
-} __attribute__ ((packed));
-
-/* dedicated endpoint registers, BAR0 + 0x0200 */
-
-struct net2280_dep_regs {       /* [11.8] */
-        // offset 0x0200, 0x0210, 0x220, 0x230, 0x240
-        __le32                  dep_cfg;
-        // offset 0x0204, 0x0214, 0x224, 0x234, 0x244
-        __le32                  dep_rsp;
-        u32                     _unused[2];
-} __attribute__ ((packed));
-
-/* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
- * like this, for ep0 then the configurable endpoints A..F
- * ep0 reserved for control; E and F have only 64 bytes of fifo
- */
-struct net2280_ep_regs {        /* [11.9] */
-        // offset 0x0300, 0x0320, 0x0340, 0x0360, 0x0380, 0x03a0, 0x03c0
-        __le32                  ep_cfg;
-#define     ENDPOINT_BYTE_COUNT                                 16
-#define     ENDPOINT_ENABLE                                     10
-#define     ENDPOINT_TYPE                                       8
-#define     ENDPOINT_DIRECTION                                  7
-#define     ENDPOINT_NUMBER                                     0
-        __le32                  ep_rsp;
-#define     SET_NAK_OUT_PACKETS                                 15
-#define     SET_EP_HIDE_STATUS_PHASE                            14
-#define     SET_EP_FORCE_CRC_ERROR                              13
-#define     SET_INTERRUPT_MODE                                  12
-#define     SET_CONTROL_STATUS_PHASE_HANDSHAKE                  11
-#define     SET_NAK_OUT_PACKETS_MODE                            10
-#define     SET_ENDPOINT_TOGGLE                                 9
-#define     SET_ENDPOINT_HALT                                   8
-#define     CLEAR_NAK_OUT_PACKETS                               7
-#define     CLEAR_EP_HIDE_STATUS_PHASE                          6
-#define     CLEAR_EP_FORCE_CRC_ERROR                            5
-#define     CLEAR_INTERRUPT_MODE                                4
-#define     CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE                3
-#define     CLEAR_NAK_OUT_PACKETS_MODE                          2
-#define     CLEAR_ENDPOINT_TOGGLE                               1
-#define     CLEAR_ENDPOINT_HALT                                 0
-        __le32                  ep_irqenb;
-#define     SHORT_PACKET_OUT_DONE_INTERRUPT_ENABLE              6
-#define     SHORT_PACKET_TRANSFERRED_INTERRUPT_ENABLE           5
-#define     DATA_PACKET_RECEIVED_INTERRUPT_ENABLE               3
-#define     DATA_PACKET_TRANSMITTED_INTERRUPT_ENABLE            2
-#define     DATA_OUT_PING_TOKEN_INTERRUPT_ENABLE                1
-#define     DATA_IN_TOKEN_INTERRUPT_ENABLE                      0
-        __le32                  ep_stat;
-#define     FIFO_VALID_COUNT                                    24
-#define     HIGH_BANDWIDTH_OUT_TRANSACTION_PID                  22
-#define     TIMEOUT                                             21
-#define     USB_STALL_SENT                                      20
-#define     USB_IN_NAK_SENT                                     19
-#define     USB_IN_ACK_RCVD                                     18
-#define     USB_OUT_PING_NAK_SENT                               17
-#define     USB_OUT_ACK_SENT                                    16
-#define     FIFO_OVERFLOW                                       13
-#define     FIFO_UNDERFLOW                                      12
-#define     FIFO_FULL                                           11
-#define     FIFO_EMPTY                                          10
-#define     FIFO_FLUSH                                          9
-#define     SHORT_PACKET_OUT_DONE_INTERRUPT                     6
-#define     SHORT_PACKET_TRANSFERRED_INTERRUPT                  5
-#define     NAK_OUT_PACKETS                                     4
-#define     DATA_PACKET_RECEIVED_INTERRUPT                      3
-#define     DATA_PACKET_TRANSMITTED_INTERRUPT                   2
-#define     DATA_OUT_PING_TOKEN_INTERRUPT                       1
-#define     DATA_IN_TOKEN_INTERRUPT                             0
-        // offset 0x0310, 0x0330, 0x0350, 0x0370, 0x0390, 0x03b0, 0x03d0
-        __le32                  ep_avail;
-        __le32                  ep_data;
-        u32                     _unused0[2];
-} __attribute__ ((packed));
-
-struct net2280_reg_write {
-        __le16 port;
-        __le32 addr;
-        __le32 val;
-} __attribute__ ((packed));
-
-struct net2280_reg_read {
-        __le16 port;
-        __le32 addr;
-} __attribute__ ((packed));
-#endif /* NET2280_H */
diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig
new file mode 100644
index 000000000000..d3469d08f966
--- /dev/null
+++ b/drivers/net/wireless/p54/Kconfig
@@ -0,0 +1,63 @@
+config P54_COMMON
+        tristate "Softmac Prism54 support"
+        depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
+        ---help---
+          This is common code for isl38xx based cards.
+          This module does nothing by itself - the USB/PCI frontends
+          also need to be enabled in order to support any devices.
+
+          These devices require softmac firmware which can be found at
+          http://prism54.org/
+
+          If you choose to build a module, it'll be called p54common.
+
+config P54_USB
+        tristate "Prism54 USB support"
+        depends on P54_COMMON && USB
+        select CRC32
+        ---help---
+          This driver is for USB isl38xx based wireless cards.
+          These are USB based adapters found in devices such as:
+
+          3COM 3CRWE254G72
+          SMC 2862W-G
+          Accton 802.11g WN4501 USB
+          Siemens Gigaset USB
+          Netgear WG121
+          Netgear WG111
+          Medion 40900, Roper Europe
+          Shuttle PN15, Airvast WM168g, IOGear GWU513
+          Linksys WUSB54G
+          Linksys WUSB54G Portable
+          DLink DWL-G120 Spinnaker
+          DLink DWL-G122
+          Belkin F5D7050 ver 1000
+          Cohiba Proto board
+          SMC 2862W-G version 2
+          U.S. Robotics U5 802.11g Adapter
+          FUJITSU E-5400 USB D1700
+          Sagem XG703A
+          DLink DWL-G120 Cohiba
+          Spinnaker Proto board
+          Linksys WUSB54AG
+          Inventel UR054G
+          Spinnaker DUT
+
+          These devices require softmac firmware which can be found at
+          http://prism54.org/
+
+          If you choose to build a module, it'll be called p54usb.
+
+config P54_PCI
+        tristate "Prism54 PCI support"
+        depends on P54_COMMON && PCI
+        ---help---
+          This driver is for PCI isl38xx based wireless cards.
+          This driver supports most devices that are supported by the
+          fullmac prism54 driver plus many devices which are not
+          supported by the fullmac driver/firmware.
+
+          This driver requires softmac firmware which can be found at
+          http://prism54.org/
+
+          If you choose to build a module, it'll be called p54pci.
diff --git a/drivers/net/wireless/p54/Makefile b/drivers/net/wireless/p54/Makefile
new file mode 100644
index 000000000000..4fa9ce717360
--- /dev/null
+++ b/drivers/net/wireless/p54/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_P54_COMMON)        += p54common.o
+obj-$(CONFIG_P54_USB)           += p54usb.o
+obj-$(CONFIG_P54_PCI)           += p54pci.o
diff --git a/drivers/net/wireless/p54/net2280.h b/drivers/net/wireless/p54/net2280.h
new file mode 100644
index 000000000000..4915d9d54203
--- /dev/null
+++ b/drivers/net/wireless/p54/net2280.h
@@ -0,0 +1,452 @@
+#ifndef NET2280_H
+#define NET2280_H
+/*
+ * NetChip 2280 high/full speed USB device controller.
+ * Unlike many such controllers, this one talks PCI.
+ */
+
+/*
+ * Copyright (C) 2002 NetChip Technology, Inc. (http://www.netchip.com)
+ * Copyright (C) 2003 David Brownell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*-------------------------------------------------------------------------*/
+
+/* NET2280 MEMORY MAPPED REGISTERS
+ *
+ * The register layout came from the chip documentation, and the bit
+ * number definitions were extracted from chip specification.
+ *
+ * Use the shift operator ('<<') to build bit masks, with readl/writel
+ * to access the registers through PCI.
+ */
+
+/* main registers, BAR0 + 0x0000 */
+struct net2280_regs {
+        /* offset 0x0000 */
+        __le32                  devinit;
+#define LOCAL_CLOCK_FREQUENCY                                   8
+#define FORCE_PCI_RESET                                         7
+#define PCI_ID                                                  6
+#define PCI_ENABLE                                              5
+#define FIFO_SOFT_RESET                                         4
+#define CFG_SOFT_RESET                                          3
+#define PCI_SOFT_RESET                                          2
+#define USB_SOFT_RESET                                          1
+#define M8051_RESET                                             0
+        __le32                  eectl;
+#define EEPROM_ADDRESS_WIDTH                                    23
+#define EEPROM_CHIP_SELECT_ACTIVE                               22
+#define EEPROM_PRESENT                                          21
+#define EEPROM_VALID                                            20
+#define EEPROM_BUSY                                             19
+#define EEPROM_CHIP_SELECT_ENABLE                               18
+#define EEPROM_BYTE_READ_START                                  17
+#define EEPROM_BYTE_WRITE_START                                 16
+#define EEPROM_READ_DATA                                        8
+#define EEPROM_WRITE_DATA                                       0
+        __le32                  eeclkfreq;
+        u32                     _unused0;
+        /* offset 0x0010 */
+
+        __le32                  pciirqenb0;     /* interrupt PCI master ... */
+#define SETUP_PACKET_INTERRUPT_ENABLE                           7
+#define ENDPOINT_F_INTERRUPT_ENABLE                             6
+#define ENDPOINT_E_INTERRUPT_ENABLE                             5
+#define ENDPOINT_D_INTERRUPT_ENABLE                             4
+#define ENDPOINT_C_INTERRUPT_ENABLE                             3
+#define ENDPOINT_B_INTERRUPT_ENABLE                             2
+#define ENDPOINT_A_INTERRUPT_ENABLE                             1
+#define ENDPOINT_0_INTERRUPT_ENABLE                             0
+        __le32                  pciirqenb1;
+#define PCI_INTERRUPT_ENABLE                                    31
+#define POWER_STATE_CHANGE_INTERRUPT_ENABLE                     27
+#define PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                    26
+#define PCI_PARITY_ERROR_INTERRUPT_ENABLE                       25
+#define PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE              20
+#define PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE              19
+#define PCI_TARGET_ABORT_ASSERTED_INTERRUPT_ENABLE              18
+#define PCI_RETRY_ABORT_INTERRUPT_ENABLE                        17
+#define PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE                  16
+#define GPIO_INTERRUPT_ENABLE                                   13
+#define DMA_D_INTERRUPT_ENABLE                                  12
+#define DMA_C_INTERRUPT_ENABLE                                  11
+#define DMA_B_INTERRUPT_ENABLE                                  10
+#define DMA_A_INTERRUPT_ENABLE                                  9
+#define EEPROM_DONE_INTERRUPT_ENABLE                            8
+#define VBUS_INTERRUPT_ENABLE                                   7
+#define CONTROL_STATUS_INTERRUPT_ENABLE                         6
+#define ROOT_PORT_RESET_INTERRUPT_ENABLE                        4
+#define SUSPEND_REQUEST_INTERRUPT_ENABLE                        3
+#define SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE                 2
+#define RESUME_INTERRUPT_ENABLE                                 1
+#define SOF_INTERRUPT_ENABLE                                    0
+        __le32                  cpu_irqenb0;    /* ... or onboard 8051 */
+#define SETUP_PACKET_INTERRUPT_ENABLE                           7
+#define ENDPOINT_F_INTERRUPT_ENABLE                             6
+#define ENDPOINT_E_INTERRUPT_ENABLE                             5
+#define ENDPOINT_D_INTERRUPT_ENABLE                             4
+#define ENDPOINT_C_INTERRUPT_ENABLE                             3
+#define ENDPOINT_B_INTERRUPT_ENABLE                             2
+#define ENDPOINT_A_INTERRUPT_ENABLE                             1
+#define ENDPOINT_0_INTERRUPT_ENABLE                             0
+        __le32                  cpu_irqenb1;
+#define CPU_INTERRUPT_ENABLE                                    31
+#define POWER_STATE_CHANGE_INTERRUPT_ENABLE                     27
+#define PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                    26
+#define PCI_PARITY_ERROR_INTERRUPT_ENABLE                       25
+#define PCI_INTA_INTERRUPT_ENABLE                               24
+#define PCI_PME_INTERRUPT_ENABLE                                23
+#define PCI_SERR_INTERRUPT_ENABLE                               22
+#define PCI_PERR_INTERRUPT_ENABLE                               21
+#define PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE              20
+#define PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE              19
+#define PCI_RETRY_ABORT_INTERRUPT_ENABLE                        17
+#define PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE                  16
+#define GPIO_INTERRUPT_ENABLE                                   13
+#define DMA_D_INTERRUPT_ENABLE                                  12
+#define DMA_C_INTERRUPT_ENABLE                                  11
+#define DMA_B_INTERRUPT_ENABLE                                  10
+#define DMA_A_INTERRUPT_ENABLE                                  9
+#define EEPROM_DONE_INTERRUPT_ENABLE                            8
+#define VBUS_INTERRUPT_ENABLE                                   7
+#define CONTROL_STATUS_INTERRUPT_ENABLE                         6
+#define ROOT_PORT_RESET_INTERRUPT_ENABLE                        4
+#define SUSPEND_REQUEST_INTERRUPT_ENABLE                        3
+#define SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE                 2
+#define RESUME_INTERRUPT_ENABLE                                 1
+#define SOF_INTERRUPT_ENABLE                                    0
+
+        /* offset 0x0020 */
+        u32                     _unused1;
+        __le32                  usbirqenb1;
+#define USB_INTERRUPT_ENABLE                                    31
+#define POWER_STATE_CHANGE_INTERRUPT_ENABLE                     27
+#define PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                    26
+#define PCI_PARITY_ERROR_INTERRUPT_ENABLE                       25
+#define PCI_INTA_INTERRUPT_ENABLE                               24
+#define PCI_PME_INTERRUPT_ENABLE                                23
+#define PCI_SERR_INTERRUPT_ENABLE                               22
+#define PCI_PERR_INTERRUPT_ENABLE                               21
+#define PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE              20
+#define PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE              19
+#define PCI_RETRY_ABORT_INTERRUPT_ENABLE                        17
+#define PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE                  16
+#define GPIO_INTERRUPT_ENABLE                                   13
+#define DMA_D_INTERRUPT_ENABLE                                  12
+#define DMA_C_INTERRUPT_ENABLE                                  11
+#define DMA_B_INTERRUPT_ENABLE                                  10
+#define DMA_A_INTERRUPT_ENABLE                                  9
+#define EEPROM_DONE_INTERRUPT_ENABLE                            8
+#define VBUS_INTERRUPT_ENABLE                                   7
+#define CONTROL_STATUS_INTERRUPT_ENABLE                         6
+#define ROOT_PORT_RESET_INTERRUPT_ENABLE                        4
+#define SUSPEND_REQUEST_INTERRUPT_ENABLE                        3
+#define SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE                 2
+#define RESUME_INTERRUPT_ENABLE                                 1
+#define SOF_INTERRUPT_ENABLE                                    0
+        __le32                  irqstat0;
+#define INTA_ASSERTED                                           12
+#define SETUP_PACKET_INTERRUPT                                  7
+#define ENDPOINT_F_INTERRUPT                                    6
+#define ENDPOINT_E_INTERRUPT                                    5
+#define ENDPOINT_D_INTERRUPT                                    4
+#define ENDPOINT_C_INTERRUPT                                    3
+#define ENDPOINT_B_INTERRUPT                                    2
+#define ENDPOINT_A_INTERRUPT                                    1
+#define ENDPOINT_0_INTERRUPT                                    0
+        __le32                  irqstat1;
+#define POWER_STATE_CHANGE_INTERRUPT                            27
+#define PCI_ARBITER_TIMEOUT_INTERRUPT                           26
+#define PCI_PARITY_ERROR_INTERRUPT                              25
+#define PCI_INTA_INTERRUPT                                      24
+#define PCI_PME_INTERRUPT                                       23
+#define PCI_SERR_INTERRUPT                                      22
+#define PCI_PERR_INTERRUPT                                      21
+#define PCI_MASTER_ABORT_RECEIVED_INTERRUPT                     20
+#define PCI_TARGET_ABORT_RECEIVED_INTERRUPT                     19
+#define PCI_RETRY_ABORT_INTERRUPT                               17
+#define PCI_MASTER_CYCLE_DONE_INTERRUPT                         16
+#define GPIO_INTERRUPT                                          13
+#define DMA_D_INTERRUPT                                         12
+#define DMA_C_INTERRUPT                                         11
+#define DMA_B_INTERRUPT                                         10
+#define DMA_A_INTERRUPT                                         9
+#define EEPROM_DONE_INTERRUPT                                   8
+#define VBUS_INTERRUPT                                          7
+#define CONTROL_STATUS_INTERRUPT                                6
+#define ROOT_PORT_RESET_INTERRUPT                               4
+#define SUSPEND_REQUEST_INTERRUPT                               3
+#define SUSPEND_REQUEST_CHANGE_INTERRUPT                        2
+#define RESUME_INTERRUPT                                        1
+#define SOF_INTERRUPT                                           0
+        /* offset 0x0030 */
+        __le32                  idxaddr;
+        __le32                  idxdata;
+        __le32                  fifoctl;
+#define PCI_BASE2_RANGE                                         16
+#define IGNORE_FIFO_AVAILABILITY                                3
+#define PCI_BASE2_SELECT                                        2
+#define FIFO_CONFIGURATION_SELECT                               0
+        u32                     _unused2;
+        /* offset 0x0040 */
+        __le32                  memaddr;
+#define START                                                   28
+#define DIRECTION                                               27
+#define FIFO_DIAGNOSTIC_SELECT                                  24
+#define MEMORY_ADDRESS                                          0
+        __le32                  memdata0;
+        __le32                  memdata1;
+        u32                     _unused3;
+        /* offset 0x0050 */
+        __le32                  gpioctl;
+#define GPIO3_LED_SELECT                                        12
+#define GPIO3_INTERRUPT_ENABLE                                  11
+#define GPIO2_INTERRUPT_ENABLE                                  10
+#define GPIO1_INTERRUPT_ENABLE                                  9
+#define GPIO0_INTERRUPT_ENABLE                                  8
+#define GPIO3_OUTPUT_ENABLE                                     7
+#define GPIO2_OUTPUT_ENABLE                                     6
+#define GPIO1_OUTPUT_ENABLE                                     5
+#define GPIO0_OUTPUT_ENABLE                                     4
+#define GPIO3_DATA                                              3
+#define GPIO2_DATA                                              2
+#define GPIO1_DATA                                              1
+#define GPIO0_DATA                                              0
+        __le32                  gpiostat;
+#define GPIO3_INTERRUPT                                         3
+#define GPIO2_INTERRUPT                                         2
+#define GPIO1_INTERRUPT                                         1
+#define GPIO0_INTERRUPT                                         0
+} __attribute__ ((packed));
+
+/* usb control, BAR0 + 0x0080 */
+struct net2280_usb_regs {
+        /* offset 0x0080 */
+        __le32                  stdrsp;
+#define STALL_UNSUPPORTED_REQUESTS                              31
+#define SET_TEST_MODE                                           16
+#define GET_OTHER_SPEED_CONFIGURATION                           15
+#define GET_DEVICE_QUALIFIER                                    14
+#define SET_ADDRESS                                             13
+#define ENDPOINT_SET_CLEAR_HALT                                 12
+#define DEVICE_SET_CLEAR_DEVICE_REMOTE_WAKEUP                   11
+#define GET_STRING_DESCRIPTOR_2                                 10
+#define GET_STRING_DESCRIPTOR_1                                 9
+#define GET_STRING_DESCRIPTOR_0                                 8
+#define GET_SET_INTERFACE                                       6
+#define GET_SET_CONFIGURATION                                   5
+#define GET_CONFIGURATION_DESCRIPTOR                            4
+#define GET_DEVICE_DESCRIPTOR                                   3
+#define GET_ENDPOINT_STATUS                                     2
+#define GET_INTERFACE_STATUS                                    1
+#define GET_DEVICE_STATUS                                       0
+        __le32                  prodvendid;
+#define     PRODUCT_ID                                          16
+#define     VENDOR_ID                                           0
+        __le32                  relnum;
+        __le32                  usbctl;
+#define SERIAL_NUMBER_INDEX                                     16
+#define PRODUCT_ID_STRING_ENABLE                                13
+#define VENDOR_ID_STRING_ENABLE                                 12
+#define USB_ROOT_PORT_WAKEUP_ENABLE                             11
+#define VBUS_PIN                                                10
+#define TIMED_DISCONNECT                                        9
+#define SUSPEND_IMMEDIATELY                                     7
+#define SELF_POWERED_USB_DEVICE                                 6
+#define REMOTE_WAKEUP_SUPPORT                                   5
+#define PME_POLARITY                                            4
+#define USB_DETECT_ENABLE                                       3
+#define PME_WAKEUP_ENABLE                                       2
+#define DEVICE_REMOTE_WAKEUP_ENABLE                             1
+#define SELF_POWERED_STATUS                                     0
+        /* offset 0x0090 */
+        __le32                  usbstat;
+#define HIGH_SPEED                                              7
+#define FULL_SPEED                                              6
+#define GENERATE_RESUME                                         5
+#define GENERATE_DEVICE_REMOTE_WAKEUP                           4
+        __le32                  xcvrdiag;
+#define FORCE_HIGH_SPEED_MODE                                   31
+#define FORCE_FULL_SPEED_MODE                                   30
+#define USB_TEST_MODE                                           24
+#define LINE_STATE                                              16
+#define TRANSCEIVER_OPERATION_MODE                              2
+#define TRANSCEIVER_SELECT                                      1
+#define TERMINATION_SELECT                                      0
+        __le32                  setup0123;
+        __le32                  setup4567;
+        /* offset 0x0090 */
+        u32                     _unused0;
+        __le32                  ouraddr;
+#define FORCE_IMMEDIATE                                         7
+#define OUR_USB_ADDRESS                                         0
+        __le32                  ourconfig;
+} __attribute__ ((packed));
+
+/* pci control, BAR0 + 0x0100 */
+struct net2280_pci_regs {
+        /* offset 0x0100 */
+        __le32                  pcimstctl;
+#define PCI_ARBITER_PARK_SELECT                                 13
+#define PCI_MULTI LEVEL_ARBITER                                 12
+#define PCI_RETRY_ABORT_ENABLE                                  11
+#define DMA_MEMORY_WRITE_AND_INVALIDATE_ENABLE                  10
+#define DMA_READ_MULTIPLE_ENABLE                                9
+#define DMA_READ_LINE_ENABLE                                    8
+#define PCI_MASTER_COMMAND_SELECT                               6
+#define         MEM_READ_OR_WRITE                               0
+#define         IO_READ_OR_WRITE                                1
+#define         CFG_READ_OR_WRITE                               2
+#define PCI_MASTER_START                                        5
+#define PCI_MASTER_READ_WRITE                                   4
+#define         PCI_MASTER_WRITE                                0
+#define         PCI_MASTER_READ                                 1
+#define PCI_MASTER_BYTE_WRITE_ENABLES                           0
+        __le32                  pcimstaddr;
+        __le32                  pcimstdata;
+        __le32                  pcimststat;
+#define PCI_ARBITER_CLEAR                                       2
+#define PCI_EXTERNAL_ARBITER                                    1
+#define PCI_HOST_MODE                                           0
+} __attribute__ ((packed));
+
+/* dma control, BAR0 + 0x0180 ... array of four structs like this,
+ * for channels 0..3.  see also struct net2280_dma:  descriptor
+ * that can be loaded into some of these registers.
+ */
+struct net2280_dma_regs {       /* [11.7] */
+        /* offset 0x0180, 0x01a0, 0x01c0, 0x01e0, */
+        __le32                  dmactl;
+#define DMA_SCATTER_GATHER_DONE_INTERRUPT_ENABLE                25
+#define DMA_CLEAR_COUNT_ENABLE                                  21
+#define DESCRIPTOR_POLLING_RATE                                 19
+#define         POLL_CONTINUOUS                                 0
+#define         POLL_1_USEC                                     1
+#define         POLL_100_USEC                                   2
+#define         POLL_1_MSEC                                     3
+#define DMA_VALID_BIT_POLLING_ENABLE                            18
+#define DMA_VALID_BIT_ENABLE                                    17
+#define DMA_SCATTER_GATHER_ENABLE                               16
+#define DMA_OUT_AUTO_START_ENABLE                               4
+#define DMA_PREEMPT_ENABLE                                      3
+#define DMA_FIFO_VALIDATE                                       2
+#define DMA_ENABLE                                              1
+#define DMA_ADDRESS_HOLD                                        0
+        __le32                  dmastat;
+#define DMA_SCATTER_GATHER_DONE_INTERRUPT                       25
+#define DMA_TRANSACTION_DONE_INTERRUPT                          24
+#define DMA_ABORT                                               1
+#define DMA_START                                               0
+        u32                     _unused0[2];
+        /* offset 0x0190, 0x01b0, 0x01d0, 0x01f0, */
+        __le32                  dmacount;
+#define VALID_BIT                                               31
+#define DMA_DIRECTION                                           30
+#define DMA_DONE_INTERRUPT_ENABLE                               29
+#define END_OF_CHAIN                                            28
+#define DMA_BYTE_COUNT_MASK                                     ((1<<24)-1)
+#define DMA_BYTE_COUNT                                          0
+        __le32                  dmaaddr;
+        __le32                  dmadesc;
+        u32                     _unused1;
+} __attribute__ ((packed));
+
+/* dedicated endpoint registers, BAR0 + 0x0200 */
+
+struct net2280_dep_regs {       /* [11.8] */
+        /* offset 0x0200, 0x0210, 0x220, 0x230, 0x240 */
+        __le32                  dep_cfg;
+        /* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */
+        __le32                  dep_rsp;
+        u32                     _unused[2];
+} __attribute__ ((packed));
+
+/* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
+ * like this, for ep0 then the configurable endpoints A..F
+ * ep0 reserved for control; E and F have only 64 bytes of fifo
+ */
+struct net2280_ep_regs {        /* [11.9] */
+        /* offset 0x0300, 0x0320, 0x0340, 0x0360, 0x0380, 0x03a0, 0x03c0 */
+        __le32                  ep_cfg;
+#define ENDPOINT_BYTE_COUNT                                     16
+#define ENDPOINT_ENABLE                                         10
+#define ENDPOINT_TYPE                                           8
+#define ENDPOINT_DIRECTION                                      7
+#define ENDPOINT_NUMBER                                         0
+        __le32                  ep_rsp;
+#define SET_NAK_OUT_PACKETS                                     15
+#define SET_EP_HIDE_STATUS_PHASE                                14
+#define SET_EP_FORCE_CRC_ERROR                                  13
+#define SET_INTERRUPT_MODE                                      12
+#define SET_CONTROL_STATUS_PHASE_HANDSHAKE                      11
+#define SET_NAK_OUT_PACKETS_MODE                                10
+#define SET_ENDPOINT_TOGGLE                                     9
+#define SET_ENDPOINT_HALT                                       8
+#define CLEAR_NAK_OUT_PACKETS                                   7
+#define CLEAR_EP_HIDE_STATUS_PHASE                              6
+#define CLEAR_EP_FORCE_CRC_ERROR                                5
+#define CLEAR_INTERRUPT_MODE                                    4
+#define CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE                    3
+#define CLEAR_NAK_OUT_PACKETS_MODE                              2
+#define CLEAR_ENDPOINT_TOGGLE                                   1
+#define CLEAR_ENDPOINT_HALT                                     0
+        __le32                  ep_irqenb;
+#define SHORT_PACKET_OUT_DONE_INTERRUPT_ENABLE                  6
+#define SHORT_PACKET_TRANSFERRED_INTERRUPT_ENABLE               5
+#define DATA_PACKET_RECEIVED_INTERRUPT_ENABLE                   3
+#define DATA_PACKET_TRANSMITTED_INTERRUPT_ENABLE                2
+#define DATA_OUT_PING_TOKEN_INTERRUPT_ENABLE                    1
+#define DATA_IN_TOKEN_INTERRUPT_ENABLE                          0
+        __le32                  ep_stat;
+#define FIFO_VALID_COUNT                                        24
+#define HIGH_BANDWIDTH_OUT_TRANSACTION_PID                      22
+#define TIMEOUT                                                 21
+#define USB_STALL_SENT                                          20
+#define USB_IN_NAK_SENT                                         19
+#define USB_IN_ACK_RCVD                                         18
+#define USB_OUT_PING_NAK_SENT                                   17
+#define USB_OUT_ACK_SENT                                        16
+#define FIFO_OVERFLOW                                           13
+#define FIFO_UNDERFLOW                                          12
+#define FIFO_FULL                                               11
+#define FIFO_EMPTY                                              10
+#define FIFO_FLUSH                                              9
+#define SHORT_PACKET_OUT_DONE_INTERRUPT                         6
+#define SHORT_PACKET_TRANSFERRED_INTERRUPT                      5
+#define NAK_OUT_PACKETS                                         4
+#define DATA_PACKET_RECEIVED_INTERRUPT                          3
+#define DATA_PACKET_TRANSMITTED_INTERRUPT                       2
+#define DATA_OUT_PING_TOKEN_INTERRUPT                           1
+#define DATA_IN_TOKEN_INTERRUPT                                 0
+        /* offset 0x0310, 0x0330, 0x0350, 0x0370, 0x0390, 0x03b0, 0x03d0 */
+        __le32                  ep_avail;
+        __le32                  ep_data;
+        u32                     _unused0[2];
+} __attribute__ ((packed));
+
+struct net2280_reg_write {
+        __le16 port;
+        __le32 addr;
+        __le32 val;
+} __attribute__ ((packed));
+
+struct net2280_reg_read {
+        __le16 port;
+        __le32 addr;
+} __attribute__ ((packed));
+#endif /* NET2280_H */
diff --git a/drivers/net/wireless/p54.h b/drivers/net/wireless/p54/p54.h
index 744c866066c5..06d2c67f4c81 100644
--- a/drivers/net/wireless/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -64,10 +64,6 @@ struct p54_common {
         unsigned int tx_hdr_len;
         void *cached_vdcf;
         unsigned int fw_var;
-        /* FIXME: this channels/modes/rates stuff sucks */
-        struct ieee80211_channel channels[14];
-        struct ieee80211_rate rates[12];
-        struct ieee80211_hw_mode modes[2];
         struct ieee80211_tx_queue_stats tx_stats;
 };
 
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54/p54common.c
index d191e055a788..63f9badf3f52 100644
--- a/drivers/net/wireless/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -27,6 +27,46 @@ MODULE_DESCRIPTION("Softmac Prism54 common code");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("prism54common");
 
+static struct ieee80211_rate p54_rates[] = {
+        { .bitrate = 10, .hw_value = 0, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 20, .hw_value = 1, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 55, .hw_value = 2, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 110, .hw_value = 3, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 60, .hw_value = 4, },
+        { .bitrate = 90, .hw_value = 5, },
+        { .bitrate = 120, .hw_value = 6, },
+        { .bitrate = 180, .hw_value = 7, },
+        { .bitrate = 240, .hw_value = 8, },
+        { .bitrate = 360, .hw_value = 9, },
+        { .bitrate = 480, .hw_value = 10, },
+        { .bitrate = 540, .hw_value = 11, },
+};
+
+static struct ieee80211_channel p54_channels[] = {
+        { .center_freq = 2412, .hw_value = 1, },
+        { .center_freq = 2417, .hw_value = 2, },
+        { .center_freq = 2422, .hw_value = 3, },
+        { .center_freq = 2427, .hw_value = 4, },
+        { .center_freq = 2432, .hw_value = 5, },
+        { .center_freq = 2437, .hw_value = 6, },
+        { .center_freq = 2442, .hw_value = 7, },
+        { .center_freq = 2447, .hw_value = 8, },
+        { .center_freq = 2452, .hw_value = 9, },
+        { .center_freq = 2457, .hw_value = 10, },
+        { .center_freq = 2462, .hw_value = 11, },
+        { .center_freq = 2467, .hw_value = 12, },
+        { .center_freq = 2472, .hw_value = 13, },
+        { .center_freq = 2484, .hw_value = 14, },
+};
+
+static struct ieee80211_supported_band band_2GHz = {
+        .channels = p54_channels,
+        .n_channels = ARRAY_SIZE(p54_channels),
+        .bitrates = p54_rates,
+        .n_bitrates = ARRAY_SIZE(p54_rates),
+};
+
+
 void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
 {
         struct p54_common *priv = dev->priv;
@@ -257,6 +297,10 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                         /* make it overrun */
                         entry_len = len;
                         break;
+                default:
+                        printk(KERN_INFO "p54: unknown eeprom code : 0x%x\n",
+                                le16_to_cpu(entry->code));
+                        break;
                 }
 
                 entry = (void *)entry + (entry_len + 1)*2;
@@ -312,10 +356,10 @@ static void p54_rx_data(struct ieee80211_hw *dev, struct sk_buff *skb)
         u16 freq = le16_to_cpu(hdr->freq);
 
         rx_status.ssi = hdr->rssi;
-        rx_status.rate = hdr->rate & 0x1f; /* report short preambles & CCK too */
-        rx_status.channel = freq == 2484 ? 14 : (freq - 2407)/5;
+        /* XX correct? */
+        rx_status.rate_idx = hdr->rate & 0xf;
         rx_status.freq = freq;
-        rx_status.phymode = MODE_IEEE80211G;
+        rx_status.band = IEEE80211_BAND_2GHZ;
         rx_status.antenna = hdr->antenna;
         rx_status.mactime = le64_to_cpu(hdr->timestamp);
         rx_status.flag |= RX_FLAG_TSFT;
@@ -353,7 +397,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
         while (entry != (struct sk_buff *)&priv->tx_queue) {
                 range = (struct memrecord *)&entry->cb;
                 if (range->start_addr == addr) {
-                        struct ieee80211_tx_status status = {{0}};
+                        struct ieee80211_tx_status status;
                         struct p54_control_hdr *entry_hdr;
                         struct p54_tx_control_allocdata *entry_data;
                         int pad = 0;
@@ -369,6 +413,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
                                 kfree_skb(entry);
                                 break;
                         }
+                        memset(&status, 0, sizeof(status));
                         memcpy(&status.control, range->control,
                                sizeof(status.control));
                         kfree(range->control);
@@ -551,7 +596,9 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
         txhdr->padding2 = 0;
 
         /* TODO: add support for alternate retry TX rates */
-        rate = control->tx_rate;
+        rate = control->tx_rate->hw_value;
+        if (control->flags & IEEE80211_TXCTL_SHORT_PREAMBLE)
+                rate |= 0x10;
         if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS)
                 rate |= 0x40;
         else if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
@@ -721,13 +768,12 @@ static int p54_set_leds(struct ieee80211_hw *dev, int mode, int link, int act)
         return 0;
 }
 
-#define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, burst)      \
+#define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, _txop)      \
 do {                                                            \
         queue.aifs = cpu_to_le16(ai_fs);                        \
         queue.cwmin = cpu_to_le16(cw_min);                      \
         queue.cwmax = cpu_to_le16(cw_max);                      \
-        queue.txop = (burst == 0) ?                             \
-                0 : cpu_to_le16((burst * 100) / 32 + 1);        \
+        queue.txop = cpu_to_le16(_txop);                        \
 } while(0)
 
 static void p54_init_vdcf(struct ieee80211_hw *dev)
@@ -745,10 +791,10 @@ static void p54_init_vdcf(struct ieee80211_hw *dev)
 
         vdcf = (struct p54_tx_control_vdcf *) hdr->data;
 
-        P54_SET_QUEUE(vdcf->queue[0], 0x0002, 0x0003, 0x0007, 0x000f);
-        P54_SET_QUEUE(vdcf->queue[1], 0x0002, 0x0007, 0x000f, 0x001e);
-        P54_SET_QUEUE(vdcf->queue[2], 0x0002, 0x000f, 0x03ff, 0x0014);
-        P54_SET_QUEUE(vdcf->queue[3], 0x0007, 0x000f, 0x03ff, 0x0000);
+        P54_SET_QUEUE(vdcf->queue[0], 0x0002, 0x0003, 0x0007, 47);
+        P54_SET_QUEUE(vdcf->queue[1], 0x0002, 0x0007, 0x000f, 94);
+        P54_SET_QUEUE(vdcf->queue[2], 0x0003, 0x000f, 0x03ff, 0);
+        P54_SET_QUEUE(vdcf->queue[3], 0x0007, 0x000f, 0x03ff, 0);
 }
 
 static void p54_set_vdcf(struct ieee80211_hw *dev)
@@ -853,7 +899,7 @@ static int p54_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)
 {
         int ret;
 
-        ret = p54_set_freq(dev, cpu_to_le16(conf->freq));
+        ret = p54_set_freq(dev, cpu_to_le16(conf->channel->center_freq));
         p54_set_vdcf(dev);
         return ret;
 }
@@ -901,7 +947,7 @@ static int p54_conf_tx(struct ieee80211_hw *dev, int queue,
 
         if ((params) && !((queue < 0) || (queue > 4))) {
                 P54_SET_QUEUE(vdcf->queue[queue], params->aifs,
-                        params->cw_min, params->cw_max, params->burst_time);
+                        params->cw_min, params->cw_max, params->txop);
         } else
                 return -EINVAL;
 
@@ -948,7 +994,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
 {
         struct ieee80211_hw *dev;
         struct p54_common *priv;
-        int i;
 
         dev = ieee80211_alloc_hw(priv_data_len, &p54_ops);
         if (!dev)
@@ -957,18 +1002,7 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
         priv = dev->priv;
         priv->mode = IEEE80211_IF_TYPE_INVALID;
         skb_queue_head_init(&priv->tx_queue);
-        memcpy(priv->channels, p54_channels, sizeof(p54_channels));
-        memcpy(priv->rates, p54_rates, sizeof(p54_rates));
-        priv->modes[1].mode = MODE_IEEE80211B;
-        priv->modes[1].num_rates = 4;
-        priv->modes[1].rates = priv->rates;
-        priv->modes[1].num_channels = ARRAY_SIZE(p54_channels);
-        priv->modes[1].channels = priv->channels;
-        priv->modes[0].mode = MODE_IEEE80211G;
-        priv->modes[0].num_rates = ARRAY_SIZE(p54_rates);
-        priv->modes[0].rates = priv->rates;
-        priv->modes[0].num_channels = ARRAY_SIZE(p54_channels);
-        priv->modes[0].channels = priv->channels;
+        dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &band_2GHz;
         dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */
                     IEEE80211_HW_RX_INCLUDES_FCS;
         dev->channel_change_time = 1000;        /* TODO: find actual value */
@@ -990,14 +1024,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
 
         p54_init_vdcf(dev);
 
-        for (i = 0; i < 2; i++) {
-                if (ieee80211_register_hwmode(dev, &priv->modes[i])) {
-                        kfree(priv->cached_vdcf);
-                        ieee80211_free_hw(dev);
-                        return NULL;
-                }
-        }
-
         return dev;
 }
 EXPORT_SYMBOL_GPL(p54_init_common);
diff --git a/drivers/net/wireless/p54common.h b/drivers/net/wireless/p54/p54common.h
index b67ff34e26fe..c15b56e1d75e 100644
--- a/drivers/net/wireless/p54common.h
+++ b/drivers/net/wireless/p54/p54common.h
@@ -251,79 +251,4 @@ struct p54_tx_control_vdcf {
         __le16 frameburst;
 } __attribute__ ((packed));
 
-static const struct ieee80211_rate p54_rates[] = {
-        { .rate = 10,
-          .val = 0,
-          .val2 = 0x10,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 20,
-          .val = 1,
-          .val2 = 0x11,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 55,
-          .val = 2,
-          .val2 = 0x12,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 110,
-          .val = 3,
-          .val2 = 0x13,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 60,
-          .val = 4,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 90,
-          .val = 5,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 120,
-          .val = 6,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 180,
-          .val = 7,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 240,
-          .val = 8,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 360,
-          .val = 9,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 480,
-          .val = 10,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 540,
-          .val = 11,
-          .flags = IEEE80211_RATE_OFDM },
-};
-
-// TODO: just generate this..
-static const struct ieee80211_channel p54_channels[] = {
-        { .chan = 1,
-          .freq = 2412},
-        { .chan = 2,
-          .freq = 2417},
-        { .chan = 3,
-          .freq = 2422},
-        { .chan = 4,
-          .freq = 2427},
-        { .chan = 5,
-          .freq = 2432},
-        { .chan = 6,
-          .freq = 2437},
-        { .chan = 7,
-          .freq = 2442},
-        { .chan = 8,
-          .freq = 2447},
-        { .chan = 9,
-          .freq = 2452},
-        { .chan = 10,
-          .freq = 2457},
-        { .chan = 11,
-          .freq = 2462},
-        { .chan = 12,
-          .freq = 2467},
-        { .chan = 13,
-          .freq = 2472},
-        { .chan = 14,
-          .freq = 2484}
-};
-
 #endif /* PRISM54COMMON_H */
diff --git a/drivers/net/wireless/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index fa527723fbe0..fa527723fbe0 100644
--- a/drivers/net/wireless/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
diff --git a/drivers/net/wireless/p54pci.h b/drivers/net/wireless/p54/p54pci.h
index 5bedd7af385d..5bedd7af385d 100644
--- a/drivers/net/wireless/p54pci.h
+++ b/drivers/net/wireless/p54/p54pci.h
diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 98ddbb3b3273..98ddbb3b3273 100644
--- a/drivers/net/wireless/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
diff --git a/drivers/net/wireless/p54usb.h b/drivers/net/wireless/p54/p54usb.h
index d1896b396c1c..d1896b396c1c 100644
--- a/drivers/net/wireless/p54usb.h
+++ b/drivers/net/wireless/p54/p54usb.h
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 1b595a6525f4..e5b3c282009c 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -165,7 +165,7 @@ prism54_update_stats(struct work_struct *work)
         struct obj_bss bss, *bss2;
         union oid_res_t r;
 
-        down(&priv->stats_sem);
+        mutex_lock(&priv->stats_lock);
 
 /* Noise floor.
  * I'm not sure if the unit is dBm.
@@ -207,7 +207,7 @@ prism54_update_stats(struct work_struct *work)
         mgt_get_request(priv, DOT11_OID_MPDUTXFAILED, 0, NULL, &r);
         priv->local_iwstatistics.discard.retries = r.u;
 
-        up(&priv->stats_sem);
+        mutex_unlock(&priv->stats_lock);
 
         return;
 }
@@ -218,12 +218,12 @@ prism54_get_wireless_stats(struct net_device *ndev)
         islpci_private *priv = netdev_priv(ndev);
 
         /* If the stats are being updated return old data */
-        if (down_trylock(&priv->stats_sem) == 0) {
+        if (mutex_trylock(&priv->stats_lock)) {
                 memcpy(&priv->iwstatistics, &priv->local_iwstatistics,
                        sizeof (struct iw_statistics));
                 /* They won't be marked updated for the next time */
                 priv->local_iwstatistics.qual.updated = 0;
-                up(&priv->stats_sem);
+                mutex_unlock(&priv->stats_lock);
         } else
                 priv->iwstatistics.qual.updated = 0;
 
@@ -1780,7 +1780,7 @@ prism54_set_raw(struct net_device *ndev, struct iw_request_info *info,
 void
 prism54_acl_init(struct islpci_acl *acl)
 {
-        sema_init(&acl->sem, 1);
+        mutex_init(&acl->lock);
         INIT_LIST_HEAD(&acl->mac_list);
         acl->size = 0;
         acl->policy = MAC_POLICY_OPEN;
@@ -1792,10 +1792,10 @@ prism54_clear_mac(struct islpci_acl *acl)
         struct list_head *ptr, *next;
         struct mac_entry *entry;
 
-        down(&acl->sem);
+        mutex_lock(&acl->lock);
 
         if (acl->size == 0) {
-                up(&acl->sem);
+                mutex_unlock(&acl->lock);
                 return;
         }
 
@@ -1806,7 +1806,7 @@ prism54_clear_mac(struct islpci_acl *acl)
                 kfree(entry);
         }
         acl->size = 0;
-        up(&acl->sem);
+        mutex_unlock(&acl->lock);
 }
 
 void
@@ -1833,13 +1833,13 @@ prism54_add_mac(struct net_device *ndev, struct iw_request_info *info,
 
         memcpy(entry->addr, addr->sa_data, ETH_ALEN);
 
-        if (down_interruptible(&acl->sem)) {
+        if (mutex_lock_interruptible(&acl->lock)) {
                 kfree(entry);
                 return -ERESTARTSYS;
         }
         list_add_tail(&entry->_list, &acl->mac_list);
         acl->size++;
-        up(&acl->sem);
+        mutex_unlock(&acl->lock);
 
         return 0;
 }
@@ -1856,18 +1856,18 @@ prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
         if (addr->sa_family != ARPHRD_ETHER)
                 return -EOPNOTSUPP;
 
-        if (down_interruptible(&acl->sem))
+        if (mutex_lock_interruptible(&acl->lock))
                 return -ERESTARTSYS;
         list_for_each_entry(entry, &acl->mac_list, _list) {
                 if (memcmp(entry->addr, addr->sa_data, ETH_ALEN) == 0) {
                         list_del(&entry->_list);
                         acl->size--;
                         kfree(entry);
-                        up(&acl->sem);
+                        mutex_unlock(&acl->lock);
                         return 0;
                 }
         }
-        up(&acl->sem);
+        mutex_unlock(&acl->lock);
         return -EINVAL;
 }
 
@@ -1882,7 +1882,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
 
         dwrq->length = 0;
 
-        if (down_interruptible(&acl->sem))
+        if (mutex_lock_interruptible(&acl->lock))
                 return -ERESTARTSYS;
 
         list_for_each_entry(entry, &acl->mac_list, _list) {
@@ -1891,7 +1891,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
                 dwrq->length++;
                 dst++;
         }
-        up(&acl->sem);
+        mutex_unlock(&acl->lock);
         return 0;
 }
 
@@ -1955,11 +1955,11 @@ prism54_mac_accept(struct islpci_acl *acl, char *mac)
         struct mac_entry *entry;
         int res = 0;
 
-        if (down_interruptible(&acl->sem))
+        if (mutex_lock_interruptible(&acl->lock))
                 return -ERESTARTSYS;
 
         if (acl->policy == MAC_POLICY_OPEN) {
-                up(&acl->sem);
+                mutex_unlock(&acl->lock);
                 return 1;
         }
 
@@ -1970,7 +1970,7 @@ prism54_mac_accept(struct islpci_acl *acl, char *mac)
                 }
         }
         res = (acl->policy == MAC_POLICY_ACCEPT) ? !res : res;
-        up(&acl->sem);
+        mutex_unlock(&acl->lock);
 
         return res;
 }
@@ -2081,6 +2081,7 @@ link_changed(struct net_device *ndev, u32 bitrate)
         islpci_private *priv = netdev_priv(ndev);
 
         if (bitrate) {
+                netif_carrier_on(ndev);
                 if (priv->iw_mode == IW_MODE_INFRA) {
                         union iwreq_data uwrq;
                         prism54_get_wap(ndev, NULL, (struct sockaddr *) &uwrq,
@@ -2089,8 +2090,10 @@ link_changed(struct net_device *ndev, u32 bitrate)
                 } else
                         send_simple_event(netdev_priv(ndev),
                                           "Link established");
-        } else
+        } else {
+                netif_carrier_off(ndev);
                 send_simple_event(netdev_priv(ndev), "Link lost");
+        }
 }
 
 /* Beacon/ProbeResp payload header */
@@ -2114,7 +2117,7 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
         if (wpa_ie_len > MAX_WPA_IE_LEN)
                 wpa_ie_len = MAX_WPA_IE_LEN;
 
-        down(&priv->wpa_sem);
+        mutex_lock(&priv->wpa_lock);
 
         /* try to use existing entry */
         list_for_each(ptr, &priv->bss_wpa_list) {
@@ -2165,7 +2168,7 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                 kfree(bss);
         }
 
-        up(&priv->wpa_sem);
+        mutex_unlock(&priv->wpa_lock);
 }
 
 static size_t
@@ -2175,7 +2178,7 @@ prism54_wpa_bss_ie_get(islpci_private *priv, u8 *bssid, u8 *wpa_ie)
         struct islpci_bss_wpa_ie *bss = NULL;
         size_t len = 0;
 
-        down(&priv->wpa_sem);
+        mutex_lock(&priv->wpa_lock);
 
         list_for_each(ptr, &priv->bss_wpa_list) {
                 bss = list_entry(ptr, struct islpci_bss_wpa_ie, list);
@@ -2187,7 +2190,7 @@ prism54_wpa_bss_ie_get(islpci_private *priv, u8 *bssid, u8 *wpa_ie)
                 len = bss->wpa_ie_len;
                 memcpy(wpa_ie, bss->wpa_ie, len);
         }
-        up(&priv->wpa_sem);
+        mutex_unlock(&priv->wpa_lock);
 
         return len;
 }
@@ -2196,7 +2199,7 @@ void
 prism54_wpa_bss_ie_init(islpci_private *priv)
 {
         INIT_LIST_HEAD(&priv->bss_wpa_list);
-        sema_init(&priv->wpa_sem, 1);
+        mutex_init(&priv->wpa_lock);
 }
 
 void
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index dbb538ccb4ec..04c2638d75ad 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -387,7 +387,9 @@ islpci_open(struct net_device *ndev)
         }
 
         netif_start_queue(ndev);
-/*      netif_mark_up( ndev ); */
+
+        /* Turn off carrier unless we know we have associated */
+        netif_carrier_off(ndev);
 
         return 0;
 }
@@ -864,7 +866,7 @@ islpci_setup(struct pci_dev *pdev)
         mutex_init(&priv->mgmt_lock);
         priv->mgmt_received = NULL;
         init_waitqueue_head(&priv->mgmt_wqueue);
-        sema_init(&priv->stats_sem, 1);
+        mutex_init(&priv->stats_lock);
         spin_lock_init(&priv->slock);
 
         /* init state machine with off#1 state */
diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h
index 4e0182ce835b..8e55a5fcffae 100644
--- a/drivers/net/wireless/prism54/islpci_dev.h
+++ b/drivers/net/wireless/prism54/islpci_dev.h
@@ -55,7 +55,7 @@ struct islpci_acl {
    enum { MAC_POLICY_OPEN=0, MAC_POLICY_ACCEPT=1, MAC_POLICY_REJECT=2 } policy;
    struct list_head mac_list;  /* a list of mac_entry */
    int size;   /* size of queue */
-   struct semaphore sem;   /* accessed in ioctls and trap_work */
+   struct mutex lock;   /* accessed in ioctls and trap_work */
 };
 
 struct islpci_membuf {
@@ -88,7 +88,7 @@ typedef struct {
 
         /* Take care of the wireless stats */
         struct work_struct stats_work;
-        struct semaphore stats_sem;
+        struct mutex stats_lock;
         /* remember when we last updated the stats */
         unsigned long stats_timestamp;
         /* The first is accessed under semaphore locking.
@@ -178,7 +178,7 @@ typedef struct {
         int wpa; /* WPA mode enabled */
         struct list_head bss_wpa_list;
         int num_bss_wpa;
-        struct semaphore wpa_sem;
+        struct mutex wpa_lock;
         u8 wpa_ie[MAX_WPA_IE_LEN];
         size_t wpa_ie_len;
 
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index f3858ee36f32..963960dc30f2 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/ptrace.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/timer.h>
@@ -2582,7 +2583,7 @@ static char *nettype[] = {"Adhoc", "Infra "};
 static char *framing[] = {"Encapsulation", "Translation"}
 ;
 /*===========================================================================*/
-static int ray_cs_proc_read(char *buf, char **start, off_t offset, int len)
+static int ray_cs_proc_show(struct seq_file *m, void *v)
 {
 /* Print current values which are not available via other means
  * eg ifconfig 
@@ -2606,83 +2607,93 @@ static int ray_cs_proc_read(char *buf, char **start, off_t offset, int len)
     if (!local)
         return 0;
 
-    len = 0;
-
-    len += sprintf(buf + len, "Raylink Wireless LAN driver status\n");
-    len += sprintf(buf + len, "%s\n", rcsid);
+    seq_puts(m, "Raylink Wireless LAN driver status\n");
+    seq_printf(m, "%s\n", rcsid);
     /* build 4 does not report version, and field is 0x55 after memtest */
-    len += sprintf(buf + len, "Firmware version     = ");
+    seq_puts(m, "Firmware version     = ");
     if (local->fw_ver == 0x55)
-        len += sprintf(buf + len, "4 - Use dump_cis for more details\n");
+        seq_puts(m, "4 - Use dump_cis for more details\n");
     else
-        len += sprintf(buf + len, "%2d.%02d.%02d\n",
+        seq_printf(m, "%2d.%02d.%02d\n",
                    local->fw_ver, local->fw_bld, local->fw_var);
 
     for (i=0; i<32; i++) c[i] = local->sparm.b5.a_current_ess_id[i];
     c[32] = 0;
-    len += sprintf(buf + len, "%s network ESSID = \"%s\"\n", 
+    seq_printf(m, "%s network ESSID = \"%s\"\n",
                    nettype[local->sparm.b5.a_network_type], c);
 
     p = local->bss_id;
-    len += sprintf(buf + len, "BSSID                = %s\n",
+    seq_printf(m, "BSSID                = %s\n",
                    print_mac(mac, p));
 
-    len += sprintf(buf + len, "Country code         = %d\n", 
+    seq_printf(m, "Country code         = %d\n",
                    local->sparm.b5.a_curr_country_code);
 
     i = local->card_status;
     if (i < 0) i = 10;
     if (i > 16) i = 10;
-    len += sprintf(buf + len, "Card status          = %s\n", card_status[i]);
+    seq_printf(m, "Card status          = %s\n", card_status[i]);
 
-    len += sprintf(buf + len, "Framing mode         = %s\n",framing[translate]);
+    seq_printf(m, "Framing mode         = %s\n",framing[translate]);
 
-    len += sprintf(buf + len, "Last pkt signal lvl  = %d\n", local->last_rsl);
+    seq_printf(m, "Last pkt signal lvl  = %d\n", local->last_rsl);
 
     if (local->beacon_rxed) {
         /* Pull some fields out of last beacon received */
-        len += sprintf(buf + len, "Beacon Interval      = %d Kus\n", 
+        seq_printf(m, "Beacon Interval      = %d Kus\n",
                        local->last_bcn.beacon_intvl[0]
                        + 256 * local->last_bcn.beacon_intvl[1]);
     
     p = local->last_bcn.elements;
     if (p[0] == C_ESSID_ELEMENT_ID) p += p[1] + 2;
     else {
-        len += sprintf(buf + len, "Parse beacon failed at essid element id = %d\n",p[0]);
-        return len;
+        seq_printf(m, "Parse beacon failed at essid element id = %d\n",p[0]);
+        return 0;
     }
 
     if (p[0] == C_SUPPORTED_RATES_ELEMENT_ID) {
-        len += sprintf(buf + len, "Supported rate codes = ");
+        seq_puts(m, "Supported rate codes = ");
         for (i=2; i<p[1] + 2; i++) 
-            len += sprintf(buf + len, "0x%02x ", p[i]);
-        len += sprintf(buf + len, "\n");
+            seq_printf(m, "0x%02x ", p[i]);
+        seq_putc(m, '\n');
         p += p[1] + 2;
     }
     else {
-        len += sprintf(buf + len, "Parse beacon failed at rates element\n");
-        return len;
+        seq_puts(m, "Parse beacon failed at rates element\n");
+        return 0;
     }
 
         if (p[0] == C_FH_PARAM_SET_ELEMENT_ID) {
             pfh = (struct freq_hop_element *)p;
-            len += sprintf(buf + len, "Hop dwell            = %d Kus\n",
+            seq_printf(m, "Hop dwell            = %d Kus\n",
                            pfh->dwell_time[0] + 256 * pfh->dwell_time[1]);
-            len += sprintf(buf + len, "Hop set              = %d \n", pfh->hop_set);
-            len += sprintf(buf + len, "Hop pattern          = %d \n", pfh->hop_pattern);
-            len += sprintf(buf + len, "Hop index            = %d \n", pfh->hop_index);
+            seq_printf(m, "Hop set              = %d \n", pfh->hop_set);
+            seq_printf(m, "Hop pattern          = %d \n", pfh->hop_pattern);
+            seq_printf(m, "Hop index            = %d \n", pfh->hop_index);
             p += p[1] + 2;
         }
         else {
-            len += sprintf(buf + len, "Parse beacon failed at FH param element\n");
-            return len;
+            seq_puts(m, "Parse beacon failed at FH param element\n");
+            return 0;
         }
     } else {
-        len += sprintf(buf + len, "No beacons received\n");
+        seq_puts(m, "No beacons received\n");
     }
-    return len;
+    return 0;
 }
 
+static int ray_cs_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ray_cs_proc_show, NULL);
+}
+
+static const struct file_operations ray_cs_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = ray_cs_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 #endif
 /*===========================================================================*/
 static int build_auth_frame(ray_dev_t *local, UCHAR *dest, int auth_type)
@@ -2815,7 +2826,7 @@ static int __init init_ray_cs(void)
 #ifdef CONFIG_PROC_FS
     proc_mkdir("driver/ray_cs", NULL);
 
-    create_proc_info_entry("driver/ray_cs/ray_cs", 0, NULL, &ray_cs_proc_read);
+    proc_create("driver/ray_cs/ray_cs", 0, NULL, &ray_cs_proc_fops);
     raycs_write("driver/ray_cs/essid", write_essid, NULL);
     raycs_write("driver/ray_cs/net_type", write_int, &net_type);
     raycs_write("driver/ray_cs/translate", write_int, &translate);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 10b776c1adc5..977751f372ff 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -154,128 +154,121 @@ MODULE_PARM_DESC(workaround_interval,
 #define NDIS_802_11_LENGTH_RATES 8
 #define NDIS_802_11_LENGTH_RATES_EX 16
 
-struct NDIS_802_11_SSID {
-        __le32 SsidLength;
-        u8 Ssid[NDIS_802_11_LENGTH_SSID];
-} __attribute__((packed));
-
-enum NDIS_802_11_NETWORK_TYPE {
-        Ndis802_11FH,
-        Ndis802_11DS,
-        Ndis802_11OFDM5,
-        Ndis802_11OFDM24,
-        Ndis802_11NetworkTypeMax
+enum ndis_80211_net_type {
+        ndis_80211_type_freq_hop,
+        ndis_80211_type_direct_seq,
+        ndis_80211_type_ofdm_a,
+        ndis_80211_type_ofdm_g
 };
 
-struct NDIS_802_11_CONFIGURATION_FH {
-        __le32 Length;
-        __le32 HopPattern;
-        __le32 HopSet;
-        __le32 DwellTime;
-} __attribute__((packed));
-
-struct NDIS_802_11_CONFIGURATION {
-        __le32 Length;
-        __le32 BeaconPeriod;
-        __le32 ATIMWindow;
-        __le32 DSConfig;
-        struct NDIS_802_11_CONFIGURATION_FH FHConfig;
-} __attribute__((packed));
-
-enum NDIS_802_11_NETWORK_INFRASTRUCTURE {
-        Ndis802_11IBSS,
-        Ndis802_11Infrastructure,
-        Ndis802_11AutoUnknown,
-        Ndis802_11InfrastructureMax
+enum ndis_80211_net_infra {
+        ndis_80211_infra_adhoc,
+        ndis_80211_infra_infra,
+        ndis_80211_infra_auto_unknown
 };
 
-enum NDIS_802_11_AUTHENTICATION_MODE {
-        Ndis802_11AuthModeOpen,
-        Ndis802_11AuthModeShared,
-        Ndis802_11AuthModeAutoSwitch,
-        Ndis802_11AuthModeWPA,
-        Ndis802_11AuthModeWPAPSK,
-        Ndis802_11AuthModeWPANone,
-        Ndis802_11AuthModeWPA2,
-        Ndis802_11AuthModeWPA2PSK,
-        Ndis802_11AuthModeMax
+enum ndis_80211_auth_mode {
+        ndis_80211_auth_open,
+        ndis_80211_auth_shared,
+        ndis_80211_auth_auto_switch,
+        ndis_80211_auth_wpa,
+        ndis_80211_auth_wpa_psk,
+        ndis_80211_auth_wpa_none,
+        ndis_80211_auth_wpa2,
+        ndis_80211_auth_wpa2_psk
 };
 
-enum NDIS_802_11_ENCRYPTION_STATUS {
-        Ndis802_11WEPEnabled,
-        Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled,
-        Ndis802_11WEPDisabled,
-        Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled,
-        Ndis802_11WEPKeyAbsent,
-        Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent,
-        Ndis802_11WEPNotSupported,
-        Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported,
-        Ndis802_11Encryption2Enabled,
-        Ndis802_11Encryption2KeyAbsent,
-        Ndis802_11Encryption3Enabled,
-        Ndis802_11Encryption3KeyAbsent
+enum ndis_80211_encr_status {
+        ndis_80211_encr_wep_enabled,
+        ndis_80211_encr_disabled,
+        ndis_80211_encr_wep_key_absent,
+        ndis_80211_encr_not_supported,
+        ndis_80211_encr_tkip_enabled,
+        ndis_80211_encr_tkip_key_absent,
+        ndis_80211_encr_ccmp_enabled,
+        ndis_80211_encr_ccmp_key_absent
 };
 
-enum NDIS_802_11_PRIVACY_FILTER {
-        Ndis802_11PrivFilterAcceptAll,
-        Ndis802_11PrivFilter8021xWEP
+enum ndis_80211_priv_filter {
+        ndis_80211_priv_accept_all,
+        ndis_80211_priv_8021x_wep
 };
 
-struct NDIS_WLAN_BSSID_EX {
-        __le32 Length;
-        u8 MacAddress[6];
-        u8 Padding[2];
-        struct NDIS_802_11_SSID Ssid;
-        __le32 Privacy;
-        __le32 Rssi;
-        __le32 NetworkTypeInUse;
-        struct NDIS_802_11_CONFIGURATION Configuration;
-        __le32 InfrastructureMode;
-        u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
-        __le32 IELength;
-        u8 IEs[0];
+struct ndis_80211_ssid {
+        __le32 length;
+        u8 essid[NDIS_802_11_LENGTH_SSID];
+} __attribute__((packed));
+
+struct ndis_80211_conf_freq_hop {
+        __le32 length;
+        __le32 hop_pattern;
+        __le32 hop_set;
+        __le32 dwell_time;
+} __attribute__((packed));
+
+struct ndis_80211_conf {
+        __le32 length;
+        __le32 beacon_period;
+        __le32 atim_window;
+        __le32 ds_config;
+        struct ndis_80211_conf_freq_hop fh_config;
+} __attribute__((packed));
+
+struct ndis_80211_bssid_ex {
+        __le32 length;
+        u8 mac[6];
+        u8 padding[2];
+        struct ndis_80211_ssid ssid;
+        __le32 privacy;
+        __le32 rssi;
+        __le32 net_type;
+        struct ndis_80211_conf config;
+        __le32 net_infra;
+        u8 rates[NDIS_802_11_LENGTH_RATES_EX];
+        __le32 ie_length;
+        u8 ies[0];
 } __attribute__((packed));
 
-struct NDIS_802_11_BSSID_LIST_EX {
-        __le32 NumberOfItems;
-        struct NDIS_WLAN_BSSID_EX Bssid[0];
+struct ndis_80211_bssid_list_ex {
+        __le32 num_items;
+        struct ndis_80211_bssid_ex bssid[0];
 } __attribute__((packed));
 
-struct NDIS_802_11_FIXED_IEs {
-        u8 Timestamp[8];
-        __le16 BeaconInterval;
-        __le16 Capabilities;
+struct ndis_80211_fixed_ies {
+        u8 timestamp[8];
+        __le16 beacon_interval;
+        __le16 capabilities;
 } __attribute__((packed));
 
-struct NDIS_802_11_WEP {
-        __le32 Length;
-        __le32 KeyIndex;
-        __le32 KeyLength;
-        u8 KeyMaterial[32];
+struct ndis_80211_wep_key {
+        __le32 size;
+        __le32 index;
+        __le32 length;
+        u8 material[32];
 } __attribute__((packed));
 
-struct NDIS_802_11_KEY {
-        __le32 Length;
-        __le32 KeyIndex;
-        __le32 KeyLength;
-        u8 Bssid[6];
-        u8 Padding[6];
-        u8 KeyRSC[8];
-        u8 KeyMaterial[32];
+struct ndis_80211_key {
+        __le32 size;
+        __le32 index;
+        __le32 length;
+        u8 bssid[6];
+        u8 padding[6];
+        u8 rsc[8];
+        u8 material[32];
 } __attribute__((packed));
 
-struct NDIS_802_11_REMOVE_KEY {
-        __le32 Length;
-        __le32 KeyIndex;
-        u8 Bssid[6];
+struct ndis_80211_remove_key {
+        __le32 size;
+        __le32 index;
+        u8 bssid[6];
 } __attribute__((packed));
 
-struct RNDIS_CONFIG_PARAMETER_INFOBUFFER {
-        __le32 ParameterNameOffset;
-        __le32 ParameterNameLength;
-        __le32 ParameterType;
-        __le32 ParameterValueOffset;
-        __le32 ParameterValueLength;
+struct ndis_config_param {
+        __le32 name_offs;
+        __le32 name_length;
+        __le32 type;
+        __le32 value_offs;
+        __le32 value_length;
 } __attribute__((packed));
 
 /* these have to match what is in wpa_supplicant */
@@ -334,7 +327,7 @@ struct rndis_wext_private {
         /* hardware state */
         int radio_on;
         int infra_mode;
-        struct NDIS_802_11_SSID essid;
+        struct ndis_80211_ssid essid;
 
         /* encryption stuff */
         int  encr_tx_key_index;
@@ -484,7 +477,7 @@ static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
 static int rndis_set_config_parameter(struct usbnet *dev, char *param,
                                                 int value_type, void *value)
 {
-        struct RNDIS_CONFIG_PARAMETER_INFOBUFFER *infobuf;
+        struct ndis_config_param *infobuf;
         int value_len, info_len, param_len, ret, i;
         __le16 *unibuf;
         __le32 *dst_value;
@@ -519,12 +512,11 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param,
                 devdbg(dev, "setting config parameter: %s, value: %d",
                                                 param, *(u32 *)value);
 
-        infobuf->ParameterNameOffset = cpu_to_le32(sizeof(*infobuf));
-        infobuf->ParameterNameLength = cpu_to_le32(param_len);
-        infobuf->ParameterType = cpu_to_le32(value_type);
-        infobuf->ParameterValueOffset = cpu_to_le32(sizeof(*infobuf) +
-                                                                param_len);
-        infobuf->ParameterValueLength = cpu_to_le32(value_len);
+        infobuf->name_offs = cpu_to_le32(sizeof(*infobuf));
+        infobuf->name_length = cpu_to_le32(param_len);
+        infobuf->type = cpu_to_le32(value_type);
+        infobuf->value_offs = cpu_to_le32(sizeof(*infobuf) + param_len);
+        infobuf->value_length = cpu_to_le32(value_len);
 
         /* simple string to unicode string conversion */
         unibuf = (void *)infobuf + sizeof(*infobuf);
@@ -630,7 +622,7 @@ static int freq_to_dsconfig(struct iw_freq *freq, unsigned int *dsconfig)
 static int
 add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index);
 
-static int get_essid(struct usbnet *usbdev, struct NDIS_802_11_SSID *ssid)
+static int get_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
 {
         int ret, len;
 
@@ -638,14 +630,14 @@ static int get_essid(struct usbnet *usbdev, struct NDIS_802_11_SSID *ssid)
         ret = rndis_query_oid(usbdev, OID_802_11_SSID, ssid, &len);
 
         if (ret != 0)
-                ssid->SsidLength = 0;
+                ssid->length = 0;
 
 #ifdef DEBUG
         {
                 unsigned char tmp[NDIS_802_11_LENGTH_SSID + 1];
 
-                memcpy(tmp, ssid->Ssid, le32_to_cpu(ssid->SsidLength));
-                tmp[le32_to_cpu(ssid->SsidLength)] = 0;
+                memcpy(tmp, ssid->essid, le32_to_cpu(ssid->length));
+                tmp[le32_to_cpu(ssid->length)] = 0;
                 devdbg(usbdev, "get_essid: '%s', ret: %d", tmp, ret);
         }
 #endif
@@ -653,7 +645,7 @@ static int get_essid(struct usbnet *usbdev, struct NDIS_802_11_SSID *ssid)
 }
 
 
-static int set_essid(struct usbnet *usbdev, struct NDIS_802_11_SSID *ssid)
+static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
 {
         struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
         int ret;
@@ -697,7 +689,7 @@ static int is_associated(struct usbnet *usbdev)
 static int disassociate(struct usbnet *usbdev, int reset_ssid)
 {
         struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-        struct NDIS_802_11_SSID ssid;
+        struct ndis_80211_ssid ssid;
         int i, ret = 0;
 
         if (priv->radio_on) {
@@ -714,12 +706,12 @@ static int disassociate(struct usbnet *usbdev, int reset_ssid)
         /* disassociate causes radio to be turned off; if reset_ssid
          * is given, set random ssid to enable radio */
         if (reset_ssid) {
-                ssid.SsidLength = cpu_to_le32(sizeof(ssid.Ssid));
-                get_random_bytes(&ssid.Ssid[2], sizeof(ssid.Ssid)-2);
-                ssid.Ssid[0] = 0x1;
-                ssid.Ssid[1] = 0xff;
-                for (i = 2; i < sizeof(ssid.Ssid); i++)
-                        ssid.Ssid[i] = 0x1 + (ssid.Ssid[i] * 0xfe / 0xff);
+                ssid.length = cpu_to_le32(sizeof(ssid.essid));
+                get_random_bytes(&ssid.essid[2], sizeof(ssid.essid)-2);
+                ssid.essid[0] = 0x1;
+                ssid.essid[1] = 0xff;
+                for (i = 2; i < sizeof(ssid.essid); i++)
+                        ssid.essid[i] = 0x1 + (ssid.essid[i] * 0xfe / 0xff);
                 ret = set_essid(usbdev, &ssid);
         }
         return ret;
@@ -737,23 +729,23 @@ static int set_auth_mode(struct usbnet *usbdev, int wpa_version, int authalg)
 
         if (wpa_version & IW_AUTH_WPA_VERSION_WPA2) {
                 if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_802_1X)
-                        auth_mode = Ndis802_11AuthModeWPA2;
+                        auth_mode = ndis_80211_auth_wpa2;
                 else
-                        auth_mode = Ndis802_11AuthModeWPA2PSK;
+                        auth_mode = ndis_80211_auth_wpa2_psk;
         } else if (wpa_version & IW_AUTH_WPA_VERSION_WPA) {
                 if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_802_1X)
-                        auth_mode = Ndis802_11AuthModeWPA;
+                        auth_mode = ndis_80211_auth_wpa;
                 else if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_PSK)
-                        auth_mode = Ndis802_11AuthModeWPAPSK;
+                        auth_mode = ndis_80211_auth_wpa_psk;
                 else
-                        auth_mode = Ndis802_11AuthModeWPANone;
+                        auth_mode = ndis_80211_auth_wpa_none;
         } else if (authalg & IW_AUTH_ALG_SHARED_KEY) {
                 if (authalg & IW_AUTH_ALG_OPEN_SYSTEM)
-                        auth_mode = Ndis802_11AuthModeAutoSwitch;
+                        auth_mode = ndis_80211_auth_auto_switch;
                 else
-                        auth_mode = Ndis802_11AuthModeShared;
+                        auth_mode = ndis_80211_auth_shared;
         } else
-                auth_mode = Ndis802_11AuthModeOpen;
+                auth_mode = ndis_80211_auth_open;
 
         tmp = cpu_to_le32(auth_mode);
         ret = rndis_set_oid(usbdev, OID_802_11_AUTHENTICATION_MODE, &tmp,
@@ -778,9 +770,9 @@ static int set_priv_filter(struct usbnet *usbdev)
 
         if (priv->wpa_version & IW_AUTH_WPA_VERSION_WPA2 ||
             priv->wpa_version & IW_AUTH_WPA_VERSION_WPA)
-                tmp = cpu_to_le32(Ndis802_11PrivFilter8021xWEP);
+                tmp = cpu_to_le32(ndis_80211_priv_8021x_wep);
         else
-                tmp = cpu_to_le32(Ndis802_11PrivFilterAcceptAll);
+                tmp = cpu_to_le32(ndis_80211_priv_accept_all);
 
         return rndis_set_oid(usbdev, OID_802_11_PRIVACY_FILTER, &tmp,
                                                                 sizeof(tmp));
@@ -798,18 +790,18 @@ static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
                 groupwise);
 
         if (pairwise & IW_AUTH_CIPHER_CCMP)
-                encr_mode = Ndis802_11Encryption3Enabled;
+                encr_mode = ndis_80211_encr_ccmp_enabled;
         else if (pairwise & IW_AUTH_CIPHER_TKIP)
-                encr_mode = Ndis802_11Encryption2Enabled;
+                encr_mode = ndis_80211_encr_tkip_enabled;
         else if (pairwise &
                  (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104))
-                encr_mode = Ndis802_11Encryption1Enabled;
+                encr_mode = ndis_80211_encr_wep_enabled;
         else if (groupwise & IW_AUTH_CIPHER_CCMP)
-                encr_mode = Ndis802_11Encryption3Enabled;
+                encr_mode = ndis_80211_encr_ccmp_enabled;
         else if (groupwise & IW_AUTH_CIPHER_TKIP)
-                encr_mode = Ndis802_11Encryption2Enabled;
+                encr_mode = ndis_80211_encr_tkip_enabled;
         else
-                encr_mode = Ndis802_11EncryptionDisabled;
+                encr_mode = ndis_80211_encr_disabled;
 
         tmp = cpu_to_le32(encr_mode);
         ret = rndis_set_oid(usbdev, OID_802_11_ENCRYPTION_STATUS, &tmp,
@@ -877,7 +869,7 @@ static void set_default_iw_params(struct usbnet *usbdev)
         priv->wpa_keymgmt = 0;
         priv->wpa_version = 0;
 
-        set_infra_mode(usbdev, Ndis802_11Infrastructure);
+        set_infra_mode(usbdev, ndis_80211_infra_infra);
         set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
                                 IW_AUTH_ALG_OPEN_SYSTEM);
         set_priv_filter(usbdev);
@@ -899,7 +891,7 @@ static int deauthenticate(struct usbnet *usbdev)
 static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
 {
         struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-        struct NDIS_802_11_WEP ndis_key;
+        struct ndis_80211_wep_key ndis_key;
         int ret;
 
         if (key_len <= 0 || key_len > 32 || index < 0 || index >= 4)
@@ -907,13 +899,13 @@ static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
 
         memset(&ndis_key, 0, sizeof(ndis_key));
 
-        ndis_key.Length = cpu_to_le32(sizeof(ndis_key));
-        ndis_key.KeyLength = cpu_to_le32(key_len);
-        ndis_key.KeyIndex = cpu_to_le32(index);
-        memcpy(&ndis_key.KeyMaterial, key, key_len);
+        ndis_key.size = cpu_to_le32(sizeof(ndis_key));
+        ndis_key.length = cpu_to_le32(key_len);
+        ndis_key.index = cpu_to_le32(index);
+        memcpy(&ndis_key.material, key, key_len);
 
         if (index == priv->encr_tx_key_index) {
-                ndis_key.KeyIndex |= cpu_to_le32(1 << 31);
+                ndis_key.index |= cpu_to_le32(1 << 31);
                 ret = set_encr_mode(usbdev, IW_AUTH_CIPHER_WEP104,
                                                 IW_AUTH_CIPHER_NONE);
                 if (ret)
@@ -940,7 +932,7 @@ static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
 static int remove_key(struct usbnet *usbdev, int index, u8 bssid[ETH_ALEN])
 {
         struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-        struct NDIS_802_11_REMOVE_KEY remove_key;
+        struct ndis_80211_remove_key remove_key;
         __le32 keyindex;
         int ret;
 
@@ -954,17 +946,17 @@ static int remove_key(struct usbnet *usbdev, int index, u8 bssid[ETH_ALEN])
             priv->wpa_cipher_pair == IW_AUTH_CIPHER_CCMP ||
             priv->wpa_cipher_group == IW_AUTH_CIPHER_TKIP ||
             priv->wpa_cipher_group == IW_AUTH_CIPHER_CCMP) {
-                remove_key.Length = cpu_to_le32(sizeof(remove_key));
-                remove_key.KeyIndex = cpu_to_le32(index);
+                remove_key.size = cpu_to_le32(sizeof(remove_key));
+                remove_key.index = cpu_to_le32(index);
                 if (bssid) {
                         /* pairwise key */
                         if (memcmp(bssid, ffff_bssid, ETH_ALEN) != 0)
-                                remove_key.KeyIndex |= cpu_to_le32(1 << 30);
-                        memcpy(remove_key.Bssid, bssid,
-                                        sizeof(remove_key.Bssid));
+                                remove_key.index |= cpu_to_le32(1 << 30);
+                        memcpy(remove_key.bssid, bssid,
+                                        sizeof(remove_key.bssid));
                 } else
-                        memset(remove_key.Bssid, 0xff,
-                                                sizeof(remove_key.Bssid));
+                        memset(remove_key.bssid, 0xff,
+                                                sizeof(remove_key.bssid));
 
                 ret = rndis_set_oid(usbdev, OID_802_11_REMOVE_KEY, &remove_key,
                                                         sizeof(remove_key));
@@ -1184,7 +1176,7 @@ static int rndis_iw_get_name(struct net_device *dev,
 static int rndis_iw_set_essid(struct net_device *dev,
     struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
 {
-        struct NDIS_802_11_SSID ssid;
+        struct ndis_80211_ssid ssid;
         int length = wrqu->essid.length;
         struct usbnet *usbdev = dev->priv;
 
@@ -1194,11 +1186,11 @@ static int rndis_iw_set_essid(struct net_device *dev,
         if (length > NDIS_802_11_LENGTH_SSID)
                 length = NDIS_802_11_LENGTH_SSID;
 
-        ssid.SsidLength = cpu_to_le32(length);
+        ssid.length = cpu_to_le32(length);
         if (length > 0)
-                memcpy(ssid.Ssid, essid, length);
+                memcpy(ssid.essid, essid, length);
         else
-                memset(ssid.Ssid, 0, NDIS_802_11_LENGTH_SSID);
+                memset(ssid.essid, 0, NDIS_802_11_LENGTH_SSID);
 
         set_assoc_params(usbdev);
 
@@ -1212,16 +1204,16 @@ static int rndis_iw_set_essid(struct net_device *dev,
 static int rndis_iw_get_essid(struct net_device *dev,
     struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
 {
-        struct NDIS_802_11_SSID ssid;
+        struct ndis_80211_ssid ssid;
         struct usbnet *usbdev = dev->priv;
         int ret;
 
         ret = get_essid(usbdev, &ssid);
 
-        if (ret == 0 && le32_to_cpu(ssid.SsidLength) > 0) {
+        if (ret == 0 && le32_to_cpu(ssid.length) > 0) {
                 wrqu->essid.flags = 1;
-                wrqu->essid.length = le32_to_cpu(ssid.SsidLength);
-                memcpy(essid, ssid.Ssid, wrqu->essid.length);
+                wrqu->essid.length = le32_to_cpu(ssid.length);
+                memcpy(essid, ssid.essid, wrqu->essid.length);
                 essid[wrqu->essid.length] = 0;
         } else {
                 memset(essid, 0, sizeof(NDIS_802_11_LENGTH_SSID));
@@ -1398,13 +1390,13 @@ static int rndis_iw_get_mode(struct net_device *dev,
         struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
 
         switch (priv->infra_mode) {
-        case Ndis802_11IBSS:
+        case ndis_80211_infra_adhoc:
                 wrqu->mode = IW_MODE_ADHOC;
                 break;
-        case Ndis802_11Infrastructure:
+        case ndis_80211_infra_infra:
                 wrqu->mode = IW_MODE_INFRA;
                 break;
-        /*case Ndis802_11AutoUnknown:*/
+        /*case ndis_80211_infra_auto_unknown:*/
         default:
                 wrqu->mode = IW_MODE_AUTO;
                 break;
@@ -1424,14 +1416,14 @@ static int rndis_iw_set_mode(struct net_device *dev,
 
         switch (wrqu->mode) {
         case IW_MODE_ADHOC:
-                mode = Ndis802_11IBSS;
+                mode = ndis_80211_infra_adhoc;
                 break;
         case IW_MODE_INFRA:
-                mode = Ndis802_11Infrastructure;
+                mode = ndis_80211_infra_infra;
                 break;
         /*case IW_MODE_AUTO:*/
         default:
-                mode = Ndis802_11AutoUnknown;
+                mode = ndis_80211_infra_auto_unknown;
                 break;
         }
 
@@ -1507,7 +1499,7 @@ static int rndis_iw_set_encode_ext(struct net_device *dev,
         struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
         struct usbnet *usbdev = dev->priv;
         struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-        struct NDIS_802_11_KEY ndis_key;
+        struct ndis_80211_key ndis_key;
         int keyidx, ret;
         u8 *addr;
 
@@ -1532,54 +1524,54 @@ static int rndis_iw_set_encode_ext(struct net_device *dev,
             ext->alg == IW_ENCODE_ALG_NONE || ext->key_len == 0)
                 return remove_key(usbdev, keyidx, NULL);
 
-        if (ext->key_len > sizeof(ndis_key.KeyMaterial))
+        if (ext->key_len > sizeof(ndis_key.material))
                 return -1;
 
         memset(&ndis_key, 0, sizeof(ndis_key));
 
-        ndis_key.Length = cpu_to_le32(sizeof(ndis_key) -
-                                sizeof(ndis_key.KeyMaterial) + ext->key_len);
-        ndis_key.KeyLength = cpu_to_le32(ext->key_len);
-        ndis_key.KeyIndex = cpu_to_le32(keyidx);
+        ndis_key.size = cpu_to_le32(sizeof(ndis_key) -
+                                sizeof(ndis_key.material) + ext->key_len);
+        ndis_key.length = cpu_to_le32(ext->key_len);
+        ndis_key.index = cpu_to_le32(keyidx);
 
         if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-                memcpy(ndis_key.KeyRSC, ext->rx_seq, 6);
-                ndis_key.KeyIndex |= cpu_to_le32(1 << 29);
+                memcpy(ndis_key.rsc, ext->rx_seq, 6);
+                ndis_key.index |= cpu_to_le32(1 << 29);
         }
 
         addr = ext->addr.sa_data;
         if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
                 /* group key */
-                if (priv->infra_mode == Ndis802_11IBSS)
-                        memset(ndis_key.Bssid, 0xff, ETH_ALEN);
+                if (priv->infra_mode == ndis_80211_infra_adhoc)
+                        memset(ndis_key.bssid, 0xff, ETH_ALEN);
                 else
-                        get_bssid(usbdev, ndis_key.Bssid);
+                        get_bssid(usbdev, ndis_key.bssid);
         } else {
                 /* pairwise key */
-                ndis_key.KeyIndex |= cpu_to_le32(1 << 30);
-                memcpy(ndis_key.Bssid, addr, ETH_ALEN);
+                ndis_key.index |= cpu_to_le32(1 << 30);
+                memcpy(ndis_key.bssid, addr, ETH_ALEN);
         }
 
         if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
-                ndis_key.KeyIndex |= cpu_to_le32(1 << 31);
+                ndis_key.index |= cpu_to_le32(1 << 31);
 
         if (ext->alg == IW_ENCODE_ALG_TKIP && ext->key_len == 32) {
                 /* wpa_supplicant gives us the Michael MIC RX/TX keys in
                  * different order than NDIS spec, so swap the order here. */
-                memcpy(ndis_key.KeyMaterial, ext->key, 16);
-                memcpy(ndis_key.KeyMaterial + 16, ext->key + 24, 8);
-                memcpy(ndis_key.KeyMaterial + 24, ext->key + 16, 8);
+                memcpy(ndis_key.material, ext->key, 16);
+                memcpy(ndis_key.material + 16, ext->key + 24, 8);
+                memcpy(ndis_key.material + 24, ext->key + 16, 8);
         } else
-                memcpy(ndis_key.KeyMaterial, ext->key, ext->key_len);
+                memcpy(ndis_key.material, ext->key, ext->key_len);
 
         ret = rndis_set_oid(usbdev, OID_802_11_ADD_KEY, &ndis_key,
-                                        le32_to_cpu(ndis_key.Length));
+                                        le32_to_cpu(ndis_key.size));
         devdbg(usbdev, "SIOCSIWENCODEEXT: OID_802_11_ADD_KEY -> %08X", ret);
         if (ret != 0)
                 return ret;
 
         priv->encr_key_len[keyidx] = ext->key_len;
-        memcpy(&priv->encr_keys[keyidx], ndis_key.KeyMaterial, ext->key_len);
+        memcpy(&priv->encr_keys[keyidx], ndis_key.material, ext->key_len);
         if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
                 priv->encr_tx_key_index = keyidx;
 
@@ -1611,7 +1603,7 @@ static int rndis_iw_set_scan(struct net_device *dev,
 
 
 static char *rndis_translate_scan(struct net_device *dev,
-    char *cev, char *end_buf, struct NDIS_WLAN_BSSID_EX *bssid)
+    char *cev, char *end_buf, struct ndis_80211_bssid_ex *bssid)
 {
 #ifdef DEBUG
         struct usbnet *usbdev = dev->priv;
@@ -1624,60 +1616,55 @@ static char *rndis_translate_scan(struct net_device *dev,
         unsigned char sbuf[32];
         DECLARE_MAC_BUF(mac);
 
-        bssid_len = le32_to_cpu(bssid->Length);
+        bssid_len = le32_to_cpu(bssid->length);
 
-        devdbg(usbdev, "BSSID %s", print_mac(mac, bssid->MacAddress));
+        devdbg(usbdev, "BSSID %s", print_mac(mac, bssid->mac));
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-        memcpy(iwe.u.ap_addr.sa_data, bssid->MacAddress, ETH_ALEN);
+        memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN);
         cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_ADDR_LEN);
 
-        devdbg(usbdev, "SSID(%d) %s",
-                le32_to_cpu(bssid->Ssid.SsidLength),
-                bssid->Ssid.Ssid);
+        devdbg(usbdev, "SSID(%d) %s", le32_to_cpu(bssid->ssid.length),
+                                                bssid->ssid.essid);
         iwe.cmd = SIOCGIWESSID;
-        iwe.u.essid.length = le32_to_cpu(bssid->Ssid.SsidLength);
+        iwe.u.essid.length = le32_to_cpu(bssid->ssid.length);
         iwe.u.essid.flags = 1;
-        cev = iwe_stream_add_point(cev, end_buf, &iwe,
-                                                bssid->Ssid.Ssid);
+        cev = iwe_stream_add_point(cev, end_buf, &iwe, bssid->ssid.essid);
 
-        devdbg(usbdev, "MODE %d",
-                        le32_to_cpu(bssid->InfrastructureMode));
+        devdbg(usbdev, "MODE %d", le32_to_cpu(bssid->net_infra));
         iwe.cmd = SIOCGIWMODE;
-        switch (le32_to_cpu(bssid->InfrastructureMode)) {
-        case Ndis802_11IBSS:
+        switch (le32_to_cpu(bssid->net_infra)) {
+        case ndis_80211_infra_adhoc:
                 iwe.u.mode = IW_MODE_ADHOC;
                 break;
-        case Ndis802_11Infrastructure:
+        case ndis_80211_infra_infra:
                 iwe.u.mode = IW_MODE_INFRA;
                 break;
-        /*case Ndis802_11AutoUnknown:*/
+        /*case ndis_80211_infra_auto_unknown:*/
         default:
                 iwe.u.mode = IW_MODE_AUTO;
                 break;
         }
         cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_UINT_LEN);
 
-        devdbg(usbdev, "FREQ %d kHz",
-                le32_to_cpu(bssid->Configuration.DSConfig));
+        devdbg(usbdev, "FREQ %d kHz", le32_to_cpu(bssid->config.ds_config));
         iwe.cmd = SIOCGIWFREQ;
-        dsconfig_to_freq(le32_to_cpu(bssid->Configuration.DSConfig),
-                                                                &iwe.u.freq);
+        dsconfig_to_freq(le32_to_cpu(bssid->config.ds_config), &iwe.u.freq);
         cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_FREQ_LEN);
 
-        devdbg(usbdev, "QUAL %d", le32_to_cpu(bssid->Rssi));
+        devdbg(usbdev, "QUAL %d", le32_to_cpu(bssid->rssi));
         iwe.cmd = IWEVQUAL;
-        iwe.u.qual.qual  = level_to_qual(le32_to_cpu(bssid->Rssi));
-        iwe.u.qual.level = le32_to_cpu(bssid->Rssi);
+        iwe.u.qual.qual  = level_to_qual(le32_to_cpu(bssid->rssi));
+        iwe.u.qual.level = le32_to_cpu(bssid->rssi);
         iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED
                         | IW_QUAL_LEVEL_UPDATED
                         | IW_QUAL_NOISE_INVALID;
         cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_QUAL_LEN);
 
-        devdbg(usbdev, "ENCODE %d", le32_to_cpu(bssid->Privacy));
+        devdbg(usbdev, "ENCODE %d", le32_to_cpu(bssid->privacy));
         iwe.cmd = SIOCGIWENCODE;
         iwe.u.data.length = 0;
-        if (le32_to_cpu(bssid->Privacy) == Ndis802_11PrivFilterAcceptAll)
+        if (le32_to_cpu(bssid->privacy) == ndis_80211_priv_accept_all)
                 iwe.u.data.flags = IW_ENCODE_DISABLED;
         else
                 iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
@@ -1687,10 +1674,10 @@ static char *rndis_translate_scan(struct net_device *dev,
         devdbg(usbdev, "RATES:");
         current_val = cev + IW_EV_LCP_LEN;
         iwe.cmd = SIOCGIWRATE;
-        for (i = 0; i < sizeof(bssid->SupportedRates); i++) {
-                if (bssid->SupportedRates[i] & 0x7f) {
+        for (i = 0; i < sizeof(bssid->rates); i++) {
+                if (bssid->rates[i] & 0x7f) {
                         iwe.u.bitrate.value =
-                                ((bssid->SupportedRates[i] & 0x7f) *
+                                ((bssid->rates[i] & 0x7f) *
                                 500000);
                         devdbg(usbdev, " %d", iwe.u.bitrate.value);
                         current_val = iwe_stream_add_value(cev,
@@ -1702,24 +1689,24 @@ static char *rndis_translate_scan(struct net_device *dev,
         if ((current_val - cev) > IW_EV_LCP_LEN)
                 cev = current_val;
 
-        beacon = le32_to_cpu(bssid->Configuration.BeaconPeriod);
+        beacon = le32_to_cpu(bssid->config.beacon_period);
         devdbg(usbdev, "BCN_INT %d", beacon);
         iwe.cmd = IWEVCUSTOM;
         snprintf(sbuf, sizeof(sbuf), "bcn_int=%d", beacon);
         iwe.u.data.length = strlen(sbuf);
         cev = iwe_stream_add_point(cev, end_buf, &iwe, sbuf);
 
-        atim = le32_to_cpu(bssid->Configuration.ATIMWindow);
+        atim = le32_to_cpu(bssid->config.atim_window);
         devdbg(usbdev, "ATIM %d", atim);
         iwe.cmd = IWEVCUSTOM;
         snprintf(sbuf, sizeof(sbuf), "atim=%u", atim);
         iwe.u.data.length = strlen(sbuf);
         cev = iwe_stream_add_point(cev, end_buf, &iwe, sbuf);
 
-        ie = (void *)(bssid->IEs + sizeof(struct NDIS_802_11_FIXED_IEs));
+        ie = (void *)(bssid->ies + sizeof(struct ndis_80211_fixed_ies));
         ie_len = min(bssid_len - (int)sizeof(*bssid),
-                                        (int)le32_to_cpu(bssid->IELength));
-        ie_len -= sizeof(struct NDIS_802_11_FIXED_IEs);
+                                        (int)le32_to_cpu(bssid->ie_length));
+        ie_len -= sizeof(struct ndis_80211_fixed_ies);
         while (ie_len >= sizeof(*ie) && sizeof(*ie) + ie->len <= ie_len) {
                 if ((ie->id == MFIE_TYPE_GENERIC && ie->len >= 4 &&
                                 memcmp(ie->data, "\x00\x50\xf2\x01", 4) == 0) ||
@@ -1746,8 +1733,8 @@ static int rndis_iw_get_scan(struct net_device *dev,
         struct usbnet *usbdev = dev->priv;
         void *buf = NULL;
         char *cev = extra;
-        struct NDIS_802_11_BSSID_LIST_EX *bssid_list;
-        struct NDIS_WLAN_BSSID_EX *bssid;
+        struct ndis_80211_bssid_list_ex *bssid_list;
+        struct ndis_80211_bssid_ex *bssid;
         int ret = -EINVAL, len, count, bssid_len;
 
         devdbg(usbdev, "SIOCGIWSCAN");
@@ -1765,16 +1752,16 @@ static int rndis_iw_get_scan(struct net_device *dev,
                 goto out;
 
         bssid_list = buf;
-        bssid = bssid_list->Bssid;
-        bssid_len = le32_to_cpu(bssid->Length);
-        count = le32_to_cpu(bssid_list->NumberOfItems);
+        bssid = bssid_list->bssid;
+        bssid_len = le32_to_cpu(bssid->length);
+        count = le32_to_cpu(bssid_list->num_items);
         devdbg(usbdev, "SIOCGIWSCAN: %d BSSIDs found", count);
 
         while (count && ((void *)bssid + bssid_len) <= (buf + len)) {
                 cev = rndis_translate_scan(dev, cev, extra + IW_SCAN_MAX_DATA,
                                                                         bssid);
                 bssid = (void *)bssid + bssid_len;
-                bssid_len = le32_to_cpu(bssid->Length);
+                bssid_len = le32_to_cpu(bssid->length);
                 count--;
         }
 
@@ -1948,7 +1935,7 @@ static int rndis_iw_set_freq(struct net_device *dev,
     struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
 {
         struct usbnet *usbdev = dev->priv;
-        struct NDIS_802_11_CONFIGURATION config;
+        struct ndis_80211_conf config;
         unsigned int dsconfig;
         int len, ret;
 
@@ -1967,7 +1954,7 @@ static int rndis_iw_set_freq(struct net_device *dev,
                 return 0;
         }
 
-        config.DSConfig = cpu_to_le32(dsconfig);
+        config.ds_config = cpu_to_le32(dsconfig);
 
         devdbg(usbdev, "SIOCSIWFREQ: %d * 10^%d", wrqu->freq.m, wrqu->freq.e);
         return rndis_set_oid(usbdev, OID_802_11_CONFIGURATION, &config,
@@ -1979,13 +1966,13 @@ static int rndis_iw_get_freq(struct net_device *dev,
     struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
 {
         struct usbnet *usbdev = dev->priv;
-        struct NDIS_802_11_CONFIGURATION config;
+        struct ndis_80211_conf config;
         int len, ret;
 
         len = sizeof(config);
         ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
         if (ret == 0)
-                dsconfig_to_freq(le32_to_cpu(config.DSConfig), &wrqu->freq);
+                dsconfig_to_freq(le32_to_cpu(config.ds_config), &wrqu->freq);
 
         devdbg(usbdev, "SIOCGIWFREQ: %d", wrqu->freq.m);
         return ret;
@@ -2266,14 +2253,14 @@ static int rndis_wext_get_caps(struct usbnet *dev)
                         n = 8;
                 for (i = 0; i < n; i++) {
                         switch (le32_to_cpu(networks_supported.items[i])) {
-                        case Ndis802_11FH:
-                        case Ndis802_11DS:
+                        case ndis_80211_type_freq_hop:
+                        case ndis_80211_type_direct_seq:
                                 priv->caps |= CAP_MODE_80211B;
                                 break;
-                        case Ndis802_11OFDM5:
+                        case ndis_80211_type_ofdm_a:
                                 priv->caps |= CAP_MODE_80211A;
                                 break;
-                        case Ndis802_11OFDM24:
+                        case ndis_80211_type_ofdm_g:
                                 priv->caps |= CAP_MODE_80211G;
                                 break;
                         }
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index da05b1faf60d..a1e3938cba9b 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -5,30 +5,28 @@ config RT2X00
           This will enable the experimental support for the Ralink drivers,
           developed in the rt2x00 project <http://rt2x00.serialmonkey.com>.
 
-          These drivers will make use of the Devicescape ieee80211 stack.
+          These drivers will make use of the mac80211 stack.
 
           When building one of the individual drivers, the rt2x00 library
           will also be created. That library (when the driver is built as
           a module) will be called "rt2x00lib.ko".
 
+if RT2X00
+
 config RT2X00_LIB
         tristate
-        depends on RT2X00
 
 config RT2X00_LIB_PCI
         tristate
-        depends on RT2X00
         select RT2X00_LIB
 
 config RT2X00_LIB_USB
         tristate
-        depends on RT2X00
         select RT2X00_LIB
 
 config RT2X00_LIB_FIRMWARE
         boolean
         depends on RT2X00_LIB
-        select CRC_ITU_T
         select FW_LOADER
 
 config RT2X00_LIB_RFKILL
@@ -37,9 +35,13 @@ config RT2X00_LIB_RFKILL
         select RFKILL
         select INPUT_POLLDEV
 
+config RT2X00_LIB_LEDS
+        boolean
+        depends on RT2X00_LIB
+
 config RT2400PCI
         tristate "Ralink rt2400 pci/pcmcia support"
-        depends on RT2X00 && PCI
+        depends on PCI
         select RT2X00_LIB_PCI
         select EEPROM_93CX6
         ---help---
@@ -56,9 +58,16 @@ config RT2400PCI_RFKILL
           hardware button to control the radio state.
           This feature depends on the RF switch subsystem rfkill.
 
+config RT2400PCI_LEDS
+        bool "RT2400 leds support"
+        depends on RT2400PCI && LEDS_CLASS
+        select RT2X00_LIB_LEDS
+        ---help---
+          This adds support for led triggers provided my mac80211.
+
 config RT2500PCI
         tristate "Ralink rt2500 pci/pcmcia support"
-        depends on RT2X00 && PCI
+        depends on PCI
         select RT2X00_LIB_PCI
         select EEPROM_93CX6
         ---help---
@@ -75,11 +84,19 @@ config RT2500PCI_RFKILL
           hardware button to control the radio state.
           This feature depends on the RF switch subsystem rfkill.
 
+config RT2500PCI_LEDS
+        bool "RT2500 leds support"
+        depends on RT2500PCI && LEDS_CLASS
+        select RT2X00_LIB_LEDS
+        ---help---
+          This adds support for led triggers provided my mac80211.
+
 config RT61PCI
         tristate "Ralink rt61 pci/pcmcia support"
-        depends on RT2X00 && PCI
+        depends on PCI
         select RT2X00_LIB_PCI
         select RT2X00_LIB_FIRMWARE
+        select CRC_ITU_T
         select EEPROM_93CX6
         ---help---
           This is an experimental driver for the Ralink rt61 wireless chip.
@@ -95,25 +112,47 @@ config RT61PCI_RFKILL
           hardware button to control the radio state.
           This feature depends on the RF switch subsystem rfkill.
 
+config RT61PCI_LEDS
+        bool "RT61 leds support"
+        depends on RT61PCI && LEDS_CLASS
+        select RT2X00_LIB_LEDS
+        ---help---
+          This adds support for led triggers provided my mac80211.
+
 config RT2500USB
         tristate "Ralink rt2500 usb support"
-        depends on RT2X00 && USB
+        depends on USB
         select RT2X00_LIB_USB
         ---help---
           This is an experimental driver for the Ralink rt2500 wireless chip.
 
           When compiled as a module, this driver will be called "rt2500usb.ko".
 
+config RT2500USB_LEDS
+        bool "RT2500 leds support"
+        depends on RT2500USB && LEDS_CLASS
+        select RT2X00_LIB_LEDS
+        ---help---
+          This adds support for led triggers provided my mac80211.
+
 config RT73USB
         tristate "Ralink rt73 usb support"
-        depends on RT2X00 && USB
+        depends on USB
         select RT2X00_LIB_USB
         select RT2X00_LIB_FIRMWARE
+        select CRC_ITU_T
         ---help---
           This is an experimental driver for the Ralink rt73 wireless chip.
 
           When compiled as a module, this driver will be called "rt73usb.ko".
 
+config RT73USB_LEDS
+        bool "RT73 leds support"
+        depends on RT73USB && LEDS_CLASS
+        select RT2X00_LIB_LEDS
+        ---help---
+          This adds support for led triggers provided my mac80211.
+
 config RT2X00_LIB_DEBUGFS
         bool "Ralink debugfs support"
         depends on RT2X00_LIB && MAC80211_DEBUGFS
@@ -128,3 +167,4 @@ config RT2X00_DEBUG
         ---help---
           Enable debugging output for all rt2x00 modules
 
+endif
diff --git a/drivers/net/wireless/rt2x00/Makefile b/drivers/net/wireless/rt2x00/Makefile
index 30d654a42eea..1087dbcf1a04 100644
--- a/drivers/net/wireless/rt2x00/Makefile
+++ b/drivers/net/wireless/rt2x00/Makefile
@@ -1,22 +1,17 @@
-rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00config.o
+rt2x00lib-y                             += rt2x00dev.o
+rt2x00lib-y                             += rt2x00mac.o
+rt2x00lib-y                             += rt2x00config.o
+rt2x00lib-y                             += rt2x00queue.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_DEBUGFS)  += rt2x00debug.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_RFKILL)   += rt2x00rfkill.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_FIRMWARE) += rt2x00firmware.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_LEDS)     += rt2x00leds.o
 
-ifeq ($(CONFIG_RT2X00_LIB_DEBUGFS),y)
-        rt2x00lib-objs += rt2x00debug.o
-endif
-
-ifeq ($(CONFIG_RT2X00_LIB_RFKILL),y)
-        rt2x00lib-objs += rt2x00rfkill.o
-endif
-
-ifeq ($(CONFIG_RT2X00_LIB_FIRMWARE),y)
-        rt2x00lib-objs += rt2x00firmware.o
-endif
-
-obj-$(CONFIG_RT2X00_LIB)        += rt2x00lib.o
-obj-$(CONFIG_RT2X00_LIB_PCI)    += rt2x00pci.o
-obj-$(CONFIG_RT2X00_LIB_USB)    += rt2x00usb.o
-obj-$(CONFIG_RT2400PCI)         += rt2400pci.o
-obj-$(CONFIG_RT2500PCI)         += rt2500pci.o
-obj-$(CONFIG_RT61PCI)           += rt61pci.o
-obj-$(CONFIG_RT2500USB)         += rt2500usb.o
-obj-$(CONFIG_RT73USB)           += rt73usb.o
+obj-$(CONFIG_RT2X00_LIB)                += rt2x00lib.o
+obj-$(CONFIG_RT2X00_LIB_PCI)            += rt2x00pci.o
+obj-$(CONFIG_RT2X00_LIB_USB)            += rt2x00usb.o
+obj-$(CONFIG_RT2400PCI)                 += rt2400pci.o
+obj-$(CONFIG_RT2500PCI)                 += rt2500pci.o
+obj-$(CONFIG_RT61PCI)                   += rt61pci.o
+obj-$(CONFIG_RT2500USB)                 += rt2500usb.o
+obj-$(CONFIG_RT73USB)                   += rt73usb.o
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index c69f85ed7669..b41187af1306 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -243,53 +243,109 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 #define rt2400pci_rfkill_poll   NULL
 #endif /* CONFIG_RT2400PCI_RFKILL */
 
-/*
- * Configuration handlers.
- */
-static void rt2400pci_config_mac_addr(struct rt2x00_dev *rt2x00dev,
-                                      __le32 *mac)
+#ifdef CONFIG_RT2400PCI_LEDS
+static void rt2400pci_brightness_set(struct led_classdev *led_cdev,
+                                     enum led_brightness brightness)
 {
-        rt2x00pci_register_multiwrite(rt2x00dev, CSR3, mac,
-                                      (2 * sizeof(__le32)));
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        unsigned int enabled = brightness != LED_OFF;
+        u32 reg;
+
+        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+
+        if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)
+                rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);
+        else if (led->type == LED_TYPE_ACTIVITY)
+                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);
+
+        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
 }
 
-static void rt2400pci_config_bssid(struct rt2x00_dev *rt2x00dev,
-                                   __le32 *bssid)
+static int rt2400pci_blink_set(struct led_classdev *led_cdev,
+                               unsigned long *delay_on,
+                               unsigned long *delay_off)
 {
-        rt2x00pci_register_multiwrite(rt2x00dev, CSR5, bssid,
-                                      (2 * sizeof(__le32)));
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        u32 reg;
+
+        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+        rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);
+        rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);
+        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+
+        return 0;
 }
+#endif /* CONFIG_RT2400PCI_LEDS */
 
-static void rt2400pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
-                                  const int tsf_sync)
+/*
+ * Configuration handlers.
+ */
+static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev,
+                                    const unsigned int filter_flags)
 {
         u32 reg;
 
-        rt2x00pci_register_write(rt2x00dev, CSR14, 0);
-
         /*
-         * Enable beacon config
+         * Start configuration steps.
+         * Note that the version error will always be dropped
+         * since there is no filter for it at this time.
          */
-        rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
-        rt2x00_set_field32(&reg, BCNCSR1_PRELOAD,
-                           PREAMBLE + get_duration(IEEE80211_HEADER, 20));
-        rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
+        rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+        rt2x00_set_field32(&reg, RXCSR0_DROP_CRC,
+                           !(filter_flags & FIF_FCSFAIL));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_PHYSICAL,
+                           !(filter_flags & FIF_PLCPFAIL));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,
+                           !(filter_flags & FIF_CONTROL));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
+                           !(filter_flags & FIF_PROMISC_IN_BSS));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
+        rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
+        rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+}
 
-        /*
-         * Enable synchronisation.
-         */
-        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
-        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
-        rt2x00_set_field32(&reg, CSR14_TBCN, (tsf_sync == TSF_SYNC_BEACON));
-        rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
-        rt2x00_set_field32(&reg, CSR14_TSF_SYNC, tsf_sync);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+static void rt2400pci_config_intf(struct rt2x00_dev *rt2x00dev,
+                                  struct rt2x00_intf *intf,
+                                  struct rt2x00intf_conf *conf,
+                                  const unsigned int flags)
+{
+        unsigned int bcn_preload;
+        u32 reg;
+
+        if (flags & CONFIG_UPDATE_TYPE) {
+                /*
+                 * Enable beacon config
+                 */
+                bcn_preload = PREAMBLE + get_duration(IEEE80211_HEADER, 20);
+                rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
+                rt2x00_set_field32(&reg, BCNCSR1_PRELOAD, bcn_preload);
+                rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
+
+                /*
+                 * Enable synchronisation.
+                 */
+                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
+                rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);
+                rt2x00_set_field32(&reg, CSR14_TBCN, 1);
+                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        }
+
+        if (flags & CONFIG_UPDATE_MAC)
+                rt2x00pci_register_multiwrite(rt2x00dev, CSR3,
+                                              conf->mac, sizeof(conf->mac));
+
+        if (flags & CONFIG_UPDATE_BSSID)
+                rt2x00pci_register_multiwrite(rt2x00dev, CSR5,
+                                              conf->bssid, sizeof(conf->bssid));
 }
 
-static void rt2400pci_config_preamble(struct rt2x00_dev *rt2x00dev,
-                                      const int short_preamble,
-                                      const int ack_timeout,
-                                      const int ack_consume_time)
+static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev,
+                                 struct rt2x00lib_erp *erp)
 {
         int preamble_mask;
         u32 reg;
@@ -297,11 +353,13 @@ static void rt2400pci_config_preamble(struct rt2x00_dev *rt2x00dev,
         /*
          * When short preamble is enabled, we should set bit 0x08
          */
-        preamble_mask = short_preamble << 3;
+        preamble_mask = erp->short_preamble << 3;
 
         rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);
-        rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT, ack_timeout);
-        rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME, ack_consume_time);
+        rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT,
+                           erp->ack_timeout);
+        rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME,
+                           erp->ack_consume_time);
         rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);
 
         rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
@@ -397,6 +455,13 @@ static void rt2400pci_config_antenna(struct rt2x00_dev *rt2x00dev,
         u8 r1;
         u8 r4;
 
+        /*
+         * We should never come here because rt2x00lib is supposed
+         * to catch this and send us the correct antenna explicitely.
+         */
+        BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
+               ant->tx == ANTENNA_SW_DIVERSITY);
+
         rt2400pci_bbp_read(rt2x00dev, 4, &r4);
         rt2400pci_bbp_read(rt2x00dev, 1, &r1);
 
@@ -410,14 +475,8 @@ static void rt2400pci_config_antenna(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_A:
                 rt2x00_set_field8(&r1, BBP_R1_TX_ANTENNA, 0);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r1, BBP_R1_TX_ANTENNA, 2);
                 break;
         }
@@ -432,14 +491,8 @@ static void rt2400pci_config_antenna(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_A:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 0);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
                 break;
         }
@@ -481,8 +534,8 @@ static void rt2400pci_config_duration(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2400pci_config(struct rt2x00_dev *rt2x00dev,
-                             const unsigned int flags,
-                             struct rt2x00lib_conf *libconf)
+                             struct rt2x00lib_conf *libconf,
+                             const unsigned int flags)
 {
         if (flags & CONFIG_UPDATE_PHYMODE)
                 rt2400pci_config_phymode(rt2x00dev, libconf->basic_rates);
@@ -498,45 +551,17 @@ static void rt2400pci_config(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2400pci_config_cw(struct rt2x00_dev *rt2x00dev,
-                                struct ieee80211_tx_queue_params *params)
+                                const int cw_min, const int cw_max)
 {
         u32 reg;
 
         rt2x00pci_register_read(rt2x00dev, CSR11, &reg);
-        rt2x00_set_field32(&reg, CSR11_CWMIN, params->cw_min);
-        rt2x00_set_field32(&reg, CSR11_CWMAX, params->cw_max);
+        rt2x00_set_field32(&reg, CSR11_CWMIN, cw_min);
+        rt2x00_set_field32(&reg, CSR11_CWMAX, cw_max);
         rt2x00pci_register_write(rt2x00dev, CSR11, reg);
 }
 
 /*
- * LED functions.
- */
-static void rt2400pci_enable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-
-        rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-
-        rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);
-        rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);
-        rt2x00_set_field32(&reg, LEDCSR_LINK,
-                           (rt2x00dev->led_mode != LED_MODE_ASUS));
-        rt2x00_set_field32(&reg, LEDCSR_ACTIVITY,
-                           (rt2x00dev->led_mode != LED_MODE_TXRX_ACTIVITY));
-        rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
-}
-
-static void rt2400pci_disable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-
-        rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-        rt2x00_set_field32(&reg, LEDCSR_LINK, 0);
-        rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, 0);
-        rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
-}
-
-/*
  * Link tuning
  */
 static void rt2400pci_link_stats(struct rt2x00_dev *rt2x00dev,
@@ -593,90 +618,94 @@ static void rt2400pci_link_tuner(struct rt2x00_dev *rt2x00dev)
  * Initialization functions.
  */
 static void rt2400pci_init_rxentry(struct rt2x00_dev *rt2x00dev,
-                                   struct data_entry *entry)
+                                   struct queue_entry *entry)
 {
-        __le32 *rxd = entry->priv;
+        struct queue_entry_priv_pci_rx *priv_rx = entry->priv_data;
         u32 word;
 
-        rt2x00_desc_read(rxd, 2, &word);
-        rt2x00_set_field32(&word, RXD_W2_BUFFER_LENGTH, entry->ring->data_size);
-        rt2x00_desc_write(rxd, 2, word);
+        rt2x00_desc_read(priv_rx->desc, 2, &word);
+        rt2x00_set_field32(&word, RXD_W2_BUFFER_LENGTH,
+                           entry->queue->data_size);
+        rt2x00_desc_write(priv_rx->desc, 2, word);
 
-        rt2x00_desc_read(rxd, 1, &word);
-        rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, entry->data_dma);
-        rt2x00_desc_write(rxd, 1, word);
+        rt2x00_desc_read(priv_rx->desc, 1, &word);
+        rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, priv_rx->data_dma);
+        rt2x00_desc_write(priv_rx->desc, 1, word);
 
-        rt2x00_desc_read(rxd, 0, &word);
+        rt2x00_desc_read(priv_rx->desc, 0, &word);
         rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
-        rt2x00_desc_write(rxd, 0, word);
+        rt2x00_desc_write(priv_rx->desc, 0, word);
 }
 
 static void rt2400pci_init_txentry(struct rt2x00_dev *rt2x00dev,
-                                   struct data_entry *entry)
+                                   struct queue_entry *entry)
 {
-        __le32 *txd = entry->priv;
+        struct queue_entry_priv_pci_tx *priv_tx = entry->priv_data;
         u32 word;
 
-        rt2x00_desc_read(txd, 1, &word);
-        rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, entry->data_dma);
-        rt2x00_desc_write(txd, 1, word);
+        rt2x00_desc_read(priv_tx->desc, 1, &word);
+        rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, priv_tx->data_dma);
+        rt2x00_desc_write(priv_tx->desc, 1, word);
 
-        rt2x00_desc_read(txd, 2, &word);
-        rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH, entry->ring->data_size);
-        rt2x00_desc_write(txd, 2, word);
+        rt2x00_desc_read(priv_tx->desc, 2, &word);
+        rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH,
+                           entry->queue->data_size);
+        rt2x00_desc_write(priv_tx->desc, 2, word);
 
-        rt2x00_desc_read(txd, 0, &word);
+        rt2x00_desc_read(priv_tx->desc, 0, &word);
         rt2x00_set_field32(&word, TXD_W0_VALID, 0);
         rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
-        rt2x00_desc_write(txd, 0, word);
+        rt2x00_desc_write(priv_tx->desc, 0, word);
 }
 
-static int rt2400pci_init_rings(struct rt2x00_dev *rt2x00dev)
+static int rt2400pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
+        struct queue_entry_priv_pci_rx *priv_rx;
+        struct queue_entry_priv_pci_tx *priv_tx;
         u32 reg;
 
         /*
          * Initialize registers.
          */
         rt2x00pci_register_read(rt2x00dev, TXCSR2, &reg);
-        rt2x00_set_field32(&reg, TXCSR2_TXD_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].desc_size);
-        rt2x00_set_field32(&reg, TXCSR2_NUM_TXD,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA1].stats.limit);
-        rt2x00_set_field32(&reg, TXCSR2_NUM_ATIM,
-                           rt2x00dev->bcn[1].stats.limit);
-        rt2x00_set_field32(&reg, TXCSR2_NUM_PRIO,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].stats.limit);
+        rt2x00_set_field32(&reg, TXCSR2_TXD_SIZE, rt2x00dev->tx[0].desc_size);
+        rt2x00_set_field32(&reg, TXCSR2_NUM_TXD, rt2x00dev->tx[1].limit);
+        rt2x00_set_field32(&reg, TXCSR2_NUM_ATIM, rt2x00dev->bcn[1].limit);
+        rt2x00_set_field32(&reg, TXCSR2_NUM_PRIO, rt2x00dev->tx[0].limit);
         rt2x00pci_register_write(rt2x00dev, TXCSR2, reg);
 
+        priv_tx = rt2x00dev->tx[1].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR3, &reg);
         rt2x00_set_field32(&reg, TXCSR3_TX_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA1].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR3, reg);
 
+        priv_tx = rt2x00dev->tx[0].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR5, &reg);
         rt2x00_set_field32(&reg, TXCSR5_PRIO_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR5, reg);
 
+        priv_tx = rt2x00dev->bcn[1].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR4, &reg);
         rt2x00_set_field32(&reg, TXCSR4_ATIM_RING_REGISTER,
-                           rt2x00dev->bcn[1].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR4, reg);
 
+        priv_tx = rt2x00dev->bcn[0].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR6, &reg);
         rt2x00_set_field32(&reg, TXCSR6_BEACON_RING_REGISTER,
-                           rt2x00dev->bcn[0].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR6, reg);
 
         rt2x00pci_register_read(rt2x00dev, RXCSR1, &reg);
         rt2x00_set_field32(&reg, RXCSR1_RXD_SIZE, rt2x00dev->rx->desc_size);
-        rt2x00_set_field32(&reg, RXCSR1_NUM_RXD, rt2x00dev->rx->stats.limit);
+        rt2x00_set_field32(&reg, RXCSR1_NUM_RXD, rt2x00dev->rx->limit);
         rt2x00pci_register_write(rt2x00dev, RXCSR1, reg);
 
+        priv_rx = rt2x00dev->rx->entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, RXCSR2, &reg);
-        rt2x00_set_field32(&reg, RXCSR2_RX_RING_REGISTER,
-                           rt2x00dev->rx->data_dma);
+        rt2x00_set_field32(&reg, RXCSR2_RX_RING_REGISTER, priv_rx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, RXCSR2, reg);
 
         return 0;
@@ -795,19 +824,15 @@ continue_csr_init:
         rt2400pci_bbp_write(rt2x00dev, 30, 0x21);
         rt2400pci_bbp_write(rt2x00dev, 31, 0x00);
 
-        DEBUG(rt2x00dev, "Start initialization from EEPROM...\n");
         for (i = 0; i < EEPROM_BBP_SIZE; i++) {
                 rt2x00_eeprom_read(rt2x00dev, EEPROM_BBP_START + i, &eeprom);
 
                 if (eeprom != 0xffff && eeprom != 0x0000) {
                         reg_id = rt2x00_get_field16(eeprom, EEPROM_BBP_REG_ID);
                         value = rt2x00_get_field16(eeprom, EEPROM_BBP_VALUE);
-                        DEBUG(rt2x00dev, "BBP: 0x%02x, value: 0x%02x.\n",
-                              reg_id, value);
                         rt2400pci_bbp_write(rt2x00dev, reg_id, value);
                 }
         }
-        DEBUG(rt2x00dev, "...End initialization from EEPROM.\n");
 
         return 0;
 }
@@ -859,7 +884,7 @@ static int rt2400pci_enable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize all registers.
          */
-        if (rt2400pci_init_rings(rt2x00dev) ||
+        if (rt2400pci_init_queues(rt2x00dev) ||
             rt2400pci_init_registers(rt2x00dev) ||
             rt2400pci_init_bbp(rt2x00dev)) {
                 ERROR(rt2x00dev, "Register initialization failed.\n");
@@ -871,11 +896,6 @@ static int rt2400pci_enable_radio(struct rt2x00_dev *rt2x00dev)
          */
         rt2400pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_ON);
 
-        /*
-         * Enable LED
-         */
-        rt2400pci_enable_led(rt2x00dev);
-
         return 0;
 }
 
@@ -883,11 +903,6 @@ static void rt2400pci_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        /*
-         * Disable LED
-         */
-        rt2400pci_disable_led(rt2x00dev);
-
         rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);
 
         /*
@@ -986,10 +1001,10 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev,
  */
 static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                     struct sk_buff *skb,
-                                    struct txdata_entry_desc *desc,
+                                    struct txentry_desc *txdesc,
                                     struct ieee80211_tx_control *control)
 {
-        struct skb_desc *skbdesc = get_skb_desc(skb);
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
         __le32 *txd = skbdesc->desc;
         u32 word;
 
@@ -1001,19 +1016,19 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         rt2x00_desc_write(txd, 2, word);
 
         rt2x00_desc_read(txd, 3, &word);
-        rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, desc->signal);
+        rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, txdesc->signal);
         rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL_REGNUM, 5);
         rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL_BUSY, 1);
-        rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, desc->service);
+        rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, txdesc->service);
         rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE_REGNUM, 6);
         rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE_BUSY, 1);
         rt2x00_desc_write(txd, 3, word);
 
         rt2x00_desc_read(txd, 4, &word);
-        rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_LOW, desc->length_low);
+        rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_LOW, txdesc->length_low);
         rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW_REGNUM, 8);
         rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW_BUSY, 1);
-        rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_HIGH, desc->length_high);
+        rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_HIGH, txdesc->length_high);
         rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH_REGNUM, 7);
         rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH_BUSY, 1);
         rt2x00_desc_write(txd, 4, word);
@@ -1022,14 +1037,14 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 1);
         rt2x00_set_field32(&word, TXD_W0_VALID, 1);
         rt2x00_set_field32(&word, TXD_W0_MORE_FRAG,
-                           test_bit(ENTRY_TXD_MORE_FRAG, &desc->flags));
+                           test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_ACK,
-                           test_bit(ENTRY_TXD_ACK, &desc->flags));
+                           test_bit(ENTRY_TXD_ACK, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_TIMESTAMP,
-                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &desc->flags));
+                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_RTS,
-                           test_bit(ENTRY_TXD_RTS_FRAME, &desc->flags));
-        rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+                           test_bit(ENTRY_TXD_RTS_FRAME, &txdesc->flags));
+        rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
         rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
                            !!(control->flags &
                               IEEE80211_TXCTL_LONG_RETRY_LIMIT));
@@ -1040,13 +1055,15 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
  * TX data initialization
  */
 static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
-                                    unsigned int queue)
+                                    const unsigned int queue)
 {
         u32 reg;
 
-        if (queue == IEEE80211_TX_QUEUE_BEACON) {
+        if (queue == RT2X00_BCN_QUEUE_BEACON) {
                 rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
                 if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) {
+                        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
+                        rt2x00_set_field32(&reg, CSR14_TBCN, 1);
                         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
                         rt2x00pci_register_write(rt2x00dev, CSR14, reg);
                 }
@@ -1059,56 +1076,62 @@ static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, TXCSR0_KICK_TX,
                            (queue == IEEE80211_TX_QUEUE_DATA1));
         rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM,
-                           (queue == IEEE80211_TX_QUEUE_AFTER_BEACON));
+                           (queue == RT2X00_BCN_QUEUE_ATIM));
         rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
 }
 
 /*
  * RX control handlers
  */
-static void rt2400pci_fill_rxdone(struct data_entry *entry,
-                                  struct rxdata_entry_desc *desc)
+static void rt2400pci_fill_rxdone(struct queue_entry *entry,
+                                  struct rxdone_entry_desc *rxdesc)
 {
-        __le32 *rxd = entry->priv;
+        struct queue_entry_priv_pci_rx *priv_rx = entry->priv_data;
         u32 word0;
         u32 word2;
+        u32 word3;
 
-        rt2x00_desc_read(rxd, 0, &word0);
-        rt2x00_desc_read(rxd, 2, &word2);
+        rt2x00_desc_read(priv_rx->desc, 0, &word0);
+        rt2x00_desc_read(priv_rx->desc, 2, &word2);
+        rt2x00_desc_read(priv_rx->desc, 3, &word3);
 
-        desc->flags = 0;
+        rxdesc->flags = 0;
         if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
-                desc->flags |= RX_FLAG_FAILED_FCS_CRC;
+                rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
         if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
-                desc->flags |= RX_FLAG_FAILED_PLCP_CRC;
+                rxdesc->flags |= RX_FLAG_FAILED_PLCP_CRC;
 
         /*
          * Obtain the status about this packet.
+         * The signal is the PLCP value, and needs to be stripped
+         * of the preamble bit (0x08).
          */
-        desc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL);
-        desc->rssi = rt2x00_get_field32(word2, RXD_W2_RSSI) -
-            entry->ring->rt2x00dev->rssi_offset;
-        desc->ofdm = 0;
-        desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
-        desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
+        rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL) & ~0x08;
+        rxdesc->rssi = rt2x00_get_field32(word2, RXD_W3_RSSI) -
+            entry->queue->rt2x00dev->rssi_offset;
+        rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+
+        rxdesc->dev_flags = RXDONE_SIGNAL_PLCP;
+        if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
+                rxdesc->dev_flags |= RXDONE_MY_BSS;
 }
 
 /*
  * Interrupt functions.
  */
-static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev, const int queue)
+static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev,
+                             const enum ieee80211_tx_queue queue_idx)
 {
-        struct data_ring *ring = rt2x00lib_get_ring(rt2x00dev, queue);
-        struct data_entry *entry;
-        __le32 *txd;
+        struct data_queue *queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);
+        struct queue_entry_priv_pci_tx *priv_tx;
+        struct queue_entry *entry;
+        struct txdone_entry_desc txdesc;
         u32 word;
-        int tx_status;
-        int retry;
 
-        while (!rt2x00_ring_empty(ring)) {
-                entry = rt2x00_get_data_entry_done(ring);
-                txd = entry->priv;
-                rt2x00_desc_read(txd, 0, &word);
+        while (!rt2x00queue_empty(queue)) {
+                entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
+                priv_tx = entry->priv_data;
+                rt2x00_desc_read(priv_tx->desc, 0, &word);
 
                 if (rt2x00_get_field32(word, TXD_W0_OWNER_NIC) ||
                     !rt2x00_get_field32(word, TXD_W0_VALID))
@@ -1117,10 +1140,10 @@ static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev, const int queue)
                 /*
                  * Obtain the status about this packet.
                  */
-                tx_status = rt2x00_get_field32(word, TXD_W0_RESULT);
-                retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);
+                txdesc.status = rt2x00_get_field32(word, TXD_W0_RESULT);
+                txdesc.retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);
 
-                rt2x00pci_txdone(rt2x00dev, entry, tx_status, retry);
+                rt2x00pci_txdone(rt2x00dev, entry, &txdesc);
         }
 }
 
@@ -1164,7 +1187,7 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
          * 3 - Atim ring transmit done interrupt.
          */
         if (rt2x00_get_field32(reg, CSR7_TXDONE_ATIMRING))
-                rt2400pci_txdone(rt2x00dev, IEEE80211_TX_QUEUE_AFTER_BEACON);
+                rt2400pci_txdone(rt2x00dev, RT2X00_BCN_QUEUE_ATIM);
 
         /*
          * 4 - Priority ring transmit done interrupt.
@@ -1272,8 +1295,27 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Store led mode, for correct led behaviour.
          */
-        rt2x00dev->led_mode =
-            rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
+#ifdef CONFIG_RT2400PCI_LEDS
+        value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
+
+        rt2x00dev->led_radio.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_radio.type = LED_TYPE_RADIO;
+        rt2x00dev->led_radio.led_dev.brightness_set =
+            rt2400pci_brightness_set;
+        rt2x00dev->led_radio.led_dev.blink_set =
+            rt2400pci_blink_set;
+        rt2x00dev->led_radio.flags = LED_INITIALIZED;
+
+        if (value == LED_MODE_TXRX_ACTIVITY) {
+                rt2x00dev->led_qual.rt2x00dev = rt2x00dev;
+                rt2x00dev->led_radio.type = LED_TYPE_ACTIVITY;
+                rt2x00dev->led_qual.led_dev.brightness_set =
+                    rt2400pci_brightness_set;
+                rt2x00dev->led_qual.led_dev.blink_set =
+                    rt2400pci_blink_set;
+                rt2x00dev->led_qual.flags = LED_INITIALIZED;
+        }
+#endif /* CONFIG_RT2400PCI_LEDS */
 
         /*
          * Detect if this device has an hardware controlled radio.
@@ -1343,8 +1385,8 @@ static void rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize hw_mode information.
          */
-        spec->num_modes = 1;
-        spec->num_rates = 4;
+        spec->supported_bands = SUPPORT_BAND_2GHZ;
+        spec->supported_rates = SUPPORT_RATE_CCK;
         spec->tx_power_a = NULL;
         spec->tx_power_bg = txpower;
         spec->tx_power_default = DEFAULT_TXPOWER;
@@ -1374,9 +1416,9 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         rt2400pci_probe_hw_mode(rt2x00dev);
 
         /*
-         * This device requires the beacon ring
+         * This device requires the atim queue
          */
-        __set_bit(DRIVER_REQUIRE_BEACON_RING, &rt2x00dev->flags);
+        __set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -1389,64 +1431,6 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev)
 /*
  * IEEE80211 stack callback functions.
  */
-static void rt2400pci_configure_filter(struct ieee80211_hw *hw,
-                                       unsigned int changed_flags,
-                                       unsigned int *total_flags,
-                                       int mc_count,
-                                       struct dev_addr_list *mc_list)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-        u32 reg;
-
-        /*
-         * Mask off any flags we are going to ignore from
-         * the total_flags field.
-         */
-        *total_flags &=
-            FIF_ALLMULTI |
-            FIF_FCSFAIL |
-            FIF_PLCPFAIL |
-            FIF_CONTROL |
-            FIF_OTHER_BSS |
-            FIF_PROMISC_IN_BSS;
-
-        /*
-         * Apply some rules to the filters:
-         * - Some filters imply different filters to be set.
-         * - Some things we can't filter out at all.
-         */
-        *total_flags |= FIF_ALLMULTI;
-        if (*total_flags & FIF_OTHER_BSS ||
-            *total_flags & FIF_PROMISC_IN_BSS)
-                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-
-        /*
-         * Check if there is any work left for us.
-         */
-        if (rt2x00dev->packet_filter == *total_flags)
-                return;
-        rt2x00dev->packet_filter = *total_flags;
-
-        /*
-         * Start configuration steps.
-         * Note that the version error will always be dropped
-         * since there is no filter for it at this time.
-         */
-        rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
-        rt2x00_set_field32(&reg, RXCSR0_DROP_CRC,
-                           !(*total_flags & FIF_FCSFAIL));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_PHYSICAL,
-                           !(*total_flags & FIF_PLCPFAIL));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,
-                           !(*total_flags & FIF_CONTROL));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
-        rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
-}
-
 static int rt2400pci_set_retry_limit(struct ieee80211_hw *hw,
                                      u32 short_retry, u32 long_retry)
 {
@@ -1481,7 +1465,8 @@ static int rt2400pci_conf_tx(struct ieee80211_hw *hw,
         /*
          * Write configuration to register.
          */
-        rt2400pci_config_cw(rt2x00dev, &rt2x00dev->tx->tx_params);
+        rt2400pci_config_cw(rt2x00dev,
+                            rt2x00dev->tx->cw_min, rt2x00dev->tx->cw_max);
 
         return 0;
 }
@@ -1500,12 +1485,58 @@ static u64 rt2400pci_get_tsf(struct ieee80211_hw *hw)
         return tsf;
 }
 
-static void rt2400pci_reset_tsf(struct ieee80211_hw *hw)
+static int rt2400pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
+                                   struct ieee80211_tx_control *control)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
+        struct rt2x00_intf *intf = vif_to_intf(control->vif);
+        struct queue_entry_priv_pci_tx *priv_tx;
+        struct skb_frame_desc *skbdesc;
+        u32 reg;
+
+        if (unlikely(!intf->beacon))
+                return -ENOBUFS;
+        priv_tx = intf->beacon->priv_data;
 
-        rt2x00pci_register_write(rt2x00dev, CSR16, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR17, 0);
+        /*
+         * Fill in skb descriptor
+         */
+        skbdesc = get_skb_frame_desc(skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
+        skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
+        skbdesc->data = skb->data;
+        skbdesc->data_len = skb->len;
+        skbdesc->desc = priv_tx->desc;
+        skbdesc->desc_len = intf->beacon->queue->desc_size;
+        skbdesc->entry = intf->beacon;
+
+        /*
+         * Disable beaconing while we are reloading the beacon data,
+         * otherwise we might be sending out invalid data.
+         */
+        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
+        rt2x00_set_field32(&reg, CSR14_TBCN, 0);
+        rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
+        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+
+        /*
+         * mac80211 doesn't provide the control->queue variable
+         * for beacons. Set our own queue identification so
+         * it can be used during descriptor initialization.
+         */
+        control->queue = RT2X00_BCN_QUEUE_BEACON;
+        rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
+
+        /*
+         * Enable beacon generation.
+         * Write entire beacon with descriptor to register,
+         * and kick the beacon generator.
+         */
+        memcpy(priv_tx->data, skb->data, skb->len);
+        rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, control->queue);
+
+        return 0;
 }
 
 static int rt2400pci_tx_last_beacon(struct ieee80211_hw *hw)
@@ -1525,15 +1556,14 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .config_interface       = rt2x00mac_config_interface,
-        .configure_filter       = rt2400pci_configure_filter,
+        .configure_filter       = rt2x00mac_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt2400pci_set_retry_limit,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2400pci_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt2400pci_get_tsf,
-        .reset_tsf              = rt2400pci_reset_tsf,
-        .beacon_update          = rt2x00pci_beacon_update,
+        .beacon_update          = rt2400pci_beacon_update,
         .tx_last_beacon         = rt2400pci_tx_last_beacon,
 };
 
@@ -1553,19 +1583,50 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
         .write_tx_data          = rt2x00pci_write_tx_data,
         .kick_tx_queue          = rt2400pci_kick_tx_queue,
         .fill_rxdone            = rt2400pci_fill_rxdone,
-        .config_mac_addr        = rt2400pci_config_mac_addr,
-        .config_bssid           = rt2400pci_config_bssid,
-        .config_type            = rt2400pci_config_type,
-        .config_preamble        = rt2400pci_config_preamble,
+        .config_filter          = rt2400pci_config_filter,
+        .config_intf            = rt2400pci_config_intf,
+        .config_erp             = rt2400pci_config_erp,
         .config                 = rt2400pci_config,
 };
 
+static const struct data_queue_desc rt2400pci_queue_rx = {
+        .entry_num              = RX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = RXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_rx),
+};
+
+static const struct data_queue_desc rt2400pci_queue_tx = {
+        .entry_num              = TX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
+static const struct data_queue_desc rt2400pci_queue_bcn = {
+        .entry_num              = BEACON_ENTRIES,
+        .data_size              = MGMT_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
+static const struct data_queue_desc rt2400pci_queue_atim = {
+        .entry_num              = ATIM_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
 static const struct rt2x00_ops rt2400pci_ops = {
         .name           = KBUILD_MODNAME,
-        .rxd_size       = RXD_DESC_SIZE,
-        .txd_size       = TXD_DESC_SIZE,
+        .max_sta_intf   = 1,
+        .max_ap_intf    = 1,
         .eeprom_size    = EEPROM_SIZE,
         .rf_size        = RF_SIZE,
+        .rx             = &rt2400pci_queue_rx,
+        .tx             = &rt2400pci_queue_tx,
+        .bcn            = &rt2400pci_queue_bcn,
+        .atim           = &rt2400pci_queue_atim,
         .lib            = &rt2400pci_rt2x00_ops,
         .hw             = &rt2400pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h
index 369aac6d0336..a5210f9a3360 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.h
+++ b/drivers/net/wireless/rt2x00/rt2400pci.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -899,13 +899,13 @@
  * Word2
  */
 #define RXD_W2_BUFFER_LENGTH            FIELD32(0x0000ffff)
-#define RXD_W2_SIGNAL                   FIELD32(0x00ff0000)
-#define RXD_W2_RSSI                     FIELD32(0xff000000)
+#define RXD_W2_BBR0                     FIELD32(0x00ff0000)
+#define RXD_W2_SIGNAL                   FIELD32(0xff000000)
 
 /*
  * Word3
  */
-#define RXD_W3_BBR2                     FIELD32(0x000000ff)
+#define RXD_W3_RSSI                     FIELD32(0x000000ff)
 #define RXD_W3_BBR3                     FIELD32(0x0000ff00)
 #define RXD_W3_BBR4                     FIELD32(0x00ff0000)
 #define RXD_W3_BBR5                     FIELD32(0xff000000)
@@ -923,13 +923,13 @@
 #define RXD_W7_RESERVED                 FIELD32(0xffffffff)
 
 /*
- * Macro's for converting txpower from EEPROM to dscape value
- * and from dscape value to register value.
+ * Macro's for converting txpower from EEPROM to mac80211 value
+ * and from mac80211 value to register value.
  * NOTE: Logics in rt2400pci for txpower are reversed
  * compared to the other rt2x00 drivers. A higher txpower
  * value means that the txpower must be lowered. This is
  * important when converting the value coming from the
- * dscape stack to the rt2400 acceptable value.
+ * mac80211 stack to the rt2400 acceptable value.
  */
 #define MIN_TXPOWER     31
 #define MAX_TXPOWER     62
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 91e87b53374f..5ade097ed45e 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -243,57 +243,116 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 #define rt2500pci_rfkill_poll   NULL
 #endif /* CONFIG_RT2500PCI_RFKILL */
 
-/*
- * Configuration handlers.
- */
-static void rt2500pci_config_mac_addr(struct rt2x00_dev *rt2x00dev,
-                                      __le32 *mac)
+#ifdef CONFIG_RT2500PCI_LEDS
+static void rt2500pci_brightness_set(struct led_classdev *led_cdev,
+                                     enum led_brightness brightness)
 {
-        rt2x00pci_register_multiwrite(rt2x00dev, CSR3, mac,
-                                      (2 * sizeof(__le32)));
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        unsigned int enabled = brightness != LED_OFF;
+        u32 reg;
+
+        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+
+        if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)
+                rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);
+        else if (led->type == LED_TYPE_ACTIVITY)
+                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);
+
+        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
 }
 
-static void rt2500pci_config_bssid(struct rt2x00_dev *rt2x00dev,
-                                   __le32 *bssid)
+static int rt2500pci_blink_set(struct led_classdev *led_cdev,
+                               unsigned long *delay_on,
+                               unsigned long *delay_off)
 {
-        rt2x00pci_register_multiwrite(rt2x00dev, CSR5, bssid,
-                                      (2 * sizeof(__le32)));
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        u32 reg;
+
+        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+        rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);
+        rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);
+        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+
+        return 0;
 }
+#endif /* CONFIG_RT2500PCI_LEDS */
 
-static void rt2500pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
-                                  const int tsf_sync)
+/*
+ * Configuration handlers.
+ */
+static void rt2500pci_config_filter(struct rt2x00_dev *rt2x00dev,
+                                    const unsigned int filter_flags)
 {
         u32 reg;
 
-        rt2x00pci_register_write(rt2x00dev, CSR14, 0);
-
         /*
-         * Enable beacon config
+         * Start configuration steps.
+         * Note that the version error will always be dropped
+         * and broadcast frames will always be accepted since
+         * there is no filter for it at this time.
          */
-        rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
-        rt2x00_set_field32(&reg, BCNCSR1_PRELOAD,
-                           PREAMBLE + get_duration(IEEE80211_HEADER, 20));
-        rt2x00_set_field32(&reg, BCNCSR1_BEACON_CWMIN,
-                           rt2x00lib_get_ring(rt2x00dev,
-                                              IEEE80211_TX_QUEUE_BEACON)
-                           ->tx_params.cw_min);
-        rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
+        rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+        rt2x00_set_field32(&reg, RXCSR0_DROP_CRC,
+                           !(filter_flags & FIF_FCSFAIL));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_PHYSICAL,
+                           !(filter_flags & FIF_PLCPFAIL));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,
+                           !(filter_flags & FIF_CONTROL));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
+                           !(filter_flags & FIF_PROMISC_IN_BSS));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
+        rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
+        rt2x00_set_field32(&reg, RXCSR0_DROP_MCAST,
+                           !(filter_flags & FIF_ALLMULTI));
+        rt2x00_set_field32(&reg, RXCSR0_DROP_BCAST, 0);
+        rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+}
 
-        /*
-         * Enable synchronisation.
-         */
-        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
-        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
-        rt2x00_set_field32(&reg, CSR14_TBCN, (tsf_sync == TSF_SYNC_BEACON));
-        rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
-        rt2x00_set_field32(&reg, CSR14_TSF_SYNC, tsf_sync);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+static void rt2500pci_config_intf(struct rt2x00_dev *rt2x00dev,
+                                  struct rt2x00_intf *intf,
+                                  struct rt2x00intf_conf *conf,
+                                  const unsigned int flags)
+{
+        struct data_queue *queue =
+            rt2x00queue_get_queue(rt2x00dev, RT2X00_BCN_QUEUE_BEACON);
+        unsigned int bcn_preload;
+        u32 reg;
+
+        if (flags & CONFIG_UPDATE_TYPE) {
+                /*
+                 * Enable beacon config
+                 */
+                bcn_preload = PREAMBLE + get_duration(IEEE80211_HEADER, 20);
+                rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
+                rt2x00_set_field32(&reg, BCNCSR1_PRELOAD, bcn_preload);
+                rt2x00_set_field32(&reg, BCNCSR1_BEACON_CWMIN, queue->cw_min);
+                rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
+
+                /*
+                 * Enable synchronisation.
+                 */
+                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
+                rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);
+                rt2x00_set_field32(&reg, CSR14_TBCN, 1);
+                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        }
+
+        if (flags & CONFIG_UPDATE_MAC)
+                rt2x00pci_register_multiwrite(rt2x00dev, CSR3,
+                                              conf->mac, sizeof(conf->mac));
+
+        if (flags & CONFIG_UPDATE_BSSID)
+                rt2x00pci_register_multiwrite(rt2x00dev, CSR5,
+                                              conf->bssid, sizeof(conf->bssid));
 }
 
-static void rt2500pci_config_preamble(struct rt2x00_dev *rt2x00dev,
-                                      const int short_preamble,
-                                      const int ack_timeout,
-                                      const int ack_consume_time)
+static void rt2500pci_config_erp(struct rt2x00_dev *rt2x00dev,
+                                 struct rt2x00lib_erp *erp)
 {
         int preamble_mask;
         u32 reg;
@@ -301,11 +360,13 @@ static void rt2500pci_config_preamble(struct rt2x00_dev *rt2x00dev,
         /*
          * When short preamble is enabled, we should set bit 0x08
          */
-        preamble_mask = short_preamble << 3;
+        preamble_mask = erp->short_preamble << 3;
 
         rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);
-        rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT, ack_timeout);
-        rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME, ack_consume_time);
+        rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT,
+                           erp->ack_timeout);
+        rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME,
+                           erp->ack_consume_time);
         rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);
 
         rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
@@ -425,6 +486,13 @@ static void rt2500pci_config_antenna(struct rt2x00_dev *rt2x00dev,
         u8 r14;
         u8 r2;
 
+        /*
+         * We should never come here because rt2x00lib is supposed
+         * to catch this and send us the correct antenna explicitely.
+         */
+        BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
+               ant->tx == ANTENNA_SW_DIVERSITY);
+
         rt2x00pci_register_read(rt2x00dev, BBPCSR1, &reg);
         rt2500pci_bbp_read(rt2x00dev, 14, &r14);
         rt2500pci_bbp_read(rt2x00dev, 2, &r2);
@@ -438,15 +506,8 @@ static void rt2500pci_config_antenna(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBPCSR1_CCK, 0);
                 rt2x00_set_field32(&reg, BBPCSR1_OFDM, 0);
                 break;
-        case ANTENNA_HW_DIVERSITY:
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r2, BBP_R2_TX_ANTENNA, 2);
                 rt2x00_set_field32(&reg, BBPCSR1_CCK, 2);
                 rt2x00_set_field32(&reg, BBPCSR1_OFDM, 2);
@@ -460,15 +521,8 @@ static void rt2500pci_config_antenna(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_A:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 0);
                 break;
-        case ANTENNA_HW_DIVERSITY:
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 2);
                 break;
         }
@@ -530,8 +584,8 @@ static void rt2500pci_config_duration(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2500pci_config(struct rt2x00_dev *rt2x00dev,
-                             const unsigned int flags,
-                             struct rt2x00lib_conf *libconf)
+                             struct rt2x00lib_conf *libconf,
+                             const unsigned int flags)
 {
         if (flags & CONFIG_UPDATE_PHYMODE)
                 rt2500pci_config_phymode(rt2x00dev, libconf->basic_rates);
@@ -548,34 +602,6 @@ static void rt2500pci_config(struct rt2x00_dev *rt2x00dev,
 }
 
 /*
- * LED functions.
- */
-static void rt2500pci_enable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-
-        rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-
-        rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);
-        rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);
-        rt2x00_set_field32(&reg, LEDCSR_LINK,
-                           (rt2x00dev->led_mode != LED_MODE_ASUS));
-        rt2x00_set_field32(&reg, LEDCSR_ACTIVITY,
-                           (rt2x00dev->led_mode != LED_MODE_TXRX_ACTIVITY));
-        rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
-}
-
-static void rt2500pci_disable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-
-        rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-        rt2x00_set_field32(&reg, LEDCSR_LINK, 0);
-        rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, 0);
-        rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
-}
-
-/*
  * Link tuning
  */
 static void rt2500pci_link_stats(struct rt2x00_dev *rt2x00dev,
@@ -610,9 +636,10 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)
         /*
          * To prevent collisions with MAC ASIC on chipsets
          * up to version C the link tuning should halt after 20
-         * seconds.
+         * seconds while being associated.
          */
         if (rt2x00_rev(&rt2x00dev->chip) < RT2560_VERSION_D &&
+            rt2x00dev->intf_associated &&
             rt2x00dev->link.count > 20)
                 return;
 
@@ -620,9 +647,12 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)
 
         /*
          * Chipset versions C and lower should directly continue
-         * to the dynamic CCA tuning.
+         * to the dynamic CCA tuning. Chipset version D and higher
+         * should go straight to dynamic CCA tuning when they
+         * are not associated.
          */
-        if (rt2x00_rev(&rt2x00dev->chip) < RT2560_VERSION_D)
+        if (rt2x00_rev(&rt2x00dev->chip) < RT2560_VERSION_D ||
+            !rt2x00dev->intf_associated)
                 goto dynamic_cca_tune;
 
         /*
@@ -684,82 +714,84 @@ dynamic_cca_tune:
  * Initialization functions.
  */
 static void rt2500pci_init_rxentry(struct rt2x00_dev *rt2x00dev,
-                                   struct data_entry *entry)
+                                   struct queue_entry *entry)
 {
-        __le32 *rxd = entry->priv;
+        struct queue_entry_priv_pci_rx *priv_rx = entry->priv_data;
         u32 word;
 
-        rt2x00_desc_read(rxd, 1, &word);
-        rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, entry->data_dma);
-        rt2x00_desc_write(rxd, 1, word);
+        rt2x00_desc_read(priv_rx->desc, 1, &word);
+        rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, priv_rx->data_dma);
+        rt2x00_desc_write(priv_rx->desc, 1, word);
 
-        rt2x00_desc_read(rxd, 0, &word);
+        rt2x00_desc_read(priv_rx->desc, 0, &word);
         rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
-        rt2x00_desc_write(rxd, 0, word);
+        rt2x00_desc_write(priv_rx->desc, 0, word);
 }
 
 static void rt2500pci_init_txentry(struct rt2x00_dev *rt2x00dev,
-                                   struct data_entry *entry)
+                                   struct queue_entry *entry)
 {
-        __le32 *txd = entry->priv;
+        struct queue_entry_priv_pci_tx *priv_tx = entry->priv_data;
         u32 word;
 
-        rt2x00_desc_read(txd, 1, &word);
-        rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, entry->data_dma);
-        rt2x00_desc_write(txd, 1, word);
+        rt2x00_desc_read(priv_tx->desc, 1, &word);
+        rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, priv_tx->data_dma);
+        rt2x00_desc_write(priv_tx->desc, 1, word);
 
-        rt2x00_desc_read(txd, 0, &word);
+        rt2x00_desc_read(priv_tx->desc, 0, &word);
         rt2x00_set_field32(&word, TXD_W0_VALID, 0);
         rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
-        rt2x00_desc_write(txd, 0, word);
+        rt2x00_desc_write(priv_tx->desc, 0, word);
 }
 
-static int rt2500pci_init_rings(struct rt2x00_dev *rt2x00dev)
+static int rt2500pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
+        struct queue_entry_priv_pci_rx *priv_rx;
+        struct queue_entry_priv_pci_tx *priv_tx;
         u32 reg;
 
         /*
          * Initialize registers.
          */
         rt2x00pci_register_read(rt2x00dev, TXCSR2, &reg);
-        rt2x00_set_field32(&reg, TXCSR2_TXD_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].desc_size);
-        rt2x00_set_field32(&reg, TXCSR2_NUM_TXD,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA1].stats.limit);
-        rt2x00_set_field32(&reg, TXCSR2_NUM_ATIM,
-                           rt2x00dev->bcn[1].stats.limit);
-        rt2x00_set_field32(&reg, TXCSR2_NUM_PRIO,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].stats.limit);
+        rt2x00_set_field32(&reg, TXCSR2_TXD_SIZE, rt2x00dev->tx[0].desc_size);
+        rt2x00_set_field32(&reg, TXCSR2_NUM_TXD, rt2x00dev->tx[1].limit);
+        rt2x00_set_field32(&reg, TXCSR2_NUM_ATIM, rt2x00dev->bcn[1].limit);
+        rt2x00_set_field32(&reg, TXCSR2_NUM_PRIO, rt2x00dev->tx[0].limit);
         rt2x00pci_register_write(rt2x00dev, TXCSR2, reg);
 
+        priv_tx = rt2x00dev->tx[1].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR3, &reg);
         rt2x00_set_field32(&reg, TXCSR3_TX_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA1].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR3, reg);
 
+        priv_tx = rt2x00dev->tx[0].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR5, &reg);
         rt2x00_set_field32(&reg, TXCSR5_PRIO_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR5, reg);
 
+        priv_tx = rt2x00dev->bcn[1].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR4, &reg);
         rt2x00_set_field32(&reg, TXCSR4_ATIM_RING_REGISTER,
-                           rt2x00dev->bcn[1].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR4, reg);
 
+        priv_tx = rt2x00dev->bcn[0].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, TXCSR6, &reg);
         rt2x00_set_field32(&reg, TXCSR6_BEACON_RING_REGISTER,
-                           rt2x00dev->bcn[0].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, TXCSR6, reg);
 
         rt2x00pci_register_read(rt2x00dev, RXCSR1, &reg);
         rt2x00_set_field32(&reg, RXCSR1_RXD_SIZE, rt2x00dev->rx->desc_size);
-        rt2x00_set_field32(&reg, RXCSR1_NUM_RXD, rt2x00dev->rx->stats.limit);
+        rt2x00_set_field32(&reg, RXCSR1_NUM_RXD, rt2x00dev->rx->limit);
         rt2x00pci_register_write(rt2x00dev, RXCSR1, reg);
 
+        priv_rx = rt2x00dev->rx->entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, RXCSR2, &reg);
-        rt2x00_set_field32(&reg, RXCSR2_RX_RING_REGISTER,
-                           rt2x00dev->rx->data_dma);
+        rt2x00_set_field32(&reg, RXCSR2_RX_RING_REGISTER, priv_rx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, RXCSR2, reg);
 
         return 0;
@@ -947,19 +979,15 @@ continue_csr_init:
         rt2500pci_bbp_write(rt2x00dev, 61, 0x6d);
         rt2500pci_bbp_write(rt2x00dev, 62, 0x10);
 
-        DEBUG(rt2x00dev, "Start initialization from EEPROM...\n");
         for (i = 0; i < EEPROM_BBP_SIZE; i++) {
                 rt2x00_eeprom_read(rt2x00dev, EEPROM_BBP_START + i, &eeprom);
 
                 if (eeprom != 0xffff && eeprom != 0x0000) {
                         reg_id = rt2x00_get_field16(eeprom, EEPROM_BBP_REG_ID);
                         value = rt2x00_get_field16(eeprom, EEPROM_BBP_VALUE);
-                        DEBUG(rt2x00dev, "BBP: 0x%02x, value: 0x%02x.\n",
-                              reg_id, value);
                         rt2500pci_bbp_write(rt2x00dev, reg_id, value);
                 }
         }
-        DEBUG(rt2x00dev, "...End initialization from EEPROM.\n");
 
         return 0;
 }
@@ -1011,7 +1039,7 @@ static int rt2500pci_enable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize all registers.
          */
-        if (rt2500pci_init_rings(rt2x00dev) ||
+        if (rt2500pci_init_queues(rt2x00dev) ||
             rt2500pci_init_registers(rt2x00dev) ||
             rt2500pci_init_bbp(rt2x00dev)) {
                 ERROR(rt2x00dev, "Register initialization failed.\n");
@@ -1023,11 +1051,6 @@ static int rt2500pci_enable_radio(struct rt2x00_dev *rt2x00dev)
          */
         rt2500pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_ON);
 
-        /*
-         * Enable LED
-         */
-        rt2500pci_enable_led(rt2x00dev);
-
         return 0;
 }
 
@@ -1035,11 +1058,6 @@ static void rt2500pci_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        /*
-         * Disable LED
-         */
-        rt2500pci_disable_led(rt2x00dev);
-
         rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);
 
         /*
@@ -1138,10 +1156,10 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev,
  */
 static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                     struct sk_buff *skb,
-                                    struct txdata_entry_desc *desc,
+                                    struct txentry_desc *txdesc,
                                     struct ieee80211_tx_control *control)
 {
-        struct skb_desc *skbdesc = get_skb_desc(skb);
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
         __le32 *txd = skbdesc->desc;
         u32 word;
 
@@ -1150,36 +1168,36 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
          */
         rt2x00_desc_read(txd, 2, &word);
         rt2x00_set_field32(&word, TXD_W2_IV_OFFSET, IEEE80211_HEADER);
-        rt2x00_set_field32(&word, TXD_W2_AIFS, desc->aifs);
-        rt2x00_set_field32(&word, TXD_W2_CWMIN, desc->cw_min);
-        rt2x00_set_field32(&word, TXD_W2_CWMAX, desc->cw_max);
+        rt2x00_set_field32(&word, TXD_W2_AIFS, txdesc->aifs);
+        rt2x00_set_field32(&word, TXD_W2_CWMIN, txdesc->cw_min);
+        rt2x00_set_field32(&word, TXD_W2_CWMAX, txdesc->cw_max);
         rt2x00_desc_write(txd, 2, word);
 
         rt2x00_desc_read(txd, 3, &word);
-        rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, desc->signal);
-        rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, desc->service);
-        rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW, desc->length_low);
-        rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH, desc->length_high);
+        rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, txdesc->signal);
+        rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, txdesc->service);
+        rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW, txdesc->length_low);
+        rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH, txdesc->length_high);
         rt2x00_desc_write(txd, 3, word);
 
         rt2x00_desc_read(txd, 10, &word);
         rt2x00_set_field32(&word, TXD_W10_RTS,
-                           test_bit(ENTRY_TXD_RTS_FRAME, &desc->flags));
+                           test_bit(ENTRY_TXD_RTS_FRAME, &txdesc->flags));
         rt2x00_desc_write(txd, 10, word);
 
         rt2x00_desc_read(txd, 0, &word);
         rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 1);
         rt2x00_set_field32(&word, TXD_W0_VALID, 1);
         rt2x00_set_field32(&word, TXD_W0_MORE_FRAG,
-                           test_bit(ENTRY_TXD_MORE_FRAG, &desc->flags));
+                           test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_ACK,
-                           test_bit(ENTRY_TXD_ACK, &desc->flags));
+                           test_bit(ENTRY_TXD_ACK, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_TIMESTAMP,
-                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &desc->flags));
+                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_OFDM,
-                           test_bit(ENTRY_TXD_OFDM_RATE, &desc->flags));
+                           test_bit(ENTRY_TXD_OFDM_RATE, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_CIPHER_OWNER, 1);
-        rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+        rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
         rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
                            !!(control->flags &
                               IEEE80211_TXCTL_LONG_RETRY_LIMIT));
@@ -1192,13 +1210,15 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
  * TX data initialization
  */
 static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
-                                    unsigned int queue)
+                                    const unsigned int queue)
 {
         u32 reg;
 
-        if (queue == IEEE80211_TX_QUEUE_BEACON) {
+        if (queue == RT2X00_BCN_QUEUE_BEACON) {
                 rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
                 if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) {
+                        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
+                        rt2x00_set_field32(&reg, CSR14_TBCN, 1);
                         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
                         rt2x00pci_register_write(rt2x00dev, CSR14, reg);
                 }
@@ -1211,53 +1231,63 @@ static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, TXCSR0_KICK_TX,
                            (queue == IEEE80211_TX_QUEUE_DATA1));
         rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM,
-                           (queue == IEEE80211_TX_QUEUE_AFTER_BEACON));
+                           (queue == RT2X00_BCN_QUEUE_ATIM));
         rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
 }
 
 /*
  * RX control handlers
  */
-static void rt2500pci_fill_rxdone(struct data_entry *entry,
-                                  struct rxdata_entry_desc *desc)
+static void rt2500pci_fill_rxdone(struct queue_entry *entry,
+                                  struct rxdone_entry_desc *rxdesc)
 {
-        __le32 *rxd = entry->priv;
+        struct queue_entry_priv_pci_rx *priv_rx = entry->priv_data;
         u32 word0;
         u32 word2;
 
-        rt2x00_desc_read(rxd, 0, &word0);
-        rt2x00_desc_read(rxd, 2, &word2);
+        rt2x00_desc_read(priv_rx->desc, 0, &word0);
+        rt2x00_desc_read(priv_rx->desc, 2, &word2);
 
-        desc->flags = 0;
+        rxdesc->flags = 0;
         if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
-                desc->flags |= RX_FLAG_FAILED_FCS_CRC;
+                rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
         if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
-                desc->flags |= RX_FLAG_FAILED_PLCP_CRC;
-
-        desc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL);
-        desc->rssi = rt2x00_get_field32(word2, RXD_W2_RSSI) -
-            entry->ring->rt2x00dev->rssi_offset;
-        desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
-        desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
-        desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
+                rxdesc->flags |= RX_FLAG_FAILED_PLCP_CRC;
+
+        /*
+         * Obtain the status about this packet.
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
+         */
+        rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL);
+        rxdesc->rssi = rt2x00_get_field32(word2, RXD_W2_RSSI) -
+            entry->queue->rt2x00dev->rssi_offset;
+        rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+
+        rxdesc->dev_flags = 0;
+        if (rt2x00_get_field32(word0, RXD_W0_OFDM))
+                rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
+        if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
+                rxdesc->dev_flags |= RXDONE_MY_BSS;
 }
 
 /*
  * Interrupt functions.
  */
-static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev, const int queue)
+static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev,
+                             const enum ieee80211_tx_queue queue_idx)
 {
-        struct data_ring *ring = rt2x00lib_get_ring(rt2x00dev, queue);
-        struct data_entry *entry;
-        __le32 *txd;
+        struct data_queue *queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);
+        struct queue_entry_priv_pci_tx *priv_tx;
+        struct queue_entry *entry;
+        struct txdone_entry_desc txdesc;
         u32 word;
-        int tx_status;
-        int retry;
 
-        while (!rt2x00_ring_empty(ring)) {
-                entry = rt2x00_get_data_entry_done(ring);
-                txd = entry->priv;
-                rt2x00_desc_read(txd, 0, &word);
+        while (!rt2x00queue_empty(queue)) {
+                entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
+                priv_tx = entry->priv_data;
+                rt2x00_desc_read(priv_tx->desc, 0, &word);
 
                 if (rt2x00_get_field32(word, TXD_W0_OWNER_NIC) ||
                     !rt2x00_get_field32(word, TXD_W0_VALID))
@@ -1266,10 +1296,10 @@ static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev, const int queue)
                 /*
                  * Obtain the status about this packet.
                  */
-                tx_status = rt2x00_get_field32(word, TXD_W0_RESULT);
-                retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);
+                txdesc.status = rt2x00_get_field32(word, TXD_W0_RESULT);
+                txdesc.retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);
 
-                rt2x00pci_txdone(rt2x00dev, entry, tx_status, retry);
+                rt2x00pci_txdone(rt2x00dev, entry, &txdesc);
         }
 }
 
@@ -1313,7 +1343,7 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
          * 3 - Atim ring transmit done interrupt.
          */
         if (rt2x00_get_field32(reg, CSR7_TXDONE_ATIMRING))
-                rt2500pci_txdone(rt2x00dev, IEEE80211_TX_QUEUE_AFTER_BEACON);
+                rt2500pci_txdone(rt2x00dev, RT2X00_BCN_QUEUE_ATIM);
 
         /*
          * 4 - Priority ring transmit done interrupt.
@@ -1442,8 +1472,27 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Store led mode, for correct led behaviour.
          */
-        rt2x00dev->led_mode =
-            rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
+#ifdef CONFIG_RT2500PCI_LEDS
+        value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
+
+        rt2x00dev->led_radio.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_radio.type = LED_TYPE_RADIO;
+        rt2x00dev->led_radio.led_dev.brightness_set =
+            rt2500pci_brightness_set;
+        rt2x00dev->led_radio.led_dev.blink_set =
+            rt2500pci_blink_set;
+        rt2x00dev->led_radio.flags = LED_INITIALIZED;
+
+        if (value == LED_MODE_TXRX_ACTIVITY) {
+                rt2x00dev->led_qual.rt2x00dev = rt2x00dev;
+                rt2x00dev->led_radio.type = LED_TYPE_ACTIVITY;
+                rt2x00dev->led_qual.led_dev.brightness_set =
+                    rt2500pci_brightness_set;
+                rt2x00dev->led_qual.led_dev.blink_set =
+                    rt2500pci_blink_set;
+                rt2x00dev->led_qual.flags = LED_INITIALIZED;
+        }
+#endif /* CONFIG_RT2500PCI_LEDS */
 
         /*
          * Detect if this device has an hardware controlled radio.
@@ -1656,8 +1705,8 @@ static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize hw_mode information.
          */
-        spec->num_modes = 2;
-        spec->num_rates = 12;
+        spec->supported_bands = SUPPORT_BAND_2GHZ;
+        spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;
         spec->tx_power_a = NULL;
         spec->tx_power_bg = txpower;
         spec->tx_power_default = DEFAULT_TXPOWER;
@@ -1678,9 +1727,9 @@ static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                 spec->num_channels = ARRAY_SIZE(rf_vals_bg_2525e);
                 spec->channels = rf_vals_bg_2525e;
         } else if (rt2x00_rf(&rt2x00dev->chip, RF5222)) {
+                spec->supported_bands |= SUPPORT_BAND_5GHZ;
                 spec->num_channels = ARRAY_SIZE(rf_vals_5222);
                 spec->channels = rf_vals_5222;
-                spec->num_modes = 3;
         }
 }
 
@@ -1705,9 +1754,9 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         rt2500pci_probe_hw_mode(rt2x00dev);
 
         /*
-         * This device requires the beacon ring
+         * This device requires the atim queue
          */
-        __set_bit(DRIVER_REQUIRE_BEACON_RING, &rt2x00dev->flags);
+        __set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -1720,69 +1769,6 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev)
 /*
  * IEEE80211 stack callback functions.
  */
-static void rt2500pci_configure_filter(struct ieee80211_hw *hw,
-                                       unsigned int changed_flags,
-                                       unsigned int *total_flags,
-                                       int mc_count,
-                                       struct dev_addr_list *mc_list)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-        u32 reg;
-
-        /*
-         * Mask off any flags we are going to ignore from
-         * the total_flags field.
-         */
-        *total_flags &=
-            FIF_ALLMULTI |
-            FIF_FCSFAIL |
-            FIF_PLCPFAIL |
-            FIF_CONTROL |
-            FIF_OTHER_BSS |
-            FIF_PROMISC_IN_BSS;
-
-        /*
-         * Apply some rules to the filters:
-         * - Some filters imply different filters to be set.
-         * - Some things we can't filter out at all.
-         */
-        if (mc_count)
-                *total_flags |= FIF_ALLMULTI;
-        if (*total_flags & FIF_OTHER_BSS ||
-            *total_flags & FIF_PROMISC_IN_BSS)
-                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-
-        /*
-         * Check if there is any work left for us.
-         */
-        if (rt2x00dev->packet_filter == *total_flags)
-                return;
-        rt2x00dev->packet_filter = *total_flags;
-
-        /*
-         * Start configuration steps.
-         * Note that the version error will always be dropped
-         * and broadcast frames will always be accepted since
-         * there is no filter for it at this time.
-         */
-        rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
-        rt2x00_set_field32(&reg, RXCSR0_DROP_CRC,
-                           !(*total_flags & FIF_FCSFAIL));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_PHYSICAL,
-                           !(*total_flags & FIF_PLCPFAIL));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,
-                           !(*total_flags & FIF_CONTROL));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
-        rt2x00_set_field32(&reg, RXCSR0_DROP_MCAST,
-                           !(*total_flags & FIF_ALLMULTI));
-        rt2x00_set_field32(&reg, RXCSR0_DROP_BCAST, 0);
-        rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
-}
-
 static int rt2500pci_set_retry_limit(struct ieee80211_hw *hw,
                                      u32 short_retry, u32 long_retry)
 {
@@ -1811,12 +1797,59 @@ static u64 rt2500pci_get_tsf(struct ieee80211_hw *hw)
         return tsf;
 }
 
-static void rt2500pci_reset_tsf(struct ieee80211_hw *hw)
+static int rt2500pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
+                                   struct ieee80211_tx_control *control)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
+        struct rt2x00_intf *intf = vif_to_intf(control->vif);
+        struct queue_entry_priv_pci_tx *priv_tx;
+        struct skb_frame_desc *skbdesc;
+        u32 reg;
 
-        rt2x00pci_register_write(rt2x00dev, CSR16, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR17, 0);
+        if (unlikely(!intf->beacon))
+                return -ENOBUFS;
+
+        priv_tx = intf->beacon->priv_data;
+
+        /*
+         * Fill in skb descriptor
+         */
+        skbdesc = get_skb_frame_desc(skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
+        skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
+        skbdesc->data = skb->data;
+        skbdesc->data_len = skb->len;
+        skbdesc->desc = priv_tx->desc;
+        skbdesc->desc_len = intf->beacon->queue->desc_size;
+        skbdesc->entry = intf->beacon;
+
+        /*
+         * Disable beaconing while we are reloading the beacon data,
+         * otherwise we might be sending out invalid data.
+         */
+        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
+        rt2x00_set_field32(&reg, CSR14_TBCN, 0);
+        rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
+        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+
+        /*
+         * mac80211 doesn't provide the control->queue variable
+         * for beacons. Set our own queue identification so
+         * it can be used during descriptor initialization.
+         */
+        control->queue = RT2X00_BCN_QUEUE_BEACON;
+        rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
+
+        /*
+         * Enable beacon generation.
+         * Write entire beacon with descriptor to register,
+         * and kick the beacon generator.
+         */
+        memcpy(priv_tx->data, skb->data, skb->len);
+        rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, control->queue);
+
+        return 0;
 }
 
 static int rt2500pci_tx_last_beacon(struct ieee80211_hw *hw)
@@ -1836,15 +1869,14 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .config_interface       = rt2x00mac_config_interface,
-        .configure_filter       = rt2500pci_configure_filter,
+        .configure_filter       = rt2x00mac_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt2500pci_set_retry_limit,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt2500pci_get_tsf,
-        .reset_tsf              = rt2500pci_reset_tsf,
-        .beacon_update          = rt2x00pci_beacon_update,
+        .beacon_update          = rt2500pci_beacon_update,
         .tx_last_beacon         = rt2500pci_tx_last_beacon,
 };
 
@@ -1864,19 +1896,50 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
         .write_tx_data          = rt2x00pci_write_tx_data,
         .kick_tx_queue          = rt2500pci_kick_tx_queue,
         .fill_rxdone            = rt2500pci_fill_rxdone,
-        .config_mac_addr        = rt2500pci_config_mac_addr,
-        .config_bssid           = rt2500pci_config_bssid,
-        .config_type            = rt2500pci_config_type,
-        .config_preamble        = rt2500pci_config_preamble,
+        .config_filter          = rt2500pci_config_filter,
+        .config_intf            = rt2500pci_config_intf,
+        .config_erp             = rt2500pci_config_erp,
         .config                 = rt2500pci_config,
 };
 
+static const struct data_queue_desc rt2500pci_queue_rx = {
+        .entry_num              = RX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = RXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_rx),
+};
+
+static const struct data_queue_desc rt2500pci_queue_tx = {
+        .entry_num              = TX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
+static const struct data_queue_desc rt2500pci_queue_bcn = {
+        .entry_num              = BEACON_ENTRIES,
+        .data_size              = MGMT_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
+static const struct data_queue_desc rt2500pci_queue_atim = {
+        .entry_num              = ATIM_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
 static const struct rt2x00_ops rt2500pci_ops = {
         .name           = KBUILD_MODNAME,
-        .rxd_size       = RXD_DESC_SIZE,
-        .txd_size       = TXD_DESC_SIZE,
+        .max_sta_intf   = 1,
+        .max_ap_intf    = 1,
         .eeprom_size    = EEPROM_SIZE,
         .rf_size        = RF_SIZE,
+        .rx             = &rt2500pci_queue_rx,
+        .tx             = &rt2500pci_queue_tx,
+        .bcn            = &rt2500pci_queue_bcn,
+        .atim           = &rt2500pci_queue_atim,
         .lib            = &rt2500pci_rt2x00_ops,
         .hw             = &rt2500pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h
index 92ba0902d107..13899550465a 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.h
+++ b/drivers/net/wireless/rt2x00/rt2500pci.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -1213,8 +1213,8 @@
 #define RXD_W10_DROP                    FIELD32(0x00000001)
 
 /*
- * Macro's for converting txpower from EEPROM to dscape value
- * and from dscape value to register value.
+ * Macro's for converting txpower from EEPROM to mac80211 value
+ * and from mac80211 value to register value.
  */
 #define MIN_TXPOWER     0
 #define MAX_TXPOWER     31
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 638c3d243108..6bb07b339325 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -282,97 +282,136 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = {
 };
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 
-/*
- * Configuration handlers.
- */
-static void rt2500usb_config_mac_addr(struct rt2x00_dev *rt2x00dev,
-                                      __le32 *mac)
+#ifdef CONFIG_RT2500USB_LEDS
+static void rt2500usb_brightness_set(struct led_classdev *led_cdev,
+                                     enum led_brightness brightness)
 {
-        rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, mac,
-                                      (3 * sizeof(__le16)));
-}
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        unsigned int enabled = brightness != LED_OFF;
+        u16 reg;
 
-static void rt2500usb_config_bssid(struct rt2x00_dev *rt2x00dev,
-                                   __le32 *bssid)
-{
-        rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR5, bssid,
-                                      (3 * sizeof(__le16)));
+        rt2500usb_register_read(led->rt2x00dev, MAC_CSR20, &reg);
+
+        if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)
+                rt2x00_set_field16(&reg, MAC_CSR20_LINK, enabled);
+        else if (led->type == LED_TYPE_ACTIVITY)
+                rt2x00_set_field16(&reg, MAC_CSR20_ACTIVITY, enabled);
+
+        rt2500usb_register_write(led->rt2x00dev, MAC_CSR20, reg);
 }
 
-static void rt2500usb_config_type(struct rt2x00_dev *rt2x00dev, const int type,
-                                  const int tsf_sync)
+static int rt2500usb_blink_set(struct led_classdev *led_cdev,
+                               unsigned long *delay_on,
+                               unsigned long *delay_off)
 {
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
         u16 reg;
 
-        rt2500usb_register_write(rt2x00dev, TXRX_CSR19, 0);
+        rt2500usb_register_read(led->rt2x00dev, MAC_CSR21, &reg);
+        rt2x00_set_field16(&reg, MAC_CSR21_ON_PERIOD, *delay_on);
+        rt2x00_set_field16(&reg, MAC_CSR21_OFF_PERIOD, *delay_off);
+        rt2500usb_register_write(led->rt2x00dev, MAC_CSR21, reg);
 
-        /*
-         * Enable beacon config
-         */
-        rt2500usb_register_read(rt2x00dev, TXRX_CSR20, &reg);
-        rt2x00_set_field16(&reg, TXRX_CSR20_OFFSET,
-                           (PREAMBLE + get_duration(IEEE80211_HEADER, 20)) >> 6);
-        if (type == IEEE80211_IF_TYPE_STA)
-                rt2x00_set_field16(&reg, TXRX_CSR20_BCN_EXPECT_WINDOW, 0);
-        else
-                rt2x00_set_field16(&reg, TXRX_CSR20_BCN_EXPECT_WINDOW, 2);
-        rt2500usb_register_write(rt2x00dev, TXRX_CSR20, reg);
+        return 0;
+}
+#endif /* CONFIG_RT2500USB_LEDS */
+
+/*
+ * Configuration handlers.
+ */
+static void rt2500usb_config_filter(struct rt2x00_dev *rt2x00dev,
+                                    const unsigned int filter_flags)
+{
+        u16 reg;
 
         /*
-         * Enable synchronisation.
+         * Start configuration steps.
+         * Note that the version error will always be dropped
+         * and broadcast frames will always be accepted since
+         * there is no filter for it at this time.
          */
-        rt2500usb_register_read(rt2x00dev, TXRX_CSR18, &reg);
-        rt2x00_set_field16(&reg, TXRX_CSR18_OFFSET, 0);
-        rt2500usb_register_write(rt2x00dev, TXRX_CSR18, reg);
-
-        rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
-        rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);
-        rt2x00_set_field16(&reg, TXRX_CSR19_TBCN,
-                           (tsf_sync == TSF_SYNC_BEACON));
-        rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);
-        rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, tsf_sync);
-        rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
+        rt2500usb_register_read(rt2x00dev, TXRX_CSR2, &reg);
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_CRC,
+                           !(filter_flags & FIF_FCSFAIL));
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_PHYSICAL,
+                           !(filter_flags & FIF_PLCPFAIL));
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_CONTROL,
+                           !(filter_flags & FIF_CONTROL));
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_NOT_TO_ME,
+                           !(filter_flags & FIF_PROMISC_IN_BSS));
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_TODS,
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_VERSION_ERROR, 1);
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_MULTICAST,
+                           !(filter_flags & FIF_ALLMULTI));
+        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_BROADCAST, 0);
+        rt2500usb_register_write(rt2x00dev, TXRX_CSR2, reg);
 }
 
-static void rt2500usb_config_preamble(struct rt2x00_dev *rt2x00dev,
-                                      const int short_preamble,
-                                      const int ack_timeout,
-                                      const int ack_consume_time)
+static void rt2500usb_config_intf(struct rt2x00_dev *rt2x00dev,
+                                  struct rt2x00_intf *intf,
+                                  struct rt2x00intf_conf *conf,
+                                  const unsigned int flags)
 {
+        unsigned int bcn_preload;
         u16 reg;
 
-        /*
-         * When in atomic context, reschedule and let rt2x00lib
-         * call this function again.
-         */
-        if (in_atomic()) {
-                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->config_work);
-                return;
+        if (flags & CONFIG_UPDATE_TYPE) {
+                /*
+                 * Enable beacon config
+                 */
+                bcn_preload = PREAMBLE + get_duration(IEEE80211_HEADER, 20);
+                rt2500usb_register_read(rt2x00dev, TXRX_CSR20, &reg);
+                rt2x00_set_field16(&reg, TXRX_CSR20_OFFSET, bcn_preload >> 6);
+                rt2x00_set_field16(&reg, TXRX_CSR20_BCN_EXPECT_WINDOW,
+                                   2 * (conf->type != IEEE80211_IF_TYPE_STA));
+                rt2500usb_register_write(rt2x00dev, TXRX_CSR20, reg);
+
+                /*
+                 * Enable synchronisation.
+                 */
+                rt2500usb_register_read(rt2x00dev, TXRX_CSR18, &reg);
+                rt2x00_set_field16(&reg, TXRX_CSR18_OFFSET, 0);
+                rt2500usb_register_write(rt2x00dev, TXRX_CSR18, reg);
+
+                rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
+                rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);
+                rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, conf->sync);
+                rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 1);
+                rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
         }
 
+        if (flags & CONFIG_UPDATE_MAC)
+                rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, conf->mac,
+                                              (3 * sizeof(__le16)));
+
+        if (flags & CONFIG_UPDATE_BSSID)
+                rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR5, conf->bssid,
+                                              (3 * sizeof(__le16)));
+}
+
+static void rt2500usb_config_erp(struct rt2x00_dev *rt2x00dev,
+                                 struct rt2x00lib_erp *erp)
+{
+        u16 reg;
+
         rt2500usb_register_read(rt2x00dev, TXRX_CSR1, &reg);
-        rt2x00_set_field16(&reg, TXRX_CSR1_ACK_TIMEOUT, ack_timeout);
+        rt2x00_set_field16(&reg, TXRX_CSR1_ACK_TIMEOUT, erp->ack_timeout);
         rt2500usb_register_write(rt2x00dev, TXRX_CSR1, reg);
 
         rt2500usb_register_read(rt2x00dev, TXRX_CSR10, &reg);
         rt2x00_set_field16(&reg, TXRX_CSR10_AUTORESPOND_PREAMBLE,
-                           !!short_preamble);
+                           !!erp->short_preamble);
         rt2500usb_register_write(rt2x00dev, TXRX_CSR10, reg);
 }
 
 static void rt2500usb_config_phymode(struct rt2x00_dev *rt2x00dev,
-                                     const int phymode,
                                      const int basic_rate_mask)
 {
         rt2500usb_register_write(rt2x00dev, TXRX_CSR11, basic_rate_mask);
-
-        if (phymode == HWMODE_B) {
-                rt2500usb_register_write(rt2x00dev, MAC_CSR11, 0x000b);
-                rt2500usb_register_write(rt2x00dev, MAC_CSR12, 0x0040);
-        } else {
-                rt2500usb_register_write(rt2x00dev, MAC_CSR11, 0x0005);
-                rt2500usb_register_write(rt2x00dev, MAC_CSR12, 0x016c);
-        }
 }
 
 static void rt2500usb_config_channel(struct rt2x00_dev *rt2x00dev,
@@ -424,6 +463,13 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         u16 csr5;
         u16 csr6;
 
+        /*
+         * We should never come here because rt2x00lib is supposed
+         * to catch this and send us the correct antenna explicitely.
+         */
+        BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
+               ant->tx == ANTENNA_SW_DIVERSITY);
+
         rt2500usb_bbp_read(rt2x00dev, 2, &r2);
         rt2500usb_bbp_read(rt2x00dev, 14, &r14);
         rt2500usb_register_read(rt2x00dev, PHY_CSR5, &csr5);
@@ -443,14 +489,8 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field16(&csr5, PHY_CSR5_CCK, 0);
                 rt2x00_set_field16(&csr6, PHY_CSR6_OFDM, 0);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r2, BBP_R2_TX_ANTENNA, 2);
                 rt2x00_set_field16(&csr5, PHY_CSR5_CCK, 2);
                 rt2x00_set_field16(&csr6, PHY_CSR6_OFDM, 2);
@@ -467,14 +507,8 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_A:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 0);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 2);
                 break;
         }
@@ -510,6 +544,8 @@ static void rt2500usb_config_duration(struct rt2x00_dev *rt2x00dev,
         u16 reg;
 
         rt2500usb_register_write(rt2x00dev, MAC_CSR10, libconf->slot_time);
+        rt2500usb_register_write(rt2x00dev, MAC_CSR11, libconf->sifs);
+        rt2500usb_register_write(rt2x00dev, MAC_CSR12, libconf->eifs);
 
         rt2500usb_register_read(rt2x00dev, TXRX_CSR18, &reg);
         rt2x00_set_field16(&reg, TXRX_CSR18_INTERVAL,
@@ -518,12 +554,11 @@ static void rt2500usb_config_duration(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2500usb_config(struct rt2x00_dev *rt2x00dev,
-                             const unsigned int flags,
-                             struct rt2x00lib_conf *libconf)
+                             struct rt2x00lib_conf *libconf,
+                             const unsigned int flags)
 {
         if (flags & CONFIG_UPDATE_PHYMODE)
-                rt2500usb_config_phymode(rt2x00dev, libconf->phymode,
-                                         libconf->basic_rates);
+                rt2500usb_config_phymode(rt2x00dev, libconf->basic_rates);
         if (flags & CONFIG_UPDATE_CHANNEL)
                 rt2500usb_config_channel(rt2x00dev, &libconf->rf,
                                          libconf->conf->power_level);
@@ -537,36 +572,6 @@ static void rt2500usb_config(struct rt2x00_dev *rt2x00dev,
 }
 
 /*
- * LED functions.
- */
-static void rt2500usb_enable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u16 reg;
-
-        rt2500usb_register_read(rt2x00dev, MAC_CSR21, &reg);
-        rt2x00_set_field16(&reg, MAC_CSR21_ON_PERIOD, 70);
-        rt2x00_set_field16(&reg, MAC_CSR21_OFF_PERIOD, 30);
-        rt2500usb_register_write(rt2x00dev, MAC_CSR21, reg);
-
-        rt2500usb_register_read(rt2x00dev, MAC_CSR20, &reg);
-        rt2x00_set_field16(&reg, MAC_CSR20_LINK,
-                           (rt2x00dev->led_mode != LED_MODE_ASUS));
-        rt2x00_set_field16(&reg, MAC_CSR20_ACTIVITY,
-                           (rt2x00dev->led_mode != LED_MODE_TXRX_ACTIVITY));
-        rt2500usb_register_write(rt2x00dev, MAC_CSR20, reg);
-}
-
-static void rt2500usb_disable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u16 reg;
-
-        rt2500usb_register_read(rt2x00dev, MAC_CSR20, &reg);
-        rt2x00_set_field16(&reg, MAC_CSR20_LINK, 0);
-        rt2x00_set_field16(&reg, MAC_CSR20_ACTIVITY, 0);
-        rt2500usb_register_write(rt2x00dev, MAC_CSR20, reg);
-}
-
-/*
  * Link tuning
  */
 static void rt2500usb_link_stats(struct rt2x00_dev *rt2x00dev,
@@ -626,6 +631,24 @@ static void rt2500usb_link_tuner(struct rt2x00_dev *rt2x00dev)
         u8 low_bound;
 
         /*
+         * Read current r17 value, as well as the sensitivity values
+         * for the r17 register.
+         */
+        rt2500usb_bbp_read(rt2x00dev, 17, &r17);
+        rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R17, &r17_sens);
+
+        rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_VGC, &vgc_bound);
+        up_bound = rt2x00_get_field16(vgc_bound, EEPROM_BBPTUNE_VGCUPPER);
+        low_bound = rt2x00_get_field16(vgc_bound, EEPROM_BBPTUNE_VGCLOWER);
+
+        /*
+         * If we are not associated, we should go straight to the
+         * dynamic CCA tuning.
+         */
+        if (!rt2x00dev->intf_associated)
+                goto dynamic_cca_tune;
+
+        /*
          * Determine the BBP tuning threshold and correctly
          * set BBP 24, 25 and 61.
          */
@@ -651,13 +674,6 @@ static void rt2500usb_link_tuner(struct rt2x00_dev *rt2x00dev)
         rt2500usb_bbp_write(rt2x00dev, 61, r61);
 
         /*
-         * Read current r17 value, as well as the sensitivity values
-         * for the r17 register.
-         */
-        rt2500usb_bbp_read(rt2x00dev, 17, &r17);
-        rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R17, &r17_sens);
-
-        /*
          * A too low RSSI will cause too much false CCA which will
          * then corrupt the R17 tuning. To remidy this the tuning should
          * be stopped (While making sure the R17 value will not exceed limits)
@@ -692,14 +708,9 @@ static void rt2500usb_link_tuner(struct rt2x00_dev *rt2x00dev)
          * Leave short or middle distance condition, restore r17
          * to the dynamic tuning range.
          */
-        rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_VGC, &vgc_bound);
-        vgc_bound = rt2x00_get_field16(vgc_bound, EEPROM_BBPTUNE_VGCUPPER);
-
         low_bound = 0x32;
-        if (rssi >= -77)
-                up_bound = vgc_bound;
-        else
-                up_bound = vgc_bound - (-77 - rssi);
+        if (rssi < -77)
+                up_bound -= (-77 - rssi);
 
         if (up_bound < low_bound)
                 up_bound = low_bound;
@@ -707,7 +718,16 @@ static void rt2500usb_link_tuner(struct rt2x00_dev *rt2x00dev)
         if (r17 > up_bound) {
                 rt2500usb_bbp_write(rt2x00dev, 17, up_bound);
                 rt2x00dev->link.vgc_level = up_bound;
-        } else if (rt2x00dev->link.qual.false_cca > 512 && r17 < up_bound) {
+                return;
+        }
+
+dynamic_cca_tune:
+
+        /*
+         * R17 is inside the dynamic tuning range,
+         * start tuning the link based on the false cca counter.
+         */
+        if (rt2x00dev->link.qual.false_cca > 512 && r17 < up_bound) {
                 rt2500usb_bbp_write(rt2x00dev, 17, ++r17);
                 rt2x00dev->link.vgc_level = r17;
         } else if (rt2x00dev->link.qual.false_cca < 100 && r17 > low_bound) {
@@ -878,19 +898,15 @@ continue_csr_init:
         rt2500usb_bbp_write(rt2x00dev, 62, 0x10);
         rt2500usb_bbp_write(rt2x00dev, 75, 0xff);
 
-        DEBUG(rt2x00dev, "Start initialization from EEPROM...\n");
         for (i = 0; i < EEPROM_BBP_SIZE; i++) {
                 rt2x00_eeprom_read(rt2x00dev, EEPROM_BBP_START + i, &eeprom);
 
                 if (eeprom != 0xffff && eeprom != 0x0000) {
                         reg_id = rt2x00_get_field16(eeprom, EEPROM_BBP_REG_ID);
                         value = rt2x00_get_field16(eeprom, EEPROM_BBP_VALUE);
-                        DEBUG(rt2x00dev, "BBP: 0x%02x, value: 0x%02x.\n",
-                              reg_id, value);
                         rt2500usb_bbp_write(rt2x00dev, reg_id, value);
                 }
         }
-        DEBUG(rt2x00dev, "...End initialization from EEPROM.\n");
 
         return 0;
 }
@@ -920,21 +936,11 @@ static int rt2500usb_enable_radio(struct rt2x00_dev *rt2x00dev)
                 return -EIO;
         }
 
-        /*
-         * Enable LED
-         */
-        rt2500usb_enable_led(rt2x00dev);
-
         return 0;
 }
 
 static void rt2500usb_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
-        /*
-         * Disable LED
-         */
-        rt2500usb_disable_led(rt2x00dev);
-
         rt2500usb_register_write(rt2x00dev, MAC_CSR13, 0x2121);
         rt2500usb_register_write(rt2x00dev, MAC_CSR14, 0x2121);
 
@@ -1027,10 +1033,10 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev,
  */
 static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                     struct sk_buff *skb,
-                                    struct txdata_entry_desc *desc,
+                                    struct txentry_desc *txdesc,
                                     struct ieee80211_tx_control *control)
 {
-        struct skb_desc *skbdesc = get_skb_desc(skb);
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
         __le32 *txd = skbdesc->desc;
         u32 word;
 
@@ -1039,31 +1045,31 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
          */
         rt2x00_desc_read(txd, 1, &word);
         rt2x00_set_field32(&word, TXD_W1_IV_OFFSET, IEEE80211_HEADER);
-        rt2x00_set_field32(&word, TXD_W1_AIFS, desc->aifs);
-        rt2x00_set_field32(&word, TXD_W1_CWMIN, desc->cw_min);
-        rt2x00_set_field32(&word, TXD_W1_CWMAX, desc->cw_max);
+        rt2x00_set_field32(&word, TXD_W1_AIFS, txdesc->aifs);
+        rt2x00_set_field32(&word, TXD_W1_CWMIN, txdesc->cw_min);
+        rt2x00_set_field32(&word, TXD_W1_CWMAX, txdesc->cw_max);
         rt2x00_desc_write(txd, 1, word);
 
         rt2x00_desc_read(txd, 2, &word);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, desc->signal);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, desc->service);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW, desc->length_low);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH, desc->length_high);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, txdesc->signal);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, txdesc->service);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW, txdesc->length_low);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH, txdesc->length_high);
         rt2x00_desc_write(txd, 2, word);
 
         rt2x00_desc_read(txd, 0, &word);
         rt2x00_set_field32(&word, TXD_W0_RETRY_LIMIT, control->retry_limit);
         rt2x00_set_field32(&word, TXD_W0_MORE_FRAG,
-                           test_bit(ENTRY_TXD_MORE_FRAG, &desc->flags));
+                           test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_ACK,
-                           test_bit(ENTRY_TXD_ACK, &desc->flags));
+                           test_bit(ENTRY_TXD_ACK, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_TIMESTAMP,
-                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &desc->flags));
+                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_OFDM,
-                           test_bit(ENTRY_TXD_OFDM_RATE, &desc->flags));
+                           test_bit(ENTRY_TXD_OFDM_RATE, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_NEW_SEQ,
                            !!(control->flags & IEEE80211_TXCTL_FIRST_FRAGMENT));
-        rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+        rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
         rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);
         rt2x00_set_field32(&word, TXD_W0_CIPHER, CIPHER_NONE);
         rt2x00_desc_write(txd, 0, word);
@@ -1088,15 +1094,17 @@ static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
  * TX data initialization
  */
 static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
-                                    unsigned int queue)
+                                    const unsigned int queue)
 {
         u16 reg;
 
-        if (queue != IEEE80211_TX_QUEUE_BEACON)
+        if (queue != RT2X00_BCN_QUEUE_BEACON)
                 return;
 
         rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
         if (!rt2x00_get_field16(reg, TXRX_CSR19_BEACON_GEN)) {
+                rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);
+                rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 1);
                 rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 1);
                 /*
                  * Beacon generation will fail initially.
@@ -1114,42 +1122,68 @@ static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
 /*
  * RX control handlers
  */
-static void rt2500usb_fill_rxdone(struct data_entry *entry,
-                                  struct rxdata_entry_desc *desc)
+static void rt2500usb_fill_rxdone(struct queue_entry *entry,
+                                  struct rxdone_entry_desc *rxdesc)
 {
-        struct skb_desc *skbdesc = get_skb_desc(entry->skb);
-        struct urb *urb = entry->priv;
-        __le32 *rxd = (__le32 *)(entry->skb->data +
-                                 (urb->actual_length - entry->ring->desc_size));
+        struct queue_entry_priv_usb_rx *priv_rx = entry->priv_data;
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
+        __le32 *rxd =
+            (__le32 *)(entry->skb->data +
+                       (priv_rx->urb->actual_length - entry->queue->desc_size));
+        unsigned int offset = entry->queue->desc_size + 2;
         u32 word0;
         u32 word1;
 
+        /*
+         * Copy descriptor to the available headroom inside the skbuffer.
+         */
+        skb_push(entry->skb, offset);
+        memcpy(entry->skb->data, rxd, entry->queue->desc_size);
+        rxd = (__le32 *)entry->skb->data;
+
+        /*
+         * The descriptor is now aligned to 4 bytes and thus it is
+         * now safe to read it on all architectures.
+         */
         rt2x00_desc_read(rxd, 0, &word0);
         rt2x00_desc_read(rxd, 1, &word1);
 
-        desc->flags = 0;
+        rxdesc->flags = 0;
         if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
-                desc->flags |= RX_FLAG_FAILED_FCS_CRC;
+                rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
         if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
-                desc->flags |= RX_FLAG_FAILED_PLCP_CRC;
+                rxdesc->flags |= RX_FLAG_FAILED_PLCP_CRC;
 
         /*
          * Obtain the status about this packet.
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
+         */
+        rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
+        rxdesc->rssi = rt2x00_get_field32(word1, RXD_W1_RSSI) -
+            entry->queue->rt2x00dev->rssi_offset;
+        rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+
+        rxdesc->dev_flags = 0;
+        if (rt2x00_get_field32(word0, RXD_W0_OFDM))
+                rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
+        if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
+                rxdesc->dev_flags |= RXDONE_MY_BSS;
+
+        /*
+         * Adjust the skb memory window to the frame boundaries.
          */
-        desc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
-        desc->rssi = rt2x00_get_field32(word1, RXD_W1_RSSI) -
-            entry->ring->rt2x00dev->rssi_offset;
-        desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
-        desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
-        desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
+        skb_pull(entry->skb, offset);
+        skb_trim(entry->skb, rxdesc->size);
 
         /*
          * Set descriptor and data pointer.
          */
-        skbdesc->desc = entry->skb->data + desc->size;
-        skbdesc->desc_len = entry->ring->desc_size;
         skbdesc->data = entry->skb->data;
-        skbdesc->data_len = desc->size;
+        skbdesc->data_len = rxdesc->size;
+        skbdesc->desc = rxd;
+        skbdesc->desc_len = entry->queue->desc_size;
 }
 
 /*
@@ -1157,10 +1191,10 @@ static void rt2500usb_fill_rxdone(struct data_entry *entry,
  */
 static void rt2500usb_beacondone(struct urb *urb)
 {
-        struct data_entry *entry = (struct data_entry *)urb->context;
-        struct data_ring *ring = entry->ring;
+        struct queue_entry *entry = (struct queue_entry *)urb->context;
+        struct queue_entry_priv_usb_bcn *priv_bcn = entry->priv_data;
 
-        if (!test_bit(DEVICE_ENABLED_RADIO, &ring->rt2x00dev->flags))
+        if (!test_bit(DEVICE_ENABLED_RADIO, &entry->queue->rt2x00dev->flags))
                 return;
 
         /*
@@ -1169,18 +1203,11 @@ static void rt2500usb_beacondone(struct urb *urb)
          * Otherwise we should free the sk_buffer, the device
          * should be doing the rest of the work now.
          */
-        if (ring->index == 1) {
-                rt2x00_ring_index_done_inc(ring);
-                entry = rt2x00_get_data_entry(ring);
-                usb_submit_urb(entry->priv, GFP_ATOMIC);
-                rt2x00_ring_index_inc(ring);
-        } else if (ring->index_done == 1) {
-                entry = rt2x00_get_data_entry_done(ring);
-                if (entry->skb) {
-                        dev_kfree_skb(entry->skb);
-                        entry->skb = NULL;
-                }
-                rt2x00_ring_index_done_inc(ring);
+        if (priv_bcn->guardian_urb == urb) {
+                usb_submit_urb(priv_bcn->urb, GFP_ATOMIC);
+        } else if (priv_bcn->urb == urb) {
+                dev_kfree_skb(entry->skb);
+                entry->skb = NULL;
         }
 }
 
@@ -1191,6 +1218,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
 {
         u16 word;
         u8 *mac;
+        u8 bbp;
 
         rt2x00usb_eeprom_read(rt2x00dev, rt2x00dev->eeprom, EEPROM_SIZE);
 
@@ -1245,9 +1273,17 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 EEPROM(rt2x00dev, "BBPtune: 0x%04x\n", word);
         }
 
+        /*
+         * Switch lower vgc bound to current BBP R17 value,
+         * lower the value a bit for better quality.
+         */
+        rt2500usb_bbp_read(rt2x00dev, 17, &bbp);
+        bbp -= 6;
+
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_VGC, &word);
         if (word == 0xffff) {
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCUPPER, 0x40);
+                rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
                 EEPROM(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);
         }
@@ -1258,6 +1294,9 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_HIGH, 0x41);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R17, word);
                 EEPROM(rt2x00dev, "BBPtune r17: 0x%04x\n", word);
+        } else {
+                rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
+                rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R24, &word);
@@ -1342,8 +1381,27 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Store led mode, for correct led behaviour.
          */
-        rt2x00dev->led_mode =
-            rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
+#ifdef CONFIG_RT2500USB_LEDS
+        value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
+
+        rt2x00dev->led_radio.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_radio.type = LED_TYPE_RADIO;
+        rt2x00dev->led_radio.led_dev.brightness_set =
+            rt2500usb_brightness_set;
+        rt2x00dev->led_radio.led_dev.blink_set =
+            rt2500usb_blink_set;
+        rt2x00dev->led_radio.flags = LED_INITIALIZED;
+
+        if (value == LED_MODE_TXRX_ACTIVITY) {
+                rt2x00dev->led_qual.rt2x00dev = rt2x00dev;
+                rt2x00dev->led_radio.type = LED_TYPE_ACTIVITY;
+                rt2x00dev->led_qual.led_dev.brightness_set =
+                    rt2500usb_brightness_set;
+                rt2x00dev->led_qual.led_dev.blink_set =
+                    rt2500usb_blink_set;
+                rt2x00dev->led_qual.flags = LED_INITIALIZED;
+        }
+#endif /* CONFIG_RT2500USB_LEDS */
 
         /*
          * Check if the BBP tuning should be disabled.
@@ -1550,8 +1608,8 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize hw_mode information.
          */
-        spec->num_modes = 2;
-        spec->num_rates = 12;
+        spec->supported_bands = SUPPORT_BAND_2GHZ;
+        spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;
         spec->tx_power_a = NULL;
         spec->tx_power_bg = txpower;
         spec->tx_power_default = DEFAULT_TXPOWER;
@@ -1572,9 +1630,9 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                 spec->num_channels = ARRAY_SIZE(rf_vals_bg_2525e);
                 spec->channels = rf_vals_bg_2525e;
         } else if (rt2x00_rf(&rt2x00dev->chip, RF5222)) {
+                spec->supported_bands |= SUPPORT_BAND_5GHZ;
                 spec->num_channels = ARRAY_SIZE(rf_vals_5222);
                 spec->channels = rf_vals_5222;
-                spec->num_modes = 3;
         }
 }
 
@@ -1599,9 +1657,11 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)
         rt2500usb_probe_hw_mode(rt2x00dev);
 
         /*
-         * This device requires the beacon ring
+         * This device requires the atim queue
          */
-        __set_bit(DRIVER_REQUIRE_BEACON_RING, &rt2x00dev->flags);
+        __set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);
+        __set_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags);
+        __set_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -1614,125 +1674,58 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)
 /*
  * IEEE80211 stack callback functions.
  */
-static void rt2500usb_configure_filter(struct ieee80211_hw *hw,
-                                       unsigned int changed_flags,
-                                       unsigned int *total_flags,
-                                       int mc_count,
-                                       struct dev_addr_list *mc_list)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-        u16 reg;
-
-        /*
-         * Mask off any flags we are going to ignore from
-         * the total_flags field.
-         */
-        *total_flags &=
-            FIF_ALLMULTI |
-            FIF_FCSFAIL |
-            FIF_PLCPFAIL |
-            FIF_CONTROL |
-            FIF_OTHER_BSS |
-            FIF_PROMISC_IN_BSS;
-
-        /*
-         * Apply some rules to the filters:
-         * - Some filters imply different filters to be set.
-         * - Some things we can't filter out at all.
-         */
-        if (mc_count)
-                *total_flags |= FIF_ALLMULTI;
-        if (*total_flags & FIF_OTHER_BSS ||
-            *total_flags & FIF_PROMISC_IN_BSS)
-                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-
-        /*
-         * Check if there is any work left for us.
-         */
-        if (rt2x00dev->packet_filter == *total_flags)
-                return;
-        rt2x00dev->packet_filter = *total_flags;
-
-        /*
-         * When in atomic context, reschedule and let rt2x00lib
-         * call this function again.
-         */
-        if (in_atomic()) {
-                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
-                return;
-        }
-
-        /*
-         * Start configuration steps.
-         * Note that the version error will always be dropped
-         * and broadcast frames will always be accepted since
-         * there is no filter for it at this time.
-         */
-        rt2500usb_register_read(rt2x00dev, TXRX_CSR2, &reg);
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_CRC,
-                           !(*total_flags & FIF_FCSFAIL));
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_PHYSICAL,
-                           !(*total_flags & FIF_PLCPFAIL));
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_CONTROL,
-                           !(*total_flags & FIF_CONTROL));
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_NOT_TO_ME,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_TODS,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_VERSION_ERROR, 1);
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_MULTICAST,
-                           !(*total_flags & FIF_ALLMULTI));
-        rt2x00_set_field16(&reg, TXRX_CSR2_DROP_BROADCAST, 0);
-        rt2500usb_register_write(rt2x00dev, TXRX_CSR2, reg);
-}
-
 static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
                                    struct sk_buff *skb,
                                    struct ieee80211_tx_control *control)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct usb_device *usb_dev =
-            interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
-        struct skb_desc *desc;
-        struct data_ring *ring;
-        struct data_entry *beacon;
-        struct data_entry *guardian;
+        struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev);
+        struct rt2x00_intf *intf = vif_to_intf(control->vif);
+        struct queue_entry_priv_usb_bcn *priv_bcn;
+        struct skb_frame_desc *skbdesc;
         int pipe = usb_sndbulkpipe(usb_dev, 1);
         int length;
+        u16 reg;
+
+        if (unlikely(!intf->beacon))
+                return -ENOBUFS;
+
+        priv_bcn = intf->beacon->priv_data;
 
         /*
-         * Just in case the ieee80211 doesn't set this,
-         * but we need this queue set for the descriptor
-         * initialization.
+         * Add the descriptor in front of the skb.
          */
-        control->queue = IEEE80211_TX_QUEUE_BEACON;
-        ring = rt2x00lib_get_ring(rt2x00dev, control->queue);
+        skb_push(skb, intf->beacon->queue->desc_size);
+        memset(skb->data, 0, intf->beacon->queue->desc_size);
 
         /*
-         * Obtain 2 entries, one for the guardian byte,
-         * the second for the actual beacon.
+         * Fill in skb descriptor
          */
-        guardian = rt2x00_get_data_entry(ring);
-        rt2x00_ring_index_inc(ring);
-        beacon = rt2x00_get_data_entry(ring);
+        skbdesc = get_skb_frame_desc(skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
+        skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
+        skbdesc->data = skb->data + intf->beacon->queue->desc_size;
+        skbdesc->data_len = skb->len - intf->beacon->queue->desc_size;
+        skbdesc->desc = skb->data;
+        skbdesc->desc_len = intf->beacon->queue->desc_size;
+        skbdesc->entry = intf->beacon;
 
         /*
-         * Add the descriptor in front of the skb.
+         * Disable beaconing while we are reloading the beacon data,
+         * otherwise we might be sending out invalid data.
          */
-        skb_push(skb, ring->desc_size);
-        memset(skb->data, 0, ring->desc_size);
+        rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
+        rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 0);
+        rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 0);
+        rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);
+        rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
 
         /*
-         * Fill in skb descriptor
+         * mac80211 doesn't provide the control->queue variable
+         * for beacons. Set our own queue identification so
+         * it can be used during descriptor initialization.
          */
-        desc = get_skb_desc(skb);
-        desc->desc_len = ring->desc_size;
-        desc->data_len = skb->len - ring->desc_size;
-        desc->desc = skb->data;
-        desc->data = skb->data + ring->desc_size;
-        desc->ring = ring;
-        desc->entry = beacon;
-
+        control->queue = RT2X00_BCN_QUEUE_BEACON;
         rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
 
         /*
@@ -1742,27 +1735,29 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
          */
         length = rt2500usb_get_tx_data_len(rt2x00dev, skb);
 
-        usb_fill_bulk_urb(beacon->priv, usb_dev, pipe,
-                          skb->data, length, rt2500usb_beacondone, beacon);
+        usb_fill_bulk_urb(priv_bcn->urb, usb_dev, pipe,
+                          skb->data, length, rt2500usb_beacondone,
+                          intf->beacon);
 
         /*
          * Second we need to create the guardian byte.
          * We only need a single byte, so lets recycle
          * the 'flags' field we are not using for beacons.
          */
-        guardian->flags = 0;
-        usb_fill_bulk_urb(guardian->priv, usb_dev, pipe,
-                          &guardian->flags, 1, rt2500usb_beacondone, guardian);
+        priv_bcn->guardian_data = 0;
+        usb_fill_bulk_urb(priv_bcn->guardian_urb, usb_dev, pipe,
+                          &priv_bcn->guardian_data, 1, rt2500usb_beacondone,
+                          intf->beacon);
 
         /*
          * Send out the guardian byte.
          */
-        usb_submit_urb(guardian->priv, GFP_ATOMIC);
+        usb_submit_urb(priv_bcn->guardian_urb, GFP_ATOMIC);
 
         /*
          * Enable beacon generation.
          */
-        rt2500usb_kick_tx_queue(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
+        rt2500usb_kick_tx_queue(rt2x00dev, control->queue);
 
         return 0;
 }
@@ -1775,7 +1770,7 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .config_interface       = rt2x00mac_config_interface,
-        .configure_filter       = rt2500usb_configure_filter,
+        .configure_filter       = rt2x00mac_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
@@ -1798,19 +1793,50 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {
         .get_tx_data_len        = rt2500usb_get_tx_data_len,
         .kick_tx_queue          = rt2500usb_kick_tx_queue,
         .fill_rxdone            = rt2500usb_fill_rxdone,
-        .config_mac_addr        = rt2500usb_config_mac_addr,
-        .config_bssid           = rt2500usb_config_bssid,
-        .config_type            = rt2500usb_config_type,
-        .config_preamble        = rt2500usb_config_preamble,
+        .config_filter          = rt2500usb_config_filter,
+        .config_intf            = rt2500usb_config_intf,
+        .config_erp             = rt2500usb_config_erp,
         .config                 = rt2500usb_config,
 };
 
+static const struct data_queue_desc rt2500usb_queue_rx = {
+        .entry_num              = RX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = RXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_usb_rx),
+};
+
+static const struct data_queue_desc rt2500usb_queue_tx = {
+        .entry_num              = TX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_usb_tx),
+};
+
+static const struct data_queue_desc rt2500usb_queue_bcn = {
+        .entry_num              = BEACON_ENTRIES,
+        .data_size              = MGMT_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_usb_bcn),
+};
+
+static const struct data_queue_desc rt2500usb_queue_atim = {
+        .entry_num              = ATIM_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_usb_tx),
+};
+
 static const struct rt2x00_ops rt2500usb_ops = {
         .name           = KBUILD_MODNAME,
-        .rxd_size       = RXD_DESC_SIZE,
-        .txd_size       = TXD_DESC_SIZE,
+        .max_sta_intf   = 1,
+        .max_ap_intf    = 1,
         .eeprom_size    = EEPROM_SIZE,
         .rf_size        = RF_SIZE,
+        .rx             = &rt2500usb_queue_rx,
+        .tx             = &rt2500usb_queue_tx,
+        .bcn            = &rt2500usb_queue_bcn,
+        .atim           = &rt2500usb_queue_atim,
         .lib            = &rt2500usb_rt2x00_ops,
         .hw             = &rt2500usb_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h
index 9e0433722e3d..a37a068d0c71 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.h
+++ b/drivers/net/wireless/rt2x00/rt2500usb.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -135,7 +135,7 @@
  * Misc MAC_CSR registers.
  * MAC_CSR9: Timer control.
  * MAC_CSR10: Slot time.
- * MAC_CSR11: IFS.
+ * MAC_CSR11: SIFS.
  * MAC_CSR12: EIFS.
  * MAC_CSR13: Power mode0.
  * MAC_CSR14: Power mode1.
@@ -686,6 +686,7 @@
  */
 #define EEPROM_BBPTUNE_VGC              0x0034
 #define EEPROM_BBPTUNE_VGCUPPER         FIELD16(0x00ff)
+#define EEPROM_BBPTUNE_VGCLOWER         FIELD16(0xff00)
 
 /*
  * EEPROM BBP R17 Tuning.
@@ -786,8 +787,8 @@
 #define RXD_W3_EIV                      FIELD32(0xffffffff)
 
 /*
- * Macro's for converting txpower from EEPROM to dscape value
- * and from dscape value to register value.
+ * Macro's for converting txpower from EEPROM to mac80211 value
+ * and from mac80211 value to register value.
  */
 #define MIN_TXPOWER     0
 #define MAX_TXPOWER     31
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 6c725422af5a..57bdc153952f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -27,23 +27,24 @@
 #define RT2X00_H
 
 #include <linux/bitops.h>
-#include <linux/prefetch.h>
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
 #include <linux/firmware.h>
+#include <linux/leds.h>
 #include <linux/mutex.h>
 #include <linux/etherdevice.h>
 
 #include <net/mac80211.h>
 
 #include "rt2x00debug.h"
+#include "rt2x00leds.h"
 #include "rt2x00reg.h"
-#include "rt2x00ring.h"
+#include "rt2x00queue.h"
 
 /*
  * Module information.
  */
-#define DRV_VERSION     "2.0.14"
+#define DRV_VERSION     "2.1.4"
 #define DRV_PROJECT     "http://rt2x00.serialmonkey.com"
 
 /*
@@ -91,26 +92,6 @@
         DEBUG_PRINTK(__dev, KERN_DEBUG, "EEPROM recovery", __msg, ##__args)
 
 /*
- * Ring sizes.
- * Ralink PCI devices demand the Frame size to be a multiple of 128 bytes.
- * DATA_FRAME_SIZE is used for TX, RX, ATIM and PRIO rings.
- * MGMT_FRAME_SIZE is used for the BEACON ring.
- */
-#define DATA_FRAME_SIZE 2432
-#define MGMT_FRAME_SIZE 256
-
-/*
- * Number of entries in a packet ring.
- * PCI devices only need 1 Beacon entry,
- * but USB devices require a second because they
- * have to send a Guardian byte first.
- */
-#define RX_ENTRIES      12
-#define TX_ENTRIES      12
-#define ATIM_ENTRIES    1
-#define BEACON_ENTRIES  2
-
-/*
  * Standard timing and size defines.
  * These values should follow the ieee80211 specifications.
  */
@@ -364,20 +345,22 @@ static inline int rt2x00_update_ant_rssi(struct link *link, int rssi)
 
 /*
  * Interface structure
- * Configuration details about the current interface.
+ * Per interface configuration details, this structure
+ * is allocated as the private data for ieee80211_vif.
  */
-struct interface {
+struct rt2x00_intf {
         /*
-         * Interface identification. The value is assigned
-         * to us by the 80211 stack, and is used to request
-         * new beacons.
+         * All fields within the rt2x00_intf structure
+         * must be protected with a spinlock.
          */
-        struct ieee80211_vif *id;
+        spinlock_t lock;
 
         /*
-         * Current working type (IEEE80211_IF_TYPE_*).
+         * BSS configuration. Copied from the structure
+         * passed to us through the bss_info_changed()
+         * callback funtion.
          */
-        int type;
+        struct ieee80211_bss_conf conf;
 
         /*
          * MAC of the device.
@@ -388,42 +371,60 @@ struct interface {
          * BBSID of the AP to associate with.
          */
         u8 bssid[ETH_ALEN];
-};
 
-static inline int is_interface_present(struct interface *intf)
-{
-        return !!intf->id;
-}
+        /*
+         * Entry in the beacon queue which belongs to
+         * this interface. Each interface has its own
+         * dedicated beacon entry.
+         */
+        struct queue_entry *beacon;
+
+        /*
+         * Actions that needed rescheduling.
+         */
+        unsigned int delayed_flags;
+#define DELAYED_UPDATE_BEACON           0x00000001
+#define DELAYED_CONFIG_ERP              0x00000002
+#define DELAYED_LED_ASSOC               0x00000004
+};
 
-static inline int is_interface_type(struct interface *intf, int type)
+static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
 {
-        return intf->type == type;
+        return (struct rt2x00_intf *)vif->drv_priv;
 }
 
-/*
+/**
+ * struct hw_mode_spec: Hardware specifications structure
+ *
  * Details about the supported modes, rates and channels
  * of a particular chipset. This is used by rt2x00lib
  * to build the ieee80211_hw_mode array for mac80211.
+ *
+ * @supported_bands: Bitmask contained the supported bands (2.4GHz, 5.2GHz).
+ * @supported_rates: Rate types which are supported (CCK, OFDM).
+ * @num_channels: Number of supported channels. This is used as array size
+ *      for @tx_power_a, @tx_power_bg and @channels.
+ * channels: Device/chipset specific channel values (See &struct rf_channel).
+ * @tx_power_a: TX power values for all 5.2GHz channels (may be NULL).
+ * @tx_power_bg: TX power values for all 2.4GHz channels (may be NULL).
+ * @tx_power_default: Default TX power value to use when either
+ *      @tx_power_a or @tx_power_bg is missing.
  */
 struct hw_mode_spec {
-        /*
-         * Number of modes, rates and channels.
-         */
-        int num_modes;
-        int num_rates;
-        int num_channels;
+        unsigned int supported_bands;
+#define SUPPORT_BAND_2GHZ       0x00000001
+#define SUPPORT_BAND_5GHZ       0x00000002
+
+        unsigned int supported_rates;
+#define SUPPORT_RATE_CCK        0x00000001
+#define SUPPORT_RATE_OFDM       0x00000002
+
+        unsigned int num_channels;
+        const struct rf_channel *channels;
 
-        /*
-         * txpower values.
-         */
         const u8 *tx_power_a;
         const u8 *tx_power_bg;
         u8 tx_power_default;
-
-        /*
-         * Device/chipset specific value.
-         */
-        const struct rf_channel *channels;
 };
 
 /*
@@ -439,10 +440,10 @@ struct rt2x00lib_conf {
 
         struct antenna_setup ant;
 
-        int phymode;
+        enum ieee80211_band band;
 
-        int basic_rates;
-        int slot_time;
+        u32 basic_rates;
+        u32 slot_time;
 
         short sifs;
         short pifs;
@@ -451,6 +452,47 @@ struct rt2x00lib_conf {
 };
 
 /*
+ * Configuration structure for erp settings.
+ */
+struct rt2x00lib_erp {
+        int short_preamble;
+
+        int ack_timeout;
+        int ack_consume_time;
+};
+
+/*
+ * Configuration structure wrapper around the
+ * rt2x00 interface configuration handler.
+ */
+struct rt2x00intf_conf {
+        /*
+         * Interface type
+         */
+        enum ieee80211_if_types type;
+
+        /*
+         * TSF sync value, this is dependant on the operation type.
+         */
+        enum tsf_sync sync;
+
+        /*
+         * The MAC and BSSID addressess are simple array of bytes,
+         * these arrays are little endian, so when sending the addressess
+         * to the drivers, copy the it into a endian-signed variable.
+         *
+         * Note that all devices (except rt2500usb) have 32 bits
+         * register word sizes. This means that whatever variable we
+         * pass _must_ be a multiple of 32 bits. Otherwise the device
+         * might not accept what we are sending to it.
+         * This will also make it easier for the driver to write
+         * the data to the device.
+         */
+        __le32 mac[2];
+        __le32 bssid[2];
+};
+
+/*
  * rt2x00lib callback functions.
  */
 struct rt2x00lib_ops {
@@ -464,6 +506,7 @@ struct rt2x00lib_ops {
          */
         int (*probe_hw) (struct rt2x00_dev *rt2x00dev);
         char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev);
+        u16 (*get_firmware_crc) (void *data, const size_t len);
         int (*load_firmware) (struct rt2x00_dev *rt2x00dev, void *data,
                               const size_t len);
 
@@ -474,12 +517,12 @@ struct rt2x00lib_ops {
         void (*uninitialize) (struct rt2x00_dev *rt2x00dev);
 
         /*
-         * Ring initialization handlers
+         * queue initialization handlers
          */
         void (*init_rxentry) (struct rt2x00_dev *rt2x00dev,
-                              struct data_entry *entry);
+                              struct queue_entry *entry);
         void (*init_txentry) (struct rt2x00_dev *rt2x00dev,
-                              struct data_entry *entry);
+                              struct queue_entry *entry);
 
         /*
          * Radio control handlers.
@@ -497,35 +540,40 @@ struct rt2x00lib_ops {
          */
         void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev,
                                struct sk_buff *skb,
-                               struct txdata_entry_desc *desc,
+                               struct txentry_desc *txdesc,
                                struct ieee80211_tx_control *control);
         int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,
-                              struct data_ring *ring, struct sk_buff *skb,
+                              struct data_queue *queue, struct sk_buff *skb,
                               struct ieee80211_tx_control *control);
         int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,
                                 struct sk_buff *skb);
         void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,
-                               unsigned int queue);
+                               const unsigned int queue);
 
         /*
          * RX control handlers
          */
-        void (*fill_rxdone) (struct data_entry *entry,
-                             struct rxdata_entry_desc *desc);
+        void (*fill_rxdone) (struct queue_entry *entry,
+                             struct rxdone_entry_desc *rxdesc);
 
         /*
          * Configuration handlers.
          */
-        void (*config_mac_addr) (struct rt2x00_dev *rt2x00dev, __le32 *mac);
-        void (*config_bssid) (struct rt2x00_dev *rt2x00dev, __le32 *bssid);
-        void (*config_type) (struct rt2x00_dev *rt2x00dev, const int type,
-                                                           const int tsf_sync);
-        void (*config_preamble) (struct rt2x00_dev *rt2x00dev,
-                                 const int short_preamble,
-                                 const int ack_timeout,
-                                 const int ack_consume_time);
-        void (*config) (struct rt2x00_dev *rt2x00dev, const unsigned int flags,
-                        struct rt2x00lib_conf *libconf);
+        void (*config_filter) (struct rt2x00_dev *rt2x00dev,
+                               const unsigned int filter_flags);
+        void (*config_intf) (struct rt2x00_dev *rt2x00dev,
+                             struct rt2x00_intf *intf,
+                             struct rt2x00intf_conf *conf,
+                             const unsigned int flags);
+#define CONFIG_UPDATE_TYPE              ( 1 << 1 )
+#define CONFIG_UPDATE_MAC               ( 1 << 2 )
+#define CONFIG_UPDATE_BSSID             ( 1 << 3 )
+
+        void (*config_erp) (struct rt2x00_dev *rt2x00dev,
+                            struct rt2x00lib_erp *erp);
+        void (*config) (struct rt2x00_dev *rt2x00dev,
+                        struct rt2x00lib_conf *libconf,
+                        const unsigned int flags);
 #define CONFIG_UPDATE_PHYMODE           ( 1 << 1 )
 #define CONFIG_UPDATE_CHANNEL           ( 1 << 2 )
 #define CONFIG_UPDATE_TXPOWER           ( 1 << 3 )
@@ -540,10 +588,14 @@ struct rt2x00lib_ops {
  */
 struct rt2x00_ops {
         const char *name;
-        const unsigned int rxd_size;
-        const unsigned int txd_size;
+        const unsigned int max_sta_intf;
+        const unsigned int max_ap_intf;
         const unsigned int eeprom_size;
         const unsigned int rf_size;
+        const struct data_queue_desc *rx;
+        const struct data_queue_desc *tx;
+        const struct data_queue_desc *bcn;
+        const struct data_queue_desc *atim;
         const struct rt2x00lib_ops *lib;
         const struct ieee80211_ops *hw;
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
@@ -569,8 +621,11 @@ enum rt2x00_flags {
         /*
          * Driver features
          */
+        DRIVER_SUPPORT_MIXED_INTERFACES,
         DRIVER_REQUIRE_FIRMWARE,
-        DRIVER_REQUIRE_BEACON_RING,
+        DRIVER_REQUIRE_BEACON_GUARD,
+        DRIVER_REQUIRE_ATIM_QUEUE,
+        DRIVER_REQUIRE_SCHEDULED,
 
         /*
          * Driver configuration
@@ -582,7 +637,6 @@ enum rt2x00_flags {
         CONFIG_EXTERNAL_LNA_BG,
         CONFIG_DOUBLE_ANTENNA,
         CONFIG_DISABLE_LINK_TUNING,
-        CONFIG_SHORT_PREAMBLE,
 };
 
 /*
@@ -597,8 +651,10 @@ struct rt2x00_dev {
          * macro's should be used for correct typecasting.
          */
         void *dev;
-#define rt2x00dev_pci(__dev)    ( (struct pci_dev*)(__dev)->dev )
-#define rt2x00dev_usb(__dev)    ( (struct usb_interface*)(__dev)->dev )
+#define rt2x00dev_pci(__dev)    ( (struct pci_dev *)(__dev)->dev )
+#define rt2x00dev_usb(__dev)    ( (struct usb_interface *)(__dev)->dev )
+#define rt2x00dev_usb_dev(__dev)\
+        ( (struct usb_device *)interface_to_usbdev(rt2x00dev_usb(__dev)) )
 
         /*
          * Callback functions.
@@ -609,18 +665,15 @@ struct rt2x00_dev {
          * IEEE80211 control structure.
          */
         struct ieee80211_hw *hw;
-        struct ieee80211_hw_mode *hwmodes;
-        unsigned int curr_hwmode;
-#define HWMODE_B        0
-#define HWMODE_G        1
-#define HWMODE_A        2
+        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
+        enum ieee80211_band curr_band;
 
         /*
          * rfkill structure for RF state switching support.
          * This will only be compiled in when required.
          */
 #ifdef CONFIG_RT2X00_LIB_RFKILL
-unsigned long rfkill_state;
+        unsigned long rfkill_state;
 #define RFKILL_STATE_ALLOCATED          1
 #define RFKILL_STATE_REGISTERED         2
         struct rfkill *rfkill;
@@ -636,6 +689,17 @@ unsigned long rfkill_state;
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 
         /*
+         * LED structure for changing the LED status
+         * by mac8011 or the kernel.
+         */
+#ifdef CONFIG_RT2X00_LIB_LEDS
+        struct rt2x00_led led_radio;
+        struct rt2x00_led led_assoc;
+        struct rt2x00_led led_qual;
+        u16 led_mcu_reg;
+#endif /* CONFIG_RT2X00_LIB_LEDS */
+
+        /*
          * Device flags.
          * In these flags the current status and some
          * of the device capabilities are stored.
@@ -661,11 +725,13 @@ unsigned long rfkill_state;
 
         /*
          * Register pointers
-         * csr_addr: Base register address. (PCI)
-         * csr_cache: CSR cache for usb_control_msg. (USB)
+         * csr.base: CSR base register address. (PCI)
+         * csr.cache: CSR cache for usb_control_msg. (USB)
          */
-        void __iomem *csr_addr;
-        void *csr_cache;
+        union csr {
+                void __iomem *base;
+                void *cache;
+        } csr;
 
         /*
          * Mutex to protect register accesses on USB devices.
@@ -687,9 +753,14 @@ unsigned long rfkill_state;
         unsigned int packet_filter;
 
         /*
-         * Interface configuration.
+         * Interface details:
+         *  - Open ap interface count.
+         *  - Open sta interface count.
+         *  - Association count.
          */
-        struct interface interface;
+        unsigned int intf_ap_count;
+        unsigned int intf_sta_count;
+        unsigned int intf_associated;
 
         /*
          * Link quality
@@ -722,16 +793,6 @@ unsigned long rfkill_state;
         u16 tx_power;
 
         /*
-         * LED register (for rt61pci & rt73usb).
-         */
-        u16 led_reg;
-
-        /*
-         * Led mode (LED_MODE_*)
-         */
-        u8 led_mode;
-
-        /*
          * Rssi <-> Dbm offset
          */
         u8 rssi_offset;
@@ -755,19 +816,18 @@ unsigned long rfkill_state;
         /*
          * Scheduled work.
          */
-        struct work_struct beacon_work;
+        struct work_struct intf_work;
         struct work_struct filter_work;
-        struct work_struct config_work;
 
         /*
-         * Data ring arrays for RX, TX and Beacon.
-         * The Beacon array also contains the Atim ring
+         * Data queue arrays for RX, TX and Beacon.
+         * The Beacon array also contains the Atim queue
          * if that is supported by the device.
          */
-        int data_rings;
-        struct data_ring *rx;
-        struct data_ring *tx;
-        struct data_ring *bcn;
+        int data_queues;
+        struct data_queue *rx;
+        struct data_queue *tx;
+        struct data_queue *bcn;
 
         /*
          * Firmware image.
@@ -776,37 +836,6 @@ unsigned long rfkill_state;
 };
 
 /*
- * For-each loop for the ring array.
- * All rings have been allocated as a single array,
- * this means we can create a very simply loop macro
- * that is capable of looping through all rings.
- * ring_end(), txring_end() and ring_loop() are helper macro's which
- * should not be used directly. Instead the following should be used:
- * ring_for_each() - Loops through all rings (RX, TX, Beacon & Atim)
- * txring_for_each() - Loops through TX data rings (TX only)
- * txringall_for_each() - Loops through all TX rings (TX, Beacon & Atim)
- */
-#define ring_end(__dev) \
-        &(__dev)->rx[(__dev)->data_rings]
-
-#define txring_end(__dev) \
-        &(__dev)->tx[(__dev)->hw->queues]
-
-#define ring_loop(__entry, __start, __end)                      \
-        for ((__entry) = (__start);                             \
-             prefetch(&(__entry)[1]), (__entry) != (__end);     \
-             (__entry) = &(__entry)[1])
-
-#define ring_for_each(__dev, __entry) \
-        ring_loop(__entry, (__dev)->rx, ring_end(__dev))
-
-#define txring_for_each(__dev, __entry) \
-        ring_loop(__entry, (__dev)->tx, txring_end(__dev))
-
-#define txringall_for_each(__dev, __entry) \
-        ring_loop(__entry, (__dev)->tx, ring_end(__dev))
-
-/*
  * Generic RF access.
  * The RF is being accessed by word index.
  */
@@ -898,20 +927,43 @@ static inline u16 get_duration_res(const unsigned int size, const u8 rate)
         return ((size * 8 * 10) % rate);
 }
 
-/*
- * Library functions.
+/**
+ * rt2x00queue_get_queue - Convert mac80211 queue index to rt2x00 queue
+ * @rt2x00dev: Pointer to &struct rt2x00_dev.
+ * @queue: mac80211/rt2x00 queue index
+ *      (see &enum ieee80211_tx_queue and &enum rt2x00_bcn_queue).
+ */
+struct data_queue *rt2x00queue_get_queue(struct rt2x00_dev *rt2x00dev,
+                                         const unsigned int queue);
+
+/**
+ * rt2x00queue_get_entry - Get queue entry where the given index points to.
+ * @rt2x00dev: Pointer to &struct rt2x00_dev.
+ * @index: Index identifier for obtaining the correct index.
+ */
+struct queue_entry *rt2x00queue_get_entry(struct data_queue *queue,
+                                          enum queue_index index);
+
+/**
+ * rt2x00queue_index_inc - Index incrementation function
+ * @queue: Queue (&struct data_queue) to perform the action on.
+ * @action: Index type (&enum queue_index) to perform the action on.
+ *
+ * This function will increase the requested index on the queue,
+ * it will grab the appropriate locks and handle queue overflow events by
+ * resetting the index to the start of the queue.
  */
-struct data_ring *rt2x00lib_get_ring(struct rt2x00_dev *rt2x00dev,
-                                     const unsigned int queue);
+void rt2x00queue_index_inc(struct data_queue *queue, enum queue_index index);
+
 
 /*
  * Interrupt context handlers.
  */
 void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev);
-void rt2x00lib_txdone(struct data_entry *entry,
-                      const int status, const int retry);
-void rt2x00lib_rxdone(struct data_entry *entry, struct sk_buff *skb,
-                      struct rxdata_entry_desc *desc);
+void rt2x00lib_txdone(struct queue_entry *entry,
+                      struct txdone_entry_desc *txdesc);
+void rt2x00lib_rxdone(struct queue_entry *entry,
+                      struct rxdone_entry_desc *rxdesc);
 
 /*
  * TX descriptor initializer
@@ -935,6 +987,10 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
 int rt2x00mac_config_interface(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif,
                                struct ieee80211_if_conf *conf);
+void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
+                                unsigned int changed_flags,
+                                unsigned int *total_flags,
+                                int mc_count, struct dev_addr_list *mc_list);
 int rt2x00mac_get_stats(struct ieee80211_hw *hw,
                         struct ieee80211_low_level_stats *stats);
 int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 07adc576db49..a9930a03f450 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -29,64 +29,78 @@
 #include "rt2x00.h"
 #include "rt2x00lib.h"
 
-
-/*
- * The MAC and BSSID addressess are simple array of bytes,
- * these arrays are little endian, so when sending the addressess
- * to the drivers, copy the it into a endian-signed variable.
- *
- * Note that all devices (except rt2500usb) have 32 bits
- * register word sizes. This means that whatever variable we
- * pass _must_ be a multiple of 32 bits. Otherwise the device
- * might not accept what we are sending to it.
- * This will also make it easier for the driver to write
- * the data to the device.
- *
- * Also note that when NULL is passed as address the
- * we will send 00:00:00:00:00 to the device to clear the address.
- * This will prevent the device being confused when it wants
- * to ACK frames or consideres itself associated.
- */
-void rt2x00lib_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *mac)
-{
-        __le32 reg[2];
-
-        memset(&reg, 0, sizeof(reg));
-        if (mac)
-                memcpy(&reg, mac, ETH_ALEN);
-
-        rt2x00dev->ops->lib->config_mac_addr(rt2x00dev, &reg[0]);
-}
-
-void rt2x00lib_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid)
+void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
+                           struct rt2x00_intf *intf,
+                           enum ieee80211_if_types type,
+                           u8 *mac, u8 *bssid)
 {
-        __le32 reg[2];
+        struct rt2x00intf_conf conf;
+        unsigned int flags = 0;
 
-        memset(&reg, 0, sizeof(reg));
-        if (bssid)
-                memcpy(&reg, bssid, ETH_ALEN);
-
-        rt2x00dev->ops->lib->config_bssid(rt2x00dev, &reg[0]);
-}
-
-void rt2x00lib_config_type(struct rt2x00_dev *rt2x00dev, const int type)
-{
-        int tsf_sync;
+        conf.type = type;
 
         switch (type) {
         case IEEE80211_IF_TYPE_IBSS:
         case IEEE80211_IF_TYPE_AP:
-                tsf_sync = TSF_SYNC_BEACON;
+                conf.sync = TSF_SYNC_BEACON;
                 break;
         case IEEE80211_IF_TYPE_STA:
-                tsf_sync = TSF_SYNC_INFRA;
+                conf.sync = TSF_SYNC_INFRA;
                 break;
         default:
-                tsf_sync = TSF_SYNC_NONE;
+                conf.sync = TSF_SYNC_NONE;
                 break;
         }
 
-        rt2x00dev->ops->lib->config_type(rt2x00dev, type, tsf_sync);
+        /*
+         * Note that when NULL is passed as address we will send
+         * 00:00:00:00:00 to the device to clear the address.
+         * This will prevent the device being confused when it wants
+         * to ACK frames or consideres itself associated.
+         */
+        memset(&conf.mac, 0, sizeof(conf.mac));
+        if (mac)
+                memcpy(&conf.mac, mac, ETH_ALEN);
+
+        memset(&conf.bssid, 0, sizeof(conf.bssid));
+        if (bssid)
+                memcpy(&conf.bssid, bssid, ETH_ALEN);
+
+        flags |= CONFIG_UPDATE_TYPE;
+        if (mac || (!rt2x00dev->intf_ap_count && !rt2x00dev->intf_sta_count))
+                flags |= CONFIG_UPDATE_MAC;
+        if (bssid || (!rt2x00dev->intf_ap_count && !rt2x00dev->intf_sta_count))
+                flags |= CONFIG_UPDATE_BSSID;
+
+        rt2x00dev->ops->lib->config_intf(rt2x00dev, intf, &conf, flags);
+}
+
+void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
+                          struct rt2x00_intf *intf,
+                          struct ieee80211_bss_conf *bss_conf)
+{
+        struct rt2x00lib_erp erp;
+
+        memset(&erp, 0, sizeof(erp));
+
+        erp.short_preamble = bss_conf->use_short_preamble;
+        erp.ack_timeout = PLCP + get_duration(ACK_SIZE, 10);
+        erp.ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10);
+
+        if (rt2x00dev->hw->conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME)
+                erp.ack_timeout += SHORT_DIFS;
+        else
+                erp.ack_timeout += DIFS;
+
+        if (bss_conf->use_short_preamble) {
+                erp.ack_timeout += SHORT_PREAMBLE;
+                erp.ack_consume_time += SHORT_PREAMBLE;
+        } else {
+                erp.ack_timeout += PREAMBLE;
+                erp.ack_consume_time += PREAMBLE;
+        }
+
+        rt2x00dev->ops->lib->config_erp(rt2x00dev, &erp);
 }
 
 void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
@@ -113,7 +127,7 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
          * The latter is required since we need to recalibrate the
          * noise-sensitivity ratio for the new setup.
          */
-        rt2x00dev->ops->lib->config(rt2x00dev, CONFIG_UPDATE_ANTENNA, &libconf);
+        rt2x00dev->ops->lib->config(rt2x00dev, &libconf, CONFIG_UPDATE_ANTENNA);
         rt2x00lib_reset_link_tuner(rt2x00dev);
 
         rt2x00dev->link.ant.active.rx = libconf.ant.rx;
@@ -123,12 +137,26 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
                 rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);
 }
 
+static u32 rt2x00lib_get_basic_rates(struct ieee80211_supported_band *band)
+{
+        const struct rt2x00_rate *rate;
+        unsigned int i;
+        u32 mask = 0;
+
+        for (i = 0; i < band->n_bitrates; i++) {
+                rate = rt2x00_get_rate(band->bitrates[i].hw_value);
+                if (rate->flags & DEV_RATE_BASIC)
+                        mask |= rate->ratemask;
+        }
+
+        return mask;
+}
+
 void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
                       struct ieee80211_conf *conf, const int force_config)
 {
         struct rt2x00lib_conf libconf;
-        struct ieee80211_hw_mode *mode;
-        struct ieee80211_rate *rate;
+        struct ieee80211_supported_band *band;
         struct antenna_setup *default_ant = &rt2x00dev->default_ant;
         struct antenna_setup *active_ant = &rt2x00dev->link.ant.active;
         int flags = 0;
@@ -147,9 +175,9 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
          * Check which configuration options have been
          * updated and should be send to the device.
          */
-        if (rt2x00dev->rx_status.phymode != conf->phymode)
+        if (rt2x00dev->rx_status.band != conf->channel->band)
                 flags |= CONFIG_UPDATE_PHYMODE;
-        if (rt2x00dev->rx_status.channel != conf->channel)
+        if (rt2x00dev->rx_status.freq != conf->channel->center_freq)
                 flags |= CONFIG_UPDATE_CHANNEL;
         if (rt2x00dev->tx_power != conf->power_level)
                 flags |= CONFIG_UPDATE_TXPOWER;
@@ -204,33 +232,15 @@ config:
         memset(&libconf, 0, sizeof(libconf));
 
         if (flags & CONFIG_UPDATE_PHYMODE) {
-                switch (conf->phymode) {
-                case MODE_IEEE80211A:
-                        libconf.phymode = HWMODE_A;
-                        break;
-                case MODE_IEEE80211B:
-                        libconf.phymode = HWMODE_B;
-                        break;
-                case MODE_IEEE80211G:
-                        libconf.phymode = HWMODE_G;
-                        break;
-                default:
-                        ERROR(rt2x00dev,
-                              "Attempt to configure unsupported mode (%d)"
-                              "Defaulting to 802.11b", conf->phymode);
-                        libconf.phymode = HWMODE_B;
-                }
-
-                mode = &rt2x00dev->hwmodes[libconf.phymode];
-                rate = &mode->rates[mode->num_rates - 1];
-
-                libconf.basic_rates =
-                    DEVICE_GET_RATE_FIELD(rate->val, RATEMASK) & DEV_BASIC_RATEMASK;
+                band = &rt2x00dev->bands[conf->channel->band];
+
+                libconf.band = conf->channel->band;
+                libconf.basic_rates = rt2x00lib_get_basic_rates(band);
         }
 
         if (flags & CONFIG_UPDATE_CHANNEL) {
                 memcpy(&libconf.rf,
-                       &rt2x00dev->spec.channels[conf->channel_val],
+                       &rt2x00dev->spec.channels[conf->channel->hw_value],
                        sizeof(libconf.rf));
         }
 
@@ -266,7 +276,7 @@ config:
         /*
          * Start configuration.
          */
-        rt2x00dev->ops->lib->config(rt2x00dev, flags, &libconf);
+        rt2x00dev->ops->lib->config(rt2x00dev, &libconf, flags);
 
         /*
          * Some configuration changes affect the link quality
@@ -276,12 +286,11 @@ config:
                 rt2x00lib_reset_link_tuner(rt2x00dev);
 
         if (flags & CONFIG_UPDATE_PHYMODE) {
-                rt2x00dev->curr_hwmode = libconf.phymode;
-                rt2x00dev->rx_status.phymode = conf->phymode;
+                rt2x00dev->curr_band = conf->channel->band;
+                rt2x00dev->rx_status.band = conf->channel->band;
         }
 
-        rt2x00dev->rx_status.freq = conf->freq;
-        rt2x00dev->rx_status.channel = conf->channel;
+        rt2x00dev->rx_status.freq = conf->channel->center_freq;
         rt2x00dev->tx_power = conf->power_level;
 
         if (flags & CONFIG_UPDATE_ANTENNA) {
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index b44a9f4b9b7f..bfab3b8780d6 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 #include "rt2x00lib.h"
 #include "rt2x00dump.h"
 
-#define PRINT_LINE_LEN_MAX 32
+#define MAX_LINE_LENGTH 64
 
 struct rt2x00debug_intf {
         /*
@@ -60,8 +60,9 @@ struct rt2x00debug_intf {
          *     - eeprom offset/value files
          *     - bbp offset/value files
          *     - rf offset/value files
-         *   - frame dump folder
+         *   - queue folder
          *     - frame dump file
+         *     - queue stats file
          */
         struct dentry *driver_folder;
         struct dentry *driver_entry;
@@ -76,8 +77,9 @@ struct rt2x00debug_intf {
         struct dentry *bbp_val_entry;
         struct dentry *rf_off_entry;
         struct dentry *rf_val_entry;
-        struct dentry *frame_folder;
-        struct dentry *frame_dump_entry;
+        struct dentry *queue_folder;
+        struct dentry *queue_frame_dump_entry;
+        struct dentry *queue_stats_entry;
 
         /*
          * The frame dump file only allows a single reader,
@@ -116,7 +118,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
                             struct sk_buff *skb)
 {
         struct rt2x00debug_intf *intf = rt2x00dev->debugfs_intf;
-        struct skb_desc *desc = get_skb_desc(skb);
+        struct skb_frame_desc *desc = get_skb_frame_desc(skb);
         struct sk_buff *skbcopy;
         struct rt2x00dump_hdr *dump_hdr;
         struct timeval timestamp;
@@ -147,7 +149,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
         dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);
         dump_hdr->chip_rev = cpu_to_le32(rt2x00dev->chip.rev);
         dump_hdr->type = cpu_to_le16(desc->frame_type);
-        dump_hdr->ring_index = desc->ring->queue_idx;
+        dump_hdr->queue_index = desc->entry->queue->qid;
         dump_hdr->entry_index = desc->entry->entry_idx;
         dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
         dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);
@@ -186,7 +188,7 @@ static int rt2x00debug_file_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int rt2x00debug_open_ring_dump(struct inode *inode, struct file *file)
+static int rt2x00debug_open_queue_dump(struct inode *inode, struct file *file)
 {
         struct rt2x00debug_intf *intf = inode->i_private;
         int retval;
@@ -203,7 +205,7 @@ static int rt2x00debug_open_ring_dump(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int rt2x00debug_release_ring_dump(struct inode *inode, struct file *file)
+static int rt2x00debug_release_queue_dump(struct inode *inode, struct file *file)
 {
         struct rt2x00debug_intf *intf = inode->i_private;
 
@@ -214,10 +216,10 @@ static int rt2x00debug_release_ring_dump(struct inode *inode, struct file *file)
         return rt2x00debug_file_release(inode, file);
 }
 
-static ssize_t rt2x00debug_read_ring_dump(struct file *file,
-                                          char __user *buf,
-                                          size_t length,
-                                          loff_t *offset)
+static ssize_t rt2x00debug_read_queue_dump(struct file *file,
+                                           char __user *buf,
+                                           size_t length,
+                                           loff_t *offset)
 {
         struct rt2x00debug_intf *intf = file->private_data;
         struct sk_buff *skb;
@@ -248,8 +250,8 @@ exit:
         return status;
 }
 
-static unsigned int rt2x00debug_poll_ring_dump(struct file *file,
-                                               poll_table *wait)
+static unsigned int rt2x00debug_poll_queue_dump(struct file *file,
+                                                poll_table *wait)
 {
         struct rt2x00debug_intf *intf = file->private_data;
 
@@ -261,12 +263,68 @@ static unsigned int rt2x00debug_poll_ring_dump(struct file *file,
         return 0;
 }
 
-static const struct file_operations rt2x00debug_fop_ring_dump = {
+static const struct file_operations rt2x00debug_fop_queue_dump = {
         .owner          = THIS_MODULE,
-        .read           = rt2x00debug_read_ring_dump,
-        .poll           = rt2x00debug_poll_ring_dump,
-        .open           = rt2x00debug_open_ring_dump,
-        .release        = rt2x00debug_release_ring_dump,
+        .read           = rt2x00debug_read_queue_dump,
+        .poll           = rt2x00debug_poll_queue_dump,
+        .open           = rt2x00debug_open_queue_dump,
+        .release        = rt2x00debug_release_queue_dump,
+};
+
+static ssize_t rt2x00debug_read_queue_stats(struct file *file,
+                                            char __user *buf,
+                                            size_t length,
+                                            loff_t *offset)
+{
+        struct rt2x00debug_intf *intf = file->private_data;
+        struct data_queue *queue;
+        unsigned long irqflags;
+        unsigned int lines = 1 + intf->rt2x00dev->data_queues;
+        size_t size;
+        char *data;
+        char *temp;
+
+        if (*offset)
+                return 0;
+
+        data = kzalloc(lines * MAX_LINE_LENGTH, GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
+        temp = data +
+            sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdone\tcrypto\n");
+
+        queue_for_each(intf->rt2x00dev, queue) {
+                spin_lock_irqsave(&queue->lock, irqflags);
+
+                temp += sprintf(temp, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", queue->qid,
+                                queue->count, queue->limit, queue->length,
+                                queue->index[Q_INDEX],
+                                queue->index[Q_INDEX_DONE],
+                                queue->index[Q_INDEX_CRYPTO]);
+
+                spin_unlock_irqrestore(&queue->lock, irqflags);
+        }
+
+        size = strlen(data);
+        size = min(size, length);
+
+        if (copy_to_user(buf, data, size)) {
+                kfree(data);
+                return -EFAULT;
+        }
+
+        kfree(data);
+
+        *offset += size;
+        return size;
+}
+
+static const struct file_operations rt2x00debug_fop_queue_stats = {
+        .owner          = THIS_MODULE,
+        .read           = rt2x00debug_read_queue_stats,
+        .open           = rt2x00debug_file_open,
+        .release        = rt2x00debug_file_release,
 };
 
 #define RT2X00DEBUGFS_OPS_READ(__name, __format, __type)        \
@@ -386,7 +444,7 @@ static struct dentry *rt2x00debug_create_file_driver(const char *name,
 {
         char *data;
 
-        data = kzalloc(3 * PRINT_LINE_LEN_MAX, GFP_KERNEL);
+        data = kzalloc(3 * MAX_LINE_LENGTH, GFP_KERNEL);
         if (!data)
                 return NULL;
 
@@ -409,7 +467,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
         const struct rt2x00debug *debug = intf->debug;
         char *data;
 
-        data = kzalloc(8 * PRINT_LINE_LEN_MAX, GFP_KERNEL);
+        data = kzalloc(8 * MAX_LINE_LENGTH, GFP_KERNEL);
         if (!data)
                 return NULL;
 
@@ -496,20 +554,24 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
 
 #undef RT2X00DEBUGFS_CREATE_REGISTER_ENTRY
 
-        intf->frame_folder =
-            debugfs_create_dir("frame", intf->driver_folder);
-        if (IS_ERR(intf->frame_folder))
+        intf->queue_folder =
+            debugfs_create_dir("queue", intf->driver_folder);
+        if (IS_ERR(intf->queue_folder))
                 goto exit;
 
-        intf->frame_dump_entry =
-            debugfs_create_file("dump", S_IRUGO, intf->frame_folder,
-                                intf, &rt2x00debug_fop_ring_dump);
-        if (IS_ERR(intf->frame_dump_entry))
+        intf->queue_frame_dump_entry =
+            debugfs_create_file("dump", S_IRUGO, intf->queue_folder,
+                                intf, &rt2x00debug_fop_queue_dump);
+        if (IS_ERR(intf->queue_frame_dump_entry))
                 goto exit;
 
         skb_queue_head_init(&intf->frame_dump_skbqueue);
         init_waitqueue_head(&intf->frame_dump_waitqueue);
 
+        intf->queue_stats_entry =
+            debugfs_create_file("queue", S_IRUGO, intf->queue_folder,
+                                intf, &rt2x00debug_fop_queue_stats);
+
         return;
 
 exit:
@@ -528,8 +590,9 @@ void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
 
         skb_queue_purge(&intf->frame_dump_skbqueue);
 
-        debugfs_remove(intf->frame_dump_entry);
-        debugfs_remove(intf->frame_folder);
+        debugfs_remove(intf->queue_stats_entry);
+        debugfs_remove(intf->queue_frame_dump_entry);
+        debugfs_remove(intf->queue_folder);
         debugfs_remove(intf->rf_val_entry);
         debugfs_remove(intf->rf_off_entry);
         debugfs_remove(intf->bbp_val_entry);
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.h b/drivers/net/wireless/rt2x00/rt2x00debug.h
index d37efbd09c41..c4ce895aa1c7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.h
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e873a39fcce3..f8fe7a139a8a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -31,34 +31,6 @@
 #include "rt2x00dump.h"
 
 /*
- * Ring handler.
- */
-struct data_ring *rt2x00lib_get_ring(struct rt2x00_dev *rt2x00dev,
-                                     const unsigned int queue)
-{
-        int beacon = test_bit(DRIVER_REQUIRE_BEACON_RING, &rt2x00dev->flags);
-
-        /*
-         * Check if we are requesting a reqular TX ring,
-         * or if we are requesting a Beacon or Atim ring.
-         * For Atim rings, we should check if it is supported.
-         */
-        if (queue < rt2x00dev->hw->queues && rt2x00dev->tx)
-                return &rt2x00dev->tx[queue];
-
-        if (!rt2x00dev->bcn || !beacon)
-                return NULL;
-
-        if (queue == IEEE80211_TX_QUEUE_BEACON)
-                return &rt2x00dev->bcn[0];
-        else if (queue == IEEE80211_TX_QUEUE_AFTER_BEACON)
-                return &rt2x00dev->bcn[1];
-
-        return NULL;
-}
-EXPORT_SYMBOL_GPL(rt2x00lib_get_ring);
-
-/*
  * Link tuning handlers
  */
 void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev)
@@ -113,46 +85,6 @@ static void rt2x00lib_stop_link_tuner(struct rt2x00_dev *rt2x00dev)
 }
 
 /*
- * Ring initialization
- */
-static void rt2x00lib_init_rxrings(struct rt2x00_dev *rt2x00dev)
-{
-        struct data_ring *ring = rt2x00dev->rx;
-        unsigned int i;
-
-        if (!rt2x00dev->ops->lib->init_rxentry)
-                return;
-
-        if (ring->data_addr)
-                memset(ring->data_addr, 0, rt2x00_get_ring_size(ring));
-
-        for (i = 0; i < ring->stats.limit; i++)
-                rt2x00dev->ops->lib->init_rxentry(rt2x00dev, &ring->entry[i]);
-
-        rt2x00_ring_index_clear(ring);
-}
-
-static void rt2x00lib_init_txrings(struct rt2x00_dev *rt2x00dev)
-{
-        struct data_ring *ring;
-        unsigned int i;
-
-        if (!rt2x00dev->ops->lib->init_txentry)
-                return;
-
-        txringall_for_each(rt2x00dev, ring) {
-                if (ring->data_addr)
-                        memset(ring->data_addr, 0, rt2x00_get_ring_size(ring));
-
-                for (i = 0; i < ring->stats.limit; i++)
-                        rt2x00dev->ops->lib->init_txentry(rt2x00dev,
-                                                          &ring->entry[i]);
-
-                rt2x00_ring_index_clear(ring);
-        }
-}
-
-/*
  * Radio control handlers.
  */
 int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
@@ -168,19 +100,21 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
                 return 0;
 
         /*
-         * Initialize all data rings.
+         * Initialize all data queues.
          */
-        rt2x00lib_init_rxrings(rt2x00dev);
-        rt2x00lib_init_txrings(rt2x00dev);
+        rt2x00queue_init_rx(rt2x00dev);
+        rt2x00queue_init_tx(rt2x00dev);
 
         /*
          * Enable radio.
          */
-        status = rt2x00dev->ops->lib->set_device_state(rt2x00dev,
-                                                       STATE_RADIO_ON);
+        status =
+            rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_ON);
         if (status)
                 return status;
 
+        rt2x00leds_led_radio(rt2x00dev, true);
+
         __set_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags);
 
         /*
@@ -204,12 +138,10 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Stop all scheduled work.
          */
-        if (work_pending(&rt2x00dev->beacon_work))
-                cancel_work_sync(&rt2x00dev->beacon_work);
+        if (work_pending(&rt2x00dev->intf_work))
+                cancel_work_sync(&rt2x00dev->intf_work);
         if (work_pending(&rt2x00dev->filter_work))
                 cancel_work_sync(&rt2x00dev->filter_work);
-        if (work_pending(&rt2x00dev->config_work))
-                cancel_work_sync(&rt2x00dev->config_work);
 
         /*
          * Stop the TX queues.
@@ -225,6 +157,7 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
          * Disable radio.
          */
         rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_OFF);
+        rt2x00leds_led_radio(rt2x00dev, false);
 }
 
 void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state)
@@ -241,7 +174,7 @@ void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state)
          * When we are enabling the RX, we should also start the link tuner.
          */
         if (state == STATE_RADIO_RX_ON &&
-            is_interface_present(&rt2x00dev->interface))
+            (rt2x00dev->intf_ap_count || rt2x00dev->intf_sta_count))
                 rt2x00lib_start_link_tuner(rt2x00dev);
 }
 
@@ -449,6 +382,11 @@ static void rt2x00lib_link_tuner(struct work_struct *work)
         rt2x00lib_precalculate_link_signal(&rt2x00dev->link.qual);
 
         /*
+         * Send a signal to the led to update the led signal strength.
+         */
+        rt2x00leds_led_quality(rt2x00dev, rt2x00dev->link.qual.avg_rssi);
+
+        /*
          * Evaluate antenna setup, make this the last step since this could
          * possibly reset some statistics.
          */
@@ -466,59 +404,76 @@ static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
 {
         struct rt2x00_dev *rt2x00dev =
             container_of(work, struct rt2x00_dev, filter_work);
-        unsigned int filter = rt2x00dev->packet_filter;
+
+        rt2x00dev->ops->lib->config_filter(rt2x00dev, rt2x00dev->packet_filter);
+}
+
+static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,
+                                          struct ieee80211_vif *vif)
+{
+        struct rt2x00_dev *rt2x00dev = data;
+        struct rt2x00_intf *intf = vif_to_intf(vif);
+        struct sk_buff *skb;
+        struct ieee80211_tx_control control;
+        struct ieee80211_bss_conf conf;
+        int delayed_flags;
 
         /*
-         * Since we had stored the filter inside interface.filter,
-         * we should now clear that field. Otherwise the driver will
-         * assume nothing has changed (*total_flags will be compared
-         * to interface.filter to determine if any action is required).
+         * Copy all data we need during this action under the protection
+         * of a spinlock. Otherwise race conditions might occur which results
+         * into an invalid configuration.
          */
-        rt2x00dev->packet_filter = 0;
+        spin_lock(&intf->lock);
+
+        memcpy(&conf, &intf->conf, sizeof(conf));
+        delayed_flags = intf->delayed_flags;
+        intf->delayed_flags = 0;
 
-        rt2x00dev->ops->hw->configure_filter(rt2x00dev->hw,
-                                             filter, &filter, 0, NULL);
+        spin_unlock(&intf->lock);
+
+        if (delayed_flags & DELAYED_UPDATE_BEACON) {
+                skb = ieee80211_beacon_get(rt2x00dev->hw, vif, &control);
+                if (skb && rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw,
+                                                             skb, &control))
+                        dev_kfree_skb(skb);
+        }
+
+        if (delayed_flags & DELAYED_CONFIG_ERP)
+                rt2x00lib_config_erp(rt2x00dev, intf, &intf->conf);
+
+        if (delayed_flags & DELAYED_LED_ASSOC)
+                rt2x00leds_led_assoc(rt2x00dev, !!rt2x00dev->intf_associated);
 }
 
-static void rt2x00lib_configuration_scheduled(struct work_struct *work)
+static void rt2x00lib_intf_scheduled(struct work_struct *work)
 {
         struct rt2x00_dev *rt2x00dev =
-            container_of(work, struct rt2x00_dev, config_work);
-        struct ieee80211_bss_conf bss_conf;
-
-        bss_conf.use_short_preamble =
-                test_bit(CONFIG_SHORT_PREAMBLE, &rt2x00dev->flags);
+            container_of(work, struct rt2x00_dev, intf_work);
 
         /*
-         * FIXME: shouldn't invoke it this way because all other contents
-         *        of bss_conf is invalid.
+         * Iterate over each interface and perform the
+         * requested configurations.
          */
-        rt2x00mac_bss_info_changed(rt2x00dev->hw, rt2x00dev->interface.id,
-                                   &bss_conf, BSS_CHANGED_ERP_PREAMBLE);
+        ieee80211_iterate_active_interfaces(rt2x00dev->hw,
+                                            rt2x00lib_intf_scheduled_iter,
+                                            rt2x00dev);
 }
 
 /*
  * Interrupt context handlers.
  */
-static void rt2x00lib_beacondone_scheduled(struct work_struct *work)
+static void rt2x00lib_beacondone_iter(void *data, u8 *mac,
+                                      struct ieee80211_vif *vif)
 {
-        struct rt2x00_dev *rt2x00dev =
-            container_of(work, struct rt2x00_dev, beacon_work);
-        struct data_ring *ring =
-            rt2x00lib_get_ring(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
-        struct data_entry *entry = rt2x00_get_data_entry(ring);
-        struct sk_buff *skb;
+        struct rt2x00_intf *intf = vif_to_intf(vif);
 
-        skb = ieee80211_beacon_get(rt2x00dev->hw,
-                                   rt2x00dev->interface.id,
-                                   &entry->tx_status.control);
-        if (!skb)
+        if (vif->type != IEEE80211_IF_TYPE_AP &&
+            vif->type != IEEE80211_IF_TYPE_IBSS)
                 return;
 
-        rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw, skb,
-                                          &entry->tx_status.control);
-
-        dev_kfree_skb(skb);
+        spin_lock(&intf->lock);
+        intf->delayed_flags |= DELAYED_UPDATE_BEACON;
+        spin_unlock(&intf->lock);
 }
 
 void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)
@@ -526,116 +481,140 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)
         if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
                 return;
 
-        queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->beacon_work);
+        ieee80211_iterate_active_interfaces(rt2x00dev->hw,
+                                            rt2x00lib_beacondone_iter,
+                                            rt2x00dev);
+
+        queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work);
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_beacondone);
 
-void rt2x00lib_txdone(struct data_entry *entry,
-                      const int status, const int retry)
+void rt2x00lib_txdone(struct queue_entry *entry,
+                      struct txdone_entry_desc *txdesc)
 {
-        struct rt2x00_dev *rt2x00dev = entry->ring->rt2x00dev;
-        struct ieee80211_tx_status *tx_status = &entry->tx_status;
-        struct ieee80211_low_level_stats *stats = &rt2x00dev->low_level_stats;
-        int success = !!(status == TX_SUCCESS || status == TX_SUCCESS_RETRY);
-        int fail = !!(status == TX_FAIL_RETRY || status == TX_FAIL_INVALID ||
-                      status == TX_FAIL_OTHER);
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+        struct skb_frame_desc *skbdesc;
+        struct ieee80211_tx_status tx_status;
+        int success = !!(txdesc->status == TX_SUCCESS ||
+                         txdesc->status == TX_SUCCESS_RETRY);
+        int fail = !!(txdesc->status == TX_FAIL_RETRY ||
+                      txdesc->status == TX_FAIL_INVALID ||
+                      txdesc->status == TX_FAIL_OTHER);
 
         /*
          * Update TX statistics.
          */
-        tx_status->flags = 0;
-        tx_status->ack_signal = 0;
-        tx_status->excessive_retries = (status == TX_FAIL_RETRY);
-        tx_status->retry_count = retry;
         rt2x00dev->link.qual.tx_success += success;
-        rt2x00dev->link.qual.tx_failed += retry + fail;
+        rt2x00dev->link.qual.tx_failed += txdesc->retry + fail;
+
+        /*
+         * Initialize TX status
+         */
+        tx_status.flags = 0;
+        tx_status.ack_signal = 0;
+        tx_status.excessive_retries = (txdesc->status == TX_FAIL_RETRY);
+        tx_status.retry_count = txdesc->retry;
+        memcpy(&tx_status.control, txdesc->control, sizeof(*txdesc->control));
 
-        if (!(tx_status->control.flags & IEEE80211_TXCTL_NO_ACK)) {
+        if (!(tx_status.control.flags & IEEE80211_TXCTL_NO_ACK)) {
                 if (success)
-                        tx_status->flags |= IEEE80211_TX_STATUS_ACK;
+                        tx_status.flags |= IEEE80211_TX_STATUS_ACK;
                 else
-                        stats->dot11ACKFailureCount++;
+                        rt2x00dev->low_level_stats.dot11ACKFailureCount++;
         }
 
-        tx_status->queue_length = entry->ring->stats.limit;
-        tx_status->queue_number = tx_status->control.queue;
+        tx_status.queue_length = entry->queue->limit;
+        tx_status.queue_number = tx_status.control.queue;
 
-        if (tx_status->control.flags & IEEE80211_TXCTL_USE_RTS_CTS) {
+        if (tx_status.control.flags & IEEE80211_TXCTL_USE_RTS_CTS) {
                 if (success)
-                        stats->dot11RTSSuccessCount++;
+                        rt2x00dev->low_level_stats.dot11RTSSuccessCount++;
                 else
-                        stats->dot11RTSFailureCount++;
+                        rt2x00dev->low_level_stats.dot11RTSFailureCount++;
         }
 
         /*
-         * Send the tx_status to mac80211 & debugfs.
-         * mac80211 will clean up the skb structure.
+         * Send the tx_status to debugfs. Only send the status report
+         * to mac80211 when the frame originated from there. If this was
+         * a extra frame coming through a mac80211 library call (RTS/CTS)
+         * then we should not send the status report back.
+         * If send to mac80211, mac80211 will clean up the skb structure,
+         * otherwise we have to do it ourself.
          */
-        get_skb_desc(entry->skb)->frame_type = DUMP_FRAME_TXDONE;
+        skbdesc = get_skb_frame_desc(entry->skb);
+        skbdesc->frame_type = DUMP_FRAME_TXDONE;
+
         rt2x00debug_dump_frame(rt2x00dev, entry->skb);
-        ieee80211_tx_status_irqsafe(rt2x00dev->hw, entry->skb, tx_status);
+
+        if (!(skbdesc->flags & FRAME_DESC_DRIVER_GENERATED))
+                ieee80211_tx_status_irqsafe(rt2x00dev->hw,
+                                            entry->skb, &tx_status);
+        else
+                dev_kfree_skb(entry->skb);
         entry->skb = NULL;
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_txdone);
 
-void rt2x00lib_rxdone(struct data_entry *entry, struct sk_buff *skb,
-                      struct rxdata_entry_desc *desc)
+void rt2x00lib_rxdone(struct queue_entry *entry,
+                      struct rxdone_entry_desc *rxdesc)
 {
-        struct rt2x00_dev *rt2x00dev = entry->ring->rt2x00dev;
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct ieee80211_rx_status *rx_status = &rt2x00dev->rx_status;
-        struct ieee80211_hw_mode *mode;
-        struct ieee80211_rate *rate;
+        struct ieee80211_supported_band *sband;
         struct ieee80211_hdr *hdr;
+        const struct rt2x00_rate *rate;
         unsigned int i;
-        int val = 0;
+        int idx = -1;
         u16 fc;
 
         /*
          * Update RX statistics.
          */
-        mode = &rt2x00dev->hwmodes[rt2x00dev->curr_hwmode];
-        for (i = 0; i < mode->num_rates; i++) {
-                rate = &mode->rates[i];
+        sband = &rt2x00dev->bands[rt2x00dev->curr_band];
+        for (i = 0; i < sband->n_bitrates; i++) {
+                rate = rt2x00_get_rate(sband->bitrates[i].hw_value);
 
-                /*
-                 * When frame was received with an OFDM bitrate,
-                 * the signal is the PLCP value. If it was received with
-                 * a CCK bitrate the signal is the rate in 0.5kbit/s.
-                 */
-                if (!desc->ofdm)
-                        val = DEVICE_GET_RATE_FIELD(rate->val, RATE);
-                else
-                        val = DEVICE_GET_RATE_FIELD(rate->val, PLCP);
-
-                if (val == desc->signal) {
-                        val = rate->val;
+                if (((rxdesc->dev_flags & RXDONE_SIGNAL_PLCP) &&
+                     (rate->plcp == rxdesc->signal)) ||
+                    (!(rxdesc->dev_flags & RXDONE_SIGNAL_PLCP) &&
+                      (rate->bitrate == rxdesc->signal))) {
+                        idx = i;
                         break;
                 }
         }
 
+        if (idx < 0) {
+                WARNING(rt2x00dev, "Frame received with unrecognized signal,"
+                        "signal=0x%.2x, plcp=%d.\n", rxdesc->signal,
+                        !!(rxdesc->dev_flags & RXDONE_SIGNAL_PLCP));
+                idx = 0;
+        }
+
         /*
          * Only update link status if this is a beacon frame carrying our bssid.
          */
-        hdr = (struct ieee80211_hdr*)skb->data;
+        hdr = (struct ieee80211_hdr *)entry->skb->data;
         fc = le16_to_cpu(hdr->frame_control);
-        if (is_beacon(fc) && desc->my_bss)
-                rt2x00lib_update_link_stats(&rt2x00dev->link, desc->rssi);
+        if (is_beacon(fc) && (rxdesc->dev_flags & RXDONE_MY_BSS))
+                rt2x00lib_update_link_stats(&rt2x00dev->link, rxdesc->rssi);
 
         rt2x00dev->link.qual.rx_success++;
 
-        rx_status->rate = val;
+        rx_status->rate_idx = idx;
         rx_status->signal =
-            rt2x00lib_calculate_link_signal(rt2x00dev, desc->rssi);
-        rx_status->ssi = desc->rssi;
-        rx_status->flag = desc->flags;
+            rt2x00lib_calculate_link_signal(rt2x00dev, rxdesc->rssi);
+        rx_status->ssi = rxdesc->rssi;
+        rx_status->flag = rxdesc->flags;
         rx_status->antenna = rt2x00dev->link.ant.active.rx;
 
         /*
-         * Send frame to mac80211 & debugfs
+         * Send frame to mac80211 & debugfs.
+         * mac80211 will clean up the skb structure.
          */
-        get_skb_desc(skb)->frame_type = DUMP_FRAME_RXDONE;
-        rt2x00debug_dump_frame(rt2x00dev, skb);
-        ieee80211_rx_irqsafe(rt2x00dev->hw, skb, rx_status);
+        get_skb_frame_desc(entry->skb)->frame_type = DUMP_FRAME_RXDONE;
+        rt2x00debug_dump_frame(rt2x00dev, entry->skb);
+        ieee80211_rx_irqsafe(rt2x00dev->hw, entry->skb, rx_status);
+        entry->skb = NULL;
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_rxdone);
 
@@ -646,83 +625,69 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                              struct sk_buff *skb,
                              struct ieee80211_tx_control *control)
 {
-        struct txdata_entry_desc desc;
-        struct skb_desc *skbdesc = get_skb_desc(skb);
-        struct ieee80211_hdr *ieee80211hdr = skbdesc->data;
+        struct txentry_desc txdesc;
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skbdesc->data;
+        const struct rt2x00_rate *rate;
         int tx_rate;
-        int bitrate;
         int length;
         int duration;
         int residual;
         u16 frame_control;
         u16 seq_ctrl;
 
-        memset(&desc, 0, sizeof(desc));
+        memset(&txdesc, 0, sizeof(txdesc));
 
-        desc.cw_min = skbdesc->ring->tx_params.cw_min;
-        desc.cw_max = skbdesc->ring->tx_params.cw_max;
-        desc.aifs = skbdesc->ring->tx_params.aifs;
-
-        /*
-         * Identify queue
-         */
-        if (control->queue < rt2x00dev->hw->queues)
-                desc.queue = control->queue;
-        else if (control->queue == IEEE80211_TX_QUEUE_BEACON ||
-                 control->queue == IEEE80211_TX_QUEUE_AFTER_BEACON)
-                desc.queue = QUEUE_MGMT;
-        else
-                desc.queue = QUEUE_OTHER;
+        txdesc.queue = skbdesc->entry->queue->qid;
+        txdesc.cw_min = skbdesc->entry->queue->cw_min;
+        txdesc.cw_max = skbdesc->entry->queue->cw_max;
+        txdesc.aifs = skbdesc->entry->queue->aifs;
 
         /*
          * Read required fields from ieee80211 header.
          */
-        frame_control = le16_to_cpu(ieee80211hdr->frame_control);
-        seq_ctrl = le16_to_cpu(ieee80211hdr->seq_ctrl);
+        frame_control = le16_to_cpu(hdr->frame_control);
+        seq_ctrl = le16_to_cpu(hdr->seq_ctrl);
 
-        tx_rate = control->tx_rate;
+        tx_rate = control->tx_rate->hw_value;
 
         /*
          * Check whether this frame is to be acked
          */
         if (!(control->flags & IEEE80211_TXCTL_NO_ACK))
-                __set_bit(ENTRY_TXD_ACK, &desc.flags);
+                __set_bit(ENTRY_TXD_ACK, &txdesc.flags);
 
         /*
          * Check if this is a RTS/CTS frame
          */
         if (is_rts_frame(frame_control) || is_cts_frame(frame_control)) {
-                __set_bit(ENTRY_TXD_BURST, &desc.flags);
+                __set_bit(ENTRY_TXD_BURST, &txdesc.flags);
                 if (is_rts_frame(frame_control)) {
-                        __set_bit(ENTRY_TXD_RTS_FRAME, &desc.flags);
-                        __set_bit(ENTRY_TXD_ACK, &desc.flags);
+                        __set_bit(ENTRY_TXD_RTS_FRAME, &txdesc.flags);
+                        __set_bit(ENTRY_TXD_ACK, &txdesc.flags);
                 } else
-                        __clear_bit(ENTRY_TXD_ACK, &desc.flags);
+                        __clear_bit(ENTRY_TXD_ACK, &txdesc.flags);
                 if (control->rts_cts_rate)
-                        tx_rate = control->rts_cts_rate;
+                        tx_rate = control->rts_cts_rate->hw_value;
         }
 
-        /*
-         * Check for OFDM
-         */
-        if (DEVICE_GET_RATE_FIELD(tx_rate, RATEMASK) & DEV_OFDM_RATEMASK)
-                __set_bit(ENTRY_TXD_OFDM_RATE, &desc.flags);
+        rate = rt2x00_get_rate(tx_rate);
 
         /*
          * Check if more fragments are pending
          */
-        if (ieee80211_get_morefrag(ieee80211hdr)) {
-                __set_bit(ENTRY_TXD_BURST, &desc.flags);
-                __set_bit(ENTRY_TXD_MORE_FRAG, &desc.flags);
+        if (ieee80211_get_morefrag(hdr)) {
+                __set_bit(ENTRY_TXD_BURST, &txdesc.flags);
+                __set_bit(ENTRY_TXD_MORE_FRAG, &txdesc.flags);
         }
 
         /*
          * Beacons and probe responses require the tsf timestamp
          * to be inserted into the frame.
          */
-        if (control->queue == IEEE80211_TX_QUEUE_BEACON ||
+        if (control->queue == RT2X00_BCN_QUEUE_BEACON ||
             is_probe_resp(frame_control))
-                __set_bit(ENTRY_TXD_REQ_TIMESTAMP, &desc.flags);
+                __set_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc.flags);
 
         /*
          * Determine with what IFS priority this frame should be send.
@@ -730,30 +695,30 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
          * or this fragment came after RTS/CTS.
          */
         if ((seq_ctrl & IEEE80211_SCTL_FRAG) > 0 ||
-            test_bit(ENTRY_TXD_RTS_FRAME, &desc.flags))
-                desc.ifs = IFS_SIFS;
+            test_bit(ENTRY_TXD_RTS_FRAME, &txdesc.flags))
+                txdesc.ifs = IFS_SIFS;
         else
-                desc.ifs = IFS_BACKOFF;
+                txdesc.ifs = IFS_BACKOFF;
 
         /*
          * PLCP setup
          * Length calculation depends on OFDM/CCK rate.
          */
-        desc.signal = DEVICE_GET_RATE_FIELD(tx_rate, PLCP);
-        desc.service = 0x04;
+        txdesc.signal = rate->plcp;
+        txdesc.service = 0x04;
 
         length = skbdesc->data_len + FCS_LEN;
-        if (test_bit(ENTRY_TXD_OFDM_RATE, &desc.flags)) {
-                desc.length_high = (length >> 6) & 0x3f;
-                desc.length_low = length & 0x3f;
-        } else {
-                bitrate = DEVICE_GET_RATE_FIELD(tx_rate, RATE);
+        if (rate->flags & DEV_RATE_OFDM) {
+                __set_bit(ENTRY_TXD_OFDM_RATE, &txdesc.flags);
 
+                txdesc.length_high = (length >> 6) & 0x3f;
+                txdesc.length_low = length & 0x3f;
+        } else {
                 /*
                  * Convert length to microseconds.
                  */
-                residual = get_duration_res(length, bitrate);
-                duration = get_duration(length, bitrate);
+                residual = get_duration_res(length, rate->bitrate);
+                duration = get_duration(length, rate->bitrate);
 
                 if (residual != 0) {
                         duration++;
@@ -761,28 +726,27 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                         /*
                          * Check if we need to set the Length Extension
                          */
-                        if (bitrate == 110 && residual <= 30)
-                                desc.service |= 0x80;
+                        if (rate->bitrate == 110 && residual <= 30)
+                                txdesc.service |= 0x80;
                 }
 
-                desc.length_high = (duration >> 8) & 0xff;
-                desc.length_low = duration & 0xff;
+                txdesc.length_high = (duration >> 8) & 0xff;
+                txdesc.length_low = duration & 0xff;
 
                 /*
                  * When preamble is enabled we should set the
                  * preamble bit for the signal.
                  */
-                if (DEVICE_GET_RATE_FIELD(tx_rate, PREAMBLE))
-                        desc.signal |= 0x08;
+                if (rt2x00_get_rate_preamble(tx_rate))
+                        txdesc.signal |= 0x08;
         }
 
-        rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, skb, &desc, control);
+        rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, skb, &txdesc, control);
 
         /*
-         * Update ring entry.
+         * Update queue entry.
          */
         skbdesc->entry->skb = skb;
-        memcpy(&skbdesc->entry->tx_status.control, control, sizeof(*control));
 
         /*
          * The frame has been completely initialized and ready
@@ -798,133 +762,167 @@ EXPORT_SYMBOL_GPL(rt2x00lib_write_tx_desc);
 /*
  * Driver initialization handlers.
  */
+const struct rt2x00_rate rt2x00_supported_rates[12] = {
+        {
+                .flags = DEV_RATE_CCK | DEV_RATE_BASIC,
+                .bitrate = 10,
+                .ratemask = BIT(0),
+                .plcp = 0x00,
+        },
+        {
+                .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC,
+                .bitrate = 20,
+                .ratemask = BIT(1),
+                .plcp = 0x01,
+        },
+        {
+                .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC,
+                .bitrate = 55,
+                .ratemask = BIT(2),
+                .plcp = 0x02,
+        },
+        {
+                .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC,
+                .bitrate = 110,
+                .ratemask = BIT(3),
+                .plcp = 0x03,
+        },
+        {
+                .flags = DEV_RATE_OFDM | DEV_RATE_BASIC,
+                .bitrate = 60,
+                .ratemask = BIT(4),
+                .plcp = 0x0b,
+        },
+        {
+                .flags = DEV_RATE_OFDM,
+                .bitrate = 90,
+                .ratemask = BIT(5),
+                .plcp = 0x0f,
+        },
+        {
+                .flags = DEV_RATE_OFDM | DEV_RATE_BASIC,
+                .bitrate = 120,
+                .ratemask = BIT(6),
+                .plcp = 0x0a,
+        },
+        {
+                .flags = DEV_RATE_OFDM,
+                .bitrate = 180,
+                .ratemask = BIT(7),
+                .plcp = 0x0e,
+        },
+        {
+                .flags = DEV_RATE_OFDM | DEV_RATE_BASIC,
+                .bitrate = 240,
+                .ratemask = BIT(8),
+                .plcp = 0x09,
+        },
+        {
+                .flags = DEV_RATE_OFDM,
+                .bitrate = 360,
+                .ratemask = BIT(9),
+                .plcp = 0x0d,
+        },
+        {
+                .flags = DEV_RATE_OFDM,
+                .bitrate = 480,
+                .ratemask = BIT(10),
+                .plcp = 0x08,
+        },
+        {
+                .flags = DEV_RATE_OFDM,
+                .bitrate = 540,
+                .ratemask = BIT(11),
+                .plcp = 0x0c,
+        },
+};
+
 static void rt2x00lib_channel(struct ieee80211_channel *entry,
                               const int channel, const int tx_power,
                               const int value)
 {
-        entry->chan = channel;
-        if (channel <= 14)
-                entry->freq = 2407 + (5 * channel);
-        else
-                entry->freq = 5000 + (5 * channel);
-        entry->val = value;
-        entry->flag =
-            IEEE80211_CHAN_W_IBSS |
-            IEEE80211_CHAN_W_ACTIVE_SCAN |
-            IEEE80211_CHAN_W_SCAN;
-        entry->power_level = tx_power;
-        entry->antenna_max = 0xff;
+        entry->center_freq = ieee80211_channel_to_frequency(channel);
+        entry->hw_value = value;
+        entry->max_power = tx_power;
+        entry->max_antenna_gain = 0xff;
 }
 
 static void rt2x00lib_rate(struct ieee80211_rate *entry,
-                           const int rate, const int mask,
-                           const int plcp, const int flags)
+                           const u16 index, const struct rt2x00_rate *rate)
 {
-        entry->rate = rate;
-        entry->val =
-            DEVICE_SET_RATE_FIELD(rate, RATE) |
-            DEVICE_SET_RATE_FIELD(mask, RATEMASK) |
-            DEVICE_SET_RATE_FIELD(plcp, PLCP);
-        entry->flags = flags;
-        entry->val2 = entry->val;
-        if (entry->flags & IEEE80211_RATE_PREAMBLE2)
-                entry->val2 |= DEVICE_SET_RATE_FIELD(1, PREAMBLE);
-        entry->min_rssi_ack = 0;
-        entry->min_rssi_ack_delta = 0;
+        entry->flags = 0;
+        entry->bitrate = rate->bitrate;
+        entry->hw_value = rt2x00_create_rate_hw_value(index, 0);
+        entry->hw_value_short = entry->hw_value;
+
+        if (rate->flags & DEV_RATE_SHORT_PREAMBLE) {
+                entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
+                entry->hw_value_short |= rt2x00_create_rate_hw_value(index, 1);
+        }
 }
 
 static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
                                     struct hw_mode_spec *spec)
 {
         struct ieee80211_hw *hw = rt2x00dev->hw;
-        struct ieee80211_hw_mode *hwmodes;
         struct ieee80211_channel *channels;
         struct ieee80211_rate *rates;
+        unsigned int num_rates;
         unsigned int i;
         unsigned char tx_power;
 
-        hwmodes = kzalloc(sizeof(*hwmodes) * spec->num_modes, GFP_KERNEL);
-        if (!hwmodes)
-                goto exit;
+        num_rates = 0;
+        if (spec->supported_rates & SUPPORT_RATE_CCK)
+                num_rates += 4;
+        if (spec->supported_rates & SUPPORT_RATE_OFDM)
+                num_rates += 8;
 
         channels = kzalloc(sizeof(*channels) * spec->num_channels, GFP_KERNEL);
         if (!channels)
-                goto exit_free_modes;
+                return -ENOMEM;
 
-        rates = kzalloc(sizeof(*rates) * spec->num_rates, GFP_KERNEL);
+        rates = kzalloc(sizeof(*rates) * num_rates, GFP_KERNEL);
         if (!rates)
                 goto exit_free_channels;
 
         /*
          * Initialize Rate list.
          */
-        rt2x00lib_rate(&rates[0], 10, DEV_RATEMASK_1MB,
-                       0x00, IEEE80211_RATE_CCK);
-        rt2x00lib_rate(&rates[1], 20, DEV_RATEMASK_2MB,
-                       0x01, IEEE80211_RATE_CCK_2);
-        rt2x00lib_rate(&rates[2], 55, DEV_RATEMASK_5_5MB,
-                       0x02, IEEE80211_RATE_CCK_2);
-        rt2x00lib_rate(&rates[3], 110, DEV_RATEMASK_11MB,
-                       0x03, IEEE80211_RATE_CCK_2);
-
-        if (spec->num_rates > 4) {
-                rt2x00lib_rate(&rates[4], 60, DEV_RATEMASK_6MB,
-                               0x0b, IEEE80211_RATE_OFDM);
-                rt2x00lib_rate(&rates[5], 90, DEV_RATEMASK_9MB,
-                               0x0f, IEEE80211_RATE_OFDM);
-                rt2x00lib_rate(&rates[6], 120, DEV_RATEMASK_12MB,
-                               0x0a, IEEE80211_RATE_OFDM);
-                rt2x00lib_rate(&rates[7], 180, DEV_RATEMASK_18MB,
-                               0x0e, IEEE80211_RATE_OFDM);
-                rt2x00lib_rate(&rates[8], 240, DEV_RATEMASK_24MB,
-                               0x09, IEEE80211_RATE_OFDM);
-                rt2x00lib_rate(&rates[9], 360, DEV_RATEMASK_36MB,
-                               0x0d, IEEE80211_RATE_OFDM);
-                rt2x00lib_rate(&rates[10], 480, DEV_RATEMASK_48MB,
-                               0x08, IEEE80211_RATE_OFDM);
-                rt2x00lib_rate(&rates[11], 540, DEV_RATEMASK_54MB,
-                               0x0c, IEEE80211_RATE_OFDM);
-        }
+        for (i = 0; i < num_rates; i++)
+                rt2x00lib_rate(&rates[i], i, rt2x00_get_rate(i));
 
         /*
          * Initialize Channel list.
          */
         for (i = 0; i < spec->num_channels; i++) {
-                if (spec->channels[i].channel <= 14)
-                        tx_power = spec->tx_power_bg[i];
-                else if (spec->tx_power_a)
-                        tx_power = spec->tx_power_a[i];
-                else
-                        tx_power = spec->tx_power_default;
+                if (spec->channels[i].channel <= 14) {
+                        if (spec->tx_power_bg)
+                                tx_power = spec->tx_power_bg[i];
+                        else
+                                tx_power = spec->tx_power_default;
+                } else {
+                        if (spec->tx_power_a)
+                                tx_power = spec->tx_power_a[i];
+                        else
+                                tx_power = spec->tx_power_default;
+                }
 
                 rt2x00lib_channel(&channels[i],
                                   spec->channels[i].channel, tx_power, i);
         }
 
         /*
-         * Intitialize 802.11b
-         * Rates: CCK.
-         * Channels: OFDM.
-         */
-        if (spec->num_modes > HWMODE_B) {
-                hwmodes[HWMODE_B].mode = MODE_IEEE80211B;
-                hwmodes[HWMODE_B].num_channels = 14;
-                hwmodes[HWMODE_B].num_rates = 4;
-                hwmodes[HWMODE_B].channels = channels;
-                hwmodes[HWMODE_B].rates = rates;
-        }
-
-        /*
-         * Intitialize 802.11g
+         * Intitialize 802.11b, 802.11g
          * Rates: CCK, OFDM.
-         * Channels: OFDM.
-         */
-        if (spec->num_modes > HWMODE_G) {
-                hwmodes[HWMODE_G].mode = MODE_IEEE80211G;
-                hwmodes[HWMODE_G].num_channels = 14;
-                hwmodes[HWMODE_G].num_rates = spec->num_rates;
-                hwmodes[HWMODE_G].channels = channels;
-                hwmodes[HWMODE_G].rates = rates;
+         * Channels: 2.4 GHz
+         */
+        if (spec->supported_bands & SUPPORT_BAND_2GHZ) {
+                rt2x00dev->bands[IEEE80211_BAND_2GHZ].n_channels = 14;
+                rt2x00dev->bands[IEEE80211_BAND_2GHZ].n_bitrates = num_rates;
+                rt2x00dev->bands[IEEE80211_BAND_2GHZ].channels = channels;
+                rt2x00dev->bands[IEEE80211_BAND_2GHZ].bitrates = rates;
+                hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+                    &rt2x00dev->bands[IEEE80211_BAND_2GHZ];
         }
 
         /*
@@ -932,40 +930,21 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
          * Rates: OFDM.
          * Channels: OFDM, UNII, HiperLAN2.
          */
-        if (spec->num_modes > HWMODE_A) {
-                hwmodes[HWMODE_A].mode = MODE_IEEE80211A;
-                hwmodes[HWMODE_A].num_channels = spec->num_channels - 14;
-                hwmodes[HWMODE_A].num_rates = spec->num_rates - 4;
-                hwmodes[HWMODE_A].channels = &channels[14];
-                hwmodes[HWMODE_A].rates = &rates[4];
+        if (spec->supported_bands & SUPPORT_BAND_5GHZ) {
+                rt2x00dev->bands[IEEE80211_BAND_5GHZ].n_channels =
+                    spec->num_channels - 14;
+                rt2x00dev->bands[IEEE80211_BAND_5GHZ].n_bitrates =
+                    num_rates - 4;
+                rt2x00dev->bands[IEEE80211_BAND_5GHZ].channels = &channels[14];
+                rt2x00dev->bands[IEEE80211_BAND_5GHZ].bitrates = &rates[4];
+                hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                    &rt2x00dev->bands[IEEE80211_BAND_5GHZ];
         }
 
-        if (spec->num_modes > HWMODE_G &&
-            ieee80211_register_hwmode(hw, &hwmodes[HWMODE_G]))
-                goto exit_free_rates;
-
-        if (spec->num_modes > HWMODE_B &&
-            ieee80211_register_hwmode(hw, &hwmodes[HWMODE_B]))
-                goto exit_free_rates;
-
-        if (spec->num_modes > HWMODE_A &&
-            ieee80211_register_hwmode(hw, &hwmodes[HWMODE_A]))
-                goto exit_free_rates;
-
-        rt2x00dev->hwmodes = hwmodes;
-
         return 0;
 
-exit_free_rates:
-        kfree(rates);
-
-exit_free_channels:
+ exit_free_channels:
         kfree(channels);
-
-exit_free_modes:
-        kfree(hwmodes);
-
-exit:
         ERROR(rt2x00dev, "Allocation ieee80211 modes failed.\n");
         return -ENOMEM;
 }
@@ -975,11 +954,11 @@ static void rt2x00lib_remove_hw(struct rt2x00_dev *rt2x00dev)
         if (test_bit(DEVICE_REGISTERED_HW, &rt2x00dev->flags))
                 ieee80211_unregister_hw(rt2x00dev->hw);
 
-        if (likely(rt2x00dev->hwmodes)) {
-                kfree(rt2x00dev->hwmodes->channels);
-                kfree(rt2x00dev->hwmodes->rates);
-                kfree(rt2x00dev->hwmodes);
-                rt2x00dev->hwmodes = NULL;
+        if (likely(rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ])) {
+                kfree(rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ]->channels);
+                kfree(rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ]->bitrates);
+                rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = NULL;
+                rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
         }
 }
 
@@ -1012,86 +991,6 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
 /*
  * Initialization/uninitialization handlers.
  */
-static int rt2x00lib_alloc_entries(struct data_ring *ring,
-                                   const u16 max_entries, const u16 data_size,
-                                   const u16 desc_size)
-{
-        struct data_entry *entry;
-        unsigned int i;
-
-        ring->stats.limit = max_entries;
-        ring->data_size = data_size;
-        ring->desc_size = desc_size;
-
-        /*
-         * Allocate all ring entries.
-         */
-        entry = kzalloc(ring->stats.limit * sizeof(*entry), GFP_KERNEL);
-        if (!entry)
-                return -ENOMEM;
-
-        for (i = 0; i < ring->stats.limit; i++) {
-                entry[i].flags = 0;
-                entry[i].ring = ring;
-                entry[i].skb = NULL;
-                entry[i].entry_idx = i;
-        }
-
-        ring->entry = entry;
-
-        return 0;
-}
-
-static int rt2x00lib_alloc_ring_entries(struct rt2x00_dev *rt2x00dev)
-{
-        struct data_ring *ring;
-
-        /*
-         * Allocate the RX ring.
-         */
-        if (rt2x00lib_alloc_entries(rt2x00dev->rx, RX_ENTRIES, DATA_FRAME_SIZE,
-                                    rt2x00dev->ops->rxd_size))
-                return -ENOMEM;
-
-        /*
-         * First allocate the TX rings.
-         */
-        txring_for_each(rt2x00dev, ring) {
-                if (rt2x00lib_alloc_entries(ring, TX_ENTRIES, DATA_FRAME_SIZE,
-                                            rt2x00dev->ops->txd_size))
-                        return -ENOMEM;
-        }
-
-        if (!test_bit(DRIVER_REQUIRE_BEACON_RING, &rt2x00dev->flags))
-                return 0;
-
-        /*
-         * Allocate the BEACON ring.
-         */
-        if (rt2x00lib_alloc_entries(&rt2x00dev->bcn[0], BEACON_ENTRIES,
-                                    MGMT_FRAME_SIZE, rt2x00dev->ops->txd_size))
-                return -ENOMEM;
-
-        /*
-         * Allocate the Atim ring.
-         */
-        if (rt2x00lib_alloc_entries(&rt2x00dev->bcn[1], ATIM_ENTRIES,
-                                    DATA_FRAME_SIZE, rt2x00dev->ops->txd_size))
-                return -ENOMEM;
-
-        return 0;
-}
-
-static void rt2x00lib_free_ring_entries(struct rt2x00_dev *rt2x00dev)
-{
-        struct data_ring *ring;
-
-        ring_for_each(rt2x00dev, ring) {
-                kfree(ring->entry);
-                ring->entry = NULL;
-        }
-}
-
 static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
 {
         if (!__test_and_clear_bit(DEVICE_INITIALIZED, &rt2x00dev->flags))
@@ -1108,9 +1007,9 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
         rt2x00dev->ops->lib->uninitialize(rt2x00dev);
 
         /*
-         * Free allocated ring entries.
+         * Free allocated queue entries.
          */
-        rt2x00lib_free_ring_entries(rt2x00dev);
+        rt2x00queue_uninitialize(rt2x00dev);
 }
 
 static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
@@ -1121,13 +1020,11 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
                 return 0;
 
         /*
-         * Allocate all ring entries.
+         * Allocate all queue entries.
          */
-        status = rt2x00lib_alloc_ring_entries(rt2x00dev);
-        if (status) {
-                ERROR(rt2x00dev, "Ring entries allocation failed.\n");
+        status = rt2x00queue_initialize(rt2x00dev);
+        if (status)
                 return status;
-        }
 
         /*
          * Initialize the device.
@@ -1146,7 +1043,7 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
         return 0;
 
 exit:
-        rt2x00lib_free_ring_entries(rt2x00dev);
+        rt2x00lib_uninitialize(rt2x00dev);
 
         return status;
 }
@@ -1162,11 +1059,9 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
          * If this is the first interface which is added,
          * we should load the firmware now.
          */
-        if (test_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags)) {
-                retval = rt2x00lib_load_firmware(rt2x00dev);
-                if (retval)
-                        return retval;
-        }
+        retval = rt2x00lib_load_firmware(rt2x00dev);
+        if (retval)
+                return retval;
 
         /*
          * Initialize the device.
@@ -1184,6 +1079,10 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
                 return retval;
         }
 
+        rt2x00dev->intf_ap_count = 0;
+        rt2x00dev->intf_sta_count = 0;
+        rt2x00dev->intf_associated = 0;
+
         __set_bit(DEVICE_STARTED, &rt2x00dev->flags);
 
         return 0;
@@ -1200,74 +1099,25 @@ void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev)
          */
         rt2x00lib_disable_radio(rt2x00dev);
 
+        rt2x00dev->intf_ap_count = 0;
+        rt2x00dev->intf_sta_count = 0;
+        rt2x00dev->intf_associated = 0;
+
         __clear_bit(DEVICE_STARTED, &rt2x00dev->flags);
 }
 
 /*
  * driver allocation handlers.
  */
-static int rt2x00lib_alloc_rings(struct rt2x00_dev *rt2x00dev)
+int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
 {
-        struct data_ring *ring;
-        unsigned int index;
-
-        /*
-         * We need the following rings:
-         * RX: 1
-         * TX: hw->queues
-         * Beacon: 1 (if required)
-         * Atim: 1 (if required)
-         */
-        rt2x00dev->data_rings = 1 + rt2x00dev->hw->queues +
-            (2 * test_bit(DRIVER_REQUIRE_BEACON_RING, &rt2x00dev->flags));
-
-        ring = kzalloc(rt2x00dev->data_rings * sizeof(*ring), GFP_KERNEL);
-        if (!ring) {
-                ERROR(rt2x00dev, "Ring allocation failed.\n");
-                return -ENOMEM;
-        }
-
-        /*
-         * Initialize pointers
-         */
-        rt2x00dev->rx = ring;
-        rt2x00dev->tx = &rt2x00dev->rx[1];
-        if (test_bit(DRIVER_REQUIRE_BEACON_RING, &rt2x00dev->flags))
-                rt2x00dev->bcn = &rt2x00dev->tx[rt2x00dev->hw->queues];
+        int retval = -ENOMEM;
 
         /*
-         * Initialize ring parameters.
-         * RX: queue_idx = 0
-         * TX: queue_idx = IEEE80211_TX_QUEUE_DATA0 + index
-         * TX: cw_min: 2^5 = 32.
-         * TX: cw_max: 2^10 = 1024.
+         * Make room for rt2x00_intf inside the per-interface
+         * structure ieee80211_vif.
          */
-        rt2x00dev->rx->rt2x00dev = rt2x00dev;
-        rt2x00dev->rx->queue_idx = 0;
-
-        index = IEEE80211_TX_QUEUE_DATA0;
-        txring_for_each(rt2x00dev, ring) {
-                ring->rt2x00dev = rt2x00dev;
-                ring->queue_idx = index++;
-                ring->tx_params.aifs = 2;
-                ring->tx_params.cw_min = 5;
-                ring->tx_params.cw_max = 10;
-        }
-
-        return 0;
-}
-
-static void rt2x00lib_free_rings(struct rt2x00_dev *rt2x00dev)
-{
-        kfree(rt2x00dev->rx);
-        rt2x00dev->rx = NULL;
-        rt2x00dev->tx = NULL;
-        rt2x00dev->bcn = NULL;
-}
-
-int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
-{
-        int retval = -ENOMEM;
+        rt2x00dev->hw->vif_data_size = sizeof(struct rt2x00_intf);
 
         /*
          * Let the driver probe the device to detect the capabilities.
@@ -1281,20 +1131,14 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize configuration work.
          */
-        INIT_WORK(&rt2x00dev->beacon_work, rt2x00lib_beacondone_scheduled);
+        INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
         INIT_WORK(&rt2x00dev->filter_work, rt2x00lib_packetfilter_scheduled);
-        INIT_WORK(&rt2x00dev->config_work, rt2x00lib_configuration_scheduled);
         INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00lib_link_tuner);
 
         /*
-         * Reset current working type.
-         */
-        rt2x00dev->interface.type = IEEE80211_IF_TYPE_INVALID;
-
-        /*
-         * Allocate ring array.
+         * Allocate queue array.
          */
-        retval = rt2x00lib_alloc_rings(rt2x00dev);
+        retval = rt2x00queue_allocate(rt2x00dev);
         if (retval)
                 goto exit;
 
@@ -1310,6 +1154,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
         /*
          * Register extra components.
          */
+        rt2x00leds_register(rt2x00dev);
         rt2x00rfkill_allocate(rt2x00dev);
         rt2x00debug_register(rt2x00dev);
 
@@ -1343,6 +1188,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
          */
         rt2x00debug_deregister(rt2x00dev);
         rt2x00rfkill_free(rt2x00dev);
+        rt2x00leds_unregister(rt2x00dev);
 
         /*
          * Free ieee80211_hw memory.
@@ -1355,9 +1201,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
         rt2x00lib_free_firmware(rt2x00dev);
 
         /*
-         * Free ring structures.
+         * Free queue structures.
          */
-        rt2x00lib_free_rings(rt2x00dev);
+        rt2x00queue_free(rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
 
@@ -1388,6 +1234,7 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
         /*
          * Suspend/disable extra components.
          */
+        rt2x00leds_suspend(rt2x00dev);
         rt2x00rfkill_suspend(rt2x00dev);
         rt2x00debug_deregister(rt2x00dev);
 
@@ -1412,9 +1259,30 @@ exit:
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
 
+static void rt2x00lib_resume_intf(void *data, u8 *mac,
+                                  struct ieee80211_vif *vif)
+{
+        struct rt2x00_dev *rt2x00dev = data;
+        struct rt2x00_intf *intf = vif_to_intf(vif);
+
+        spin_lock(&intf->lock);
+
+        rt2x00lib_config_intf(rt2x00dev, intf,
+                              vif->type, intf->mac, intf->bssid);
+
+
+        /*
+         * Master or Ad-hoc mode require a new beacon update.
+         */
+        if (vif->type == IEEE80211_IF_TYPE_AP ||
+            vif->type == IEEE80211_IF_TYPE_IBSS)
+                intf->delayed_flags |= DELAYED_UPDATE_BEACON;
+
+        spin_unlock(&intf->lock);
+}
+
 int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
 {
-        struct interface *intf = &rt2x00dev->interface;
         int retval;
 
         NOTICE(rt2x00dev, "Waking up.\n");
@@ -1424,6 +1292,7 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
          */
         rt2x00debug_register(rt2x00dev);
         rt2x00rfkill_resume(rt2x00dev);
+        rt2x00leds_resume(rt2x00dev);
 
         /*
          * Only continue if mac80211 had open interfaces.
@@ -1445,9 +1314,12 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
         if (!rt2x00dev->hw->conf.radio_enabled)
                 rt2x00lib_disable_radio(rt2x00dev);
 
-        rt2x00lib_config_mac_addr(rt2x00dev, intf->mac);
-        rt2x00lib_config_bssid(rt2x00dev, intf->bssid);
-        rt2x00lib_config_type(rt2x00dev, intf->type);
+        /*
+         * Iterator over each active interface to
+         * reconfigure the hardware.
+         */
+        ieee80211_iterate_active_interfaces(rt2x00dev->hw,
+                                            rt2x00lib_resume_intf, rt2x00dev);
 
         /*
          * We are ready again to receive requests from mac80211.
@@ -1463,12 +1335,11 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
         ieee80211_start_queues(rt2x00dev->hw);
 
         /*
-         * When in Master or Ad-hoc mode,
-         * restart Beacon transmitting by faking a beacondone event.
+         * During interface iteration we might have changed the
+         * delayed_flags, time to handles the event by calling
+         * the work handler directly.
          */
-        if (intf->type == IEEE80211_IF_TYPE_AP ||
-            intf->type == IEEE80211_IF_TYPE_IBSS)
-                rt2x00lib_beacondone(rt2x00dev);
+        rt2x00lib_intf_scheduled(&rt2x00dev->intf_work);
 
         return 0;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00dump.h b/drivers/net/wireless/rt2x00/rt2x00dump.h
index 99f3f367adce..7169c222a486 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dump.h
+++ b/drivers/net/wireless/rt2x00/rt2x00dump.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -93,8 +93,8 @@ enum rt2x00_dump_type {
  * @chip_rf: RF chipset
  * @chip_rev: Chipset revision
  * @type: The frame type (&rt2x00_dump_type)
- * @ring_index: The index number of the data ring.
- * @entry_index: The index number of the entry inside the data ring.
+ * @queue_index: The index number of the data queue.
+ * @entry_index: The index number of the entry inside the data queue.
  * @timestamp_sec: Timestamp - seconds
  * @timestamp_usec: Timestamp - microseconds
  */
@@ -111,7 +111,7 @@ struct rt2x00dump_hdr {
         __le32 chip_rev;
 
         __le16 type;
-        __u8 ring_index;
+        __u8 queue_index;
         __u8 entry_index;
 
         __le32 timestamp_sec;
diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/rt2x00/rt2x00firmware.c
index 0a475e4e2442..b971bc6e7ee2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00firmware.c
+++ b/drivers/net/wireless/rt2x00/rt2x00firmware.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,6 @@
         Abstract: rt2x00 firmware loading routines.
  */
 
-#include <linux/crc-itu-t.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 
@@ -37,7 +36,6 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
         char *fw_name;
         int retval;
         u16 crc;
-        u16 tmp;
 
         /*
          * Read correct firmware from harddisk.
@@ -63,18 +61,9 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
                 return -ENOENT;
         }
 
-        /*
-         * Validate the firmware using 16 bit CRC.
-         * The last 2 bytes of the firmware are the CRC
-         * so substract those 2 bytes from the CRC checksum,
-         * and set those 2 bytes to 0 when calculating CRC.
-         */
-        tmp = 0;
-        crc = crc_itu_t(0, fw->data, fw->size - 2);
-        crc = crc_itu_t(crc, (u8 *)&tmp, 2);
-
+        crc = rt2x00dev->ops->lib->get_firmware_crc(fw->data, fw->size);
         if (crc != (fw->data[fw->size - 2] << 8 | fw->data[fw->size - 1])) {
-                ERROR(rt2x00dev, "Firmware CRC error.\n");
+                ERROR(rt2x00dev, "Firmware checksum error.\n");
                 retval = -ENOENT;
                 goto exit;
         }
@@ -96,6 +85,9 @@ int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
 
+        if (!test_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags))
+                return 0;
+
         if (!rt2x00dev->fw) {
                 retval = rt2x00lib_request_firmware(rt2x00dev);
                 if (retval)
@@ -116,4 +108,3 @@ void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev)
         release_firmware(rt2x00dev->fw);
         rt2x00dev->fw = NULL;
 }
-
diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.c b/drivers/net/wireless/rt2x00/rt2x00leds.c
new file mode 100644
index 000000000000..40c1f5c1b805
--- /dev/null
+++ b/drivers/net/wireless/rt2x00/rt2x00leds.c
@@ -0,0 +1,219 @@
+/*
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
+        <http://rt2x00.serialmonkey.com>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the
+        Free Software Foundation, Inc.,
+        59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+        Module: rt2x00lib
+        Abstract: rt2x00 led specific routines.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include "rt2x00.h"
+#include "rt2x00lib.h"
+
+void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi)
+{
+        struct rt2x00_led *led = &rt2x00dev->led_qual;
+        unsigned int brightness;
+
+        if ((led->type != LED_TYPE_QUALITY) || !(led->flags & LED_REGISTERED))
+                return;
+
+        /*
+         * Led handling requires a positive value for the rssi,
+         * to do that correctly we need to add the correction.
+         */
+        rssi += rt2x00dev->rssi_offset;
+
+        /*
+         * Get the rssi level, this is used to convert the rssi
+         * to a LED value inside the range LED_OFF - LED_FULL.
+         */
+        if (rssi <= 30)
+                rssi = 0;
+        else if (rssi <= 39)
+                rssi = 1;
+        else if (rssi <= 49)
+                rssi = 2;
+        else if (rssi <= 53)
+                rssi = 3;
+        else if (rssi <= 63)
+                rssi = 4;
+        else
+                rssi = 5;
+
+        /*
+         * Note that we must _not_ send LED_OFF since the driver
+         * is going to calculate the value and might use it in a
+         * division.
+         */
+        brightness = ((LED_FULL / 6) * rssi) + 1;
+        if (brightness != led->led_dev.brightness) {
+                led->led_dev.brightness_set(&led->led_dev, brightness);
+                led->led_dev.brightness = brightness;
+        }
+}
+
+void rt2x00leds_led_assoc(struct rt2x00_dev *rt2x00dev, bool enabled)
+{
+        struct rt2x00_led *led = &rt2x00dev->led_assoc;
+        unsigned int brightness;
+
+        if ((led->type != LED_TYPE_ASSOC) || !(led->flags & LED_REGISTERED))
+                return;
+
+        brightness = enabled ? LED_FULL : LED_OFF;
+        if (brightness != led->led_dev.brightness) {
+                led->led_dev.brightness_set(&led->led_dev, brightness);
+                led->led_dev.brightness = brightness;
+        }
+}
+
+void rt2x00leds_led_radio(struct rt2x00_dev *rt2x00dev, bool enabled)
+{
+        struct rt2x00_led *led = &rt2x00dev->led_radio;
+        unsigned int brightness;
+
+        if ((led->type != LED_TYPE_RADIO) || !(led->flags & LED_REGISTERED))
+                return;
+
+        brightness = enabled ? LED_FULL : LED_OFF;
+        if (brightness != led->led_dev.brightness) {
+                led->led_dev.brightness_set(&led->led_dev, brightness);
+                led->led_dev.brightness = brightness;
+        }
+}
+
+static int rt2x00leds_register_led(struct rt2x00_dev *rt2x00dev,
+                                   struct rt2x00_led *led,
+                                   const char *name)
+{
+        struct device *device = wiphy_dev(rt2x00dev->hw->wiphy);
+        int retval;
+
+        led->led_dev.name = name;
+
+        retval = led_classdev_register(device, &led->led_dev);
+        if (retval) {
+                ERROR(rt2x00dev, "Failed to register led handler.\n");
+                return retval;
+        }
+
+        led->flags |= LED_REGISTERED;
+
+        return 0;
+}
+
+void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
+{
+        char dev_name[16];
+        char name[32];
+        int retval;
+        unsigned long on_period;
+        unsigned long off_period;
+
+        snprintf(dev_name, sizeof(dev_name), "%s-%s",
+                 rt2x00dev->ops->name, wiphy_name(rt2x00dev->hw->wiphy));
+
+        if (rt2x00dev->led_radio.flags & LED_INITIALIZED) {
+                snprintf(name, sizeof(name), "%s:radio", dev_name);
+
+                retval = rt2x00leds_register_led(rt2x00dev,
+                                                 &rt2x00dev->led_radio,
+                                                 name);
+                if (retval)
+                        goto exit_fail;
+        }
+
+        if (rt2x00dev->led_assoc.flags & LED_INITIALIZED) {
+                snprintf(name, sizeof(name), "%s:assoc", dev_name);
+
+                retval = rt2x00leds_register_led(rt2x00dev,
+                                                 &rt2x00dev->led_assoc,
+                                                 name);
+                if (retval)
+                        goto exit_fail;
+        }
+
+        if (rt2x00dev->led_qual.flags & LED_INITIALIZED) {
+                snprintf(name, sizeof(name), "%s:quality", dev_name);
+
+                retval = rt2x00leds_register_led(rt2x00dev,
+                                                 &rt2x00dev->led_qual,
+                                                 name);
+                if (retval)
+                        goto exit_fail;
+        }
+
+        /*
+         * Initialize blink time to default value:
+         * On period: 70ms
+         * Off period: 30ms
+         */
+        if (rt2x00dev->led_radio.led_dev.blink_set) {
+                on_period = 70;
+                off_period = 30;
+                rt2x00dev->led_radio.led_dev.blink_set(
+                    &rt2x00dev->led_radio.led_dev, &on_period, &off_period);
+        }
+
+        return;
+
+exit_fail:
+        rt2x00leds_unregister(rt2x00dev);
+}
+
+static void rt2x00leds_unregister_led(struct rt2x00_led *led)
+{
+        led_classdev_unregister(&led->led_dev);
+        led->led_dev.brightness_set(&led->led_dev, LED_OFF);
+        led->flags &= ~LED_REGISTERED;
+}
+
+void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev)
+{
+        if (rt2x00dev->led_qual.flags & LED_REGISTERED)
+                rt2x00leds_unregister_led(&rt2x00dev->led_qual);
+        if (rt2x00dev->led_assoc.flags & LED_REGISTERED)
+                rt2x00leds_unregister_led(&rt2x00dev->led_assoc);
+        if (rt2x00dev->led_radio.flags & LED_REGISTERED)
+                rt2x00leds_unregister_led(&rt2x00dev->led_radio);
+}
+
+void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev)
+{
+        if (rt2x00dev->led_qual.flags & LED_REGISTERED)
+                led_classdev_suspend(&rt2x00dev->led_qual.led_dev);
+        if (rt2x00dev->led_assoc.flags & LED_REGISTERED)
+                led_classdev_suspend(&rt2x00dev->led_assoc.led_dev);
+        if (rt2x00dev->led_radio.flags & LED_REGISTERED)
+                led_classdev_suspend(&rt2x00dev->led_radio.led_dev);
+}
+
+void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev)
+{
+        if (rt2x00dev->led_radio.flags & LED_REGISTERED)
+                led_classdev_resume(&rt2x00dev->led_radio.led_dev);
+        if (rt2x00dev->led_assoc.flags & LED_REGISTERED)
+                led_classdev_resume(&rt2x00dev->led_assoc.led_dev);
+        if (rt2x00dev->led_qual.flags & LED_REGISTERED)
+                led_classdev_resume(&rt2x00dev->led_qual.led_dev);
+}
diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.h b/drivers/net/wireless/rt2x00/rt2x00leds.h
new file mode 100644
index 000000000000..9df4a49bdcad
--- /dev/null
+++ b/drivers/net/wireless/rt2x00/rt2x00leds.h
@@ -0,0 +1,50 @@
+/*
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
+        <http://rt2x00.serialmonkey.com>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the
+        Free Software Foundation, Inc.,
+        59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+        Module: rt2x00lib
+        Abstract: rt2x00 led datastructures and routines
+ */
+
+#ifndef RT2X00LEDS_H
+#define RT2X00LEDS_H
+
+enum led_type {
+        LED_TYPE_RADIO,
+        LED_TYPE_ASSOC,
+        LED_TYPE_ACTIVITY,
+        LED_TYPE_QUALITY,
+};
+
+#ifdef CONFIG_RT2X00_LIB_LEDS
+
+struct rt2x00_led {
+        struct rt2x00_dev *rt2x00dev;
+        struct led_classdev led_dev;
+
+        enum led_type type;
+        unsigned int flags;
+#define LED_INITIALIZED         ( 1 << 0 )
+#define LED_REGISTERED          ( 1 << 1 )
+};
+
+#endif /* CONFIG_RT2X00_LIB_LEDS */
+
+#endif /* RT2X00LEDS_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index ce58c654ade1..5be32fffc74c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,40 @@
 #define RFKILL_POLL_INTERVAL    ( 1000 )
 
 /*
+ * rt2x00_rate: Per rate device information
+ */
+struct rt2x00_rate {
+        unsigned short flags;
+#define DEV_RATE_CCK                    0x0001
+#define DEV_RATE_OFDM                   0x0002
+#define DEV_RATE_SHORT_PREAMBLE         0x0004
+#define DEV_RATE_BASIC                  0x0008
+
+        unsigned short bitrate; /* In 100kbit/s */
+        unsigned short ratemask;
+
+        unsigned short plcp;
+};
+
+extern const struct rt2x00_rate rt2x00_supported_rates[12];
+
+static inline u16 rt2x00_create_rate_hw_value(const u16 index,
+                                              const u16 short_preamble)
+{
+        return (short_preamble << 8) | (index & 0xff);
+}
+
+static inline const struct rt2x00_rate *rt2x00_get_rate(const u16 hw_value)
+{
+        return &rt2x00_supported_rates[hw_value & 0xff];
+}
+
+static inline int rt2x00_get_rate_preamble(const u16 hw_value)
+{
+        return (hw_value & 0xff00);
+}
+
+/*
  * Radio control handlers.
  */
 int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev);
@@ -50,15 +84,29 @@ void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev);
 /*
  * Configuration handlers.
  */
-void rt2x00lib_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *mac);
-void rt2x00lib_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid);
-void rt2x00lib_config_type(struct rt2x00_dev *rt2x00dev, const int type);
+void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
+                           struct rt2x00_intf *intf,
+                           enum ieee80211_if_types type,
+                           u8 *mac, u8 *bssid);
+void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
+                          struct rt2x00_intf *intf,
+                          struct ieee80211_bss_conf *conf);
 void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
                               enum antenna rx, enum antenna tx);
 void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
                       struct ieee80211_conf *conf, const int force_config);
 
 /*
+ * Queue handlers.
+ */
+void rt2x00queue_init_rx(struct rt2x00_dev *rt2x00dev);
+void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev);
+int rt2x00queue_initialize(struct rt2x00_dev *rt2x00dev);
+void rt2x00queue_uninitialize(struct rt2x00_dev *rt2x00dev);
+int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev);
+void rt2x00queue_free(struct rt2x00_dev *rt2x00dev);
+
+/*
  * Firmware handlers.
  */
 #ifdef CONFIG_RT2X00_LIB_FIRMWARE
@@ -132,4 +180,48 @@ static inline void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
 }
 #endif /* CONFIG_RT2X00_LIB_RFKILL */
 
+/*
+ * LED handlers
+ */
+#ifdef CONFIG_RT2X00_LIB_LEDS
+void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi);
+void rt2x00leds_led_assoc(struct rt2x00_dev *rt2x00dev, bool enabled);
+void rt2x00leds_led_radio(struct rt2x00_dev *rt2x00dev, bool enabled);
+void rt2x00leds_register(struct rt2x00_dev *rt2x00dev);
+void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev);
+void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev);
+void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev);
+#else
+static inline void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev,
+                                          int rssi)
+{
+}
+
+static inline void rt2x00leds_led_assoc(struct rt2x00_dev *rt2x00dev,
+                                        bool enabled)
+{
+}
+
+static inline void rt2x00leds_led_radio(struct rt2x00_dev *rt2x00dev,
+                                        bool enabled)
+{
+}
+
+static inline void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
+{
+}
+
+static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev)
+{
+}
+
+static inline void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev)
+{
+}
+
+static inline void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev)
+{
+}
+#endif /* CONFIG_RT2X00_LIB_LEDS */
+
 #endif /* RT2X00LIB_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index e3f15e518c76..c206b5092070 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -30,10 +30,11 @@
 #include "rt2x00lib.h"
 
 static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
-                                struct data_ring *ring,
+                                struct data_queue *queue,
                                 struct sk_buff *frag_skb,
                                 struct ieee80211_tx_control *control)
 {
+        struct skb_frame_desc *skbdesc;
         struct sk_buff *skb;
         int size;
 
@@ -52,15 +53,22 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
         skb_put(skb, size);
 
         if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
-                ieee80211_ctstoself_get(rt2x00dev->hw, rt2x00dev->interface.id,
+                ieee80211_ctstoself_get(rt2x00dev->hw, control->vif,
                                         frag_skb->data, frag_skb->len, control,
                                         (struct ieee80211_cts *)(skb->data));
         else
-                ieee80211_rts_get(rt2x00dev->hw, rt2x00dev->interface.id,
+                ieee80211_rts_get(rt2x00dev->hw, control->vif,
                                   frag_skb->data, frag_skb->len, control,
                                   (struct ieee80211_rts *)(skb->data));
 
-        if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, ring, skb, control)) {
+        /*
+         * Initialize skb descriptor
+         */
+        skbdesc = get_skb_frame_desc(skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
+        skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
+
+        if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb, control)) {
                 WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");
                 return NETDEV_TX_BUSY;
         }
@@ -73,7 +81,8 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct ieee80211_hdr *ieee80211hdr = (struct ieee80211_hdr *)skb->data;
-        struct data_ring *ring;
+        struct data_queue *queue;
+        struct skb_frame_desc *skbdesc;
         u16 frame_control;
 
         /*
@@ -88,10 +97,14 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         }
 
         /*
-         * Determine which ring to put packet on.
+         * Determine which queue to put packet on.
          */
-        ring = rt2x00lib_get_ring(rt2x00dev, control->queue);
-        if (unlikely(!ring)) {
+        if (control->flags & IEEE80211_TXCTL_SEND_AFTER_DTIM &&
+            test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags))
+                queue = rt2x00queue_get_queue(rt2x00dev, RT2X00_BCN_QUEUE_ATIM);
+        else
+                queue = rt2x00queue_get_queue(rt2x00dev, control->queue);
+        if (unlikely(!queue)) {
                 ERROR(rt2x00dev,
                       "Attempt to send packet over invalid queue %d.\n"
                       "Please file bug report to %s.\n",
@@ -110,23 +123,29 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         if (!is_rts_frame(frame_control) && !is_cts_frame(frame_control) &&
             (control->flags & (IEEE80211_TXCTL_USE_RTS_CTS |
                                IEEE80211_TXCTL_USE_CTS_PROTECT))) {
-                if (rt2x00_ring_free(ring) <= 1) {
+                if (rt2x00queue_available(queue) <= 1) {
                         ieee80211_stop_queue(rt2x00dev->hw, control->queue);
                         return NETDEV_TX_BUSY;
                 }
 
-                if (rt2x00mac_tx_rts_cts(rt2x00dev, ring, skb, control)) {
+                if (rt2x00mac_tx_rts_cts(rt2x00dev, queue, skb, control)) {
                         ieee80211_stop_queue(rt2x00dev->hw, control->queue);
                         return NETDEV_TX_BUSY;
                 }
         }
 
-        if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, ring, skb, control)) {
+        /*
+         * Initialize skb descriptor
+         */
+        skbdesc = get_skb_frame_desc(skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
+
+        if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb, control)) {
                 ieee80211_stop_queue(rt2x00dev->hw, control->queue);
                 return NETDEV_TX_BUSY;
         }
 
-        if (rt2x00_ring_full(ring))
+        if (rt2x00queue_full(queue))
                 ieee80211_stop_queue(rt2x00dev->hw, control->queue);
 
         if (rt2x00dev->ops->lib->kick_tx_queue)
@@ -162,27 +181,67 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
                             struct ieee80211_if_init_conf *conf)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct interface *intf = &rt2x00dev->interface;
-
-        /* FIXME: Beaconing is broken in rt2x00. */
-        if (conf->type == IEEE80211_IF_TYPE_IBSS ||
-            conf->type == IEEE80211_IF_TYPE_AP) {
-                ERROR(rt2x00dev,
-                      "rt2x00 does not support Adhoc or Master mode");
-                return -EOPNOTSUPP;
-        }
+        struct rt2x00_intf *intf = vif_to_intf(conf->vif);
+        struct data_queue *queue =
+            rt2x00queue_get_queue(rt2x00dev, RT2X00_BCN_QUEUE_BEACON);
+        struct queue_entry *entry = NULL;
+        unsigned int i;
 
         /*
-         * Don't allow interfaces to be added while
-         * either the device has disappeared or when
-         * another interface is already present.
+         * Don't allow interfaces to be added
+         * the device has disappeared.
          */
         if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags) ||
-            is_interface_present(intf))
+            !test_bit(DEVICE_STARTED, &rt2x00dev->flags))
+                return -ENODEV;
+
+        /*
+         * When we don't support mixed interfaces (a combination
+         * of sta and ap virtual interfaces) then we can only
+         * add this interface when the rival interface count is 0.
+         */
+        if (!test_bit(DRIVER_SUPPORT_MIXED_INTERFACES, &rt2x00dev->flags) &&
+            ((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) ||
+             (conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count)))
+                return -ENOBUFS;
+
+        /*
+         * Check if we exceeded the maximum amount of supported interfaces.
+         */
+        if ((conf->type == IEEE80211_IF_TYPE_AP &&
+             rt2x00dev->intf_ap_count >= rt2x00dev->ops->max_ap_intf) ||
+            (conf->type != IEEE80211_IF_TYPE_AP &&
+             rt2x00dev->intf_sta_count >= rt2x00dev->ops->max_sta_intf))
                 return -ENOBUFS;
 
-        intf->id = conf->vif;
-        intf->type = conf->type;
+        /*
+         * Loop through all beacon queues to find a free
+         * entry. Since there are as much beacon entries
+         * as the maximum interfaces, this search shouldn't
+         * fail.
+         */
+        for (i = 0; i < queue->limit; i++) {
+                entry = &queue->entries[i];
+                if (!__test_and_set_bit(ENTRY_BCN_ASSIGNED, &entry->flags))
+                        break;
+        }
+
+        if (unlikely(i == queue->limit))
+                return -ENOBUFS;
+
+        /*
+         * We are now absolutely sure the interface can be created,
+         * increase interface count and start initialization.
+         */
+
+        if (conf->type == IEEE80211_IF_TYPE_AP)
+                rt2x00dev->intf_ap_count++;
+        else
+                rt2x00dev->intf_sta_count++;
+
+        spin_lock_init(&intf->lock);
+        intf->beacon = entry;
+
         if (conf->type == IEEE80211_IF_TYPE_AP)
                 memcpy(&intf->bssid, conf->mac_addr, ETH_ALEN);
         memcpy(&intf->mac, conf->mac_addr, ETH_ALEN);
@@ -192,8 +251,14 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
          * has been initialized. Otherwise the device can reset
          * the MAC registers.
          */
-        rt2x00lib_config_mac_addr(rt2x00dev, intf->mac);
-        rt2x00lib_config_type(rt2x00dev, conf->type);
+        rt2x00lib_config_intf(rt2x00dev, intf, conf->type, intf->mac, NULL);
+
+        /*
+         * Some filters depend on the current working mode. We can force
+         * an update during the next configure_filter() run by mac80211 by
+         * resetting the current packet_filter state.
+         */
+        rt2x00dev->packet_filter = 0;
 
         return 0;
 }
@@ -203,7 +268,7 @@ void rt2x00mac_remove_interface(struct ieee80211_hw *hw,
                                 struct ieee80211_if_init_conf *conf)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct interface *intf = &rt2x00dev->interface;
+        struct rt2x00_intf *intf = vif_to_intf(conf->vif);
 
         /*
          * Don't allow interfaces to be remove while
@@ -211,21 +276,27 @@ void rt2x00mac_remove_interface(struct ieee80211_hw *hw,
          * no interface is present.
          */
         if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags) ||
-            !is_interface_present(intf))
+            (conf->type == IEEE80211_IF_TYPE_AP && !rt2x00dev->intf_ap_count) ||
+            (conf->type != IEEE80211_IF_TYPE_AP && !rt2x00dev->intf_sta_count))
                 return;
 
-        intf->id = 0;
-        intf->type = IEEE80211_IF_TYPE_INVALID;
-        memset(&intf->bssid, 0x00, ETH_ALEN);
-        memset(&intf->mac, 0x00, ETH_ALEN);
+        if (conf->type == IEEE80211_IF_TYPE_AP)
+                rt2x00dev->intf_ap_count--;
+        else
+                rt2x00dev->intf_sta_count--;
+
+        /*
+         * Release beacon entry so it is available for
+         * new interfaces again.
+         */
+        __clear_bit(ENTRY_BCN_ASSIGNED, &intf->beacon->flags);
 
         /*
          * Make sure the bssid and mac address registers
          * are cleared to prevent false ACKing of frames.
          */
-        rt2x00lib_config_mac_addr(rt2x00dev, intf->mac);
-        rt2x00lib_config_bssid(rt2x00dev, intf->bssid);
-        rt2x00lib_config_type(rt2x00dev, intf->type);
+        rt2x00lib_config_intf(rt2x00dev, intf,
+                              IEEE80211_IF_TYPE_INVALID, NULL, NULL);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface);
 
@@ -270,7 +341,7 @@ int rt2x00mac_config_interface(struct ieee80211_hw *hw,
                                struct ieee80211_if_conf *conf)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct interface *intf = &rt2x00dev->interface;
+        struct rt2x00_intf *intf = vif_to_intf(vif);
         int status;
 
         /*
@@ -280,12 +351,7 @@ int rt2x00mac_config_interface(struct ieee80211_hw *hw,
         if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags))
                 return 0;
 
-        /*
-         * If the given type does not match the configured type,
-         * there has been a problem.
-         */
-        if (conf->type != intf->type)
-                return -EINVAL;
+        spin_lock(&intf->lock);
 
         /*
          * If the interface does not work in master mode,
@@ -294,7 +360,16 @@ int rt2x00mac_config_interface(struct ieee80211_hw *hw,
          */
         if (conf->type != IEEE80211_IF_TYPE_AP)
                 memcpy(&intf->bssid, conf->bssid, ETH_ALEN);
-        rt2x00lib_config_bssid(rt2x00dev, intf->bssid);
+
+        spin_unlock(&intf->lock);
+
+        /*
+         * Call rt2x00_config_intf() outside of the spinlock context since
+         * the call will sleep for USB drivers. By using the ieee80211_if_conf
+         * values as arguments we make keep access to rt2x00_intf thread safe
+         * even without the lock.
+         */
+        rt2x00lib_config_intf(rt2x00dev, intf, conf->type, NULL, conf->bssid);
 
         /*
          * We only need to initialize the beacon when master mode is enabled.
@@ -312,6 +387,50 @@ int rt2x00mac_config_interface(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_config_interface);
 
+void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
+                                unsigned int changed_flags,
+                                unsigned int *total_flags,
+                                int mc_count, struct dev_addr_list *mc_list)
+{
+        struct rt2x00_dev *rt2x00dev = hw->priv;
+
+        /*
+         * Mask off any flags we are going to ignore
+         * from the total_flags field.
+         */
+        *total_flags &=
+            FIF_ALLMULTI |
+            FIF_FCSFAIL |
+            FIF_PLCPFAIL |
+            FIF_CONTROL |
+            FIF_OTHER_BSS |
+            FIF_PROMISC_IN_BSS;
+
+        /*
+         * Apply some rules to the filters:
+         * - Some filters imply different filters to be set.
+         * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
+         */
+        *total_flags |= FIF_ALLMULTI;
+        if (*total_flags & FIF_OTHER_BSS ||
+            *total_flags & FIF_PROMISC_IN_BSS)
+                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
+
+        /*
+         * Check if there is any work left for us.
+         */
+        if (rt2x00dev->packet_filter == *total_flags)
+                return;
+        rt2x00dev->packet_filter = *total_flags;
+
+        if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))
+                rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
+        else
+                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
+}
+EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter);
+
 int rt2x00mac_get_stats(struct ieee80211_hw *hw,
                         struct ieee80211_low_level_stats *stats)
 {
@@ -334,9 +453,11 @@ int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,
         struct rt2x00_dev *rt2x00dev = hw->priv;
         unsigned int i;
 
-        for (i = 0; i < hw->queues; i++)
-                memcpy(&stats->data[i], &rt2x00dev->tx[i].stats,
-                       sizeof(rt2x00dev->tx[i].stats));
+        for (i = 0; i < hw->queues; i++) {
+                stats->data[i].len = rt2x00dev->tx[i].length;
+                stats->data[i].limit = rt2x00dev->tx[i].limit;
+                stats->data[i].count = rt2x00dev->tx[i].count;
+        }
 
         return 0;
 }
@@ -348,71 +469,83 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
                                 u32 changes)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        int short_preamble;
-        int ack_timeout;
-        int ack_consume_time;
-        int difs;
-        int preamble;
+        struct rt2x00_intf *intf = vif_to_intf(vif);
+        unsigned int delayed = 0;
 
         /*
-         * We only support changing preamble mode.
+         * When the association status has changed we must reset the link
+         * tuner counter. This is because some drivers determine if they
+         * should perform link tuning based on the number of seconds
+         * while associated or not associated.
          */
-        if (!(changes & BSS_CHANGED_ERP_PREAMBLE))
-                return;
-
-        short_preamble = bss_conf->use_short_preamble;
-        preamble = bss_conf->use_short_preamble ?
-                                SHORT_PREAMBLE : PREAMBLE;
+        if (changes & BSS_CHANGED_ASSOC) {
+                rt2x00dev->link.count = 0;
 
-        difs = (hw->conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME) ?
-                SHORT_DIFS : DIFS;
-        ack_timeout = difs + PLCP + preamble + get_duration(ACK_SIZE, 10);
+                if (bss_conf->assoc)
+                        rt2x00dev->intf_associated++;
+                else
+                        rt2x00dev->intf_associated--;
 
-        ack_consume_time = SIFS + PLCP + preamble + get_duration(ACK_SIZE, 10);
+                if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))
+                        rt2x00leds_led_assoc(rt2x00dev,
+                                             !!rt2x00dev->intf_associated);
+                else
+                        delayed |= DELAYED_LED_ASSOC;
+        }
 
-        if (short_preamble)
-                __set_bit(CONFIG_SHORT_PREAMBLE, &rt2x00dev->flags);
-        else
-                __clear_bit(CONFIG_SHORT_PREAMBLE, &rt2x00dev->flags);
+        /*
+         * When the erp information has changed, we should perform
+         * additional configuration steps. For all other changes we are done.
+         */
+        if (changes & BSS_CHANGED_ERP_PREAMBLE) {
+                if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))
+                        rt2x00lib_config_erp(rt2x00dev, intf, bss_conf);
+                else
+                        delayed |= DELAYED_CONFIG_ERP;
+        }
 
-        rt2x00dev->ops->lib->config_preamble(rt2x00dev, short_preamble,
-                                             ack_timeout, ack_consume_time);
+        spin_lock(&intf->lock);
+        memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
+        if (delayed) {
+                intf->delayed_flags |= delayed;
+                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work);
+        }
+        spin_unlock(&intf->lock);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);
 
-int rt2x00mac_conf_tx(struct ieee80211_hw *hw, int queue,
+int rt2x00mac_conf_tx(struct ieee80211_hw *hw, int queue_idx,
                       const struct ieee80211_tx_queue_params *params)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct data_ring *ring;
+        struct data_queue *queue;
 
-        ring = rt2x00lib_get_ring(rt2x00dev, queue);
-        if (unlikely(!ring))
+        queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);
+        if (unlikely(!queue))
                 return -EINVAL;
 
         /*
          * The passed variables are stored as real value ((2^n)-1).
          * Ralink registers require to know the bit number 'n'.
          */
-        if (params->cw_min)
-                ring->tx_params.cw_min = fls(params->cw_min);
+        if (params->cw_min > 0)
+                queue->cw_min = fls(params->cw_min);
         else
-                ring->tx_params.cw_min = 5; /* cw_min: 2^5 = 32. */
+                queue->cw_min = 5; /* cw_min: 2^5 = 32. */
 
-        if (params->cw_max)
-                ring->tx_params.cw_max = fls(params->cw_max);
+        if (params->cw_max > 0)
+                queue->cw_max = fls(params->cw_max);
         else
-                ring->tx_params.cw_max = 10; /* cw_min: 2^10 = 1024. */
+                queue->cw_max = 10; /* cw_min: 2^10 = 1024. */
 
-        if (params->aifs)
-                ring->tx_params.aifs = params->aifs;
+        if (params->aifs >= 0)
+                queue->aifs = params->aifs;
         else
-                ring->tx_params.aifs = 2;
+                queue->aifs = 2;
 
         INFO(rt2x00dev,
-             "Configured TX ring %d - CWmin: %d, CWmax: %d, Aifs: %d.\n",
-             queue, ring->tx_params.cw_min, ring->tx_params.cw_max,
-             ring->tx_params.aifs);
+             "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d.\n",
+             queue_idx, queue->cw_min, queue->cw_max, queue->aifs);
 
         return 0;
 }
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 804a9980055d..7867ec64bd2c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -32,64 +32,21 @@
 #include "rt2x00pci.h"
 
 /*
- * Beacon handlers.
- */
-int rt2x00pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
-                            struct ieee80211_tx_control *control)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct skb_desc *desc;
-        struct data_ring *ring;
-        struct data_entry *entry;
-
-        /*
-         * Just in case mac80211 doesn't set this correctly,
-         * but we need this queue set for the descriptor
-         * initialization.
-         */
-        control->queue = IEEE80211_TX_QUEUE_BEACON;
-        ring = rt2x00lib_get_ring(rt2x00dev, control->queue);
-        entry = rt2x00_get_data_entry(ring);
-
-        /*
-         * Fill in skb descriptor
-         */
-        desc = get_skb_desc(skb);
-        desc->desc_len = ring->desc_size;
-        desc->data_len = skb->len;
-        desc->desc = entry->priv;
-        desc->data = skb->data;
-        desc->ring = ring;
-        desc->entry = entry;
-
-        memcpy(entry->data_addr, skb->data, skb->len);
-        rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
-
-        /*
-         * Enable beacon generation.
-         */
-        rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, control->queue);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(rt2x00pci_beacon_update);
-
-/*
  * TX data handlers.
  */
 int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
-                            struct data_ring *ring, struct sk_buff *skb,
+                            struct data_queue *queue, struct sk_buff *skb,
                             struct ieee80211_tx_control *control)
 {
-        struct data_entry *entry = rt2x00_get_data_entry(ring);
-        __le32 *txd = entry->priv;
-        struct skb_desc *desc;
+        struct queue_entry *entry = rt2x00queue_get_entry(queue, Q_INDEX);
+        struct queue_entry_priv_pci_tx *priv_tx = entry->priv_data;
+        struct skb_frame_desc *skbdesc;
         u32 word;
 
-        if (rt2x00_ring_full(ring))
+        if (rt2x00queue_full(queue))
                 return -EINVAL;
 
-        rt2x00_desc_read(txd, 0, &word);
+        rt2x00_desc_read(priv_tx->desc, 0, &word);
 
         if (rt2x00_get_field32(word, TXD_ENTRY_OWNER_NIC) ||
             rt2x00_get_field32(word, TXD_ENTRY_VALID)) {
@@ -103,18 +60,18 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
         /*
          * Fill in skb descriptor
          */
-        desc = get_skb_desc(skb);
-        desc->desc_len = ring->desc_size;
-        desc->data_len = skb->len;
-        desc->desc = entry->priv;
-        desc->data = skb->data;
-        desc->ring = ring;
-        desc->entry = entry;
-
-        memcpy(entry->data_addr, skb->data, skb->len);
+        skbdesc = get_skb_frame_desc(skb);
+        skbdesc->data = skb->data;
+        skbdesc->data_len = skb->len;
+        skbdesc->desc = priv_tx->desc;
+        skbdesc->desc_len = queue->desc_size;
+        skbdesc->entry = entry;
+
+        memcpy(&priv_tx->control, control, sizeof(priv_tx->control));
+        memcpy(priv_tx->data, skb->data, skb->len);
         rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
 
-        rt2x00_ring_index_inc(ring);
+        rt2x00queue_index_inc(queue, Q_INDEX);
 
         return 0;
 }
@@ -125,29 +82,28 @@ EXPORT_SYMBOL_GPL(rt2x00pci_write_tx_data);
  */
 void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 {
-        struct data_ring *ring = rt2x00dev->rx;
-        struct data_entry *entry;
-        struct sk_buff *skb;
+        struct data_queue *queue = rt2x00dev->rx;
+        struct queue_entry *entry;
+        struct queue_entry_priv_pci_rx *priv_rx;
         struct ieee80211_hdr *hdr;
-        struct skb_desc *skbdesc;
-        struct rxdata_entry_desc desc;
+        struct skb_frame_desc *skbdesc;
+        struct rxdone_entry_desc rxdesc;
         int header_size;
-        __le32 *rxd;
         int align;
         u32 word;
 
         while (1) {
-                entry = rt2x00_get_data_entry(ring);
-                rxd = entry->priv;
-                rt2x00_desc_read(rxd, 0, &word);
+                entry = rt2x00queue_get_entry(queue, Q_INDEX);
+                priv_rx = entry->priv_data;
+                rt2x00_desc_read(priv_rx->desc, 0, &word);
 
                 if (rt2x00_get_field32(word, RXD_ENTRY_OWNER_NIC))
                         break;
 
-                memset(&desc, 0, sizeof(desc));
-                rt2x00dev->ops->lib->fill_rxdone(entry, &desc);
+                memset(&rxdesc, 0, sizeof(rxdesc));
+                rt2x00dev->ops->lib->fill_rxdone(entry, &rxdesc);
 
-                hdr = (struct ieee80211_hdr *)entry->data_addr;
+                hdr = (struct ieee80211_hdr *)priv_rx->data;
                 header_size =
                     ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
 
@@ -161,66 +117,68 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
                  * Allocate the sk_buffer, initialize it and copy
                  * all data into it.
                  */
-                skb = dev_alloc_skb(desc.size + align);
-                if (!skb)
+                entry->skb = dev_alloc_skb(rxdesc.size + align);
+                if (!entry->skb)
                         return;
 
-                skb_reserve(skb, align);
-                memcpy(skb_put(skb, desc.size), entry->data_addr, desc.size);
+                skb_reserve(entry->skb, align);
+                memcpy(skb_put(entry->skb, rxdesc.size),
+                       priv_rx->data, rxdesc.size);
 
                 /*
                  * Fill in skb descriptor
                  */
-                skbdesc = get_skb_desc(skb);
-                skbdesc->desc_len = entry->ring->desc_size;
-                skbdesc->data_len = skb->len;
-                skbdesc->desc = entry->priv;
-                skbdesc->data = skb->data;
-                skbdesc->ring = ring;
+                skbdesc = get_skb_frame_desc(entry->skb);
+                memset(skbdesc, 0, sizeof(*skbdesc));
+                skbdesc->data = entry->skb->data;
+                skbdesc->data_len = entry->skb->len;
+                skbdesc->desc = priv_rx->desc;
+                skbdesc->desc_len = queue->desc_size;
                 skbdesc->entry = entry;
 
                 /*
                  * Send the frame to rt2x00lib for further processing.
                  */
-                rt2x00lib_rxdone(entry, skb, &desc);
+                rt2x00lib_rxdone(entry, &rxdesc);
 
-                if (test_bit(DEVICE_ENABLED_RADIO, &ring->rt2x00dev->flags)) {
+                if (test_bit(DEVICE_ENABLED_RADIO, &queue->rt2x00dev->flags)) {
                         rt2x00_set_field32(&word, RXD_ENTRY_OWNER_NIC, 1);
-                        rt2x00_desc_write(rxd, 0, word);
+                        rt2x00_desc_write(priv_rx->desc, 0, word);
                 }
 
-                rt2x00_ring_index_inc(ring);
+                rt2x00queue_index_inc(queue, Q_INDEX);
         }
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_rxdone);
 
-void rt2x00pci_txdone(struct rt2x00_dev *rt2x00dev, struct data_entry *entry,
-                      const int tx_status, const int retry)
+void rt2x00pci_txdone(struct rt2x00_dev *rt2x00dev, struct queue_entry *entry,
+                      struct txdone_entry_desc *txdesc)
 {
+        struct queue_entry_priv_pci_tx *priv_tx = entry->priv_data;
         u32 word;
 
-        rt2x00lib_txdone(entry, tx_status, retry);
+        txdesc->control = &priv_tx->control;
+        rt2x00lib_txdone(entry, txdesc);
 
         /*
          * Make this entry available for reuse.
          */
         entry->flags = 0;
 
-        rt2x00_desc_read(entry->priv, 0, &word);
+        rt2x00_desc_read(priv_tx->desc, 0, &word);
         rt2x00_set_field32(&word, TXD_ENTRY_OWNER_NIC, 0);
         rt2x00_set_field32(&word, TXD_ENTRY_VALID, 0);
-        rt2x00_desc_write(entry->priv, 0, word);
+        rt2x00_desc_write(priv_tx->desc, 0, word);
 
-        rt2x00_ring_index_done_inc(entry->ring);
+        rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);
 
         /*
-         * If the data ring was full before the txdone handler
+         * If the data queue was full before the txdone handler
          * we must make sure the packet queue in the mac80211 stack
          * is reenabled when the txdone handler has finished.
          */
-        if (!rt2x00_ring_full(entry->ring))
-                ieee80211_wake_queue(rt2x00dev->hw,
-                                     entry->tx_status.control.queue);
+        if (!rt2x00queue_full(entry->queue))
+                ieee80211_wake_queue(rt2x00dev->hw, priv_tx->control.queue);
 
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_txdone);
@@ -228,73 +186,122 @@ EXPORT_SYMBOL_GPL(rt2x00pci_txdone);
 /*
  * Device initialization handlers.
  */
-#define priv_offset(__ring, __i)                                \
-({                                                              \
-        ring->data_addr + (i * ring->desc_size);                \
+#define desc_size(__queue)                      \
+({                                              \
+         ((__queue)->limit * (__queue)->desc_size);\
+})
+
+#define data_size(__queue)                      \
+({                                              \
+         ((__queue)->limit * (__queue)->data_size);\
 })
 
-#define data_addr_offset(__ring, __i)                           \
-({                                                              \
-        (__ring)->data_addr +                                   \
-            ((__ring)->stats.limit * (__ring)->desc_size) +     \
-            ((__i) * (__ring)->data_size);                      \
+#define dma_size(__queue)                       \
+({                                              \
+        data_size(__queue) + desc_size(__queue);\
 })
 
-#define data_dma_offset(__ring, __i)                            \
-({                                                              \
-        (__ring)->data_dma +                                    \
-            ((__ring)->stats.limit * (__ring)->desc_size) +     \
-            ((__i) * (__ring)->data_size);                      \
+#define desc_offset(__queue, __base, __i)       \
+({                                              \
+        (__base) + data_size(__queue) +         \
+            ((__i) * (__queue)->desc_size);     \
 })
 
-static int rt2x00pci_alloc_dma(struct rt2x00_dev *rt2x00dev,
-                               struct data_ring *ring)
+#define data_offset(__queue, __base, __i)       \
+({                                              \
+        (__base) +                              \
+            ((__i) * (__queue)->data_size);     \
+})
+
+static int rt2x00pci_alloc_queue_dma(struct rt2x00_dev *rt2x00dev,
+                                     struct data_queue *queue)
 {
+        struct pci_dev *pci_dev = rt2x00dev_pci(rt2x00dev);
+        struct queue_entry_priv_pci_rx *priv_rx;
+        struct queue_entry_priv_pci_tx *priv_tx;
+        void *addr;
+        dma_addr_t dma;
+        void *desc_addr;
+        dma_addr_t desc_dma;
+        void *data_addr;
+        dma_addr_t data_dma;
         unsigned int i;
 
         /*
          * Allocate DMA memory for descriptor and buffer.
          */
-        ring->data_addr = pci_alloc_consistent(rt2x00dev_pci(rt2x00dev),
-                                               rt2x00_get_ring_size(ring),
-                                               &ring->data_dma);
-        if (!ring->data_addr)
+        addr = pci_alloc_consistent(pci_dev, dma_size(queue), &dma);
+        if (!addr)
                 return -ENOMEM;
 
+        memset(addr, 0, dma_size(queue));
+
         /*
-         * Initialize all ring entries to contain valid
-         * addresses.
+         * Initialize all queue entries to contain valid addresses.
          */
-        for (i = 0; i < ring->stats.limit; i++) {
-                ring->entry[i].priv = priv_offset(ring, i);
-                ring->entry[i].data_addr = data_addr_offset(ring, i);
-                ring->entry[i].data_dma = data_dma_offset(ring, i);
+        for (i = 0; i < queue->limit; i++) {
+                desc_addr = desc_offset(queue, addr, i);
+                desc_dma = desc_offset(queue, dma, i);
+                data_addr = data_offset(queue, addr, i);
+                data_dma = data_offset(queue, dma, i);
+
+                if (queue->qid == QID_RX) {
+                        priv_rx = queue->entries[i].priv_data;
+                        priv_rx->desc = desc_addr;
+                        priv_rx->desc_dma = desc_dma;
+                        priv_rx->data = data_addr;
+                        priv_rx->data_dma = data_dma;
+                } else {
+                        priv_tx = queue->entries[i].priv_data;
+                        priv_tx->desc = desc_addr;
+                        priv_tx->desc_dma = desc_dma;
+                        priv_tx->data = data_addr;
+                        priv_tx->data_dma = data_dma;
+                }
         }
 
         return 0;
 }
 
-static void rt2x00pci_free_dma(struct rt2x00_dev *rt2x00dev,
-                               struct data_ring *ring)
+static void rt2x00pci_free_queue_dma(struct rt2x00_dev *rt2x00dev,
+                                     struct data_queue *queue)
 {
-        if (ring->data_addr)
-                pci_free_consistent(rt2x00dev_pci(rt2x00dev),
-                                    rt2x00_get_ring_size(ring),
-                                    ring->data_addr, ring->data_dma);
-        ring->data_addr = NULL;
+        struct pci_dev *pci_dev = rt2x00dev_pci(rt2x00dev);
+        struct queue_entry_priv_pci_rx *priv_rx;
+        struct queue_entry_priv_pci_tx *priv_tx;
+        void *data_addr;
+        dma_addr_t data_dma;
+
+        if (queue->qid == QID_RX) {
+                priv_rx = queue->entries[0].priv_data;
+                data_addr = priv_rx->data;
+                data_dma = priv_rx->data_dma;
+
+                priv_rx->data = NULL;
+        } else {
+                priv_tx = queue->entries[0].priv_data;
+                data_addr = priv_tx->data;
+                data_dma = priv_tx->data_dma;
+
+                priv_tx->data = NULL;
+        }
+
+        if (data_addr)
+                pci_free_consistent(pci_dev, dma_size(queue),
+                                    data_addr, data_dma);
 }
 
 int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
 {
         struct pci_dev *pci_dev = rt2x00dev_pci(rt2x00dev);
-        struct data_ring *ring;
+        struct data_queue *queue;
         int status;
 
         /*
          * Allocate DMA
          */
-        ring_for_each(rt2x00dev, ring) {
-                status = rt2x00pci_alloc_dma(rt2x00dev, ring);
+        queue_for_each(rt2x00dev, queue) {
+                status = rt2x00pci_alloc_queue_dma(rt2x00dev, queue);
                 if (status)
                         goto exit;
         }
@@ -321,7 +328,7 @@ EXPORT_SYMBOL_GPL(rt2x00pci_initialize);
 
 void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev)
 {
-        struct data_ring *ring;
+        struct data_queue *queue;
 
         /*
          * Free irq line.
@@ -331,8 +338,8 @@ void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev)
         /*
          * Free DMA
          */
-        ring_for_each(rt2x00dev, ring)
-                rt2x00pci_free_dma(rt2x00dev, ring);
+        queue_for_each(rt2x00dev, queue)
+                rt2x00pci_free_queue_dma(rt2x00dev, queue);
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
 
@@ -347,9 +354,9 @@ static void rt2x00pci_free_reg(struct rt2x00_dev *rt2x00dev)
         kfree(rt2x00dev->eeprom);
         rt2x00dev->eeprom = NULL;
 
-        if (rt2x00dev->csr_addr) {
-                iounmap(rt2x00dev->csr_addr);
-                rt2x00dev->csr_addr = NULL;
+        if (rt2x00dev->csr.base) {
+                iounmap(rt2x00dev->csr.base);
+                rt2x00dev->csr.base = NULL;
         }
 }
 
@@ -357,9 +364,9 @@ static int rt2x00pci_alloc_reg(struct rt2x00_dev *rt2x00dev)
 {
         struct pci_dev *pci_dev = rt2x00dev_pci(rt2x00dev);
 
-        rt2x00dev->csr_addr = ioremap(pci_resource_start(pci_dev, 0),
+        rt2x00dev->csr.base = ioremap(pci_resource_start(pci_dev, 0),
                                       pci_resource_len(pci_dev, 0));
-        if (!rt2x00dev->csr_addr)
+        if (!rt2x00dev->csr.base)
                 goto exit;
 
         rt2x00dev->eeprom = kzalloc(rt2x00dev->ops->eeprom_size, GFP_KERNEL);
@@ -530,5 +537,5 @@ EXPORT_SYMBOL_GPL(rt2x00pci_resume);
  */
 MODULE_AUTHOR(DRV_PROJECT);
 MODULE_VERSION(DRV_VERSION);
-MODULE_DESCRIPTION("rt2x00 library");
+MODULE_DESCRIPTION("rt2x00 pci library");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index 2d1eb8144da4..9d1cdb99431c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ static inline void rt2x00pci_register_read(struct rt2x00_dev *rt2x00dev,
                                            const unsigned long offset,
                                            u32 *value)
 {
-        *value = readl(rt2x00dev->csr_addr + offset);
+        *value = readl(rt2x00dev->csr.base + offset);
 }
 
 static inline void
@@ -69,14 +69,14 @@ rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev,
                              const unsigned long offset,
                              void *value, const u16 length)
 {
-        memcpy_fromio(value, rt2x00dev->csr_addr + offset, length);
+        memcpy_fromio(value, rt2x00dev->csr.base + offset, length);
 }
 
 static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev,
                                             const unsigned long offset,
                                             u32 value)
 {
-        writel(value, rt2x00dev->csr_addr + offset);
+        writel(value, rt2x00dev->csr.base + offset);
 }
 
 static inline void
@@ -84,28 +84,63 @@ rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
                               const unsigned long offset,
                               void *value, const u16 length)
 {
-        memcpy_toio(rt2x00dev->csr_addr + offset, value, length);
+        memcpy_toio(rt2x00dev->csr.base + offset, value, length);
 }
 
 /*
- * Beacon handlers.
- */
-int rt2x00pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
-                            struct ieee80211_tx_control *control);
-
-/*
  * TX data handlers.
  */
 int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
-                            struct data_ring *ring, struct sk_buff *skb,
+                            struct data_queue *queue, struct sk_buff *skb,
                             struct ieee80211_tx_control *control);
 
-/*
- * RX/TX data handlers.
+/**
+ * struct queue_entry_priv_pci_rx: Per RX entry PCI specific information
+ *
+ * @desc: Pointer to device descriptor.
+ * @data: Pointer to device's entry memory.
+ * @dma: DMA pointer to &data.
+ */
+struct queue_entry_priv_pci_rx {
+        __le32 *desc;
+        dma_addr_t desc_dma;
+
+        void *data;
+        dma_addr_t data_dma;
+};
+
+/**
+ * struct queue_entry_priv_pci_tx: Per TX entry PCI specific information
+ *
+ * @desc: Pointer to device descriptor
+ * @data: Pointer to device's entry memory.
+ * @dma: DMA pointer to &data.
+ * @control: mac80211 control structure used to transmit data.
+ */
+struct queue_entry_priv_pci_tx {
+        __le32 *desc;
+        dma_addr_t desc_dma;
+
+        void *data;
+        dma_addr_t data_dma;
+
+        struct ieee80211_tx_control control;
+};
+
+/**
+ * rt2x00pci_rxdone - Handle RX done events
+ * @rt2x00dev: Device pointer, see &struct rt2x00_dev.
  */
 void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev);
-void rt2x00pci_txdone(struct rt2x00_dev *rt2x00dev, struct data_entry *entry,
-                      const int tx_status, const int retry);
+
+/**
+ * rt2x00pci_txdone - Handle TX done events
+ * @rt2x00dev: Device pointer, see &struct rt2x00_dev.
+ * @entry: Entry which has completed the transmission of a frame.
+ * @desc: TX done descriptor
+ */
+void rt2x00pci_txdone(struct rt2x00_dev *rt2x00dev, struct queue_entry *entry,
+                      struct txdone_entry_desc *desc);
 
 /*
  * Device initialization handlers.
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
new file mode 100644
index 000000000000..659e9f44c40c
--- /dev/null
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -0,0 +1,304 @@
+/*
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
+        <http://rt2x00.serialmonkey.com>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the
+        Free Software Foundation, Inc.,
+        59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+        Module: rt2x00lib
+        Abstract: rt2x00 queue specific routines.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include "rt2x00.h"
+#include "rt2x00lib.h"
+
+struct data_queue *rt2x00queue_get_queue(struct rt2x00_dev *rt2x00dev,
+                                         const unsigned int queue)
+{
+        int atim = test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);
+
+        if (queue < rt2x00dev->hw->queues && rt2x00dev->tx)
+                return &rt2x00dev->tx[queue];
+
+        if (!rt2x00dev->bcn)
+                return NULL;
+
+        if (queue == RT2X00_BCN_QUEUE_BEACON)
+                return &rt2x00dev->bcn[0];
+        else if (queue == RT2X00_BCN_QUEUE_ATIM && atim)
+                return &rt2x00dev->bcn[1];
+
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(rt2x00queue_get_queue);
+
+struct queue_entry *rt2x00queue_get_entry(struct data_queue *queue,
+                                          enum queue_index index)
+{
+        struct queue_entry *entry;
+        unsigned long irqflags;
+
+        if (unlikely(index >= Q_INDEX_MAX)) {
+                ERROR(queue->rt2x00dev,
+                      "Entry requested from invalid index type (%d)\n", index);
+                return NULL;
+        }
+
+        spin_lock_irqsave(&queue->lock, irqflags);
+
+        entry = &queue->entries[queue->index[index]];
+
+        spin_unlock_irqrestore(&queue->lock, irqflags);
+
+        return entry;
+}
+EXPORT_SYMBOL_GPL(rt2x00queue_get_entry);
+
+void rt2x00queue_index_inc(struct data_queue *queue, enum queue_index index)
+{
+        unsigned long irqflags;
+
+        if (unlikely(index >= Q_INDEX_MAX)) {
+                ERROR(queue->rt2x00dev,
+                      "Index change on invalid index type (%d)\n", index);
+                return;
+        }
+
+        spin_lock_irqsave(&queue->lock, irqflags);
+
+        queue->index[index]++;
+        if (queue->index[index] >= queue->limit)
+                queue->index[index] = 0;
+
+        if (index == Q_INDEX) {
+                queue->length++;
+        } else if (index == Q_INDEX_DONE) {
+                queue->length--;
+                queue->count ++;
+        }
+
+        spin_unlock_irqrestore(&queue->lock, irqflags);
+}
+EXPORT_SYMBOL_GPL(rt2x00queue_index_inc);
+
+static void rt2x00queue_reset(struct data_queue *queue)
+{
+        unsigned long irqflags;
+
+        spin_lock_irqsave(&queue->lock, irqflags);
+
+        queue->count = 0;
+        queue->length = 0;
+        memset(queue->index, 0, sizeof(queue->index));
+
+        spin_unlock_irqrestore(&queue->lock, irqflags);
+}
+
+void rt2x00queue_init_rx(struct rt2x00_dev *rt2x00dev)
+{
+        struct data_queue *queue = rt2x00dev->rx;
+        unsigned int i;
+
+        rt2x00queue_reset(queue);
+
+        if (!rt2x00dev->ops->lib->init_rxentry)
+                return;
+
+        for (i = 0; i < queue->limit; i++)
+                rt2x00dev->ops->lib->init_rxentry(rt2x00dev,
+                                                  &queue->entries[i]);
+}
+
+void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev)
+{
+        struct data_queue *queue;
+        unsigned int i;
+
+        txall_queue_for_each(rt2x00dev, queue) {
+                rt2x00queue_reset(queue);
+
+                if (!rt2x00dev->ops->lib->init_txentry)
+                        continue;
+
+                for (i = 0; i < queue->limit; i++)
+                        rt2x00dev->ops->lib->init_txentry(rt2x00dev,
+                                                          &queue->entries[i]);
+        }
+}
+
+static int rt2x00queue_alloc_entries(struct data_queue *queue,
+                                     const struct data_queue_desc *qdesc)
+{
+        struct queue_entry *entries;
+        unsigned int entry_size;
+        unsigned int i;
+
+        rt2x00queue_reset(queue);
+
+        queue->limit = qdesc->entry_num;
+        queue->data_size = qdesc->data_size;
+        queue->desc_size = qdesc->desc_size;
+
+        /*
+         * Allocate all queue entries.
+         */
+        entry_size = sizeof(*entries) + qdesc->priv_size;
+        entries = kzalloc(queue->limit * entry_size, GFP_KERNEL);
+        if (!entries)
+                return -ENOMEM;
+
+#define QUEUE_ENTRY_PRIV_OFFSET(__base, __index, __limit, __esize, __psize) \
+        ( ((char *)(__base)) + ((__limit) * (__esize)) + \
+            ((__index) * (__psize)) )
+
+        for (i = 0; i < queue->limit; i++) {
+                entries[i].flags = 0;
+                entries[i].queue = queue;
+                entries[i].skb = NULL;
+                entries[i].entry_idx = i;
+                entries[i].priv_data =
+                    QUEUE_ENTRY_PRIV_OFFSET(entries, i, queue->limit,
+                                            sizeof(*entries), qdesc->priv_size);
+        }
+
+#undef QUEUE_ENTRY_PRIV_OFFSET
+
+        queue->entries = entries;
+
+        return 0;
+}
+
+int rt2x00queue_initialize(struct rt2x00_dev *rt2x00dev)
+{
+        struct data_queue *queue;
+        int status;
+
+
+        status = rt2x00queue_alloc_entries(rt2x00dev->rx, rt2x00dev->ops->rx);
+        if (status)
+                goto exit;
+
+        tx_queue_for_each(rt2x00dev, queue) {
+                status = rt2x00queue_alloc_entries(queue, rt2x00dev->ops->tx);
+                if (status)
+                        goto exit;
+        }
+
+        status = rt2x00queue_alloc_entries(rt2x00dev->bcn, rt2x00dev->ops->bcn);
+        if (status)
+                goto exit;
+
+        if (!test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags))
+                return 0;
+
+        status = rt2x00queue_alloc_entries(&rt2x00dev->bcn[1],
+                                           rt2x00dev->ops->atim);
+        if (status)
+                goto exit;
+
+        return 0;
+
+exit:
+        ERROR(rt2x00dev, "Queue entries allocation failed.\n");
+
+        rt2x00queue_uninitialize(rt2x00dev);
+
+        return status;
+}
+
+void rt2x00queue_uninitialize(struct rt2x00_dev *rt2x00dev)
+{
+        struct data_queue *queue;
+
+        queue_for_each(rt2x00dev, queue) {
+                kfree(queue->entries);
+                queue->entries = NULL;
+        }
+}
+
+static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,
+                             struct data_queue *queue, enum data_queue_qid qid)
+{
+        spin_lock_init(&queue->lock);
+
+        queue->rt2x00dev = rt2x00dev;
+        queue->qid = qid;
+        queue->aifs = 2;
+        queue->cw_min = 5;
+        queue->cw_max = 10;
+}
+
+int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev)
+{
+        struct data_queue *queue;
+        enum data_queue_qid qid;
+        unsigned int req_atim =
+            !!test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);
+
+        /*
+         * We need the following queues:
+         * RX: 1
+         * TX: hw->queues
+         * Beacon: 1
+         * Atim: 1 (if required)
+         */
+        rt2x00dev->data_queues = 2 + rt2x00dev->hw->queues + req_atim;
+
+        queue = kzalloc(rt2x00dev->data_queues * sizeof(*queue), GFP_KERNEL);
+        if (!queue) {
+                ERROR(rt2x00dev, "Queue allocation failed.\n");
+                return -ENOMEM;
+        }
+
+        /*
+         * Initialize pointers
+         */
+        rt2x00dev->rx = queue;
+        rt2x00dev->tx = &queue[1];
+        rt2x00dev->bcn = &queue[1 + rt2x00dev->hw->queues];
+
+        /*
+         * Initialize queue parameters.
+         * RX: qid = QID_RX
+         * TX: qid = QID_AC_BE + index
+         * TX: cw_min: 2^5 = 32.
+         * TX: cw_max: 2^10 = 1024.
+         * BCN & Atim: qid = QID_MGMT
+         */
+        rt2x00queue_init(rt2x00dev, rt2x00dev->rx, QID_RX);
+
+        qid = QID_AC_BE;
+        tx_queue_for_each(rt2x00dev, queue)
+                rt2x00queue_init(rt2x00dev, queue, qid++);
+
+        rt2x00queue_init(rt2x00dev, &rt2x00dev->bcn[0], QID_MGMT);
+        if (req_atim)
+                rt2x00queue_init(rt2x00dev, &rt2x00dev->bcn[1], QID_MGMT);
+
+        return 0;
+}
+
+void rt2x00queue_free(struct rt2x00_dev *rt2x00dev)
+{
+        kfree(rt2x00dev->rx);
+        rt2x00dev->rx = NULL;
+        rt2x00dev->tx = NULL;
+        rt2x00dev->bcn = NULL;
+}
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
new file mode 100644
index 000000000000..7027c9f47d3f
--- /dev/null
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -0,0 +1,468 @@
+/*
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
+        <http://rt2x00.serialmonkey.com>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the
+        Free Software Foundation, Inc.,
+        59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+        Module: rt2x00
+        Abstract: rt2x00 queue datastructures and routines
+ */
+
+#ifndef RT2X00QUEUE_H
+#define RT2X00QUEUE_H
+
+#include <linux/prefetch.h>
+
+/**
+ * DOC: Entrie frame size
+ *
+ * Ralink PCI devices demand the Frame size to be a multiple of 128 bytes,
+ * for USB devices this restriction does not apply, but the value of
+ * 2432 makes sense since it is big enough to contain the maximum fragment
+ * size according to the ieee802.11 specs.
+ */
+#define DATA_FRAME_SIZE 2432
+#define MGMT_FRAME_SIZE 256
+
+/**
+ * DOC: Number of entries per queue
+ *
+ * After research it was concluded that 12 entries in a RX and TX
+ * queue would be sufficient. Although this is almost one third of
+ * the amount the legacy driver allocated, the queues aren't getting
+ * filled to the maximum even when working with the maximum rate.
+ */
+#define RX_ENTRIES      12
+#define TX_ENTRIES      12
+#define BEACON_ENTRIES  1
+#define ATIM_ENTRIES    1
+
+/**
+ * enum data_queue_qid: Queue identification
+ */
+enum data_queue_qid {
+        QID_AC_BE = 0,
+        QID_AC_BK = 1,
+        QID_AC_VI = 2,
+        QID_AC_VO = 3,
+        QID_HCCA = 4,
+        QID_MGMT = 13,
+        QID_RX = 14,
+        QID_OTHER = 15,
+};
+
+/**
+ * enum rt2x00_bcn_queue: Beacon queue index
+ *
+ * Start counting with a high offset, this because this enumeration
+ * supplements &enum ieee80211_tx_queue and we should prevent value
+ * conflicts.
+ *
+ * @RT2X00_BCN_QUEUE_BEACON: Beacon queue
+ * @RT2X00_BCN_QUEUE_ATIM: Atim queue (sends frame after beacon)
+ */
+enum rt2x00_bcn_queue {
+        RT2X00_BCN_QUEUE_BEACON = 100,
+        RT2X00_BCN_QUEUE_ATIM = 101,
+};
+
+/**
+ * enum skb_frame_desc_flags: Flags for &struct skb_frame_desc
+ *
+ * @FRAME_DESC_DRIVER_GENERATED: Frame was generated inside driver
+ *      and should not be reported back to mac80211 during txdone.
+ */
+enum skb_frame_desc_flags {
+        FRAME_DESC_DRIVER_GENERATED = 1 << 0,
+};
+
+/**
+ * struct skb_frame_desc: Descriptor information for the skb buffer
+ *
+ * This structure is placed over the skb->cb array, this means that
+ * this structure should not exceed the size of that array (48 bytes).
+ *
+ * @flags: Frame flags, see &enum skb_frame_desc_flags.
+ * @frame_type: Frame type, see &enum rt2x00_dump_type.
+ * @data: Pointer to data part of frame (Start of ieee80211 header).
+ * @desc: Pointer to descriptor part of the frame.
+ *      Note that this pointer could point to something outside
+ *      of the scope of the skb->data pointer.
+ * @data_len: Length of the frame data.
+ * @desc_len: Length of the frame descriptor.
+
+ * @entry: The entry to which this sk buffer belongs.
+ */
+struct skb_frame_desc {
+        unsigned int flags;
+
+        unsigned int frame_type;
+
+        void *data;
+        void *desc;
+
+        unsigned int data_len;
+        unsigned int desc_len;
+
+        struct queue_entry *entry;
+};
+
+static inline struct skb_frame_desc* get_skb_frame_desc(struct sk_buff *skb)
+{
+        BUILD_BUG_ON(sizeof(struct skb_frame_desc) > sizeof(skb->cb));
+        return (struct skb_frame_desc *)&skb->cb[0];
+}
+
+/**
+ * enum rxdone_entry_desc_flags: Flags for &struct rxdone_entry_desc
+ *
+ * @RXDONE_SIGNAL_PLCP: Does the signal field contain the plcp value,
+ *      or does it contain the bitrate itself.
+ * @RXDONE_MY_BSS: Does this frame originate from device's BSS.
+ */
+enum rxdone_entry_desc_flags {
+        RXDONE_SIGNAL_PLCP = 1 << 0,
+        RXDONE_MY_BSS = 1 << 1,
+};
+
+/**
+ * struct rxdone_entry_desc: RX Entry descriptor
+ *
+ * Summary of information that has been read from the RX frame descriptor.
+ *
+ * @signal: Signal of the received frame.
+ * @rssi: RSSI of the received frame.
+ * @size: Data size of the received frame.
+ * @flags: MAC80211 receive flags (See &enum mac80211_rx_flags).
+ * @dev_flags: Ralink receive flags (See &enum rxdone_entry_desc_flags).
+
+ */
+struct rxdone_entry_desc {
+        int signal;
+        int rssi;
+        int size;
+        int flags;
+        int dev_flags;
+};
+
+/**
+ * struct txdone_entry_desc: TX done entry descriptor
+ *
+ * Summary of information that has been read from the TX frame descriptor
+ * after the device is done with transmission.
+ *
+ * @control: Control structure which was used to transmit the frame.
+ * @status: TX status (See &enum tx_status).
+ * @retry: Retry count.
+ */
+struct txdone_entry_desc {
+        struct ieee80211_tx_control *control;
+        int status;
+        int retry;
+};
+
+/**
+ * enum txentry_desc_flags: Status flags for TX entry descriptor
+ *
+ * @ENTRY_TXD_RTS_FRAME: This frame is a RTS frame.
+ * @ENTRY_TXD_OFDM_RATE: This frame is send out with an OFDM rate.
+ * @ENTRY_TXD_MORE_FRAG: This frame is followed by another fragment.
+ * @ENTRY_TXD_REQ_TIMESTAMP: Require timestamp to be inserted.
+ * @ENTRY_TXD_BURST: This frame belongs to the same burst event.
+ * @ENTRY_TXD_ACK: An ACK is required for this frame.
+ */
+enum txentry_desc_flags {
+        ENTRY_TXD_RTS_FRAME,
+        ENTRY_TXD_OFDM_RATE,
+        ENTRY_TXD_MORE_FRAG,
+        ENTRY_TXD_REQ_TIMESTAMP,
+        ENTRY_TXD_BURST,
+        ENTRY_TXD_ACK,
+};
+
+/**
+ * struct txentry_desc: TX Entry descriptor
+ *
+ * Summary of information for the frame descriptor before sending a TX frame.
+ *
+ * @flags: Descriptor flags (See &enum queue_entry_flags).
+ * @queue: Queue identification (See &enum data_queue_qid).
+ * @length_high: PLCP length high word.
+ * @length_low: PLCP length low word.
+ * @signal: PLCP signal.
+ * @service: PLCP service.
+ * @aifs: AIFS value.
+ * @ifs: IFS value.
+ * @cw_min: cwmin value.
+ * @cw_max: cwmax value.
+ */
+struct txentry_desc {
+        unsigned long flags;
+
+        enum data_queue_qid queue;
+
+        u16 length_high;
+        u16 length_low;
+        u16 signal;
+        u16 service;
+
+        int aifs;
+        int ifs;
+        int cw_min;
+        int cw_max;
+};
+
+/**
+ * enum queue_entry_flags: Status flags for queue entry
+ *
+ * @ENTRY_BCN_ASSIGNED: This entry has been assigned to an interface.
+ *      As long as this bit is set, this entry may only be touched
+ *      through the interface structure.
+ * @ENTRY_OWNER_DEVICE_DATA: This entry is owned by the device for data
+ *      transfer (either TX or RX depending on the queue). The entry should
+ *      only be touched after the device has signaled it is done with it.
+ * @ENTRY_OWNER_DEVICE_CRYPTO: This entry is owned by the device for data
+ *      encryption or decryption. The entry should only be touched after
+ *      the device has signaled it is done with it.
+ */
+
+enum queue_entry_flags {
+        ENTRY_BCN_ASSIGNED,
+        ENTRY_OWNER_DEVICE_DATA,
+        ENTRY_OWNER_DEVICE_CRYPTO,
+};
+
+/**
+ * struct queue_entry: Entry inside the &struct data_queue
+ *
+ * @flags: Entry flags, see &enum queue_entry_flags.
+ * @queue: The data queue (&struct data_queue) to which this entry belongs.
+ * @skb: The buffer which is currently being transmitted (for TX queue),
+ *      or used to directly recieve data in (for RX queue).
+ * @entry_idx: The entry index number.
+ * @priv_data: Private data belonging to this queue entry. The pointer
+ *      points to data specific to a particular driver and queue type.
+ */
+struct queue_entry {
+        unsigned long flags;
+
+        struct data_queue *queue;
+
+        struct sk_buff *skb;
+
+        unsigned int entry_idx;
+
+        void *priv_data;
+};
+
+/**
+ * enum queue_index: Queue index type
+ *
+ * @Q_INDEX: Index pointer to the current entry in the queue, if this entry is
+ *      owned by the hardware then the queue is considered to be full.
+ * @Q_INDEX_DONE: Index pointer to the next entry which will be completed by
+ *      the hardware and for which we need to run the txdone handler. If this
+ *      entry is not owned by the hardware the queue is considered to be empty.
+ * @Q_INDEX_CRYPTO: Index pointer to the next entry which encryption/decription
+ *      will be completed by the hardware next.
+ * @Q_INDEX_MAX: Keep last, used in &struct data_queue to determine the size
+ *      of the index array.
+ */
+enum queue_index {
+        Q_INDEX,
+        Q_INDEX_DONE,
+        Q_INDEX_CRYPTO,
+        Q_INDEX_MAX,
+};
+
+/**
+ * struct data_queue: Data queue
+ *
+ * @rt2x00dev: Pointer to main &struct rt2x00dev where this queue belongs to.
+ * @entries: Base address of the &struct queue_entry which are
+ *      part of this queue.
+ * @qid: The queue identification, see &enum data_queue_qid.
+ * @lock: Spinlock to protect index handling. Whenever @index, @index_done or
+ *      @index_crypt needs to be changed this lock should be grabbed to prevent
+ *      index corruption due to concurrency.
+ * @count: Number of frames handled in the queue.
+ * @limit: Maximum number of entries in the queue.
+ * @length: Number of frames in queue.
+ * @index: Index pointers to entry positions in the queue,
+ *      use &enum queue_index to get a specific index field.
+ * @aifs: The aifs value for outgoing frames (field ignored in RX queue).
+ * @cw_min: The cw min value for outgoing frames (field ignored in RX queue).
+ * @cw_max: The cw max value for outgoing frames (field ignored in RX queue).
+ * @data_size: Maximum data size for the frames in this queue.
+ * @desc_size: Hardware descriptor size for the data in this queue.
+ */
+struct data_queue {
+        struct rt2x00_dev *rt2x00dev;
+        struct queue_entry *entries;
+
+        enum data_queue_qid qid;
+
+        spinlock_t lock;
+        unsigned int count;
+        unsigned short limit;
+        unsigned short length;
+        unsigned short index[Q_INDEX_MAX];
+
+        unsigned short aifs;
+        unsigned short cw_min;
+        unsigned short cw_max;
+
+        unsigned short data_size;
+        unsigned short desc_size;
+};
+
+/**
+ * struct data_queue_desc: Data queue description
+ *
+ * The information in this structure is used by drivers
+ * to inform rt2x00lib about the creation of the data queue.
+ *
+ * @entry_num: Maximum number of entries for a queue.
+ * @data_size: Maximum data size for the frames in this queue.
+ * @desc_size: Hardware descriptor size for the data in this queue.
+ * @priv_size: Size of per-queue_entry private data.
+ */
+struct data_queue_desc {
+        unsigned short entry_num;
+        unsigned short data_size;
+        unsigned short desc_size;
+        unsigned short priv_size;
+};
+
+/**
+ * queue_end - Return pointer to the last queue (HELPER MACRO).
+ * @__dev: Pointer to &struct rt2x00_dev
+ *
+ * Using the base rx pointer and the maximum number of available queues,
+ * this macro will return the address of 1 position beyond  the end of the
+ * queues array.
+ */
+#define queue_end(__dev) \
+        &(__dev)->rx[(__dev)->data_queues]
+
+/**
+ * tx_queue_end - Return pointer to the last TX queue (HELPER MACRO).
+ * @__dev: Pointer to &struct rt2x00_dev
+ *
+ * Using the base tx pointer and the maximum number of available TX
+ * queues, this macro will return the address of 1 position beyond
+ * the end of the TX queue array.
+ */
+#define tx_queue_end(__dev) \
+        &(__dev)->tx[(__dev)->hw->queues]
+
+/**
+ * queue_loop - Loop through the queues within a specific range (HELPER MACRO).
+ * @__entry: Pointer where the current queue entry will be stored in.
+ * @__start: Start queue pointer.
+ * @__end: End queue pointer.
+ *
+ * This macro will loop through all queues between &__start and &__end.
+ */
+#define queue_loop(__entry, __start, __end)                     \
+        for ((__entry) = (__start);                             \
+             prefetch(&(__entry)[1]), (__entry) != (__end);     \
+             (__entry) = &(__entry)[1])
+
+/**
+ * queue_for_each - Loop through all queues
+ * @__dev: Pointer to &struct rt2x00_dev
+ * @__entry: Pointer where the current queue entry will be stored in.
+ *
+ * This macro will loop through all available queues.
+ */
+#define queue_for_each(__dev, __entry) \
+        queue_loop(__entry, (__dev)->rx, queue_end(__dev))
+
+/**
+ * tx_queue_for_each - Loop through the TX queues
+ * @__dev: Pointer to &struct rt2x00_dev
+ * @__entry: Pointer where the current queue entry will be stored in.
+ *
+ * This macro will loop through all TX related queues excluding
+ * the Beacon and Atim queues.
+ */
+#define tx_queue_for_each(__dev, __entry) \
+        queue_loop(__entry, (__dev)->tx, tx_queue_end(__dev))
+
+/**
+ * txall_queue_for_each - Loop through all TX related queues
+ * @__dev: Pointer to &struct rt2x00_dev
+ * @__entry: Pointer where the current queue entry will be stored in.
+ *
+ * This macro will loop through all TX related queues including
+ * the Beacon and Atim queues.
+ */
+#define txall_queue_for_each(__dev, __entry) \
+        queue_loop(__entry, (__dev)->tx, queue_end(__dev))
+
+/**
+ * rt2x00queue_empty - Check if the queue is empty.
+ * @queue: Queue to check if empty.
+ */
+static inline int rt2x00queue_empty(struct data_queue *queue)
+{
+        return queue->length == 0;
+}
+
+/**
+ * rt2x00queue_full - Check if the queue is full.
+ * @queue: Queue to check if full.
+ */
+static inline int rt2x00queue_full(struct data_queue *queue)
+{
+        return queue->length == queue->limit;
+}
+
+/**
+ * rt2x00queue_free - Check the number of available entries in queue.
+ * @queue: Queue to check.
+ */
+static inline int rt2x00queue_available(struct data_queue *queue)
+{
+        return queue->limit - queue->length;
+}
+
+/**
+ * rt2x00_desc_read - Read a word from the hardware descriptor.
+ * @desc: Base descriptor address
+ * @word: Word index from where the descriptor should be read.
+ * @value: Address where the descriptor value should be written into.
+ */
+static inline void rt2x00_desc_read(__le32 *desc, const u8 word, u32 *value)
+{
+        *value = le32_to_cpu(desc[word]);
+}
+
+/**
+ * rt2x00_desc_write - wrote a word to the hardware descriptor.
+ * @desc: Base descriptor address
+ * @word: Word index from where the descriptor should be written.
+ * @value: Value that should be written into the descriptor.
+ */
+static inline void rt2x00_desc_write(__le32 *desc, const u8 word, u32 value)
+{
+        desc[word] = cpu_to_le32(value);
+}
+
+#endif /* RT2X00QUEUE_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
index b1915dc7dda1..0325bed2fbf5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00reg.h
+++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 /*
  * TX result flags.
  */
-enum TX_STATUS {
+enum tx_status {
         TX_SUCCESS = 0,
         TX_SUCCESS_RETRY = 1,
         TX_FAIL_RETRY = 2,
@@ -220,75 +220,4 @@ static inline u8 rt2x00_get_field8(const u8 reg,
         return (reg & field.bit_mask) >> field.bit_offset;
 }
 
-/*
- * Device specific rate value.
- * We will have to create the device specific rate value
- * passed to the ieee80211 kernel. We need to make it a consist of
- * multiple fields because we want to store more then 1 device specific
- * values inside the value.
- *      1 - rate, stored as 100 kbit/s.
- *      2 - preamble, short_preamble enabled flag.
- *      3 - MASK_RATE, which rates are enabled in this mode, this mask
- *      corresponds with the TX register format for the current device.
- *      4 - plcp, 802.11b rates are device specific,
- *      802.11g rates are set according to the ieee802.11a-1999 p.14.
- * The bit to enable preamble is set in a seperate define.
- */
-#define DEV_RATE        FIELD32(0x000007ff)
-#define DEV_PREAMBLE    FIELD32(0x00000800)
-#define DEV_RATEMASK    FIELD32(0x00fff000)
-#define DEV_PLCP        FIELD32(0xff000000)
-
-/*
- * Bitfields
- */
-#define DEV_RATEBIT_1MB         ( 1 << 0 )
-#define DEV_RATEBIT_2MB         ( 1 << 1 )
-#define DEV_RATEBIT_5_5MB       ( 1 << 2 )
-#define DEV_RATEBIT_11MB        ( 1 << 3 )
-#define DEV_RATEBIT_6MB         ( 1 << 4 )
-#define DEV_RATEBIT_9MB         ( 1 << 5 )
-#define DEV_RATEBIT_12MB        ( 1 << 6 )
-#define DEV_RATEBIT_18MB        ( 1 << 7 )
-#define DEV_RATEBIT_24MB        ( 1 << 8 )
-#define DEV_RATEBIT_36MB        ( 1 << 9 )
-#define DEV_RATEBIT_48MB        ( 1 << 10 )
-#define DEV_RATEBIT_54MB        ( 1 << 11 )
-
-/*
- * Bitmasks for DEV_RATEMASK
- */
-#define DEV_RATEMASK_1MB        ( (DEV_RATEBIT_1MB << 1) -1 )
-#define DEV_RATEMASK_2MB        ( (DEV_RATEBIT_2MB << 1) -1 )
-#define DEV_RATEMASK_5_5MB      ( (DEV_RATEBIT_5_5MB << 1) -1 )
-#define DEV_RATEMASK_11MB       ( (DEV_RATEBIT_11MB << 1) -1 )
-#define DEV_RATEMASK_6MB        ( (DEV_RATEBIT_6MB << 1) -1 )
-#define DEV_RATEMASK_9MB        ( (DEV_RATEBIT_9MB << 1) -1 )
-#define DEV_RATEMASK_12MB       ( (DEV_RATEBIT_12MB << 1) -1 )
-#define DEV_RATEMASK_18MB       ( (DEV_RATEBIT_18MB << 1) -1 )
-#define DEV_RATEMASK_24MB       ( (DEV_RATEBIT_24MB << 1) -1 )
-#define DEV_RATEMASK_36MB       ( (DEV_RATEBIT_36MB << 1) -1 )
-#define DEV_RATEMASK_48MB       ( (DEV_RATEBIT_48MB << 1) -1 )
-#define DEV_RATEMASK_54MB       ( (DEV_RATEBIT_54MB << 1) -1 )
-
-/*
- * Bitmask groups of bitrates
- */
-#define DEV_BASIC_RATEMASK \
-        ( DEV_RATEMASK_11MB | \
-          DEV_RATEBIT_6MB | DEV_RATEBIT_12MB | DEV_RATEBIT_24MB )
-
-#define DEV_CCK_RATEMASK        ( DEV_RATEMASK_11MB )
-#define DEV_OFDM_RATEMASK       ( DEV_RATEMASK_54MB & ~DEV_CCK_RATEMASK )
-
-/*
- * Macro's to set and get specific fields from the device specific val and val2
- * fields inside the ieee80211_rate entry.
- */
-#define DEVICE_SET_RATE_FIELD(__value, __mask) \
-        (int)( ((__value) << DEV_##__mask.bit_offset) & DEV_##__mask.bit_mask )
-
-#define DEVICE_GET_RATE_FIELD(__value, __mask) \
-        (int)( ((__value) & DEV_##__mask.bit_mask) >> DEV_##__mask.bit_offset )
-
 #endif /* RT2X00REG_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index f95577596206..fcef9885ab5e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
diff --git a/drivers/net/wireless/rt2x00/rt2x00ring.h b/drivers/net/wireless/rt2x00/rt2x00ring.h
deleted file mode 100644
index 1caa6d688c40..000000000000
--- a/drivers/net/wireless/rt2x00/rt2x00ring.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
-        <http://rt2x00.serialmonkey.com>
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-        GNU General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the
-        Free Software Foundation, Inc.,
-        59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/*
-        Module: rt2x00
-        Abstract: rt2x00 ring datastructures and routines
- */
-
-#ifndef RT2X00RING_H
-#define RT2X00RING_H
-
-/*
- * skb_desc
- * Descriptor information for the skb buffer
- */
-struct skb_desc {
-        unsigned int frame_type;
-
-        unsigned int desc_len;
-        unsigned int data_len;
-
-        void *desc;
-        void *data;
-
-        struct data_ring *ring;
-        struct data_entry *entry;
-};
-
-static inline struct skb_desc* get_skb_desc(struct sk_buff *skb)
-{
-        return (struct skb_desc*)&skb->cb[0];
-}
-
-/*
- * rxdata_entry_desc
- * Summary of information that has been read from the
- * RX frame descriptor.
- */
-struct rxdata_entry_desc {
-        int signal;
-        int rssi;
-        int ofdm;
-        int size;
-        int flags;
-        int my_bss;
-};
-
-/*
- * txdata_entry_desc
- * Summary of information that should be written into the
- * descriptor for sending a TX frame.
- */
-struct txdata_entry_desc {
-        unsigned long flags;
-#define ENTRY_TXDONE            1
-#define ENTRY_TXD_RTS_FRAME     2
-#define ENTRY_TXD_OFDM_RATE     3
-#define ENTRY_TXD_MORE_FRAG     4
-#define ENTRY_TXD_REQ_TIMESTAMP 5
-#define ENTRY_TXD_BURST         6
-#define ENTRY_TXD_ACK           7
-
-/*
- * Queue ID. ID's 0-4 are data TX rings
- */
-        int queue;
-#define QUEUE_MGMT              13
-#define QUEUE_RX                14
-#define QUEUE_OTHER             15
-
-        /*
-         * PLCP values.
-         */
-        u16 length_high;
-        u16 length_low;
-        u16 signal;
-        u16 service;
-
-        /*
-         * Timing information
-         */
-        int aifs;
-        int ifs;
-        int cw_min;
-        int cw_max;
-};
-
-/*
- * data_entry
- * The data ring is a list of data entries.
- * Each entry holds a reference to the descriptor
- * and the data buffer. For TX rings the reference to the
- * sk_buff of the packet being transmitted is also stored here.
- */
-struct data_entry {
-        /*
-         * Status flags
-         */
-        unsigned long flags;
-#define ENTRY_OWNER_NIC         1
-
-        /*
-         * Ring we belong to.
-         */
-        struct data_ring *ring;
-
-        /*
-         * sk_buff for the packet which is being transmitted
-         * in this entry (Only used with TX related rings).
-         */
-        struct sk_buff *skb;
-
-        /*
-         * Store a ieee80211_tx_status structure in each
-         * ring entry, this will optimize the txdone
-         * handler.
-         */
-        struct ieee80211_tx_status tx_status;
-
-        /*
-         * private pointer specific to driver.
-         */
-        void *priv;
-
-        /*
-         * Data address for this entry.
-         */
-        void *data_addr;
-        dma_addr_t data_dma;
-
-        /*
-         * Entry identification number (index).
-         */
-        unsigned int entry_idx;
-};
-
-/*
- * data_ring
- * Data rings are used by the device to send and receive packets.
- * The data_addr is the base address of the data memory.
- * To determine at which point in the ring we are,
- * have to use the rt2x00_ring_index_*() functions.
- */
-struct data_ring {
-        /*
-         * Pointer to main rt2x00dev structure where this
-         * ring belongs to.
-         */
-        struct rt2x00_dev *rt2x00dev;
-
-        /*
-         * Base address for the device specific data entries.
-         */
-        struct data_entry *entry;
-
-        /*
-         * TX queue statistic info.
-         */
-        struct ieee80211_tx_queue_stats_data stats;
-
-        /*
-         * TX Queue parameters.
-         */
-        struct ieee80211_tx_queue_params tx_params;
-
-        /*
-         * Base address for data ring.
-         */
-        dma_addr_t data_dma;
-        void *data_addr;
-
-        /*
-         * Queue identification number:
-         * RX: 0
-         * TX: IEEE80211_TX_*
-         */
-        unsigned int queue_idx;
-
-        /*
-         * Index variables.
-         */
-        u16 index;
-        u16 index_done;
-
-        /*
-         * Size of packet and descriptor in bytes.
-         */
-        u16 data_size;
-        u16 desc_size;
-};
-
-/*
- * Handlers to determine the address of the current device specific
- * data entry, where either index or index_done points to.
- */
-static inline struct data_entry *rt2x00_get_data_entry(struct data_ring *ring)
-{
-        return &ring->entry[ring->index];
-}
-
-static inline struct data_entry *rt2x00_get_data_entry_done(struct data_ring
-                                                            *ring)
-{
-        return &ring->entry[ring->index_done];
-}
-
-/*
- * Total ring memory
- */
-static inline int rt2x00_get_ring_size(struct data_ring *ring)
-{
-        return ring->stats.limit * (ring->desc_size + ring->data_size);
-}
-
-/*
- * Ring index manipulation functions.
- */
-static inline void rt2x00_ring_index_inc(struct data_ring *ring)
-{
-        ring->index++;
-        if (ring->index >= ring->stats.limit)
-                ring->index = 0;
-        ring->stats.len++;
-}
-
-static inline void rt2x00_ring_index_done_inc(struct data_ring *ring)
-{
-        ring->index_done++;
-        if (ring->index_done >= ring->stats.limit)
-                ring->index_done = 0;
-        ring->stats.len--;
-        ring->stats.count++;
-}
-
-static inline void rt2x00_ring_index_clear(struct data_ring *ring)
-{
-        ring->index = 0;
-        ring->index_done = 0;
-        ring->stats.len = 0;
-        ring->stats.count = 0;
-}
-
-static inline int rt2x00_ring_empty(struct data_ring *ring)
-{
-        return ring->stats.len == 0;
-}
-
-static inline int rt2x00_ring_full(struct data_ring *ring)
-{
-        return ring->stats.len == ring->stats.limit;
-}
-
-static inline int rt2x00_ring_free(struct data_ring *ring)
-{
-        return ring->stats.limit - ring->stats.len;
-}
-
-/*
- * TX/RX Descriptor access functions.
- */
-static inline void rt2x00_desc_read(__le32 *desc,
-                                    const u8 word, u32 *value)
-{
-        *value = le32_to_cpu(desc[word]);
-}
-
-static inline void rt2x00_desc_write(__le32 *desc,
-                                     const u8 word, const u32 value)
-{
-        desc[word] = cpu_to_le32(value);
-}
-
-#endif /* RT2X00RING_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 84e9bdb73910..5a331674dcb2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -40,8 +40,7 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,
                              void *buffer, const u16 buffer_length,
                              const int timeout)
 {
-        struct usb_device *usb_dev =
-            interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
+        struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev);
         int status;
         unsigned int i;
         unsigned int pipe =
@@ -85,20 +84,20 @@ int rt2x00usb_vendor_req_buff_lock(struct rt2x00_dev *rt2x00dev,
         /*
          * Check for Cache availability.
          */
-        if (unlikely(!rt2x00dev->csr_cache || buffer_length > CSR_CACHE_SIZE)) {
+        if (unlikely(!rt2x00dev->csr.cache || buffer_length > CSR_CACHE_SIZE)) {
                 ERROR(rt2x00dev, "CSR cache not available.\n");
                 return -ENOMEM;
         }
 
         if (requesttype == USB_VENDOR_REQUEST_OUT)
-                memcpy(rt2x00dev->csr_cache, buffer, buffer_length);
+                memcpy(rt2x00dev->csr.cache, buffer, buffer_length);
 
         status = rt2x00usb_vendor_request(rt2x00dev, request, requesttype,
-                                          offset, 0, rt2x00dev->csr_cache,
+                                          offset, 0, rt2x00dev->csr.cache,
                                           buffer_length, timeout);
 
         if (!status && requesttype == USB_VENDOR_REQUEST_IN)
-                memcpy(buffer, rt2x00dev->csr_cache, buffer_length);
+                memcpy(buffer, rt2x00dev->csr.cache, buffer_length);
 
         return status;
 }
@@ -128,15 +127,15 @@ EXPORT_SYMBOL_GPL(rt2x00usb_vendor_request_buff);
  */
 static void rt2x00usb_interrupt_txdone(struct urb *urb)
 {
-        struct data_entry *entry = (struct data_entry *)urb->context;
-        struct data_ring *ring = entry->ring;
-        struct rt2x00_dev *rt2x00dev = ring->rt2x00dev;
+        struct queue_entry *entry = (struct queue_entry *)urb->context;
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+        struct queue_entry_priv_usb_tx *priv_tx = entry->priv_data;
+        struct txdone_entry_desc txdesc;
         __le32 *txd = (__le32 *)entry->skb->data;
         u32 word;
-        int tx_status;
 
         if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
-            !__test_and_clear_bit(ENTRY_OWNER_NIC, &entry->flags))
+            !__test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
                 return;
 
         rt2x00_desc_read(txd, 0, &word);
@@ -144,45 +143,46 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
         /*
          * Remove the descriptor data from the buffer.
          */
-        skb_pull(entry->skb, ring->desc_size);
+        skb_pull(entry->skb, entry->queue->desc_size);
 
         /*
          * Obtain the status about this packet.
          */
-        tx_status = !urb->status ? TX_SUCCESS : TX_FAIL_RETRY;
+        txdesc.status = !urb->status ? TX_SUCCESS : TX_FAIL_RETRY;
+        txdesc.retry = 0;
+        txdesc.control = &priv_tx->control;
 
-        rt2x00lib_txdone(entry, tx_status, 0);
+        rt2x00lib_txdone(entry, &txdesc);
 
         /*
          * Make this entry available for reuse.
          */
         entry->flags = 0;
-        rt2x00_ring_index_done_inc(entry->ring);
+        rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);
 
         /*
-         * If the data ring was full before the txdone handler
+         * If the data queue was full before the txdone handler
          * we must make sure the packet queue in the mac80211 stack
          * is reenabled when the txdone handler has finished.
          */
-        if (!rt2x00_ring_full(ring))
-                ieee80211_wake_queue(rt2x00dev->hw,
-                                     entry->tx_status.control.queue);
+        if (!rt2x00queue_full(entry->queue))
+                ieee80211_wake_queue(rt2x00dev->hw, priv_tx->control.queue);
 }
 
 int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
-                            struct data_ring *ring, struct sk_buff *skb,
+                            struct data_queue *queue, struct sk_buff *skb,
                             struct ieee80211_tx_control *control)
 {
-        struct usb_device *usb_dev =
-            interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
-        struct data_entry *entry = rt2x00_get_data_entry(ring);
-        struct skb_desc *desc;
+        struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev);
+        struct queue_entry *entry = rt2x00queue_get_entry(queue, Q_INDEX);
+        struct queue_entry_priv_usb_tx *priv_tx = entry->priv_data;
+        struct skb_frame_desc *skbdesc;
         u32 length;
 
-        if (rt2x00_ring_full(ring))
+        if (rt2x00queue_full(queue))
                 return -EINVAL;
 
-        if (test_bit(ENTRY_OWNER_NIC, &entry->flags)) {
+        if (test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags)) {
                 ERROR(rt2x00dev,
                       "Arrived at non-free entry in the non-full queue %d.\n"
                       "Please file bug report to %s.\n",
@@ -193,20 +193,20 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
         /*
          * Add the descriptor in front of the skb.
          */
-        skb_push(skb, ring->desc_size);
-        memset(skb->data, 0, ring->desc_size);
+        skb_push(skb, queue->desc_size);
+        memset(skb->data, 0, queue->desc_size);
 
         /*
          * Fill in skb descriptor
          */
-        desc = get_skb_desc(skb);
-        desc->desc_len = ring->desc_size;
-        desc->data_len = skb->len - ring->desc_size;
-        desc->desc = skb->data;
-        desc->data = skb->data + ring->desc_size;
-        desc->ring = ring;
-        desc->entry = entry;
+        skbdesc = get_skb_frame_desc(skb);
+        skbdesc->data = skb->data + queue->desc_size;
+        skbdesc->data_len = skb->len - queue->desc_size;
+        skbdesc->desc = skb->data;
+        skbdesc->desc_len = queue->desc_size;
+        skbdesc->entry = entry;
 
+        memcpy(&priv_tx->control, control, sizeof(priv_tx->control));
         rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
 
         /*
@@ -219,12 +219,12 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
         /*
          * Initialize URB and send the frame to the device.
          */
-        __set_bit(ENTRY_OWNER_NIC, &entry->flags);
-        usb_fill_bulk_urb(entry->priv, usb_dev, usb_sndbulkpipe(usb_dev, 1),
+        __set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
+        usb_fill_bulk_urb(priv_tx->urb, usb_dev, usb_sndbulkpipe(usb_dev, 1),
                           skb->data, length, rt2x00usb_interrupt_txdone, entry);
-        usb_submit_urb(entry->priv, GFP_ATOMIC);
+        usb_submit_urb(priv_tx->urb, GFP_ATOMIC);
 
-        rt2x00_ring_index_inc(ring);
+        rt2x00queue_index_inc(queue, Q_INDEX);
 
         return 0;
 }
@@ -233,20 +233,42 @@ EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);
 /*
  * RX data handlers.
  */
+static struct sk_buff* rt2x00usb_alloc_rxskb(struct data_queue *queue)
+{
+        struct sk_buff *skb;
+        unsigned int frame_size;
+
+        /*
+         * As alignment we use 2 and not NET_IP_ALIGN because we need
+         * to be sure we have 2 bytes room in the head. (NET_IP_ALIGN
+         * can be 0 on some hardware). We use these 2 bytes for frame
+         * alignment later, we assume that the chance that
+         * header_size % 4 == 2 is bigger then header_size % 2 == 0
+         * and thus optimize alignment by reserving the 2 bytes in
+         * advance.
+         */
+        frame_size = queue->data_size + queue->desc_size;
+        skb = dev_alloc_skb(queue->desc_size + frame_size + 2);
+        if (!skb)
+                return NULL;
+
+        skb_reserve(skb, queue->desc_size + 2);
+        skb_put(skb, frame_size);
+
+        return skb;
+}
+
 static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 {
-        struct data_entry *entry = (struct data_entry *)urb->context;
-        struct data_ring *ring = entry->ring;
-        struct rt2x00_dev *rt2x00dev = ring->rt2x00dev;
+        struct queue_entry *entry = (struct queue_entry *)urb->context;
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct sk_buff *skb;
-        struct ieee80211_hdr *hdr;
-        struct skb_desc *skbdesc;
-        struct rxdata_entry_desc desc;
+        struct skb_frame_desc *skbdesc;
+        struct rxdone_entry_desc rxdesc;
         int header_size;
-        int frame_size;
 
         if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
-            !test_and_clear_bit(ENTRY_OWNER_NIC, &entry->flags))
+            !test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
                 return;
 
         /*
@@ -254,67 +276,45 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
          * to be actually valid, or if the urb is signaling
          * a problem.
          */
-        if (urb->actual_length < entry->ring->desc_size || urb->status)
+        if (urb->actual_length < entry->queue->desc_size || urb->status)
                 goto skip_entry;
 
         /*
          * Fill in skb descriptor
          */
-        skbdesc = get_skb_desc(entry->skb);
-        skbdesc->ring = ring;
+        skbdesc = get_skb_frame_desc(entry->skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
         skbdesc->entry = entry;
 
-        memset(&desc, 0, sizeof(desc));
-        rt2x00dev->ops->lib->fill_rxdone(entry, &desc);
-
-        /*
-         * Allocate a new sk buffer to replace the current one.
-         * If allocation fails, we should drop the current frame
-         * so we can recycle the existing sk buffer for the new frame.
-         * As alignment we use 2 and not NET_IP_ALIGN because we need
-         * to be sure we have 2 bytes room in the head. (NET_IP_ALIGN
-         * can be 0 on some hardware). We use these 2 bytes for frame
-         * alignment later, we assume that the chance that
-         * header_size % 4 == 2 is bigger then header_size % 2 == 0
-         * and thus optimize alignment by reserving the 2 bytes in
-         * advance.
-         */
-        frame_size = entry->ring->data_size + entry->ring->desc_size;
-        skb = dev_alloc_skb(frame_size + 2);
-        if (!skb)
-                goto skip_entry;
-
-        skb_reserve(skb, 2);
-        skb_put(skb, frame_size);
+        memset(&rxdesc, 0, sizeof(rxdesc));
+        rt2x00dev->ops->lib->fill_rxdone(entry, &rxdesc);
 
         /*
          * The data behind the ieee80211 header must be
          * aligned on a 4 byte boundary.
          */
-        hdr = (struct ieee80211_hdr *)entry->skb->data;
-        header_size =
-            ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
-
+        header_size = ieee80211_get_hdrlen_from_skb(entry->skb);
         if (header_size % 4 == 0) {
                 skb_push(entry->skb, 2);
-                memmove(entry->skb->data, entry->skb->data + 2, skb->len - 2);
+                memmove(entry->skb->data, entry->skb->data + 2,
+                        entry->skb->len - 2);
+                skbdesc->data = entry->skb->data;
+                skb_trim(entry->skb,entry->skb->len - 2);
         }
 
         /*
-         * Trim the entire buffer down to only contain the valid frame data
-         * excluding the device descriptor. The position of the descriptor
-         * varies. This means that we should check where the descriptor is
-         * and decide if we need to pull the data pointer to exclude the
-         * device descriptor.
+         * Allocate a new sk buffer to replace the current one.
+         * If allocation fails, we should drop the current frame
+         * so we can recycle the existing sk buffer for the new frame.
          */
-        if (skbdesc->data > skbdesc->desc)
-                skb_pull(entry->skb, skbdesc->desc_len);
-        skb_trim(entry->skb, desc.size);
+        skb = rt2x00usb_alloc_rxskb(entry->queue);
+        if (!skb)
+                goto skip_entry;
 
         /*
          * Send the frame to rt2x00lib for further processing.
          */
-        rt2x00lib_rxdone(entry, entry->skb, &desc);
+        rt2x00lib_rxdone(entry, &rxdesc);
 
         /*
          * Replace current entry's skb with the newly allocated one,
@@ -325,12 +325,12 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
         urb->transfer_buffer_length = entry->skb->len;
 
 skip_entry:
-        if (test_bit(DEVICE_ENABLED_RADIO, &ring->rt2x00dev->flags)) {
-                __set_bit(ENTRY_OWNER_NIC, &entry->flags);
+        if (test_bit(DEVICE_ENABLED_RADIO, &entry->queue->rt2x00dev->flags)) {
+                __set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
                 usb_submit_urb(urb, GFP_ATOMIC);
         }
 
-        rt2x00_ring_index_inc(ring);
+        rt2x00queue_index_inc(entry->queue, Q_INDEX);
 }
 
 /*
@@ -338,18 +338,44 @@ skip_entry:
  */
 void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
-        struct data_ring *ring;
+        struct queue_entry_priv_usb_rx *priv_rx;
+        struct queue_entry_priv_usb_tx *priv_tx;
+        struct queue_entry_priv_usb_bcn *priv_bcn;
+        struct data_queue *queue;
         unsigned int i;
 
         rt2x00usb_vendor_request_sw(rt2x00dev, USB_RX_CONTROL, 0x0000, 0x0000,
                                     REGISTER_TIMEOUT);
 
         /*
-         * Cancel all rings.
+         * Cancel all queues.
          */
-        ring_for_each(rt2x00dev, ring) {
-                for (i = 0; i < ring->stats.limit; i++)
-                        usb_kill_urb(ring->entry[i].priv);
+        for (i = 0; i < rt2x00dev->rx->limit; i++) {
+                priv_rx = rt2x00dev->rx->entries[i].priv_data;
+                usb_kill_urb(priv_rx->urb);
+        }
+
+        tx_queue_for_each(rt2x00dev, queue) {
+                for (i = 0; i < queue->limit; i++) {
+                        priv_tx = queue->entries[i].priv_data;
+                        usb_kill_urb(priv_tx->urb);
+                }
+        }
+
+        for (i = 0; i < rt2x00dev->bcn->limit; i++) {
+                priv_bcn = rt2x00dev->bcn->entries[i].priv_data;
+                usb_kill_urb(priv_bcn->urb);
+
+                if (priv_bcn->guardian_urb)
+                        usb_kill_urb(priv_bcn->guardian_urb);
+        }
+
+        if (!test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags))
+                return;
+
+        for (i = 0; i < rt2x00dev->bcn[1].limit; i++) {
+                priv_tx = rt2x00dev->bcn[1].entries[i].priv_data;
+                usb_kill_urb(priv_tx->urb);
         }
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio);
@@ -358,64 +384,108 @@ EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio);
  * Device initialization handlers.
  */
 void rt2x00usb_init_rxentry(struct rt2x00_dev *rt2x00dev,
-                            struct data_entry *entry)
+                            struct queue_entry *entry)
 {
-        struct usb_device *usb_dev =
-             interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
+        struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev);
+        struct queue_entry_priv_usb_rx *priv_rx = entry->priv_data;
 
-        usb_fill_bulk_urb(entry->priv, usb_dev,
+        usb_fill_bulk_urb(priv_rx->urb, usb_dev,
                           usb_rcvbulkpipe(usb_dev, 1),
                           entry->skb->data, entry->skb->len,
                           rt2x00usb_interrupt_rxdone, entry);
 
-        __set_bit(ENTRY_OWNER_NIC, &entry->flags);
-        usb_submit_urb(entry->priv, GFP_ATOMIC);
+        __set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
+        usb_submit_urb(priv_rx->urb, GFP_ATOMIC);
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_init_rxentry);
 
 void rt2x00usb_init_txentry(struct rt2x00_dev *rt2x00dev,
-                            struct data_entry *entry)
+                            struct queue_entry *entry)
 {
         entry->flags = 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_init_txentry);
 
 static int rt2x00usb_alloc_urb(struct rt2x00_dev *rt2x00dev,
-                               struct data_ring *ring)
+                               struct data_queue *queue)
 {
+        struct queue_entry_priv_usb_rx *priv_rx;
+        struct queue_entry_priv_usb_tx *priv_tx;
+        struct queue_entry_priv_usb_bcn *priv_bcn;
+        struct urb *urb;
+        unsigned int guardian =
+            test_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags);
         unsigned int i;
 
         /*
          * Allocate the URB's
          */
-        for (i = 0; i < ring->stats.limit; i++) {
-                ring->entry[i].priv = usb_alloc_urb(0, GFP_KERNEL);
-                if (!ring->entry[i].priv)
+        for (i = 0; i < queue->limit; i++) {
+                urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!urb)
                         return -ENOMEM;
+
+                if (queue->qid == QID_RX) {
+                        priv_rx = queue->entries[i].priv_data;
+                        priv_rx->urb = urb;
+                } else if (queue->qid == QID_MGMT && guardian) {
+                        priv_bcn = queue->entries[i].priv_data;
+                        priv_bcn->urb = urb;
+
+                        urb = usb_alloc_urb(0, GFP_KERNEL);
+                        if (!urb)
+                                return -ENOMEM;
+
+                        priv_bcn->guardian_urb = urb;
+                } else {
+                        priv_tx = queue->entries[i].priv_data;
+                        priv_tx->urb = urb;
+                }
         }
 
         return 0;
 }
 
 static void rt2x00usb_free_urb(struct rt2x00_dev *rt2x00dev,
-                               struct data_ring *ring)
+                               struct data_queue *queue)
 {
+        struct queue_entry_priv_usb_rx *priv_rx;
+        struct queue_entry_priv_usb_tx *priv_tx;
+        struct queue_entry_priv_usb_bcn *priv_bcn;
+        struct urb *urb;
+        unsigned int guardian =
+            test_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags);
         unsigned int i;
 
-        if (!ring->entry)
+        if (!queue->entries)
                 return;
 
-        for (i = 0; i < ring->stats.limit; i++) {
-                usb_kill_urb(ring->entry[i].priv);
-                usb_free_urb(ring->entry[i].priv);
-                if (ring->entry[i].skb)
-                        kfree_skb(ring->entry[i].skb);
+        for (i = 0; i < queue->limit; i++) {
+                if (queue->qid == QID_RX) {
+                        priv_rx = queue->entries[i].priv_data;
+                        urb = priv_rx->urb;
+                } else if (queue->qid == QID_MGMT && guardian) {
+                        priv_bcn = queue->entries[i].priv_data;
+
+                        usb_kill_urb(priv_bcn->guardian_urb);
+                        usb_free_urb(priv_bcn->guardian_urb);
+
+                        urb = priv_bcn->urb;
+                } else {
+                        priv_tx = queue->entries[i].priv_data;
+                        urb = priv_tx->urb;
+                }
+
+                usb_kill_urb(urb);
+                usb_free_urb(urb);
+                if (queue->entries[i].skb)
+                        kfree_skb(queue->entries[i].skb);
         }
 }
 
 int rt2x00usb_initialize(struct rt2x00_dev *rt2x00dev)
 {
-        struct data_ring *ring;
+        struct data_queue *queue;
         struct sk_buff *skb;
         unsigned int entry_size;
         unsigned int i;
@@ -424,25 +494,22 @@ int rt2x00usb_initialize(struct rt2x00_dev *rt2x00dev)
         /*
          * Allocate DMA
          */
-        ring_for_each(rt2x00dev, ring) {
-                status = rt2x00usb_alloc_urb(rt2x00dev, ring);
+        queue_for_each(rt2x00dev, queue) {
+                status = rt2x00usb_alloc_urb(rt2x00dev, queue);
                 if (status)
                         goto exit;
         }
 
         /*
-         * For the RX ring, skb's should be allocated.
+         * For the RX queue, skb's should be allocated.
          */
         entry_size = rt2x00dev->rx->data_size + rt2x00dev->rx->desc_size;
-        for (i = 0; i < rt2x00dev->rx->stats.limit; i++) {
-                skb = dev_alloc_skb(NET_IP_ALIGN + entry_size);
+        for (i = 0; i < rt2x00dev->rx->limit; i++) {
+                skb = rt2x00usb_alloc_rxskb(rt2x00dev->rx);
                 if (!skb)
                         goto exit;
 
-                skb_reserve(skb, NET_IP_ALIGN);
-                skb_put(skb, entry_size);
-
-                rt2x00dev->rx->entry[i].skb = skb;
+                rt2x00dev->rx->entries[i].skb = skb;
         }
 
         return 0;
@@ -456,10 +523,10 @@ EXPORT_SYMBOL_GPL(rt2x00usb_initialize);
 
 void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev)
 {
-        struct data_ring *ring;
+        struct data_queue *queue;
 
-        ring_for_each(rt2x00dev, ring)
-                rt2x00usb_free_urb(rt2x00dev, ring);
+        queue_for_each(rt2x00dev, queue)
+                rt2x00usb_free_urb(rt2x00dev, queue);
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_uninitialize);
 
@@ -474,14 +541,14 @@ static void rt2x00usb_free_reg(struct rt2x00_dev *rt2x00dev)
         kfree(rt2x00dev->eeprom);
         rt2x00dev->eeprom = NULL;
 
-        kfree(rt2x00dev->csr_cache);
-        rt2x00dev->csr_cache = NULL;
+        kfree(rt2x00dev->csr.cache);
+        rt2x00dev->csr.cache = NULL;
 }
 
 static int rt2x00usb_alloc_reg(struct rt2x00_dev *rt2x00dev)
 {
-        rt2x00dev->csr_cache = kzalloc(CSR_CACHE_SIZE, GFP_KERNEL);
-        if (!rt2x00dev->csr_cache)
+        rt2x00dev->csr.cache = kzalloc(CSR_CACHE_SIZE, GFP_KERNEL);
+        if (!rt2x00dev->csr.cache)
                 goto exit;
 
         rt2x00dev->eeprom = kzalloc(rt2x00dev->ops->eeprom_size, GFP_KERNEL);
@@ -627,9 +694,9 @@ EXPORT_SYMBOL_GPL(rt2x00usb_resume);
 #endif /* CONFIG_PM */
 
 /*
- * rt2x00pci module information.
+ * rt2x00usb module information.
  */
 MODULE_AUTHOR(DRV_PROJECT);
 MODULE_VERSION(DRV_VERSION);
-MODULE_DESCRIPTION("rt2x00 library");
+MODULE_DESCRIPTION("rt2x00 usb library");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index e40df4050cd0..11e55180cbaf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -60,34 +60,47 @@
 #define USB_VENDOR_REQUEST_IN   ( USB_DIR_IN | USB_VENDOR_REQUEST )
 #define USB_VENDOR_REQUEST_OUT  ( USB_DIR_OUT | USB_VENDOR_REQUEST )
 
-/*
- * USB vendor commands.
- */
-#define USB_DEVICE_MODE         0x01
-#define USB_SINGLE_WRITE        0x02
-#define USB_SINGLE_READ         0x03
-#define USB_MULTI_WRITE         0x06
-#define USB_MULTI_READ          0x07
-#define USB_EEPROM_WRITE        0x08
-#define USB_EEPROM_READ         0x09
-#define USB_LED_CONTROL         0x0a    /* RT73USB */
-#define USB_RX_CONTROL          0x0c
+/**
+ * enum rt2x00usb_vendor_request: USB vendor commands.
+ */
+enum rt2x00usb_vendor_request {
+        USB_DEVICE_MODE = 1,
+        USB_SINGLE_WRITE = 2,
+        USB_SINGLE_READ = 3,
+        USB_MULTI_WRITE = 6,
+        USB_MULTI_READ = 7,
+        USB_EEPROM_WRITE = 8,
+        USB_EEPROM_READ = 9,
+        USB_LED_CONTROL = 10, /* RT73USB */
+        USB_RX_CONTROL = 12,
+};
 
-/*
- * Device modes offset
+/**
+ * enum rt2x00usb_mode_offset: Device modes offset.
  */
-#define USB_MODE_RESET          0x01
-#define USB_MODE_UNPLUG         0x02
-#define USB_MODE_FUNCTION       0x03
-#define USB_MODE_TEST           0x04
-#define USB_MODE_SLEEP          0x07    /* RT73USB */
-#define USB_MODE_FIRMWARE       0x08    /* RT73USB */
-#define USB_MODE_WAKEUP         0x09    /* RT73USB */
+enum rt2x00usb_mode_offset {
+        USB_MODE_RESET = 1,
+        USB_MODE_UNPLUG = 2,
+        USB_MODE_FUNCTION = 3,
+        USB_MODE_TEST = 4,
+        USB_MODE_SLEEP = 7,     /* RT73USB */
+        USB_MODE_FIRMWARE = 8,  /* RT73USB */
+        USB_MODE_WAKEUP = 9,    /* RT73USB */
+};
 
-/*
- * Used to read/write from/to the device.
+/**
+ * rt2x00usb_vendor_request - Send register command to device
+ * @rt2x00dev: Pointer to &struct rt2x00_dev
+ * @request: USB vendor command (See &enum rt2x00usb_vendor_request)
+ * @requesttype: Request type &USB_VENDOR_REQUEST_*
+ * @offset: Register offset to perform action on
+ * @value: Value to write to device
+ * @buffer: Buffer where information will be read/written to by device
+ * @buffer_length: Size of &buffer
+ * @timeout: Operation timeout
+ *
  * This is the main function to communicate with the device,
- * the buffer argument _must_ either be NULL or point to
+ * the &buffer argument _must_ either be NULL or point to
  * a buffer allocated by kmalloc. Failure to do so can lead
  * to unexpected behavior depending on the architecture.
  */
@@ -97,13 +110,21 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,
                              void *buffer, const u16 buffer_length,
                              const int timeout);
 
-/*
- * Used to read/write from/to the device.
+/**
+ * rt2x00usb_vendor_request_buff - Send register command to device (buffered)
+ * @rt2x00dev: Pointer to &struct rt2x00_dev
+ * @request: USB vendor command (See &enum rt2x00usb_vendor_request)
+ * @requesttype: Request type &USB_VENDOR_REQUEST_*
+ * @offset: Register offset to perform action on
+ * @buffer: Buffer where information will be read/written to by device
+ * @buffer_length: Size of &buffer
+ * @timeout: Operation timeout
+ *
  * This function will use a previously with kmalloc allocated cache
  * to communicate with the device. The contents of the buffer pointer
  * will be copied to this cache when writing, or read from the cache
  * when reading.
- * Buffers send to rt2x00usb_vendor_request _must_ be allocated with
+ * Buffers send to &rt2x00usb_vendor_request _must_ be allocated with
  * kmalloc. Hence the reason for using a previously allocated cache
  * which has been allocated properly.
  */
@@ -112,15 +133,32 @@ int rt2x00usb_vendor_request_buff(struct rt2x00_dev *rt2x00dev,
                                   const u16 offset, void *buffer,
                                   const u16 buffer_length, const int timeout);
 
-/*
- * A version of rt2x00usb_vendor_request_buff which must be called
- * if the usb_cache_mutex is already held. */
+/**
+ * rt2x00usb_vendor_request_buff - Send register command to device (buffered)
+ * @rt2x00dev: Pointer to &struct rt2x00_dev
+ * @request: USB vendor command (See &enum rt2x00usb_vendor_request)
+ * @requesttype: Request type &USB_VENDOR_REQUEST_*
+ * @offset: Register offset to perform action on
+ * @buffer: Buffer where information will be read/written to by device
+ * @buffer_length: Size of &buffer
+ * @timeout: Operation timeout
+ *
+ * A version of &rt2x00usb_vendor_request_buff which must be called
+ * if the usb_cache_mutex is already held.
+ */
 int rt2x00usb_vendor_req_buff_lock(struct rt2x00_dev *rt2x00dev,
                                    const u8 request, const u8 requesttype,
                                    const u16 offset, void *buffer,
                                    const u16 buffer_length, const int timeout);
 
-/*
+/**
+ * rt2x00usb_vendor_request_sw - Send single register command to device
+ * @rt2x00dev: Pointer to &struct rt2x00_dev
+ * @request: USB vendor command (See &enum rt2x00usb_vendor_request)
+ * @offset: Register offset to perform action on
+ * @value: Value to write to device
+ * @timeout: Operation timeout
+ *
  * Simple wrapper around rt2x00usb_vendor_request to write a single
  * command to the device. Since we don't use the buffer argument we
  * don't have to worry about kmalloc here.
@@ -136,7 +174,12 @@ static inline int rt2x00usb_vendor_request_sw(struct rt2x00_dev *rt2x00dev,
                                         value, NULL, 0, timeout);
 }
 
-/*
+/**
+ * rt2x00usb_eeprom_read - Read eeprom from device
+ * @rt2x00dev: Pointer to &struct rt2x00_dev
+ * @eeprom: Pointer to eeprom array to store the information in
+ * @length: Number of bytes to read from the eeprom
+ *
  * Simple wrapper around rt2x00usb_vendor_request to read the eeprom
  * from the device. Note that the eeprom argument _must_ be allocated using
  * kmalloc for correct handling inside the kernel USB layer.
@@ -147,8 +190,8 @@ static inline int rt2x00usb_eeprom_read(struct rt2x00_dev *rt2x00dev,
         int timeout = REGISTER_TIMEOUT * (lenght / sizeof(u16));
 
         return rt2x00usb_vendor_request(rt2x00dev, USB_EEPROM_READ,
-                                        USB_VENDOR_REQUEST_IN, 0x0000,
-                                        0x0000, eeprom, lenght, timeout);
+                                        USB_VENDOR_REQUEST_IN, 0, 0,
+                                        eeprom, lenght, timeout);
 }
 
 /*
@@ -160,16 +203,58 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev);
  * TX data handlers.
  */
 int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
-                            struct data_ring *ring, struct sk_buff *skb,
+                            struct data_queue *queue, struct sk_buff *skb,
                             struct ieee80211_tx_control *control);
 
+/**
+ * struct queue_entry_priv_usb_rx: Per RX entry USB specific information
+ *
+ * @urb: Urb structure used for device communication.
+ */
+struct queue_entry_priv_usb_rx {
+        struct urb *urb;
+};
+
+/**
+ * struct queue_entry_priv_usb_tx: Per TX entry USB specific information
+ *
+ * @urb: Urb structure used for device communication.
+ * @control: mac80211 control structure used to transmit data.
+ */
+struct queue_entry_priv_usb_tx {
+        struct urb *urb;
+
+        struct ieee80211_tx_control control;
+};
+
+/**
+ * struct queue_entry_priv_usb_tx: Per TX entry USB specific information
+ *
+ * The first section should match &struct queue_entry_priv_usb_tx exactly.
+ * rt2500usb can use this structure to send a guardian byte when working
+ * with beacons.
+ *
+ * @urb: Urb structure used for device communication.
+ * @control: mac80211 control structure used to transmit data.
+ * @guardian_data: Set to 0, used for sending the guardian data.
+ * @guardian_urb: Urb structure used to send the guardian data.
+ */
+struct queue_entry_priv_usb_bcn {
+        struct urb *urb;
+
+        struct ieee80211_tx_control control;
+
+        unsigned int guardian_data;
+        struct urb *guardian_urb;
+};
+
 /*
  * Device initialization handlers.
  */
 void rt2x00usb_init_rxentry(struct rt2x00_dev *rt2x00dev,
-                            struct data_entry *entry);
+                            struct queue_entry *entry);
 void rt2x00usb_init_txentry(struct rt2x00_dev *rt2x00dev,
-                            struct data_entry *entry);
+                            struct queue_entry *entry);
 int rt2x00usb_initialize(struct rt2x00_dev *rt2x00dev);
 void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev);
 
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index ad2e7d53b3da..468a31c8c113 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
         Supported chipsets: RT2561, RT2561s, RT2661.
  */
 
+#include <linux/crc-itu-t.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
@@ -155,6 +156,12 @@ rf_write:
         rt2x00_rf_write(rt2x00dev, word, value);
 }
 
+#ifdef CONFIG_RT61PCI_LEDS
+/*
+ * This function is only called from rt61pci_led_brightness()
+ * make gcc happy by placing this function inside the
+ * same ifdef statement as the caller.
+ */
 static void rt61pci_mcu_request(struct rt2x00_dev *rt2x00dev,
                                 const u8 command, const u8 token,
                                 const u8 arg0, const u8 arg1)
@@ -181,6 +188,7 @@ static void rt61pci_mcu_request(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, HOST_CMD_CSR_INTERRUPT_MCU, 1);
         rt2x00pci_register_write(rt2x00dev, HOST_CMD_CSR, reg);
 }
+#endif /* CONFIG_RT61PCI_LEDS */
 
 static void rt61pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
 {
@@ -262,82 +270,162 @@ static int rt61pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
         u32 reg;
 
         rt2x00pci_register_read(rt2x00dev, MAC_CSR13, &reg);
-        return rt2x00_get_field32(reg, MAC_CSR13_BIT5);;
+        return rt2x00_get_field32(reg, MAC_CSR13_BIT5);
 }
 #else
 #define rt61pci_rfkill_poll     NULL
 #endif /* CONFIG_RT61PCI_RFKILL */
 
-/*
- * Configuration handlers.
- */
-static void rt61pci_config_mac_addr(struct rt2x00_dev *rt2x00dev, __le32 *mac)
+#ifdef CONFIG_RT61PCI_LEDS
+static void rt61pci_brightness_set(struct led_classdev *led_cdev,
+                                   enum led_brightness brightness)
 {
-        u32 tmp;
-
-        tmp = le32_to_cpu(mac[1]);
-        rt2x00_set_field32(&tmp, MAC_CSR3_UNICAST_TO_ME_MASK, 0xff);
-        mac[1] = cpu_to_le32(tmp);
-
-        rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR2, mac,
-                                      (2 * sizeof(__le32)));
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        unsigned int enabled = brightness != LED_OFF;
+        unsigned int a_mode =
+            (enabled && led->rt2x00dev->curr_band == IEEE80211_BAND_5GHZ);
+        unsigned int bg_mode =
+            (enabled && led->rt2x00dev->curr_band == IEEE80211_BAND_2GHZ);
+
+        if (led->type == LED_TYPE_RADIO) {
+                rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
+                                   MCU_LEDCS_RADIO_STATUS, enabled);
+
+                rt61pci_mcu_request(led->rt2x00dev, MCU_LED, 0xff,
+                                    (led->rt2x00dev->led_mcu_reg & 0xff),
+                                    ((led->rt2x00dev->led_mcu_reg >> 8)));
+        } else if (led->type == LED_TYPE_ASSOC) {
+                rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
+                                   MCU_LEDCS_LINK_BG_STATUS, bg_mode);
+                rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
+                                   MCU_LEDCS_LINK_A_STATUS, a_mode);
+
+                rt61pci_mcu_request(led->rt2x00dev, MCU_LED, 0xff,
+                                    (led->rt2x00dev->led_mcu_reg & 0xff),
+                                    ((led->rt2x00dev->led_mcu_reg >> 8)));
+        } else if (led->type == LED_TYPE_QUALITY) {
+                /*
+                 * The brightness is divided into 6 levels (0 - 5),
+                 * this means we need to convert the brightness
+                 * argument into the matching level within that range.
+                 */
+                rt61pci_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
+                                    brightness / (LED_FULL / 6), 0);
+        }
 }
 
-static void rt61pci_config_bssid(struct rt2x00_dev *rt2x00dev, __le32 *bssid)
+static int rt61pci_blink_set(struct led_classdev *led_cdev,
+                             unsigned long *delay_on,
+                             unsigned long *delay_off)
 {
-        u32 tmp;
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        u32 reg;
 
-        tmp = le32_to_cpu(bssid[1]);
-        rt2x00_set_field32(&tmp, MAC_CSR5_BSS_ID_MASK, 3);
-        bssid[1] = cpu_to_le32(tmp);
+        rt2x00pci_register_read(led->rt2x00dev, MAC_CSR14, &reg);
+        rt2x00_set_field32(&reg, MAC_CSR14_ON_PERIOD, *delay_on);
+        rt2x00_set_field32(&reg, MAC_CSR14_OFF_PERIOD, *delay_off);
+        rt2x00pci_register_write(led->rt2x00dev, MAC_CSR14, reg);
 
-        rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR4, bssid,
-                                      (2 * sizeof(__le32)));
+        return 0;
 }
+#endif /* CONFIG_RT61PCI_LEDS */
 
-static void rt61pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
-                                const int tsf_sync)
+/*
+ * Configuration handlers.
+ */
+static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,
+                                  const unsigned int filter_flags)
 {
         u32 reg;
 
         /*
-         * Clear current synchronisation setup.
-         * For the Beacon base registers we only need to clear
-         * the first byte since that byte contains the VALID and OWNER
-         * bits which (when set to 0) will invalidate the entire beacon.
+         * Start configuration steps.
+         * Note that the version error will always be dropped
+         * and broadcast frames will always be accepted since
+         * there is no filter for it at this time.
          */
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, 0);
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE0, 0);
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE1, 0);
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE2, 0);
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
+        rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC,
+                           !(filter_flags & FIF_FCSFAIL));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL,
+                           !(filter_flags & FIF_PLCPFAIL));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
+                           !(filter_flags & FIF_CONTROL));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
+                           !(filter_flags & FIF_PROMISC_IN_BSS));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
+                           !(filter_flags & FIF_ALLMULTI));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_BROADCAST, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS,
+                           !(filter_flags & FIF_CONTROL));
+        rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
+}
 
-        /*
-         * Enable synchronisation.
-         */
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
-        rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
-        rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE,
-                          (tsf_sync == TSF_SYNC_BEACON));
-        rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
-        rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, tsf_sync);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev,
+                                struct rt2x00_intf *intf,
+                                struct rt2x00intf_conf *conf,
+                                const unsigned int flags)
+{
+        unsigned int beacon_base;
+        u32 reg;
+
+        if (flags & CONFIG_UPDATE_TYPE) {
+                /*
+                 * Clear current synchronisation setup.
+                 * For the Beacon base registers we only need to clear
+                 * the first byte since that byte contains the VALID and OWNER
+                 * bits which (when set to 0) will invalidate the entire beacon.
+                 */
+                beacon_base = HW_BEACON_OFFSET(intf->beacon->entry_idx);
+                rt2x00pci_register_write(rt2x00dev, beacon_base, 0);
+
+                /*
+                 * Enable synchronisation.
+                 */
+                rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+                rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
+                rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync);
+                rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
+                rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+        }
+
+        if (flags & CONFIG_UPDATE_MAC) {
+                reg = le32_to_cpu(conf->mac[1]);
+                rt2x00_set_field32(&reg, MAC_CSR3_UNICAST_TO_ME_MASK, 0xff);
+                conf->mac[1] = cpu_to_le32(reg);
+
+                rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR2,
+                                              conf->mac, sizeof(conf->mac));
+        }
+
+        if (flags & CONFIG_UPDATE_BSSID) {
+                reg = le32_to_cpu(conf->bssid[1]);
+                rt2x00_set_field32(&reg, MAC_CSR5_BSS_ID_MASK, 3);
+                conf->bssid[1] = cpu_to_le32(reg);
+
+                rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR4,
+                                              conf->bssid, sizeof(conf->bssid));
+        }
 }
 
-static void rt61pci_config_preamble(struct rt2x00_dev *rt2x00dev,
-                                    const int short_preamble,
-                                    const int ack_timeout,
-                                    const int ack_consume_time)
+static void rt61pci_config_erp(struct rt2x00_dev *rt2x00dev,
+                               struct rt2x00lib_erp *erp)
 {
         u32 reg;
 
         rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
-        rt2x00_set_field32(&reg, TXRX_CSR0_RX_ACK_TIMEOUT, ack_timeout);
+        rt2x00_set_field32(&reg, TXRX_CSR0_RX_ACK_TIMEOUT, erp->ack_timeout);
         rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
 
         rt2x00pci_register_read(rt2x00dev, TXRX_CSR4, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE,
-                           !!short_preamble);
+                           !!erp->short_preamble);
         rt2x00pci_register_write(rt2x00dev, TXRX_CSR4, reg);
 }
 
@@ -427,27 +515,21 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
-                                  (rt2x00dev->curr_hwmode != HWMODE_A));
+                                  (rt2x00dev->curr_band != IEEE80211_BAND_5GHZ));
                 break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
-                if (rt2x00dev->curr_hwmode == HWMODE_A)
+                if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ)
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
                 else
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
-                if (rt2x00dev->curr_hwmode == HWMODE_A)
+                if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ)
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
                 else
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
@@ -486,14 +568,8 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
                 break;
@@ -531,10 +607,6 @@ static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev,
         rt61pci_bbp_read(rt2x00dev, 4, &r4);
         rt61pci_bbp_read(rt2x00dev, 77, &r77);
 
-        /* FIXME: Antenna selection for the rf 2529 is very confusing in the
-         * legacy driver. The code below should be ok for non-diversity setups.
-         */
-
         /*
          * Configure the RX antenna.
          */
@@ -544,15 +616,14 @@ static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
                 rt61pci_config_antenna_2529_rx(rt2x00dev, 0, 0);
                 break;
-        case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
+                 * FIXME: Antenna selection for the rf 2529 is very confusing
+                 * in the legacy driver. Just default to antenna B until the
+                 * legacy code can be properly translated into rt2x00 code.
                  */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
                 rt61pci_config_antenna_2529_rx(rt2x00dev, 1, 1);
@@ -603,7 +674,14 @@ static void rt61pci_config_antenna(struct rt2x00_dev *rt2x00dev,
         unsigned int i;
         u32 reg;
 
-        if (rt2x00dev->curr_hwmode == HWMODE_A) {
+        /*
+         * We should never come here because rt2x00lib is supposed
+         * to catch this and send us the correct antenna explicitely.
+         */
+        BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
+               ant->tx == ANTENNA_SW_DIVERSITY);
+
+        if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ) {
                 sel = antenna_sel_a;
                 lna = test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags);
         } else {
@@ -617,10 +695,9 @@ static void rt61pci_config_antenna(struct rt2x00_dev *rt2x00dev,
         rt2x00pci_register_read(rt2x00dev, PHY_CSR0, &reg);
 
         rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_BG,
-                           (rt2x00dev->curr_hwmode == HWMODE_B ||
-                            rt2x00dev->curr_hwmode == HWMODE_G));
+                           rt2x00dev->curr_band == IEEE80211_BAND_2GHZ);
         rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_A,
-                           (rt2x00dev->curr_hwmode == HWMODE_A));
+                           rt2x00dev->curr_band == IEEE80211_BAND_5GHZ);
 
         rt2x00pci_register_write(rt2x00dev, PHY_CSR0, reg);
 
@@ -667,8 +744,8 @@ static void rt61pci_config_duration(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt61pci_config(struct rt2x00_dev *rt2x00dev,
-                           const unsigned int flags,
-                           struct rt2x00lib_conf *libconf)
+                           struct rt2x00lib_conf *libconf,
+                           const unsigned int flags)
 {
         if (flags & CONFIG_UPDATE_PHYMODE)
                 rt61pci_config_phymode(rt2x00dev, libconf->basic_rates);
@@ -684,78 +761,6 @@ static void rt61pci_config(struct rt2x00_dev *rt2x00dev,
 }
 
 /*
- * LED functions.
- */
-static void rt61pci_enable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-        u8 arg0;
-        u8 arg1;
-
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR14, &reg);
-        rt2x00_set_field32(&reg, MAC_CSR14_ON_PERIOD, 70);
-        rt2x00_set_field32(&reg, MAC_CSR14_OFF_PERIOD, 30);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR14, reg);
-
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_RADIO_STATUS, 1);
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LINK_A_STATUS,
-                           (rt2x00dev->rx_status.phymode == MODE_IEEE80211A));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LINK_BG_STATUS,
-                           (rt2x00dev->rx_status.phymode != MODE_IEEE80211A));
-
-        arg0 = rt2x00dev->led_reg & 0xff;
-        arg1 = (rt2x00dev->led_reg >> 8) & 0xff;
-
-        rt61pci_mcu_request(rt2x00dev, MCU_LED, 0xff, arg0, arg1);
-}
-
-static void rt61pci_disable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u16 led_reg;
-        u8 arg0;
-        u8 arg1;
-
-        led_reg = rt2x00dev->led_reg;
-        rt2x00_set_field16(&led_reg, MCU_LEDCS_RADIO_STATUS, 0);
-        rt2x00_set_field16(&led_reg, MCU_LEDCS_LINK_BG_STATUS, 0);
-        rt2x00_set_field16(&led_reg, MCU_LEDCS_LINK_A_STATUS, 0);
-
-        arg0 = led_reg & 0xff;
-        arg1 = (led_reg >> 8) & 0xff;
-
-        rt61pci_mcu_request(rt2x00dev, MCU_LED, 0xff, arg0, arg1);
-}
-
-static void rt61pci_activity_led(struct rt2x00_dev *rt2x00dev, int rssi)
-{
-        u8 led;
-
-        if (rt2x00dev->led_mode != LED_MODE_SIGNAL_STRENGTH)
-                return;
-
-        /*
-         * Led handling requires a positive value for the rssi,
-         * to do that correctly we need to add the correction.
-         */
-        rssi += rt2x00dev->rssi_offset;
-
-        if (rssi <= 30)
-                led = 0;
-        else if (rssi <= 39)
-                led = 1;
-        else if (rssi <= 49)
-                led = 2;
-        else if (rssi <= 53)
-                led = 3;
-        else if (rssi <= 63)
-                led = 4;
-        else
-                led = 5;
-
-        rt61pci_mcu_request(rt2x00dev, MCU_LED_STRENGTH, 0xff, led, 0);
-}
-
-/*
  * Link tuning
  */
 static void rt61pci_link_stats(struct rt2x00_dev *rt2x00dev,
@@ -789,17 +794,12 @@ static void rt61pci_link_tuner(struct rt2x00_dev *rt2x00dev)
         u8 up_bound;
         u8 low_bound;
 
-        /*
-         * Update Led strength
-         */
-        rt61pci_activity_led(rt2x00dev, rssi);
-
         rt61pci_bbp_read(rt2x00dev, 17, &r17);
 
         /*
          * Determine r17 bounds.
          */
-        if (rt2x00dev->rx_status.phymode == MODE_IEEE80211A) {
+        if (rt2x00dev->rx_status.band == IEEE80211_BAND_5GHZ) {
                 low_bound = 0x28;
                 up_bound = 0x48;
                 if (test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags)) {
@@ -816,6 +816,13 @@ static void rt61pci_link_tuner(struct rt2x00_dev *rt2x00dev)
         }
 
         /*
+         * If we are not associated, we should go straight to the
+         * dynamic CCA tuning.
+         */
+        if (!rt2x00dev->intf_associated)
+                goto dynamic_cca_tune;
+
+        /*
          * Special big-R17 for very short distance
          */
         if (rssi >= -35) {
@@ -866,6 +873,8 @@ static void rt61pci_link_tuner(struct rt2x00_dev *rt2x00dev)
                 return;
         }
 
+dynamic_cca_tune:
+
         /*
          * r17 does not yet exceed upper limit, continue and base
          * the r17 tuning on the false CCA count.
@@ -882,7 +891,7 @@ static void rt61pci_link_tuner(struct rt2x00_dev *rt2x00dev)
 }
 
 /*
- * Firmware name function.
+ * Firmware functions
  */
 static char *rt61pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
 {
@@ -906,9 +915,23 @@ static char *rt61pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
         return fw_name;
 }
 
-/*
- * Initialization functions.
- */
+static u16 rt61pci_get_firmware_crc(void *data, const size_t len)
+{
+        u16 crc;
+
+        /*
+         * Use the crc itu-t algorithm.
+         * The last 2 bytes in the firmware array are the crc checksum itself,
+         * this means that we should never pass those 2 bytes to the crc
+         * algorithm.
+         */
+        crc = crc_itu_t(0, data, len - 2);
+        crc = crc_itu_t_byte(crc, 0);
+        crc = crc_itu_t_byte(crc, 0);
+
+        return crc;
+}
+
 static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
                                  const size_t len)
 {
@@ -989,50 +1012,55 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
         return 0;
 }
 
+/*
+ * Initialization functions.
+ */
 static void rt61pci_init_rxentry(struct rt2x00_dev *rt2x00dev,
-                                 struct data_entry *entry)
+                                 struct queue_entry *entry)
 {
-        __le32 *rxd = entry->priv;
+        struct queue_entry_priv_pci_rx *priv_rx = entry->priv_data;
         u32 word;
 
-        rt2x00_desc_read(rxd, 5, &word);
+        rt2x00_desc_read(priv_rx->desc, 5, &word);
         rt2x00_set_field32(&word, RXD_W5_BUFFER_PHYSICAL_ADDRESS,
-                           entry->data_dma);
-        rt2x00_desc_write(rxd, 5, word);
+                           priv_rx->data_dma);
+        rt2x00_desc_write(priv_rx->desc, 5, word);
 
-        rt2x00_desc_read(rxd, 0, &word);
+        rt2x00_desc_read(priv_rx->desc, 0, &word);
         rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
-        rt2x00_desc_write(rxd, 0, word);
+        rt2x00_desc_write(priv_rx->desc, 0, word);
 }
 
 static void rt61pci_init_txentry(struct rt2x00_dev *rt2x00dev,
-                                 struct data_entry *entry)
+                                 struct queue_entry *entry)
 {
-        __le32 *txd = entry->priv;
+        struct queue_entry_priv_pci_tx *priv_tx = entry->priv_data;
         u32 word;
 
-        rt2x00_desc_read(txd, 1, &word);
+        rt2x00_desc_read(priv_tx->desc, 1, &word);
         rt2x00_set_field32(&word, TXD_W1_BUFFER_COUNT, 1);
-        rt2x00_desc_write(txd, 1, word);
+        rt2x00_desc_write(priv_tx->desc, 1, word);
 
-        rt2x00_desc_read(txd, 5, &word);
-        rt2x00_set_field32(&word, TXD_W5_PID_TYPE, entry->ring->queue_idx);
+        rt2x00_desc_read(priv_tx->desc, 5, &word);
+        rt2x00_set_field32(&word, TXD_W5_PID_TYPE, entry->queue->qid);
         rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE, entry->entry_idx);
-        rt2x00_desc_write(txd, 5, word);
+        rt2x00_desc_write(priv_tx->desc, 5, word);
 
-        rt2x00_desc_read(txd, 6, &word);
+        rt2x00_desc_read(priv_tx->desc, 6, &word);
         rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS,
-                           entry->data_dma);
-        rt2x00_desc_write(txd, 6, word);
+                           priv_tx->data_dma);
+        rt2x00_desc_write(priv_tx->desc, 6, word);
 
-        rt2x00_desc_read(txd, 0, &word);
+        rt2x00_desc_read(priv_tx->desc, 0, &word);
         rt2x00_set_field32(&word, TXD_W0_VALID, 0);
         rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
-        rt2x00_desc_write(txd, 0, word);
+        rt2x00_desc_write(priv_tx->desc, 0, word);
 }
 
-static int rt61pci_init_rings(struct rt2x00_dev *rt2x00dev)
+static int rt61pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
+        struct queue_entry_priv_pci_rx *priv_rx;
+        struct queue_entry_priv_pci_tx *priv_tx;
         u32 reg;
 
         /*
@@ -1040,59 +1068,55 @@ static int rt61pci_init_rings(struct rt2x00_dev *rt2x00dev)
          */
         rt2x00pci_register_read(rt2x00dev, TX_RING_CSR0, &reg);
         rt2x00_set_field32(&reg, TX_RING_CSR0_AC0_RING_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].stats.limit);
+                           rt2x00dev->tx[0].limit);
         rt2x00_set_field32(&reg, TX_RING_CSR0_AC1_RING_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA1].stats.limit);
+                           rt2x00dev->tx[1].limit);
         rt2x00_set_field32(&reg, TX_RING_CSR0_AC2_RING_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA2].stats.limit);
+                           rt2x00dev->tx[2].limit);
         rt2x00_set_field32(&reg, TX_RING_CSR0_AC3_RING_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA3].stats.limit);
+                           rt2x00dev->tx[3].limit);
         rt2x00pci_register_write(rt2x00dev, TX_RING_CSR0, reg);
 
         rt2x00pci_register_read(rt2x00dev, TX_RING_CSR1, &reg);
-        rt2x00_set_field32(&reg, TX_RING_CSR1_MGMT_RING_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA4].stats.limit);
         rt2x00_set_field32(&reg, TX_RING_CSR1_TXD_SIZE,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].desc_size /
-                           4);
+                           rt2x00dev->tx[0].desc_size / 4);
         rt2x00pci_register_write(rt2x00dev, TX_RING_CSR1, reg);
 
+        priv_tx = rt2x00dev->tx[0].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, AC0_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC0_BASE_CSR_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA0].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, AC0_BASE_CSR, reg);
 
+        priv_tx = rt2x00dev->tx[1].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, AC1_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC1_BASE_CSR_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA1].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, AC1_BASE_CSR, reg);
 
+        priv_tx = rt2x00dev->tx[2].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, AC2_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC2_BASE_CSR_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA2].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, AC2_BASE_CSR, reg);
 
+        priv_tx = rt2x00dev->tx[3].entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, AC3_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC3_BASE_CSR_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA3].data_dma);
+                           priv_tx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, AC3_BASE_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, MGMT_BASE_CSR, &reg);
-        rt2x00_set_field32(&reg, MGMT_BASE_CSR_RING_REGISTER,
-                           rt2x00dev->tx[IEEE80211_TX_QUEUE_DATA4].data_dma);
-        rt2x00pci_register_write(rt2x00dev, MGMT_BASE_CSR, reg);
-
         rt2x00pci_register_read(rt2x00dev, RX_RING_CSR, &reg);
-        rt2x00_set_field32(&reg, RX_RING_CSR_RING_SIZE,
-                           rt2x00dev->rx->stats.limit);
+        rt2x00_set_field32(&reg, RX_RING_CSR_RING_SIZE, rt2x00dev->rx->limit);
         rt2x00_set_field32(&reg, RX_RING_CSR_RXD_SIZE,
                            rt2x00dev->rx->desc_size / 4);
         rt2x00_set_field32(&reg, RX_RING_CSR_RXD_WRITEBACK_SIZE, 4);
         rt2x00pci_register_write(rt2x00dev, RX_RING_CSR, reg);
 
+        priv_rx = rt2x00dev->rx->entries[0].priv_data;
         rt2x00pci_register_read(rt2x00dev, RX_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, RX_BASE_CSR_RING_REGISTER,
-                           rt2x00dev->rx->data_dma);
+                           priv_rx->desc_dma);
         rt2x00pci_register_write(rt2x00dev, RX_BASE_CSR, reg);
 
         rt2x00pci_register_read(rt2x00dev, TX_DMA_DST_CSR, &reg);
@@ -1100,7 +1124,6 @@ static int rt61pci_init_rings(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC1, 2);
         rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC2, 2);
         rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC3, 2);
-        rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_MGMT, 0);
         rt2x00pci_register_write(rt2x00dev, TX_DMA_DST_CSR, reg);
 
         rt2x00pci_register_read(rt2x00dev, LOAD_TX_RING_CSR, &reg);
@@ -1108,7 +1131,6 @@ static int rt61pci_init_rings(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC1, 1);
         rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC2, 1);
         rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC3, 1);
-        rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_MGMT, 1);
         rt2x00pci_register_write(rt2x00dev, LOAD_TX_RING_CSR, reg);
 
         rt2x00pci_register_read(rt2x00dev, RX_CNTL_CSR, &reg);
@@ -1224,6 +1246,17 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00pci_register_write(rt2x00dev, AC_TXOP_CSR1, reg);
 
         /*
+         * Clear all beacons
+         * For the Beacon base registers we only need to clear
+         * the first byte since that byte contains the VALID and OWNER
+         * bits which (when set to 0) will invalidate the entire beacon.
+         */
+        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE0, 0);
+        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE1, 0);
+        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE2, 0);
+        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
+
+        /*
          * We must clear the error counters.
          * These registers are cleared on read,
          * so we may pass a useless variable to store the value.
@@ -1296,19 +1329,15 @@ continue_csr_init:
         rt61pci_bbp_write(rt2x00dev, 102, 0x16);
         rt61pci_bbp_write(rt2x00dev, 107, 0x04);
 
-        DEBUG(rt2x00dev, "Start initialization from EEPROM...\n");
         for (i = 0; i < EEPROM_BBP_SIZE; i++) {
                 rt2x00_eeprom_read(rt2x00dev, EEPROM_BBP_START + i, &eeprom);
 
                 if (eeprom != 0xffff && eeprom != 0x0000) {
                         reg_id = rt2x00_get_field16(eeprom, EEPROM_BBP_REG_ID);
                         value = rt2x00_get_field16(eeprom, EEPROM_BBP_VALUE);
-                        DEBUG(rt2x00dev, "BBP: 0x%02x, value: 0x%02x.\n",
-                              reg_id, value);
                         rt61pci_bbp_write(rt2x00dev, reg_id, value);
                 }
         }
-        DEBUG(rt2x00dev, "...End initialization from EEPROM.\n");
 
         return 0;
 }
@@ -1375,7 +1404,7 @@ static int rt61pci_enable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize all registers.
          */
-        if (rt61pci_init_rings(rt2x00dev) ||
+        if (rt61pci_init_queues(rt2x00dev) ||
             rt61pci_init_registers(rt2x00dev) ||
             rt61pci_init_bbp(rt2x00dev)) {
                 ERROR(rt2x00dev, "Register initialization failed.\n");
@@ -1394,11 +1423,6 @@ static int rt61pci_enable_radio(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, RX_CNTL_CSR_ENABLE_RX_DMA, 1);
         rt2x00pci_register_write(rt2x00dev, RX_CNTL_CSR, reg);
 
-        /*
-         * Enable LED
-         */
-        rt61pci_enable_led(rt2x00dev);
-
         return 0;
 }
 
@@ -1406,11 +1430,6 @@ static void rt61pci_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        /*
-         * Disable LED
-         */
-        rt61pci_disable_led(rt2x00dev);
-
         rt2x00pci_register_write(rt2x00dev, MAC_CSR10, 0x00001818);
 
         /*
@@ -1426,7 +1445,6 @@ static void rt61pci_disable_radio(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC1, 1);
         rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC2, 1);
         rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC3, 1);
-        rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_MGMT, 1);
         rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
 
         /*
@@ -1508,10 +1526,10 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev,
  */
 static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                     struct sk_buff *skb,
-                                    struct txdata_entry_desc *desc,
+                                    struct txentry_desc *txdesc,
                                     struct ieee80211_tx_control *control)
 {
-        struct skb_desc *skbdesc = get_skb_desc(skb);
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
         __le32 *txd = skbdesc->desc;
         u32 word;
 
@@ -1519,50 +1537,52 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
          * Start writing the descriptor words.
          */
         rt2x00_desc_read(txd, 1, &word);
-        rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, desc->queue);
-        rt2x00_set_field32(&word, TXD_W1_AIFSN, desc->aifs);
-        rt2x00_set_field32(&word, TXD_W1_CWMIN, desc->cw_min);
-        rt2x00_set_field32(&word, TXD_W1_CWMAX, desc->cw_max);
+        rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, txdesc->queue);
+        rt2x00_set_field32(&word, TXD_W1_AIFSN, txdesc->aifs);
+        rt2x00_set_field32(&word, TXD_W1_CWMIN, txdesc->cw_min);
+        rt2x00_set_field32(&word, TXD_W1_CWMAX, txdesc->cw_max);
         rt2x00_set_field32(&word, TXD_W1_IV_OFFSET, IEEE80211_HEADER);
         rt2x00_set_field32(&word, TXD_W1_HW_SEQUENCE, 1);
         rt2x00_desc_write(txd, 1, word);
 
         rt2x00_desc_read(txd, 2, &word);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, desc->signal);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, desc->service);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW, desc->length_low);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH, desc->length_high);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, txdesc->signal);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, txdesc->service);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW, txdesc->length_low);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH, txdesc->length_high);
         rt2x00_desc_write(txd, 2, word);
 
         rt2x00_desc_read(txd, 5, &word);
         rt2x00_set_field32(&word, TXD_W5_TX_POWER,
-                           TXPOWER_TO_DEV(control->power_level));
+                           TXPOWER_TO_DEV(rt2x00dev->tx_power));
         rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);
         rt2x00_desc_write(txd, 5, word);
 
-        rt2x00_desc_read(txd, 11, &word);
-        rt2x00_set_field32(&word, TXD_W11_BUFFER_LENGTH0, skbdesc->data_len);
-        rt2x00_desc_write(txd, 11, word);
+        if (skbdesc->desc_len > TXINFO_SIZE) {
+                rt2x00_desc_read(txd, 11, &word);
+                rt2x00_set_field32(&word, TXD_W11_BUFFER_LENGTH0, skbdesc->data_len);
+                rt2x00_desc_write(txd, 11, word);
+        }
 
         rt2x00_desc_read(txd, 0, &word);
         rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 1);
         rt2x00_set_field32(&word, TXD_W0_VALID, 1);
         rt2x00_set_field32(&word, TXD_W0_MORE_FRAG,
-                           test_bit(ENTRY_TXD_MORE_FRAG, &desc->flags));
+                           test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_ACK,
-                           test_bit(ENTRY_TXD_ACK, &desc->flags));
+                           test_bit(ENTRY_TXD_ACK, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_TIMESTAMP,
-                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &desc->flags));
+                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_OFDM,
-                           test_bit(ENTRY_TXD_OFDM_RATE, &desc->flags));
-        rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+                           test_bit(ENTRY_TXD_OFDM_RATE, &txdesc->flags));
+        rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
         rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
                            !!(control->flags &
                               IEEE80211_TXCTL_LONG_RETRY_LIMIT));
         rt2x00_set_field32(&word, TXD_W0_TKIP_MIC, 0);
         rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);
         rt2x00_set_field32(&word, TXD_W0_BURST,
-                           test_bit(ENTRY_TXD_BURST, &desc->flags));
+                           test_bit(ENTRY_TXD_BURST, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
         rt2x00_desc_write(txd, 0, word);
 }
@@ -1571,11 +1591,11 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
  * TX data initialization
  */
 static void rt61pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
-                                  unsigned int queue)
+                                  const unsigned int queue)
 {
         u32 reg;
 
-        if (queue == IEEE80211_TX_QUEUE_BEACON) {
+        if (queue == RT2X00_BCN_QUEUE_BEACON) {
                 /*
                  * For Wi-Fi faily generated beacons between participating
                  * stations. Set TBTT phase adaptive adjustment step to 8us.
@@ -1584,6 +1604,8 @@ static void rt61pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
 
                 rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
                 if (!rt2x00_get_field32(reg, TXRX_CSR9_BEACON_GEN)) {
+                        rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
+                        rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
                         rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 1);
                         rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
                 }
@@ -1599,8 +1621,6 @@ static void rt61pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
                            (queue == IEEE80211_TX_QUEUE_DATA2));
         rt2x00_set_field32(&reg, TX_CNTL_CSR_KICK_TX_AC3,
                            (queue == IEEE80211_TX_QUEUE_DATA3));
-        rt2x00_set_field32(&reg, TX_CNTL_CSR_KICK_TX_MGMT,
-                           (queue == IEEE80211_TX_QUEUE_DATA4));
         rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
 }
 
@@ -1628,7 +1648,7 @@ static int rt61pci_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
                 return 0;
         }
 
-        if (rt2x00dev->rx_status.phymode == MODE_IEEE80211A) {
+        if (rt2x00dev->rx_status.band == IEEE80211_BAND_5GHZ) {
                 if (test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags))
                         offset += 14;
 
@@ -1648,28 +1668,35 @@ static int rt61pci_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
         return rt2x00_get_field32(rxd_w1, RXD_W1_RSSI_AGC) * 2 - offset;
 }
 
-static void rt61pci_fill_rxdone(struct data_entry *entry,
-                                struct rxdata_entry_desc *desc)
+static void rt61pci_fill_rxdone(struct queue_entry *entry,
+                                struct rxdone_entry_desc *rxdesc)
 {
-        __le32 *rxd = entry->priv;
+        struct queue_entry_priv_pci_rx *priv_rx = entry->priv_data;
         u32 word0;
         u32 word1;
 
-        rt2x00_desc_read(rxd, 0, &word0);
-        rt2x00_desc_read(rxd, 1, &word1);
+        rt2x00_desc_read(priv_rx->desc, 0, &word0);
+        rt2x00_desc_read(priv_rx->desc, 1, &word1);
 
-        desc->flags = 0;
+        rxdesc->flags = 0;
         if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
-                desc->flags |= RX_FLAG_FAILED_FCS_CRC;
+                rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
 
         /*
          * Obtain the status about this packet.
-         */
-        desc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
-        desc->rssi = rt61pci_agc_to_rssi(entry->ring->rt2x00dev, word1);
-        desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
-        desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
-        desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
+         */
+        rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
+        rxdesc->rssi = rt61pci_agc_to_rssi(entry->queue->rt2x00dev, word1);
+        rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+
+        rxdesc->dev_flags = 0;
+        if (rt2x00_get_field32(word0, RXD_W0_OFDM))
+                rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
+        if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
+                rxdesc->dev_flags |= RXDONE_MY_BSS;
 }
 
 /*
@@ -1677,17 +1704,16 @@ static void rt61pci_fill_rxdone(struct data_entry *entry,
  */
 static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
 {
-        struct data_ring *ring;
-        struct data_entry *entry;
-        struct data_entry *entry_done;
-        __le32 *txd;
+        struct data_queue *queue;
+        struct queue_entry *entry;
+        struct queue_entry *entry_done;
+        struct queue_entry_priv_pci_tx *priv_tx;
+        struct txdone_entry_desc txdesc;
         u32 word;
         u32 reg;
         u32 old_reg;
         int type;
         int index;
-        int tx_status;
-        int retry;
 
         /*
          * During each loop we will compare the freshly read
@@ -1710,11 +1736,11 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
 
                 /*
                  * Skip this entry when it contains an invalid
-                 * ring identication number.
+                 * queue identication number.
                  */
                 type = rt2x00_get_field32(reg, STA_CSR4_PID_TYPE);
-                ring = rt2x00lib_get_ring(rt2x00dev, type);
-                if (unlikely(!ring))
+                queue = rt2x00queue_get_queue(rt2x00dev, type);
+                if (unlikely(!queue))
                         continue;
 
                 /*
@@ -1722,36 +1748,40 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                  * index number.
                  */
                 index = rt2x00_get_field32(reg, STA_CSR4_PID_SUBTYPE);
-                if (unlikely(index >= ring->stats.limit))
+                if (unlikely(index >= queue->limit))
                         continue;
 
-                entry = &ring->entry[index];
-                txd = entry->priv;
-                rt2x00_desc_read(txd, 0, &word);
+                entry = &queue->entries[index];
+                priv_tx = entry->priv_data;
+                rt2x00_desc_read(priv_tx->desc, 0, &word);
 
                 if (rt2x00_get_field32(word, TXD_W0_OWNER_NIC) ||
                     !rt2x00_get_field32(word, TXD_W0_VALID))
                         return;
 
-                entry_done = rt2x00_get_data_entry_done(ring);
+                entry_done = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
                 while (entry != entry_done) {
-                        /* Catch up. Just report any entries we missed as
-                         * failed. */
+                        /* Catch up.
+                         * Just report any entries we missed as failed.
+                         */
                         WARNING(rt2x00dev,
-                                "TX status report missed for entry %p\n",
-                                entry_done);
-                        rt2x00pci_txdone(rt2x00dev, entry_done, TX_FAIL_OTHER,
-                                         0);
-                        entry_done = rt2x00_get_data_entry_done(ring);
+                                "TX status report missed for entry %d\n",
+                                entry_done->entry_idx);
+
+                        txdesc.status = TX_FAIL_OTHER;
+                        txdesc.retry = 0;
+
+                        rt2x00pci_txdone(rt2x00dev, entry_done, &txdesc);
+                        entry_done = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
                 }
 
                 /*
                  * Obtain the status about this packet.
                  */
-                tx_status = rt2x00_get_field32(reg, STA_CSR4_TX_RESULT);
-                retry = rt2x00_get_field32(reg, STA_CSR4_RETRY_COUNT);
+                txdesc.status = rt2x00_get_field32(reg, STA_CSR4_TX_RESULT);
+                txdesc.retry = rt2x00_get_field32(reg, STA_CSR4_RETRY_COUNT);
 
-                rt2x00pci_txdone(rt2x00dev, entry, tx_status, retry);
+                rt2x00pci_txdone(rt2x00dev, entry, &txdesc);
         }
 }
 
@@ -1906,7 +1936,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_1, 0);
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_2, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_OFFSET_A, word);
-                EEPROM(rt2x00dev, "RSSI OFFSET BG: 0x%04x\n", word);
+                EEPROM(rt2x00dev, "RSSI OFFSET A: 0x%04x\n", word);
         } else {
                 value = rt2x00_get_field16(word, EEPROM_RSSI_OFFSET_A_1);
                 if (value < -10 || value > 10)
@@ -2035,35 +2065,61 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * If the eeprom value is invalid,
          * switch to default led mode.
          */
+#ifdef CONFIG_RT61PCI_LEDS
         rt2x00_eeprom_read(rt2x00dev, EEPROM_LED, &eeprom);
+        value = rt2x00_get_field16(eeprom, EEPROM_LED_LED_MODE);
+
+        rt2x00dev->led_radio.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_radio.type = LED_TYPE_RADIO;
+        rt2x00dev->led_radio.led_dev.brightness_set =
+            rt61pci_brightness_set;
+        rt2x00dev->led_radio.led_dev.blink_set =
+            rt61pci_blink_set;
+        rt2x00dev->led_radio.flags = LED_INITIALIZED;
+
+        rt2x00dev->led_assoc.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_assoc.type = LED_TYPE_ASSOC;
+        rt2x00dev->led_assoc.led_dev.brightness_set =
+            rt61pci_brightness_set;
+        rt2x00dev->led_assoc.led_dev.blink_set =
+            rt61pci_blink_set;
+        rt2x00dev->led_assoc.flags = LED_INITIALIZED;
+
+        if (value == LED_MODE_SIGNAL_STRENGTH) {
+                rt2x00dev->led_qual.rt2x00dev = rt2x00dev;
+                rt2x00dev->led_radio.type = LED_TYPE_QUALITY;
+                rt2x00dev->led_qual.led_dev.brightness_set =
+                    rt61pci_brightness_set;
+                rt2x00dev->led_qual.led_dev.blink_set =
+                    rt61pci_blink_set;
+                rt2x00dev->led_qual.flags = LED_INITIALIZED;
+        }
 
-        rt2x00dev->led_mode = rt2x00_get_field16(eeprom, EEPROM_LED_LED_MODE);
-
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LED_MODE,
-                           rt2x00dev->led_mode);
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_0,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_LED_MODE, value);
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_0,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_0));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_1,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_1,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_1));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_2,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_2,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_2));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_3,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_3,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_3));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_4,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_4,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_4));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_ACT,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_ACT,
                            rt2x00_get_field16(eeprom, EEPROM_LED_POLARITY_ACT));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_READY_BG,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_READY_BG,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_RDY_G));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_READY_A,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_READY_A,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_RDY_A));
+#endif /* CONFIG_RT61PCI_LEDS */
 
         return 0;
 }
@@ -2197,7 +2253,7 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         rt2x00dev->hw->extra_tx_headroom = 0;
         rt2x00dev->hw->max_signal = MAX_SIGNAL;
         rt2x00dev->hw->max_rssi = MAX_RX_SSI;
-        rt2x00dev->hw->queues = 5;
+        rt2x00dev->hw->queues = 4;
 
         SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_pci(rt2x00dev)->dev);
         SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
@@ -2214,8 +2270,8 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize hw_mode information.
          */
-        spec->num_modes = 2;
-        spec->num_rates = 12;
+        spec->supported_bands = SUPPORT_BAND_2GHZ;
+        spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;
         spec->tx_power_a = NULL;
         spec->tx_power_bg = txpower;
         spec->tx_power_default = DEFAULT_TXPOWER;
@@ -2230,7 +2286,7 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 
         if (rt2x00_rf(&rt2x00dev->chip, RF5225) ||
             rt2x00_rf(&rt2x00dev->chip, RF5325)) {
-                spec->num_modes = 3;
+                spec->supported_bands |= SUPPORT_BAND_5GHZ;
                 spec->num_channels = ARRAY_SIZE(rf_vals_seq);
 
                 txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);
@@ -2262,7 +2318,7 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         rt61pci_probe_hw_mode(rt2x00dev);
 
         /*
-         * This device requires firmware
+         * This device requires firmware.
          */
         __set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);
 
@@ -2277,70 +2333,6 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
 /*
  * IEEE80211 stack callback functions.
  */
-static void rt61pci_configure_filter(struct ieee80211_hw *hw,
-                                     unsigned int changed_flags,
-                                     unsigned int *total_flags,
-                                     int mc_count,
-                                     struct dev_addr_list *mc_list)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-        u32 reg;
-
-        /*
-         * Mask off any flags we are going to ignore from
-         * the total_flags field.
-         */
-        *total_flags &=
-            FIF_ALLMULTI |
-            FIF_FCSFAIL |
-            FIF_PLCPFAIL |
-            FIF_CONTROL |
-            FIF_OTHER_BSS |
-            FIF_PROMISC_IN_BSS;
-
-        /*
-         * Apply some rules to the filters:
-         * - Some filters imply different filters to be set.
-         * - Some things we can't filter out at all.
-         * - Multicast filter seems to kill broadcast traffic so never use it.
-         */
-        *total_flags |= FIF_ALLMULTI;
-        if (*total_flags & FIF_OTHER_BSS ||
-            *total_flags & FIF_PROMISC_IN_BSS)
-                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-
-        /*
-         * Check if there is any work left for us.
-         */
-        if (rt2x00dev->packet_filter == *total_flags)
-                return;
-        rt2x00dev->packet_filter = *total_flags;
-
-        /*
-         * Start configuration steps.
-         * Note that the version error will always be dropped
-         * and broadcast frames will always be accepted since
-         * there is no filter for it at this time.
-         */
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC,
-                           !(*total_flags & FIF_FCSFAIL));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL,
-                           !(*total_flags & FIF_PLCPFAIL));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
-                           !(*total_flags & FIF_CONTROL));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
-                           !(*total_flags & FIF_ALLMULTI));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_BORADCAST, 0);
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS, 1);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
-}
-
 static int rt61pci_set_retry_limit(struct ieee80211_hw *hw,
                                    u32 short_retry, u32 long_retry)
 {
@@ -2369,66 +2361,72 @@ static u64 rt61pci_get_tsf(struct ieee80211_hw *hw)
         return tsf;
 }
 
-static void rt61pci_reset_tsf(struct ieee80211_hw *hw)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR12, 0);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR13, 0);
-}
-
 static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
                           struct ieee80211_tx_control *control)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct skb_desc *desc;
-        struct data_ring *ring;
-        struct data_entry *entry;
+        struct rt2x00_intf *intf = vif_to_intf(control->vif);
+        struct skb_frame_desc *skbdesc;
+        unsigned int beacon_base;
+        u32 reg;
 
-        /*
-         * Just in case the ieee80211 doesn't set this,
-         * but we need this queue set for the descriptor
-         * initialization.
-         */
-        control->queue = IEEE80211_TX_QUEUE_BEACON;
-        ring = rt2x00lib_get_ring(rt2x00dev, control->queue);
-        entry = rt2x00_get_data_entry(ring);
+        if (unlikely(!intf->beacon))
+                return -ENOBUFS;
 
         /*
          * We need to append the descriptor in front of the
          * beacon frame.
          */
-        if (skb_headroom(skb) < TXD_DESC_SIZE) {
-                if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC))
+        if (skb_headroom(skb) < intf->beacon->queue->desc_size) {
+                if (pskb_expand_head(skb, intf->beacon->queue->desc_size,
+                                     0, GFP_ATOMIC))
                         return -ENOMEM;
         }
 
         /*
          * Add the descriptor in front of the skb.
          */
-        skb_push(skb, ring->desc_size);
-        memset(skb->data, 0, ring->desc_size);
+        skb_push(skb, intf->beacon->queue->desc_size);
+        memset(skb->data, 0, intf->beacon->queue->desc_size);
 
         /*
          * Fill in skb descriptor
          */
-        desc = get_skb_desc(skb);
-        desc->desc_len = ring->desc_size;
-        desc->data_len = skb->len - ring->desc_size;
-        desc->desc = skb->data;
-        desc->data = skb->data + ring->desc_size;
-        desc->ring = ring;
-        desc->entry = entry;
+        skbdesc = get_skb_frame_desc(skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
+        skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
+        skbdesc->data = skb->data + intf->beacon->queue->desc_size;
+        skbdesc->data_len = skb->len - intf->beacon->queue->desc_size;
+        skbdesc->desc = skb->data;
+        skbdesc->desc_len = intf->beacon->queue->desc_size;
+        skbdesc->entry = intf->beacon;
+
+        /*
+         * Disable beaconing while we are reloading the beacon data,
+         * otherwise we might be sending out invalid data.
+         */
+        rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
+        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
 
+        /*
+         * mac80211 doesn't provide the control->queue variable
+         * for beacons. Set our own queue identification so
+         * it can be used during descriptor initialization.
+         */
+        control->queue = RT2X00_BCN_QUEUE_BEACON;
         rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
 
         /*
          * Write entire beacon with descriptor to register,
          * and kick the beacon generator.
          */
-        rt2x00pci_register_multiwrite(rt2x00dev, HW_BEACON_BASE0,
+        beacon_base = HW_BEACON_OFFSET(intf->beacon->entry_idx);
+        rt2x00pci_register_multiwrite(rt2x00dev, beacon_base,
                                       skb->data, skb->len);
-        rt61pci_kick_tx_queue(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
+        rt61pci_kick_tx_queue(rt2x00dev, control->queue);
 
         return 0;
 }
@@ -2441,14 +2439,13 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .config_interface       = rt2x00mac_config_interface,
-        .configure_filter       = rt61pci_configure_filter,
+        .configure_filter       = rt2x00mac_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt61pci_set_retry_limit,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt61pci_get_tsf,
-        .reset_tsf              = rt61pci_reset_tsf,
         .beacon_update          = rt61pci_beacon_update,
 };
 
@@ -2456,6 +2453,7 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
         .irq_handler            = rt61pci_interrupt,
         .probe_hw               = rt61pci_probe_hw,
         .get_firmware_name      = rt61pci_get_firmware_name,
+        .get_firmware_crc       = rt61pci_get_firmware_crc,
         .load_firmware          = rt61pci_load_firmware,
         .initialize             = rt2x00pci_initialize,
         .uninitialize           = rt2x00pci_uninitialize,
@@ -2470,19 +2468,42 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
         .write_tx_data          = rt2x00pci_write_tx_data,
         .kick_tx_queue          = rt61pci_kick_tx_queue,
         .fill_rxdone            = rt61pci_fill_rxdone,
-        .config_mac_addr        = rt61pci_config_mac_addr,
-        .config_bssid           = rt61pci_config_bssid,
-        .config_type            = rt61pci_config_type,
-        .config_preamble        = rt61pci_config_preamble,
+        .config_filter          = rt61pci_config_filter,
+        .config_intf            = rt61pci_config_intf,
+        .config_erp             = rt61pci_config_erp,
         .config                 = rt61pci_config,
 };
 
+static const struct data_queue_desc rt61pci_queue_rx = {
+        .entry_num              = RX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = RXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_rx),
+};
+
+static const struct data_queue_desc rt61pci_queue_tx = {
+        .entry_num              = TX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
+static const struct data_queue_desc rt61pci_queue_bcn = {
+        .entry_num              = 4 * BEACON_ENTRIES,
+        .data_size              = MGMT_FRAME_SIZE,
+        .desc_size              = TXINFO_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
+};
+
 static const struct rt2x00_ops rt61pci_ops = {
         .name           = KBUILD_MODNAME,
-        .rxd_size       = RXD_DESC_SIZE,
-        .txd_size       = TXD_DESC_SIZE,
+        .max_sta_intf   = 1,
+        .max_ap_intf    = 4,
         .eeprom_size    = EEPROM_SIZE,
         .rf_size        = RF_SIZE,
+        .rx             = &rt61pci_queue_rx,
+        .tx             = &rt61pci_queue_tx,
+        .bcn            = &rt61pci_queue_bcn,
         .lib            = &rt61pci_rt2x00_ops,
         .hw             = &rt61pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index 4c6524eedad0..3511bba7ff65 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -161,7 +161,9 @@ struct hw_pairwise_ta_entry {
 #define HW_BEACON_BASE1                 0x2d00
 #define HW_BEACON_BASE2                 0x2e00
 #define HW_BEACON_BASE3                 0x2f00
-#define HW_BEACON_OFFSET                0x0100
+
+#define HW_BEACON_OFFSET(__index) \
+        ( HW_BEACON_BASE0 + (__index * 0x0100) )
 
 /*
  * HOST-MCU shared memory.
@@ -234,6 +236,11 @@ struct hw_pairwise_ta_entry {
 
 /*
  * MAC_CSR3: STA MAC register 1.
+ * UNICAST_TO_ME_MASK:
+ *      Used to mask off bits from byte 5 of the MAC address
+ *      to determine the UNICAST_TO_ME bit for RX frames.
+ *      The full mask is complemented by BSS_ID_MASK:
+ *              MASK = BSS_ID_MASK & UNICAST_TO_ME_MASK
  */
 #define MAC_CSR3                        0x300c
 #define MAC_CSR3_BYTE4                  FIELD32(0x000000ff)
@@ -251,7 +258,14 @@ struct hw_pairwise_ta_entry {
 
 /*
  * MAC_CSR5: BSSID register 1.
- * BSS_ID_MASK: 3: one BSSID, 0: 4 BSSID, 2 or 1: 2 BSSID.
+ * BSS_ID_MASK:
+ *      This mask is used to mask off bits 0 and 1 of byte 5 of the
+ *      BSSID. This will make sure that those bits will be ignored
+ *      when determining the MY_BSS of RX frames.
+ *              0: 1-BSSID mode (BSS index = 0)
+ *              1: 2-BSSID mode (BSS index: Byte5, bit 0)
+ *              2: 2-BSSID mode (BSS index: byte5, bit 1)
+ *              3: 4-BSSID mode (BSS index: byte5, bit 0 - 1)
  */
 #define MAC_CSR5                        0x3014
 #define MAC_CSR5_BYTE4                  FIELD32(0x000000ff)
@@ -391,7 +405,7 @@ struct hw_pairwise_ta_entry {
 #define TXRX_CSR0_DROP_TO_DS            FIELD32(0x00200000)
 #define TXRX_CSR0_DROP_VERSION_ERROR    FIELD32(0x00400000)
 #define TXRX_CSR0_DROP_MULTICAST        FIELD32(0x00800000)
-#define TXRX_CSR0_DROP_BORADCAST        FIELD32(0x01000000)
+#define TXRX_CSR0_DROP_BROADCAST        FIELD32(0x01000000)
 #define TXRX_CSR0_DROP_ACK_CTS          FIELD32(0x02000000)
 #define TXRX_CSR0_TX_WITHOUT_WAITING    FIELD32(0x04000000)
 
@@ -866,7 +880,7 @@ struct hw_pairwise_ta_entry {
 #define TX_CNTL_CSR_ABORT_TX_MGMT       FIELD32(0x00100000)
 
 /*
- * LOAD_TX_RING_CSR: Load RX de
+ * LOAD_TX_RING_CSR: Load RX desriptor
  */
 #define LOAD_TX_RING_CSR                0x3434
 #define LOAD_TX_RING_CSR_LOAD_TXD_AC0   FIELD32(0x00000001)
@@ -1116,10 +1130,10 @@ struct hw_pairwise_ta_entry {
 #define EEPROM_MAC_ADDR_0               0x0002
 #define EEPROM_MAC_ADDR_BYTE0           FIELD16(0x00ff)
 #define EEPROM_MAC_ADDR_BYTE1           FIELD16(0xff00)
-#define EEPROM_MAC_ADDR1                0x0004
+#define EEPROM_MAC_ADDR1                0x0003
 #define EEPROM_MAC_ADDR_BYTE2           FIELD16(0x00ff)
 #define EEPROM_MAC_ADDR_BYTE3           FIELD16(0xff00)
-#define EEPROM_MAC_ADDR_2               0x0006
+#define EEPROM_MAC_ADDR_2               0x0004
 #define EEPROM_MAC_ADDR_BYTE4           FIELD16(0x00ff)
 #define EEPROM_MAC_ADDR_BYTE5           FIELD16(0xff00)
 
@@ -1247,6 +1261,7 @@ struct hw_pairwise_ta_entry {
  * DMA descriptor defines.
  */
 #define TXD_DESC_SIZE                   ( 16 * sizeof(__le32) )
+#define TXINFO_SIZE                     ( 6 * sizeof(__le32) )
 #define RXD_DESC_SIZE                   ( 16 * sizeof(__le32) )
 
 /*
@@ -1440,8 +1455,8 @@ struct hw_pairwise_ta_entry {
 #define RXD_W15_RESERVED                FIELD32(0xffffffff)
 
 /*
- * Macro's for converting txpower from EEPROM to dscape value
- * and from dscape value to register value.
+ * Macro's for converting txpower from EEPROM to mac80211 value
+ * and from mac80211 value to register value.
  */
 #define MIN_TXPOWER     0
 #define MAX_TXPOWER     31
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 3909cf42f472..a9efe25f1ea7 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
         Supported chipsets: rt2571W & rt2671.
  */
 
+#include <linux/crc-itu-t.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
@@ -278,85 +279,158 @@ static const struct rt2x00debug rt73usb_rt2x00debug = {
 };
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 
-/*
- * Configuration handlers.
- */
-static void rt73usb_config_mac_addr(struct rt2x00_dev *rt2x00dev, __le32 *mac)
+#ifdef CONFIG_RT73USB_LEDS
+static void rt73usb_brightness_set(struct led_classdev *led_cdev,
+                                   enum led_brightness brightness)
 {
-        u32 tmp;
-
-        tmp = le32_to_cpu(mac[1]);
-        rt2x00_set_field32(&tmp, MAC_CSR3_UNICAST_TO_ME_MASK, 0xff);
-        mac[1] = cpu_to_le32(tmp);
-
-        rt73usb_register_multiwrite(rt2x00dev, MAC_CSR2, mac,
-                                    (2 * sizeof(__le32)));
+        struct rt2x00_led *led =
+           container_of(led_cdev, struct rt2x00_led, led_dev);
+        unsigned int enabled = brightness != LED_OFF;
+        unsigned int a_mode =
+            (enabled && led->rt2x00dev->curr_band == IEEE80211_BAND_5GHZ);
+        unsigned int bg_mode =
+            (enabled && led->rt2x00dev->curr_band == IEEE80211_BAND_2GHZ);
+
+        if (led->type == LED_TYPE_RADIO) {
+                rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
+                                   MCU_LEDCS_RADIO_STATUS, enabled);
+
+                rt2x00usb_vendor_request_sw(led->rt2x00dev, USB_LED_CONTROL,
+                                            0, led->rt2x00dev->led_mcu_reg,
+                                            REGISTER_TIMEOUT);
+        } else if (led->type == LED_TYPE_ASSOC) {
+                rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
+                                   MCU_LEDCS_LINK_BG_STATUS, bg_mode);
+                rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
+                                   MCU_LEDCS_LINK_A_STATUS, a_mode);
+
+                rt2x00usb_vendor_request_sw(led->rt2x00dev, USB_LED_CONTROL,
+                                            0, led->rt2x00dev->led_mcu_reg,
+                                            REGISTER_TIMEOUT);
+        } else if (led->type == LED_TYPE_QUALITY) {
+                /*
+                 * The brightness is divided into 6 levels (0 - 5),
+                 * this means we need to convert the brightness
+                 * argument into the matching level within that range.
+                 */
+                rt2x00usb_vendor_request_sw(led->rt2x00dev, USB_LED_CONTROL,
+                                            brightness / (LED_FULL / 6),
+                                            led->rt2x00dev->led_mcu_reg,
+                                            REGISTER_TIMEOUT);
+        }
 }
 
-static void rt73usb_config_bssid(struct rt2x00_dev *rt2x00dev, __le32 *bssid)
+static int rt73usb_blink_set(struct led_classdev *led_cdev,
+                             unsigned long *delay_on,
+                             unsigned long *delay_off)
 {
-        u32 tmp;
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        u32 reg;
 
-        tmp = le32_to_cpu(bssid[1]);
-        rt2x00_set_field32(&tmp, MAC_CSR5_BSS_ID_MASK, 3);
-        bssid[1] = cpu_to_le32(tmp);
+        rt73usb_register_read(led->rt2x00dev, MAC_CSR14, &reg);
+        rt2x00_set_field32(&reg, MAC_CSR14_ON_PERIOD, *delay_on);
+        rt2x00_set_field32(&reg, MAC_CSR14_OFF_PERIOD, *delay_off);
+        rt73usb_register_write(led->rt2x00dev, MAC_CSR14, reg);
 
-        rt73usb_register_multiwrite(rt2x00dev, MAC_CSR4, bssid,
-                                    (2 * sizeof(__le32)));
+        return 0;
 }
+#endif /* CONFIG_RT73USB_LEDS */
 
-static void rt73usb_config_type(struct rt2x00_dev *rt2x00dev, const int type,
-                                const int tsf_sync)
+/*
+ * Configuration handlers.
+ */
+static void rt73usb_config_filter(struct rt2x00_dev *rt2x00dev,
+                                  const unsigned int filter_flags)
 {
         u32 reg;
 
         /*
-         * Clear current synchronisation setup.
-         * For the Beacon base registers we only need to clear
-         * the first byte since that byte contains the VALID and OWNER
-         * bits which (when set to 0) will invalidate the entire beacon.
-         */
-        rt73usb_register_write(rt2x00dev, TXRX_CSR9, 0);
-        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE0, 0);
-        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE1, 0);
-        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE2, 0);
-        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
-
-        /*
-         * Enable synchronisation.
+         * Start configuration steps.
+         * Note that the version error will always be dropped
+         * and broadcast frames will always be accepted since
+         * there is no filter for it at this time.
          */
-        rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
-        rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
-        rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE,
-                           (tsf_sync == TSF_SYNC_BEACON));
-        rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
-        rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, tsf_sync);
-        rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
+        rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC,
+                           !(filter_flags & FIF_FCSFAIL));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL,
+                           !(filter_flags & FIF_PLCPFAIL));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
+                           !(filter_flags & FIF_CONTROL));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
+                           !(filter_flags & FIF_PROMISC_IN_BSS));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
+                           !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                           !rt2x00dev->intf_ap_count);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
+                           !(filter_flags & FIF_ALLMULTI));
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_BROADCAST, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS,
+                           !(filter_flags & FIF_CONTROL));
+        rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
 }
 
-static void rt73usb_config_preamble(struct rt2x00_dev *rt2x00dev,
-                                      const int short_preamble,
-                                      const int ack_timeout,
-                                      const int ack_consume_time)
+static void rt73usb_config_intf(struct rt2x00_dev *rt2x00dev,
+                                struct rt2x00_intf *intf,
+                                struct rt2x00intf_conf *conf,
+                                const unsigned int flags)
 {
+        unsigned int beacon_base;
         u32 reg;
 
-        /*
-         * When in atomic context, reschedule and let rt2x00lib
-         * call this function again.
-         */
-        if (in_atomic()) {
-                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->config_work);
-                return;
+        if (flags & CONFIG_UPDATE_TYPE) {
+                /*
+                 * Clear current synchronisation setup.
+                 * For the Beacon base registers we only need to clear
+                 * the first byte since that byte contains the VALID and OWNER
+                 * bits which (when set to 0) will invalidate the entire beacon.
+                 */
+                beacon_base = HW_BEACON_OFFSET(intf->beacon->entry_idx);
+                rt73usb_register_write(rt2x00dev, beacon_base, 0);
+
+                /*
+                 * Enable synchronisation.
+                 */
+                rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
+                rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
+                rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync);
+                rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
+                rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
         }
 
+        if (flags & CONFIG_UPDATE_MAC) {
+                reg = le32_to_cpu(conf->mac[1]);
+                rt2x00_set_field32(&reg, MAC_CSR3_UNICAST_TO_ME_MASK, 0xff);
+                conf->mac[1] = cpu_to_le32(reg);
+
+                rt73usb_register_multiwrite(rt2x00dev, MAC_CSR2,
+                                            conf->mac, sizeof(conf->mac));
+        }
+
+        if (flags & CONFIG_UPDATE_BSSID) {
+                reg = le32_to_cpu(conf->bssid[1]);
+                rt2x00_set_field32(&reg, MAC_CSR5_BSS_ID_MASK, 3);
+                conf->bssid[1] = cpu_to_le32(reg);
+
+                rt73usb_register_multiwrite(rt2x00dev, MAC_CSR4,
+                                            conf->bssid, sizeof(conf->bssid));
+        }
+}
+
+static void rt73usb_config_erp(struct rt2x00_dev *rt2x00dev,
+                               struct rt2x00lib_erp *erp)
+{
+        u32 reg;
+
         rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
-        rt2x00_set_field32(&reg, TXRX_CSR0_RX_ACK_TIMEOUT, ack_timeout);
+        rt2x00_set_field32(&reg, TXRX_CSR0_RX_ACK_TIMEOUT, erp->ack_timeout);
         rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
 
         rt73usb_register_read(rt2x00dev, TXRX_CSR4, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE,
-                           !!short_preamble);
+                           !!erp->short_preamble);
         rt73usb_register_write(rt2x00dev, TXRX_CSR4, reg);
 }
 
@@ -442,28 +516,22 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2);
                 temp = !test_bit(CONFIG_FRAME_TYPE, &rt2x00dev->flags)
-                       && (rt2x00dev->curr_hwmode != HWMODE_A);
+                       && (rt2x00dev->curr_band != IEEE80211_BAND_5GHZ);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, temp);
                 break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
-                if (rt2x00dev->curr_hwmode == HWMODE_A)
+                if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ)
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
                 else
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
-                if (rt2x00dev->curr_hwmode == HWMODE_A)
+                if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ)
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
                 else
                         rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
@@ -501,14 +569,8 @@ static void rt73usb_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 break;
-        case ANTENNA_SW_DIVERSITY:
-                /*
-                 * NOTE: We should never come here because rt2x00lib is
-                 * supposed to catch this and send us the correct antenna
-                 * explicitely. However we are nog going to bug about this.
-                 * Instead, just default to antenna B.
-                 */
         case ANTENNA_B:
+        default:
                 rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
                 break;
@@ -558,7 +620,14 @@ static void rt73usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         unsigned int i;
         u32 reg;
 
-        if (rt2x00dev->curr_hwmode == HWMODE_A) {
+        /*
+         * We should never come here because rt2x00lib is supposed
+         * to catch this and send us the correct antenna explicitely.
+         */
+        BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
+               ant->tx == ANTENNA_SW_DIVERSITY);
+
+        if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ) {
                 sel = antenna_sel_a;
                 lna = test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags);
         } else {
@@ -572,10 +641,9 @@ static void rt73usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         rt73usb_register_read(rt2x00dev, PHY_CSR0, &reg);
 
         rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_BG,
-                           (rt2x00dev->curr_hwmode == HWMODE_B ||
-                            rt2x00dev->curr_hwmode == HWMODE_G));
+                           (rt2x00dev->curr_band == IEEE80211_BAND_2GHZ));
         rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_A,
-                           (rt2x00dev->curr_hwmode == HWMODE_A));
+                           (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ));
 
         rt73usb_register_write(rt2x00dev, PHY_CSR0, reg);
 
@@ -617,8 +685,8 @@ static void rt73usb_config_duration(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt73usb_config(struct rt2x00_dev *rt2x00dev,
-                           const unsigned int flags,
-                           struct rt2x00lib_conf *libconf)
+                           struct rt2x00lib_conf *libconf,
+                           const unsigned int flags)
 {
         if (flags & CONFIG_UPDATE_PHYMODE)
                 rt73usb_config_phymode(rt2x00dev, libconf->basic_rates);
@@ -634,68 +702,6 @@ static void rt73usb_config(struct rt2x00_dev *rt2x00dev,
 }
 
 /*
- * LED functions.
- */
-static void rt73usb_enable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-
-        rt73usb_register_read(rt2x00dev, MAC_CSR14, &reg);
-        rt2x00_set_field32(&reg, MAC_CSR14_ON_PERIOD, 70);
-        rt2x00_set_field32(&reg, MAC_CSR14_OFF_PERIOD, 30);
-        rt73usb_register_write(rt2x00dev, MAC_CSR14, reg);
-
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_RADIO_STATUS, 1);
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LINK_A_STATUS,
-                           (rt2x00dev->rx_status.phymode == MODE_IEEE80211A));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LINK_BG_STATUS,
-                           (rt2x00dev->rx_status.phymode != MODE_IEEE80211A));
-
-        rt2x00usb_vendor_request_sw(rt2x00dev, USB_LED_CONTROL, 0x0000,
-                                    rt2x00dev->led_reg, REGISTER_TIMEOUT);
-}
-
-static void rt73usb_disable_led(struct rt2x00_dev *rt2x00dev)
-{
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_RADIO_STATUS, 0);
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LINK_BG_STATUS, 0);
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LINK_A_STATUS, 0);
-
-        rt2x00usb_vendor_request_sw(rt2x00dev, USB_LED_CONTROL, 0x0000,
-                                    rt2x00dev->led_reg, REGISTER_TIMEOUT);
-}
-
-static void rt73usb_activity_led(struct rt2x00_dev *rt2x00dev, int rssi)
-{
-        u32 led;
-
-        if (rt2x00dev->led_mode != LED_MODE_SIGNAL_STRENGTH)
-                return;
-
-        /*
-         * Led handling requires a positive value for the rssi,
-         * to do that correctly we need to add the correction.
-         */
-        rssi += rt2x00dev->rssi_offset;
-
-        if (rssi <= 30)
-                led = 0;
-        else if (rssi <= 39)
-                led = 1;
-        else if (rssi <= 49)
-                led = 2;
-        else if (rssi <= 53)
-                led = 3;
-        else if (rssi <= 63)
-                led = 4;
-        else
-                led = 5;
-
-        rt2x00usb_vendor_request_sw(rt2x00dev, USB_LED_CONTROL, led,
-                                    rt2x00dev->led_reg, REGISTER_TIMEOUT);
-}
-
-/*
  * Link tuning
  */
 static void rt73usb_link_stats(struct rt2x00_dev *rt2x00dev,
@@ -729,17 +735,12 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
         u8 up_bound;
         u8 low_bound;
 
-        /*
-         * Update Led strength
-         */
-        rt73usb_activity_led(rt2x00dev, rssi);
-
         rt73usb_bbp_read(rt2x00dev, 17, &r17);
 
         /*
          * Determine r17 bounds.
          */
-        if (rt2x00dev->rx_status.phymode == MODE_IEEE80211A) {
+        if (rt2x00dev->rx_status.band == IEEE80211_BAND_5GHZ) {
                 low_bound = 0x28;
                 up_bound = 0x48;
 
@@ -766,6 +767,13 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
         }
 
         /*
+         * If we are not associated, we should go straight to the
+         * dynamic CCA tuning.
+         */
+        if (!rt2x00dev->intf_associated)
+                goto dynamic_cca_tune;
+
+        /*
          * Special big-R17 for very short distance
          */
         if (rssi > -35) {
@@ -815,6 +823,8 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
                 return;
         }
 
+dynamic_cca_tune:
+
         /*
          * r17 does not yet exceed upper limit, continue and base
          * the r17 tuning on the false CCA count.
@@ -833,16 +843,30 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
 }
 
 /*
- * Firmware name function.
+ * Firmware functions
  */
 static char *rt73usb_get_firmware_name(struct rt2x00_dev *rt2x00dev)
 {
         return FIRMWARE_RT2571;
 }
 
-/*
- * Initialization functions.
- */
+static u16 rt73usb_get_firmware_crc(void *data, const size_t len)
+{
+        u16 crc;
+
+        /*
+         * Use the crc itu-t algorithm.
+         * The last 2 bytes in the firmware array are the crc checksum itself,
+         * this means that we should never pass those 2 bytes to the crc
+         * algorithm.
+         */
+        crc = crc_itu_t(0, data, len - 2);
+        crc = crc_itu_t_byte(crc, 0);
+        crc = crc_itu_t_byte(crc, 0);
+
+        return crc;
+}
+
 static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
                                  const size_t len)
 {
@@ -889,7 +913,7 @@ static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
 
                 rt2x00usb_vendor_request(rt2x00dev, USB_MULTI_WRITE,
                                          USB_VENDOR_REQUEST_OUT,
-                                         FIRMWARE_IMAGE_BASE + i, 0x0000,
+                                         FIRMWARE_IMAGE_BASE + i, 0,
                                          cache, buflen, timeout);
 
                 ptr += buflen;
@@ -902,18 +926,19 @@ static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
          * we need to specify a long timeout time.
          */
         status = rt2x00usb_vendor_request_sw(rt2x00dev, USB_DEVICE_MODE,
-                                             0x0000, USB_MODE_FIRMWARE,
+                                             0, USB_MODE_FIRMWARE,
                                              REGISTER_TIMEOUT_FIRMWARE);
         if (status < 0) {
                 ERROR(rt2x00dev, "Failed to write Firmware to device.\n");
                 return status;
         }
 
-        rt73usb_disable_led(rt2x00dev);
-
         return 0;
 }
 
+/*
+ * Initialization functions.
+ */
 static int rt73usb_init_registers(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
@@ -1021,6 +1046,17 @@ static int rt73usb_init_registers(struct rt2x00_dev *rt2x00dev)
         rt73usb_register_write(rt2x00dev, MAC_CSR9, reg);
 
         /*
+         * Clear all beacons
+         * For the Beacon base registers we only need to clear
+         * the first byte since that byte contains the VALID and OWNER
+         * bits which (when set to 0) will invalidate the entire beacon.
+         */
+        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE0, 0);
+        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE1, 0);
+        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE2, 0);
+        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
+
+        /*
          * We must clear the error counters.
          * These registers are cleared on read,
          * so we may pass a useless variable to store the value.
@@ -1094,19 +1130,15 @@ continue_csr_init:
         rt73usb_bbp_write(rt2x00dev, 102, 0x16);
         rt73usb_bbp_write(rt2x00dev, 107, 0x04);
 
-        DEBUG(rt2x00dev, "Start initialization from EEPROM...\n");
         for (i = 0; i < EEPROM_BBP_SIZE; i++) {
                 rt2x00_eeprom_read(rt2x00dev, EEPROM_BBP_START + i, &eeprom);
 
                 if (eeprom != 0xffff && eeprom != 0x0000) {
                         reg_id = rt2x00_get_field16(eeprom, EEPROM_BBP_REG_ID);
                         value = rt2x00_get_field16(eeprom, EEPROM_BBP_VALUE);
-                        DEBUG(rt2x00dev, "BBP: 0x%02x, value: 0x%02x.\n",
-                              reg_id, value);
                         rt73usb_bbp_write(rt2x00dev, reg_id, value);
                 }
         }
-        DEBUG(rt2x00dev, "...End initialization from EEPROM.\n");
 
         return 0;
 }
@@ -1136,21 +1168,11 @@ static int rt73usb_enable_radio(struct rt2x00_dev *rt2x00dev)
                 return -EIO;
         }
 
-        /*
-         * Enable LED
-         */
-        rt73usb_enable_led(rt2x00dev);
-
         return 0;
 }
 
 static void rt73usb_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
-        /*
-         * Disable LED
-         */
-        rt73usb_disable_led(rt2x00dev);
-
         rt73usb_register_write(rt2x00dev, MAC_CSR10, 0x00001818);
 
         /*
@@ -1234,10 +1256,10 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev,
  */
 static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                     struct sk_buff *skb,
-                                    struct txdata_entry_desc *desc,
+                                    struct txentry_desc *txdesc,
                                     struct ieee80211_tx_control *control)
 {
-        struct skb_desc *skbdesc = get_skb_desc(skb);
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
         __le32 *txd = skbdesc->desc;
         u32 word;
 
@@ -1245,47 +1267,47 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
          * Start writing the descriptor words.
          */
         rt2x00_desc_read(txd, 1, &word);
-        rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, desc->queue);
-        rt2x00_set_field32(&word, TXD_W1_AIFSN, desc->aifs);
-        rt2x00_set_field32(&word, TXD_W1_CWMIN, desc->cw_min);
-        rt2x00_set_field32(&word, TXD_W1_CWMAX, desc->cw_max);
+        rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, txdesc->queue);
+        rt2x00_set_field32(&word, TXD_W1_AIFSN, txdesc->aifs);
+        rt2x00_set_field32(&word, TXD_W1_CWMIN, txdesc->cw_min);
+        rt2x00_set_field32(&word, TXD_W1_CWMAX, txdesc->cw_max);
         rt2x00_set_field32(&word, TXD_W1_IV_OFFSET, IEEE80211_HEADER);
         rt2x00_set_field32(&word, TXD_W1_HW_SEQUENCE, 1);
         rt2x00_desc_write(txd, 1, word);
 
         rt2x00_desc_read(txd, 2, &word);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, desc->signal);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, desc->service);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW, desc->length_low);
-        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH, desc->length_high);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, txdesc->signal);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, txdesc->service);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW, txdesc->length_low);
+        rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH, txdesc->length_high);
         rt2x00_desc_write(txd, 2, word);
 
         rt2x00_desc_read(txd, 5, &word);
         rt2x00_set_field32(&word, TXD_W5_TX_POWER,
-                           TXPOWER_TO_DEV(control->power_level));
+                           TXPOWER_TO_DEV(rt2x00dev->tx_power));
         rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);
         rt2x00_desc_write(txd, 5, word);
 
         rt2x00_desc_read(txd, 0, &word);
         rt2x00_set_field32(&word, TXD_W0_BURST,
-                           test_bit(ENTRY_TXD_BURST, &desc->flags));
+                           test_bit(ENTRY_TXD_BURST, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_VALID, 1);
         rt2x00_set_field32(&word, TXD_W0_MORE_FRAG,
-                           test_bit(ENTRY_TXD_MORE_FRAG, &desc->flags));
+                           test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_ACK,
-                           test_bit(ENTRY_TXD_ACK, &desc->flags));
+                           test_bit(ENTRY_TXD_ACK, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_TIMESTAMP,
-                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &desc->flags));
+                           test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_OFDM,
-                           test_bit(ENTRY_TXD_OFDM_RATE, &desc->flags));
-        rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+                           test_bit(ENTRY_TXD_OFDM_RATE, &txdesc->flags));
+        rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
         rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
                            !!(control->flags &
                               IEEE80211_TXCTL_LONG_RETRY_LIMIT));
         rt2x00_set_field32(&word, TXD_W0_TKIP_MIC, 0);
         rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);
         rt2x00_set_field32(&word, TXD_W0_BURST2,
-                           test_bit(ENTRY_TXD_BURST, &desc->flags));
+                           test_bit(ENTRY_TXD_BURST, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
         rt2x00_desc_write(txd, 0, word);
 }
@@ -1309,11 +1331,11 @@ static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
  * TX data initialization
  */
 static void rt73usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
-                                  unsigned int queue)
+                                  const unsigned int queue)
 {
         u32 reg;
 
-        if (queue != IEEE80211_TX_QUEUE_BEACON)
+        if (queue != RT2X00_BCN_QUEUE_BEACON)
                 return;
 
         /*
@@ -1324,6 +1346,8 @@ static void rt73usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
 
         rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
         if (!rt2x00_get_field32(reg, TXRX_CSR9_BEACON_GEN)) {
+                rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
+                rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
                 rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 1);
                 rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
         }
@@ -1353,7 +1377,7 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
                 return 0;
         }
 
-        if (rt2x00dev->rx_status.phymode == MODE_IEEE80211A) {
+        if (rt2x00dev->rx_status.band == IEEE80211_BAND_5GHZ) {
                 if (test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags)) {
                         if (lna == 3 || lna == 2)
                                 offset += 10;
@@ -1377,37 +1401,62 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
         return rt2x00_get_field32(rxd_w1, RXD_W1_RSSI_AGC) * 2 - offset;
 }
 
-static void rt73usb_fill_rxdone(struct data_entry *entry,
-                                struct rxdata_entry_desc *desc)
+static void rt73usb_fill_rxdone(struct queue_entry *entry,
+                                struct rxdone_entry_desc *rxdesc)
 {
-        struct skb_desc *skbdesc = get_skb_desc(entry->skb);
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
         __le32 *rxd = (__le32 *)entry->skb->data;
+        unsigned int offset = entry->queue->desc_size + 2;
         u32 word0;
         u32 word1;
 
+        /*
+         * Copy descriptor to the available headroom inside the skbuffer.
+         */
+        skb_push(entry->skb, offset);
+        memcpy(entry->skb->data, rxd, entry->queue->desc_size);
+        rxd = (__le32 *)entry->skb->data;
+
+        /*
+         * The descriptor is now aligned to 4 bytes and thus it is
+         * now safe to read it on all architectures.
+         */
         rt2x00_desc_read(rxd, 0, &word0);
         rt2x00_desc_read(rxd, 1, &word1);
 
-        desc->flags = 0;
+        rxdesc->flags = 0;
         if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
-                desc->flags |= RX_FLAG_FAILED_FCS_CRC;
+                rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
 
         /*
          * Obtain the status about this packet.
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
          */
-        desc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
-        desc->rssi = rt73usb_agc_to_rssi(entry->ring->rt2x00dev, word1);
-        desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
-        desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
-        desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
+        rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
+        rxdesc->rssi = rt73usb_agc_to_rssi(entry->queue->rt2x00dev, word1);
+        rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+
+        rxdesc->dev_flags = 0;
+        if (rt2x00_get_field32(word0, RXD_W0_OFDM))
+                rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
+        if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
+                rxdesc->dev_flags |= RXDONE_MY_BSS;
+
+        /*
+         * Adjust the skb memory window to the frame boundaries.
+         */
+        skb_pull(entry->skb, offset + entry->queue->desc_size);
+        skb_trim(entry->skb, rxdesc->size);
 
         /*
          * Set descriptor and data pointer.
          */
-        skbdesc->desc = entry->skb->data;
-        skbdesc->desc_len = entry->ring->desc_size;
-        skbdesc->data = entry->skb->data + entry->ring->desc_size;
-        skbdesc->data_len = desc->size;
+        skbdesc->data = entry->skb->data;
+        skbdesc->data_len = rxdesc->size;
+        skbdesc->desc = rxd;
+        skbdesc->desc_len = entry->queue->desc_size;
 }
 
 /*
@@ -1499,7 +1548,7 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_1, 0);
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_2, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_OFFSET_A, word);
-                EEPROM(rt2x00dev, "RSSI OFFSET BG: 0x%04x\n", word);
+                EEPROM(rt2x00dev, "RSSI OFFSET A: 0x%04x\n", word);
         } else {
                 value = rt2x00_get_field16(word, EEPROM_RSSI_OFFSET_A_1);
                 if (value < -10 || value > 10)
@@ -1577,33 +1626,60 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Store led settings, for correct led behaviour.
          */
+#ifdef CONFIG_RT73USB_LEDS
         rt2x00_eeprom_read(rt2x00dev, EEPROM_LED, &eeprom);
 
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_LED_MODE,
-                           rt2x00dev->led_mode);
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_0,
+        rt2x00dev->led_radio.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_radio.type = LED_TYPE_RADIO;
+        rt2x00dev->led_radio.led_dev.brightness_set =
+            rt73usb_brightness_set;
+        rt2x00dev->led_radio.led_dev.blink_set =
+            rt73usb_blink_set;
+        rt2x00dev->led_radio.flags = LED_INITIALIZED;
+
+        rt2x00dev->led_assoc.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_assoc.type = LED_TYPE_ASSOC;
+        rt2x00dev->led_assoc.led_dev.brightness_set =
+            rt73usb_brightness_set;
+        rt2x00dev->led_assoc.led_dev.blink_set =
+            rt73usb_blink_set;
+        rt2x00dev->led_assoc.flags = LED_INITIALIZED;
+
+        if (value == LED_MODE_SIGNAL_STRENGTH) {
+                rt2x00dev->led_qual.rt2x00dev = rt2x00dev;
+                rt2x00dev->led_radio.type = LED_TYPE_QUALITY;
+                rt2x00dev->led_qual.led_dev.brightness_set =
+                    rt73usb_brightness_set;
+                rt2x00dev->led_qual.led_dev.blink_set =
+                    rt73usb_blink_set;
+                rt2x00dev->led_qual.flags = LED_INITIALIZED;
+        }
+
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_LED_MODE, value);
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_0,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_0));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_1,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_1,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_1));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_2,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_2,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_2));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_3,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_3,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_3));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_GPIO_4,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_GPIO_4,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_GPIO_4));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_ACT,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_ACT,
                            rt2x00_get_field16(eeprom, EEPROM_LED_POLARITY_ACT));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_READY_BG,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_READY_BG,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_RDY_G));
-        rt2x00_set_field16(&rt2x00dev->led_reg, MCU_LEDCS_POLARITY_READY_A,
+        rt2x00_set_field16(&rt2x00dev->led_mcu_reg, MCU_LEDCS_POLARITY_READY_A,
                            rt2x00_get_field16(eeprom,
                                               EEPROM_LED_POLARITY_RDY_A));
+#endif /* CONFIG_RT73USB_LEDS */
 
         return 0;
 }
@@ -1759,7 +1835,7 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;
         rt2x00dev->hw->max_signal = MAX_SIGNAL;
         rt2x00dev->hw->max_rssi = MAX_RX_SSI;
-        rt2x00dev->hw->queues = 5;
+        rt2x00dev->hw->queues = 4;
 
         SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_usb(rt2x00dev)->dev);
         SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
@@ -1776,8 +1852,8 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize hw_mode information.
          */
-        spec->num_modes = 2;
-        spec->num_rates = 12;
+        spec->supported_bands = SUPPORT_BAND_2GHZ;
+        spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;
         spec->tx_power_a = NULL;
         spec->tx_power_bg = txpower;
         spec->tx_power_default = DEFAULT_TXPOWER;
@@ -1786,20 +1862,20 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                 spec->num_channels = ARRAY_SIZE(rf_vals_bg_2528);
                 spec->channels = rf_vals_bg_2528;
         } else if (rt2x00_rf(&rt2x00dev->chip, RF5226)) {
+                spec->supported_bands |= SUPPORT_BAND_5GHZ;
                 spec->num_channels = ARRAY_SIZE(rf_vals_5226);
                 spec->channels = rf_vals_5226;
         } else if (rt2x00_rf(&rt2x00dev->chip, RF2527)) {
                 spec->num_channels = 14;
                 spec->channels = rf_vals_5225_2527;
         } else if (rt2x00_rf(&rt2x00dev->chip, RF5225)) {
+                spec->supported_bands |= SUPPORT_BAND_5GHZ;
                 spec->num_channels = ARRAY_SIZE(rf_vals_5225_2527);
                 spec->channels = rf_vals_5225_2527;
         }
 
         if (rt2x00_rf(&rt2x00dev->chip, RF5225) ||
             rt2x00_rf(&rt2x00dev->chip, RF5226)) {
-                spec->num_modes = 3;
-
                 txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);
                 for (i = 0; i < 14; i++)
                         txpower[i] = TXPOWER_FROM_DEV(txpower[i]);
@@ -1829,9 +1905,10 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)
         rt73usb_probe_hw_mode(rt2x00dev);
 
         /*
-         * This device requires firmware
+         * This device requires firmware.
          */
         __set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);
+        __set_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -1844,79 +1921,6 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)
 /*
  * IEEE80211 stack callback functions.
  */
-static void rt73usb_configure_filter(struct ieee80211_hw *hw,
-                                     unsigned int changed_flags,
-                                     unsigned int *total_flags,
-                                     int mc_count,
-                                     struct dev_addr_list *mc_list)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-        u32 reg;
-
-        /*
-         * Mask off any flags we are going to ignore from
-         * the total_flags field.
-         */
-        *total_flags &=
-            FIF_ALLMULTI |
-            FIF_FCSFAIL |
-            FIF_PLCPFAIL |
-            FIF_CONTROL |
-            FIF_OTHER_BSS |
-            FIF_PROMISC_IN_BSS;
-
-        /*
-         * Apply some rules to the filters:
-         * - Some filters imply different filters to be set.
-         * - Some things we can't filter out at all.
-         * - Multicast filter seems to kill broadcast traffic so never use it.
-         */
-        *total_flags |= FIF_ALLMULTI;
-        if (*total_flags & FIF_OTHER_BSS ||
-            *total_flags & FIF_PROMISC_IN_BSS)
-                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-
-        /*
-         * Check if there is any work left for us.
-         */
-        if (rt2x00dev->packet_filter == *total_flags)
-                return;
-        rt2x00dev->packet_filter = *total_flags;
-
-        /*
-         * When in atomic context, reschedule and let rt2x00lib
-         * call this function again.
-         */
-        if (in_atomic()) {
-                queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
-                return;
-        }
-
-        /*
-         * Start configuration steps.
-         * Note that the version error will always be dropped
-         * and broadcast frames will always be accepted since
-         * there is no filter for it at this time.
-         */
-        rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC,
-                           !(*total_flags & FIF_FCSFAIL));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL,
-                           !(*total_flags & FIF_PLCPFAIL));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
-                           !(*total_flags & FIF_CONTROL));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
-                           !(*total_flags & FIF_PROMISC_IN_BSS));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
-                           !(*total_flags & FIF_ALLMULTI));
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_BROADCAST, 0);
-        rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS, 1);
-        rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
-}
-
 static int rt73usb_set_retry_limit(struct ieee80211_hw *hw,
                                    u32 short_retry, u32 long_retry)
 {
@@ -1955,61 +1959,65 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw)
 #define rt73usb_get_tsf NULL
 #endif
 
-static void rt73usb_reset_tsf(struct ieee80211_hw *hw)
-{
-        struct rt2x00_dev *rt2x00dev = hw->priv;
-
-        rt73usb_register_write(rt2x00dev, TXRX_CSR12, 0);
-        rt73usb_register_write(rt2x00dev, TXRX_CSR13, 0);
-}
-
 static int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
-                          struct ieee80211_tx_control *control)
+                                 struct ieee80211_tx_control *control)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct skb_desc *desc;
-        struct data_ring *ring;
-        struct data_entry *entry;
-        int timeout;
+        struct rt2x00_intf *intf = vif_to_intf(control->vif);
+        struct skb_frame_desc *skbdesc;
+        unsigned int beacon_base;
+        unsigned int timeout;
+        u32 reg;
 
-        /*
-         * Just in case the ieee80211 doesn't set this,
-         * but we need this queue set for the descriptor
-         * initialization.
-         */
-        control->queue = IEEE80211_TX_QUEUE_BEACON;
-        ring = rt2x00lib_get_ring(rt2x00dev, control->queue);
-        entry = rt2x00_get_data_entry(ring);
+        if (unlikely(!intf->beacon))
+                return -ENOBUFS;
 
         /*
          * Add the descriptor in front of the skb.
          */
-        skb_push(skb, ring->desc_size);
-        memset(skb->data, 0, ring->desc_size);
+        skb_push(skb, intf->beacon->queue->desc_size);
+        memset(skb->data, 0, intf->beacon->queue->desc_size);
 
         /*
          * Fill in skb descriptor
          */
-        desc = get_skb_desc(skb);
-        desc->desc_len = ring->desc_size;
-        desc->data_len = skb->len - ring->desc_size;
-        desc->desc = skb->data;
-        desc->data = skb->data + ring->desc_size;
-        desc->ring = ring;
-        desc->entry = entry;
+        skbdesc = get_skb_frame_desc(skb);
+        memset(skbdesc, 0, sizeof(*skbdesc));
+        skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
+        skbdesc->data = skb->data + intf->beacon->queue->desc_size;
+        skbdesc->data_len = skb->len - intf->beacon->queue->desc_size;
+        skbdesc->desc = skb->data;
+        skbdesc->desc_len = intf->beacon->queue->desc_size;
+        skbdesc->entry = intf->beacon;
 
+        /*
+         * Disable beaconing while we are reloading the beacon data,
+         * otherwise we might be sending out invalid data.
+         */
+        rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
+        rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
+
+        /*
+         * mac80211 doesn't provide the control->queue variable
+         * for beacons. Set our own queue identification so
+         * it can be used during descriptor initialization.
+         */
+        control->queue = RT2X00_BCN_QUEUE_BEACON;
         rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
 
         /*
          * Write entire beacon with descriptor to register,
          * and kick the beacon generator.
          */
+        beacon_base = HW_BEACON_OFFSET(intf->beacon->entry_idx);
         timeout = REGISTER_TIMEOUT * (skb->len / sizeof(u32));
         rt2x00usb_vendor_request(rt2x00dev, USB_MULTI_WRITE,
-                                 USB_VENDOR_REQUEST_OUT,
-                                 HW_BEACON_BASE0, 0x0000,
+                                 USB_VENDOR_REQUEST_OUT, beacon_base, 0,
                                  skb->data, skb->len, timeout);
-        rt73usb_kick_tx_queue(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
+        rt73usb_kick_tx_queue(rt2x00dev, control->queue);
 
         return 0;
 }
@@ -2022,20 +2030,20 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .config_interface       = rt2x00mac_config_interface,
-        .configure_filter       = rt73usb_configure_filter,
+        .configure_filter       = rt2x00mac_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt73usb_set_retry_limit,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt73usb_get_tsf,
-        .reset_tsf              = rt73usb_reset_tsf,
         .beacon_update          = rt73usb_beacon_update,
 };
 
 static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {
         .probe_hw               = rt73usb_probe_hw,
         .get_firmware_name      = rt73usb_get_firmware_name,
+        .get_firmware_crc       = rt73usb_get_firmware_crc,
         .load_firmware          = rt73usb_load_firmware,
         .initialize             = rt2x00usb_initialize,
         .uninitialize           = rt2x00usb_uninitialize,
@@ -2050,19 +2058,42 @@ static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {
         .get_tx_data_len        = rt73usb_get_tx_data_len,
         .kick_tx_queue          = rt73usb_kick_tx_queue,
         .fill_rxdone            = rt73usb_fill_rxdone,
-        .config_mac_addr        = rt73usb_config_mac_addr,
-        .config_bssid           = rt73usb_config_bssid,
-        .config_type            = rt73usb_config_type,
-        .config_preamble        = rt73usb_config_preamble,
+        .config_filter          = rt73usb_config_filter,
+        .config_intf            = rt73usb_config_intf,
+        .config_erp             = rt73usb_config_erp,
         .config                 = rt73usb_config,
 };
 
+static const struct data_queue_desc rt73usb_queue_rx = {
+        .entry_num              = RX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = RXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_usb_rx),
+};
+
+static const struct data_queue_desc rt73usb_queue_tx = {
+        .entry_num              = TX_ENTRIES,
+        .data_size              = DATA_FRAME_SIZE,
+        .desc_size              = TXD_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_usb_tx),
+};
+
+static const struct data_queue_desc rt73usb_queue_bcn = {
+        .entry_num              = 4 * BEACON_ENTRIES,
+        .data_size              = MGMT_FRAME_SIZE,
+        .desc_size              = TXINFO_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_usb_tx),
+};
+
 static const struct rt2x00_ops rt73usb_ops = {
         .name           = KBUILD_MODNAME,
-        .rxd_size       = RXD_DESC_SIZE,
-        .txd_size       = TXD_DESC_SIZE,
+        .max_sta_intf   = 1,
+        .max_ap_intf    = 4,
         .eeprom_size    = EEPROM_SIZE,
         .rf_size        = RF_SIZE,
+        .rx             = &rt73usb_queue_rx,
+        .tx             = &rt73usb_queue_tx,
+        .bcn            = &rt73usb_queue_bcn,
         .lib            = &rt73usb_rt2x00_ops,
         .hw             = &rt73usb_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h
index d49dcaacecee..06d687425fef 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.h
+++ b/drivers/net/wireless/rt2x00/rt73usb.h
@@ -1,5 +1,5 @@
 /*
-        Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
         <http://rt2x00.serialmonkey.com>
 
         This program is free software; you can redistribute it and/or modify
@@ -114,6 +114,9 @@ struct hw_pairwise_ta_entry {
 #define HW_BEACON_BASE2                 0x2600
 #define HW_BEACON_BASE3                 0x2700
 
+#define HW_BEACON_OFFSET(__index) \
+        ( HW_BEACON_BASE0 + (__index * 0x0100) )
+
 /*
  * MAC Control/Status Registers(CSR).
  * Some values are set in TU, whereas 1 TU == 1024 us.
@@ -146,6 +149,11 @@ struct hw_pairwise_ta_entry {
 
 /*
  * MAC_CSR3: STA MAC register 1.
+ * UNICAST_TO_ME_MASK:
+ *      Used to mask off bits from byte 5 of the MAC address
+ *      to determine the UNICAST_TO_ME bit for RX frames.
+ *      The full mask is complemented by BSS_ID_MASK:
+ *              MASK = BSS_ID_MASK & UNICAST_TO_ME_MASK
  */
 #define MAC_CSR3                        0x300c
 #define MAC_CSR3_BYTE4                  FIELD32(0x000000ff)
@@ -163,7 +171,14 @@ struct hw_pairwise_ta_entry {
 
 /*
  * MAC_CSR5: BSSID register 1.
- * BSS_ID_MASK: 3: one BSSID, 0: 4 BSSID, 2 or 1: 2 BSSID.
+ * BSS_ID_MASK:
+ *      This mask is used to mask off bits 0 and 1 of byte 5 of the
+ *      BSSID. This will make sure that those bits will be ignored
+ *      when determining the MY_BSS of RX frames.
+ *              0: 1-BSSID mode (BSS index = 0)
+ *              1: 2-BSSID mode (BSS index: Byte5, bit 0)
+ *              2: 2-BSSID mode (BSS index: byte5, bit 1)
+ *              3: 4-BSSID mode (BSS index: byte5, bit 0 - 1)
  */
 #define MAC_CSR5                        0x3014
 #define MAC_CSR5_BYTE4                  FIELD32(0x000000ff)
@@ -867,6 +882,7 @@ struct hw_pairwise_ta_entry {
  * DMA descriptor defines.
  */
 #define TXD_DESC_SIZE                   ( 6 * sizeof(__le32) )
+#define TXINFO_SIZE                     ( 6 * sizeof(__le32) )
 #define RXD_DESC_SIZE                   ( 6 * sizeof(__le32) )
 
 /*
@@ -1007,8 +1023,8 @@ struct hw_pairwise_ta_entry {
 #define RXD_W5_RESERVED                 FIELD32(0xffffffff)
 
 /*
- * Macro's for converting txpower from EEPROM to dscape value
- * and from dscape value to register value.
+ * Macro's for converting txpower from EEPROM to mac80211 value
+ * and from mac80211 value to register value.
  */
 #define MIN_TXPOWER     0
 #define MAX_TXPOWER     31
diff --git a/drivers/net/wireless/rtl8180.h b/drivers/net/wireless/rtl8180.h
index 2cbfe3c8081f..082a11f93beb 100644
--- a/drivers/net/wireless/rtl8180.h
+++ b/drivers/net/wireless/rtl8180.h
@@ -102,7 +102,7 @@ struct rtl8180_priv {
         struct rtl8180_tx_ring tx_ring[4];
         struct ieee80211_channel channels[14];
         struct ieee80211_rate rates[12];
-        struct ieee80211_hw_mode modes[2];
+        struct ieee80211_supported_band band;
         struct pci_dev *pdev;
         u32 rx_conf;
 
diff --git a/drivers/net/wireless/rtl8180_dev.c b/drivers/net/wireless/rtl8180_dev.c
index 5e9a8ace0d81..c181f23e930d 100644
--- a/drivers/net/wireless/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl8180_dev.c
@@ -49,6 +49,41 @@ static struct pci_device_id rtl8180_table[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(pci, rtl8180_table);
 
+static const struct ieee80211_rate rtl818x_rates[] = {
+        { .bitrate = 10, .hw_value = 0, },
+        { .bitrate = 20, .hw_value = 1, },
+        { .bitrate = 55, .hw_value = 2, },
+        { .bitrate = 110, .hw_value = 3, },
+        { .bitrate = 60, .hw_value = 4, },
+        { .bitrate = 90, .hw_value = 5, },
+        { .bitrate = 120, .hw_value = 6, },
+        { .bitrate = 180, .hw_value = 7, },
+        { .bitrate = 240, .hw_value = 8, },
+        { .bitrate = 360, .hw_value = 9, },
+        { .bitrate = 480, .hw_value = 10, },
+        { .bitrate = 540, .hw_value = 11, },
+};
+
+static const struct ieee80211_channel rtl818x_channels[] = {
+        { .center_freq = 2412 },
+        { .center_freq = 2417 },
+        { .center_freq = 2422 },
+        { .center_freq = 2427 },
+        { .center_freq = 2432 },
+        { .center_freq = 2437 },
+        { .center_freq = 2442 },
+        { .center_freq = 2447 },
+        { .center_freq = 2452 },
+        { .center_freq = 2457 },
+        { .center_freq = 2462 },
+        { .center_freq = 2467 },
+        { .center_freq = 2472 },
+        { .center_freq = 2484 },
+};
+
+
+
+
 void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data)
 {
         struct rtl8180_priv *priv = dev->priv;
@@ -99,10 +134,10 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
                         /* TODO: improve signal/rssi reporting */
                         rx_status.signal = flags2 & 0xFF;
                         rx_status.ssi = (flags2 >> 8) & 0x7F;
-                        rx_status.rate = (flags >> 20) & 0xF;
-                        rx_status.freq = dev->conf.freq;
-                        rx_status.channel = dev->conf.channel;
-                        rx_status.phymode = dev->conf.phymode;
+                        /* XXX: is this correct? */
+                        rx_status.rate_idx = (flags >> 20) & 0xF;
+                        rx_status.freq = dev->conf.channel->center_freq;
+                        rx_status.band = dev->conf.channel->band;
                         rx_status.mactime = le64_to_cpu(entry->tsft);
                         rx_status.flag |= RX_FLAG_TSFT;
                         if (flags & RTL8180_RX_DESC_FLAG_CRC32_ERR)
@@ -222,18 +257,25 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
         mapping = pci_map_single(priv->pdev, skb->data,
                                  skb->len, PCI_DMA_TODEVICE);
 
+        BUG_ON(!control->tx_rate);
+
         tx_flags = RTL8180_TX_DESC_FLAG_OWN | RTL8180_TX_DESC_FLAG_FS |
-                   RTL8180_TX_DESC_FLAG_LS | (control->tx_rate << 24) |
-                   (control->rts_cts_rate << 19) | skb->len;
+                   RTL8180_TX_DESC_FLAG_LS |
+                   (control->tx_rate->hw_value << 24) | skb->len;
 
         if (priv->r8185)
                 tx_flags |= RTL8180_TX_DESC_FLAG_DMA |
                             RTL8180_TX_DESC_FLAG_NO_ENC;
 
-        if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS)
+        if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
+                BUG_ON(!control->rts_cts_rate);
                 tx_flags |= RTL8180_TX_DESC_FLAG_RTS;
-        else if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+                tx_flags |= control->rts_cts_rate->hw_value << 19;
+        } else if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) {
+                BUG_ON(!control->rts_cts_rate);
                 tx_flags |= RTL8180_TX_DESC_FLAG_CTS;
+                tx_flags |= control->rts_cts_rate->hw_value << 19;
+        }
 
         *((struct ieee80211_tx_control **) skb->cb) =
                 kmemdup(control, sizeof(*control), GFP_ATOMIC);
@@ -246,9 +288,9 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
                 unsigned int remainder;
 
                 plcp_len = DIV_ROUND_UP(16 * (skb->len + 4),
-                                        (control->rate->rate * 2) / 10);
+                                        (control->tx_rate->bitrate * 2) / 10);
                 remainder = (16 * (skb->len + 4)) %
-                            ((control->rate->rate * 2) / 10);
+                            ((control->tx_rate->bitrate * 2) / 10);
                 if (remainder > 0 && remainder <= 6)
                         plcp_len |= 1 << 15;
         }
@@ -261,8 +303,8 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
         entry->plcp_len = cpu_to_le16(plcp_len);
         entry->tx_buf = cpu_to_le32(mapping);
         entry->frame_len = cpu_to_le32(skb->len);
-        entry->flags2 = control->alt_retry_rate != -1 ?
-                        control->alt_retry_rate << 4 : 0;
+        entry->flags2 = control->alt_retry_rate != NULL ?
+                        control->alt_retry_rate->bitrate << 4 : 0;
         entry->retry_limit = control->retry_limit;
         entry->flags = cpu_to_le32(tx_flags);
         __skb_queue_tail(&ring->queue, skb);
@@ -646,9 +688,9 @@ static int rtl8180_add_interface(struct ieee80211_hw *dev,
 
         rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
         rtl818x_iowrite32(priv, (__le32 __iomem *)&priv->map->MAC[0],
-                          cpu_to_le32(*(u32 *)conf->mac_addr));
+                          le32_to_cpu(*(__le32 *)conf->mac_addr));
         rtl818x_iowrite16(priv, (__le16 __iomem *)&priv->map->MAC[4],
-                          cpu_to_le16(*(u16 *)(conf->mac_addr + 4)));
+                          le16_to_cpu(*(__le16 *)(conf->mac_addr + 4)));
         rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
 
         return 0;
@@ -838,19 +880,19 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
                 goto err_free_dev;
         }
 
+        BUILD_BUG_ON(sizeof(priv->channels) != sizeof(rtl818x_channels));
+        BUILD_BUG_ON(sizeof(priv->rates) != sizeof(rtl818x_rates));
+
         memcpy(priv->channels, rtl818x_channels, sizeof(rtl818x_channels));
         memcpy(priv->rates, rtl818x_rates, sizeof(rtl818x_rates));
-        priv->modes[0].mode = MODE_IEEE80211G;
-        priv->modes[0].num_rates = ARRAY_SIZE(rtl818x_rates);
-        priv->modes[0].rates = priv->rates;
-        priv->modes[0].num_channels = ARRAY_SIZE(rtl818x_channels);
-        priv->modes[0].channels = priv->channels;
-        priv->modes[1].mode = MODE_IEEE80211B;
-        priv->modes[1].num_rates = 4;
-        priv->modes[1].rates = priv->rates;
-        priv->modes[1].num_channels = ARRAY_SIZE(rtl818x_channels);
-        priv->modes[1].channels = priv->channels;
-        priv->mode = IEEE80211_IF_TYPE_INVALID;
+
+        priv->band.band = IEEE80211_BAND_2GHZ;
+        priv->band.channels = priv->channels;
+        priv->band.n_channels = ARRAY_SIZE(rtl818x_channels);
+        priv->band.bitrates = priv->rates;
+        priv->band.n_bitrates = 4;
+        dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
+
         dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
                      IEEE80211_HW_RX_INCLUDES_FCS;
         dev->queues = 1;
@@ -879,15 +921,10 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
 
         priv->r8185 = reg & RTL818X_TX_CONF_R8185_ABC;
         if (priv->r8185) {
-                if ((err = ieee80211_register_hwmode(dev, &priv->modes[0])))
-                        goto err_iounmap;
-
+                priv->band.n_bitrates = ARRAY_SIZE(rtl818x_rates);
                 pci_try_set_mwi(pdev);
         }
 
-        if ((err = ieee80211_register_hwmode(dev, &priv->modes[1])))
-                goto err_iounmap;
-
         eeprom.data = dev;
         eeprom.register_read = rtl8180_eeprom_register_read;
         eeprom.register_write = rtl8180_eeprom_register_write;
@@ -950,8 +987,8 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
         for (i = 0; i < 14; i += 2) {
                 u16 txpwr;
                 eeprom_93cx6_read(&eeprom, 0x10 + (i >> 1), &txpwr);
-                priv->channels[i].val = txpwr & 0xFF;
-                priv->channels[i + 1].val = txpwr >> 8;
+                priv->channels[i].hw_value = txpwr & 0xFF;
+                priv->channels[i + 1].hw_value = txpwr >> 8;
         }
 
         /* OFDM TX power */
@@ -959,8 +996,8 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
                 for (i = 0; i < 14; i += 2) {
                         u16 txpwr;
                         eeprom_93cx6_read(&eeprom, 0x20 + (i >> 1), &txpwr);
-                        priv->channels[i].val |= (txpwr & 0xFF) << 8;
-                        priv->channels[i + 1].val |= txpwr & 0xFF00;
+                        priv->channels[i].hw_value |= (txpwr & 0xFF) << 8;
+                        priv->channels[i + 1].hw_value |= txpwr & 0xFF00;
                 }
         }
 
diff --git a/drivers/net/wireless/rtl8180_grf5101.c b/drivers/net/wireless/rtl8180_grf5101.c
index 8293e19c4c59..5d47935dbac3 100644
--- a/drivers/net/wireless/rtl8180_grf5101.c
+++ b/drivers/net/wireless/rtl8180_grf5101.c
@@ -73,8 +73,9 @@ static void grf5101_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
         struct rtl8180_priv *priv = dev->priv;
-        u32 txpw = priv->channels[conf->channel - 1].val & 0xFF;
-        u32 chan = conf->channel - 1;
+        int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        u32 txpw = priv->channels[channel - 1].hw_value & 0xFF;
+        u32 chan = channel - 1;
 
         /* set TX power */
         write_grf5101(dev, 0x15, 0x0);
diff --git a/drivers/net/wireless/rtl8180_max2820.c b/drivers/net/wireless/rtl8180_max2820.c
index 98fe9fd64968..a34dfd382b6d 100644
--- a/drivers/net/wireless/rtl8180_max2820.c
+++ b/drivers/net/wireless/rtl8180_max2820.c
@@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
         struct rtl8180_priv *priv = dev->priv;
-        unsigned int chan_idx = conf ? conf->channel - 1 : 0;
-        u32 txpw = priv->channels[chan_idx].val & 0xFF;
+        int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        unsigned int chan_idx = channel - 1;
+        u32 txpw = priv->channels[chan_idx].hw_value & 0xFF;
         u32 chan = max2820_chan[chan_idx];
 
         /* While philips SA2400 drive the PA bias from
diff --git a/drivers/net/wireless/rtl8180_rtl8225.c b/drivers/net/wireless/rtl8180_rtl8225.c
index ef3832bee85c..cd22781728a9 100644
--- a/drivers/net/wireless/rtl8180_rtl8225.c
+++ b/drivers/net/wireless/rtl8180_rtl8225.c
@@ -261,8 +261,8 @@ static void rtl8225_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
         u32 reg;
         int i;
 
-        cck_power = priv->channels[channel - 1].val & 0xFF;
-        ofdm_power = priv->channels[channel - 1].val >> 8;
+        cck_power = priv->channels[channel - 1].hw_value & 0xFF;
+        ofdm_power = priv->channels[channel - 1].hw_value >> 8;
 
         cck_power = min(cck_power, (u8)35);
         ofdm_power = min(ofdm_power, (u8)35);
@@ -476,8 +476,8 @@ static void rtl8225z2_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
         const u8 *tmp;
         int i;
 
-        cck_power = priv->channels[channel - 1].val & 0xFF;
-        ofdm_power = priv->channels[channel - 1].val >> 8;
+        cck_power = priv->channels[channel - 1].hw_value & 0xFF;
+        ofdm_power = priv->channels[channel - 1].hw_value >> 8;
 
         if (channel == 14)
                 tmp = rtl8225z2_tx_power_cck_ch14;
@@ -716,13 +716,14 @@ static void rtl8225_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
         struct rtl8180_priv *priv = dev->priv;
+        int chan = ieee80211_frequency_to_channel(conf->channel->center_freq);
 
         if (priv->rf->init == rtl8225_rf_init)
-                rtl8225_rf_set_tx_power(dev, conf->channel);
+                rtl8225_rf_set_tx_power(dev, chan);
         else
-                rtl8225z2_rf_set_tx_power(dev, conf->channel);
+                rtl8225z2_rf_set_tx_power(dev, chan);
 
-        rtl8225_write(dev, 0x7, rtl8225_chan[conf->channel - 1]);
+        rtl8225_write(dev, 0x7, rtl8225_chan[chan - 1]);
         msleep(10);
 
         if (conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME) {
diff --git a/drivers/net/wireless/rtl8180_sa2400.c b/drivers/net/wireless/rtl8180_sa2400.c
index e08ace7b1cb7..0311b4ea124c 100644
--- a/drivers/net/wireless/rtl8180_sa2400.c
+++ b/drivers/net/wireless/rtl8180_sa2400.c
@@ -80,8 +80,9 @@ static void sa2400_rf_set_channel(struct ieee80211_hw *dev,
                                   struct ieee80211_conf *conf)
 {
         struct rtl8180_priv *priv = dev->priv;
-        u32 txpw = priv->channels[conf->channel - 1].val & 0xFF;
-        u32 chan = sa2400_chan[conf->channel - 1];
+        int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        u32 txpw = priv->channels[channel - 1].hw_value & 0xFF;
+        u32 chan = sa2400_chan[channel - 1];
 
         write_sa2400(dev, 7, txpw);
 
diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
index 8680a0b6433c..076d88b6db0e 100644
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -71,7 +71,7 @@ struct rtl8187_priv {
         /* rtl8187 specific */
         struct ieee80211_channel channels[14];
         struct ieee80211_rate rates[12];
-        struct ieee80211_hw_mode modes[2];
+        struct ieee80211_supported_band band;
         struct usb_device *udev;
         u32 rx_conf;
         u16 txpwr_base;
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 133b3f39eeb6..d5787b37e1fb 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -45,6 +45,38 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(usb, rtl8187_table);
 
+static const struct ieee80211_rate rtl818x_rates[] = {
+        { .bitrate = 10, .hw_value = 0, },
+        { .bitrate = 20, .hw_value = 1, },
+        { .bitrate = 55, .hw_value = 2, },
+        { .bitrate = 110, .hw_value = 3, },
+        { .bitrate = 60, .hw_value = 4, },
+        { .bitrate = 90, .hw_value = 5, },
+        { .bitrate = 120, .hw_value = 6, },
+        { .bitrate = 180, .hw_value = 7, },
+        { .bitrate = 240, .hw_value = 8, },
+        { .bitrate = 360, .hw_value = 9, },
+        { .bitrate = 480, .hw_value = 10, },
+        { .bitrate = 540, .hw_value = 11, },
+};
+
+static const struct ieee80211_channel rtl818x_channels[] = {
+        { .center_freq = 2412 },
+        { .center_freq = 2417 },
+        { .center_freq = 2422 },
+        { .center_freq = 2427 },
+        { .center_freq = 2432 },
+        { .center_freq = 2437 },
+        { .center_freq = 2442 },
+        { .center_freq = 2447 },
+        { .center_freq = 2452 },
+        { .center_freq = 2457 },
+        { .center_freq = 2462 },
+        { .center_freq = 2467 },
+        { .center_freq = 2472 },
+        { .center_freq = 2484 },
+};
+
 static void rtl8187_iowrite_async_cb(struct urb *urb)
 {
         kfree(urb->context);
@@ -146,17 +178,23 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
 
         flags = skb->len;
         flags |= RTL8187_TX_FLAG_NO_ENCRYPT;
-        flags |= control->rts_cts_rate << 19;
-        flags |= control->tx_rate << 24;
+
+        BUG_ON(!control->tx_rate);
+
+        flags |= control->tx_rate->hw_value << 24;
         if (ieee80211_get_morefrag((struct ieee80211_hdr *)skb->data))
                 flags |= RTL8187_TX_FLAG_MORE_FRAG;
         if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
+                BUG_ON(!control->rts_cts_rate);
                 flags |= RTL8187_TX_FLAG_RTS;
+                flags |= control->rts_cts_rate->hw_value << 19;
                 rts_dur = ieee80211_rts_duration(dev, priv->vif,
                                                  skb->len, control);
-        }
-        if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+        } else if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) {
+                BUG_ON(!control->rts_cts_rate);
                 flags |= RTL8187_TX_FLAG_CTS;
+                flags |= control->rts_cts_rate->hw_value << 19;
+        }
 
         hdr = (struct rtl8187_tx_hdr *)skb_push(skb, sizeof(*hdr));
         hdr->flags = cpu_to_le32(flags);
@@ -225,10 +263,9 @@ static void rtl8187_rx_cb(struct urb *urb)
         rx_status.antenna = (hdr->signal >> 7) & 1;
         rx_status.signal = 64 - min(hdr->noise, (u8)64);
         rx_status.ssi = signal;
-        rx_status.rate = rate;
-        rx_status.freq = dev->conf.freq;
-        rx_status.channel = dev->conf.channel;
-        rx_status.phymode = dev->conf.phymode;
+        rx_status.rate_idx = rate;
+        rx_status.freq = dev->conf.channel->center_freq;
+        rx_status.band = dev->conf.channel->band;
         rx_status.mactime = le64_to_cpu(hdr->mac_time);
         rx_status.flag |= RX_FLAG_TSFT;
         if (flags & (1 << 13))
@@ -685,19 +722,22 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         usb_get_dev(udev);
 
         skb_queue_head_init(&priv->rx_queue);
+
+        BUILD_BUG_ON(sizeof(priv->channels) != sizeof(rtl818x_channels));
+        BUILD_BUG_ON(sizeof(priv->rates) != sizeof(rtl818x_rates));
+
         memcpy(priv->channels, rtl818x_channels, sizeof(rtl818x_channels));
         memcpy(priv->rates, rtl818x_rates, sizeof(rtl818x_rates));
         priv->map = (struct rtl818x_csr *)0xFF00;
-        priv->modes[0].mode = MODE_IEEE80211G;
-        priv->modes[0].num_rates = ARRAY_SIZE(rtl818x_rates);
-        priv->modes[0].rates = priv->rates;
-        priv->modes[0].num_channels = ARRAY_SIZE(rtl818x_channels);
-        priv->modes[0].channels = priv->channels;
-        priv->modes[1].mode = MODE_IEEE80211B;
-        priv->modes[1].num_rates = 4;
-        priv->modes[1].rates = priv->rates;
-        priv->modes[1].num_channels = ARRAY_SIZE(rtl818x_channels);
-        priv->modes[1].channels = priv->channels;
+
+        priv->band.band = IEEE80211_BAND_2GHZ;
+        priv->band.channels = priv->channels;
+        priv->band.n_channels = ARRAY_SIZE(rtl818x_channels);
+        priv->band.bitrates = priv->rates;
+        priv->band.n_bitrates = ARRAY_SIZE(rtl818x_rates);
+        dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
+
+
         priv->mode = IEEE80211_IF_TYPE_MNTR;
         dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
                      IEEE80211_HW_RX_INCLUDES_FCS;
@@ -706,10 +746,6 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         dev->max_rssi = 65;
         dev->max_signal = 64;
 
-        for (i = 0; i < 2; i++)
-                if ((err = ieee80211_register_hwmode(dev, &priv->modes[i])))
-                        goto err_free_dev;
-
         eeprom.data = dev;
         eeprom.register_read = rtl8187_eeprom_register_read;
         eeprom.register_write = rtl8187_eeprom_register_write;
@@ -733,20 +769,20 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         for (i = 0; i < 3; i++) {
                 eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_CHAN_1 + i,
                                   &txpwr);
-                (*channel++).val = txpwr & 0xFF;
-                (*channel++).val = txpwr >> 8;
+                (*channel++).hw_value = txpwr & 0xFF;
+                (*channel++).hw_value = txpwr >> 8;
         }
         for (i = 0; i < 2; i++) {
                 eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_CHAN_4 + i,
                                   &txpwr);
-                (*channel++).val = txpwr & 0xFF;
-                (*channel++).val = txpwr >> 8;
+                (*channel++).hw_value = txpwr & 0xFF;
+                (*channel++).hw_value = txpwr >> 8;
         }
         for (i = 0; i < 2; i++) {
                 eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_CHAN_6 + i,
                                   &txpwr);
-                (*channel++).val = txpwr & 0xFF;
-                (*channel++).val = txpwr >> 8;
+                (*channel++).hw_value = txpwr & 0xFF;
+                (*channel++).hw_value = txpwr >> 8;
         }
 
         eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_BASE,
diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl8187_rtl8225.c
index b713de17ba0a..9146387b4c5e 100644
--- a/drivers/net/wireless/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl8187_rtl8225.c
@@ -283,8 +283,8 @@ static void rtl8225_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
         u32 reg;
         int i;
 
-        cck_power = priv->channels[channel - 1].val & 0xF;
-        ofdm_power = priv->channels[channel - 1].val >> 4;
+        cck_power = priv->channels[channel - 1].hw_value & 0xF;
+        ofdm_power = priv->channels[channel - 1].hw_value >> 4;
 
         cck_power = min(cck_power, (u8)11);
         ofdm_power = min(ofdm_power, (u8)35);
@@ -500,8 +500,8 @@ static void rtl8225z2_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
         u32 reg;
         int i;
 
-        cck_power = priv->channels[channel - 1].val & 0xF;
-        ofdm_power = priv->channels[channel - 1].val >> 4;
+        cck_power = priv->channels[channel - 1].hw_value & 0xF;
+        ofdm_power = priv->channels[channel - 1].hw_value >> 4;
 
         cck_power = min(cck_power, (u8)15);
         cck_power += priv->txpwr_base & 0xF;
@@ -735,13 +735,14 @@ static void rtl8225_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
         struct rtl8187_priv *priv = dev->priv;
+        int chan = ieee80211_frequency_to_channel(conf->channel->center_freq);
 
         if (priv->rf->init == rtl8225_rf_init)
-                rtl8225_rf_set_tx_power(dev, conf->channel);
+                rtl8225_rf_set_tx_power(dev, chan);
         else
-                rtl8225z2_rf_set_tx_power(dev, conf->channel);
+                rtl8225z2_rf_set_tx_power(dev, chan);
 
-        rtl8225_write(dev, 0x7, rtl8225_chan[conf->channel - 1]);
+        rtl8225_write(dev, 0x7, rtl8225_chan[chan - 1]);
         msleep(10);
 }
 
diff --git a/drivers/net/wireless/rtl818x.h b/drivers/net/wireless/rtl818x.h
index 1e7d6f8278d7..4f7d38f506eb 100644
--- a/drivers/net/wireless/rtl818x.h
+++ b/drivers/net/wireless/rtl818x.h
@@ -175,74 +175,4 @@ struct rtl818x_rf_ops {
         void (*set_chan)(struct ieee80211_hw *, struct ieee80211_conf *);
 };
 
-static const struct ieee80211_rate rtl818x_rates[] = {
-        { .rate = 10,
-          .val = 0,
-          .flags = IEEE80211_RATE_CCK },
-        { .rate = 20,
-          .val = 1,
-          .flags = IEEE80211_RATE_CCK },
-        { .rate = 55,
-          .val = 2,
-          .flags = IEEE80211_RATE_CCK },
-        { .rate = 110,
-          .val = 3,
-          .flags = IEEE80211_RATE_CCK },
-        { .rate = 60,
-          .val = 4,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 90,
-          .val = 5,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 120,
-          .val = 6,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 180,
-          .val = 7,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 240,
-          .val = 8,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 360,
-          .val = 9,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 480,
-          .val = 10,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 540,
-          .val = 11,
-          .flags = IEEE80211_RATE_OFDM },
-};
-
-static const struct ieee80211_channel rtl818x_channels[] = {
-        { .chan = 1,
-          .freq = 2412},
-        { .chan = 2,
-          .freq = 2417},
-        { .chan = 3,
-          .freq = 2422},
-        { .chan = 4,
-          .freq = 2427},
-        { .chan = 5,
-          .freq = 2432},
-        { .chan = 6,
-          .freq = 2437},
-        { .chan = 7,
-          .freq = 2442},
-        { .chan = 8,
-          .freq = 2447},
-        { .chan = 9,
-          .freq = 2452},
-        { .chan = 10,
-          .freq = 2457},
-        { .chan = 11,
-          .freq = 2462},
-        { .chan = 12,
-          .freq = 2467},
-        { .chan = 13,
-          .freq = 2472},
-        { .chan = 14,
-          .freq = 2484}
-};
-
 #endif /* RTL818X_H */
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 88efe1bae58f..bced3fe1cf8a 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -962,12 +962,12 @@ static char *time_delta(char buffer[], long time)
 /* get Nth element of the linked list */
 static struct strip *strip_get_idx(loff_t pos) 
 {
-        struct list_head *l;
+        struct strip *str;
         int i = 0;
 
-        list_for_each_rcu(l, &strip_list) {
+        list_for_each_entry_rcu(str, &strip_list, list) {
                 if (pos == i)
-                        return list_entry(l, struct strip, list);
+                        return str;
                 ++i;
         }
         return NULL;
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 06eea6ab7bf0..baf74015751c 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -102,7 +102,7 @@ hacr_write(u_long	base,
  * Write to card's Host Adapter Command Register. Include a delay for
  * those times when it is needed.
  */
-static inline void
+static void
 hacr_write_slow(u_long  base,
                 u_char  hacr)
 {
@@ -255,7 +255,7 @@ update_psa_checksum(struct net_device *	dev)
 /*
  * Write 1 byte to the MMC.
  */
-static inline void
+static void
 mmc_out(u_long          base,
         u_short         o,
         u_char          d)
@@ -275,7 +275,7 @@ mmc_out(u_long		base,
  * Routine to write bytes to the Modem Management Controller.
  * We start by the end because it is the way it should be !
  */
-static inline void
+static void
 mmc_write(u_long        base,
           u_char        o,
           u_char *      b,
@@ -293,7 +293,7 @@ mmc_write(u_long	base,
  * Read 1 byte from the MMC.
  * Optimised version for 1 byte, avoid using memory...
  */
-static inline u_char
+static u_char
 mmc_in(u_long   base,
        u_short  o)
 {
@@ -318,7 +318,7 @@ mmc_in(u_long	base,
  * (code has just been moved in the above function)
  * We start by the end because it is the way it should be !
  */
-static inline void
+static void
 mmc_read(u_long         base,
          u_char         o,
          u_char *       b,
@@ -350,9 +350,8 @@ mmc_encr(u_long		base)	/* i/o port of the card */
 /*------------------------------------------------------------------*/
 /*
  * Wait for the frequency EEprom to complete a command...
- * I hope this one will be optimally inlined...
  */
-static inline void
+static void
 fee_wait(u_long         base,   /* i/o port of the card */
          int            delay,  /* Base delay to wait for */
          int            number) /* Number of time to wait */
@@ -738,9 +737,9 @@ static void wv_roam_handover(wavepoint_history *wavepoint, net_local *lp)
 }
 
 /* Called when a WavePoint beacon is received */
-static inline void wl_roam_gather(struct net_device *  dev,
-                                  u_char *  hdr,   /* Beacon header */
-                                  u_char *  stats) /* SNR, Signal quality 
+static void wl_roam_gather(struct net_device *  dev,
+                           u_char *  hdr,   /* Beacon header */
+                           u_char *  stats) /* SNR, Signal quality
                                                       of packet */
 {
   wavepoint_beacon *beacon= (wavepoint_beacon *)hdr; /* Rcvd. Beacon */
@@ -794,7 +793,7 @@ out:
 static inline int WAVELAN_BEACON(unsigned char *data)
 {
   wavepoint_beacon *beacon= (wavepoint_beacon *)data;
-  static wavepoint_beacon beacon_template={0xaa,0xaa,0x03,0x08,0x00,0x0e,0x20,0x03,0x00};
+  static const wavepoint_beacon beacon_template={0xaa,0xaa,0x03,0x08,0x00,0x0e,0x20,0x03,0x00};
   
   if(memcmp(beacon,&beacon_template,9)==0)
     return 1;
@@ -980,7 +979,7 @@ read_ringbuf(struct net_device *	dev,
  * wavelan_interrupt is not an option...), so you may experience
  * some delay sometime...
  */
-static inline void
+static void
 wv_82593_reconfig(struct net_device *   dev)
 {
   net_local *           lp = netdev_priv(dev);
@@ -1233,7 +1232,7 @@ wv_local_show(struct net_device *	dev)
 /*
  * Dump packet header (and content if necessary) on the screen
  */
-static inline void
+static void
 wv_packet_info(u_char *         p,              /* Packet to dump */
                int              length,         /* Length of the packet */
                char *           msg1,           /* Name of the device */
@@ -1272,7 +1271,7 @@ wv_packet_info(u_char *		p,		/* Packet to dump */
  * This is the information which is displayed by the driver at startup
  * There  is a lot of flag to configure it at your will...
  */
-static inline void
+static void
 wv_init_info(struct net_device *        dev)
 {
   unsigned int  base = dev->base_addr;
@@ -1509,7 +1508,7 @@ wavelan_set_mac_address(struct net_device *	dev,
  * Frequency setting (for hardware able of it)
  * It's a bit complicated and you don't really want to look into it...
  */
-static inline int
+static int
 wv_set_frequency(u_long         base,   /* i/o port of the card */
                  iw_freq *      frequency)
 {
@@ -1706,7 +1705,7 @@ wv_set_frequency(u_long		base,	/* i/o port of the card */
 /*
  * Give the list of available frequencies
  */
-static inline int
+static int
 wv_frequency_list(u_long        base,   /* i/o port of the card */
                   iw_freq *     list,   /* List of frequency to fill */
                   int           max)    /* Maximum number of frequencies */
@@ -2759,7 +2758,7 @@ wavelan_get_wireless_stats(struct net_device *	dev)
  * frame pointer and verify that the frame seem correct
  * (called by wv_packet_rcv())
  */
-static inline int
+static int
 wv_start_of_frame(struct net_device *   dev,
                   int           rfp,    /* end of frame */
                   int           wrap)   /* start of buffer */
@@ -2821,7 +2820,7 @@ wv_start_of_frame(struct net_device *	dev,
  * Note: if any errors occur, the packet is "dropped on the floor"
  * (called by wv_packet_rcv())
  */
-static inline void
+static void
 wv_packet_read(struct net_device *              dev,
                int              fd_p,
                int              sksize)
@@ -2922,7 +2921,7 @@ wv_packet_read(struct net_device *		dev,
  * (called by wavelan_interrupt())
  * Note : the spinlock is already grabbed for us and irq are disabled.
  */
-static inline void
+static void
 wv_packet_rcv(struct net_device *       dev)
 {
   unsigned int  base = dev->base_addr;
@@ -3056,7 +3055,7 @@ wv_packet_rcv(struct net_device *	dev)
  * the transmit.
  * (called in wavelan_packet_xmit())
  */
-static inline void
+static void
 wv_packet_write(struct net_device *     dev,
                 void *          buf,
                 short           length)
@@ -3180,7 +3179,7 @@ wavelan_packet_xmit(struct sk_buff *	skb,
  * Routine to initialize the Modem Management Controller.
  * (called by wv_hw_config())
  */
-static inline int
+static int
 wv_mmc_init(struct net_device * dev)
 {
   unsigned int  base = dev->base_addr;
@@ -3699,7 +3698,7 @@ wv_82593_config(struct net_device *	dev)
  * wavelan.
  * (called by wv_config())
  */
-static inline int
+static int
 wv_pcmcia_reset(struct net_device *     dev)
 {
   int           i;
@@ -3864,7 +3863,7 @@ wv_hw_config(struct net_device *	dev)
  *      2. Start the LAN controller's receive unit
  * (called by wavelan_event(), wavelan_watchdog() and wavelan_open())
  */
-static inline void
+static void
 wv_hw_reset(struct net_device * dev)
 {
   net_local *   lp = netdev_priv(dev);
@@ -3895,7 +3894,7 @@ wv_hw_reset(struct net_device *	dev)
  * device available to the system.
  * (called by wavelan_event())
  */
-static inline int
+static int
 wv_pcmcia_config(struct pcmcia_device * link)
 {
   struct net_device *   dev = (struct net_device *) link->priv;
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 33dd97094227..628192d7248f 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -637,7 +637,7 @@ struct net_local
 /* ----------------- MODEM MANAGEMENT SUBROUTINES ----------------- */
 static inline u_char            /* data */
         hasr_read(u_long);      /* Read the host interface : base address */
-static inline void
+static void
         hacr_write(u_long,      /* Write to host interface : base address */
                    u_char),     /* data */
         hacr_write_slow(u_long,
@@ -651,7 +651,7 @@ static void
                   int,          /* Offset in psa */
                   u_char *,     /* Buffer in memory */
                   int);         /* Length of buffer */
-static inline void
+static void
         mmc_out(u_long,         /* Write 1 byte to the Modem Manag Control */
                 u_short,
                 u_char),
@@ -659,10 +659,10 @@ static inline void
                   u_char,
                   u_char *,
                   int);
-static inline u_char            /* Read 1 byte from the MMC */
+static u_char                   /* Read 1 byte from the MMC */
         mmc_in(u_long,
                u_short);
-static inline void
+static void
         mmc_read(u_long,        /* Read n bytes from the MMC */
                  u_char,
                  u_char *,
@@ -688,10 +688,10 @@ static int
                      int,
                      char *,
                      int);
-static inline void
+static void
         wv_82593_reconfig(struct net_device *); /* Reconfigure the controller */
 /* ------------------- DEBUG & INFO SUBROUTINES ------------------- */
-static inline void
+static void
         wv_init_info(struct net_device *);      /* display startup info */
 /* ------------------- IOCTL, STATS & RECONFIG ------------------- */
 static en_stats *
@@ -699,17 +699,17 @@ static en_stats	*
 static iw_stats *
         wavelan_get_wireless_stats(struct net_device *);
 /* ----------------------- PACKET RECEPTION ----------------------- */
-static inline int
+static int
         wv_start_of_frame(struct net_device *,  /* Seek beggining of current frame */
                           int,  /* end of frame */
                           int); /* start of buffer */
-static inline void
+static void
         wv_packet_read(struct net_device *,     /* Read a packet from a frame */
                        int,
                        int),
         wv_packet_rcv(struct net_device *);     /* Read all packets waiting */
 /* --------------------- PACKET TRANSMISSION --------------------- */
-static inline void
+static void
         wv_packet_write(struct net_device *,    /* Write a packet to the Tx buffer */
                         void *,
                         short);
@@ -717,20 +717,20 @@ static int
         wavelan_packet_xmit(struct sk_buff *,   /* Send a packet */
                             struct net_device *);
 /* -------------------- HARDWARE CONFIGURATION -------------------- */
-static inline int
+static int
         wv_mmc_init(struct net_device *);       /* Initialize the modem */
 static int
         wv_ru_stop(struct net_device *),        /* Stop the i82593 receiver unit */
         wv_ru_start(struct net_device *);       /* Start the i82593 receiver unit */
 static int
         wv_82593_config(struct net_device *);   /* Configure the i82593 */
-static inline int
+static int
         wv_pcmcia_reset(struct net_device *);   /* Reset the pcmcia interface */
 static int
         wv_hw_config(struct net_device *);      /* Reset & configure the whole hardware */
-static inline void
+static void
         wv_hw_reset(struct net_device *);       /* Same, + start receiver unit */
-static inline int
+static int
         wv_pcmcia_config(struct pcmcia_device *);       /* Configure the pcmcia interface */
 static void
         wv_pcmcia_release(struct pcmcia_device *);/* Remove a device */
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 99e5b03b3f51..0acb5c345734 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -771,10 +771,10 @@ static int zd1211b_hw_init_hmac(struct zd_chip *chip)
 {
         static const struct zd_ioreq32 ioreqs[] = {
                 { CR_ZD1211B_RETRY_MAX,         0x02020202 },
-                { CR_ZD1211B_TX_PWR_CTL4,       0x007f003f },
-                { CR_ZD1211B_TX_PWR_CTL3,       0x007f003f },
-                { CR_ZD1211B_TX_PWR_CTL2,       0x003f001f },
-                { CR_ZD1211B_TX_PWR_CTL1,       0x001f000f },
+                { CR_ZD1211B_CWIN_MAX_MIN_AC0,  0x007f003f },
+                { CR_ZD1211B_CWIN_MAX_MIN_AC1,  0x007f003f },
+                { CR_ZD1211B_CWIN_MAX_MIN_AC2,  0x003f001f },
+                { CR_ZD1211B_CWIN_MAX_MIN_AC3,  0x001f000f },
                 { CR_ZD1211B_AIFS_CTL1,         0x00280028 },
                 { CR_ZD1211B_AIFS_CTL2,         0x008C003C },
                 { CR_ZD1211B_TXOP,              0x01800824 },
@@ -809,6 +809,7 @@ static int hw_init_hmac(struct zd_chip *chip)
                 { CR_AFTER_PNP,                 0x1 },
                 { CR_WEP_PROTECT,               0x114 },
                 { CR_IFS_VALUE,                 IFS_VALUE_DEFAULT },
+                { CR_CAM_MODE,                  MODE_AP_WDS},
         };
 
         ZD_ASSERT(mutex_is_locked(&chip->mutex));
@@ -986,7 +987,7 @@ static int print_fw_version(struct zd_chip *chip)
         return 0;
 }
 
-static int set_mandatory_rates(struct zd_chip *chip, int mode)
+static int set_mandatory_rates(struct zd_chip *chip, int gmode)
 {
         u32 rates;
         ZD_ASSERT(mutex_is_locked(&chip->mutex));
@@ -994,17 +995,12 @@ static int set_mandatory_rates(struct zd_chip *chip, int mode)
          * that the device is supporting. Until further notice we should try
          * to support 802.11g also for full speed USB.
          */
-        switch (mode) {
-        case MODE_IEEE80211B:
+        if (!gmode)
                 rates = CR_RATE_1M|CR_RATE_2M|CR_RATE_5_5M|CR_RATE_11M;
-                break;
-        case MODE_IEEE80211G:
+        else
                 rates = CR_RATE_1M|CR_RATE_2M|CR_RATE_5_5M|CR_RATE_11M|
                         CR_RATE_6M|CR_RATE_12M|CR_RATE_24M;
-                break;
-        default:
-                return -EINVAL;
-        }
+
         return zd_iowrite32_locked(chip, rates, CR_MANDATORY_RATE_TBL);
 }
 
@@ -1108,7 +1104,7 @@ int zd_chip_init_hw(struct zd_chip *chip)
          * It might be discussed, whether we should suppport pure b mode for
          * full speed USB.
          */
-        r = set_mandatory_rates(chip, MODE_IEEE80211G);
+        r = set_mandatory_rates(chip, 1);
         if (r)
                 goto out;
         /* Disabling interrupts is certainly a smart thing here.
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 009c03777a35..f8c061a9b6ec 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -489,6 +489,7 @@ enum {
 
 #define CR_RX_OFFSET                    CTL_REG(0x065c)
 
+#define CR_BCN_LENGTH                   CTL_REG(0x0664)
 #define CR_PHY_DELAY                    CTL_REG(0x066C)
 #define CR_BCN_FIFO                     CTL_REG(0x0670)
 #define CR_SNIFFER_ON                   CTL_REG(0x0674)
@@ -545,6 +546,8 @@ enum {
 #define RX_FILTER_CTRL (RX_FILTER_RTS | RX_FILTER_CTS | \
         RX_FILTER_CFEND | RX_FILTER_CFACK)
 
+#define BCN_MODE_IBSS                   0x2000000
+
 /* Monitor mode sets filter to 0xfffff */
 
 #define CR_ACK_TIMEOUT_EXT              CTL_REG(0x0690)
@@ -578,6 +581,11 @@ enum {
 
 /* CAM: Continuous Access Mode (power management) */
 #define CR_CAM_MODE                     CTL_REG(0x0700)
+#define MODE_IBSS                       0x0
+#define MODE_AP                         0x1
+#define MODE_STA                        0x2
+#define MODE_AP_WDS                     0x3
+
 #define CR_CAM_ROLL_TB_LOW              CTL_REG(0x0704)
 #define CR_CAM_ROLL_TB_HIGH             CTL_REG(0x0708)
 #define CR_CAM_ADDRESS                  CTL_REG(0x070C)
@@ -625,11 +633,10 @@ enum {
 #define CR_S_MD                         CTL_REG(0x0830)
 
 #define CR_USB_DEBUG_PORT               CTL_REG(0x0888)
-
-#define CR_ZD1211B_TX_PWR_CTL1          CTL_REG(0x0b00)
-#define CR_ZD1211B_TX_PWR_CTL2          CTL_REG(0x0b04)
-#define CR_ZD1211B_TX_PWR_CTL3          CTL_REG(0x0b08)
-#define CR_ZD1211B_TX_PWR_CTL4          CTL_REG(0x0b0c)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC0     CTL_REG(0x0b00)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC1     CTL_REG(0x0b04)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC2     CTL_REG(0x0b08)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC3     CTL_REG(0x0b0c)
 #define CR_ZD1211B_AIFS_CTL1            CTL_REG(0x0b10)
 #define CR_ZD1211B_AIFS_CTL2            CTL_REG(0x0b14)
 #define CR_ZD1211B_TXOP                 CTL_REG(0x0b20)
diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.c b/drivers/net/wireless/zd1211rw/zd_ieee80211.c
index 7c277ec43f79..d8dc41ec0e5d 100644
--- a/drivers/net/wireless/zd1211rw/zd_ieee80211.c
+++ b/drivers/net/wireless/zd1211rw/zd_ieee80211.c
@@ -65,16 +65,14 @@ static const struct channel_range *zd_channel_range(u8 regdomain)
 
 static void unmask_bg_channels(struct ieee80211_hw *hw,
         const struct channel_range *range,
-        struct ieee80211_hw_mode *mode)
+        struct ieee80211_supported_band *sband)
 {
         u8 channel;
 
         for (channel = range->start; channel < range->end; channel++) {
                 struct ieee80211_channel *chan =
-                        &mode->channels[CHAN_TO_IDX(channel)];
-                chan->flag |= IEEE80211_CHAN_W_SCAN |
-                        IEEE80211_CHAN_W_ACTIVE_SCAN |
-                        IEEE80211_CHAN_W_IBSS;
+                        &sband->channels[CHAN_TO_IDX(channel)];
+                chan->flags = 0;
         }
 }
 
@@ -97,7 +95,6 @@ void zd_geo_init(struct ieee80211_hw *hw, u8 regdomain)
                 range = zd_channel_range(ZD_REGDOMAIN_FCC);
         }
 
-        unmask_bg_channels(hw, range, &mac->modes[0]);
-        unmask_bg_channels(hw, range, &mac->modes[1]);
+        unmask_bg_channels(hw, range, &mac->band);
 }
 
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 76ef2d83919d..69c45ca99051 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -34,76 +34,61 @@
 
 /* This table contains the hardware specific values for the modulation rates. */
 static const struct ieee80211_rate zd_rates[] = {
-        { .rate = 10,
-          .val = ZD_CCK_RATE_1M,
-          .flags = IEEE80211_RATE_CCK },
-        { .rate = 20,
-          .val = ZD_CCK_RATE_2M,
-          .val2 = ZD_CCK_RATE_2M | ZD_CCK_PREA_SHORT,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 55,
-          .val = ZD_CCK_RATE_5_5M,
-          .val2 = ZD_CCK_RATE_5_5M | ZD_CCK_PREA_SHORT,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 110,
-          .val = ZD_CCK_RATE_11M,
-          .val2 = ZD_CCK_RATE_11M | ZD_CCK_PREA_SHORT,
-          .flags = IEEE80211_RATE_CCK_2 },
-        { .rate = 60,
-          .val = ZD_OFDM_RATE_6M,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 90,
-          .val = ZD_OFDM_RATE_9M,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 120,
-          .val = ZD_OFDM_RATE_12M,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 180,
-          .val = ZD_OFDM_RATE_18M,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 240,
-          .val = ZD_OFDM_RATE_24M,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 360,
-          .val = ZD_OFDM_RATE_36M,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 480,
-          .val = ZD_OFDM_RATE_48M,
-          .flags = IEEE80211_RATE_OFDM },
-        { .rate = 540,
-          .val = ZD_OFDM_RATE_54M,
-          .flags = IEEE80211_RATE_OFDM },
+        { .bitrate = 10,
+          .hw_value = ZD_CCK_RATE_1M, },
+        { .bitrate = 20,
+          .hw_value = ZD_CCK_RATE_2M,
+          .hw_value_short = ZD_CCK_RATE_2M | ZD_CCK_PREA_SHORT,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 55,
+          .hw_value = ZD_CCK_RATE_5_5M,
+          .hw_value_short = ZD_CCK_RATE_5_5M | ZD_CCK_PREA_SHORT,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 110,
+          .hw_value = ZD_CCK_RATE_11M,
+          .hw_value_short = ZD_CCK_RATE_11M | ZD_CCK_PREA_SHORT,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 60,
+          .hw_value = ZD_OFDM_RATE_6M,
+          .flags = 0 },
+        { .bitrate = 90,
+          .hw_value = ZD_OFDM_RATE_9M,
+          .flags = 0 },
+        { .bitrate = 120,
+          .hw_value = ZD_OFDM_RATE_12M,
+          .flags = 0 },
+        { .bitrate = 180,
+          .hw_value = ZD_OFDM_RATE_18M,
+          .flags = 0 },
+        { .bitrate = 240,
+          .hw_value = ZD_OFDM_RATE_24M,
+          .flags = 0 },
+        { .bitrate = 360,
+          .hw_value = ZD_OFDM_RATE_36M,
+          .flags = 0 },
+        { .bitrate = 480,
+          .hw_value = ZD_OFDM_RATE_48M,
+          .flags = 0 },
+        { .bitrate = 540,
+          .hw_value = ZD_OFDM_RATE_54M,
+          .flags = 0 },
 };
 
 static const struct ieee80211_channel zd_channels[] = {
-        { .chan = 1,
-          .freq = 2412},
-        { .chan = 2,
-          .freq = 2417},
-        { .chan = 3,
-          .freq = 2422},
-        { .chan = 4,
-          .freq = 2427},
-        { .chan = 5,
-          .freq = 2432},
-        { .chan = 6,
-          .freq = 2437},
-        { .chan = 7,
-          .freq = 2442},
-        { .chan = 8,
-          .freq = 2447},
-        { .chan = 9,
-          .freq = 2452},
-        { .chan = 10,
-          .freq = 2457},
-        { .chan = 11,
-          .freq = 2462},
-        { .chan = 12,
-          .freq = 2467},
-        { .chan = 13,
-          .freq = 2472},
-        { .chan = 14,
-          .freq = 2484}
+        { .center_freq = 2412, .hw_value = 1 },
+        { .center_freq = 2417, .hw_value = 2 },
+        { .center_freq = 2422, .hw_value = 3 },
+        { .center_freq = 2427, .hw_value = 4 },
+        { .center_freq = 2432, .hw_value = 5 },
+        { .center_freq = 2437, .hw_value = 6 },
+        { .center_freq = 2442, .hw_value = 7 },
+        { .center_freq = 2447, .hw_value = 8 },
+        { .center_freq = 2452, .hw_value = 9 },
+        { .center_freq = 2457, .hw_value = 10 },
+        { .center_freq = 2462, .hw_value = 11 },
+        { .center_freq = 2467, .hw_value = 12 },
+        { .center_freq = 2472, .hw_value = 13 },
+        { .center_freq = 2484, .hw_value = 14 },
 };
 
 static void housekeeping_init(struct zd_mac *mac);
@@ -490,6 +475,46 @@ static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs,
         /* FIXME: Management frame? */
 }
 
+void zd_mac_config_beacon(struct ieee80211_hw *hw, struct sk_buff *beacon)
+{
+        struct zd_mac *mac = zd_hw_mac(hw);
+        u32 tmp, j = 0;
+        /* 4 more bytes for tail CRC */
+        u32 full_len = beacon->len + 4;
+        zd_iowrite32(&mac->chip, CR_BCN_FIFO_SEMAPHORE, 0);
+        zd_ioread32(&mac->chip, CR_BCN_FIFO_SEMAPHORE, &tmp);
+        while (tmp & 0x2) {
+                zd_ioread32(&mac->chip, CR_BCN_FIFO_SEMAPHORE, &tmp);
+                if ((++j % 100) == 0) {
+                        printk(KERN_ERR "CR_BCN_FIFO_SEMAPHORE not ready\n");
+                        if (j >= 500)  {
+                                printk(KERN_ERR "Giving up beacon config.\n");
+                                return;
+                        }
+                }
+                msleep(1);
+        }
+
+        zd_iowrite32(&mac->chip, CR_BCN_FIFO, full_len - 1);
+        if (zd_chip_is_zd1211b(&mac->chip))
+                zd_iowrite32(&mac->chip, CR_BCN_LENGTH, full_len - 1);
+
+        for (j = 0 ; j < beacon->len; j++)
+                zd_iowrite32(&mac->chip, CR_BCN_FIFO,
+                                *((u8 *)(beacon->data + j)));
+
+        for (j = 0; j < 4; j++)
+                zd_iowrite32(&mac->chip, CR_BCN_FIFO, 0x0);
+
+        zd_iowrite32(&mac->chip, CR_BCN_FIFO_SEMAPHORE, 1);
+        /* 802.11b/g 2.4G CCK 1Mb
+         * 802.11a, not yet implemented, uses different values (see GPL vendor
+         * driver)
+         */
+        zd_iowrite32(&mac->chip, CR_BCN_PLCP_CFG, 0x00000400 |
+                        (full_len << 19));
+}
+
 static int fill_ctrlset(struct zd_mac *mac,
                         struct sk_buff *skb,
                         struct ieee80211_tx_control *control)
@@ -503,7 +528,9 @@ static int fill_ctrlset(struct zd_mac *mac,
 
         ZD_ASSERT(frag_len <= 0xffff);
 
-        cs->modulation = control->tx_rate;
+        cs->modulation = control->tx_rate->hw_value;
+        if (control->flags & IEEE80211_TXCTL_SHORT_PREAMBLE)
+                cs->modulation = control->tx_rate->hw_value_short;
 
         cs->tx_length = cpu_to_le16(frag_len);
 
@@ -631,6 +658,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
         int bad_frame = 0;
         u16 fc;
         bool is_qos, is_4addr, need_padding;
+        int i;
+        u8 rate;
 
         if (length < ZD_PLCP_HEADER_SIZE + 10 /* IEEE80211_1ADDR_LEN */ +
                      FCS_LEN + sizeof(struct rx_status))
@@ -660,14 +689,19 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
                 }
         }
 
-        stats.channel = _zd_chip_get_channel(&mac->chip);
-        stats.freq = zd_channels[stats.channel - 1].freq;
-        stats.phymode = MODE_IEEE80211G;
+        stats.freq = zd_channels[_zd_chip_get_channel(&mac->chip) - 1].center_freq;
+        stats.band = IEEE80211_BAND_2GHZ;
         stats.ssi = status->signal_strength;
         stats.signal = zd_rx_qual_percent(buffer,
                                           length - sizeof(struct rx_status),
                                           status);
-        stats.rate = zd_rx_rate(buffer, status);
+
+        rate = zd_rx_rate(buffer, status);
+
+        /* todo: return index in the big switches in zd_rx_rate instead */
+        for (i = 0; i < mac->band.n_bitrates; i++)
+                if (rate == mac->band.bitrates[i].hw_value)
+                        stats.rate_idx = i;
 
         length -= ZD_PLCP_HEADER_SIZE + sizeof(struct rx_status);
         buffer += ZD_PLCP_HEADER_SIZE;
@@ -715,6 +749,7 @@ static int zd_op_add_interface(struct ieee80211_hw *hw,
 
         switch (conf->type) {
         case IEEE80211_IF_TYPE_MNTR:
+        case IEEE80211_IF_TYPE_MESH_POINT:
         case IEEE80211_IF_TYPE_STA:
                 mac->type = conf->type;
                 break;
@@ -736,7 +771,7 @@ static void zd_op_remove_interface(struct ieee80211_hw *hw,
 static int zd_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
 {
         struct zd_mac *mac = zd_hw_mac(hw);
-        return zd_chip_set_channel(&mac->chip, conf->channel);
+        return zd_chip_set_channel(&mac->chip, conf->channel->hw_value);
 }
 
 static int zd_op_config_interface(struct ieee80211_hw *hw,
@@ -744,15 +779,43 @@ static int zd_op_config_interface(struct ieee80211_hw *hw,
                                    struct ieee80211_if_conf *conf)
 {
         struct zd_mac *mac = zd_hw_mac(hw);
+        int associated;
+
+        if (mac->type == IEEE80211_IF_TYPE_MESH_POINT) {
+                associated = true;
+                if (conf->beacon) {
+                        zd_mac_config_beacon(hw, conf->beacon);
+                        kfree_skb(conf->beacon);
+                        zd_set_beacon_interval(&mac->chip, BCN_MODE_IBSS |
+                                        hw->conf.beacon_int);
+                }
+        } else
+                associated = is_valid_ether_addr(conf->bssid);
 
         spin_lock_irq(&mac->lock);
-        mac->associated = is_valid_ether_addr(conf->bssid);
+        mac->associated = associated;
         spin_unlock_irq(&mac->lock);
 
         /* TODO: do hardware bssid filtering */
         return 0;
 }
 
+void zd_process_intr(struct work_struct *work)
+{
+        u16 int_status;
+        struct zd_mac *mac = container_of(work, struct zd_mac, process_intr);
+
+        int_status = le16_to_cpu(*(u16 *)(mac->intr_buffer+4));
+        if (int_status & INT_CFG_NEXT_BCN) {
+                if (net_ratelimit())
+                        dev_dbg_f(zd_mac_dev(mac), "INT_CFG_NEXT_BCN\n");
+        } else
+                dev_dbg_f(zd_mac_dev(mac), "Unsupported interrupt\n");
+
+        zd_chip_enable_hwint(&mac->chip);
+}
+
+
 static void set_multicast_hash_handler(struct work_struct *work)
 {
         struct zd_mac *mac =
@@ -780,7 +843,7 @@ static void set_rx_filter_handler(struct work_struct *work)
 
 #define SUPPORTED_FIF_FLAGS \
         (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL | \
-        FIF_OTHER_BSS)
+        FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC)
 static void zd_op_configure_filter(struct ieee80211_hw *hw,
                         unsigned int changed_flags,
                         unsigned int *new_flags,
@@ -894,7 +957,6 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
 {
         struct zd_mac *mac;
         struct ieee80211_hw *hw;
-        int i;
 
         hw = ieee80211_alloc_hw(sizeof(struct zd_mac), &zd_ops);
         if (!hw) {
@@ -912,19 +974,15 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
 
         memcpy(mac->channels, zd_channels, sizeof(zd_channels));
         memcpy(mac->rates, zd_rates, sizeof(zd_rates));
-        mac->modes[0].mode = MODE_IEEE80211G;
-        mac->modes[0].num_rates = ARRAY_SIZE(zd_rates);
-        mac->modes[0].rates = mac->rates;
-        mac->modes[0].num_channels = ARRAY_SIZE(zd_channels);
-        mac->modes[0].channels = mac->channels;
-        mac->modes[1].mode = MODE_IEEE80211B;
-        mac->modes[1].num_rates = 4;
-        mac->modes[1].rates = mac->rates;
-        mac->modes[1].num_channels = ARRAY_SIZE(zd_channels);
-        mac->modes[1].channels = mac->channels;
+        mac->band.n_bitrates = ARRAY_SIZE(zd_rates);
+        mac->band.bitrates = mac->rates;
+        mac->band.n_channels = ARRAY_SIZE(zd_channels);
+        mac->band.channels = mac->channels;
+
+        hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &mac->band;
 
         hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
-                     IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED;
+                    IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE;
         hw->max_rssi = 100;
         hw->max_signal = 100;
 
@@ -933,19 +991,12 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
 
         skb_queue_head_init(&mac->ack_wait_queue);
 
-        for (i = 0; i < 2; i++) {
-                if (ieee80211_register_hwmode(hw, &mac->modes[i])) {
-                        dev_dbg_f(&intf->dev, "cannot register hwmode\n");
-                        ieee80211_free_hw(hw);
-                        return NULL;
-                }
-        }
-
         zd_chip_init(&mac->chip, hw, intf);
         housekeeping_init(mac);
         INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler);
         INIT_WORK(&mac->set_rts_cts_work, set_rts_cts_work);
         INIT_WORK(&mac->set_rx_filter_work, set_rx_filter_handler);
+        INIT_WORK(&mac->process_intr, zd_process_intr);
 
         SET_IEEE80211_DEV(hw, &intf->dev);
         return hw;
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index 2dde108df767..71170244d2c9 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -172,12 +172,15 @@ struct zd_tx_skb_control_block {
 struct zd_mac {
         struct zd_chip chip;
         spinlock_t lock;
+        spinlock_t intr_lock;
         struct ieee80211_hw *hw;
         struct housekeeping housekeeping;
         struct work_struct set_multicast_hash_work;
         struct work_struct set_rts_cts_work;
         struct work_struct set_rx_filter_work;
+        struct work_struct process_intr;
         struct zd_mc_hash multicast_hash;
+        u8 intr_buffer[USB_MAX_EP_INT_BUFFER];
         u8 regdomain;
         u8 default_regdomain;
         int type;
@@ -185,7 +188,7 @@ struct zd_mac {
         struct sk_buff_head ack_wait_queue;
         struct ieee80211_channel channels[14];
         struct ieee80211_rate rates[12];
-        struct ieee80211_hw_mode modes[2];
+        struct ieee80211_supported_band band;
 
         /* Short preamble (used for RTS/CTS) */
         unsigned int short_preamble:1;
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 7942b15acfe7..e34675c2f8fc 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -97,6 +97,7 @@ MODULE_DEVICE_TABLE(usb, usb_ids);
 #define FW_ZD1211B_PREFIX       "zd1211/zd1211b_"
 
 /* USB device initialization */
+static void int_urb_complete(struct urb *urb);
 
 static int request_fw_file(
         const struct firmware **fw, const char *name, struct device *device)
@@ -336,11 +337,18 @@ static inline void handle_regs_int(struct urb *urb)
         struct zd_usb *usb = urb->context;
         struct zd_usb_interrupt *intr = &usb->intr;
         int len;
+        u16 int_num;
 
         ZD_ASSERT(in_interrupt());
         spin_lock(&intr->lock);
 
-        if (intr->read_regs_enabled) {
+        int_num = le16_to_cpu(*(u16 *)(urb->transfer_buffer+2));
+        if (int_num == CR_INTERRUPT) {
+                struct zd_mac *mac = zd_hw_mac(zd_usb_to_hw(urb->context));
+                memcpy(&mac->intr_buffer, urb->transfer_buffer,
+                                USB_MAX_EP_INT_BUFFER);
+                schedule_work(&mac->process_intr);
+        } else if (intr->read_regs_enabled) {
                 intr->read_regs.length = len = urb->actual_length;
 
                 if (len > sizeof(intr->read_regs.buffer))
@@ -351,7 +359,6 @@ static inline void handle_regs_int(struct urb *urb)
                 goto out;
         }
 
-        dev_dbg_f(urb_dev(urb), "regs interrupt ignored\n");
 out:
         spin_unlock(&intr->lock);
 }
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index fe6ff3e3d525..24640726f8bb 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -770,14 +770,14 @@ static void yellowfin_init_ring(struct net_device *dev)
                 /* Branch on Tx error. */
                 yp->tx_ring[j].dbdma_cmd = cpu_to_le32(CMD_STOP);
                 yp->tx_ring[j].branch_addr = cpu_to_le32(yp->tx_ring_dma +
-                        (j+1)*sizeof(struct yellowfin_desc);
+                        (j+1)*sizeof(struct yellowfin_desc));
                 j++;
                 if (yp->flags & FullTxStatus) {
                         yp->tx_ring[j].dbdma_cmd =
                                 cpu_to_le32(CMD_TXSTATUS | sizeof(*yp->tx_status));
                         yp->tx_ring[j].request_cnt = sizeof(*yp->tx_status);
                         yp->tx_ring[j].addr = cpu_to_le32(yp->tx_status_dma +
-                                i*sizeof(struct tx_status_words);
+                                i*sizeof(struct tx_status_words));
                 } else {
                         /* Symbios chips write only tx_errs word. */
                         yp->tx_ring[j].dbdma_cmd =